summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_anim_scripts.s228
-rw-r--r--data/event_scripts.s15
-rw-r--r--data/field_effect_scripts.s2
-rw-r--r--data/layouts/Route111_NoMirageTower/layout.inc1
-rw-r--r--data/maps/AbandonedShip_CaptainsOffice/header.inc2
-rw-r--r--data/maps/AbandonedShip_Corridors_1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Corridors_B1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Deck/header.inc2
-rw-r--r--data/maps/AbandonedShip_HiddenFloorCorridors/header.inc2
-rw-r--r--data/maps/AbandonedShip_HiddenFloorRooms/header.inc2
-rw-r--r--data/maps/AbandonedShip_Room_B1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Rooms2_1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Rooms2_B1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Rooms_1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Rooms_B1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Underwater1/header.inc2
-rw-r--r--data/maps/AbandonedShip_Underwater2/header.inc2
-rw-r--r--data/maps/AlteringCave/header.inc2
-rw-r--r--data/maps/AncientTomb/header.inc2
-rw-r--r--data/maps/AquaHideout_1F/header.inc2
-rw-r--r--data/maps/AquaHideout_B1F/header.inc2
-rw-r--r--data/maps/AquaHideout_B2F/header.inc2
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap1/header.inc2
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap2/header.inc2
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap3/header.inc2
-rw-r--r--data/maps/ArtisanCave_1F/header.inc2
-rw-r--r--data/maps/ArtisanCave_B1F/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc4
-rw-r--r--data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc4
-rw-r--r--data/maps/BattleFrontier_BattleArenaCorridor/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleArenaLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc4
-rw-r--r--data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc4
-rw-r--r--data/maps/BattleFrontier_BattleDomeCorridor/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleDomeLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc4
-rw-r--r--data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc4
-rw-r--r--data/maps/BattleFrontier_BattleFactoryLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc4
-rw-r--r--data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc4
-rw-r--r--data/maps/BattleFrontier_BattlePalaceCorridor/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePalaceLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeCorridor/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc4
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePyramidLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePyramidTop/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc8
-rw-r--r--data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor2/events.inc4
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor2/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerElevator/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/events.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc16
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge1/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge2/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge3/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge4/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge5/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge6/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge6/scripts.inc8
-rw-r--r--data/maps/BattleFrontier_Lounge7/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge8/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge9/header.inc2
-rw-r--r--data/maps/BattleFrontier_Mart/header.inc2
-rw-r--r--data/maps/BattleFrontier_OutsideEast/header.inc2
-rw-r--r--data/maps/BattleFrontier_OutsideWest/header.inc2
-rw-r--r--data/maps/BattleFrontier_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/BattleFrontier_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/BattleFrontier_RankingHall/header.inc2
-rw-r--r--data/maps/BattleFrontier_ReceptionGate/header.inc2
-rw-r--r--data/maps/BattleFrontier_ScottsHouse/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare01/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare02/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare03/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare04/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare05/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare06/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare07/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare08/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare09/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare10/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare11/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare12/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare13/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare14/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare15/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare16/header.inc2
-rw-r--r--data/maps/BirthIsland_Exterior/header.inc2
-rw-r--r--data/maps/BirthIsland_Exterior/scripts.inc8
-rw-r--r--data/maps/BirthIsland_Harbor/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_1F/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_B1F/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_Entrance/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc2
-rw-r--r--data/maps/DesertRuins/header.inc2
-rw-r--r--data/maps/DesertUnderpass/header.inc2
-rw-r--r--data/maps/DewfordTown/header.inc2
-rw-r--r--data/maps/DewfordTown_Gym/header.inc2
-rw-r--r--data/maps/DewfordTown_Hall/header.inc2
-rw-r--r--data/maps/DewfordTown_House1/header.inc2
-rw-r--r--data/maps/DewfordTown_House2/header.inc2
-rw-r--r--data/maps/DewfordTown_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/DewfordTown_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/DoubleBattleColosseum/header.inc2
-rw-r--r--data/maps/EverGrandeCity/header.inc2
-rw-r--r--data/maps/EverGrandeCity_ChampionsRoom/events.inc2
-rw-r--r--data/maps/EverGrandeCity_ChampionsRoom/header.inc2
-rw-r--r--data/maps/EverGrandeCity_ChampionsRoom/scripts.inc12
-rw-r--r--data/maps/EverGrandeCity_DrakesRoom/header.inc2
-rw-r--r--data/maps/EverGrandeCity_GlaciasRoom/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Hall1/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Hall2/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Hall3/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Hall4/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Hall5/header.inc2
-rw-r--r--data/maps/EverGrandeCity_HallOfFame/header.inc2
-rw-r--r--data/maps/EverGrandeCity_HallOfFame/scripts.inc4
-rw-r--r--data/maps/EverGrandeCity_PhoebesRoom/header.inc2
-rw-r--r--data/maps/EverGrandeCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/EverGrandeCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/EverGrandeCity_PokemonLeague_1F/header.inc2
-rw-r--r--data/maps/EverGrandeCity_PokemonLeague_2F/header.inc2
-rw-r--r--data/maps/EverGrandeCity_SidneysRoom/header.inc2
-rw-r--r--data/maps/FallarborTown/header.inc2
-rw-r--r--data/maps/FallarborTown_BattleTentBattleRoom/events.inc4
-rw-r--r--data/maps/FallarborTown_BattleTentBattleRoom/header.inc2
-rw-r--r--data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc4
-rw-r--r--data/maps/FallarborTown_BattleTentCorridor/header.inc2
-rw-r--r--data/maps/FallarborTown_BattleTentLobby/header.inc2
-rw-r--r--data/maps/FallarborTown_House1/header.inc2
-rw-r--r--data/maps/FallarborTown_House2/header.inc2
-rw-r--r--data/maps/FallarborTown_Mart/header.inc2
-rw-r--r--data/maps/FallarborTown_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/FallarborTown_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/FarawayIsland_Entrance/header.inc2
-rw-r--r--data/maps/FarawayIsland_Interior/header.inc2
-rw-r--r--data/maps/FieryPath/header.inc2
-rw-r--r--data/maps/FortreeCity/header.inc2
-rw-r--r--data/maps/FortreeCity_DecorationShop/header.inc2
-rw-r--r--data/maps/FortreeCity_Gym/header.inc2
-rw-r--r--data/maps/FortreeCity_House1/header.inc2
-rw-r--r--data/maps/FortreeCity_House1/scripts.inc8
-rw-r--r--data/maps/FortreeCity_House2/header.inc2
-rw-r--r--data/maps/FortreeCity_House3/header.inc2
-rw-r--r--data/maps/FortreeCity_House4/header.inc2
-rw-r--r--data/maps/FortreeCity_House5/header.inc2
-rw-r--r--data/maps/FortreeCity_Mart/header.inc2
-rw-r--r--data/maps/FortreeCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/FortreeCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/GraniteCave_1F/header.inc2
-rw-r--r--data/maps/GraniteCave_B1F/header.inc2
-rw-r--r--data/maps/GraniteCave_B2F/header.inc2
-rw-r--r--data/maps/GraniteCave_StevensRoom/header.inc2
-rw-r--r--data/maps/InsideOfTruck/header.inc2
-rw-r--r--data/maps/InsideOfTruck/scripts.inc4
-rw-r--r--data/maps/IslandCave/header.inc2
-rw-r--r--data/maps/JaggedPass/header.inc2
-rw-r--r--data/maps/LavaridgeTown/events.inc4
-rw-r--r--data/maps/LavaridgeTown/header.inc2
-rw-r--r--data/maps/LavaridgeTown/scripts.inc8
-rw-r--r--data/maps/LavaridgeTown_Gym_1F/header.inc2
-rw-r--r--data/maps/LavaridgeTown_Gym_B1F/header.inc2
-rw-r--r--data/maps/LavaridgeTown_HerbShop/header.inc2
-rw-r--r--data/maps/LavaridgeTown_House/header.inc2
-rw-r--r--data/maps/LavaridgeTown_Mart/header.inc2
-rw-r--r--data/maps/LavaridgeTown_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/LavaridgeTown_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/LilycoveCity/events.inc2
-rw-r--r--data/maps/LilycoveCity/header.inc2
-rw-r--r--data/maps/LilycoveCity/scripts.inc4
-rw-r--r--data/maps/LilycoveCity_ContestHall/header.inc2
-rw-r--r--data/maps/LilycoveCity_ContestLobby/header.inc2
-rw-r--r--data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc2
-rw-r--r--data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreElevator/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_1F/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_2F/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_3F/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_4F/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_5F/header.inc2
-rw-r--r--data/maps/LilycoveCity_Harbor/header.inc2
-rw-r--r--data/maps/LilycoveCity_House1/header.inc2
-rw-r--r--data/maps/LilycoveCity_House2/header.inc2
-rw-r--r--data/maps/LilycoveCity_House3/header.inc2
-rw-r--r--data/maps/LilycoveCity_House4/header.inc2
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc2
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc2
-rw-r--r--data/maps/LilycoveCity_MoveDeletersHouse/header.inc2
-rw-r--r--data/maps/LilycoveCity_PokemonCenter_1F/events.inc4
-rw-r--r--data/maps/LilycoveCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/LilycoveCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc2
-rw-r--r--data/maps/LilycoveCity_UnusedMart/header.inc2
-rw-r--r--data/maps/LinkContestRoom1/events.inc22
-rw-r--r--data/maps/LinkContestRoom1/header.inc2
-rw-r--r--data/maps/LinkContestRoom2/header.inc2
-rw-r--r--data/maps/LinkContestRoom3/header.inc2
-rw-r--r--data/maps/LinkContestRoom4/header.inc2
-rw-r--r--data/maps/LinkContestRoom5/header.inc2
-rw-r--r--data/maps/LinkContestRoom6/header.inc2
-rw-r--r--data/maps/LittlerootTown/events.inc2
-rw-r--r--data/maps/LittlerootTown/header.inc2
-rw-r--r--data/maps/LittlerootTown/scripts.inc32
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_1F/header.inc2
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_2F/events.inc24
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_2F/header.inc2
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc4
-rw-r--r--data/maps/LittlerootTown_MaysHouse_1F/header.inc2
-rw-r--r--data/maps/LittlerootTown_MaysHouse_2F/events.inc24
-rw-r--r--data/maps/LittlerootTown_MaysHouse_2F/header.inc2
-rw-r--r--data/maps/LittlerootTown_MaysHouse_2F/scripts.inc12
-rw-r--r--data/maps/LittlerootTown_ProfessorBirchsLab/events.inc2
-rw-r--r--data/maps/LittlerootTown_ProfessorBirchsLab/header.inc2
-rw-r--r--data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc24
-rw-r--r--data/maps/MagmaHideout_1F/header.inc2
-rw-r--r--data/maps/MagmaHideout_2F_1R/header.inc2
-rw-r--r--data/maps/MagmaHideout_2F_2R/header.inc2
-rw-r--r--data/maps/MagmaHideout_2F_3R/header.inc2
-rw-r--r--data/maps/MagmaHideout_3F_1R/header.inc2
-rw-r--r--data/maps/MagmaHideout_3F_2R/header.inc2
-rw-r--r--data/maps/MagmaHideout_3F_3R/header.inc2
-rw-r--r--data/maps/MagmaHideout_4F/header.inc2
-rw-r--r--data/maps/MarineCave_End/header.inc2
-rw-r--r--data/maps/MarineCave_Entrance/header.inc2
-rw-r--r--data/maps/MauvilleCity/header.inc2
-rw-r--r--data/maps/MauvilleCity_BikeShop/header.inc2
-rw-r--r--data/maps/MauvilleCity_GameCorner/header.inc2
-rw-r--r--data/maps/MauvilleCity_Gym/header.inc2
-rw-r--r--data/maps/MauvilleCity_House1/header.inc2
-rw-r--r--data/maps/MauvilleCity_House2/header.inc2
-rw-r--r--data/maps/MauvilleCity_Mart/header.inc2
-rw-r--r--data/maps/MauvilleCity_PokemonCenter_1F/events.inc2
-rw-r--r--data/maps/MauvilleCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/MauvilleCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/MeteorFalls_1F_1R/header.inc2
-rw-r--r--data/maps/MeteorFalls_1F_2R/header.inc2
-rw-r--r--data/maps/MeteorFalls_B1F_1R/header.inc2
-rw-r--r--data/maps/MeteorFalls_B1F_2R/header.inc2
-rw-r--r--data/maps/MeteorFalls_StevensCave/header.inc2
-rw-r--r--data/maps/MirageTower_1F/header.inc2
-rw-r--r--data/maps/MirageTower_2F/header.inc2
-rw-r--r--data/maps/MirageTower_3F/header.inc2
-rw-r--r--data/maps/MirageTower_4F/header.inc2
-rw-r--r--data/maps/MossdeepCity/header.inc2
-rw-r--r--data/maps/MossdeepCity_GameCorner_1F/header.inc2
-rw-r--r--data/maps/MossdeepCity_GameCorner_B1F/events.inc2
-rw-r--r--data/maps/MossdeepCity_GameCorner_B1F/header.inc2
-rw-r--r--data/maps/MossdeepCity_Gym/header.inc2
-rw-r--r--data/maps/MossdeepCity_House1/header.inc2
-rw-r--r--data/maps/MossdeepCity_House2/header.inc2
-rw-r--r--data/maps/MossdeepCity_House3/header.inc2
-rw-r--r--data/maps/MossdeepCity_House4/header.inc2
-rw-r--r--data/maps/MossdeepCity_Mart/header.inc2
-rw-r--r--data/maps/MossdeepCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/MossdeepCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_1F/header.inc2
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_2F/header.inc2
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc4
-rw-r--r--data/maps/MossdeepCity_StevensHouse/header.inc2
-rw-r--r--data/maps/MtChimney/header.inc2
-rw-r--r--data/maps/MtChimney_CableCarStation/header.inc2
-rw-r--r--data/maps/MtPyre_1F/header.inc2
-rw-r--r--data/maps/MtPyre_2F/header.inc2
-rw-r--r--data/maps/MtPyre_3F/header.inc2
-rw-r--r--data/maps/MtPyre_4F/header.inc2
-rw-r--r--data/maps/MtPyre_5F/header.inc2
-rw-r--r--data/maps/MtPyre_6F/header.inc2
-rw-r--r--data/maps/MtPyre_Exterior/header.inc2
-rw-r--r--data/maps/MtPyre_Summit/header.inc2
-rw-r--r--data/maps/NavelRock_B1F/header.inc2
-rw-r--r--data/maps/NavelRock_Bottom/header.inc2
-rw-r--r--data/maps/NavelRock_Down01/header.inc2
-rw-r--r--data/maps/NavelRock_Down02/header.inc2
-rw-r--r--data/maps/NavelRock_Down03/header.inc2
-rw-r--r--data/maps/NavelRock_Down04/header.inc2
-rw-r--r--data/maps/NavelRock_Down05/header.inc2
-rw-r--r--data/maps/NavelRock_Down06/header.inc2
-rw-r--r--data/maps/NavelRock_Down07/header.inc2
-rw-r--r--data/maps/NavelRock_Down08/header.inc2
-rw-r--r--data/maps/NavelRock_Down09/header.inc2
-rw-r--r--data/maps/NavelRock_Down10/header.inc2
-rw-r--r--data/maps/NavelRock_Down11/header.inc2
-rw-r--r--data/maps/NavelRock_Entrance/header.inc2
-rw-r--r--data/maps/NavelRock_Exterior/header.inc2
-rw-r--r--data/maps/NavelRock_Fork/header.inc2
-rw-r--r--data/maps/NavelRock_Harbor/header.inc2
-rw-r--r--data/maps/NavelRock_Top/header.inc2
-rw-r--r--data/maps/NavelRock_Up1/header.inc2
-rw-r--r--data/maps/NavelRock_Up2/header.inc2
-rw-r--r--data/maps/NavelRock_Up3/header.inc2
-rw-r--r--data/maps/NavelRock_Up4/header.inc2
-rw-r--r--data/maps/NewMauville_Entrance/header.inc2
-rw-r--r--data/maps/NewMauville_Inside/header.inc2
-rw-r--r--data/maps/OldaleTown/events.inc2
-rw-r--r--data/maps/OldaleTown/header.inc2
-rw-r--r--data/maps/OldaleTown/scripts.inc4
-rw-r--r--data/maps/OldaleTown_House1/header.inc2
-rw-r--r--data/maps/OldaleTown_House2/header.inc2
-rw-r--r--data/maps/OldaleTown_Mart/header.inc2
-rw-r--r--data/maps/OldaleTown_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/OldaleTown_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/PacifidlogTown/header.inc2
-rw-r--r--data/maps/PacifidlogTown_House1/header.inc2
-rw-r--r--data/maps/PacifidlogTown_House2/header.inc2
-rw-r--r--data/maps/PacifidlogTown_House3/header.inc2
-rw-r--r--data/maps/PacifidlogTown_House3/scripts.inc8
-rw-r--r--data/maps/PacifidlogTown_House4/header.inc2
-rw-r--r--data/maps/PacifidlogTown_House5/header.inc2
-rw-r--r--data/maps/PacifidlogTown_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/PacifidlogTown_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/PetalburgCity/header.inc2
-rw-r--r--data/maps/PetalburgCity_Gym/header.inc2
-rw-r--r--data/maps/PetalburgCity_House1/header.inc2
-rw-r--r--data/maps/PetalburgCity_House2/header.inc2
-rw-r--r--data/maps/PetalburgCity_Mart/header.inc2
-rw-r--r--data/maps/PetalburgCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/PetalburgCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/PetalburgCity_WallysHouse/header.inc2
-rw-r--r--data/maps/PetalburgWoods/header.inc2
-rw-r--r--data/maps/RecordCorner/header.inc2
-rw-r--r--data/maps/Route101/header.inc2
-rw-r--r--data/maps/Route101/scripts.inc4
-rw-r--r--data/maps/Route102/header.inc2
-rw-r--r--data/maps/Route103/events.inc2
-rw-r--r--data/maps/Route103/header.inc2
-rw-r--r--data/maps/Route103/scripts.inc4
-rw-r--r--data/maps/Route104/events.inc2
-rw-r--r--data/maps/Route104/header.inc2
-rw-r--r--data/maps/Route104/scripts.inc8
-rw-r--r--data/maps/Route104_MrBrineysHouse/header.inc2
-rw-r--r--data/maps/Route104_PrettyPetalFlowerShop/header.inc2
-rw-r--r--data/maps/Route104_Prototype/header.inc2
-rw-r--r--data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc2
-rw-r--r--data/maps/Route105/header.inc2
-rw-r--r--data/maps/Route106/header.inc2
-rw-r--r--data/maps/Route107/header.inc2
-rw-r--r--data/maps/Route108/header.inc2
-rw-r--r--data/maps/Route109/header.inc2
-rw-r--r--data/maps/Route109_SeashoreHouse/header.inc2
-rw-r--r--data/maps/Route110/events.inc4
-rw-r--r--data/maps/Route110/header.inc2
-rw-r--r--data/maps/Route110/scripts.inc8
-rw-r--r--data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc2
-rw-r--r--data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc2
-rw-r--r--data/maps/Route110_TrickHouseCorridor/header.inc2
-rw-r--r--data/maps/Route110_TrickHouseEnd/header.inc2
-rw-r--r--data/maps/Route110_TrickHouseEntrance/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle1/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle2/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle3/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle4/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle5/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle6/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle7/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle8/header.inc2
-rw-r--r--data/maps/Route111/events.inc2
-rw-r--r--data/maps/Route111/header.inc2
-rw-r--r--data/maps/Route111/scripts.inc4
-rw-r--r--data/maps/Route111_OldLadysRestStop/header.inc2
-rw-r--r--data/maps/Route111_WinstrateFamilysHouse/header.inc2
-rw-r--r--data/maps/Route112/header.inc2
-rw-r--r--data/maps/Route112_CableCarStation/header.inc2
-rw-r--r--data/maps/Route113/header.inc2
-rw-r--r--data/maps/Route113_GlassWorkshop/header.inc2
-rw-r--r--data/maps/Route114/header.inc2
-rw-r--r--data/maps/Route114_FossilManiacsHouse/header.inc2
-rw-r--r--data/maps/Route114_FossilManiacsTunnel/header.inc2
-rw-r--r--data/maps/Route114_LanettesHouse/header.inc2
-rw-r--r--data/maps/Route115/header.inc2
-rw-r--r--data/maps/Route116/header.inc2
-rw-r--r--data/maps/Route116_TunnelersRestHouse/header.inc2
-rw-r--r--data/maps/Route117/header.inc2
-rw-r--r--data/maps/Route117_PokemonDayCare/header.inc2
-rw-r--r--data/maps/Route118/header.inc2
-rw-r--r--data/maps/Route119/events.inc4
-rw-r--r--data/maps/Route119/header.inc2
-rw-r--r--data/maps/Route119/scripts.inc8
-rw-r--r--data/maps/Route119_House/header.inc2
-rw-r--r--data/maps/Route119_WeatherInstitute_1F/header.inc2
-rw-r--r--data/maps/Route119_WeatherInstitute_2F/header.inc2
-rw-r--r--data/maps/Route120/header.inc2
-rw-r--r--data/maps/Route121/header.inc2
-rw-r--r--data/maps/Route121_SafariZoneEntrance/header.inc2
-rw-r--r--data/maps/Route122/header.inc2
-rw-r--r--data/maps/Route123/header.inc2
-rw-r--r--data/maps/Route123_BerryMastersHouse/header.inc2
-rw-r--r--data/maps/Route124/header.inc2
-rw-r--r--data/maps/Route124_DivingTreasureHuntersHouse/header.inc2
-rw-r--r--data/maps/Route125/header.inc2
-rw-r--r--data/maps/Route126/header.inc2
-rw-r--r--data/maps/Route127/header.inc2
-rw-r--r--data/maps/Route128/header.inc2
-rw-r--r--data/maps/Route129/header.inc2
-rw-r--r--data/maps/Route130/header.inc2
-rw-r--r--data/maps/Route131/header.inc2
-rw-r--r--data/maps/Route132/header.inc2
-rw-r--r--data/maps/Route133/header.inc2
-rw-r--r--data/maps/Route134/header.inc2
-rw-r--r--data/maps/RustboroCity/events.inc2
-rw-r--r--data/maps/RustboroCity/header.inc2
-rw-r--r--data/maps/RustboroCity/scripts.inc8
-rw-r--r--data/maps/RustboroCity_CuttersHouse/header.inc2
-rw-r--r--data/maps/RustboroCity_DevonCorp_1F/header.inc2
-rw-r--r--data/maps/RustboroCity_DevonCorp_2F/header.inc2
-rw-r--r--data/maps/RustboroCity_DevonCorp_3F/header.inc2
-rw-r--r--data/maps/RustboroCity_Flat1_1F/header.inc2
-rw-r--r--data/maps/RustboroCity_Flat1_2F/header.inc2
-rw-r--r--data/maps/RustboroCity_Flat2_1F/header.inc2
-rw-r--r--data/maps/RustboroCity_Flat2_2F/header.inc2
-rw-r--r--data/maps/RustboroCity_Flat2_3F/header.inc2
-rw-r--r--data/maps/RustboroCity_Gym/header.inc2
-rw-r--r--data/maps/RustboroCity_House1/header.inc2
-rw-r--r--data/maps/RustboroCity_House1/scripts.inc8
-rw-r--r--data/maps/RustboroCity_House2/header.inc2
-rw-r--r--data/maps/RustboroCity_House3/header.inc2
-rw-r--r--data/maps/RustboroCity_Mart/header.inc2
-rw-r--r--data/maps/RustboroCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/RustboroCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/RustboroCity_PokemonSchool/header.inc2
-rw-r--r--data/maps/RusturfTunnel/header.inc2
-rw-r--r--data/maps/SSTidalCorridor/header.inc2
-rw-r--r--data/maps/SSTidalLowerDeck/header.inc2
-rw-r--r--data/maps/SSTidalRooms/header.inc2
-rw-r--r--data/maps/SafariZone_North/header.inc2
-rw-r--r--data/maps/SafariZone_Northeast/header.inc2
-rw-r--r--data/maps/SafariZone_Northwest/header.inc2
-rw-r--r--data/maps/SafariZone_RestHouse/header.inc2
-rw-r--r--data/maps/SafariZone_South/header.inc2
-rw-r--r--data/maps/SafariZone_Southeast/header.inc2
-rw-r--r--data/maps/SafariZone_Southwest/header.inc2
-rw-r--r--data/maps/ScorchedSlab/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Entrance/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room1/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room2/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room3/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room4/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room5/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room6/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room7/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room8/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room9/header.inc2
-rw-r--r--data/maps/SealedChamber_InnerRoom/header.inc2
-rw-r--r--data/maps/SealedChamber_OuterRoom/header.inc2
-rw-r--r--data/maps/SecretBase_BlueCave1/events.inc30
-rw-r--r--data/maps/SecretBase_BlueCave1/header.inc2
-rw-r--r--data/maps/SecretBase_BlueCave2/events.inc30
-rw-r--r--data/maps/SecretBase_BlueCave2/header.inc2
-rw-r--r--data/maps/SecretBase_BlueCave3/events.inc30
-rw-r--r--data/maps/SecretBase_BlueCave3/header.inc2
-rw-r--r--data/maps/SecretBase_BlueCave4/events.inc30
-rw-r--r--data/maps/SecretBase_BlueCave4/header.inc2
-rw-r--r--data/maps/SecretBase_BrownCave1/events.inc30
-rw-r--r--data/maps/SecretBase_BrownCave1/header.inc2
-rw-r--r--data/maps/SecretBase_BrownCave2/events.inc30
-rw-r--r--data/maps/SecretBase_BrownCave2/header.inc2
-rw-r--r--data/maps/SecretBase_BrownCave3/events.inc30
-rw-r--r--data/maps/SecretBase_BrownCave3/header.inc2
-rw-r--r--data/maps/SecretBase_BrownCave4/events.inc30
-rw-r--r--data/maps/SecretBase_BrownCave4/header.inc2
-rw-r--r--data/maps/SecretBase_RedCave1/events.inc30
-rw-r--r--data/maps/SecretBase_RedCave1/header.inc2
-rw-r--r--data/maps/SecretBase_RedCave2/events.inc30
-rw-r--r--data/maps/SecretBase_RedCave2/header.inc2
-rw-r--r--data/maps/SecretBase_RedCave3/events.inc30
-rw-r--r--data/maps/SecretBase_RedCave3/header.inc2
-rw-r--r--data/maps/SecretBase_RedCave4/events.inc30
-rw-r--r--data/maps/SecretBase_RedCave4/header.inc2
-rw-r--r--data/maps/SecretBase_Shrub1/events.inc30
-rw-r--r--data/maps/SecretBase_Shrub1/header.inc2
-rw-r--r--data/maps/SecretBase_Shrub2/events.inc30
-rw-r--r--data/maps/SecretBase_Shrub2/header.inc2
-rw-r--r--data/maps/SecretBase_Shrub3/events.inc30
-rw-r--r--data/maps/SecretBase_Shrub3/header.inc2
-rw-r--r--data/maps/SecretBase_Shrub4/events.inc30
-rw-r--r--data/maps/SecretBase_Shrub4/header.inc2
-rw-r--r--data/maps/SecretBase_Tree1/events.inc30
-rw-r--r--data/maps/SecretBase_Tree1/header.inc2
-rw-r--r--data/maps/SecretBase_Tree2/events.inc30
-rw-r--r--data/maps/SecretBase_Tree2/header.inc2
-rw-r--r--data/maps/SecretBase_Tree3/events.inc30
-rw-r--r--data/maps/SecretBase_Tree3/header.inc2
-rw-r--r--data/maps/SecretBase_Tree4/events.inc30
-rw-r--r--data/maps/SecretBase_Tree4/header.inc2
-rw-r--r--data/maps/SecretBase_YellowCave1/events.inc30
-rw-r--r--data/maps/SecretBase_YellowCave1/header.inc2
-rw-r--r--data/maps/SecretBase_YellowCave2/events.inc30
-rw-r--r--data/maps/SecretBase_YellowCave2/header.inc2
-rw-r--r--data/maps/SecretBase_YellowCave3/events.inc30
-rw-r--r--data/maps/SecretBase_YellowCave3/header.inc2
-rw-r--r--data/maps/SecretBase_YellowCave4/events.inc30
-rw-r--r--data/maps/SecretBase_YellowCave4/header.inc2
-rw-r--r--data/maps/ShoalCave_HighTideEntranceRoom/header.inc2
-rw-r--r--data/maps/ShoalCave_HighTideInnerRoom/header.inc2
-rw-r--r--data/maps/ShoalCave_LowTideEntranceRoom/header.inc2
-rw-r--r--data/maps/ShoalCave_LowTideIceRoom/header.inc2
-rw-r--r--data/maps/ShoalCave_LowTideInnerRoom/header.inc2
-rw-r--r--data/maps/ShoalCave_LowTideLowerRoom/header.inc2
-rw-r--r--data/maps/ShoalCave_LowTideStairsRoom/header.inc2
-rw-r--r--data/maps/SingleBattleColosseum/header.inc2
-rw-r--r--data/maps/SkyPillar_1F/header.inc2
-rw-r--r--data/maps/SkyPillar_2F/header.inc2
-rw-r--r--data/maps/SkyPillar_3F/header.inc2
-rw-r--r--data/maps/SkyPillar_4F/header.inc2
-rw-r--r--data/maps/SkyPillar_5F/header.inc2
-rw-r--r--data/maps/SkyPillar_Entrance/header.inc2
-rw-r--r--data/maps/SkyPillar_Outside/header.inc2
-rw-r--r--data/maps/SkyPillar_Top/header.inc2
-rw-r--r--data/maps/SlateportCity/header.inc2
-rw-r--r--data/maps/SlateportCity_BattleTentBattleRoom/events.inc4
-rw-r--r--data/maps/SlateportCity_BattleTentBattleRoom/header.inc2
-rw-r--r--data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc4
-rw-r--r--data/maps/SlateportCity_BattleTentCorridor/header.inc2
-rw-r--r--data/maps/SlateportCity_BattleTentLobby/header.inc2
-rw-r--r--data/maps/SlateportCity_Harbor/header.inc2
-rw-r--r--data/maps/SlateportCity_House1/header.inc2
-rw-r--r--data/maps/SlateportCity_House2/header.inc2
-rw-r--r--data/maps/SlateportCity_Mart/header.inc2
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_1F/header.inc2
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_2F/header.inc2
-rw-r--r--data/maps/SlateportCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/SlateportCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/SlateportCity_PokemonFanClub/header.inc2
-rw-r--r--data/maps/SlateportCity_SternsShipyard_1F/header.inc2
-rw-r--r--data/maps/SlateportCity_SternsShipyard_2F/header.inc2
-rw-r--r--data/maps/SootopolisCity/header.inc2
-rw-r--r--data/maps/SootopolisCity_Gym_1F/header.inc2
-rw-r--r--data/maps/SootopolisCity_Gym_B1F/header.inc2
-rw-r--r--data/maps/SootopolisCity_House1/header.inc2
-rw-r--r--data/maps/SootopolisCity_House2/header.inc2
-rw-r--r--data/maps/SootopolisCity_House3/header.inc2
-rw-r--r--data/maps/SootopolisCity_House4/header.inc2
-rw-r--r--data/maps/SootopolisCity_House5/header.inc2
-rw-r--r--data/maps/SootopolisCity_House6/header.inc2
-rw-r--r--data/maps/SootopolisCity_House7/header.inc2
-rw-r--r--data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc2
-rw-r--r--data/maps/SootopolisCity_Mart/header.inc2
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc2
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc2
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc2
-rw-r--r--data/maps/SootopolisCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/SootopolisCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/SouthernIsland_Exterior/header.inc2
-rw-r--r--data/maps/SouthernIsland_Interior/events.inc4
-rw-r--r--data/maps/SouthernIsland_Interior/header.inc2
-rw-r--r--data/maps/SouthernIsland_Interior/scripts.inc4
-rw-r--r--data/maps/TerraCave_End/header.inc2
-rw-r--r--data/maps/TerraCave_Entrance/header.inc2
-rw-r--r--data/maps/TradeCenter/header.inc2
-rw-r--r--data/maps/TrainerHill_1F/header.inc2
-rw-r--r--data/maps/TrainerHill_2F/header.inc2
-rw-r--r--data/maps/TrainerHill_3F/header.inc2
-rw-r--r--data/maps/TrainerHill_4F/header.inc2
-rw-r--r--data/maps/TrainerHill_Elevator/header.inc2
-rw-r--r--data/maps/TrainerHill_Entrance/header.inc2
-rw-r--r--data/maps/TrainerHill_Roof/header.inc2
-rw-r--r--data/maps/Underwater1/header.inc2
-rw-r--r--data/maps/Underwater2/header.inc2
-rw-r--r--data/maps/Underwater3/header.inc2
-rw-r--r--data/maps/Underwater4/header.inc2
-rw-r--r--data/maps/Underwater5/header.inc2
-rw-r--r--data/maps/Underwater6/header.inc2
-rw-r--r--data/maps/Underwater7/header.inc2
-rw-r--r--data/maps/Underwater_MarineCave/header.inc2
-rw-r--r--data/maps/Underwater_Route134/header.inc2
-rw-r--r--data/maps/Underwater_SeafloorCavern/header.inc2
-rw-r--r--data/maps/Underwater_SealedChamber/header.inc2
-rw-r--r--data/maps/Underwater_SootopolisCity/header.inc2
-rw-r--r--data/maps/UnionRoom/events.inc16
-rw-r--r--data/maps/UnionRoom/header.inc2
-rw-r--r--data/maps/UnknownMap_25_29/header.inc2
-rw-r--r--data/maps/UnknownMap_25_30/header.inc2
-rw-r--r--data/maps/UnknownMap_25_31/header.inc2
-rw-r--r--data/maps/UnknownMap_25_32/header.inc2
-rw-r--r--data/maps/UnknownMap_25_33/header.inc2
-rw-r--r--data/maps/UnknownMap_25_34/header.inc2
-rw-r--r--data/maps/UnknownMap_25_34/scripts.inc4
-rw-r--r--data/maps/VerdanturfTown/header.inc2
-rw-r--r--data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc4
-rw-r--r--data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc2
-rw-r--r--data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc4
-rw-r--r--data/maps/VerdanturfTown_BattleTentCorridor/header.inc2
-rw-r--r--data/maps/VerdanturfTown_BattleTentLobby/header.inc2
-rw-r--r--data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc2
-rw-r--r--data/maps/VerdanturfTown_House/header.inc2
-rw-r--r--data/maps/VerdanturfTown_Mart/header.inc2
-rw-r--r--data/maps/VerdanturfTown_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/VerdanturfTown_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/VerdanturfTown_WandasHouse/header.inc2
-rw-r--r--data/maps/VictoryRoad_1F/header.inc2
-rw-r--r--data/maps/VictoryRoad_B1F/header.inc2
-rw-r--r--data/maps/VictoryRoad_B2F/header.inc2
-rw-r--r--data/scripts/players_house.inc8
-rw-r--r--data/scripts/safari_zone.inc2
-rw-r--r--data/specials.inc14
-rw-r--r--data/trade.s646
616 files changed, 1227 insertions, 1871 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 185d18df1..e7a7e89b6 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -1252,12 +1252,12 @@ Move_REVERSAL:
createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE
delay 10
playsewithpan SE_W179, SOUND_PAN_ATTACKER
- createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 0
- createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 42
- createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 84
- createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 126
- createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 168
- createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 210
+ createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0
+ createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42
+ createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84
+ createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 126
+ createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 168
+ createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210
waitforvisualfinish
delay 20
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
@@ -1751,7 +1751,7 @@ Frustration_Strong:
createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28
waitforvisualfinish
delay 5
- createvisualtask sub_815C3A8, 5
+ createvisualtask AnimTask_StrongFrustrationGrowAndShrink, 5
delay 7
playsewithpan SE_W004, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, 1, 1
@@ -1785,7 +1785,7 @@ Frustration_Medium:
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
goto Frustration_Continue
Frustration_Weak:
- createsprite gUnknown_085CE4D0, ANIM_ATTACKER, 2, 20, -28
+ createsprite gWeakFrustrationAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 20, -28
waitforvisualfinish
delay 10
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2
@@ -1815,26 +1815,26 @@ Move_SAFEGUARD:
Move_PAIN_SPLIT:
loadspritegfx ANIM_TAG_PAIN_SPLIT
- createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -8, -42, 0
- createsprite gUnknown_085CE590, ANIM_TARGET, 2, -8, -42, 1
+ createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, ANIM_ATTACKER
+ createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, ANIM_TARGET
delay 10
playsewithpan SE_W207B, 0
- createvisualtask sub_815CA20, 2, 0, 0
- createvisualtask sub_815CA20, 2, 1, 0
+ createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 0
+ createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 0
waitforvisualfinish
- createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -24, -42, 0
- createsprite gUnknown_085CE590, ANIM_TARGET, 2, -24, -42, 1
+ createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -24, -42, ANIM_ATTACKER
+ createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -24, -42, ANIM_TARGET
delay 10
playsewithpan SE_W207B, 0
- createvisualtask sub_815CA20, 2, 0, 1
- createvisualtask sub_815CA20, 2, 1, 1
+ createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 1
+ createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 1
waitforvisualfinish
- createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, 8, -42, 0
- createsprite gUnknown_085CE590, ANIM_TARGET, 2, 8, -42, 1
+ createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, 8, -42, ANIM_ATTACKER
+ createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, 8, -42, ANIM_TARGET
delay 10
playsewithpan SE_W207B, 0
- createvisualtask sub_815CA20, 2, 0, 2
- createvisualtask sub_815CA20, 2, 1, 2
+ createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 2
+ createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 2
end
Move_VICE_GRIP:
@@ -2888,7 +2888,7 @@ Move_KINESIS:
Move_GLARE:
loadspritegfx ANIM_TAG_SMALL_RED_EYE
loadspritegfx ANIM_TAG_EYE_SPARKLE
- createvisualtask sub_815E114, 5, 0
+ createvisualtask AnimTask_GlareEyeDots, 5, 0
playsewithpan SE_W060B, SOUND_PAN_ATTACKER
waitforvisualfinish
createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK
@@ -2905,7 +2905,7 @@ Move_GLARE:
Move_BARRAGE:
loadspritegfx ANIM_TAG_RED_BALL
- createvisualtask sub_815E47C, 3
+ createvisualtask AnimTask_BarrageBall, 3
playsewithpan SE_W207, SOUND_PAN_ATTACKER
delay 24
createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 8, 1, 40, 1
@@ -2996,7 +2996,7 @@ Move_SPLASH:
Move_ACID_ARMOR:
monbg ANIM_ATTACKER
setalpha 15, 0
- createvisualtask sub_815D240, 2, 0
+ createvisualtask AnimTask_AcidArmor, 2, ANIM_ATTACKER
playsewithpan SE_W151, SOUND_PAN_ATTACKER
waitforvisualfinish
blendoff
@@ -3096,7 +3096,7 @@ Move_FLAIL:
loadspritegfx ANIM_TAG_IMPACT
monbg ANIM_TARGET
setalpha 12, 8
- createvisualtask sub_815C770, 2, 0
+ createvisualtask AnimTask_FlailMovement, 2, ANIM_ATTACKER
loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2
waitforvisualfinish
createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 3
@@ -3158,7 +3158,7 @@ Move_FORESIGHT:
monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET
setalpha 16, 0
- createsprite gUnknown_085CE8C4, ANIM_TARGET, 2, 1
+ createsprite gForesightMagnifyingGlassSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET
delay 17
loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4
delay 48
@@ -3219,7 +3219,7 @@ EndureEffect:
Move_CHARM:
loadspritegfx ANIM_TAG_MAGENTA_HEART
- createvisualtask sub_815C478, 5, 0, 2, 0
+ createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
@@ -3529,23 +3529,23 @@ Move_MEMENTO:
Move_FACADE:
loadspritegfx ANIM_TAG_SWEAT_DROP
- createvisualtask sub_815DCA4, 2, 0, 3
- createvisualtask sub_815DF0C, 2, 0, 72
+ createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 3
+ createvisualtask AnimTask_FacadeColorBlend, 2, ANIM_ATTACKER, 72
loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3
end
Move_SMELLING_SALT:
loadspritegfx ANIM_TAG_TAG_HAND
loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT
- createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 0, 2
- createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 1, 2
+ createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 2
+ createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 2
delay 32
- createvisualtask sub_815E840, 3, 1, 2
+ createvisualtask AnimTask_SmellingSaltsSquish, 3, ANIM_TARGET, 2
loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2
waitforvisualfinish
delay 4
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2
- createsprite gUnknown_085CE894, ANIM_TARGET, 2, 1, 8, 3
+ createsprite gSmellingSaltExclamationSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 8, 3
loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3
end
@@ -3616,9 +3616,9 @@ Move_TAUNT:
Move_HELPING_HAND:
loadspritegfx ANIM_TAG_TAG_HAND
- createvisualtask sub_815EC48, 5
- createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 0
- createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 1
+ createvisualtask AnimTask_HelpingHandAttackerMovement, 5
+ createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0
+ createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1
delay 19
playsewithpan SE_W227, 0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1
@@ -3633,18 +3633,18 @@ Move_HELPING_HAND:
Move_ASSIST:
loadspritegfx ANIM_TAG_PAW_PRINT
- createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36
+ createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36
delay 2
- createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36
+ createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36
playsewithpan SE_W010, 0
delay 2
- createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36
+ createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36
playsewithpan SE_W010, 0
delay 2
- createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36
+ createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36
playsewithpan SE_W010, 0
delay 2
- createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36
+ createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36
playsewithpan SE_W010, 0
end
@@ -3687,7 +3687,7 @@ Move_RECYCLE:
monbg ANIM_ATTACKER
setalpha 0, 16
delay 1
- createsprite gUnknown_085CE9B0, ANIM_ATTACKER, 2
+ createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2
loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3
waitforvisualfinish
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1
@@ -3764,24 +3764,24 @@ BrickBreakShatteredWall:
Move_YAWN:
loadspritegfx ANIM_TAG_PINK_CLOUD
- createvisualtask sub_815D64C, 2, 0
+ createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER
playsewithpan SE_W281, SOUND_PAN_ATTACKER
waitforvisualfinish
- createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 2
+ createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 2
playsewithpan SE_W255, SOUND_PAN_ATTACKER
delay 4
- createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 1
+ createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 1
delay 4
- createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 0
+ createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 0
waitforvisualfinish
- createvisualtask sub_815D64C, 2, 1
+ createvisualtask AnimTask_DeepInhale, 2, ANIM_TARGET
playsewithpan SE_W281, SOUND_PAN_TARGET
end
Move_ENDEAVOR:
loadspritegfx ANIM_TAG_SWEAT_DROP
loadspritegfx ANIM_TAG_IMPACT
- createvisualtask sub_815DCA4, 2, 0, 2
+ createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 2
loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2
delay 6
@@ -3989,7 +3989,7 @@ Move_FEATHER_DANCE:
Move_TEETER_DANCE:
loadspritegfx ANIM_TAG_MUSIC_NOTES
loadspritegfx ANIM_TAG_DUCK
- createvisualtask sub_8160164, 5
+ createvisualtask AnimTask_TeeterDanceMovement, 5
createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, 16, -2
playsewithpan SE_W298, SOUND_PAN_ATTACKER
delay 24
@@ -4098,7 +4098,7 @@ Move_NEEDLE_ARM:
Move_SLACK_OFF:
loadspritegfx ANIM_TAG_BLUE_STAR
- createvisualtask sub_8160544, 2, 0
+ createvisualtask AnimTask_SlackOffSquish, 2, ANIM_ATTACKER
playsewithpan SE_W281, SOUND_PAN_ATTACKER
waitforvisualfinish
call HealingEffect
@@ -4171,7 +4171,7 @@ Move_FAKE_TEARS:
loadspritegfx ANIM_TAG_MUSIC_NOTES
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31)
waitforvisualfinish
- createvisualtask sub_815C478, 5, 0, 2, 1
+ createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 1
loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4
delay 8
createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 0
@@ -4211,7 +4211,7 @@ Move_AIR_CUTTER:
Move_ODOR_SLEUTH:
monbg ANIM_TARGET
- createvisualtask sub_815F620, 5
+ createvisualtask AnimTask_OdorSleuthMovement, 5
delay 24
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4
playsewithpan SE_W207, SOUND_PAN_ATTACKER
@@ -4275,7 +4275,7 @@ Move_TICKLE:
delay 20
createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER
delay 12
- createvisualtask sub_815C478, 3, 1, 6, 2
+ createvisualtask AnimTask_RockMonBackAndForth, 3, ANIM_TARGET, 6, 2
loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8
waitforvisualfinish
end
@@ -4365,13 +4365,13 @@ Move_IRON_DEFENSE:
Move_BLOCK:
loadspritegfx ANIM_TAG_X_SIGN
- createsprite gUnknown_085CE90C, ANIM_TARGET, 66
+ createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66
playsewithpan SE_W207, SOUND_PAN_TARGET
end
Move_HOWL:
loadspritegfx ANIM_TAG_NOISE_LINE
- createvisualtask sub_815D64C, 2, 0
+ createvisualtask AnimTask_DeepInhale, 2, 0
delay 12
call RoarEffect
createvisualtask sub_8158D8C, 2, 0, 3
@@ -4392,7 +4392,7 @@ Move_BULK_UP:
Move_COVET:
loadspritegfx ANIM_TAG_MAGENTA_HEART
loadspritegfx ANIM_TAG_ITEM_BAG
- createvisualtask sub_815C478, 5, 0, 2, 0
+ createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
@@ -4973,13 +4973,13 @@ Move_ROAR:
end
RoarEffect:
- createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0
- createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2
- createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1
+ createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 0
+ createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 2
+ createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1
delay 15
- createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0
- createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2
- createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1
+ createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 0
+ createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 2
+ createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1
return
Move_GROWL:
@@ -8312,38 +8312,38 @@ MorningSun1:
Move_SWEET_SCENT:
loadspritegfx ANIM_TAG_PINK_PETAL
playsewithpan SE_W230, SOUND_PAN_ATTACKER
- createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 100
+ createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100
delay 25
setpan 0
call SweetScentEffect
- createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 55, 0
+ createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 55, 0
setpan SOUND_PAN_TARGET
createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21)
call SweetScentEffect
waitforvisualfinish
end
SweetScentEffect:
- createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 70, 1, 64
+ createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 70, 1, 64
delay 2
- createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 60, 0, 64
+ createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 60, 0, 64
delay 5
- createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 80, 1, 64
+ createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 80, 1, 64
delay 2
- createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 58, 0, 120
+ createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 58, 0, 120
delay 2
- createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120
+ createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 120
delay 2
- createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 90, 0, 64
+ createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 90, 0, 64
delay 2
- createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 48, 0, 64
+ createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 48, 0, 64
delay 2
- createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 95, 1, 80
+ createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 95, 1, 80
delay 2
- createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120
+ createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 120
delay 2
- createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 75, 1, 64
+ createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 75, 1, 64
delay 2
- createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 85, 0, 120
+ createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 85, 0, 120
delay 2
return
@@ -8404,32 +8404,32 @@ Move_FLATTER:
createvisualtask sub_815ABEC, 2
createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0
waitforvisualfinish
- createsprite gUnknown_085CE5C0, ANIM_TARGET, 2, 0, -8, 80
+ createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80
delay 0
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET
delay 10
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET
delay 0
createvisualtask sub_8159210, 5, 229, SOUND_PAN_ATTACKER
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
- call Flatter1
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
delay 5
createvisualtask sub_8159210, 5, 229, SOUND_PAN_TARGET
waitforvisualfinish
@@ -8437,9 +8437,9 @@ Move_FLATTER:
waitforvisualfinish
createvisualtask sub_815AC8C, 2
end
-Flatter1:
- createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 0
- createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 1
+CreateFlatterConfetti:
+ createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, ANIM_ATTACKER
+ createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, ANIM_TARGET
return
Move_ROLE_PLAY:
@@ -8449,7 +8449,7 @@ Move_ROLE_PLAY:
waitforvisualfinish
playsewithpan SE_W161, SOUND_PAN_ATTACKER
waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30
- createvisualtask sub_815CED8, 2
+ createvisualtask AnimTask_RolePlaySilhouette, 2
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE
@@ -8718,12 +8718,12 @@ Move_METEOR_MASH:
fadetobg BG_COSMIC
waitbgfadein
waitforvisualfinish
- createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -48, SOUND_PAN_ATTACKER, 72, 32, 30
+ createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -48, -64, 72, 32, 30
delay 10
- createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -112, SOUND_PAN_ATTACKER, 8, 32, 30
+ createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -112, -64, 8, 32, 30
delay 40
createsprite gUnknown_08595F14, ANIM_TARGET, 3, 0, 0, 0, 30
- createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -80, SOUND_PAN_ATTACKER, 40, 32, 30
+ createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -80, -64, 40, 32, 30
delay 20
playsewithpan SE_W233B, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
@@ -9551,7 +9551,7 @@ Move_KNOCK_OFF:
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
delay 4
playsewithpan SE_W233, SOUND_PAN_TARGET
- createsprite gUnknown_085CE984, ANIM_TARGET, 2, -16, -16
+ createsprite gKnockOffStrikeSpriteTemplate, ANIM_TARGET, 2, -16, -16
delay 8
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2
@@ -10450,31 +10450,31 @@ General_SmokeballEscape:
setalpha 12, 4
delay 0
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
- createsprite gUnknown_085CE734, ANIM_TARGET, 0, 0, 32, 28, 30
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_TARGET, 0, 0, 32, 28, 30
delay 4
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
- createsprite gUnknown_085CE734, ANIM_ATTACKER, 127, 2, 12, 20, 30
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 127, 2, 12, 20, 30
delay 12
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
- createsprite gUnknown_085CE734, ANIM_ATTACKER, 126, 2, -28, 4, 30
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 126, 2, -28, 4, 30
delay 12
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
- createsprite gUnknown_085CE734, ANIM_ATTACKER, 124, 2, 14, -20, 30
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 124, 2, 14, -20, 30
delay 4
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createvisualtask sub_81136E8, 2, 2
- createsprite gUnknown_085CE734, ANIM_ATTACKER, 123, 3, 4, 4, 30
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 123, 3, 4, 4, 30
delay 14
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
- createsprite gUnknown_085CE734, ANIM_ATTACKER, 122, 3, -14, 18, 46
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 46
delay 0
- createsprite gUnknown_085CE734, ANIM_ATTACKER, 121, 3, 14, -14, 46
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, -14, 46
delay 0
- createsprite gUnknown_085CE734, ANIM_ATTACKER, 120, 3, -12, -10, 46
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 120, 3, -12, -10, 46
delay 0
- createsprite gUnknown_085CE734, ANIM_ATTACKER, 119, 3, 14, 14, 46
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 119, 3, 14, 14, 46
delay 0
- createsprite gUnknown_085CE734, ANIM_ATTACKER, 118, 3, 0, 0, 46
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 118, 3, 0, 0, 46
waitforvisualfinish
clearmonbg ANIM_ATTACKER
invisible ANIM_ATTACKER
@@ -10556,11 +10556,11 @@ SnatchMoveContinue:
end
SnatchOpposingMonMove:
playsewithpan SE_W104, SOUND_PAN_ATTACKER
- createvisualtask sub_815F8F4, 2
+ createvisualtask AnimTask_SnatchOpposingMonMove, 2
goto SnatchMoveContinue
SnatchPartnerMonMove:
playsewithpan SE_W104, SOUND_PAN_ATTACKER
- createvisualtask sub_815FFC4, 2
+ createvisualtask AnimTask_SnatchPartnerMove, 2
goto SnatchMoveContinue
General_FutureSightHit:
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 068b79c63..3e97cee6b 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,3 +1,4 @@
+#include "constants/global.h"
#include "constants/battle_frontier.h"
#include "constants/battle_setup.h"
#include "constants/event_objects.h"
@@ -1792,9 +1793,9 @@ Route110_EventScript_271ED7:: @ 8271ED7
Route119_EventScript_271ED7:: @ 8271ED7
RustboroCity_EventScript_271ED7:: @ 8271ED7
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq RustboroCity_EventScript_271EEF
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq RustboroCity_EventScript_271EF5
end
@@ -1810,9 +1811,9 @@ LavaridgeTown_EventScript_271EFB:: @ 8271EFB
Route110_EventScript_271EFB:: @ 8271EFB
Route119_EventScript_271EFB:: @ 8271EFB
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq LavaridgeTown_EventScript_271F13
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq LavaridgeTown_EventScript_271F19
end
@@ -1826,9 +1827,9 @@ LavaridgeTown_EventScript_271F19:: @ 8271F19
EventScript_271F1F:: @ 8271F1F
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq EventScript_271F37
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq EventScript_271F3D
end
@@ -4768,7 +4769,7 @@ gUnknown_082A8350:: @ 82A8350
waitmovement 0
playse SE_RU_HYUU
delay 60
- special sp13F_fall_to_last_warp
+ special DoFallWarp
waitstate
end
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 81de41aaa..93fe33f8a 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -341,5 +341,5 @@ gFieldEffectScript_Unknown65:: @ 82DBCF9
field_eff_end
gFieldEffectScript_Unknown66:: @ 82DBCFF
- field_eff_callnative sub_80B9E28
+ field_eff_callnative Fldeff_MoveDeoxysRock
field_eff_end
diff --git a/data/layouts/Route111_NoMirageTower/layout.inc b/data/layouts/Route111_NoMirageTower/layout.inc
index acd390ada..bf6a188cc 100644
--- a/data/layouts/Route111_NoMirageTower/layout.inc
+++ b/data/layouts/Route111_NoMirageTower/layout.inc
@@ -12,3 +12,4 @@ Route111_NoMirageTower_Layout::
.4byte Route111_NoMirageTower_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Mauville
+
diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc
index 21573c079..3102e0614 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/header.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_CaptainsOffice: @ 84845A4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc
index 0ffb5d1f7..b9f5e809c 100644
--- a/data/maps/AbandonedShip_Corridors_1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Corridors_1F: @ 84844C4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc
index 5e4eb1dd6..98f23c223 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Corridors_B1F: @ 84844FC
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/AbandonedShip_Deck/header.inc
index a9f8945d9..394c93ec9 100644
--- a/data/maps/AbandonedShip_Deck/header.inc
+++ b/data/maps/AbandonedShip_Deck/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Deck: @ 84844A8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
index 6645c9d96..dcf42db40 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
index 5cc5bf0ad..f279a52ab 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 7
+ 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_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc
index 4e6212d01..3ac0c5f38 100644
--- a/data/maps/AbandonedShip_Room_B1F/header.inc
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Room_B1F: @ 848456C
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc
index 8e004365e..71f856bc0 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Rooms2_1F: @ 8484588
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
index 2f64a6315..943e57b77 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Rooms2_B1F: @ 8484534
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc
index 9ee2f40bc..b37456c28 100644
--- a/data/maps/AbandonedShip_Rooms_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Rooms_1F: @ 84844E0
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc
index d6f656e3b..f5ec64f2b 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Rooms_B1F: @ 8484518
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc
index 82fbdc0e9..e5119887a 100644
--- a/data/maps/AbandonedShip_Underwater1/header.inc
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Underwater1: @ 8484550
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc
index c26d65df0..de7e871d0 100644
--- a/data/maps/AbandonedShip_Underwater2/header.inc
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Underwater2: @ 84845C0
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc
index 4796b37ff..fe88dbca0 100644
--- a/data/maps/AlteringCave/header.inc
+++ b/data/maps/AlteringCave/header.inc
@@ -10,6 +10,6 @@ AlteringCave: @ 8484A58
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/AncientTomb/header.inc
index a314ad3ba..5bfe54614 100644
--- a/data/maps/AncientTomb/header.inc
+++ b/data/maps/AncientTomb/header.inc
@@ -10,6 +10,6 @@ AncientTomb: @ 8484630
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc
index c632eb204..dd4e12043 100644
--- a/data/maps/AquaHideout_1F/header.inc
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -10,6 +10,6 @@ AquaHideout_1F: @ 8484144
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 8
+ 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/header.inc b/data/maps/AquaHideout_B1F/header.inc
index ba017fb56..bc65150d6 100644
--- a/data/maps/AquaHideout_B1F/header.inc
+++ b/data/maps/AquaHideout_B1F/header.inc
@@ -10,6 +10,6 @@ AquaHideout_B1F: @ 8484160
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 8
+ 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/header.inc b/data/maps/AquaHideout_B2F/header.inc
index ea15240b9..d4bf34328 100644
--- a/data/maps/AquaHideout_B2F/header.inc
+++ b/data/maps/AquaHideout_B2F/header.inc
@@ -10,6 +10,6 @@ AquaHideout_B2F: @ 848417C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 8
+ 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_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
index 455941160..90e59a51e 100644
--- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap1: @ 84846D8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
index b4e2e712e..776465f16 100644
--- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap2: @ 84846F4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
index 7abe192b6..ab97ae84d 100644
--- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap3: @ 8484710
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc
index a69128ee7..c53a2851b 100644
--- a/data/maps/ArtisanCave_1F/header.inc
+++ b/data/maps/ArtisanCave_1F/header.inc
@@ -10,6 +10,6 @@ ArtisanCave_1F: @ 84849B0
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/ArtisanCave_B1F/header.inc
index aba179fc6..f76fe6938 100644
--- a/data/maps/ArtisanCave_B1F/header.inc
+++ b/data/maps/ArtisanCave_B1F/header.inc
@@ -10,6 +10,6 @@ ArtisanCave_B1F: @ 8484994
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/BattleFrontier_BattleArenaBattleRoom/events.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
index 1a8216287..4731db975 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
@@ -5,8 +5,8 @@ BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC
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_HIPSTER, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
- object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 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:: @ 853C9C4
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
index 8332c4236..12962e7de 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
index c6f06631c..cec596b2d 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
@@ -17,9 +17,9 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC
return
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
index 2ed587f6e..d4935ea9e 100644
--- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaCorridor: @ 8485468
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
index 5c02e0c8a..3523eaf63 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaLobby: @ 848544C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
index 63ceb7484..910160645 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
@@ -11,9 +11,9 @@ BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
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_TRADER, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 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_HIPSTER, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 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
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 3f1eb25b2..7d2119ebe 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
index ab0736581..d92c6cbf4 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -20,9 +20,9 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA
return
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
index 940ba24e6..25883e9ed 100644
--- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeCorridor: @ 8485350
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
index 5d1a7eb82..451192a45 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeLobby: @ 8485334
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
index e35435b27..59b5b15e4 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
index 264c7d731..bdaf4c51b 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
@@ -1,12 +1,12 @@
BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
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_HIPSTER, 0, 7, 4, 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, 255, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 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
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 cef72bc09..960fef2eb 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
index 794dd9d1e..8c22a9bc9 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
@@ -8,9 +8,9 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
setvar VAR_0x8004, 5
special CallFrontierUtilFunc
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
setvar VAR_0x8004, 9
special CallFrontierUtilFunc
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
index d56a2a23d..92329c6ef 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
index 3dc5d23cc..4cae9ed0c 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
index 29818b1d6..8363f2bb5 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
@@ -1,6 +1,6 @@
BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
- object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
- object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+ 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
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
index d63d3b268..2715ade5c 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
index c09c9e61c..529bcd0c3 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
@@ -12,9 +12,9 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856
return
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
index ff8af8ca8..f2866b9b0 100644
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
index 060013cce..19d06e0be 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
index 574d0cbab..07d730579 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeCorridor: @ 8485510
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
index 239c31721..e591be668 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeLobby: @ 84854F4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
index 580873720..81dee29d1 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
@@ -1,6 +1,6 @@
BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
- object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
- object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
+ 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
coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
index dcb088c27..d49bb07d5 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
index 1ee69c077..506a31496 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
index 68ca30546..3f5607922 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
index 5e0afedb5..9743a7c36 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
index ccaa1cbca..831a39d2a 100644
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
index a92f009dd..ef5c8409f 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
index 6da314304..91d454fbe 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
index 28de39cad..d58e1fe81 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidTop: @ 8485430
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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_BattleTowerBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
index 0fd75debb..148e590af 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
- object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
+ 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
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
index 797022beb..5aa95a63e 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
index 90232cf5b..f83bee69d 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
@@ -1,10 +1,10 @@
BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
- object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
+ 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_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
- object_event 5, 255, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
- object_event 6, 254, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 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:: @ 853C054
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 90ae26c25..34a8fae84 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
index bd2d38b37..8d920a8c8 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor: @ 8485200
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
index 8f6a1e2f0..f96f14916 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
@@ -1,8 +1,8 @@
BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50
- object_event 1, 255, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+ 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, 254, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 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
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 94e46b196..66255315f 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
index fa1e08faf..f8d9ff853 100644
--- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerElevator: @ 84851E4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc
index d100dec0b..6a78eaee6 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc
@@ -4,7 +4,7 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638
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_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE
+ 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
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
index e16e2a700..989bffe9b 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerLobby: @ 84851C8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
index 9212f2fd2..9f3977075 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
@@ -1,13 +1,13 @@
BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64
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_HIPSTER, 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_TRADER, 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_STORYTELLER, 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_GIDDY, 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_PLACEHOLDER_1, 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_PLACEHOLDER_2, 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, 246, 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, 247, 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
+ 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:: @ 853BF3C
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 727322b94..23a792934 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc
index a4cf64a78..58caac903 100644
--- a/data/maps/BattleFrontier_Lounge1/header.inc
+++ b/data/maps/BattleFrontier_Lounge1/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge1: @ 84855B8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc
index c363d54bf..effcc53bd 100644
--- a/data/maps/BattleFrontier_Lounge2/header.inc
+++ b/data/maps/BattleFrontier_Lounge2/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge2: @ 84855F0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc
index e5649a369..d6867551e 100644
--- a/data/maps/BattleFrontier_Lounge3/header.inc
+++ b/data/maps/BattleFrontier_Lounge3/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge3: @ 848560C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc
index a9da9677c..912cc41ff 100644
--- a/data/maps/BattleFrontier_Lounge4/header.inc
+++ b/data/maps/BattleFrontier_Lounge4/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge4: @ 8485628
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc
index 7f1142f2d..a6febc0c8 100644
--- a/data/maps/BattleFrontier_Lounge5/header.inc
+++ b/data/maps/BattleFrontier_Lounge5/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge5: @ 8485660
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc
index e07dd297f..151890a14 100644
--- a/data/maps/BattleFrontier_Lounge6/header.inc
+++ b/data/maps/BattleFrontier_Lounge6/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge6: @ 848567C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc
index 045103171..2b14c43c5 100644
--- a/data/maps/BattleFrontier_Lounge6/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge6/scripts.inc
@@ -7,7 +7,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083
setvar VAR_0x8008, 3
copyvar VAR_0x8004, VAR_0x8008
- specialvar VAR_RESULT, sub_807E73C
+ specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO
compare VAR_RESULT, 0
@@ -18,14 +18,14 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
compare VAR_0x8004, 255
goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
copyvar VAR_0x8005, VAR_0x800A
- specialvar VAR_RESULT, sub_807E9D4
+ specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if_ne BattleFrontier_Lounge6_EventScript_265075
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
- special sub_807EA10
- special sub_807F0E4
+ special CreateInGameTradePokemon
+ special DoInGameTradeScene
waitstate
msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT
setflag FLAG_BATTLE_FRONTIER_TRADE_DONE
diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc
index 22797d04e..061d2102c 100644
--- a/data/maps/BattleFrontier_Lounge7/header.inc
+++ b/data/maps/BattleFrontier_Lounge7/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge7: @ 8485698
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc
index 5494c964f..e1b319e1d 100644
--- a/data/maps/BattleFrontier_Lounge8/header.inc
+++ b/data/maps/BattleFrontier_Lounge8/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge8: @ 84856D0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc
index 5248720c7..916feb569 100644
--- a/data/maps/BattleFrontier_Lounge9/header.inc
+++ b/data/maps/BattleFrontier_Lounge9/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge9: @ 84856EC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_Mart/header.inc
index 4b3e7f79a..7dcfb9d33 100644
--- a/data/maps/BattleFrontier_Mart/header.inc
+++ b/data/maps/BattleFrontier_Mart/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Mart: @ 8485740
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc
index a30a148c2..b67df4029 100644
--- a/data/maps/BattleFrontier_OutsideEast/header.inc
+++ b/data/maps/BattleFrontier_OutsideEast/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_OutsideEast: @ 84852C4
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc
index a42ac30ff..312c1961a 100644
--- a/data/maps/BattleFrontier_OutsideWest/header.inc
+++ b/data/maps/BattleFrontier_OutsideWest/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_OutsideWest: @ 84851AC
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
index a136e803d..dcf26742c 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_PokemonCenter_1F: @ 8485708
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
index 4cd607aef..6bcff1234 100644
--- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_PokemonCenter_2F: @ 8485724
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc
index 6fcb187ed..03d9e3622 100644
--- a/data/maps/BattleFrontier_RankingHall/header.inc
+++ b/data/maps/BattleFrontier_RankingHall/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_RankingHall: @ 848559C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc
index 88f806e83..099ab38e1 100644
--- a/data/maps/BattleFrontier_ReceptionGate/header.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_ReceptionGate: @ 84856B4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc
index 0fbbb55e3..fe55f8272 100644
--- a/data/maps/BattleFrontier_ScottsHouse/header.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_ScottsHouse: @ 8485644
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc
index bcbc06c90..d9105ed4a 100644
--- a/data/maps/BattlePyramidSquare01/header.inc
+++ b/data/maps/BattlePyramidSquare01/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare01: @ 8484F60
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare02/header.inc
index 24255ea1a..cebb14906 100644
--- a/data/maps/BattlePyramidSquare02/header.inc
+++ b/data/maps/BattlePyramidSquare02/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare02: @ 8484F7C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare03/header.inc
index 21e15dc82..389cd6538 100644
--- a/data/maps/BattlePyramidSquare03/header.inc
+++ b/data/maps/BattlePyramidSquare03/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare03: @ 8484F98
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare04/header.inc
index fae10152a..3b09fce2e 100644
--- a/data/maps/BattlePyramidSquare04/header.inc
+++ b/data/maps/BattlePyramidSquare04/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare04: @ 8484FB4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare05/header.inc
index 17e05fc19..ec6eff68c 100644
--- a/data/maps/BattlePyramidSquare05/header.inc
+++ b/data/maps/BattlePyramidSquare05/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare05: @ 8484FD0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare06/header.inc
index 9a1543a33..7890c3088 100644
--- a/data/maps/BattlePyramidSquare06/header.inc
+++ b/data/maps/BattlePyramidSquare06/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare06: @ 8484FEC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare07/header.inc
index 78d3cf7f4..7f1bb51f1 100644
--- a/data/maps/BattlePyramidSquare07/header.inc
+++ b/data/maps/BattlePyramidSquare07/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare07: @ 8485008
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare08/header.inc
index de960bab0..a5d641519 100644
--- a/data/maps/BattlePyramidSquare08/header.inc
+++ b/data/maps/BattlePyramidSquare08/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare08: @ 8485024
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare09/header.inc
index 96b2beb37..d396c65a6 100644
--- a/data/maps/BattlePyramidSquare09/header.inc
+++ b/data/maps/BattlePyramidSquare09/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare09: @ 8485040
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare10/header.inc
index 37901889f..254c24708 100644
--- a/data/maps/BattlePyramidSquare10/header.inc
+++ b/data/maps/BattlePyramidSquare10/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare10: @ 848505C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare11/header.inc
index c188ecb86..765b74a0a 100644
--- a/data/maps/BattlePyramidSquare11/header.inc
+++ b/data/maps/BattlePyramidSquare11/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare11: @ 8485078
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare12/header.inc
index 11e6c7b98..e81801a35 100644
--- a/data/maps/BattlePyramidSquare12/header.inc
+++ b/data/maps/BattlePyramidSquare12/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare12: @ 8485094
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare13/header.inc
index 2f5746143..356063c35 100644
--- a/data/maps/BattlePyramidSquare13/header.inc
+++ b/data/maps/BattlePyramidSquare13/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare13: @ 84850B0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare14/header.inc
index 5926a9d2a..76ae3925c 100644
--- a/data/maps/BattlePyramidSquare14/header.inc
+++ b/data/maps/BattlePyramidSquare14/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare14: @ 84850CC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare15/header.inc
index e65db912d..57e45e1b2 100644
--- a/data/maps/BattlePyramidSquare15/header.inc
+++ b/data/maps/BattlePyramidSquare15/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare15: @ 84850E8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/BattlePyramidSquare16/header.inc
index f8f97b671..24aa3edcc 100644
--- a/data/maps/BattlePyramidSquare16/header.inc
+++ b/data/maps/BattlePyramidSquare16/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare16: @ 8485104
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc
index dabad3a71..c6b02f600 100644
--- a/data/maps/BirthIsland_Exterior/header.inc
+++ b/data/maps/BirthIsland_Exterior/header.inc
@@ -10,6 +10,6 @@ BirthIsland_Exterior: @ 8485794
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 12
+ 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/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 0aa8056bc..5bff32eb6 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -11,8 +11,8 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25
BirthIsland_Exterior_MapScript1_267F29: @ 8267F29
setflag FLAG_MAP_SCRIPT_CHECKED_DEOXYS
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
- setvar VAR_0x4034, 0
- setvar VAR_0x4035, 0
+ setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0
+ setvar VAR_DEOXYS_ROCK_LEVEL, 0
call_if_set FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_267F4E
call_if_unset FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_267F55
end
@@ -25,7 +25,7 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
goto_if_set FLAG_DEFEATED_DEOXYS, BirthIsland_Exterior_EventScript_27374E
clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
- clearflag FLAG_0x8D4
+ clearflag FLAG_DEOXYS_ROCK_COMPLETE
return
BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
@@ -42,7 +42,7 @@ BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
BirthIsland_Exterior_EventScript_267F83:: @ 8267F83
lock
faceplayer
- special sub_813AFC8
+ special DoDeoxysRockInteraction
waitstate
switch VAR_RESULT
case 0, BirthIsland_Exterior_EventScript_267FBB
diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc
index f2493d738..82b752f90 100644
--- a/data/maps/BirthIsland_Harbor/header.inc
+++ b/data/maps/BirthIsland_Harbor/header.inc
@@ -10,6 +10,6 @@ BirthIsland_Harbor: @ 84857B0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc
index 384d08bd7..f051c230c 100644
--- a/data/maps/CaveOfOrigin_1F/header.inc
+++ b/data/maps/CaveOfOrigin_1F/header.inc
@@ -10,6 +10,6 @@ CaveOfOrigin_1F: @ 84842E8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc
index d8dab3bea..7b70ba43f 100644
--- a/data/maps/CaveOfOrigin_B1F/header.inc
+++ b/data/maps/CaveOfOrigin_B1F/header.inc
@@ -10,6 +10,6 @@ CaveOfOrigin_B1F: @ 8484358
.byte WEATHER_FOG_1
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 14
+ 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_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc
index d42f912da..af622019a 100644
--- a/data/maps/CaveOfOrigin_Entrance/header.inc
+++ b/data/maps/CaveOfOrigin_Entrance/header.inc
@@ -10,6 +10,6 @@ CaveOfOrigin_Entrance: @ 84842CC
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
index b8edb52bc..6b928bb3c 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
@@ -10,6 +10,6 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
index 8d0f83892..0088131dc 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
@@ -10,6 +10,6 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320
.byte WEATHER_FOG_1
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
index 00e07549e..75bd4189e 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
@@ -10,6 +10,6 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C
.byte WEATHER_FOG_1
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/DesertRuins/header.inc
index 16e2ce55a..c717661f4 100644
--- a/data/maps/DesertRuins/header.inc
+++ b/data/maps/DesertRuins/header.inc
@@ -10,6 +10,6 @@ DesertRuins: @ 8483F68
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/DesertUnderpass/header.inc
index c4f3a05c7..757d81e73 100644
--- a/data/maps/DesertUnderpass/header.inc
+++ b/data/maps/DesertUnderpass/header.inc
@@ -10,6 +10,6 @@ DesertUnderpass: @ 8484978
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc
index c905fd606..9314f753f 100644
--- a/data/maps/DewfordTown/header.inc
+++ b/data/maps/DewfordTown/header.inc
@@ -10,6 +10,6 @@ DewfordTown: @ 84825EC
.byte WEATHER_SUNNY
.byte MAP_TYPE_TOWN
.2byte 0
- .byte 13
+ 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_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc
index 4463cc40e..783a7eacc 100644
--- a/data/maps/DewfordTown_Gym/header.inc
+++ b/data/maps/DewfordTown_Gym/header.inc
@@ -10,6 +10,6 @@ DewfordTown_Gym: @ 8482C60
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc
index 1ba44b49d..600b02763 100644
--- a/data/maps/DewfordTown_Hall/header.inc
+++ b/data/maps/DewfordTown_Hall/header.inc
@@ -10,6 +10,6 @@ DewfordTown_Hall: @ 8482C7C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/DewfordTown_House1/header.inc
index 219c70fc3..cfaaaa698 100644
--- a/data/maps/DewfordTown_House1/header.inc
+++ b/data/maps/DewfordTown_House1/header.inc
@@ -10,6 +10,6 @@ DewfordTown_House1: @ 8482C0C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/DewfordTown_House2/header.inc
index 248b7a990..2f9a36cf8 100644
--- a/data/maps/DewfordTown_House2/header.inc
+++ b/data/maps/DewfordTown_House2/header.inc
@@ -10,6 +10,6 @@ DewfordTown_House2: @ 8482C98
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
index 6813134f9..ae98bd680 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ DewfordTown_PokemonCenter_1F: @ 8482C28
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
index 43485dcad..bb46a43d0 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ DewfordTown_PokemonCenter_2F: @ 8482C44
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc
index 6bfc00393..032ef58ab 100644
--- a/data/maps/DoubleBattleColosseum/header.inc
+++ b/data/maps/DoubleBattleColosseum/header.inc
@@ -10,6 +10,6 @@ DoubleBattleColosseum: @ 8484D84
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc
index 2bebe5d12..b1ee8e3a4 100644
--- a/data/maps/EverGrandeCity/header.inc
+++ b/data/maps/EverGrandeCity/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity: @ 8482598
.byte WEATHER_SUNNY
.byte MAP_TYPE_CITY
.2byte 0
- .byte 13
+ 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_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
index bd4cc71e3..9ce5831ba 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
@@ -1,6 +1,6 @@
EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700
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_HIPSTER, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_RIVAL
+ 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
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
index 03ab762db..bd2ab305f 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index 8da9ae712..149c54cd8 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -53,16 +53,16 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61
closemessage
playse SE_DOOR
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228ABC
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC1
addobject 2
call EverGrandeCity_ChampionsRoom_EventScript_228BFD
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB
end
@@ -128,9 +128,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BEB
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BF4
closemessage
applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F
diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc
index fedc35c76..da5c8fa47 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/header.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_DrakesRoom: @ 8483C20
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
index dd23d11ef..0773a613e 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_GlaciasRoom: @ 8483C04
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc
index b055ba8b1..d554ff768 100644
--- a/data/maps/EverGrandeCity_Hall1/header.inc
+++ b/data/maps/EverGrandeCity_Hall1/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_Hall1: @ 8483C58
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc
index a80a688e0..646478a25 100644
--- a/data/maps/EverGrandeCity_Hall2/header.inc
+++ b/data/maps/EverGrandeCity_Hall2/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_Hall2: @ 8483C74
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc
index 18a9d90dc..d7beaf36e 100644
--- a/data/maps/EverGrandeCity_Hall3/header.inc
+++ b/data/maps/EverGrandeCity_Hall3/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_Hall3: @ 8483C90
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc
index 1aeb8e6a2..8cf1eea6e 100644
--- a/data/maps/EverGrandeCity_Hall4/header.inc
+++ b/data/maps/EverGrandeCity_Hall4/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_Hall4: @ 8483CAC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc
index dd82e6b56..38279720e 100644
--- a/data/maps/EverGrandeCity_Hall5/header.inc
+++ b/data/maps/EverGrandeCity_Hall5/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_Hall5: @ 8483CC8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc
index c575b2f08..865f90b91 100644
--- a/data/maps/EverGrandeCity_HallOfFame/header.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_HallOfFame: @ 8483D00
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
index 9b9bdb5d6..ddb9ade89 100644
--- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
@@ -44,9 +44,9 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
setvar VAR_TEMP_1, 1
call EverGrandeCity_HallOfFame_EventScript_2717C1
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298E9
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298F5
end
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
index 64bcaec0d..eb0d77d7b 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
index 46af6f51e..292356472 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
index 163663bb9..ec9f3e542 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
index c6a86baa5..90a42edea 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
index 61370c18d..4d9ee7f46 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc
index ce3356a95..b19db5fbb 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/header.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc
@@ -10,6 +10,6 @@ EverGrandeCity_SidneysRoom: @ 8483BCC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc
index 0c2053b8b..f32f0c30b 100644
--- a/data/maps/FallarborTown/header.inc
+++ b/data/maps/FallarborTown/header.inc
@@ -10,6 +10,6 @@ FallarborTown: @ 8482624
.byte WEATHER_SUNNY
.byte MAP_TYPE_TOWN
.2byte 0
- .byte 13
+ 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_BattleTentBattleRoom/events.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc
index f3c8838e6..681f5b028 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc
@@ -1,7 +1,7 @@
FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444
- object_event 1, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+ 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_HIPSTER, 0, 5, 1, 3, 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
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 81dbad44a..3435512f2 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
@@ -10,6 +10,6 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
index a7bf0ae62..dff1d26e0 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
@@ -10,9 +10,9 @@ FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9
FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2
return
diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc
index 4e9484d11..4b45ea55d 100644
--- a/data/maps/FallarborTown_BattleTentCorridor/header.inc
+++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc
@@ -10,6 +10,6 @@ FallarborTown_BattleTentCorridor: @ 8482DB0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc
index 416d700d0..2465f36c8 100644
--- a/data/maps/FallarborTown_BattleTentLobby/header.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/header.inc
@@ -10,6 +10,6 @@ FallarborTown_BattleTentLobby: @ 8482D94
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/FallarborTown_House1/header.inc
index aa182e2ed..d5362b8c5 100644
--- a/data/maps/FallarborTown_House1/header.inc
+++ b/data/maps/FallarborTown_House1/header.inc
@@ -10,6 +10,6 @@ FallarborTown_House1: @ 8482E20
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/FallarborTown_House2/header.inc
index c8c22eacf..7cb16bbf3 100644
--- a/data/maps/FallarborTown_House2/header.inc
+++ b/data/maps/FallarborTown_House2/header.inc
@@ -10,6 +10,6 @@ FallarborTown_House2: @ 8482E3C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/FallarborTown_Mart/header.inc
index 3119638bf..65c5caaa6 100644
--- a/data/maps/FallarborTown_Mart/header.inc
+++ b/data/maps/FallarborTown_Mart/header.inc
@@ -10,6 +10,6 @@ FallarborTown_Mart: @ 8482D78
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
index 65df98a81..b30b4874f 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
index 5308b4e09..b818368bf 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ FallarborTown_PokemonCenter_2F: @ 8482E04
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc
index e06051d7e..af762d832 100644
--- a/data/maps/FarawayIsland_Entrance/header.inc
+++ b/data/maps/FarawayIsland_Entrance/header.inc
@@ -10,6 +10,6 @@ FarawayIsland_Entrance: @ 848575C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/FarawayIsland_Interior/header.inc
index b45ac71c3..c37bacece 100644
--- a/data/maps/FarawayIsland_Interior/header.inc
+++ b/data/maps/FarawayIsland_Interior/header.inc
@@ -10,6 +10,6 @@ FarawayIsland_Interior: @ 8485778
.byte WEATHER_SHADE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 13
+ 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/FieryPath/header.inc b/data/maps/FieryPath/header.inc
index 3c9f51bc1..20278028f 100644
--- a/data/maps/FieryPath/header.inc
+++ b/data/maps/FieryPath/header.inc
@@ -10,6 +10,6 @@ FieryPath: @ 8484048
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc
index 3f671fb6c..0bfccda3c 100644
--- a/data/maps/FortreeCity/header.inc
+++ b/data/maps/FortreeCity/header.inc
@@ -10,6 +10,6 @@ FortreeCity: @ 8482528
.byte WEATHER_SUNNY
.byte MAP_TYPE_CITY
.2byte 0
- .byte 13
+ 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_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc
index 651b37488..4a640a8ad 100644
--- a/data/maps/FortreeCity_DecorationShop/header.inc
+++ b/data/maps/FortreeCity_DecorationShop/header.inc
@@ -10,6 +10,6 @@ FortreeCity_DecorationShop: @ 848361C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc
index 54a45633d..68f02747f 100644
--- a/data/maps/FortreeCity_Gym/header.inc
+++ b/data/maps/FortreeCity_Gym/header.inc
@@ -10,6 +10,6 @@ FortreeCity_Gym: @ 848353C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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_House1/header.inc b/data/maps/FortreeCity_House1/header.inc
index 1c106b8f5..1b52dd725 100644
--- a/data/maps/FortreeCity_House1/header.inc
+++ b/data/maps/FortreeCity_House1/header.inc
@@ -10,6 +10,6 @@ FortreeCity_House1: @ 8483520
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc
index 43cfc73fe..87aa7a643 100644
--- a/data/maps/FortreeCity_House1/scripts.inc
+++ b/data/maps/FortreeCity_House1/scripts.inc
@@ -7,7 +7,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355
setvar VAR_0x8008, 1
copyvar VAR_0x8004, VAR_0x8008
- specialvar VAR_RESULT, sub_807E73C
+ specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO
compare VAR_RESULT, 0
@@ -18,14 +18,14 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
compare VAR_0x8004, 255
goto_if_eq FortreeCity_House1_EventScript_21633D
copyvar VAR_0x8005, VAR_0x800A
- specialvar VAR_RESULT, sub_807E9D4
+ specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if_ne FortreeCity_House1_EventScript_216347
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
- special sub_807EA10
- special sub_807F0E4
+ special CreateInGameTradePokemon
+ special DoInGameTradeScene
waitstate
bufferspeciesname 0, VAR_0x8009
msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT
diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc
index 1e20a0227..02b76c394 100644
--- a/data/maps/FortreeCity_House2/header.inc
+++ b/data/maps/FortreeCity_House2/header.inc
@@ -10,6 +10,6 @@ FortreeCity_House2: @ 84835AC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/FortreeCity_House3/header.inc
index f2d53219a..1b039c24e 100644
--- a/data/maps/FortreeCity_House3/header.inc
+++ b/data/maps/FortreeCity_House3/header.inc
@@ -10,6 +10,6 @@ FortreeCity_House3: @ 84835C8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/FortreeCity_House4/header.inc
index efc5f06be..e675e063b 100644
--- a/data/maps/FortreeCity_House4/header.inc
+++ b/data/maps/FortreeCity_House4/header.inc
@@ -10,6 +10,6 @@ FortreeCity_House4: @ 84835E4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/FortreeCity_House5/header.inc
index c4d07f46b..bac2fff5b 100644
--- a/data/maps/FortreeCity_House5/header.inc
+++ b/data/maps/FortreeCity_House5/header.inc
@@ -10,6 +10,6 @@ FortreeCity_House5: @ 8483600
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/FortreeCity_Mart/header.inc
index 5179187be..37af953ab 100644
--- a/data/maps/FortreeCity_Mart/header.inc
+++ b/data/maps/FortreeCity_Mart/header.inc
@@ -10,6 +10,6 @@ FortreeCity_Mart: @ 8483590
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
index 9f2b78dd4..f2fdf3769 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ FortreeCity_PokemonCenter_1F: @ 8483558
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
index ccfc5bd09..1ad4484d9 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ FortreeCity_PokemonCenter_2F: @ 8483574
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc
index 4a754207b..7578523b2 100644
--- a/data/maps/GraniteCave_1F/header.inc
+++ b/data/maps/GraniteCave_1F/header.inc
@@ -10,6 +10,6 @@ GraniteCave_1F: @ 8483F84
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/GraniteCave_B1F/header.inc
index beb7fdb83..64187397c 100644
--- a/data/maps/GraniteCave_B1F/header.inc
+++ b/data/maps/GraniteCave_B1F/header.inc
@@ -10,6 +10,6 @@ GraniteCave_B1F: @ 8483FA0
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/GraniteCave_B2F/header.inc
index 0eb017bc4..4fd519156 100644
--- a/data/maps/GraniteCave_B2F/header.inc
+++ b/data/maps/GraniteCave_B2F/header.inc
@@ -10,6 +10,6 @@ GraniteCave_B2F: @ 8483FBC
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc
index 78df1ff83..0bd8e41b2 100644
--- a/data/maps/GraniteCave_StevensRoom/header.inc
+++ b/data/maps/GraniteCave_StevensRoom/header.inc
@@ -10,6 +10,6 @@ GraniteCave_StevensRoom: @ 8483FD8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc
index 51f499ee4..52ea777a9 100644
--- a/data/maps/InsideOfTruck/header.inc
+++ b/data/maps/InsideOfTruck/header.inc
@@ -10,6 +10,6 @@ InsideOfTruck: @ 8484EF0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/InsideOfTruck/scripts.inc
index 53bdc073a..858975d7a 100644
--- a/data/maps/InsideOfTruck/scripts.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
@@ -17,9 +17,9 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04
lockall
setflag FLAG_SPECIAL_FLAG_0x4000
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq InsideOfTruck_EventScript_23BF20
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq InsideOfTruck_EventScript_23BF46
end
diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc
index a56a3e4d0..767df72f0 100644
--- a/data/maps/IslandCave/header.inc
+++ b/data/maps/IslandCave/header.inc
@@ -10,6 +10,6 @@ IslandCave: @ 8484614
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc
index 797760e91..f53bfbe65 100644
--- a/data/maps/JaggedPass/header.inc
+++ b/data/maps/JaggedPass/header.inc
@@ -10,6 +10,6 @@ JaggedPass: @ 848402C
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/events.inc b/data/maps/LavaridgeTown/events.inc
index 4822762ea..6d34ee5c8 100644
--- a/data/maps/LavaridgeTown/events.inc
+++ b/data/maps/LavaridgeTown/events.inc
@@ -5,8 +5,8 @@ LavaridgeTown_EventObjects: @ 8527A54
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_GIDDY, 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_HIPSTER, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
+ 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: @ 8527B2C
diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc
index 006896453..6ea1e048c 100644
--- a/data/maps/LavaridgeTown/header.inc
+++ b/data/maps/LavaridgeTown/header.inc
@@ -10,6 +10,6 @@ LavaridgeTown: @ 8482608
.byte WEATHER_SUNNY
.byte MAP_TYPE_TOWN
.2byte 0
- .byte 13
+ 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/scripts.inc b/data/maps/LavaridgeTown/scripts.inc
index 3ffbdb07a..82a3b8469 100644
--- a/data/maps/LavaridgeTown/scripts.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -53,18 +53,18 @@ LavaridgeTown_EventScript_1EA551:: @ 81EA551
call_if_ne LavaridgeTown_EventScript_1EA65C
delay 20
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LavaridgeTown_EventScript_1EA630
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LavaridgeTown_EventScript_1EA635
compare VAR_0x8008, 9
call_if_eq LavaridgeTown_EventScript_1EA6A1
compare VAR_0x8008, 9
call_if_ne LavaridgeTown_EventScript_1EA6AC
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq LavaridgeTown_EventScript_1EA5B5
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq LavaridgeTown_EventScript_1EA5DA
end
diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc
index 6ea20174c..86882ed34 100644
--- a/data/maps/LavaridgeTown_Gym_1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/header.inc
@@ -10,6 +10,6 @@ LavaridgeTown_Gym_1F: @ 8482CD0
.byte WEATHER_FOG_1
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc
index 579c1dd3e..b393e3693 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc
@@ -10,6 +10,6 @@ LavaridgeTown_Gym_B1F: @ 8482CEC
.byte WEATHER_FOG_1
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc
index 418632b28..596d13482 100644
--- a/data/maps/LavaridgeTown_HerbShop/header.inc
+++ b/data/maps/LavaridgeTown_HerbShop/header.inc
@@ -10,6 +10,6 @@ LavaridgeTown_HerbShop: @ 8482CB4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LavaridgeTown_House/header.inc
index 9a350db79..11bb01e13 100644
--- a/data/maps/LavaridgeTown_House/header.inc
+++ b/data/maps/LavaridgeTown_House/header.inc
@@ -10,6 +10,6 @@ LavaridgeTown_House: @ 8482D08
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LavaridgeTown_Mart/header.inc
index 30683052b..1c3ce0caf 100644
--- a/data/maps/LavaridgeTown_Mart/header.inc
+++ b/data/maps/LavaridgeTown_Mart/header.inc
@@ -10,6 +10,6 @@ LavaridgeTown_Mart: @ 8482D24
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
index e657a688a..0f18f64e9 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
index 3d40c93cf..d66d90b73 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/LilycoveCity/events.inc
index 2c7f71d5c..68a782212 100644
--- a/data/maps/LilycoveCity/events.inc
+++ b/data/maps/LilycoveCity/events.inc
@@ -15,7 +15,7 @@ LilycoveCity_EventObjects: @ 8526CE8
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_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, FLAG_HIDE_LILYCOVE_CITY_RIVAL
+ 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
diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc
index dafbfaccd..cf3ebf2f5 100644
--- a/data/maps/LilycoveCity/header.inc
+++ b/data/maps/LilycoveCity/header.inc
@@ -10,6 +10,6 @@ LilycoveCity: @ 8482544
.byte WEATHER_SUNNY
.byte MAP_TYPE_CITY
.2byte 0
- .byte 13
+ 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/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index 7817b9d58..22ef234d2 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -231,9 +231,9 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE
lock
faceplayer
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq LilycoveCity_EventScript_1E2DF8
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq LilycoveCity_EventScript_1E2E6B
end
diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc
index 2049fd74c..eb07c7d59 100644
--- a/data/maps/LilycoveCity_ContestHall/header.inc
+++ b/data/maps/LilycoveCity_ContestHall/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_ContestHall: @ 84836C4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc
index 6aba3e416..605d594d3 100644
--- a/data/maps/LilycoveCity_ContestLobby/header.inc
+++ b/data/maps/LilycoveCity_ContestLobby/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_ContestLobby: @ 84836A8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
index a2737b05b..0322b01e1 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
index 112a6e8d7..92ccdc1b3 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
index 0c8cc574d..eb728241b 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
index cd6ded7d6..73ba491c3 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
index bae2b837d..949b23403 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
index 88ca3ece3..01f94ac14 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_DepartmentStore_2F: @ 8483814
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
index 1753be637..bc62df7d6 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_DepartmentStore_3F: @ 8483830
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
index c9b0870fa..94a8d29c6 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_DepartmentStore_4F: @ 848384C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
index 62d836d56..6c8070d80 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_DepartmentStore_5F: @ 8483868
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_Harbor/header.inc
index 7f970b463..e818c894f 100644
--- a/data/maps/LilycoveCity_Harbor/header.inc
+++ b/data/maps/LilycoveCity_Harbor/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_Harbor: @ 8483750
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_House1/header.inc
index 4cc0a8061..ecae30372 100644
--- a/data/maps/LilycoveCity_House1/header.inc
+++ b/data/maps/LilycoveCity_House1/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_House1: @ 8483788
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_House2/header.inc
index 988b7fa4c..f3b009880 100644
--- a/data/maps/LilycoveCity_House2/header.inc
+++ b/data/maps/LilycoveCity_House2/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_House2: @ 84837A4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_House3/header.inc
index 41f01234c..9126bb8fc 100644
--- a/data/maps/LilycoveCity_House3/header.inc
+++ b/data/maps/LilycoveCity_House3/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_House3: @ 84837C0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_House4/header.inc
index 656e60bf3..6ddb9a5f7 100644
--- a/data/maps/LilycoveCity_House4/header.inc
+++ b/data/maps/LilycoveCity_House4/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_House4: @ 84837DC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
index 0d6faebe8..b0aef9efa 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
index 641859ac6..c58b69225 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
index 6a0ddfebc..cdd8668ad 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_MoveDeletersHouse: @ 848376C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
index 3ab130771..26b6955c0 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
@@ -2,8 +2,8 @@ LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC
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_HIPSTER, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0
- object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY
+ 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
warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
index c040d7715..bcca0354d 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
index e9c27fd81..26c0789d6 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
index 78102855c..aba9dcb3c 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc
index 0384e495f..f1cbaf550 100644
--- a/data/maps/LilycoveCity_UnusedMart/header.inc
+++ b/data/maps/LilycoveCity_UnusedMart/header.inc
@@ -10,6 +10,6 @@ LilycoveCity_UnusedMart: @ 8483718
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/LinkContestRoom1/events.inc
index 99eeef56f..5c1a3b9f4 100644
--- a/data/maps/LinkContestRoom1/events.inc
+++ b/data/maps/LinkContestRoom1/events.inc
@@ -1,18 +1,18 @@
LinkContestRoom1_EventObjects: @ 8539EFC
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_HIPSTER, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
- object_event 4, EVENT_OBJ_GFX_TRADER, 0, 6, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
- object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
- object_event 7, 246, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
- object_event 8, 247, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
- object_event 9, 248, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
- object_event 10, 249, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
- object_event 11, 250, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
- object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 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_GIDDY, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
+ 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
diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc
index 9aa0c9cc7..2465a8680 100644
--- a/data/maps/LinkContestRoom1/header.inc
+++ b/data/maps/LinkContestRoom1/header.inc
@@ -10,6 +10,6 @@ LinkContestRoom1: @ 8484DA0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LinkContestRoom2/header.inc
index 342ed7d0b..f9274e58b 100644
--- a/data/maps/LinkContestRoom2/header.inc
+++ b/data/maps/LinkContestRoom2/header.inc
@@ -10,6 +10,6 @@ LinkContestRoom2: @ 8484E64
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LinkContestRoom3/header.inc
index ff29d7e87..1b445db4b 100644
--- a/data/maps/LinkContestRoom3/header.inc
+++ b/data/maps/LinkContestRoom3/header.inc
@@ -10,6 +10,6 @@ LinkContestRoom3: @ 8484E80
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LinkContestRoom4/header.inc
index 025e5971e..20720be06 100644
--- a/data/maps/LinkContestRoom4/header.inc
+++ b/data/maps/LinkContestRoom4/header.inc
@@ -10,6 +10,6 @@ LinkContestRoom4: @ 8484E9C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LinkContestRoom5/header.inc
index 7c145d0e4..f2e9c6c55 100644
--- a/data/maps/LinkContestRoom5/header.inc
+++ b/data/maps/LinkContestRoom5/header.inc
@@ -10,6 +10,6 @@ LinkContestRoom5: @ 8484EB8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/LinkContestRoom6/header.inc
index 939d56426..225a99e46 100644
--- a/data/maps/LinkContestRoom6/header.inc
+++ b/data/maps/LinkContestRoom6/header.inc
@@ -10,6 +10,6 @@ LinkContestRoom6: @ 8484ED4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/LittlerootTown/events.inc
index 71bf9a643..fc151a220 100644
--- a/data/maps/LittlerootTown/events.inc
+++ b/data/maps/LittlerootTown/events.inc
@@ -5,7 +5,7 @@ LittlerootTown_EventObjects: @ 85276A8
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_HIPSTER, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
+ 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
diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc
index db13d6def..a94244f95 100644
--- a/data/maps/LittlerootTown/header.inc
+++ b/data/maps/LittlerootTown/header.inc
@@ -10,6 +10,6 @@ LittlerootTown: @ 84825B4
.byte WEATHER_SUNNY
.byte MAP_TYPE_TOWN
.2byte 0
- .byte 13
+ 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/scripts.inc b/data/maps/LittlerootTown/scripts.inc
index 538fe9939..b7067f451 100644
--- a/data/maps/LittlerootTown/scripts.inc
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -68,9 +68,9 @@ LittlerootTown_EventScript_1E7E92:: @ 81E7E92
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
setobjectmovementtype 4, 8
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E7EB1
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E7EB9
return
@@ -381,9 +381,9 @@ LittlerootTown_EventScript_1E815A:: @ 81E815A
LittlerootTown_EventScript_1E8163:: @ 81E8163
lockall
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E817D
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E8186
releaseall
end
@@ -399,9 +399,9 @@ LittlerootTown_EventScript_1E8186:: @ 81E8186
LittlerootTown_EventScript_1E818F:: @ 81E818F
lockall
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E81A9
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E81B2
releaseall
end
@@ -454,27 +454,27 @@ LittlerootTown_EventScript_1E8205:: @ 81E8205
LittlerootTown_EventScript_1E8211:: @ 81E8211
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E8297
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E82A2
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E8281
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E828C
msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT
closemessage
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E82AD
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E82F0
call LittlerootTown_EventScript_1E8693
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E8405
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E8448
goto LittlerootTown_EventScript_1E8686
end
@@ -889,9 +889,9 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D
lock
faceplayer
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E8281
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E828C
call LittlerootTown_EventScript_1E8693
applymovement 4, LittlerootTown_Movement_2725A6
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
index 6224e7a50..edae81a87 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
@@ -10,6 +10,6 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
index 07ce48998..46a4fcfc2 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
@@ -1,17 +1,17 @@
LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0
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_HIPSTER, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+ 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
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
index ec7eb66ce..4c9e566d0 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
@@ -10,6 +10,6 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
index 524164c44..8bd4b43b9 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
@@ -247,9 +247,9 @@ LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609
EventScript_PlayerPCMale:: @ 81F860D
lockall
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C
end
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
index 7681d9a83..768c7d1b4 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
@@ -10,6 +10,6 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
index 8c93a570a..8f4c74737 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
@@ -1,17 +1,17 @@
LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480
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_HIPSTER, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+ 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
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
index 9e5d0c807..8729bedeb 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
@@ -10,6 +10,6 @@ LittlerootTown_MaysHouse_2F: @ 8482B48
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
index 5d9db05c2..ffc4a6519 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -251,9 +251,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1
lockall
goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F94F7
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED
end
@@ -271,9 +271,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7
applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E
waitmovement 0
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F951D
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F952F
setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
releaseall
@@ -300,9 +300,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A
EventScript_PlayerPCFemale:: @ 81F9553
lockall
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576
end
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
index 4eb310f74..7ab449ecd 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
@@ -1,7 +1,7 @@
LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C
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_HIPSTER, 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 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
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
index 3e55729a8..49ab94727 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
@@ -10,6 +10,6 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index c88ddd6c7..0f6f59cae 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -171,9 +171,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A4
waitmovement 0
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C
playse SE_PC_ON
waitse
@@ -533,9 +533,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
waitmovement 0
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA352
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F
setvar VAR_0x4084, 5
setflag FLAG_ADVENTURE_STARTED
@@ -605,9 +605,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC
compare VAR_0x40D3, 2
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA490
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA428
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA431
release
end
@@ -622,9 +622,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431
LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA453
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C
release
end
@@ -639,9 +639,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C
LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA487
release
end
@@ -656,9 +656,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487
LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2
release
end
diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc
index 851f56278..897f4f4fd 100644
--- a/data/maps/MagmaHideout_1F/header.inc
+++ b/data/maps/MagmaHideout_1F/header.inc
@@ -10,6 +10,6 @@ MagmaHideout_1F: @ 8484828
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc
index d8118281f..cafe144d8 100644
--- a/data/maps/MagmaHideout_2F_1R/header.inc
+++ b/data/maps/MagmaHideout_2F_1R/header.inc
@@ -10,6 +10,6 @@ MagmaHideout_2F_1R: @ 8484844
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc
index 1de48fb62..1493ae076 100644
--- a/data/maps/MagmaHideout_2F_2R/header.inc
+++ b/data/maps/MagmaHideout_2F_2R/header.inc
@@ -10,6 +10,6 @@ MagmaHideout_2F_2R: @ 8484860
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc
index b37419278..5e1ccdcda 100644
--- a/data/maps/MagmaHideout_2F_3R/header.inc
+++ b/data/maps/MagmaHideout_2F_3R/header.inc
@@ -10,6 +10,6 @@ MagmaHideout_2F_3R: @ 84848EC
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc
index d5347ed25..492fb8a7e 100644
--- a/data/maps/MagmaHideout_3F_1R/header.inc
+++ b/data/maps/MagmaHideout_3F_1R/header.inc
@@ -10,6 +10,6 @@ MagmaHideout_3F_1R: @ 848487C
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc
index 45cda066b..e1cd32f9c 100644
--- a/data/maps/MagmaHideout_3F_2R/header.inc
+++ b/data/maps/MagmaHideout_3F_2R/header.inc
@@ -10,6 +10,6 @@ MagmaHideout_3F_2R: @ 8484898
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc
index 347ec1897..b21df5e70 100644
--- a/data/maps/MagmaHideout_3F_3R/header.inc
+++ b/data/maps/MagmaHideout_3F_3R/header.inc
@@ -10,6 +10,6 @@ MagmaHideout_3F_3R: @ 84848D0
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MagmaHideout_4F/header.inc
index f11c5eadd..e10a780f7 100644
--- a/data/maps/MagmaHideout_4F/header.inc
+++ b/data/maps/MagmaHideout_4F/header.inc
@@ -10,6 +10,6 @@ MagmaHideout_4F: @ 84848B4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc
index 36bff96d6..5a3c1106b 100644
--- a/data/maps/MarineCave_End/header.inc
+++ b/data/maps/MarineCave_End/header.inc
@@ -10,6 +10,6 @@ MarineCave_End: @ 8484A04
.byte WEATHER_FOG_1
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 14
+ 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/header.inc b/data/maps/MarineCave_Entrance/header.inc
index 9feb17fe2..338da988a 100644
--- a/data/maps/MarineCave_Entrance/header.inc
+++ b/data/maps/MarineCave_Entrance/header.inc
@@ -10,6 +10,6 @@ MarineCave_Entrance: @ 84849E8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 14
+ 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/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc
index f6aadf1ff..aa107e460 100644
--- a/data/maps/MauvilleCity/header.inc
+++ b/data/maps/MauvilleCity/header.inc
@@ -10,6 +10,6 @@ MauvilleCity: @ 84824F0
.byte WEATHER_SUNNY
.byte MAP_TYPE_CITY
.2byte 0
- .byte 13
+ 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_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc
index baa4f18d5..d4434e8ba 100644
--- a/data/maps/MauvilleCity_BikeShop/header.inc
+++ b/data/maps/MauvilleCity_BikeShop/header.inc
@@ -10,6 +10,6 @@ MauvilleCity_BikeShop: @ 8483280
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc
index 45fd23da0..5c7399ae6 100644
--- a/data/maps/MauvilleCity_GameCorner/header.inc
+++ b/data/maps/MauvilleCity_GameCorner/header.inc
@@ -10,6 +10,6 @@ MauvilleCity_GameCorner: @ 84832B8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc
index 736b491db..cd38ec176 100644
--- a/data/maps/MauvilleCity_Gym/header.inc
+++ b/data/maps/MauvilleCity_Gym/header.inc
@@ -10,6 +10,6 @@ MauvilleCity_Gym: @ 8483264
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc
index 6a29041cc..261e0e45b 100644
--- a/data/maps/MauvilleCity_House1/header.inc
+++ b/data/maps/MauvilleCity_House1/header.inc
@@ -10,6 +10,6 @@ MauvilleCity_House1: @ 848329C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/MauvilleCity_House2/header.inc
index 3fc04798e..3a584fe41 100644
--- a/data/maps/MauvilleCity_House2/header.inc
+++ b/data/maps/MauvilleCity_House2/header.inc
@@ -10,6 +10,6 @@ MauvilleCity_House2: @ 84832D4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/MauvilleCity_Mart/header.inc
index 3722f4565..b3d85a0c6 100644
--- a/data/maps/MauvilleCity_Mart/header.inc
+++ b/data/maps/MauvilleCity_Mart/header.inc
@@ -10,6 +10,6 @@ MauvilleCity_Mart: @ 8483328
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
index f83ab5e45..daf747e0d 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
@@ -1,6 +1,6 @@
MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8
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_HIPSTER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 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
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
index 659176f80..207dfb526 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
index 462fdc47d..00bf23b83 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ MauvilleCity_PokemonCenter_2F: @ 848330C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc
index abf0e85c5..85ba8dd6b 100644
--- a/data/maps/MeteorFalls_1F_1R/header.inc
+++ b/data/maps/MeteorFalls_1F_1R/header.inc
@@ -10,6 +10,6 @@ MeteorFalls_1F_1R: @ 8483EC0
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc
index a0d074121..79b56a254 100644
--- a/data/maps/MeteorFalls_1F_2R/header.inc
+++ b/data/maps/MeteorFalls_1F_2R/header.inc
@@ -10,6 +10,6 @@ MeteorFalls_1F_2R: @ 8483EDC
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc
index 078998891..0d1edf89e 100644
--- a/data/maps/MeteorFalls_B1F_1R/header.inc
+++ b/data/maps/MeteorFalls_B1F_1R/header.inc
@@ -10,6 +10,6 @@ MeteorFalls_B1F_1R: @ 8483EF8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc
index dabf884b4..ed9fe8beb 100644
--- a/data/maps/MeteorFalls_B1F_2R/header.inc
+++ b/data/maps/MeteorFalls_B1F_2R/header.inc
@@ -10,6 +10,6 @@ MeteorFalls_B1F_2R: @ 8483F14
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc
index 7236159f3..28b265d44 100644
--- a/data/maps/MeteorFalls_StevensCave/header.inc
+++ b/data/maps/MeteorFalls_StevensCave/header.inc
@@ -10,6 +10,6 @@ MeteorFalls_StevensCave: @ 8484A74
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MirageTower_1F/header.inc
index 584ed3f7f..59ce7edbf 100644
--- a/data/maps/MirageTower_1F/header.inc
+++ b/data/maps/MirageTower_1F/header.inc
@@ -10,6 +10,6 @@ MirageTower_1F: @ 8484908
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MirageTower_2F/header.inc
index 03f762758..efb970538 100644
--- a/data/maps/MirageTower_2F/header.inc
+++ b/data/maps/MirageTower_2F/header.inc
@@ -10,6 +10,6 @@ MirageTower_2F: @ 8484924
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MirageTower_3F/header.inc
index 3930ca2ba..7362c553e 100644
--- a/data/maps/MirageTower_3F/header.inc
+++ b/data/maps/MirageTower_3F/header.inc
@@ -10,6 +10,6 @@ MirageTower_3F: @ 8484940
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/MirageTower_4F/header.inc
index 505e671eb..842b12bb6 100644
--- a/data/maps/MirageTower_4F/header.inc
+++ b/data/maps/MirageTower_4F/header.inc
@@ -10,6 +10,6 @@ MirageTower_4F: @ 848495C
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc
index f5196d035..641faf0f7 100644
--- a/data/maps/MossdeepCity/header.inc
+++ b/data/maps/MossdeepCity/header.inc
@@ -10,6 +10,6 @@ MossdeepCity: @ 8482560
.byte WEATHER_SUNNY
.byte MAP_TYPE_CITY
.2byte 0
- .byte 13
+ 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_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc
index 302f13d7e..d32f3a306 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc
@@ -10,6 +10,6 @@ MossdeepCity_GameCorner_1F: @ 84839F0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc
index 58ca66fd2..0737cd7e0 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/events.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc
@@ -1,5 +1,5 @@
MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0
- object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
+ 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
warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
index 86e796c52..856f76166 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
@@ -10,6 +10,6 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc
index 1b325fc9a..12421b787 100644
--- a/data/maps/MossdeepCity_Gym/header.inc
+++ b/data/maps/MossdeepCity_Gym/header.inc
@@ -10,6 +10,6 @@ MossdeepCity_Gym: @ 84838BC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc
index 25b8f5558..365120f52 100644
--- a/data/maps/MossdeepCity_House1/header.inc
+++ b/data/maps/MossdeepCity_House1/header.inc
@@ -10,6 +10,6 @@ MossdeepCity_House1: @ 84838D8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/MossdeepCity_House2/header.inc
index 718ed1f1a..76673969a 100644
--- a/data/maps/MossdeepCity_House2/header.inc
+++ b/data/maps/MossdeepCity_House2/header.inc
@@ -10,6 +10,6 @@ MossdeepCity_House2: @ 84838F4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/MossdeepCity_House3/header.inc
index 53aeb0a29..0d5be2fed 100644
--- a/data/maps/MossdeepCity_House3/header.inc
+++ b/data/maps/MossdeepCity_House3/header.inc
@@ -10,6 +10,6 @@ MossdeepCity_House3: @ 8483964
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/MossdeepCity_House4/header.inc
index 41cbc6a7a..ba9059757 100644
--- a/data/maps/MossdeepCity_House4/header.inc
+++ b/data/maps/MossdeepCity_House4/header.inc
@@ -10,6 +10,6 @@ MossdeepCity_House4: @ 848399C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/MossdeepCity_Mart/header.inc
index 659c7e133..7de6cb5de 100644
--- a/data/maps/MossdeepCity_Mart/header.inc
+++ b/data/maps/MossdeepCity_Mart/header.inc
@@ -10,6 +10,6 @@ MossdeepCity_Mart: @ 8483948
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
index 75f151c51..b97b7108d 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ MossdeepCity_PokemonCenter_1F: @ 8483910
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
index 5a98563b8..263511ce9 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ MossdeepCity_PokemonCenter_2F: @ 848392C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
index a0dd1e050..5e99c584a 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
@@ -10,6 +10,6 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
index 7f6c20a66..3f4eab34e 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
@@ -10,6 +10,6 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 005c416ee..163f7045f 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -349,9 +349,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166
MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175
lockall
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_224193
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22419A
closemessage
clearflag FLAG_DEFEATED_MAGMA_SPACE_CENTER
diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc
index 68da46965..693801b86 100644
--- a/data/maps/MossdeepCity_StevensHouse/header.inc
+++ b/data/maps/MossdeepCity_StevensHouse/header.inc
@@ -10,6 +10,6 @@ MossdeepCity_StevensHouse: @ 8483980
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/MtChimney/header.inc
index 04bfa4a45..9cd065903 100644
--- a/data/maps/MtChimney/header.inc
+++ b/data/maps/MtChimney/header.inc
@@ -10,6 +10,6 @@ MtChimney: @ 8484010
.byte WEATHER_ASH
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc
index e12bfbacb..0f858f9c1 100644
--- a/data/maps/MtChimney_CableCarStation/header.inc
+++ b/data/maps/MtChimney_CableCarStation/header.inc
@@ -10,6 +10,6 @@ MtChimney_CableCarStation: @ 8483DFC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc
index 241f3dff3..f60532fa2 100644
--- a/data/maps/MtPyre_1F/header.inc
+++ b/data/maps/MtPyre_1F/header.inc
@@ -10,6 +10,6 @@ MtPyre_1F: @ 8484064
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 8
+ 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/header.inc b/data/maps/MtPyre_2F/header.inc
index a542638a7..1abca7143 100644
--- a/data/maps/MtPyre_2F/header.inc
+++ b/data/maps/MtPyre_2F/header.inc
@@ -10,6 +10,6 @@ MtPyre_2F: @ 8484080
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 8
+ 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/header.inc b/data/maps/MtPyre_3F/header.inc
index b09729f81..3f54a3670 100644
--- a/data/maps/MtPyre_3F/header.inc
+++ b/data/maps/MtPyre_3F/header.inc
@@ -10,6 +10,6 @@ MtPyre_3F: @ 848409C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 8
+ 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/header.inc b/data/maps/MtPyre_4F/header.inc
index bee0a548f..1c41c3a6d 100644
--- a/data/maps/MtPyre_4F/header.inc
+++ b/data/maps/MtPyre_4F/header.inc
@@ -10,6 +10,6 @@ MtPyre_4F: @ 84840B8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 8
+ 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/header.inc b/data/maps/MtPyre_5F/header.inc
index d17d64262..17c8eddcd 100644
--- a/data/maps/MtPyre_5F/header.inc
+++ b/data/maps/MtPyre_5F/header.inc
@@ -10,6 +10,6 @@ MtPyre_5F: @ 84840D4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 8
+ 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/header.inc b/data/maps/MtPyre_6F/header.inc
index a783fc7c3..4e8082820 100644
--- a/data/maps/MtPyre_6F/header.inc
+++ b/data/maps/MtPyre_6F/header.inc
@@ -10,6 +10,6 @@ MtPyre_6F: @ 84840F0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 8
+ 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_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc
index b9b2575e8..3b703a41e 100644
--- a/data/maps/MtPyre_Exterior/header.inc
+++ b/data/maps/MtPyre_Exterior/header.inc
@@ -10,6 +10,6 @@ MtPyre_Exterior: @ 848410C
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/MtPyre_Summit/header.inc
index d1a65792f..29a28e99b 100644
--- a/data/maps/MtPyre_Summit/header.inc
+++ b/data/maps/MtPyre_Summit/header.inc
@@ -10,6 +10,6 @@ MtPyre_Summit: @ 8484128
.byte WEATHER_FOG_1
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc
index 59e9a3f59..cf56d8fb4 100644
--- a/data/maps/NavelRock_B1F/header.inc
+++ b/data/maps/NavelRock_B1F/header.inc
@@ -10,6 +10,6 @@ NavelRock_B1F: @ 84858C8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Bottom/header.inc
index 0711b5b81..d6f9b9d5a 100644
--- a/data/maps/NavelRock_Bottom/header.inc
+++ b/data/maps/NavelRock_Bottom/header.inc
@@ -10,6 +10,6 @@ NavelRock_Bottom: @ 8485AC0
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Down01/header.inc
index fd5b2c0f3..2dc18c232 100644
--- a/data/maps/NavelRock_Down01/header.inc
+++ b/data/maps/NavelRock_Down01/header.inc
@@ -10,6 +10,6 @@ NavelRock_Down01: @ 848598C
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Down02/header.inc
index 7827fe4cb..731e4e2fb 100644
--- a/data/maps/NavelRock_Down02/header.inc
+++ b/data/maps/NavelRock_Down02/header.inc
@@ -10,6 +10,6 @@ NavelRock_Down02: @ 84859A8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Down03/header.inc
index 465297482..fdf22dbc3 100644
--- a/data/maps/NavelRock_Down03/header.inc
+++ b/data/maps/NavelRock_Down03/header.inc
@@ -10,6 +10,6 @@ NavelRock_Down03: @ 84859C4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Down04/header.inc
index 7ee2eee47..7f93253b1 100644
--- a/data/maps/NavelRock_Down04/header.inc
+++ b/data/maps/NavelRock_Down04/header.inc
@@ -10,6 +10,6 @@ NavelRock_Down04: @ 84859E0
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Down05/header.inc
index 3f4199195..602f440e0 100644
--- a/data/maps/NavelRock_Down05/header.inc
+++ b/data/maps/NavelRock_Down05/header.inc
@@ -10,6 +10,6 @@ NavelRock_Down05: @ 84859FC
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Down06/header.inc
index 189c26969..c3ec1fe55 100644
--- a/data/maps/NavelRock_Down06/header.inc
+++ b/data/maps/NavelRock_Down06/header.inc
@@ -10,6 +10,6 @@ NavelRock_Down06: @ 8485A18
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Down07/header.inc
index 378b7bbd2..f3a5ab3f3 100644
--- a/data/maps/NavelRock_Down07/header.inc
+++ b/data/maps/NavelRock_Down07/header.inc
@@ -10,6 +10,6 @@ NavelRock_Down07: @ 8485A34
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Down08/header.inc
index 7ad3e736a..3a6f28081 100644
--- a/data/maps/NavelRock_Down08/header.inc
+++ b/data/maps/NavelRock_Down08/header.inc
@@ -10,6 +10,6 @@ NavelRock_Down08: @ 8485A50
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Down09/header.inc
index 60cec1da8..f132b9f66 100644
--- a/data/maps/NavelRock_Down09/header.inc
+++ b/data/maps/NavelRock_Down09/header.inc
@@ -10,6 +10,6 @@ NavelRock_Down09: @ 8485A6C
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Down10/header.inc
index 08b2d975b..3ee4d62ce 100644
--- a/data/maps/NavelRock_Down10/header.inc
+++ b/data/maps/NavelRock_Down10/header.inc
@@ -10,6 +10,6 @@ NavelRock_Down10: @ 8485A88
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Down11/header.inc
index 8182f1c41..ef2ad00b7 100644
--- a/data/maps/NavelRock_Down11/header.inc
+++ b/data/maps/NavelRock_Down11/header.inc
@@ -10,6 +10,6 @@ NavelRock_Down11: @ 8485AA4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Entrance/header.inc
index a0ec2bdc2..dbc28a781 100644
--- a/data/maps/NavelRock_Entrance/header.inc
+++ b/data/maps/NavelRock_Entrance/header.inc
@@ -10,6 +10,6 @@ NavelRock_Entrance: @ 84858AC
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc
index 582fd9cbc..e13422c26 100644
--- a/data/maps/NavelRock_Exterior/header.inc
+++ b/data/maps/NavelRock_Exterior/header.inc
@@ -10,6 +10,6 @@ NavelRock_Exterior: @ 8485874
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 13
+ 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_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc
index 53c0fdaed..49087db7e 100644
--- a/data/maps/NavelRock_Fork/header.inc
+++ b/data/maps/NavelRock_Fork/header.inc
@@ -10,6 +10,6 @@ NavelRock_Fork: @ 84858E4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc
index 79b1dbafb..1df05a2bc 100644
--- a/data/maps/NavelRock_Harbor/header.inc
+++ b/data/maps/NavelRock_Harbor/header.inc
@@ -10,6 +10,6 @@ NavelRock_Harbor: @ 8485890
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_Top/header.inc b/data/maps/NavelRock_Top/header.inc
index 9c0a7b1c0..e99a64054 100644
--- a/data/maps/NavelRock_Top/header.inc
+++ b/data/maps/NavelRock_Top/header.inc
@@ -10,6 +10,6 @@ NavelRock_Top: @ 8485970
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Up1/header.inc
index 3fa05854e..33266d8f0 100644
--- a/data/maps/NavelRock_Up1/header.inc
+++ b/data/maps/NavelRock_Up1/header.inc
@@ -10,6 +10,6 @@ NavelRock_Up1: @ 8485900
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Up2/header.inc
index 62fed7dc3..f93dc31ed 100644
--- a/data/maps/NavelRock_Up2/header.inc
+++ b/data/maps/NavelRock_Up2/header.inc
@@ -10,6 +10,6 @@ NavelRock_Up2: @ 848591C
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Up3/header.inc
index 723329d92..d816e58f1 100644
--- a/data/maps/NavelRock_Up3/header.inc
+++ b/data/maps/NavelRock_Up3/header.inc
@@ -10,6 +10,6 @@ NavelRock_Up3: @ 8485938
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/header.inc b/data/maps/NavelRock_Up4/header.inc
index 33501a678..583c672b4 100644
--- a/data/maps/NavelRock_Up4/header.inc
+++ b/data/maps/NavelRock_Up4/header.inc
@@ -10,6 +10,6 @@ NavelRock_Up4: @ 8485954
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 12
+ 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/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc
index 092cf841f..a8a1df296 100644
--- a/data/maps/NewMauville_Entrance/header.inc
+++ b/data/maps/NewMauville_Entrance/header.inc
@@ -10,6 +10,6 @@ NewMauville_Entrance: @ 8484470
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/NewMauville_Inside/header.inc
index 3f8d3192e..57966d38f 100644
--- a/data/maps/NewMauville_Inside/header.inc
+++ b/data/maps/NewMauville_Inside/header.inc
@@ -10,6 +10,6 @@ NewMauville_Inside: @ 848448C
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc
index bbf84390c..a3bc51483 100644
--- a/data/maps/OldaleTown/events.inc
+++ b/data/maps/OldaleTown/events.inc
@@ -2,7 +2,7 @@ OldaleTown_EventObjects: @ 8527854
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_HIPSTER, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, FLAG_HIDE_OLDALE_TOWN_RIVAL
+ 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
warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1
diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc
index 8d94687a6..83f3624dc 100644
--- a/data/maps/OldaleTown/header.inc
+++ b/data/maps/OldaleTown/header.inc
@@ -10,6 +10,6 @@ OldaleTown: @ 84825D0
.byte WEATHER_SUNNY
.byte MAP_TYPE_TOWN
.2byte 0
- .byte 13
+ 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/scripts.inc b/data/maps/OldaleTown/scripts.inc
index 921323bbf..c8a598da9 100644
--- a/data/maps/OldaleTown/scripts.inc
+++ b/data/maps/OldaleTown/scripts.inc
@@ -255,9 +255,9 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6
OldaleTown_EventScript_1E90E6:: @ 81E90E6
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq OldaleTown_EventScript_1E90FE
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq OldaleTown_EventScript_1E910C
end
diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc
index 934cb22b0..6444d83c4 100644
--- a/data/maps/OldaleTown_House1/header.inc
+++ b/data/maps/OldaleTown_House1/header.inc
@@ -10,6 +10,6 @@ OldaleTown_House1: @ 8482B80
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/OldaleTown_House2/header.inc
index 55a6fd8a3..0df8e3c0e 100644
--- a/data/maps/OldaleTown_House2/header.inc
+++ b/data/maps/OldaleTown_House2/header.inc
@@ -10,6 +10,6 @@ OldaleTown_House2: @ 8482B9C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/OldaleTown_Mart/header.inc
index 4727f0da9..df506157b 100644
--- a/data/maps/OldaleTown_Mart/header.inc
+++ b/data/maps/OldaleTown_Mart/header.inc
@@ -10,6 +10,6 @@ OldaleTown_Mart: @ 8482BF0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
index cdd572a95..250f5d164 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
index 24cf90aab..1562c900f 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/PacifidlogTown/header.inc
index 5b572682b..786fa9d71 100644
--- a/data/maps/PacifidlogTown/header.inc
+++ b/data/maps/PacifidlogTown/header.inc
@@ -10,6 +10,6 @@ PacifidlogTown: @ 848265C
.byte WEATHER_SUNNY
.byte MAP_TYPE_TOWN
.2byte 0
- .byte 13
+ 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_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc
index 511692df1..a4f350e06 100644
--- a/data/maps/PacifidlogTown_House1/header.inc
+++ b/data/maps/PacifidlogTown_House1/header.inc
@@ -10,6 +10,6 @@ PacifidlogTown_House1: @ 8482F8C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/PacifidlogTown_House2/header.inc
index 04d685323..8a3e0ada4 100644
--- a/data/maps/PacifidlogTown_House2/header.inc
+++ b/data/maps/PacifidlogTown_House2/header.inc
@@ -10,6 +10,6 @@ PacifidlogTown_House2: @ 8482FA8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/PacifidlogTown_House3/header.inc
index 48f461797..ed538fa8b 100644
--- a/data/maps/PacifidlogTown_House3/header.inc
+++ b/data/maps/PacifidlogTown_House3/header.inc
@@ -10,6 +10,6 @@ PacifidlogTown_House3: @ 8482FC4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc
index 73ecfe1f3..28f187da9 100644
--- a/data/maps/PacifidlogTown_House3/scripts.inc
+++ b/data/maps/PacifidlogTown_House3/scripts.inc
@@ -7,7 +7,7 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11
goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_203CAB
setvar VAR_0x8008, 2
copyvar VAR_0x8004, VAR_0x8008
- specialvar VAR_RESULT, sub_807E73C
+ specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO
compare VAR_RESULT, 0
@@ -18,14 +18,14 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11
compare VAR_0x8004, 255
goto_if_eq PacifidlogTown_House3_EventScript_203C93
copyvar VAR_0x8005, VAR_0x800A
- specialvar VAR_RESULT, sub_807E9D4
+ specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if_ne PacifidlogTown_House3_EventScript_203C9D
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
- special sub_807EA10
- special sub_807F0E4
+ special CreateInGameTradePokemon
+ special DoInGameTradeScene
waitstate
bufferspeciesname 0, VAR_0x8009
msgbox PacifidlogTown_House3_Text_203D87, MSGBOX_DEFAULT
diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc
index a1edad163..7108a0104 100644
--- a/data/maps/PacifidlogTown_House4/header.inc
+++ b/data/maps/PacifidlogTown_House4/header.inc
@@ -10,6 +10,6 @@ PacifidlogTown_House4: @ 8482FE0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/PacifidlogTown_House5/header.inc
index 850b4864b..07da6a24d 100644
--- a/data/maps/PacifidlogTown_House5/header.inc
+++ b/data/maps/PacifidlogTown_House5/header.inc
@@ -10,6 +10,6 @@ PacifidlogTown_House5: @ 8482FFC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
index b30133654..9db47a72b 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
index db6f8b3df..e16d7b5e5 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/PetalburgCity/header.inc
index 4dae59652..6a4f82bfa 100644
--- a/data/maps/PetalburgCity/header.inc
+++ b/data/maps/PetalburgCity/header.inc
@@ -10,6 +10,6 @@ PetalburgCity: @ 84824B8
.byte WEATHER_SUNNY
.byte MAP_TYPE_CITY
.2byte 0
- .byte 13
+ 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_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc
index e32063894..626f37c3d 100644
--- a/data/maps/PetalburgCity_Gym/header.inc
+++ b/data/maps/PetalburgCity_Gym/header.inc
@@ -10,6 +10,6 @@ PetalburgCity_Gym: @ 8483034
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc
index 85bc3e460..058d2ae6b 100644
--- a/data/maps/PetalburgCity_House1/header.inc
+++ b/data/maps/PetalburgCity_House1/header.inc
@@ -10,6 +10,6 @@ PetalburgCity_House1: @ 8483050
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/PetalburgCity_House2/header.inc
index f7f16748f..d8ceeafbe 100644
--- a/data/maps/PetalburgCity_House2/header.inc
+++ b/data/maps/PetalburgCity_House2/header.inc
@@ -10,6 +10,6 @@ PetalburgCity_House2: @ 848306C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/PetalburgCity_Mart/header.inc
index 624c8b6a1..757430cab 100644
--- a/data/maps/PetalburgCity_Mart/header.inc
+++ b/data/maps/PetalburgCity_Mart/header.inc
@@ -10,6 +10,6 @@ PetalburgCity_Mart: @ 84830C0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
index 2a05feb29..61b328753 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ PetalburgCity_PokemonCenter_1F: @ 8483088
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
index 473e3c736..c6cacfc3a 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc
index 91ee3622b..04b723666 100644
--- a/data/maps/PetalburgCity_WallysHouse/header.inc
+++ b/data/maps/PetalburgCity_WallysHouse/header.inc
@@ -10,6 +10,6 @@ PetalburgCity_WallysHouse: @ 8483018
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc
index 94b5bdfd1..e25f6f750 100644
--- a/data/maps/PetalburgWoods/header.inc
+++ b/data/maps/PetalburgWoods/header.inc
@@ -10,6 +10,6 @@ PetalburgWoods: @ 8483FF4
.byte WEATHER_SHADE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc
index 9029f306f..c0864092b 100644
--- a/data/maps/RecordCorner/header.inc
+++ b/data/maps/RecordCorner/header.inc
@@ -10,6 +10,6 @@ RecordCorner: @ 8484D68
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc
index 64836245f..5a98f7e22 100644
--- a/data/maps/Route101/header.inc
+++ b/data/maps/Route101/header.inc
@@ -10,6 +10,6 @@ Route101: @ 8482678
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/scripts.inc b/data/maps/Route101/scripts.inc
index c8ddeaaf9..15722a3f3 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -238,9 +238,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16
setvar VAR_0x4060, 3
clearflag FLAG_SPECIAL_FLAG_0x4000
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq Route101_EventScript_1EBE85
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq Route101_EventScript_1EBE89
warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
waitstate
diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc
index dc2b3240a..7a0fcacda 100644
--- a/data/maps/Route102/header.inc
+++ b/data/maps/Route102/header.inc
@@ -10,6 +10,6 @@ Route102: @ 8482694
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/events.inc b/data/maps/Route103/events.inc
index 30a7292a0..5a6cc8866 100644
--- a/data/maps/Route103/events.inc
+++ b/data/maps/Route103/events.inc
@@ -1,6 +1,6 @@
Route103_EventObjects: @ 85280DC
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_HIPSTER, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, FLAG_HIDE_ROUTE_103_RIVAL
+ 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
diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc
index c7510701e..b614f32eb 100644
--- a/data/maps/Route103/header.inc
+++ b/data/maps/Route103/header.inc
@@ -10,6 +10,6 @@ Route103: @ 84826B0
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/scripts.inc b/data/maps/Route103/scripts.inc
index d12045955..e13bad76d 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -20,9 +20,9 @@ Route103_EventScript_1EC3AE:: @ 81EC3AE
Route103_EventScript_1EC3C1:: @ 81EC3C1
lockall
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq Route103_EventScript_1EC3DA
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq Route103_EventScript_1EC434
end
diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc
index 889ef3595..53e868559 100644
--- a/data/maps/Route104/events.inc
+++ b/data/maps/Route104/events.inc
@@ -32,7 +32,7 @@ Route104_EventObjects: @ 85282E4
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_HIPSTER, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL
+ 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
warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE
diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc
index df6f0d34a..101e690d5 100644
--- a/data/maps/Route104/header.inc
+++ b/data/maps/Route104/header.inc
@@ -10,6 +10,6 @@ Route104: @ 84826CC
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/scripts.inc b/data/maps/Route104/scripts.inc
index 6cddd613f..e904f69b7 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -72,9 +72,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3
Route104_EventScript_1ECD11:: @ 81ECD11
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq Route104_EventScript_1ECD29
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq Route104_EventScript_1ECD2E
return
@@ -88,9 +88,9 @@ Route104_EventScript_1ECD2E:: @ 81ECD2E
Route104_EventScript_1ECD33:: @ 81ECD33
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq Route104_EventScript_1ECD4B
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq Route104_EventScript_1ECE6F
end
diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc
index 139efeb74..c52a076de 100644
--- a/data/maps/Route104_MrBrineysHouse/header.inc
+++ b/data/maps/Route104_MrBrineysHouse/header.inc
@@ -10,6 +10,6 @@ Route104_MrBrineysHouse: @ 8483D70
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
index cd34cd3f4..eaf073550 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
@@ -10,6 +10,6 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc
index ea0b1390a..0de3a4b47 100644
--- a/data/maps/Route104_Prototype/header.inc
+++ b/data/maps/Route104_Prototype/header.inc
@@ -10,6 +10,6 @@ Route104_Prototype: @ 8485AF8
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 8
+ 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/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
index fce17ef00..e72f9a606 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
@@ -10,6 +10,6 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 8
+ 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/Route105/header.inc b/data/maps/Route105/header.inc
index 59ea4f3df..5c6b2fc15 100644
--- a/data/maps/Route105/header.inc
+++ b/data/maps/Route105/header.inc
@@ -10,6 +10,6 @@ Route105: @ 84826E8
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route106/header.inc
index 9292cae39..f0f032b8b 100644
--- a/data/maps/Route106/header.inc
+++ b/data/maps/Route106/header.inc
@@ -10,6 +10,6 @@ Route106: @ 8482704
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route107/header.inc
index e038ea705..a4ec264ea 100644
--- a/data/maps/Route107/header.inc
+++ b/data/maps/Route107/header.inc
@@ -10,6 +10,6 @@ Route107: @ 8482720
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route108/header.inc
index a6314172f..106fe3135 100644
--- a/data/maps/Route108/header.inc
+++ b/data/maps/Route108/header.inc
@@ -10,6 +10,6 @@ Route108: @ 848273C
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route109/header.inc
index 489ea8789..045f42256 100644
--- a/data/maps/Route109/header.inc
+++ b/data/maps/Route109/header.inc
@@ -10,6 +10,6 @@ Route109: @ 8482758
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc
index 1f6f067ca..68dc54b77 100644
--- a/data/maps/Route109_SeashoreHouse/header.inc
+++ b/data/maps/Route109_SeashoreHouse/header.inc
@@ -10,6 +10,6 @@ Route109_SeashoreHouse: @ 8485B30
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/Route110/events.inc
index 221dd6f6c..b50e5eec6 100644
--- a/data/maps/Route110/events.inc
+++ b/data/maps/Route110/events.inc
@@ -26,8 +26,8 @@ Route110_EventObjects: @ 8528CF0
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_HIPSTER, 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_GIDDY, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_RIVAL_2
+ 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
diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc
index c1dd03789..14194cd37 100644
--- a/data/maps/Route110/header.inc
+++ b/data/maps/Route110/header.inc
@@ -10,6 +10,6 @@ Route110: @ 8482774
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/scripts.inc b/data/maps/Route110/scripts.inc
index c898240b8..0455ebb1f 100644
--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -379,9 +379,9 @@ Route110_EventScript_1EF763:: @ 81EF763
Route110_EventScript_1EF76E:: @ 81EF76E
lockall
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq Route110_EventScript_1EF7E1
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq Route110_EventScript_1EF7E6
applymovement 28, Route110_Movement_2725AA
waitmovement 0
@@ -397,9 +397,9 @@ Route110_EventScript_1EF76E:: @ 81EF76E
compare VAR_0x8008, 3
call_if_eq Route110_EventScript_1EF964
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq Route110_EventScript_1EF7EB
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq Route110_EventScript_1EF865
releaseall
end
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
index d98361dd3..50f4b763f 100644
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
@@ -10,6 +10,6 @@ Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 1
+ 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/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
index 24baeb042..4e09eeef3 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
@@ -10,6 +10,6 @@ Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 1
+ 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_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc
index 9d9cf23ed..6657162b7 100644
--- a/data/maps/Route110_TrickHouseCorridor/header.inc
+++ b/data/maps/Route110_TrickHouseCorridor/header.inc
@@ -10,6 +10,6 @@ Route110_TrickHouseCorridor: @ 8485B84
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc
index 3ea5a8eb8..52a39914f 100644
--- a/data/maps/Route110_TrickHouseEnd/header.inc
+++ b/data/maps/Route110_TrickHouseEnd/header.inc
@@ -10,6 +10,6 @@ Route110_TrickHouseEnd: @ 8485B68
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc
index 8e202e650..4e651e5f9 100644
--- a/data/maps/Route110_TrickHouseEntrance/header.inc
+++ b/data/maps/Route110_TrickHouseEntrance/header.inc
@@ -10,6 +10,6 @@ Route110_TrickHouseEntrance: @ 8485B4C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc
index 593b807ce..de4ff3ed2 100644
--- a/data/maps/Route110_TrickHousePuzzle1/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/header.inc
@@ -10,6 +10,6 @@ Route110_TrickHousePuzzle1: @ 8485BA0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc
index e632dbca9..8a2b708ea 100644
--- a/data/maps/Route110_TrickHousePuzzle2/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/header.inc
@@ -10,6 +10,6 @@ Route110_TrickHousePuzzle2: @ 8485BBC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc
index 77e2e4a38..37a517f72 100644
--- a/data/maps/Route110_TrickHousePuzzle3/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/header.inc
@@ -10,6 +10,6 @@ Route110_TrickHousePuzzle3: @ 8485BD8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc
index 9ad6159f3..993f002d7 100644
--- a/data/maps/Route110_TrickHousePuzzle4/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/header.inc
@@ -10,6 +10,6 @@ Route110_TrickHousePuzzle4: @ 8485BF4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc
index 910638d82..b22b21bce 100644
--- a/data/maps/Route110_TrickHousePuzzle5/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/header.inc
@@ -10,6 +10,6 @@ Route110_TrickHousePuzzle5: @ 8485C10
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc
index ab6c752cb..e10fd78b2 100644
--- a/data/maps/Route110_TrickHousePuzzle6/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/header.inc
@@ -10,6 +10,6 @@ Route110_TrickHousePuzzle6: @ 8485C2C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc
index 68a7098fb..40f43f9d8 100644
--- a/data/maps/Route110_TrickHousePuzzle7/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/header.inc
@@ -10,6 +10,6 @@ Route110_TrickHousePuzzle7: @ 8485C48
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc
index a330e3c1f..175515292 100644
--- a/data/maps/Route110_TrickHousePuzzle8/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/header.inc
@@ -10,6 +10,6 @@ Route110_TrickHousePuzzle8: @ 8485C64
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/Route111/events.inc
index 25e1beeba..975141b73 100644
--- a/data/maps/Route111/events.inc
+++ b/data/maps/Route111/events.inc
@@ -43,7 +43,7 @@ Route111_EventObjects: @ 85291F0
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_HIPSTER, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_PLAYER_DESCENT
+ 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
diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc
index 449498ed4..cb975e74a 100644
--- a/data/maps/Route111/header.inc
+++ b/data/maps/Route111/header.inc
@@ -10,6 +10,6 @@ Route111: @ 8482790
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/scripts.inc b/data/maps/Route111/scripts.inc
index 7ea8b2bf2..e844cb785 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -53,9 +53,9 @@ Route111_MapScript1_1F0D87: @ 81F0D87
Route111_EventScript_1F0DC2:: @ 81F0DC2
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq Route111_EventScript_1F0DDA
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq Route111_EventScript_1F0DE0
return
diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc
index 70bbe3777..a3c2a0161 100644
--- a/data/maps/Route111_OldLadysRestStop/header.inc
+++ b/data/maps/Route111_OldLadysRestStop/header.inc
@@ -10,6 +10,6 @@ Route111_OldLadysRestStop: @ 8483DC4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc
index dea0352e6..12e408089 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/header.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc
@@ -10,6 +10,6 @@ Route111_WinstrateFamilysHouse: @ 8483DA8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route112/header.inc
index 5961e48c2..70e0f2d65 100644
--- a/data/maps/Route112/header.inc
+++ b/data/maps/Route112/header.inc
@@ -10,6 +10,6 @@ Route112: @ 84827AC
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc
index 8e1dbc807..fd9038c12 100644
--- a/data/maps/Route112_CableCarStation/header.inc
+++ b/data/maps/Route112_CableCarStation/header.inc
@@ -10,6 +10,6 @@ Route112_CableCarStation: @ 8483DE0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route113/header.inc
index e1b082712..deaacca36 100644
--- a/data/maps/Route113/header.inc
+++ b/data/maps/Route113/header.inc
@@ -10,6 +10,6 @@ Route113: @ 84827C8
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc
index 9f31f510f..44a87e5ef 100644
--- a/data/maps/Route113_GlassWorkshop/header.inc
+++ b/data/maps/Route113_GlassWorkshop/header.inc
@@ -10,6 +10,6 @@ Route113_GlassWorkshop: @ 8485CB8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route114/header.inc
index c0920ada9..318efdbaf 100644
--- a/data/maps/Route114/header.inc
+++ b/data/maps/Route114/header.inc
@@ -10,6 +10,6 @@ Route114: @ 84827E4
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc
index a1ad307e4..ca042d6b4 100644
--- a/data/maps/Route114_FossilManiacsHouse/header.inc
+++ b/data/maps/Route114_FossilManiacsHouse/header.inc
@@ -10,6 +10,6 @@ Route114_FossilManiacsHouse: @ 8483E18
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc
index 250695671..be53b84ce 100644
--- a/data/maps/Route114_FossilManiacsTunnel/header.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/header.inc
@@ -10,6 +10,6 @@ Route114_FossilManiacsTunnel: @ 8483E34
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route114_LanettesHouse/header.inc
index 8ba9dd58c..51023a800 100644
--- a/data/maps/Route114_LanettesHouse/header.inc
+++ b/data/maps/Route114_LanettesHouse/header.inc
@@ -10,6 +10,6 @@ Route114_LanettesHouse: @ 8483E50
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc
index 5da7c8990..70e831aee 100644
--- a/data/maps/Route115/header.inc
+++ b/data/maps/Route115/header.inc
@@ -10,6 +10,6 @@ Route115: @ 8482800
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route116/header.inc
index d0f4bfedf..e97885bc7 100644
--- a/data/maps/Route116/header.inc
+++ b/data/maps/Route116/header.inc
@@ -10,6 +10,6 @@ Route116: @ 848281C
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc
index ce7de5c71..1c3abde78 100644
--- a/data/maps/Route116_TunnelersRestHouse/header.inc
+++ b/data/maps/Route116_TunnelersRestHouse/header.inc
@@ -10,6 +10,6 @@ Route116_TunnelersRestHouse: @ 8483E6C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route117/header.inc
index c720839de..1d5eda074 100644
--- a/data/maps/Route117/header.inc
+++ b/data/maps/Route117/header.inc
@@ -10,6 +10,6 @@ Route117: @ 8482838
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc
index d8fb67ce9..ba48de228 100644
--- a/data/maps/Route117_PokemonDayCare/header.inc
+++ b/data/maps/Route117_PokemonDayCare/header.inc
@@ -10,6 +10,6 @@ Route117_PokemonDayCare: @ 8483E88
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc
index 826281c09..e0b541643 100644
--- a/data/maps/Route118/header.inc
+++ b/data/maps/Route118/header.inc
@@ -10,6 +10,6 @@ Route118: @ 8482854
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/events.inc b/data/maps/Route119/events.inc
index 3a7d1422b..86ec2d2be 100644
--- a/data/maps/Route119/events.inc
+++ b/data/maps/Route119/events.inc
@@ -14,7 +14,7 @@ Route119_EventObjects: @ 852AD6C
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_HIPSTER, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL
+ 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
@@ -23,7 +23,7 @@ Route119_EventObjects: @ 852AD6C
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_GIDDY, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
+ 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
diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc
index cb9b211d9..7181f6b0d 100644
--- a/data/maps/Route119/header.inc
+++ b/data/maps/Route119/header.inc
@@ -10,6 +10,6 @@ Route119: @ 8482870
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/scripts.inc b/data/maps/Route119/scripts.inc
index 1aeb33ec5..dee76d71d 100644
--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -42,9 +42,9 @@ Route119_EventScript_1F4488:: @ 81F4488
lockall
addobject 25
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq Route119_EventScript_1F4501
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq Route119_EventScript_1F4506
delay 65
compare VAR_TEMP_1, 1
@@ -62,9 +62,9 @@ Route119_EventScript_1F4488:: @ 81F4488
addobject 16
delay 30
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq Route119_EventScript_1F450B
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq Route119_EventScript_1F4585
releaseall
end
diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc
index e06dc3147..334b858ec 100644
--- a/data/maps/Route119_House/header.inc
+++ b/data/maps/Route119_House/header.inc
@@ -10,6 +10,6 @@ Route119_House: @ 8485D28
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc
index ce15e7ea7..e5e7abbc9 100644
--- a/data/maps/Route119_WeatherInstitute_1F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/header.inc
@@ -10,6 +10,6 @@ Route119_WeatherInstitute_1F: @ 8485CF0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc
index eb8d25cd0..c81f9731c 100644
--- a/data/maps/Route119_WeatherInstitute_2F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/header.inc
@@ -10,6 +10,6 @@ Route119_WeatherInstitute_2F: @ 8485D0C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc
index a3b062bca..626b57a94 100644
--- a/data/maps/Route120/header.inc
+++ b/data/maps/Route120/header.inc
@@ -10,6 +10,6 @@ Route120: @ 848288C
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route121/header.inc
index 5f744afaf..3f070c2ec 100644
--- a/data/maps/Route121/header.inc
+++ b/data/maps/Route121/header.inc
@@ -10,6 +10,6 @@ Route121: @ 84828A8
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc
index 3617aa5b0..fa645a693 100644
--- a/data/maps/Route121_SafariZoneEntrance/header.inc
+++ b/data/maps/Route121_SafariZoneEntrance/header.inc
@@ -10,6 +10,6 @@ Route121_SafariZoneEntrance: @ 8483EA4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc
index 7e6dc55c2..eddd1a234 100644
--- a/data/maps/Route122/header.inc
+++ b/data/maps/Route122/header.inc
@@ -10,6 +10,6 @@ Route122: @ 84828C4
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route123/header.inc
index 9eba6be87..a215c3592 100644
--- a/data/maps/Route123/header.inc
+++ b/data/maps/Route123/header.inc
@@ -10,6 +10,6 @@ Route123: @ 84828E0
.byte WEATHER_SUNNY
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc
index 009b6fa98..163625aae 100644
--- a/data/maps/Route123_BerryMastersHouse/header.inc
+++ b/data/maps/Route123_BerryMastersHouse/header.inc
@@ -10,6 +10,6 @@ Route123_BerryMastersHouse: @ 8485CD4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/Route124/header.inc
index 43aab1b68..c9ae442b7 100644
--- a/data/maps/Route124/header.inc
+++ b/data/maps/Route124/header.inc
@@ -10,6 +10,6 @@ Route124: @ 84828FC
.byte WEATHER_SUNNY
.byte MAP_TYPE_6
.2byte 0
- .byte 13
+ 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_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
index 777edeff2..db9097ce5 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
@@ -10,6 +10,6 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc
index 8cf6f8531..12ea80531 100644
--- a/data/maps/Route125/header.inc
+++ b/data/maps/Route125/header.inc
@@ -10,6 +10,6 @@ Route125: @ 8482918
.byte WEATHER_SUNNY
.byte MAP_TYPE_6
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route126/header.inc
index 3e489dffd..86225727f 100644
--- a/data/maps/Route126/header.inc
+++ b/data/maps/Route126/header.inc
@@ -10,6 +10,6 @@ Route126: @ 8482934
.byte WEATHER_SUNNY
.byte MAP_TYPE_6
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route127/header.inc
index 950e11df7..b237a42ab 100644
--- a/data/maps/Route127/header.inc
+++ b/data/maps/Route127/header.inc
@@ -10,6 +10,6 @@ Route127: @ 8482950
.byte WEATHER_SUNNY
.byte MAP_TYPE_6
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route128/header.inc
index 6065e257c..2875033e9 100644
--- a/data/maps/Route128/header.inc
+++ b/data/maps/Route128/header.inc
@@ -10,6 +10,6 @@ Route128: @ 848296C
.byte WEATHER_SUNNY
.byte MAP_TYPE_6
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route129/header.inc
index 1bc9ac5f0..645cc7d92 100644
--- a/data/maps/Route129/header.inc
+++ b/data/maps/Route129/header.inc
@@ -10,6 +10,6 @@ Route129: @ 8482988
.byte WEATHER_SUNNY
.byte MAP_TYPE_6
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route130/header.inc
index bff8b4e40..4c03656ac 100644
--- a/data/maps/Route130/header.inc
+++ b/data/maps/Route130/header.inc
@@ -10,6 +10,6 @@ Route130: @ 84829A4
.byte WEATHER_SUNNY
.byte MAP_TYPE_6
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route131/header.inc
index 3e6bf34b3..e84799fd4 100644
--- a/data/maps/Route131/header.inc
+++ b/data/maps/Route131/header.inc
@@ -10,6 +10,6 @@ Route131: @ 84829C0
.byte WEATHER_SUNNY
.byte MAP_TYPE_6
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route132/header.inc
index 4e292a92b..50630af03 100644
--- a/data/maps/Route132/header.inc
+++ b/data/maps/Route132/header.inc
@@ -10,6 +10,6 @@ Route132: @ 84829DC
.byte WEATHER_SUNNY
.byte MAP_TYPE_6
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route133/header.inc
index 26428b3dc..ed6b7d2ce 100644
--- a/data/maps/Route133/header.inc
+++ b/data/maps/Route133/header.inc
@@ -10,6 +10,6 @@ Route133: @ 84829F8
.byte WEATHER_SUNNY
.byte MAP_TYPE_6
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Route134/header.inc
index d1df504ed..8204e2815 100644
--- a/data/maps/Route134/header.inc
+++ b/data/maps/Route134/header.inc
@@ -10,6 +10,6 @@ Route134: @ 8482A14
.byte WEATHER_SUNNY
.byte MAP_TYPE_6
.2byte 0
- .byte 13
+ 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/events.inc b/data/maps/RustboroCity/events.inc
index 48d125d0f..b2bcfa7ca 100644
--- a/data/maps/RustboroCity/events.inc
+++ b/data/maps/RustboroCity/events.inc
@@ -12,7 +12,7 @@ RustboroCity_EventObjects: @ 85267E0
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_HIPSTER, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, FLAG_HIDE_RUSBORO_CITY_RIVAL
+ 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
diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc
index 6e7bb70d4..0cbd55b24 100644
--- a/data/maps/RustboroCity/header.inc
+++ b/data/maps/RustboroCity/header.inc
@@ -10,6 +10,6 @@ RustboroCity: @ 848250C
.byte WEATHER_SUNNY
.byte MAP_TYPE_CITY
.2byte 0
- .byte 13
+ 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/scripts.inc b/data/maps/RustboroCity/scripts.inc
index d78777c75..7c1e14118 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -677,9 +677,9 @@ RustboroCity_EventScript_1E0DB8:: @ 81E0DB8
Route104_EventScript_1E0DD1:: @ 81E0DD1
RustboroCity_EventScript_1E0DD1:: @ 81E0DD1
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq RustboroCity_EventScript_1E0DE9
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq RustboroCity_EventScript_1E0DEE
return
@@ -821,9 +821,9 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3
RustboroCity_EventScript_1E0FF3:: @ 81E0FF3
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq RustboroCity_EventScript_1E100B
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq RustboroCity_EventScript_1E1114
end
diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc
index 40742887b..8ffdf2c7b 100644
--- a/data/maps/RustboroCity_CuttersHouse/header.inc
+++ b/data/maps/RustboroCity_CuttersHouse/header.inc
@@ -10,6 +10,6 @@ RustboroCity_CuttersHouse: @ 8483478
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc
index d86b8537c..a6f55163b 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc
@@ -10,6 +10,6 @@ RustboroCity_DevonCorp_1F: @ 8483344
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc
index b0da75514..bb548c44e 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc
@@ -10,6 +10,6 @@ RustboroCity_DevonCorp_2F: @ 8483360
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc
index 21a33d5b8..d37f055a5 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc
@@ -10,6 +10,6 @@ RustboroCity_DevonCorp_3F: @ 848337C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc
index b2a4da317..9d3a63c8c 100644
--- a/data/maps/RustboroCity_Flat1_1F/header.inc
+++ b/data/maps/RustboroCity_Flat1_1F/header.inc
@@ -10,6 +10,6 @@ RustboroCity_Flat1_1F: @ 8483424
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc
index 5a9a5a133..ce47b6cb4 100644
--- a/data/maps/RustboroCity_Flat1_2F/header.inc
+++ b/data/maps/RustboroCity_Flat1_2F/header.inc
@@ -10,6 +10,6 @@ RustboroCity_Flat1_2F: @ 8483440
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc
index 8df565936..dc2a68edf 100644
--- a/data/maps/RustboroCity_Flat2_1F/header.inc
+++ b/data/maps/RustboroCity_Flat2_1F/header.inc
@@ -10,6 +10,6 @@ RustboroCity_Flat2_1F: @ 84834B0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc
index 92161bb4d..1d117d316 100644
--- a/data/maps/RustboroCity_Flat2_2F/header.inc
+++ b/data/maps/RustboroCity_Flat2_2F/header.inc
@@ -10,6 +10,6 @@ RustboroCity_Flat2_2F: @ 84834CC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc
index fafca84e7..037ca6821 100644
--- a/data/maps/RustboroCity_Flat2_3F/header.inc
+++ b/data/maps/RustboroCity_Flat2_3F/header.inc
@@ -10,6 +10,6 @@ RustboroCity_Flat2_3F: @ 84834E8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc
index 8c07e3637..72dc7ee47 100644
--- a/data/maps/RustboroCity_Gym/header.inc
+++ b/data/maps/RustboroCity_Gym/header.inc
@@ -10,6 +10,6 @@ RustboroCity_Gym: @ 8483398
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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_House1/header.inc b/data/maps/RustboroCity_House1/header.inc
index 94ae5e1e4..cff9064e9 100644
--- a/data/maps/RustboroCity_House1/header.inc
+++ b/data/maps/RustboroCity_House1/header.inc
@@ -10,6 +10,6 @@ RustboroCity_House1: @ 848345C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc
index e006ee00a..eb5655b1a 100644
--- a/data/maps/RustboroCity_House1/scripts.inc
+++ b/data/maps/RustboroCity_House1/scripts.inc
@@ -7,7 +7,7 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F
goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_2159D5
setvar VAR_0x8008, 0
copyvar VAR_0x8004, VAR_0x8008
- specialvar VAR_RESULT, sub_807E73C
+ specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO
compare VAR_RESULT, 0
@@ -18,14 +18,14 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F
compare VAR_0x8004, 255
goto_if_eq RustboroCity_House1_EventScript_2159BD
copyvar VAR_0x8005, VAR_0x800A
- specialvar VAR_RESULT, sub_807E9D4
+ specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if_ne RustboroCity_House1_EventScript_2159C7
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
- special sub_807EA10
- special sub_807F0E4
+ special CreateInGameTradePokemon
+ special DoInGameTradeScene
waitstate
msgbox RustboroCity_House1_Text_215A77, MSGBOX_DEFAULT
setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED
diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc
index 51a6f7984..1de4f0e36 100644
--- a/data/maps/RustboroCity_House2/header.inc
+++ b/data/maps/RustboroCity_House2/header.inc
@@ -10,6 +10,6 @@ RustboroCity_House2: @ 8483494
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/RustboroCity_House3/header.inc
index 89e62cf50..c1a0312e3 100644
--- a/data/maps/RustboroCity_House3/header.inc
+++ b/data/maps/RustboroCity_House3/header.inc
@@ -10,6 +10,6 @@ RustboroCity_House3: @ 8483504
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/RustboroCity_Mart/header.inc
index 766c1cb0c..bb41aab1d 100644
--- a/data/maps/RustboroCity_Mart/header.inc
+++ b/data/maps/RustboroCity_Mart/header.inc
@@ -10,6 +10,6 @@ RustboroCity_Mart: @ 8483408
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
index 17f717230..4c5c50074 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ RustboroCity_PokemonCenter_1F: @ 84833D0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
index e7a1999cc..8e70f4c80 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ RustboroCity_PokemonCenter_2F: @ 84833EC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc
index 909e85c69..9b1467042 100644
--- a/data/maps/RustboroCity_PokemonSchool/header.inc
+++ b/data/maps/RustboroCity_PokemonSchool/header.inc
@@ -10,6 +10,6 @@ RustboroCity_PokemonSchool: @ 84833B4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc
index 4dc4e2797..70a477681 100644
--- a/data/maps/RusturfTunnel/header.inc
+++ b/data/maps/RusturfTunnel/header.inc
@@ -10,6 +10,6 @@ RusturfTunnel: @ 8483F30
.byte WEATHER_FOG_1
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc
index 9c1f2bab2..37128821c 100644
--- a/data/maps/SSTidalCorridor/header.inc
+++ b/data/maps/SSTidalCorridor/header.inc
@@ -10,6 +10,6 @@ SSTidalCorridor: @ 8484F0C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SSTidalLowerDeck/header.inc
index 6db9d2415..f86d3ac06 100644
--- a/data/maps/SSTidalLowerDeck/header.inc
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -10,6 +10,6 @@ SSTidalLowerDeck: @ 8484F28
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SSTidalRooms/header.inc
index a5788a49f..0d1f4db63 100644
--- a/data/maps/SSTidalRooms/header.inc
+++ b/data/maps/SSTidalRooms/header.inc
@@ -10,6 +10,6 @@ SSTidalRooms: @ 8484F44
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_North/header.inc b/data/maps/SafariZone_North/header.inc
index 3e667fafc..ebcb62f9a 100644
--- a/data/maps/SafariZone_North/header.inc
+++ b/data/maps/SafariZone_North/header.inc
@@ -10,6 +10,6 @@ SafariZone_North: @ 8485158
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/SafariZone_Northeast/header.inc
index 734254611..9db5fd596 100644
--- a/data/maps/SafariZone_Northeast/header.inc
+++ b/data/maps/SafariZone_Northeast/header.inc
@@ -10,6 +10,6 @@ SafariZone_Northeast: @ 848528C
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/SafariZone_Northwest/header.inc
index 786316fcd..ca59f45e7 100644
--- a/data/maps/SafariZone_Northwest/header.inc
+++ b/data/maps/SafariZone_Northwest/header.inc
@@ -10,6 +10,6 @@ SafariZone_Northwest: @ 848513C
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc
index 1f02725b0..fbb6f4d05 100644
--- a/data/maps/SafariZone_RestHouse/header.inc
+++ b/data/maps/SafariZone_RestHouse/header.inc
@@ -10,6 +10,6 @@ SafariZone_RestHouse: @ 8485270
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_South/header.inc b/data/maps/SafariZone_South/header.inc
index 5c60a541b..1567935d2 100644
--- a/data/maps/SafariZone_South/header.inc
+++ b/data/maps/SafariZone_South/header.inc
@@ -10,6 +10,6 @@ SafariZone_South: @ 8485190
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/SafariZone_Southeast/header.inc
index 54f2c505a..55ff68232 100644
--- a/data/maps/SafariZone_Southeast/header.inc
+++ b/data/maps/SafariZone_Southeast/header.inc
@@ -10,6 +10,6 @@ SafariZone_Southeast: @ 84852A8
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/SafariZone_Southwest/header.inc
index 332d2f9a4..189fa09b8 100644
--- a/data/maps/SafariZone_Southwest/header.inc
+++ b/data/maps/SafariZone_Southwest/header.inc
@@ -10,6 +10,6 @@ SafariZone_Southwest: @ 8485174
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc
index 1de3fd413..84c09df3f 100644
--- a/data/maps/ScorchedSlab/header.inc
+++ b/data/maps/ScorchedSlab/header.inc
@@ -10,6 +10,6 @@ ScorchedSlab: @ 84846BC
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc
index 417467ac5..8e62470ac 100644
--- a/data/maps/SeafloorCavern_Entrance/header.inc
+++ b/data/maps/SeafloorCavern_Entrance/header.inc
@@ -10,6 +10,6 @@ SeafloorCavern_Entrance: @ 84841B4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SeafloorCavern_Room1/header.inc
index e259b065b..9b84e5d96 100644
--- a/data/maps/SeafloorCavern_Room1/header.inc
+++ b/data/maps/SeafloorCavern_Room1/header.inc
@@ -10,6 +10,6 @@ SeafloorCavern_Room1: @ 84841D0
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SeafloorCavern_Room2/header.inc
index 6331b3b18..b7d4e47d7 100644
--- a/data/maps/SeafloorCavern_Room2/header.inc
+++ b/data/maps/SeafloorCavern_Room2/header.inc
@@ -10,6 +10,6 @@ SeafloorCavern_Room2: @ 84841EC
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SeafloorCavern_Room3/header.inc
index a91ef42ef..b5a032b60 100644
--- a/data/maps/SeafloorCavern_Room3/header.inc
+++ b/data/maps/SeafloorCavern_Room3/header.inc
@@ -10,6 +10,6 @@ SeafloorCavern_Room3: @ 8484208
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SeafloorCavern_Room4/header.inc
index 7385a41fb..75b51c343 100644
--- a/data/maps/SeafloorCavern_Room4/header.inc
+++ b/data/maps/SeafloorCavern_Room4/header.inc
@@ -10,6 +10,6 @@ SeafloorCavern_Room4: @ 8484224
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SeafloorCavern_Room5/header.inc
index aa2b0dc56..6b053fc71 100644
--- a/data/maps/SeafloorCavern_Room5/header.inc
+++ b/data/maps/SeafloorCavern_Room5/header.inc
@@ -10,6 +10,6 @@ SeafloorCavern_Room5: @ 8484240
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SeafloorCavern_Room6/header.inc
index 2f76c9b8f..d1346acd8 100644
--- a/data/maps/SeafloorCavern_Room6/header.inc
+++ b/data/maps/SeafloorCavern_Room6/header.inc
@@ -10,6 +10,6 @@ SeafloorCavern_Room6: @ 848425C
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SeafloorCavern_Room7/header.inc
index 3640bb597..b5b4aca03 100644
--- a/data/maps/SeafloorCavern_Room7/header.inc
+++ b/data/maps/SeafloorCavern_Room7/header.inc
@@ -10,6 +10,6 @@ SeafloorCavern_Room7: @ 8484278
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SeafloorCavern_Room8/header.inc
index 66e6523f0..0ada4ab71 100644
--- a/data/maps/SeafloorCavern_Room8/header.inc
+++ b/data/maps/SeafloorCavern_Room8/header.inc
@@ -10,6 +10,6 @@ SeafloorCavern_Room8: @ 8484294
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc
index 2f08ec83a..4d2be9474 100644
--- a/data/maps/SeafloorCavern_Room9/header.inc
+++ b/data/maps/SeafloorCavern_Room9/header.inc
@@ -10,6 +10,6 @@ SeafloorCavern_Room9: @ 84842B0
.byte WEATHER_FOG_1
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 14
+ 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/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc
index 541842c26..5fa5dccc9 100644
--- a/data/maps/SealedChamber_InnerRoom/header.inc
+++ b/data/maps/SealedChamber_InnerRoom/header.inc
@@ -10,6 +10,6 @@ SealedChamber_InnerRoom: @ 84846A0
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc
index 5fa6728d8..3930e818d 100644
--- a/data/maps/SealedChamber_OuterRoom/header.inc
+++ b/data/maps/SealedChamber_OuterRoom/header.inc
@@ -10,6 +10,6 @@ SealedChamber_OuterRoom: @ 8484684
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc
index 87361e082..95e52b889 100644
--- a/data/maps/SecretBase_BlueCave1/events.inc
+++ b/data/maps/SecretBase_BlueCave1/events.inc
@@ -1,19 +1,19 @@
SecretBase_BlueCave1_EventObjects: @ 8537BEC
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8537D54
warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc
index f75acd84a..60eeeab32 100644
--- a/data/maps/SecretBase_BlueCave1/header.inc
+++ b/data/maps/SecretBase_BlueCave1/header.inc
@@ -10,6 +10,6 @@ SecretBase_BlueCave1: @ 8484AC8
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_BlueCave2/events.inc
index ad584e2bb..62c4b8dcd 100644
--- a/data/maps/SecretBase_BlueCave2/events.inc
+++ b/data/maps/SecretBase_BlueCave2/events.inc
@@ -1,19 +1,19 @@
SecretBase_BlueCave2_EventObjects: @ 8538504
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 853866C
warp_def 7, 5, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc
index 6b80b45bb..348a5cd02 100644
--- a/data/maps/SecretBase_BlueCave2/header.inc
+++ b/data/maps/SecretBase_BlueCave2/header.inc
@@ -10,6 +10,6 @@ SecretBase_BlueCave2: @ 8484B70
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_BlueCave3/events.inc
index af85949d3..14c7460ad 100644
--- a/data/maps/SecretBase_BlueCave3/events.inc
+++ b/data/maps/SecretBase_BlueCave3/events.inc
@@ -1,19 +1,19 @@
SecretBase_BlueCave3_EventObjects: @ 8538E1C
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8538F84
warp_def 4, 15, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc
index 19a4afdfd..26ab5ef93 100644
--- a/data/maps/SecretBase_BlueCave3/header.inc
+++ b/data/maps/SecretBase_BlueCave3/header.inc
@@ -10,6 +10,6 @@ SecretBase_BlueCave3: @ 8484C18
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_BlueCave4/events.inc
index 6ff0d4e67..1d047cd42 100644
--- a/data/maps/SecretBase_BlueCave4/events.inc
+++ b/data/maps/SecretBase_BlueCave4/events.inc
@@ -1,19 +1,19 @@
SecretBase_BlueCave4_EventObjects: @ 8539734
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 853989C
warp_def 4, 15, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc
index 3a51deec4..5e253d51e 100644
--- a/data/maps/SecretBase_BlueCave4/header.inc
+++ b/data/maps/SecretBase_BlueCave4/header.inc
@@ -10,6 +10,6 @@ SecretBase_BlueCave4: @ 8484CC0
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_BrownCave1/events.inc
index 5a49bb704..43d144535 100644
--- a/data/maps/SecretBase_BrownCave1/events.inc
+++ b/data/maps/SecretBase_BrownCave1/events.inc
@@ -1,19 +1,19 @@
SecretBase_BrownCave1_EventObjects: @ 8537A68
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8537BD0
warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc
index 7a79eab3e..ab531bf5c 100644
--- a/data/maps/SecretBase_BrownCave1/header.inc
+++ b/data/maps/SecretBase_BrownCave1/header.inc
@@ -10,6 +10,6 @@ SecretBase_BrownCave1: @ 8484AAC
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_BrownCave2/events.inc
index 569b808bd..09bb03327 100644
--- a/data/maps/SecretBase_BrownCave2/events.inc
+++ b/data/maps/SecretBase_BrownCave2/events.inc
@@ -1,19 +1,19 @@
SecretBase_BrownCave2_EventObjects: @ 8538380
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 85384E8
warp_def 1, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc
index 5f0e61f8c..464bcd059 100644
--- a/data/maps/SecretBase_BrownCave2/header.inc
+++ b/data/maps/SecretBase_BrownCave2/header.inc
@@ -10,6 +10,6 @@ SecretBase_BrownCave2: @ 8484B54
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_BrownCave3/events.inc
index 4dd9655b8..12ec86587 100644
--- a/data/maps/SecretBase_BrownCave3/events.inc
+++ b/data/maps/SecretBase_BrownCave3/events.inc
@@ -1,19 +1,19 @@
SecretBase_BrownCave3_EventObjects: @ 8538C98
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8538E00
warp_def 11, 9, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc
index bd88bf1d3..923b2c4be 100644
--- a/data/maps/SecretBase_BrownCave3/header.inc
+++ b/data/maps/SecretBase_BrownCave3/header.inc
@@ -10,6 +10,6 @@ SecretBase_BrownCave3: @ 8484BFC
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_BrownCave4/events.inc
index 506c3cafc..15fab00be 100644
--- a/data/maps/SecretBase_BrownCave4/events.inc
+++ b/data/maps/SecretBase_BrownCave4/events.inc
@@ -1,19 +1,19 @@
SecretBase_BrownCave4_EventObjects: @ 85395B0
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8539718
warp_def 2, 8, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc
index 8183eee67..6d61f06a7 100644
--- a/data/maps/SecretBase_BrownCave4/header.inc
+++ b/data/maps/SecretBase_BrownCave4/header.inc
@@ -10,6 +10,6 @@ SecretBase_BrownCave4: @ 8484CA4
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_RedCave1/events.inc
index edc9b8e78..e0d718068 100644
--- a/data/maps/SecretBase_RedCave1/events.inc
+++ b/data/maps/SecretBase_RedCave1/events.inc
@@ -1,19 +1,19 @@
SecretBase_RedCave1_EventObjects: @ 85378E4
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8537A4C
warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc
index 774e8471e..82fc8c4e3 100644
--- a/data/maps/SecretBase_RedCave1/header.inc
+++ b/data/maps/SecretBase_RedCave1/header.inc
@@ -10,6 +10,6 @@ SecretBase_RedCave1: @ 8484A90
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_RedCave2/events.inc
index c5817721e..365e3f353 100644
--- a/data/maps/SecretBase_RedCave2/events.inc
+++ b/data/maps/SecretBase_RedCave2/events.inc
@@ -1,19 +1,19 @@
SecretBase_RedCave2_EventObjects: @ 85381FC
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8538364
warp_def 3, 14, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc
index 2137748af..e4a2176d7 100644
--- a/data/maps/SecretBase_RedCave2/header.inc
+++ b/data/maps/SecretBase_RedCave2/header.inc
@@ -10,6 +10,6 @@ SecretBase_RedCave2: @ 8484B38
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_RedCave3/events.inc
index af7854d9e..16e14d49f 100644
--- a/data/maps/SecretBase_RedCave3/events.inc
+++ b/data/maps/SecretBase_RedCave3/events.inc
@@ -1,19 +1,19 @@
SecretBase_RedCave3_EventObjects: @ 8538B14
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8538C7C
warp_def 3, 6, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc
index 04b0ae23a..9317921e2 100644
--- a/data/maps/SecretBase_RedCave3/header.inc
+++ b/data/maps/SecretBase_RedCave3/header.inc
@@ -10,6 +10,6 @@ SecretBase_RedCave3: @ 8484BE0
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_RedCave4/events.inc
index 181e8d7c6..eaf227506 100644
--- a/data/maps/SecretBase_RedCave4/events.inc
+++ b/data/maps/SecretBase_RedCave4/events.inc
@@ -1,19 +1,19 @@
SecretBase_RedCave4_EventObjects: @ 853942C
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8539594
warp_def 2, 12, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc
index 94c8605a0..62fd094a4 100644
--- a/data/maps/SecretBase_RedCave4/header.inc
+++ b/data/maps/SecretBase_RedCave4/header.inc
@@ -10,6 +10,6 @@ SecretBase_RedCave4: @ 8484C88
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_Shrub1/events.inc
index aa8054a80..07eb2e1bd 100644
--- a/data/maps/SecretBase_Shrub1/events.inc
+++ b/data/maps/SecretBase_Shrub1/events.inc
@@ -1,19 +1,19 @@
SecretBase_Shrub1_EventObjects: @ 8538078
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 85381E0
warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc
index 85e94f158..4807cc485 100644
--- a/data/maps/SecretBase_Shrub1/header.inc
+++ b/data/maps/SecretBase_Shrub1/header.inc
@@ -10,6 +10,6 @@ SecretBase_Shrub1: @ 8484B1C
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_Shrub2/events.inc
index ecbbdfcb4..385500c5f 100644
--- a/data/maps/SecretBase_Shrub2/events.inc
+++ b/data/maps/SecretBase_Shrub2/events.inc
@@ -1,19 +1,19 @@
SecretBase_Shrub2_EventObjects: @ 8538990
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8538AF8
warp_def 7, 5, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc
index 7beeb3d8b..56df5fd2f 100644
--- a/data/maps/SecretBase_Shrub2/header.inc
+++ b/data/maps/SecretBase_Shrub2/header.inc
@@ -10,6 +10,6 @@ SecretBase_Shrub2: @ 8484BC4
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_Shrub3/events.inc
index 2a280d6c5..8cc399fed 100644
--- a/data/maps/SecretBase_Shrub3/events.inc
+++ b/data/maps/SecretBase_Shrub3/events.inc
@@ -1,19 +1,19 @@
SecretBase_Shrub3_EventObjects: @ 85392A8
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8539410
warp_def 6, 9, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc
index 18b1f132a..3b5ade8f3 100644
--- a/data/maps/SecretBase_Shrub3/header.inc
+++ b/data/maps/SecretBase_Shrub3/header.inc
@@ -10,6 +10,6 @@ SecretBase_Shrub3: @ 8484C6C
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_Shrub4/events.inc
index bef5f0ca2..16dfd4ba1 100644
--- a/data/maps/SecretBase_Shrub4/events.inc
+++ b/data/maps/SecretBase_Shrub4/events.inc
@@ -1,19 +1,19 @@
SecretBase_Shrub4_EventObjects: @ 8539BC0
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8539D28
warp_def 11, 8, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc
index 72c5724f6..816b963cb 100644
--- a/data/maps/SecretBase_Shrub4/header.inc
+++ b/data/maps/SecretBase_Shrub4/header.inc
@@ -10,6 +10,6 @@ SecretBase_Shrub4: @ 8484D14
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_Tree1/events.inc
index a2863ced7..8c7c05e6e 100644
--- a/data/maps/SecretBase_Tree1/events.inc
+++ b/data/maps/SecretBase_Tree1/events.inc
@@ -1,19 +1,19 @@
SecretBase_Tree1_EventObjects: @ 8537EF4
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 853805C
warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc
index a9a341696..f1ed545a5 100644
--- a/data/maps/SecretBase_Tree1/header.inc
+++ b/data/maps/SecretBase_Tree1/header.inc
@@ -10,6 +10,6 @@ SecretBase_Tree1: @ 8484B00
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_Tree2/events.inc
index d930de64f..e6b5c627b 100644
--- a/data/maps/SecretBase_Tree2/events.inc
+++ b/data/maps/SecretBase_Tree2/events.inc
@@ -1,19 +1,19 @@
SecretBase_Tree2_EventObjects: @ 853880C
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8538974
warp_def 3, 14, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc
index 86898ed15..2d8c2652c 100644
--- a/data/maps/SecretBase_Tree2/header.inc
+++ b/data/maps/SecretBase_Tree2/header.inc
@@ -10,6 +10,6 @@ SecretBase_Tree2: @ 8484BA8
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_Tree3/events.inc
index 6dda3e303..921c4f102 100644
--- a/data/maps/SecretBase_Tree3/events.inc
+++ b/data/maps/SecretBase_Tree3/events.inc
@@ -1,19 +1,19 @@
SecretBase_Tree3_EventObjects: @ 8539124
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 853928C
warp_def 8, 6, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc
index 6ef940796..e4f703d21 100644
--- a/data/maps/SecretBase_Tree3/header.inc
+++ b/data/maps/SecretBase_Tree3/header.inc
@@ -10,6 +10,6 @@ SecretBase_Tree3: @ 8484C50
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_Tree4/events.inc
index 493bc93db..ee2495e79 100644
--- a/data/maps/SecretBase_Tree4/events.inc
+++ b/data/maps/SecretBase_Tree4/events.inc
@@ -1,19 +1,19 @@
SecretBase_Tree4_EventObjects: @ 8539A3C
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8539BA4
warp_def 7, 12, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc
index 2a2523a07..7cf8ef024 100644
--- a/data/maps/SecretBase_Tree4/header.inc
+++ b/data/maps/SecretBase_Tree4/header.inc
@@ -10,6 +10,6 @@ SecretBase_Tree4: @ 8484CF8
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_YellowCave1/events.inc
index 04045999a..6beae3454 100644
--- a/data/maps/SecretBase_YellowCave1/events.inc
+++ b/data/maps/SecretBase_YellowCave1/events.inc
@@ -1,19 +1,19 @@
SecretBase_YellowCave1_EventObjects: @ 8537D70
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8537ED8
warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc
index d15eacc36..9bc1b071e 100644
--- a/data/maps/SecretBase_YellowCave1/header.inc
+++ b/data/maps/SecretBase_YellowCave1/header.inc
@@ -10,6 +10,6 @@ SecretBase_YellowCave1: @ 8484AE4
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_YellowCave2/events.inc
index d26d337ae..9378718c4 100644
--- a/data/maps/SecretBase_YellowCave2/events.inc
+++ b/data/maps/SecretBase_YellowCave2/events.inc
@@ -1,19 +1,19 @@
SecretBase_YellowCave2_EventObjects: @ 8538688
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 85387F0
warp_def 12, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc
index a1afc748a..60c0f49f0 100644
--- a/data/maps/SecretBase_YellowCave2/header.inc
+++ b/data/maps/SecretBase_YellowCave2/header.inc
@@ -10,6 +10,6 @@ SecretBase_YellowCave2: @ 8484B8C
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_YellowCave3/events.inc
index e888677b4..3a60b042b 100644
--- a/data/maps/SecretBase_YellowCave3/events.inc
+++ b/data/maps/SecretBase_YellowCave3/events.inc
@@ -1,19 +1,19 @@
SecretBase_YellowCave3_EventObjects: @ 8538FA0
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8539108
warp_def 5, 9, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc
index 798754531..b82555cf4 100644
--- a/data/maps/SecretBase_YellowCave3/header.inc
+++ b/data/maps/SecretBase_YellowCave3/header.inc
@@ -10,6 +10,6 @@ SecretBase_YellowCave3: @ 8484C34
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/events.inc b/data/maps/SecretBase_YellowCave4/events.inc
index 577693af9..13757dbef 100644
--- a/data/maps/SecretBase_YellowCave4/events.inc
+++ b/data/maps/SecretBase_YellowCave4/events.inc
@@ -1,19 +1,19 @@
SecretBase_YellowCave4_EventObjects: @ 85398B8
- object_event 1, 255, 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_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+ 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: @ 8539A20
warp_def 6, 12, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc
index 89921f1d4..d7056f380 100644
--- a/data/maps/SecretBase_YellowCave4/header.inc
+++ b/data/maps/SecretBase_YellowCave4/header.inc
@@ -10,6 +10,6 @@ SecretBase_YellowCave4: @ 8484CDC
.byte WEATHER_NONE
.byte MAP_TYPE_SECRET_BASE
.2byte 0
- .byte 12
+ 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/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
index 507ad7054..c4d7d39e9 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
@@ -10,6 +10,6 @@ ShoalCave_HighTideEntranceRoom: @ 8484438
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
index 1d334424b..f9983a781 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
@@ -10,6 +10,6 @@ ShoalCave_HighTideInnerRoom: @ 8484454
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
index 98614de64..656df8188 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
@@ -10,6 +10,6 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc
index 05b77a442..58669c0c6 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc
@@ -10,6 +10,6 @@ ShoalCave_LowTideIceRoom: @ 84847D4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
index b1ab8a459..7f21d0a22 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
@@ -10,6 +10,6 @@ ShoalCave_LowTideInnerRoom: @ 84843E4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
index 0c8380b79..21ea185ea 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
@@ -10,6 +10,6 @@ ShoalCave_LowTideLowerRoom: @ 848441C
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
index 8a977c94e..7d7089f85 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
@@ -10,6 +10,6 @@ ShoalCave_LowTideStairsRoom: @ 8484400
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc
index fe4b69f96..ac5f23b1e 100644
--- a/data/maps/SingleBattleColosseum/header.inc
+++ b/data/maps/SingleBattleColosseum/header.inc
@@ -10,6 +10,6 @@ SingleBattleColosseum: @ 8484D30
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc
index 842ec79cd..9f76317d8 100644
--- a/data/maps/SkyPillar_1F/header.inc
+++ b/data/maps/SkyPillar_1F/header.inc
@@ -10,6 +10,6 @@ SkyPillar_1F: @ 8484764
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SkyPillar_2F/header.inc
index e018869b9..833510702 100644
--- a/data/maps/SkyPillar_2F/header.inc
+++ b/data/maps/SkyPillar_2F/header.inc
@@ -10,6 +10,6 @@ SkyPillar_2F: @ 8484780
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SkyPillar_3F/header.inc
index e3b2c3c40..5381079f6 100644
--- a/data/maps/SkyPillar_3F/header.inc
+++ b/data/maps/SkyPillar_3F/header.inc
@@ -10,6 +10,6 @@ SkyPillar_3F: @ 848479C
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SkyPillar_4F/header.inc
index 23addaa76..ff91215e0 100644
--- a/data/maps/SkyPillar_4F/header.inc
+++ b/data/maps/SkyPillar_4F/header.inc
@@ -10,6 +10,6 @@ SkyPillar_4F: @ 84847B8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SkyPillar_5F/header.inc
index 46830945d..06618c766 100644
--- a/data/maps/SkyPillar_5F/header.inc
+++ b/data/maps/SkyPillar_5F/header.inc
@@ -10,6 +10,6 @@ SkyPillar_5F: @ 84847F0
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/SkyPillar_Entrance/header.inc
index bafe1880a..434b1f85a 100644
--- a/data/maps/SkyPillar_Entrance/header.inc
+++ b/data/maps/SkyPillar_Entrance/header.inc
@@ -10,6 +10,6 @@ SkyPillar_Entrance: @ 848472C
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc
index 5e7ff153c..3ca072c80 100644
--- a/data/maps/SkyPillar_Outside/header.inc
+++ b/data/maps/SkyPillar_Outside/header.inc
@@ -10,6 +10,6 @@ SkyPillar_Outside: @ 8484748
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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_Top/header.inc b/data/maps/SkyPillar_Top/header.inc
index d4afb6ad1..07dbd38bb 100644
--- a/data/maps/SkyPillar_Top/header.inc
+++ b/data/maps/SkyPillar_Top/header.inc
@@ -10,6 +10,6 @@ SkyPillar_Top: @ 848480C
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 12
+ 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/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc
index 335a1a094..b8454f656 100644
--- a/data/maps/SlateportCity/header.inc
+++ b/data/maps/SlateportCity/header.inc
@@ -10,6 +10,6 @@ SlateportCity: @ 84824D4
.byte WEATHER_SUNNY
.byte MAP_TYPE_CITY
.2byte 0
- .byte 13
+ 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_BattleTentBattleRoom/events.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc
index 6c28d5fc5..71e8d6d3a 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc
@@ -1,7 +1,7 @@
SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC
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_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 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
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 0b6c6bd39..e9044f1e9 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
@@ -10,6 +10,6 @@ SlateportCity_BattleTentBattleRoom: @ 848314C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
index 74c64d0f2..9df0e0a6a 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
@@ -10,9 +10,9 @@ SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970
SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_209994
return
diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc
index 926a367ee..0a273edef 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/header.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc
@@ -10,6 +10,6 @@ SlateportCity_BattleTentCorridor: @ 8483130
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc
index d4689afde..6bbbbf45f 100644
--- a/data/maps/SlateportCity_BattleTentLobby/header.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/header.inc
@@ -10,6 +10,6 @@ SlateportCity_BattleTentLobby: @ 8483114
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SlateportCity_Harbor/header.inc
index 5a31901a3..922f84f1a 100644
--- a/data/maps/SlateportCity_Harbor/header.inc
+++ b/data/maps/SlateportCity_Harbor/header.inc
@@ -10,6 +10,6 @@ SlateportCity_Harbor: @ 84831D8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SlateportCity_House1/header.inc
index 06e2689cd..1e48dfb54 100644
--- a/data/maps/SlateportCity_House1/header.inc
+++ b/data/maps/SlateportCity_House1/header.inc
@@ -10,6 +10,6 @@ SlateportCity_House1: @ 8483168
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SlateportCity_House2/header.inc
index 5612c6df0..6028d12fb 100644
--- a/data/maps/SlateportCity_House2/header.inc
+++ b/data/maps/SlateportCity_House2/header.inc
@@ -10,6 +10,6 @@ SlateportCity_House2: @ 84831F4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SlateportCity_Mart/header.inc
index 764b8e9b5..2d53ac8c3 100644
--- a/data/maps/SlateportCity_Mart/header.inc
+++ b/data/maps/SlateportCity_Mart/header.inc
@@ -10,6 +10,6 @@ SlateportCity_Mart: @ 8483248
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
index 40b265c1d..b75a12f60 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
@@ -10,6 +10,6 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
index 857443db1..a571c2372 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
@@ -10,6 +10,6 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
index 0c4696d86..37f19272d 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ SlateportCity_PokemonCenter_1F: @ 8483210
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
index 8026aaf41..1cac2f35e 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ SlateportCity_PokemonCenter_2F: @ 848322C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc
index 90b17f14a..b3b0dc899 100644
--- a/data/maps/SlateportCity_PokemonFanClub/header.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/header.inc
@@ -10,6 +10,6 @@ SlateportCity_PokemonFanClub: @ 8483184
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
index 48d184517..e702530ef 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
@@ -10,6 +10,6 @@ SlateportCity_SternsShipyard_1F: @ 84830DC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
index b868e843a..8139d7604 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
@@ -10,6 +10,6 @@ SlateportCity_SternsShipyard_2F: @ 84830F8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SootopolisCity/header.inc
index e635b6f80..1b6832fbe 100644
--- a/data/maps/SootopolisCity/header.inc
+++ b/data/maps/SootopolisCity/header.inc
@@ -10,6 +10,6 @@ SootopolisCity: @ 848257C
.byte WEATHER_SUNNY
.byte MAP_TYPE_CITY
.2byte 0
- .byte 13
+ 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_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc
index 8b5c93c0d..1d71e0923 100644
--- a/data/maps/SootopolisCity_Gym_1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_1F/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_Gym_1F: @ 8483A28
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc
index 84caedcf8..c06afbc1b 100644
--- a/data/maps/SootopolisCity_Gym_B1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_Gym_B1F: @ 8483A44
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc
index 0b4eae619..f7621f917 100644
--- a/data/maps/SootopolisCity_House1/header.inc
+++ b/data/maps/SootopolisCity_House1/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_House1: @ 8483AB4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SootopolisCity_House2/header.inc
index a0d8b4fb4..c32962718 100644
--- a/data/maps/SootopolisCity_House2/header.inc
+++ b/data/maps/SootopolisCity_House2/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_House2: @ 8483AD0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SootopolisCity_House3/header.inc
index 015f6fe6c..bd90fabc0 100644
--- a/data/maps/SootopolisCity_House3/header.inc
+++ b/data/maps/SootopolisCity_House3/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_House3: @ 8483AEC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SootopolisCity_House4/header.inc
index 21c8c9235..f71568287 100644
--- a/data/maps/SootopolisCity_House4/header.inc
+++ b/data/maps/SootopolisCity_House4/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_House4: @ 8483B08
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SootopolisCity_House5/header.inc
index 60fa216ca..d3d90fb05 100644
--- a/data/maps/SootopolisCity_House5/header.inc
+++ b/data/maps/SootopolisCity_House5/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_House5: @ 8483B24
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SootopolisCity_House6/header.inc
index 112aa8a6d..e3daef4ed 100644
--- a/data/maps/SootopolisCity_House6/header.inc
+++ b/data/maps/SootopolisCity_House6/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_House6: @ 8483B40
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SootopolisCity_House7/header.inc
index a01616419..db988ed22 100644
--- a/data/maps/SootopolisCity_House7/header.inc
+++ b/data/maps/SootopolisCity_House7/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_House7: @ 8483B5C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
index b89221bac..47f68b58f 100644
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SootopolisCity_Mart/header.inc
index 4bdd9ef8d..131540c7a 100644
--- a/data/maps/SootopolisCity_Mart/header.inc
+++ b/data/maps/SootopolisCity_Mart/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_Mart: @ 8483A98
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
index be2d37eb6..153be53cb 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc
index 39b3366c5..5cdbf0559 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc
@@ -1,5 +1,5 @@
SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC
- object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
+ 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
warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
index 6635dc3d7..e0355b074 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
index c66b725fd..75da1fc47 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
index 3a2844f4e..f9e1c5189 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc
index f6153e13f..4aa0eff1a 100644
--- a/data/maps/SouthernIsland_Exterior/header.inc
+++ b/data/maps/SouthernIsland_Exterior/header.inc
@@ -10,6 +10,6 @@ SouthernIsland_Exterior: @ 8485238
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/events.inc b/data/maps/SouthernIsland_Interior/events.inc
index cc8256e8c..000386c33 100644
--- a/data/maps/SouthernIsland_Interior/events.inc
+++ b/data/maps/SouthernIsland_Interior/events.inc
@@ -1,6 +1,6 @@
SouthernIsland_Interior_EventObjects: @ 853B89C
- object_event 1, EVENT_OBJ_GFX_HIPSTER, 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_TRADER, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON
+ 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
warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR
diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc
index e674840cf..b1238c4f7 100644
--- a/data/maps/SouthernIsland_Interior/header.inc
+++ b/data/maps/SouthernIsland_Interior/header.inc
@@ -10,6 +10,6 @@ SouthernIsland_Interior: @ 8485254
.byte WEATHER_SHADE
.byte MAP_TYPE_ROUTE
.2byte 0
- .byte 13
+ 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/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc
index 33d6581a8..4f8dba7e5 100644
--- a/data/maps/SouthernIsland_Interior/scripts.inc
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
@@ -34,9 +34,9 @@ SouthernIsland_Interior_EventScript_242A95:: @ 8242A95
SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq SouthernIsland_Interior_EventScript_242AB8
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq SouthernIsland_Interior_EventScript_242ABE
end
diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc
index b69a9b501..8ba9f7d45 100644
--- a/data/maps/TerraCave_End/header.inc
+++ b/data/maps/TerraCave_End/header.inc
@@ -10,6 +10,6 @@ TerraCave_End: @ 8484A3C
.byte WEATHER_FOG_1
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 14
+ 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_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc
index 88ef9d3ef..b75c86799 100644
--- a/data/maps/TerraCave_Entrance/header.inc
+++ b/data/maps/TerraCave_Entrance/header.inc
@@ -10,6 +10,6 @@ TerraCave_Entrance: @ 8484A20
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc
index 947cdbde2..9b621cb02 100644
--- a/data/maps/TradeCenter/header.inc
+++ b/data/maps/TradeCenter/header.inc
@@ -10,6 +10,6 @@ TradeCenter: @ 8484D4C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_1F/header.inc b/data/maps/TrainerHill_1F/header.inc
index b21e67e69..3c6b58119 100644
--- a/data/maps/TrainerHill_1F/header.inc
+++ b/data/maps/TrainerHill_1F/header.inc
@@ -10,6 +10,6 @@ TrainerHill_1F: @ 84857E8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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/header.inc b/data/maps/TrainerHill_2F/header.inc
index e2a02834e..d8343060c 100644
--- a/data/maps/TrainerHill_2F/header.inc
+++ b/data/maps/TrainerHill_2F/header.inc
@@ -10,6 +10,6 @@ TrainerHill_2F: @ 8485804
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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/header.inc b/data/maps/TrainerHill_3F/header.inc
index c7513cc96..db82eb277 100644
--- a/data/maps/TrainerHill_3F/header.inc
+++ b/data/maps/TrainerHill_3F/header.inc
@@ -10,6 +10,6 @@ TrainerHill_3F: @ 8485820
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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/header.inc b/data/maps/TrainerHill_4F/header.inc
index f25ce4e97..d699f53d5 100644
--- a/data/maps/TrainerHill_4F/header.inc
+++ b/data/maps/TrainerHill_4F/header.inc
@@ -10,6 +10,6 @@ TrainerHill_4F: @ 848583C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc
index 0d4e95af3..936b7712d 100644
--- a/data/maps/TrainerHill_Elevator/header.inc
+++ b/data/maps/TrainerHill_Elevator/header.inc
@@ -10,6 +10,6 @@ TrainerHill_Elevator: @ 8485ADC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc
index 8e8eb4b91..79d6c8b96 100644
--- a/data/maps/TrainerHill_Entrance/header.inc
+++ b/data/maps/TrainerHill_Entrance/header.inc
@@ -10,6 +10,6 @@ TrainerHill_Entrance: @ 84857CC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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/header.inc b/data/maps/TrainerHill_Roof/header.inc
index d4d431dc5..9f0b0dd3b 100644
--- a/data/maps/TrainerHill_Roof/header.inc
+++ b/data/maps/TrainerHill_Roof/header.inc
@@ -10,6 +10,6 @@ TrainerHill_Roof: @ 8485858
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 4
+ 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/Underwater1/header.inc b/data/maps/Underwater1/header.inc
index bf5589117..7cf954299 100644
--- a/data/maps/Underwater1/header.inc
+++ b/data/maps/Underwater1/header.inc
@@ -10,6 +10,6 @@ Underwater1: @ 8482A30
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Underwater2/header.inc
index 5bd5b037b..a4c14ab28 100644
--- a/data/maps/Underwater2/header.inc
+++ b/data/maps/Underwater2/header.inc
@@ -10,6 +10,6 @@ Underwater2: @ 8482A4C
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Underwater3/header.inc
index 064a732a5..4e91eb687 100644
--- a/data/maps/Underwater3/header.inc
+++ b/data/maps/Underwater3/header.inc
@@ -10,6 +10,6 @@ Underwater3: @ 8482A68
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Underwater4/header.inc
index 7752479de..804fb1d14 100644
--- a/data/maps/Underwater4/header.inc
+++ b/data/maps/Underwater4/header.inc
@@ -10,6 +10,6 @@ Underwater4: @ 8482A84
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Underwater5/header.inc
index dda2f54b1..8ad3b5ba2 100644
--- a/data/maps/Underwater5/header.inc
+++ b/data/maps/Underwater5/header.inc
@@ -10,6 +10,6 @@ Underwater5: @ 8482AA0
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Underwater6/header.inc
index 17769c331..4e978a1e7 100644
--- a/data/maps/Underwater6/header.inc
+++ b/data/maps/Underwater6/header.inc
@@ -10,6 +10,6 @@ Underwater6: @ 8482ABC
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Underwater7/header.inc
index f5bc3bfa3..132eb867e 100644
--- a/data/maps/Underwater7/header.inc
+++ b/data/maps/Underwater7/header.inc
@@ -10,6 +10,6 @@ Underwater7: @ 8482AD8
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Underwater_MarineCave/header.inc
index 7232ba916..88fe213ab 100644
--- a/data/maps/Underwater_MarineCave/header.inc
+++ b/data/maps/Underwater_MarineCave/header.inc
@@ -10,6 +10,6 @@ Underwater_MarineCave: @ 84849CC
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Underwater_Route134/header.inc
index 71332ec78..591dffa53 100644
--- a/data/maps/Underwater_Route134/header.inc
+++ b/data/maps/Underwater_Route134/header.inc
@@ -10,6 +10,6 @@ Underwater_Route134: @ 848464C
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc
index bc2efc58e..08eac747c 100644
--- a/data/maps/Underwater_SeafloorCavern/header.inc
+++ b/data/maps/Underwater_SeafloorCavern/header.inc
@@ -10,6 +10,6 @@ Underwater_SeafloorCavern: @ 8484198
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Underwater_SealedChamber/header.inc
index 0c6e94575..94fcc6ba7 100644
--- a/data/maps/Underwater_SealedChamber/header.inc
+++ b/data/maps/Underwater_SealedChamber/header.inc
@@ -10,6 +10,6 @@ Underwater_SealedChamber: @ 8484668
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/header.inc b/data/maps/Underwater_SootopolisCity/header.inc
index c4f55b1ef..1611026e0 100644
--- a/data/maps/Underwater_SootopolisCity/header.inc
+++ b/data/maps/Underwater_SootopolisCity/header.inc
@@ -10,6 +10,6 @@ Underwater_SootopolisCity: @ 8483F4C
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
- .byte 13
+ 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/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc
index 0cebf1502..3ab614468 100644
--- a/data/maps/UnionRoom/events.inc
+++ b/data/maps/UnionRoom/events.inc
@@ -1,13 +1,13 @@
UnionRoom_EventObjects: @ 853B020
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_GIDDY, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, FLAG_HIDE_UNION_ROOM_PLAYER_4
- object_event 3, 247, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, FLAG_HIDE_UNION_ROOM_PLAYER_8
- object_event 4, 246, 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_PLACEHOLDER_2, 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_PLACEHOLDER_1, 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_STORYTELLER, 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_TRADER, 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_HIPSTER, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, FLAG_HIDE_UNION_ROOM_PLAYER_1
+ 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: @ 853B0F8
warp_def 7, 11, 3, 127, MAP_NONE
diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc
index 29608287d..29fd3cc3f 100644
--- a/data/maps/UnionRoom/header.inc
+++ b/data/maps/UnionRoom/header.inc
@@ -10,6 +10,6 @@ UnionRoom: @ 8485120
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 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/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc
index 3241622ac..a3777fd80 100644
--- a/data/maps/UnknownMap_25_29/header.inc
+++ b/data/maps/UnknownMap_25_29/header.inc
@@ -10,6 +10,6 @@ UnknownMap_25_29: @ 8484DBC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/UnknownMap_25_30/header.inc
index c1188df54..a4184b85d 100644
--- a/data/maps/UnknownMap_25_30/header.inc
+++ b/data/maps/UnknownMap_25_30/header.inc
@@ -10,6 +10,6 @@ UnknownMap_25_30: @ 8484DD8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/UnknownMap_25_31/header.inc
index 68eb31bc6..ec4838bd5 100644
--- a/data/maps/UnknownMap_25_31/header.inc
+++ b/data/maps/UnknownMap_25_31/header.inc
@@ -10,6 +10,6 @@ UnknownMap_25_31: @ 8484DF4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/UnknownMap_25_32/header.inc
index c8d16cd09..39e982093 100644
--- a/data/maps/UnknownMap_25_32/header.inc
+++ b/data/maps/UnknownMap_25_32/header.inc
@@ -10,6 +10,6 @@ UnknownMap_25_32: @ 8484E10
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/UnknownMap_25_33/header.inc
index 45f9543df..87f8b0c1e 100644
--- a/data/maps/UnknownMap_25_33/header.inc
+++ b/data/maps/UnknownMap_25_33/header.inc
@@ -10,6 +10,6 @@ UnknownMap_25_33: @ 8484E2C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/UnknownMap_25_34/header.inc
index 0b612b27c..c053c5e19 100644
--- a/data/maps/UnknownMap_25_34/header.inc
+++ b/data/maps/UnknownMap_25_34/header.inc
@@ -10,6 +10,6 @@ UnknownMap_25_34: @ 8484E48
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc
index efb82a907..fe88972df 100644
--- a/data/maps/UnknownMap_25_34/scripts.inc
+++ b/data/maps/UnknownMap_25_34/scripts.inc
@@ -442,9 +442,9 @@ LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC
LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4
return
diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc
index e07566710..053a58712 100644
--- a/data/maps/VerdanturfTown/header.inc
+++ b/data/maps/VerdanturfTown/header.inc
@@ -10,6 +10,6 @@ VerdanturfTown: @ 8482640
.byte WEATHER_SUNNY
.byte MAP_TYPE_TOWN
.2byte 0
- .byte 13
+ 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_BattleTentBattleRoom/events.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc
index 8992f7fc5..ee91fff2c 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc
@@ -1,6 +1,6 @@
VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734
- object_event 1, EVENT_OBJ_GFX_TRADER, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
- object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 11, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+ 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
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
index 30daf14ca..8a95c60a3 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
@@ -10,6 +10,6 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
index e6a61184e..52aed7618 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
@@ -10,9 +10,9 @@ VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A
VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333
return
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
index e75e2f003..5aa6fcc46 100644
--- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
@@ -10,6 +10,6 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc
index 5852d60f4..3f3eb1ae6 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc
@@ -10,6 +10,6 @@ VerdanturfTown_BattleTentLobby: @ 8482E58
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
index dfb4b0d05..43148f8ef 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
@@ -10,6 +10,6 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/VerdanturfTown_House/header.inc
index 7f223d09a..5c3e26d09 100644
--- a/data/maps/VerdanturfTown_House/header.inc
+++ b/data/maps/VerdanturfTown_House/header.inc
@@ -10,6 +10,6 @@ VerdanturfTown_House: @ 8482F38
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/VerdanturfTown_Mart/header.inc
index 4846b25e3..0441f8147 100644
--- a/data/maps/VerdanturfTown_Mart/header.inc
+++ b/data/maps/VerdanturfTown_Mart/header.inc
@@ -10,6 +10,6 @@ VerdanturfTown_Mart: @ 8482EAC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
index 9ae2edb7f..e1d7d3fa8 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
index a2a5a929e..933a3da18 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags 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/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc
index 1887b7880..573fe6f76 100644
--- a/data/maps/VerdanturfTown_WandasHouse/header.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/header.inc
@@ -10,6 +10,6 @@ VerdanturfTown_WandasHouse: @ 8482F00
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
- .byte 0
+ map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc
index 56b800a29..950f26aa5 100644
--- a/data/maps/VictoryRoad_1F/header.inc
+++ b/data/maps/VictoryRoad_1F/header.inc
@@ -10,6 +10,6 @@ VictoryRoad_1F: @ 8484374
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/VictoryRoad_B1F/header.inc
index 6650653ef..d89408de9 100644
--- a/data/maps/VictoryRoad_B1F/header.inc
+++ b/data/maps/VictoryRoad_B1F/header.inc
@@ -10,6 +10,6 @@ VictoryRoad_B1F: @ 8484390
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/header.inc b/data/maps/VictoryRoad_B2F/header.inc
index c89256b33..462898c2b 100644
--- a/data/maps/VictoryRoad_B2F/header.inc
+++ b/data/maps/VictoryRoad_B2F/header.inc
@@ -10,6 +10,6 @@ VictoryRoad_B2F: @ 84843AC
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
- .byte 15
+ 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/scripts/players_house.inc b/data/scripts/players_house.inc
index a198b0774..eb29ef6e0 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -68,9 +68,9 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799
setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1
setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2927DF
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_29280F
playse SE_KAIDAN
removeobject VAR_0x8008
@@ -438,9 +438,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2
LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
lockall
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C76
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C86
compare VAR_0x8008, 0
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 2932401e1..1fcf5d166 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -40,7 +40,7 @@ EventScript_2A4B9B:: @ 82A4B9B
releaseall
goto EventScript_2A4B5D
-EventScript_2A4BAC:: @ 82A4BAC
+EventScript_PokeBlockFeeder:: @ 82A4BAC
lockall
special GetPokeblockFeederInFront
compare VAR_RESULT, 65535
diff --git a/data/specials.inc b/data/specials.inc
index fed1b6641..dd8a51b34 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -263,10 +263,10 @@ gSpecials:: @ 81DBA64
def_special BedroomPC
def_special PlayerPC
def_special FieldShowRegionMap
- def_special sub_807E73C
- def_special sub_807EA10
- def_special sub_807F0E4
- def_special sub_807E9D4
+ def_special GetInGameTradeSpeciesInfo
+ def_special CreateInGameTradePokemon
+ def_special DoInGameTradeScene
+ def_special GetTradeSpecies
def_special GetWeekCount
def_special RetrieveLotteryNumber
def_special PickLotteryCornerTicket
@@ -328,8 +328,8 @@ gSpecials:: @ 81DBA64
def_special DoSealedChamberShakingEffect2
def_special FoundBlackGlasses
def_special sub_80AC81C
- def_special sp13E_warp_to_last_warp
- def_special sp13F_fall_to_last_warp
+ def_special DoDiveWarp
+ def_special DoFallWarp
def_special ShowContestEntryMonPic
def_special sub_80F8EB8
def_special SetEReaderTrainerGfxId
@@ -488,7 +488,7 @@ gSpecials:: @ 81DBA64
def_special sub_81B892C
def_special sub_813AEB4
def_special sub_813AF48
- def_special sub_813AFC8
+ def_special DoDeoxysRockInteraction
def_special sub_813B1D0
def_special CreateObedientEnemyMon
def_special StartMirageTowerDisintegration
diff --git a/data/trade.s b/data/trade.s
deleted file mode 100644
index b96c5adb3..000000000
--- a/data/trade.s
+++ /dev/null
@@ -1,646 +0,0 @@
-#include "constants/species.h"
-#include "constants/items.h"
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gUnknown_0832C6A8:: @ 832C6A8
- .4byte 0x00000f2c, 0x00003d88, 0x0000001c, 0x00000024, 0x00000064, 0x00000528
-
- .align 1
-gTradeMovesBoxTilemap:: @ 832C6C0
- .incbin "graphics/trade/moves_box_map.bin"
-
- .align 1
-gTradePartyBoxTilemap:: @ 832C8BE
- .incbin "graphics/trade/party_box_map.bin"
-
- .align 1
-gTradeStripesBG2Tilemap:: @ 832CABC
- .incbin "graphics/trade/stripes_bg2_map.bin"
-
- .align 1
-gTradeStripesBG3Tilemap:: @ 832D2BC
- .incbin "graphics/trade/stripes_bg3_map.bin"
-
-gText_EmptyString7:: @ 832DABC
- .string "$"
-
-gText_ClrWhtHltTrspntShdwDrkGry:: @ 832DABD
- .string "{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}$"
-
-gText_MaleSymbol4:: @ 832DAC7
- .string "♂$"
-
-gText_FemaleSymbol4:: @ 832DAC9
- .string "♀$"
-
-gText_GenderlessSymbol:: @ 832DACB
- .string "$"
-
-gText_SpaceMove:: @ 832DACC
- .string " MOVE$"
-
-gText_NewLine3:: @ 832DAD2
- .string "\n$"
-
-gText_Slash2:: @ 832DAD4
- .string "/$"
-
-gText_Lv2:: @ 832DAD6
- .string "Lv. $"
-
-gText_ThreeDashes2:: @ 832DADB
- .string "---$"
-
-gText_FourQuestionMarks:: @ 832DADF
- .string "????$"
-
-gText_832DAE4:: @ 832DAE4
- .string "$"
-
-gText_IsThisTradeOkay:: @ 832DAE5
- .string "Is this trade okay?$"
-
-gText_Cancel6:: @ 832DAF9
- .string "CANCEL$"
-
-gText_ChooseAPkmn:: @ 832DB00
- .string "Choose a POKéMON.$"
-
-gText_Summary3:: @ 832DB12
- .string "SUMMARY$"
-
-gText_Trade2:: @ 832DB1A
- .string "TRADE$"
-
-gText_CancelTrade:: @ 832DB20
- .string "Cancel trade?$"
-
-gJPText_832DB2E:: @ 832DB2E
- .string "Bボタン で もどります$"
-
-gText_Summary4:: @ 832DB3B
- .string "SUMMARY$"
-
-gText_Trade3:: @ 832DB43
- .string "TRADE$"
-
-gText_CommunicationStandby6:: @ 832DB49
- .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Communication standby…\nPlease wait.$"
-
-gText_TheTradeHasBeenCanceled:: @ 832DB76
- .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}The trade has\nbeen canceled.$"
-
-gText_YourOnlyPkmnForBattle:: @ 832DB9C
- .string "That's your only\nPOKéMON for battle.$"
-
-gText_WaitingForYourFriend:: @ 832DBC1
- .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…$"
-
-gText_YourFriendWantsToTrade:: @ 832DBED
- .string "Your friend wants\nto trade POKéMON.$"
-
- .align 2
-gOamData_832DC14:: @ 832DC14
- .2byte 0x4000, 0x8000, 0x0400, 0x0000
-
- .align 2
-gOamData_832DC1C:: @ 832DC1C
- .2byte 0x4000, 0xc000, 0x0400, 0x0000
-
- .align 2
-gSpriteAnim_832DC24:: @ 832DC24
- .2byte 0x0000, 0x0005, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_832DC2C:: @ 832DC2C
- .2byte 0x0020, 0x0005, 0xffff, 0x0000
-
- .align 2
-gSpriteAnimTable_832DC34:: @ 832DC34
- .4byte gSpriteAnim_832DC24
- .4byte gSpriteAnim_832DC2C
-
- .align 2
-gUnknown_0832DC3C:: @ 832DC3C
- obj_tiles gUnknown_08DDC6E4, 0x0800, 0x012c
-
- .align 2
-gUnknown_0832DC44:: @ 832DC44
- obj_pal gUnknown_08DDB444, 0x0929
-
- .align 2
-gSpriteAnim_832DC4C:: @ 832DC4C
- .2byte 0x0000, 0x0005, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_832DC54:: @ 832DC54
- .2byte 0x0008, 0x0005, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_832DC5C:: @ 832DC5C
- .2byte 0x0010, 0x0005, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_832DC64:: @ 832DC64
- .2byte 0x0018, 0x0005, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_832DC6C:: @ 832DC6C
- .2byte 0x0020, 0x0005, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_832DC74:: @ 832DC74
- .2byte 0x0028, 0x0005, 0xffff, 0x0000
-
- .align 2
-gSpriteAnimTable_832DC7C:: @ 832DC7C
- .4byte gSpriteAnim_832DC4C
- .4byte gSpriteAnim_832DC54
- .4byte gSpriteAnim_832DC5C
- .4byte gSpriteAnim_832DC64
- .4byte gSpriteAnim_832DC6C
- .4byte gSpriteAnim_832DC74
-
- .align 2
-gSpriteTemplate_832DC94:: @ 832DC94
- spr_template 0x012c, 0x0929, gOamData_832DC1C, gSpriteAnimTable_832DC34, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
- .align 2
-gSpriteTemplate_832DCAC:: @ 832DCAC
- spr_template 0x00c8, 0x133d, gOamData_832DC14, gSpriteAnimTable_832DC7C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
- .align 2
-TradeScreenTextPalette:: @ 832DCC4
- .incbin "graphics/trade/text.gbapal"
-
- .align 2
-gSpritePalette_TradeScreenText:: @ 832DCE4
- obj_pal TradeScreenTextPalette, 0x133d
-
-gUnknown_0832DCEC:: @ 832DCEC
- .byte 0x04, 0x02, 0x0c, 0x0c, 0x00, 0x00, 0x02, 0x04, 0x0c, 0x0c, 0x00, 0x00, 0x07, 0x06, 0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x07, 0x00, 0x00, 0x00, 0x05, 0x03, 0x0c, 0x0c, 0x00, 0x00, 0x03, 0x05
- .byte 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x07, 0x06, 0x01, 0x00, 0x00, 0x06, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x08, 0x07, 0x06
- .byte 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x05, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x09, 0x08, 0x07, 0x00, 0x00, 0x08, 0x09, 0x06, 0x06, 0x00, 0x00
- .byte 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x01, 0x01
- .byte 0x01, 0x01, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x0a, 0x08, 0x06, 0x00, 0x00, 0x00, 0x0a, 0x08, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x0a, 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x09, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x0c
- .byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x04, 0x03, 0x02
- .byte 0x01, 0x00, 0x0b, 0x09, 0x07, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x0b, 0x09, 0x07, 0x06, 0x00, 0x00, 0x07, 0x06, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00
-
-gUnknown_0832DE24:: @ 832DE24
- .byte 0x01, 0x05, 0x08, 0x05, 0x01, 0x0a, 0x08, 0x0a, 0x01, 0x0f, 0x08, 0x0f, 0x10, 0x05, 0x17, 0x05, 0x10, 0x0a, 0x17, 0x0a, 0x10, 0x0f, 0x17, 0x0f, 0x17, 0x12
-
-gUnknown_0832DE3E:: @ 832DE3E
- .byte 0x05, 0x04, 0x0c, 0x04, 0x05, 0x09, 0x0c, 0x09, 0x05, 0x0e, 0x0c, 0x0e, 0x14, 0x04, 0x1b, 0x04, 0x14, 0x09, 0x1b, 0x09, 0x14, 0x0e, 0x1b, 0x0e
-
-gUnknown_0832DE56:: @ 832DE56
- .byte 0x01, 0x03, 0x08, 0x03, 0x01, 0x08, 0x08, 0x08, 0x01, 0x0d, 0x08, 0x0d, 0x10, 0x03, 0x17, 0x03, 0x10, 0x08, 0x17, 0x08, 0x10, 0x0d, 0x17, 0x0d, 0x00, 0x0e, 0x0f, 0x1d, 0x03, 0x05, 0x03, 0x07
- .byte 0x12, 0x05, 0x12, 0x07, 0x08, 0x07, 0x16, 0x0c, 0x08, 0x07, 0x16, 0x0c, 0x06, 0x07, 0x18, 0x0c, 0x06, 0x07, 0x18, 0x0c, 0x08, 0x07, 0x16, 0x0c, 0x07, 0x07, 0x17, 0x0c, 0x00, 0x00
-
- .align 2
-gUnknown_0832DE94:: @ 832DE94
- .4byte gText_Cancel6
- .4byte gText_ChooseAPkmn
- .4byte gText_Summary3
- .4byte gText_Trade2
- .4byte gText_CancelTrade
- .4byte gJPText_832DB2E
-
- .align 2
-gUnknown_0832DEAC:: @ 832DEAC
- .4byte gText_Summary4, sub_807A000
- .4byte gText_Trade3, sub_807A024
-
- .align 2
-gUnknown_0832DEBC:: @ 832DEBC
- .4byte gText_CommunicationStandby6
- .4byte gText_TheTradeHasBeenCanceled
- .4byte gText_YourOnlyPkmnForBattle
- .4byte gText_OnlyPkmnForBattle
- .4byte gText_WaitingForYourFriend
- .4byte gText_YourFriendWantsToTrade
- .4byte gText_PkmnCantBeTradedNow
- .4byte gText_EggCantBeTradedNow
- .4byte gText_OtherTrainersPkmnCantBeTraded
-
-gUnknown_0832DEE0:: @ 832DEE0
- .byte 0x00, 0x01, 0x02, 0x00
-
- .align 2
-gUnknown_0832DEE4:: @ 832DEE4
- .4byte 0x000001f8, 0x00001051, 0x00002062, 0x00003073
-
- .align 2
-gUnknown_0832DEF4:: @ 832DEF4
- window_template 0x00, 0x04, 0x07, 0x16, 0x04, 0x0f, 0x001e
- window_template 0x00, 0x13, 0x0f, 0x0a, 0x04, 0x0f, 0x0076
- window_template 0x00, 0x00, 0x05, 0x08, 0x02, 0x0d, 0x009e
- window_template 0x00, 0x07, 0x05, 0x08, 0x02, 0x0d, 0x00ae
- window_template 0x00, 0x00, 0x0a, 0x08, 0x02, 0x0d, 0x00be
- window_template 0x00, 0x07, 0x0a, 0x08, 0x02, 0x0d, 0x00ce
- window_template 0x00, 0x00, 0x0f, 0x08, 0x02, 0x0d, 0x00de
- window_template 0x00, 0x07, 0x0f, 0x08, 0x02, 0x0d, 0x00ee
- window_template 0x00, 0x0f, 0x05, 0x08, 0x02, 0x0d, 0x00fe
- window_template 0x00, 0x16, 0x05, 0x08, 0x02, 0x0d, 0x010e
- window_template 0x00, 0x0f, 0x0a, 0x08, 0x02, 0x0d, 0x011e
- window_template 0x00, 0x16, 0x0a, 0x08, 0x02, 0x0d, 0x012e
- window_template 0x00, 0x0f, 0x0f, 0x08, 0x02, 0x0d, 0x013e
- window_template 0x00, 0x16, 0x0f, 0x08, 0x02, 0x0d, 0x014e
- window_template 0x00, 0x02, 0x05, 0x0e, 0x02, 0x0d, 0x015e
- window_template 0x00, 0x03, 0x08, 0x0b, 0x08, 0x0f, 0x017a
- window_template 0x00, 0x11, 0x05, 0x0e, 0x02, 0x0f, 0x01d2
- window_template 0x00, 0x12, 0x08, 0x0b, 0x08, 0x0f, 0x01ee
- null_window_template
-
- .align 2
-gUnknown_0832DF8C:: @ 832DF8C
- window_template 0x00, 0x17, 0x0d, 0x05, 0x04, 0x0f, 0x0246
-
-gJPText_Shedinja:: @ 832DF94
- .string "ヌケニン$"
-
-gUnknown_0832DF99:: @ 832DF99
- .byte 0x04, 0x03, 0x13, 0x03, 0x00, 0x00, 0x00
-
- .align 2
-gTradeBallPalette:: @ 832DFA0
- .incbin "graphics/trade/ball.gbapal"
-
- .align 2
-gTradeBallTiles:: @ 832DFC0
- .incbin "graphics/trade/ball.4bpp"
-
- .align 2
-gUnknown_832E5C0:: @ 832E5C0
- .incbin "graphics/trade/pokeball_symbol.8bpp"
-
- .align 2
-gUnknown_0832FFC0:: @ 832FFC0
- .incbin "graphics/trade/cable_closeup_map.bin"
-
- .align 2
-gUnknown_083307C0:: @ 83307C0
- .incbin "graphics/trade/pokeball_symbol_map.bin"
-
- .align 2
-gUnknown_083308C0:: @ 83308C0
- .incbin "graphics/trade/unknown_3308C0.gbapal"
-
- .align 2
-gUnknown_083308E0:: @ 83308E0
- .incbin "graphics/trade/gba.gbapal"
- .incbin "graphics/trade/shadow.gbapal"
- .incbin "graphics/trade/black.gbapal"
-
- .align 2
-gUnknown_08330940:: @ 8330940
- .incbin "graphics/trade/misc.gbapal"
-
- .align 2
-gTradeGlow1Tiles:: @ 8330960
- .incbin "graphics/trade/glow1.4bpp"
-
- .align 2
-gTradeGlow2Tiles:: @ 8330B60
- .incbin "graphics/trade/glow2.4bpp"
-
- .align 2
-gTradeCableEndTiles:: @ 8330D60
- .incbin "graphics/trade/cable_end.4bpp"
-
- .align 2
-gTradeGBAScreenTiles:: @ 8330F60
- .incbin "graphics/trade/gba_screen.4bpp"
-
- .align 2
-gUnknown_08331F60:: @ 8331F60
- .incbin "graphics/trade/shadow_map.bin"
-
- .align 2
-gUnknown_08332F60:: @ 8332F60
- .incbin "graphics/trade/gba_affine.8bpp"
-
- .space 0x40
-
- .align 2
-gUnknown_083357A0:: @ 83357A0
- .incbin "graphics/trade/gba_affine_map_cable.bin"
-
- .align 2
-gUnknown_083358A0:: @ 83358A0
- .incbin "graphics/trade/gba_affine_map_wireless.bin"
-
- .align 2
-gUnknown_083359A0:: @ 83359A0
- .incbin "graphics/trade/gba_map_wireless.bin"
-
- .align 2
-gUnknown_083369A0:: @ 83369A0
- .incbin "graphics/trade/gba_map_cable.bin"
-
- .align 2
-gUnknown_083379A0:: @ 83379A0
- .incbin "graphics/trade/unknown_3379A0.bin.lz"
-
- .align 2
-gUnknown_08337AA0:: @ 8337AA0
- .incbin "graphics/trade/wireless_signal_send.gbapal"
-
- .align 2
-gUnknown_08337CA0:: @ 8337CA0
- .incbin "graphics/trade/wireless_signal_receive.gbapal"
-
- .align 2
-gUnknown_08337EA0:: @ 8337EA0
- .incbin "graphics/trade/black.gbapal"
-
- .align 2
-gUnknown_08337EC0:: @ 8337EC0
- .incbin "graphics/trade/wireless_signal.4bpp.lz"
-
- .align 2
-gUnknown_08338550:: @ 8338550
- .incbin "graphics/trade/wireless_signal.bin.lz"
-
- .align 2
-gOamData_8338C44:: @ 8338C44
- .2byte 0x0100, 0x4000, 0x0000, 0x0000
-
- .align 2
-gSpriteAnim_8338C4C:: @ 8338C4C
- .2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0x0010, 0x0003, 0x0014, 0x0003, 0x0018, 0x0003, 0x001c, 0x0003
- .2byte 0x0020, 0x0003, 0x0024, 0x0003, 0x0028, 0x0003, 0x002c, 0x0003, 0xfffd, 0x0001, 0x0000, 0x0003, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_8338C88:: @ 8338C88
- .2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0x0010, 0x0003, 0x0014, 0x0003, 0x0018, 0x0003, 0x001c, 0x0003
- .2byte 0x0020, 0x0003, 0x0024, 0x0003, 0x0028, 0x0003, 0x002c, 0x0003, 0xfffd, 0x0002, 0x0000, 0x0003, 0xffff, 0x0000
-
- .align 2
-gSpriteAnimTable_8338C88:: @ 8338CC4
- .4byte gSpriteAnim_8338C4C
- .4byte gSpriteAnim_8338C88
-
- .align 2
-gSpriteAffineAnim_8338CCC:: @ 8338CCC
- .2byte 0x0000, 0x0000, 0x0100, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gSpriteAffineAnim_8338CDC:: @ 8338CDC
- .2byte 0xfff8, 0x0000, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gSpriteAffineAnim_8338CEC:: @ 8338CEC
- .2byte 0x0060, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0500, 0x0000, 0x0008, 0x0000, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gSpriteAffineAnimTable_8338D0C:: @ 8338D0C
- .4byte gSpriteAffineAnim_8338CCC
- .4byte gSpriteAffineAnim_8338CDC
- .4byte gSpriteAffineAnim_8338CEC
-
- .align 2
-gUnknown_08338D18:: @ 8338D18
- obj_tiles gTradeBallTiles, 0x0600, 0x15b5
-
- .align 2
-gUnknown_08338D20:: @ 8338D20
- obj_pal gTradeBallPalette, 0x15b6
-
- .align 2
-gSpriteTemplate_8338D28:: @ 8338D28
- spr_template 0x15b5, 0x15b6, gOamData_8338C44, gSpriteAnimTable_8338C88, NULL, gSpriteAffineAnimTable_8338D0C, sub_807E55C
-
- .align 2
-gOamData_8338D40:: @ 8338D40
- .2byte 0x0500, 0x8000, 0x0400, 0x0000
-
- .align 2
-gSpriteAnim_8338D48:: @ 8338D48
- .2byte 0x0000, 0x00c5, 0xffff, 0x0000
-
- .align 2
-gSpriteAnimTable_8338D50:: @ 8338D50
- .4byte gSpriteAnim_8338D48
-
- .align 2
-gSpriteAffineAnim_8338D54:: @ 8338D54
- .2byte 0xfff6, 0xfff6, 0x0500, 0x0000, 0x000a, 0x000a, 0x0500, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
-
- .align 2
-gSpriteAffineAnimTable_8338D6C:: @ 8338D6C
- .4byte gSpriteAffineAnim_8338D54
-
- .align 2
-gUnknown_08338D70:: @ 8338D70
- obj_tiles gTradeGlow1Tiles, 0x0200, 0x15ae
-
- .align 2
-gUnknown_08338D78:: @ 8338D78
- obj_pal gUnknown_08330940, 0x15af
-
- .align 2
-gUnknown_08338D80:: @ 8338D80
- obj_pal gUnknown_083308E0, 0x15b3
-
- .align 2
-gUnknown_08338D88:: @ 8338D88
- spr_template 0x15ae, 0x15af, gOamData_8338D40, gSpriteAnimTable_8338D50, NULL, gSpriteAffineAnimTable_8338D6C, sub_807AA28
-
- .align 2
-gOamData_8338DA0:: @ 8338DA0
- .2byte 0x8000, 0x8000, 0x0400, 0x0000
-
- .align 2
-gSpriteAnim_8338DA8:: @ 8338DA8
- .2byte 0x0000, 0x00c5, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_8338DB0:: @ 8338DB0
- .2byte 0x0008, 0x00c5, 0xffff, 0x0000
-
- .align 2
-gSpriteAnimTable_8338DB8:: @ 8338DB8
- .4byte gSpriteAnim_8338DA8
- .4byte gSpriteAnim_8338DB0
-
- .align 2
-gUnknown_08338DC0:: @ 8338DC0
- obj_tiles gTradeGlow2Tiles, 0x0300, 0x15b0
-
- .align 2
-gSpriteTemplate_8338DC8:: @ 8338DC8
- spr_template 0x15b0, 0x15af, gOamData_8338DA0, gSpriteAnimTable_8338DB8, NULL, gDummySpriteAffineAnimTable, sub_807AA7C
-
- .align 2
-gOamData_8338DE0:: @ 8338DE0
- .2byte 0x8000, 0x8000, 0x0400, 0x0000
-
- .align 2
-gSpriteAnim_8338DE8:: @ 8338DE8
- .2byte 0x0000, 0x000a, 0xffff, 0x0000
-
- .align 2
-gSpriteAnimTable_8338DF0:: @ 8338DF0
- .4byte gSpriteAnim_8338DE8
-
- .align 2
-gUnknown_08338DF4:: @ 8338DF4
- obj_tiles gTradeCableEndTiles, 0x0100, 0x15b2
-
- .align 2
-gSpriteTemplate_8338DFC:: @ 8338DFC
- spr_template 0x15b2, 0x15b3, gOamData_8338DE0, gSpriteAnimTable_8338DF0, NULL, gDummySpriteAffineAnimTable, sub_807AABC
-
- .align 2
-gOamData_8338E14:: @ 8338E14
- .2byte 0x4000, 0xc000, 0x0400, 0x0000
-
- .align 2
-gSpriteAnim_8338E1C:: @ 8338E1C
- .2byte 0x0000, 0x00c2, 0x0020, 0x00c2, 0x0040, 0x00c2, 0x0060, 0x00c2, 0x0040, 0x00c2, 0x0020, 0x00c2, 0x0000, 0x00c2, 0xfffd, 0x0008
- .2byte 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_8338E40:: @ 8338E40
- .2byte 0x0000, 0x00c2, 0x0020, 0x00c2, 0x0040, 0x00c2, 0x0060, 0x00c2, 0x0040, 0x00c2, 0x0020, 0x00c2, 0x0000, 0x00c2, 0xfffd, 0x0002
- .2byte 0xffff, 0x0000
-
- .align 2
-gSpriteAnimTable_8338E64:: @ 8338E64
- .4byte gSpriteAnim_8338E1C
-
- .align 2
-gSpriteAnimTable_8338E68:: @ 8338E68
- .4byte gSpriteAnim_8338E40
-
-gUnknown_08338E6C:: @ 8338E6C
- obj_tiles gTradeGBAScreenTiles, 0x1000, 0x15b4
-
- .align 2
-gSpriteTemplate_8338E74:: @ 8338E74
- spr_template 0x15b4, 0x15b3, gOamData_8338E14, gSpriteAnimTable_8338E64, NULL, gDummySpriteAffineAnimTable, sub_807AB04
-
- .align 2
-gSpriteTemplate_8338E8C:: @ 8338E8C
- spr_template 0x15b4, 0x15b3, gOamData_8338E14, gSpriteAnimTable_8338E68, NULL, gDummySpriteAffineAnimTable, sub_807AB04
-
- .align 1
-gUnknown_08338EA4:: @ 8338EA4
- .incbin "graphics/trade/unknown_338EA4.gbapal"
-
- .align 2
-gSpriteAffineAnim_8338EBC:: @ 8338EBC
- .2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
-
- .align 2
-gSpriteAffineAnimTable_8338ECC:: @ 8338ECC
- .4byte gSpriteAffineAnim_8338EBC
-
- .align 2
-gIngameTrades:: @ 8338ED0
- .string "DOTS$", 11
- .align 1
- .2byte SPECIES_SEEDOT
- .byte 5, 4, 5, 4, 4, 4
- .byte 1
- .align 2
- .4byte 0x9746
- .byte 30, 5, 5, 5, 5
- .align 2
- .4byte 0x84
- .2byte ITEM_CHESTO_BERRY
- .byte -1
- .string "KOBE$", 11
- .byte 0
- .byte 10
- .2byte SPECIES_RALTS
-
- .align 2
- .string "PLUSES$", 11
- .align 1
- .2byte SPECIES_PLUSLE
- .byte 4, 4, 4, 5, 5, 4
- .byte 0
- .align 2
- .4byte 0x1210c
- .byte 5, 5, 30, 5, 5
- .align 2
- .4byte 0x6f
- .2byte ITEM_WOOD_MAIL
- .byte 0
- .string "ROMAN$", 11
- .byte 0
- .byte 10
- .2byte SPECIES_VOLBEAT
-
- .align 2
- .string "SEASOR$", 11
- .align 1
- .2byte SPECIES_HORSEA
- .byte 5, 4, 4, 4, 5, 4
- .byte 0
- .align 2
- .4byte 0xb4cd
- .byte 5, 5, 5, 5, 30
- .align 2
- .4byte 0x7f
- .2byte ITEM_WAVE_MAIL
- .byte 1
- .string "SKYLAR$", 11
- .byte 0
- .byte 10
- .2byte SPECIES_BAGON
-
- .align 2
- .string "MEOWOW$", 11
- .align 1
- .2byte SPECIES_MEOWTH
- .byte 4, 5, 4, 5, 4, 4
- .byte 0
- .align 2
- .4byte 0x16559
- .byte 5, 5, 5, 30, 5
- .align 2
- .4byte 0x8b
- .2byte ITEM_RETRO_MAIL
- .byte 2
- .string "ISIS$", 11
- .byte 1
- .byte 10
- .2byte SPECIES_SKITTY
-
- .align 2
-gUnknown_08338FC0:: @ 8338FC0
- .2byte 0x1006, 0x1232, 0x102f, 0x0161, 0x0c00, 0x0182, 0x1000, 0x1006, 0x0e3b, 0x0000, 0x0a01, 0x1000, 0x161e, 0x018b, 0x0433, 0x1611
- .2byte 0x180f, 0x0074, 0x1440, 0x0000, 0x0811, 0x102b, 0x013b, 0x2a34, 0x0c16, 0x1037, 0x1020, 0x0418, 0x0c23, 0x0000
-
- .align 2
-gUnknown_08338FFC:: @ 8338FFC
- window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0040
- null_window_template
-
- .align 2
-gUnknown_0833900C:: @ 833900C
- window_template 0x00, 0x15, 0x09, 0x05, 0x04, 0x0f, 0x00bc
-
- .align 2
-gUnknown_08339014:: @ 8339014
- .4byte 0x000001fc, 0x00002051, 0x00002326, 0x00003063
-
-gUnknown_08339024:: @ 8339024
- .byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfd, 0xfd, 0xfe, 0xfe, 0xfe
- .byte 0xfe, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04
- .byte 0x04, 0x04, 0xfc, 0xfd, 0xfd, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0xfc, 0xfd, 0xfe, 0xff
- .byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x02, 0x03
-
-gUnknown_08339090:: @ 8339090
- .byte 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x05, 0x02, 0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x09, 0x02, 0x0a, 0x03, 0x0b, 0x03, 0x0c, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x02
- .byte 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x05, 0x02, 0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x09, 0x02, 0x0a, 0x03, 0x0b, 0x03, 0x0c, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x10, 0x01
- .byte 0x10, 0xff, 0x00, 0x00