summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-07-12 22:15:35 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-07-12 22:15:35 -0500
commitd53e8137cd1e14c7fd5435562a979bb6bd83d20e (patch)
treeccd1e737c7492840af0745d48a984eb723c55b70
parentd5eb94330a9c626aaf72b5e5d44f7aaf1da0d00c (diff)
Use weather constants in map headers
-rw-r--r--data/maps.s1
-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/header.inc2
-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/header.inc2
-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/header.inc2
-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/header.inc2
-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/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/header.inc2
-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/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerElevator/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/header.inc2
-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_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_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/header.inc2
-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_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/header.inc2
-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_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/IslandCave/header.inc2
-rw-r--r--data/maps/JaggedPass/header.inc2
-rw-r--r--data/maps/LavaridgeTown/header.inc2
-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/header.inc2
-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/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/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/header.inc2
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_1F/header.inc2
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_2F/header.inc2
-rw-r--r--data/maps/LittlerootTown_MaysHouse_1F/header.inc2
-rw-r--r--data/maps/LittlerootTown_MaysHouse_2F/header.inc2
-rw-r--r--data/maps/LittlerootTown_ProfessorBirchsLab/header.inc2
-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/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/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_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/header.inc2
-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_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/Route102/header.inc2
-rw-r--r--data/maps/Route103/header.inc2
-rw-r--r--data/maps/Route104/header.inc2
-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/header.inc2
-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/header.inc2
-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/header.inc2
-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/header.inc2
-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_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/header.inc2
-rw-r--r--data/maps/SecretBase_BlueCave2/header.inc2
-rw-r--r--data/maps/SecretBase_BlueCave3/header.inc2
-rw-r--r--data/maps/SecretBase_BlueCave4/header.inc2
-rw-r--r--data/maps/SecretBase_BrownCave1/header.inc2
-rw-r--r--data/maps/SecretBase_BrownCave2/header.inc2
-rw-r--r--data/maps/SecretBase_BrownCave3/header.inc2
-rw-r--r--data/maps/SecretBase_BrownCave4/header.inc2
-rw-r--r--data/maps/SecretBase_RedCave1/header.inc2
-rw-r--r--data/maps/SecretBase_RedCave2/header.inc2
-rw-r--r--data/maps/SecretBase_RedCave3/header.inc2
-rw-r--r--data/maps/SecretBase_RedCave4/header.inc2
-rw-r--r--data/maps/SecretBase_Shrub1/header.inc2
-rw-r--r--data/maps/SecretBase_Shrub2/header.inc2
-rw-r--r--data/maps/SecretBase_Shrub3/header.inc2
-rw-r--r--data/maps/SecretBase_Shrub4/header.inc2
-rw-r--r--data/maps/SecretBase_Tree1/header.inc2
-rw-r--r--data/maps/SecretBase_Tree2/header.inc2
-rw-r--r--data/maps/SecretBase_Tree3/header.inc2
-rw-r--r--data/maps/SecretBase_Tree4/header.inc2
-rw-r--r--data/maps/SecretBase_YellowCave1/header.inc2
-rw-r--r--data/maps/SecretBase_YellowCave2/header.inc2
-rw-r--r--data/maps/SecretBase_YellowCave3/header.inc2
-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/header.inc2
-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/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/header.inc2
-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/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/VerdanturfTown/header.inc2
-rw-r--r--data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc2
-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
519 files changed, 519 insertions, 518 deletions
diff --git a/data/maps.s b/data/maps.s
index 8a0c2d43a..59a6b4930 100644
--- a/data/maps.s
+++ b/data/maps.s
@@ -1,6 +1,7 @@
#include "constants/maps.h"
#include "constants/region_map_sections.h"
#include "constants/songs.h"
+#include "constants/weather.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc
index a07a66947..149f27655 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/header.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice: @ 84845A4
.2byte 195
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc
index 118d91860..a0971779c 100644
--- a/data/maps/AbandonedShip_Corridors_1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Corridors_1F: @ 84844C4
.2byte 187
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc
index 6b743af3a..12cb7e697 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Corridors_B1F: @ 84844FC
.2byte 189
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc
index da8f1f124..f6616f885 100644
--- a/data/maps/AbandonedShip_Deck/header.inc
+++ b/data/maps/AbandonedShip_Deck/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Deck: @ 84844A8
.2byte 186
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
index e83f9a020..f375e0bee 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC
.2byte 289
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
index b6b48d652..0ef17861a 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8
.2byte 310
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 7
diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc
index 3282054cb..5dc438acd 100644
--- a/data/maps/AbandonedShip_Room_B1F/header.inc
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Room_B1F: @ 848456C
.2byte 193
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc
index 4d5eead34..e4bf89911 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Rooms2_1F: @ 8484588
.2byte 194
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
index ddac73f8e..fa713bf29 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Rooms2_B1F: @ 8484534
.2byte 191
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc
index 304180955..d552a8cac 100644
--- a/data/maps/AbandonedShip_Rooms_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Rooms_1F: @ 84844E0
.2byte 188
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc
index b9be9d667..7b121a2d2 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Rooms_B1F: @ 8484518
.2byte 190
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc
index e73f1c5d9..0176f1637 100644
--- a/data/maps/AbandonedShip_Underwater1/header.inc
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Underwater1: @ 8484550
.2byte 192
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc
index cb7f00a6f..7ca32edb8 100644
--- a/data/maps/AbandonedShip_Underwater2/header.inc
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Underwater2: @ 84845C0
.2byte 196
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc
index 1c390ec99..344bdaf8c 100644
--- a/data/maps/AlteringCave/header.inc
+++ b/data/maps/AlteringCave/header.inc
@@ -7,7 +7,7 @@ AlteringCave: @ 8484A58
.2byte 420
.byte MAPSEC_ALTERING_CAVE_2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc
index 5cce523f9..afc0f475c 100644
--- a/data/maps/AncientTomb/header.inc
+++ b/data/maps/AncientTomb/header.inc
@@ -7,7 +7,7 @@ AncientTomb: @ 8484630
.2byte 281
.byte MAPSEC_ANCIENT_TOMB
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc
index 31085dd4c..7590ebce5 100644
--- a/data/maps/AquaHideout_1F/header.inc
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -7,7 +7,7 @@ AquaHideout_1F: @ 8484144
.2byte 143
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 8
diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc
index 984d16740..51ec82492 100644
--- a/data/maps/AquaHideout_B1F/header.inc
+++ b/data/maps/AquaHideout_B1F/header.inc
@@ -7,7 +7,7 @@ AquaHideout_B1F: @ 8484160
.2byte 144
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 8
diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc
index 230c2b7d0..0d903e1cf 100644
--- a/data/maps/AquaHideout_B2F/header.inc
+++ b/data/maps/AquaHideout_B2F/header.inc
@@ -7,7 +7,7 @@ AquaHideout_B2F: @ 848417C
.2byte 145
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 8
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
index c2dc76096..242f32e61 100644
--- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
@@ -7,7 +7,7 @@ AquaHideout_UnusedRubyMap1: @ 84846D8
.2byte 316
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
index cc01983a9..ebc999cf4 100644
--- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
@@ -7,7 +7,7 @@ AquaHideout_UnusedRubyMap2: @ 84846F4
.2byte 317
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
index 8adc7f2ba..f9d571c8e 100644
--- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
@@ -7,7 +7,7 @@ AquaHideout_UnusedRubyMap3: @ 8484710
.2byte 318
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc
index 33d974804..b801c08af 100644
--- a/data/maps/ArtisanCave_1F/header.inc
+++ b/data/maps/ArtisanCave_1F/header.inc
@@ -7,7 +7,7 @@ ArtisanCave_1F: @ 84849B0
.2byte 401
.byte MAPSEC_ARTISAN_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc
index 8ff225a8e..8e106ea1c 100644
--- a/data/maps/ArtisanCave_B1F/header.inc
+++ b/data/maps/ArtisanCave_B1F/header.inc
@@ -7,7 +7,7 @@ ArtisanCave_B1F: @ 8484994
.2byte 400
.byte MAPSEC_ARTISAN_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
index 927137cf0..d20c65c2e 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484
.2byte 356
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
index 332363738..ba4431464 100644
--- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleArenaCorridor: @ 8485468
.2byte 355
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
index 541613f53..112fb86bd 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleArenaLobby: @ 848544C
.2byte 354
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
index 6ddf3fb45..19d194169 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388
.2byte 335
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
index 25c5d684f..72caf9523 100644
--- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleDomeCorridor: @ 8485350
.2byte 333
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
index be93189ab..0d607e671 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleDomeLobby: @ 8485334
.2byte 332
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
index 592300353..db09e9b41 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C
.2byte 334
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
index c672d86cd..27e2c8952 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
.2byte 348
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
index 1fa0645a3..b9fb23a03 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0
.2byte 346
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
index 766e9689b..e1fa2d524 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
.2byte 347
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
index 696e41601..701647467 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
.2byte 344
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
index 18ddced68..d867a0daf 100644
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0
.2byte 343
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
index cc723eb42..3b53c9397 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4
.2byte 342
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
index 955b0be42..0f93684c3 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattlePikeCorridor: @ 8485510
.2byte 350
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
index e75761bed..d6fe6e340 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattlePikeLobby: @ 84854F4
.2byte 349
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
index e5ea8a3ef..f4fde68ad 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548
.2byte 352
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
index 8111043c6..4274d8eee 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564
.2byte 353
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
index 2395feb52..15b65af63 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580
.2byte 358
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
index f6b0e6351..b744f348f 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C
.2byte 351
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
index fca127f5f..289c02455 100644
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
.2byte 398
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
index a5eda44ef..a0face861 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414
.2byte 361
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
index 06fd632f8..9fa6b7fa3 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8
.2byte 360
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
index 140a5d4e8..970aadfbe 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattlePyramidTop: @ 8485430
.2byte 378
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
index fdf167b9f..18d60521c 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C
.2byte 268
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
index 157a9f0ae..6606a9be7 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318
.2byte 268
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
index de71a7dc6..13b0ebbf3 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleTowerCorridor: @ 8485200
.2byte 267
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
index 1ba6d43c9..1a6e40299 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC
.2byte 391
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
index d3e6216d2..380a5400e 100644
--- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleTowerElevator: @ 84851E4
.2byte 266
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
index db62f0be3..5d9252fbb 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleTowerLobby: @ 84851C8
.2byte 264
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
index 5a25ffafa..9bcd28c75 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
.2byte 390
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc
index 21e01eb7d..25e88a5df 100644
--- a/data/maps/BattleFrontier_Lounge1/header.inc
+++ b/data/maps/BattleFrontier_Lounge1/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_Lounge1: @ 84855B8
.2byte 429
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc
index ad875cc4e..71b933474 100644
--- a/data/maps/BattleFrontier_Lounge2/header.inc
+++ b/data/maps/BattleFrontier_Lounge2/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_Lounge2: @ 84855F0
.2byte 397
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc
index 8ce5169d7..2f4b74d7e 100644
--- a/data/maps/BattleFrontier_Lounge3/header.inc
+++ b/data/maps/BattleFrontier_Lounge3/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_Lounge3: @ 848560C
.2byte 429
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc
index 11f40472b..6fea64a15 100644
--- a/data/maps/BattleFrontier_Lounge4/header.inc
+++ b/data/maps/BattleFrontier_Lounge4/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_Lounge4: @ 8485628
.2byte 429
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc
index 743ccd512..f38db8f29 100644
--- a/data/maps/BattleFrontier_Lounge5/header.inc
+++ b/data/maps/BattleFrontier_Lounge5/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_Lounge5: @ 8485660
.2byte 397
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc
index b6192f8a9..78f103166 100644
--- a/data/maps/BattleFrontier_Lounge6/header.inc
+++ b/data/maps/BattleFrontier_Lounge6/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_Lounge6: @ 848567C
.2byte 429
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc
index 96843d502..871e16cc2 100644
--- a/data/maps/BattleFrontier_Lounge7/header.inc
+++ b/data/maps/BattleFrontier_Lounge7/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_Lounge7: @ 8485698
.2byte 429
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc
index 9a320a4bf..620e79304 100644
--- a/data/maps/BattleFrontier_Lounge8/header.inc
+++ b/data/maps/BattleFrontier_Lounge8/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_Lounge8: @ 84856D0
.2byte 429
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc
index 999ba6ce0..37b608edf 100644
--- a/data/maps/BattleFrontier_Lounge9/header.inc
+++ b/data/maps/BattleFrontier_Lounge9/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_Lounge9: @ 84856EC
.2byte 429
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc
index 2285a9e3f..b356e7d7a 100644
--- a/data/maps/BattleFrontier_Mart/header.inc
+++ b/data/maps/BattleFrontier_Mart/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_Mart: @ 8485740
.2byte 63
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc
index 0f49f1e4b..3db684e8f 100644
--- a/data/maps/BattleFrontier_OutsideEast/header.inc
+++ b/data/maps/BattleFrontier_OutsideEast/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_OutsideEast: @ 84852C4
.2byte 345
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc
index bbef1d1c7..2c1d3754e 100644
--- a/data/maps/BattleFrontier_OutsideWest/header.inc
+++ b/data/maps/BattleFrontier_OutsideWest/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_OutsideWest: @ 84851AC
.2byte 265
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
index 2b39d2cf6..283c3744a 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_PokemonCenter_1F: @ 8485708
.2byte 61
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
index 740141748..44442a28c 100644
--- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_PokemonCenter_2F: @ 8485724
.2byte 62
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc
index 8036032e3..2e91cbfaf 100644
--- a/data/maps/BattleFrontier_RankingHall/header.inc
+++ b/data/maps/BattleFrontier_RankingHall/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_RankingHall: @ 848559C
.2byte 396
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc
index 236698cd2..f009f93e5 100644
--- a/data/maps/BattleFrontier_ReceptionGate/header.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_ReceptionGate: @ 84856B4
.2byte 399
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc
index b7468a9d2..11cf24022 100644
--- a/data/maps/BattleFrontier_ScottsHouse/header.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/header.inc
@@ -7,7 +7,7 @@ BattleFrontier_ScottsHouse: @ 8485644
.2byte 430
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc
index dc3deeb48..ef8c315d9 100644
--- a/data/maps/BattlePyramidSquare01/header.inc
+++ b/data/maps/BattlePyramidSquare01/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare01: @ 8484F60
.2byte 362
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc
index 8d65a6fa6..41f1523cf 100644
--- a/data/maps/BattlePyramidSquare02/header.inc
+++ b/data/maps/BattlePyramidSquare02/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare02: @ 8484F7C
.2byte 363
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc
index c3bf3376d..2938d5280 100644
--- a/data/maps/BattlePyramidSquare03/header.inc
+++ b/data/maps/BattlePyramidSquare03/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare03: @ 8484F98
.2byte 364
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc
index c001abc53..ae838f26d 100644
--- a/data/maps/BattlePyramidSquare04/header.inc
+++ b/data/maps/BattlePyramidSquare04/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare04: @ 8484FB4
.2byte 365
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc
index e96d7cac7..e893cfbcb 100644
--- a/data/maps/BattlePyramidSquare05/header.inc
+++ b/data/maps/BattlePyramidSquare05/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare05: @ 8484FD0
.2byte 366
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc
index 440eac549..397c7c27c 100644
--- a/data/maps/BattlePyramidSquare06/header.inc
+++ b/data/maps/BattlePyramidSquare06/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare06: @ 8484FEC
.2byte 367
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc
index f467dfd7d..3d9e1c2c5 100644
--- a/data/maps/BattlePyramidSquare07/header.inc
+++ b/data/maps/BattlePyramidSquare07/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare07: @ 8485008
.2byte 368
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc
index 00c45e577..af3df7eba 100644
--- a/data/maps/BattlePyramidSquare08/header.inc
+++ b/data/maps/BattlePyramidSquare08/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare08: @ 8485024
.2byte 369
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc
index 27a33d4b0..2fb732618 100644
--- a/data/maps/BattlePyramidSquare09/header.inc
+++ b/data/maps/BattlePyramidSquare09/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare09: @ 8485040
.2byte 370
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc
index 1507f0518..8f95706d3 100644
--- a/data/maps/BattlePyramidSquare10/header.inc
+++ b/data/maps/BattlePyramidSquare10/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare10: @ 848505C
.2byte 371
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc
index 98c08a116..8d0ffdaae 100644
--- a/data/maps/BattlePyramidSquare11/header.inc
+++ b/data/maps/BattlePyramidSquare11/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare11: @ 8485078
.2byte 372
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc
index 39cc4061a..268f24cb1 100644
--- a/data/maps/BattlePyramidSquare12/header.inc
+++ b/data/maps/BattlePyramidSquare12/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare12: @ 8485094
.2byte 373
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc
index b4b1a281d..b4d09580f 100644
--- a/data/maps/BattlePyramidSquare13/header.inc
+++ b/data/maps/BattlePyramidSquare13/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare13: @ 84850B0
.2byte 374
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc
index 407cf0024..7d43feff0 100644
--- a/data/maps/BattlePyramidSquare14/header.inc
+++ b/data/maps/BattlePyramidSquare14/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare14: @ 84850CC
.2byte 375
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc
index 37d8c75cb..c67e86abe 100644
--- a/data/maps/BattlePyramidSquare15/header.inc
+++ b/data/maps/BattlePyramidSquare15/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare15: @ 84850E8
.2byte 376
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc
index f264ace73..3026d44bd 100644
--- a/data/maps/BattlePyramidSquare16/header.inc
+++ b/data/maps/BattlePyramidSquare16/header.inc
@@ -7,7 +7,7 @@ BattlePyramidSquare16: @ 8485104
.2byte 377
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc
index 04a62dd6b..5bda31250 100644
--- a/data/maps/BirthIsland_Exterior/header.inc
+++ b/data/maps/BirthIsland_Exterior/header.inc
@@ -7,7 +7,7 @@ BirthIsland_Exterior: @ 8485794
.2byte 404
.byte MAPSEC_BIRTH_ISLAND_2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 12
diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc
index e3b8a21f3..f0ea9a70a 100644
--- a/data/maps/BirthIsland_Harbor/header.inc
+++ b/data/maps/BirthIsland_Harbor/header.inc
@@ -7,7 +7,7 @@ BirthIsland_Harbor: @ 84857B0
.2byte 405
.byte MAPSEC_BIRTH_ISLAND_2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc
index c25c0d82b..2b4464937 100644
--- a/data/maps/CaveOfOrigin_1F/header.inc
+++ b/data/maps/CaveOfOrigin_1F/header.inc
@@ -7,7 +7,7 @@ CaveOfOrigin_1F: @ 84842E8
.2byte 158
.byte MAPSEC_CAVE_OF_ORIGIN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc
index b5eacd7d9..46cac3433 100644
--- a/data/maps/CaveOfOrigin_B1F/header.inc
+++ b/data/maps/CaveOfOrigin_B1F/header.inc
@@ -7,7 +7,7 @@ CaveOfOrigin_B1F: @ 8484358
.2byte 162
.byte MAPSEC_CAVE_OF_ORIGIN
.byte 0
- .byte 6
+ .byte WEATHER_FOG_1
.byte 4
.2byte 0
.byte 14
diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc
index 5cda3da60..a19256b39 100644
--- a/data/maps/CaveOfOrigin_Entrance/header.inc
+++ b/data/maps/CaveOfOrigin_Entrance/header.inc
@@ -7,7 +7,7 @@ CaveOfOrigin_Entrance: @ 84842CC
.2byte 157
.byte MAPSEC_CAVE_OF_ORIGIN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
index 762fb4115..155670bf0 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
@@ -7,7 +7,7 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304
.2byte 159
.byte MAPSEC_CAVE_OF_ORIGIN
.byte 1
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
index bd77221f6..12d34ac46 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
@@ -7,7 +7,7 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320
.2byte 160
.byte MAPSEC_CAVE_OF_ORIGIN
.byte 1
- .byte 6
+ .byte WEATHER_FOG_1
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
index a5597e4e9..9edfd72a8 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
@@ -7,7 +7,7 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C
.2byte 161
.byte MAPSEC_CAVE_OF_ORIGIN
.byte 1
- .byte 6
+ .byte WEATHER_FOG_1
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc
index 009a279e1..7e63a9023 100644
--- a/data/maps/DesertRuins/header.inc
+++ b/data/maps/DesertRuins/header.inc
@@ -7,7 +7,7 @@ DesertRuins: @ 8483F68
.2byte 131
.byte MAPSEC_DESERT_RUINS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc
index 9d4bec918..d3f41bd72 100644
--- a/data/maps/DesertUnderpass/header.inc
+++ b/data/maps/DesertUnderpass/header.inc
@@ -7,7 +7,7 @@ DesertUnderpass: @ 8484978
.2byte 389
.byte MAPSEC_DESERT_UNDERPASS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc
index c6fb45581..fb1270636 100644
--- a/data/maps/DewfordTown/header.inc
+++ b/data/maps/DewfordTown/header.inc
@@ -7,7 +7,7 @@ DewfordTown: @ 84825EC
.2byte 12
.byte MAPSEC_DEWFORD_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 13
diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc
index 24866ee7a..de821f116 100644
--- a/data/maps/DewfordTown_Gym/header.inc
+++ b/data/maps/DewfordTown_Gym/header.inc
@@ -7,7 +7,7 @@ DewfordTown_Gym: @ 8482C60
.2byte 65
.byte MAPSEC_DEWFORD_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc
index dfa5daf1f..934a5a039 100644
--- a/data/maps/DewfordTown_Hall/header.inc
+++ b/data/maps/DewfordTown_Hall/header.inc
@@ -7,7 +7,7 @@ DewfordTown_Hall: @ 8482C7C
.2byte 66
.byte MAPSEC_DEWFORD_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc
index 94c735b59..46352ccc6 100644
--- a/data/maps/DewfordTown_House1/header.inc
+++ b/data/maps/DewfordTown_House1/header.inc
@@ -7,7 +7,7 @@ DewfordTown_House1: @ 8482C0C
.2byte 64
.byte MAPSEC_DEWFORD_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc
index c27122bc5..0d7070cae 100644
--- a/data/maps/DewfordTown_House2/header.inc
+++ b/data/maps/DewfordTown_House2/header.inc
@@ -7,7 +7,7 @@ DewfordTown_House2: @ 8482C98
.2byte 67
.byte MAPSEC_DEWFORD_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
index e7b628503..8a22a27f8 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ DewfordTown_PokemonCenter_1F: @ 8482C28
.2byte 61
.byte MAPSEC_DEWFORD_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
index 90ec683d7..cd54f5fe0 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ DewfordTown_PokemonCenter_2F: @ 8482C44
.2byte 62
.byte MAPSEC_DEWFORD_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc
index 05949ab05..8d4de2924 100644
--- a/data/maps/DoubleBattleColosseum/header.inc
+++ b/data/maps/DoubleBattleColosseum/header.inc
@@ -7,7 +7,7 @@ DoubleBattleColosseum: @ 8484D84
.2byte 224
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc
index 7ba0b694b..7401e4f2f 100644
--- a/data/maps/EverGrandeCity/header.inc
+++ b/data/maps/EverGrandeCity/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity: @ 8482598
.2byte 9
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 13
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
index 1e3591b8a..3cbf3d3b7 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C
.2byte 115
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc
index 0de64f823..87ee3f9b6 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/header.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_DrakesRoom: @ 8483C20
.2byte 114
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
index 2c6ad7097..b8170952e 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_GlaciasRoom: @ 8483C04
.2byte 113
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc
index eba002828..2b993b9a6 100644
--- a/data/maps/EverGrandeCity_Hall1/header.inc
+++ b/data/maps/EverGrandeCity_Hall1/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_Hall1: @ 8483C58
.2byte 116
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc
index 7c932e333..9d7a836fe 100644
--- a/data/maps/EverGrandeCity_Hall2/header.inc
+++ b/data/maps/EverGrandeCity_Hall2/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_Hall2: @ 8483C74
.2byte 116
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc
index ff5999475..d22707542 100644
--- a/data/maps/EverGrandeCity_Hall3/header.inc
+++ b/data/maps/EverGrandeCity_Hall3/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_Hall3: @ 8483C90
.2byte 116
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc
index 4051a8722..80867002f 100644
--- a/data/maps/EverGrandeCity_Hall4/header.inc
+++ b/data/maps/EverGrandeCity_Hall4/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_Hall4: @ 8483CAC
.2byte 315
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc
index 1f6ade600..1d1ac9edd 100644
--- a/data/maps/EverGrandeCity_Hall5/header.inc
+++ b/data/maps/EverGrandeCity_Hall5/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_Hall5: @ 8483CC8
.2byte 116
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc
index 22bb385c3..6918cc2f1 100644
--- a/data/maps/EverGrandeCity_HallOfFame/header.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_HallOfFame: @ 8483D00
.2byte 298
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
index 267f341d5..b852e1c8e 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8
.2byte 112
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
index 1eb362f60..d43b97fbc 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C
.2byte 61
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
index 3bfe680e5..3ee23fe99 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38
.2byte 62
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
index e81864220..17d01bfae 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4
.2byte 270
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
index 59e523449..217647a56 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54
.2byte 62
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc
index a2f5ebef3..875c190f5 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/header.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom: @ 8483BCC
.2byte 111
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc
index caece3a22..77be7ebaa 100644
--- a/data/maps/FallarborTown/header.inc
+++ b/data/maps/FallarborTown/header.inc
@@ -7,7 +7,7 @@ FallarborTown: @ 8482624
.2byte 14
.byte MAPSEC_FALLARBOR_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 13
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
index 17a58396f..0781e0c30 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
@@ -7,7 +7,7 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC
.2byte 386
.byte MAPSEC_FALLARBOR_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc
index adf2570af..6e5950e85 100644
--- a/data/maps/FallarborTown_BattleTentCorridor/header.inc
+++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc
@@ -7,7 +7,7 @@ FallarborTown_BattleTentCorridor: @ 8482DB0
.2byte 385
.byte MAPSEC_FALLARBOR_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc
index 60d07ff5b..6702e2f9d 100644
--- a/data/maps/FallarborTown_BattleTentLobby/header.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/header.inc
@@ -7,7 +7,7 @@ FallarborTown_BattleTentLobby: @ 8482D94
.2byte 384
.byte MAPSEC_FALLARBOR_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc
index e07cc4ee8..b801201f3 100644
--- a/data/maps/FallarborTown_House1/header.inc
+++ b/data/maps/FallarborTown_House1/header.inc
@@ -7,7 +7,7 @@ FallarborTown_House1: @ 8482E20
.2byte 59
.byte MAPSEC_FALLARBOR_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc
index 5e50c8271..b30fdf515 100644
--- a/data/maps/FallarborTown_House2/header.inc
+++ b/data/maps/FallarborTown_House2/header.inc
@@ -7,7 +7,7 @@ FallarborTown_House2: @ 8482E3C
.2byte 60
.byte MAPSEC_FALLARBOR_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc
index ee3d1bb7a..7c9be5b8f 100644
--- a/data/maps/FallarborTown_Mart/header.inc
+++ b/data/maps/FallarborTown_Mart/header.inc
@@ -7,7 +7,7 @@ FallarborTown_Mart: @ 8482D78
.2byte 63
.byte MAPSEC_FALLARBOR_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
index ea7d76a36..0e1402710 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8
.2byte 61
.byte MAPSEC_FALLARBOR_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
index a2e45e006..f00757c91 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ FallarborTown_PokemonCenter_2F: @ 8482E04
.2byte 62
.byte MAPSEC_FALLARBOR_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc
index 1b2e2300a..539a797f1 100644
--- a/data/maps/FarawayIsland_Entrance/header.inc
+++ b/data/maps/FarawayIsland_Entrance/header.inc
@@ -7,7 +7,7 @@ FarawayIsland_Entrance: @ 848575C
.2byte 402
.byte MAPSEC_FARAWAY_ISLAND
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 13
diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc
index 2ac52de61..a5b52d076 100644
--- a/data/maps/FarawayIsland_Interior/header.inc
+++ b/data/maps/FarawayIsland_Interior/header.inc
@@ -7,7 +7,7 @@ FarawayIsland_Interior: @ 8485778
.2byte 403
.byte MAPSEC_FARAWAY_ISLAND
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 8
.2byte 0
.byte 13
diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc
index 5ebac1143..bdf2ec584 100644
--- a/data/maps/FieryPath/header.inc
+++ b/data/maps/FieryPath/header.inc
@@ -7,7 +7,7 @@ FieryPath: @ 8484048
.2byte 293
.byte MAPSEC_FIERY_PATH
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc
index 98c24b211..7e20bffff 100644
--- a/data/maps/FortreeCity/header.inc
+++ b/data/maps/FortreeCity/header.inc
@@ -7,7 +7,7 @@ FortreeCity: @ 8482528
.2byte 5
.byte MAPSEC_FORTREE_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 13
diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc
index 918a988b2..dadd55e02 100644
--- a/data/maps/FortreeCity_DecorationShop/header.inc
+++ b/data/maps/FortreeCity_DecorationShop/header.inc
@@ -7,7 +7,7 @@ FortreeCity_DecorationShop: @ 848361C
.2byte 255
.byte MAPSEC_FORTREE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc
index 21b280322..459db5bd5 100644
--- a/data/maps/FortreeCity_Gym/header.inc
+++ b/data/maps/FortreeCity_Gym/header.inc
@@ -7,7 +7,7 @@ FortreeCity_Gym: @ 848353C
.2byte 100
.byte MAPSEC_FORTREE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc
index 9c933f5bb..013caf4d2 100644
--- a/data/maps/FortreeCity_House1/header.inc
+++ b/data/maps/FortreeCity_House1/header.inc
@@ -7,7 +7,7 @@ FortreeCity_House1: @ 8483520
.2byte 99
.byte MAPSEC_FORTREE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc
index a339e9dde..b631de024 100644
--- a/data/maps/FortreeCity_House2/header.inc
+++ b/data/maps/FortreeCity_House2/header.inc
@@ -7,7 +7,7 @@ FortreeCity_House2: @ 84835AC
.2byte 101
.byte MAPSEC_FORTREE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc
index 45f8e2e05..477706e68 100644
--- a/data/maps/FortreeCity_House3/header.inc
+++ b/data/maps/FortreeCity_House3/header.inc
@@ -7,7 +7,7 @@ FortreeCity_House3: @ 84835C8
.2byte 99
.byte MAPSEC_FORTREE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc
index cdd8de330..15182d88f 100644
--- a/data/maps/FortreeCity_House4/header.inc
+++ b/data/maps/FortreeCity_House4/header.inc
@@ -7,7 +7,7 @@ FortreeCity_House4: @ 84835E4
.2byte 101
.byte MAPSEC_FORTREE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc
index 3017bae96..29dbe8c13 100644
--- a/data/maps/FortreeCity_House5/header.inc
+++ b/data/maps/FortreeCity_House5/header.inc
@@ -7,7 +7,7 @@ FortreeCity_House5: @ 8483600
.2byte 99
.byte MAPSEC_FORTREE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc
index 1dd682c08..0a67a7b51 100644
--- a/data/maps/FortreeCity_Mart/header.inc
+++ b/data/maps/FortreeCity_Mart/header.inc
@@ -7,7 +7,7 @@ FortreeCity_Mart: @ 8483590
.2byte 63
.byte MAPSEC_FORTREE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
index 920f961bf..02819535e 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_1F: @ 8483558
.2byte 61
.byte MAPSEC_FORTREE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
index 197901ce7..ab03878eb 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_2F: @ 8483574
.2byte 62
.byte MAPSEC_FORTREE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc
index af8cc27b7..df957dc4d 100644
--- a/data/maps/GraniteCave_1F/header.inc
+++ b/data/maps/GraniteCave_1F/header.inc
@@ -7,7 +7,7 @@ GraniteCave_1F: @ 8483F84
.2byte 132
.byte MAPSEC_GRANITE_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc
index 244eff08e..183cece4a 100644
--- a/data/maps/GraniteCave_B1F/header.inc
+++ b/data/maps/GraniteCave_B1F/header.inc
@@ -7,7 +7,7 @@ GraniteCave_B1F: @ 8483FA0
.2byte 133
.byte MAPSEC_GRANITE_CAVE
.byte 1
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc
index 0d1aeea5a..452fd1e2f 100644
--- a/data/maps/GraniteCave_B2F/header.inc
+++ b/data/maps/GraniteCave_B2F/header.inc
@@ -7,7 +7,7 @@ GraniteCave_B2F: @ 8483FBC
.2byte 134
.byte MAPSEC_GRANITE_CAVE
.byte 1
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc
index 2c1514b75..159d49277 100644
--- a/data/maps/GraniteCave_StevensRoom/header.inc
+++ b/data/maps/GraniteCave_StevensRoom/header.inc
@@ -7,7 +7,7 @@ GraniteCave_StevensRoom: @ 8483FD8
.2byte 288
.byte MAPSEC_GRANITE_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc
index e3a316015..438f3bd0a 100644
--- a/data/maps/InsideOfTruck/header.inc
+++ b/data/maps/InsideOfTruck/header.inc
@@ -7,7 +7,7 @@ InsideOfTruck: @ 8484EF0
.2byte 237
.byte MAPSEC_INSIDE_OF_TRUCK
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc
index 14fe2e7e2..6d097c21d 100644
--- a/data/maps/IslandCave/header.inc
+++ b/data/maps/IslandCave/header.inc
@@ -7,7 +7,7 @@ IslandCave: @ 8484614
.2byte 280
.byte MAPSEC_ISLAND_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc
index 6bab46582..326269407 100644
--- a/data/maps/JaggedPass/header.inc
+++ b/data/maps/JaggedPass/header.inc
@@ -7,7 +7,7 @@ JaggedPass: @ 848402C
.2byte 292
.byte MAPSEC_JAGGED_PASS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc
index ff1e483e0..9ddad2758 100644
--- a/data/maps/LavaridgeTown/header.inc
+++ b/data/maps/LavaridgeTown/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown: @ 8482608
.2byte 13
.byte MAPSEC_LAVARIDGE_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 13
diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc
index e7fb510f7..1257c09c0 100644
--- a/data/maps/LavaridgeTown_Gym_1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_Gym_1F: @ 8482CD0
.2byte 69
.byte MAPSEC_LAVARIDGE_TOWN
.byte 0
- .byte 6
+ .byte WEATHER_FOG_1
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc
index 1f591e8f2..fc90b501f 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_Gym_B1F: @ 8482CEC
.2byte 70
.byte MAPSEC_LAVARIDGE_TOWN
.byte 0
- .byte 6
+ .byte WEATHER_FOG_1
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc
index bb34945c5..db621e67d 100644
--- a/data/maps/LavaridgeTown_HerbShop/header.inc
+++ b/data/maps/LavaridgeTown_HerbShop/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_HerbShop: @ 8482CB4
.2byte 68
.byte MAPSEC_LAVARIDGE_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc
index f9e56baea..b8f607e15 100644
--- a/data/maps/LavaridgeTown_House/header.inc
+++ b/data/maps/LavaridgeTown_House/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_House: @ 8482D08
.2byte 64
.byte MAPSEC_LAVARIDGE_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc
index a01610eaf..f06a48f72 100644
--- a/data/maps/LavaridgeTown_Mart/header.inc
+++ b/data/maps/LavaridgeTown_Mart/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_Mart: @ 8482D24
.2byte 63
.byte MAPSEC_LAVARIDGE_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
index ae10ecf37..42a463624 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40
.2byte 71
.byte MAPSEC_LAVARIDGE_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
index 1fb9fc917..7149858a8 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C
.2byte 62
.byte MAPSEC_LAVARIDGE_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc
index eb3ad0011..f372e381c 100644
--- a/data/maps/LilycoveCity/header.inc
+++ b/data/maps/LilycoveCity/header.inc
@@ -7,7 +7,7 @@ LilycoveCity: @ 8482544
.2byte 6
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 13
diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc
index 29ec0ca38..1cd935b55 100644
--- a/data/maps/LilycoveCity_ContestHall/header.inc
+++ b/data/maps/LilycoveCity_ContestHall/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_ContestHall: @ 84836C4
.2byte 106
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc
index 6cbc84c1b..ee9660ebf 100644
--- a/data/maps/LilycoveCity_ContestLobby/header.inc
+++ b/data/maps/LilycoveCity_ContestLobby/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_ContestLobby: @ 84836A8
.2byte 105
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
index 7881cf288..166d86828 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638
.2byte 299
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
index 3e3a5810f..9b8f05106 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654
.2byte 300
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
index 3e490a6cd..23e99c981 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0
.2byte 273
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
index 991117c67..ffd3d4021 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884
.2byte 262
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
index af11b9d99..695b5560d 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8
.2byte 257
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
index dd79bf744..34beb40f7 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_2F: @ 8483814
.2byte 258
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
index 48e90e355..5c49de2eb 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_3F: @ 8483830
.2byte 259
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
index 3a098b37c..c298bc024 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_4F: @ 848384C
.2byte 260
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
index a1af1c59f..32c178628 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_5F: @ 8483868
.2byte 261
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc
index 4f8b71c7a..a28edee35 100644
--- a/data/maps/LilycoveCity_Harbor/header.inc
+++ b/data/maps/LilycoveCity_Harbor/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_Harbor: @ 8483750
.2byte 88
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc
index 903bcd845..e29bdfbc5 100644
--- a/data/maps/LilycoveCity_House1/header.inc
+++ b/data/maps/LilycoveCity_House1/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_House1: @ 8483788
.2byte 59
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc
index f78304998..0ffeffd03 100644
--- a/data/maps/LilycoveCity_House2/header.inc
+++ b/data/maps/LilycoveCity_House2/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_House2: @ 84837A4
.2byte 74
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc
index 49bd9d333..fc2868a9c 100644
--- a/data/maps/LilycoveCity_House3/header.inc
+++ b/data/maps/LilycoveCity_House3/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_House3: @ 84837C0
.2byte 60
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc
index 331b40645..66c3636cf 100644
--- a/data/maps/LilycoveCity_House4/header.inc
+++ b/data/maps/LilycoveCity_House4/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_House4: @ 84837DC
.2byte 59
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
index 1b5c0ed32..292c61623 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670
.2byte 103
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
index cb282a135..9bdff8e90 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C
.2byte 104
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
index 3bc705498..1adc065dd 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_MoveDeletersHouse: @ 848376C
.2byte 60
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
index 2dd859134..92bc0e9d9 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0
.2byte 61
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
index df902a25b..1ae72be25 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC
.2byte 62
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
index f429787fa..2137aecc9 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734
.2byte 107
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc
index 09869a0a5..ecff7b16f 100644
--- a/data/maps/LilycoveCity_UnusedMart/header.inc
+++ b/data/maps/LilycoveCity_UnusedMart/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_UnusedMart: @ 8483718
.2byte 63
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc
index bcb120e6b..8b35b2629 100644
--- a/data/maps/LinkContestRoom1/header.inc
+++ b/data/maps/LinkContestRoom1/header.inc
@@ -7,7 +7,7 @@ LinkContestRoom1: @ 8484DA0
.2byte 225
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc
index 298bbad57..b8e3e1822 100644
--- a/data/maps/LinkContestRoom2/header.inc
+++ b/data/maps/LinkContestRoom2/header.inc
@@ -7,7 +7,7 @@ LinkContestRoom2: @ 8484E64
.2byte 232
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc
index 3c60ff649..5b1e2d8f3 100644
--- a/data/maps/LinkContestRoom3/header.inc
+++ b/data/maps/LinkContestRoom3/header.inc
@@ -7,7 +7,7 @@ LinkContestRoom3: @ 8484E80
.2byte 233
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc
index 6be3dba3f..6a4190ca7 100644
--- a/data/maps/LinkContestRoom4/header.inc
+++ b/data/maps/LinkContestRoom4/header.inc
@@ -7,7 +7,7 @@ LinkContestRoom4: @ 8484E9C
.2byte 234
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc
index d929ef742..bf95bb2ef 100644
--- a/data/maps/LinkContestRoom5/header.inc
+++ b/data/maps/LinkContestRoom5/header.inc
@@ -7,7 +7,7 @@ LinkContestRoom5: @ 8484EB8
.2byte 235
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc
index cc2a56e79..231f31001 100644
--- a/data/maps/LinkContestRoom6/header.inc
+++ b/data/maps/LinkContestRoom6/header.inc
@@ -7,7 +7,7 @@ LinkContestRoom6: @ 8484ED4
.2byte 236
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc
index dbc6effd6..5fb0a6eab 100644
--- a/data/maps/LittlerootTown/header.inc
+++ b/data/maps/LittlerootTown/header.inc
@@ -7,7 +7,7 @@ LittlerootTown: @ 84825B4
.2byte 10
.byte MAPSEC_LITTLEROOT_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 13
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
index f4b411a06..69eff71f7 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
@@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4
.2byte 54
.byte MAPSEC_LITTLEROOT_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
index 39a81acd1..7b5fa7375 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
@@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10
.2byte 55
.byte MAPSEC_LITTLEROOT_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
index 821cacc0b..56b925c2a 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
@@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C
.2byte 56
.byte MAPSEC_LITTLEROOT_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
index 711c8b381..496d3cf83 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
@@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_2F: @ 8482B48
.2byte 57
.byte MAPSEC_LITTLEROOT_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
index 18b6d4d61..7ba2b7e0e 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
@@ -7,7 +7,7 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64
.2byte 58
.byte MAPSEC_LITTLEROOT_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc
index c82b22bc3..65e781626 100644
--- a/data/maps/MagmaHideout_1F/header.inc
+++ b/data/maps/MagmaHideout_1F/header.inc
@@ -7,7 +7,7 @@ MagmaHideout_1F: @ 8484828
.2byte 336
.byte MAPSEC_MAGMA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc
index 261502089..50bf554d7 100644
--- a/data/maps/MagmaHideout_2F_1R/header.inc
+++ b/data/maps/MagmaHideout_2F_1R/header.inc
@@ -7,7 +7,7 @@ MagmaHideout_2F_1R: @ 8484844
.2byte 337
.byte MAPSEC_MAGMA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc
index 5032b25a6..376c2f232 100644
--- a/data/maps/MagmaHideout_2F_2R/header.inc
+++ b/data/maps/MagmaHideout_2F_2R/header.inc
@@ -7,7 +7,7 @@ MagmaHideout_2F_2R: @ 8484860
.2byte 338
.byte MAPSEC_MAGMA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc
index fefbbfb8d..bc8816d1c 100644
--- a/data/maps/MagmaHideout_2F_3R/header.inc
+++ b/data/maps/MagmaHideout_2F_3R/header.inc
@@ -7,7 +7,7 @@ MagmaHideout_2F_3R: @ 84848EC
.2byte 380
.byte MAPSEC_MAGMA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc
index 52ad4945e..412756e49 100644
--- a/data/maps/MagmaHideout_3F_1R/header.inc
+++ b/data/maps/MagmaHideout_3F_1R/header.inc
@@ -7,7 +7,7 @@ MagmaHideout_3F_1R: @ 848487C
.2byte 339
.byte MAPSEC_MAGMA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc
index 14d6eeff6..d0ae8c4e1 100644
--- a/data/maps/MagmaHideout_3F_2R/header.inc
+++ b/data/maps/MagmaHideout_3F_2R/header.inc
@@ -7,7 +7,7 @@ MagmaHideout_3F_2R: @ 8484898
.2byte 340
.byte MAPSEC_MAGMA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc
index 8e27ddbae..f27df336c 100644
--- a/data/maps/MagmaHideout_3F_3R/header.inc
+++ b/data/maps/MagmaHideout_3F_3R/header.inc
@@ -7,7 +7,7 @@ MagmaHideout_3F_3R: @ 84848D0
.2byte 379
.byte MAPSEC_MAGMA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc
index b32ba1b05..778899830 100644
--- a/data/maps/MagmaHideout_4F/header.inc
+++ b/data/maps/MagmaHideout_4F/header.inc
@@ -7,7 +7,7 @@ MagmaHideout_4F: @ 84848B4
.2byte 341
.byte MAPSEC_MAGMA_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc
index 41c7c1a86..da43bbc46 100644
--- a/data/maps/MarineCave_End/header.inc
+++ b/data/maps/MarineCave_End/header.inc
@@ -7,7 +7,7 @@ MarineCave_End: @ 8484A04
.2byte 413
.byte MAPSEC_MARINE_CAVE
.byte 0
- .byte 6
+ .byte WEATHER_FOG_1
.byte 4
.2byte 0
.byte 14
diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc
index 1affd1213..6432ee987 100644
--- a/data/maps/MarineCave_Entrance/header.inc
+++ b/data/maps/MarineCave_Entrance/header.inc
@@ -7,7 +7,7 @@ MarineCave_Entrance: @ 84849E8
.2byte 407
.byte MAPSEC_MARINE_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 14
diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc
index bd14b94bf..a6a3db192 100644
--- a/data/maps/MauvilleCity/header.inc
+++ b/data/maps/MauvilleCity/header.inc
@@ -7,7 +7,7 @@ MauvilleCity: @ 84824F0
.2byte 3
.byte MAPSEC_MAUVILLE_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 13
diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc
index 2ad55f408..942859e0c 100644
--- a/data/maps/MauvilleCity_BikeShop/header.inc
+++ b/data/maps/MauvilleCity_BikeShop/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_BikeShop: @ 8483280
.2byte 90
.byte MAPSEC_MAUVILLE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc
index 24dd5d97d..20e6b5a09 100644
--- a/data/maps/MauvilleCity_GameCorner/header.inc
+++ b/data/maps/MauvilleCity_GameCorner/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_GameCorner: @ 84832B8
.2byte 91
.byte MAPSEC_MAUVILLE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc
index 21aa7c991..e10fa76c8 100644
--- a/data/maps/MauvilleCity_Gym/header.inc
+++ b/data/maps/MauvilleCity_Gym/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_Gym: @ 8483264
.2byte 89
.byte MAPSEC_MAUVILLE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc
index 719e88b1f..b5f6b9175 100644
--- a/data/maps/MauvilleCity_House1/header.inc
+++ b/data/maps/MauvilleCity_House1/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_House1: @ 848329C
.2byte 60
.byte MAPSEC_MAUVILLE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc
index 0ab38aa38..fe7b14fcc 100644
--- a/data/maps/MauvilleCity_House2/header.inc
+++ b/data/maps/MauvilleCity_House2/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_House2: @ 84832D4
.2byte 59
.byte MAPSEC_MAUVILLE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc
index 6e029f786..082ff6045 100644
--- a/data/maps/MauvilleCity_Mart/header.inc
+++ b/data/maps/MauvilleCity_Mart/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_Mart: @ 8483328
.2byte 63
.byte MAPSEC_MAUVILLE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
index b2b2e21ce..ddc901f44 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0
.2byte 61
.byte MAPSEC_MAUVILLE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
index aaefbba0a..e4981b277 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_PokemonCenter_2F: @ 848330C
.2byte 62
.byte MAPSEC_MAUVILLE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc
index 6cc631f65..2b012f5b8 100644
--- a/data/maps/MeteorFalls_1F_1R/header.inc
+++ b/data/maps/MeteorFalls_1F_1R/header.inc
@@ -7,7 +7,7 @@ MeteorFalls_1F_1R: @ 8483EC0
.2byte 125
.byte MAPSEC_METEOR_FALLS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc
index f225660d0..e2b352406 100644
--- a/data/maps/MeteorFalls_1F_2R/header.inc
+++ b/data/maps/MeteorFalls_1F_2R/header.inc
@@ -7,7 +7,7 @@ MeteorFalls_1F_2R: @ 8483EDC
.2byte 126
.byte MAPSEC_METEOR_FALLS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc
index ea434e50b..a90a21049 100644
--- a/data/maps/MeteorFalls_B1F_1R/header.inc
+++ b/data/maps/MeteorFalls_B1F_1R/header.inc
@@ -7,7 +7,7 @@ MeteorFalls_B1F_1R: @ 8483EF8
.2byte 127
.byte MAPSEC_METEOR_FALLS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc
index b820706f5..df6a9ee01 100644
--- a/data/maps/MeteorFalls_B1F_2R/header.inc
+++ b/data/maps/MeteorFalls_B1F_2R/header.inc
@@ -7,7 +7,7 @@ MeteorFalls_B1F_2R: @ 8483F14
.2byte 128
.byte MAPSEC_METEOR_FALLS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc
index 002031a7a..cf9796360 100644
--- a/data/maps/MeteorFalls_StevensCave/header.inc
+++ b/data/maps/MeteorFalls_StevensCave/header.inc
@@ -7,7 +7,7 @@ MeteorFalls_StevensCave: @ 8484A74
.2byte 431
.byte MAPSEC_METEOR_FALLS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc
index a9cf03b39..90bc41a90 100644
--- a/data/maps/MirageTower_1F/header.inc
+++ b/data/maps/MirageTower_1F/header.inc
@@ -7,7 +7,7 @@ MirageTower_1F: @ 8484908
.2byte 381
.byte MAPSEC_MIRAGE_TOWER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc
index 0c983da36..4a984edea 100644
--- a/data/maps/MirageTower_2F/header.inc
+++ b/data/maps/MirageTower_2F/header.inc
@@ -7,7 +7,7 @@ MirageTower_2F: @ 8484924
.2byte 382
.byte MAPSEC_MIRAGE_TOWER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc
index c26f56dea..c3c126d56 100644
--- a/data/maps/MirageTower_3F/header.inc
+++ b/data/maps/MirageTower_3F/header.inc
@@ -7,7 +7,7 @@ MirageTower_3F: @ 8484940
.2byte 383
.byte MAPSEC_MIRAGE_TOWER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc
index fc49e37a9..c0b51c174 100644
--- a/data/maps/MirageTower_4F/header.inc
+++ b/data/maps/MirageTower_4F/header.inc
@@ -7,7 +7,7 @@ MirageTower_4F: @ 848495C
.2byte 388
.byte MAPSEC_MIRAGE_TOWER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc
index 2c7c774d3..eba304363 100644
--- a/data/maps/MossdeepCity/header.inc
+++ b/data/maps/MossdeepCity/header.inc
@@ -7,7 +7,7 @@ MossdeepCity: @ 8482560
.2byte 7
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 13
diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc
index 75074e91f..b04ffb872 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F: @ 84839F0
.2byte 305
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
index 14e89db1c..d0b115b37 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C
.2byte 306
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc
index 2ce3b8eaa..df190975c 100644
--- a/data/maps/MossdeepCity_Gym/header.inc
+++ b/data/maps/MossdeepCity_Gym/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_Gym: @ 84838BC
.2byte 108
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc
index 8b7112431..0843eb3f4 100644
--- a/data/maps/MossdeepCity_House1/header.inc
+++ b/data/maps/MossdeepCity_House1/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_House1: @ 84838D8
.2byte 60
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc
index 72e0f38ab..b844bd961 100644
--- a/data/maps/MossdeepCity_House2/header.inc
+++ b/data/maps/MossdeepCity_House2/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_House2: @ 84838F4
.2byte 59
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc
index 8e56d6f53..6e47ed443 100644
--- a/data/maps/MossdeepCity_House3/header.inc
+++ b/data/maps/MossdeepCity_House3/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_House3: @ 8483964
.2byte 60
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc
index d5f7f5db9..dbd201c2e 100644
--- a/data/maps/MossdeepCity_House4/header.inc
+++ b/data/maps/MossdeepCity_House4/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_House4: @ 848399C
.2byte 80
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc
index 80bc3bc38..72dc8a409 100644
--- a/data/maps/MossdeepCity_Mart/header.inc
+++ b/data/maps/MossdeepCity_Mart/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_Mart: @ 8483948
.2byte 63
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
index 2277dd173..e39eb8183 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_1F: @ 8483910
.2byte 61
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
index 59c6ea2c8..022761465 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_2F: @ 848392C
.2byte 62
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
index ea035f4be..c38fc57eb 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8
.2byte 275
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
index e1418859b..53fb8a06a 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4
.2byte 276
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc
index 070effff6..43b5f92cf 100644
--- a/data/maps/MossdeepCity_StevensHouse/header.inc
+++ b/data/maps/MossdeepCity_StevensHouse/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_StevensHouse: @ 8483980
.2byte 327
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc
index 8d060e401..29c068992 100644
--- a/data/maps/MtChimney/header.inc
+++ b/data/maps/MtChimney/header.inc
@@ -7,7 +7,7 @@ MtChimney: @ 8484010
.2byte 136
.byte MAPSEC_MT_CHIMNEY
.byte 0
- .byte 7
+ .byte WEATHER_ASH
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc
index 7c1e49a99..3de6d823e 100644
--- a/data/maps/MtChimney_CableCarStation/header.inc
+++ b/data/maps/MtChimney_CableCarStation/header.inc
@@ -7,7 +7,7 @@ MtChimney_CableCarStation: @ 8483DFC
.2byte 118
.byte MAPSEC_MT_CHIMNEY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc
index 9e903d5b6..88306a7de 100644
--- a/data/maps/MtPyre_1F/header.inc
+++ b/data/maps/MtPyre_1F/header.inc
@@ -7,7 +7,7 @@ MtPyre_1F: @ 8484064
.2byte 137
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 8
diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc
index 4f3687bf2..0afddfb49 100644
--- a/data/maps/MtPyre_2F/header.inc
+++ b/data/maps/MtPyre_2F/header.inc
@@ -7,7 +7,7 @@ MtPyre_2F: @ 8484080
.2byte 138
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 8
diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc
index 28721a757..8ccabb8c8 100644
--- a/data/maps/MtPyre_3F/header.inc
+++ b/data/maps/MtPyre_3F/header.inc
@@ -7,7 +7,7 @@ MtPyre_3F: @ 848409C
.2byte 139
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 8
diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc
index a0be9d599..22a41d25c 100644
--- a/data/maps/MtPyre_4F/header.inc
+++ b/data/maps/MtPyre_4F/header.inc
@@ -7,7 +7,7 @@ MtPyre_4F: @ 84840B8
.2byte 140
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 8
diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc
index 7e756e8f5..47f92d2c8 100644
--- a/data/maps/MtPyre_5F/header.inc
+++ b/data/maps/MtPyre_5F/header.inc
@@ -7,7 +7,7 @@ MtPyre_5F: @ 84840D4
.2byte 141
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 8
diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc
index b9c9f38c5..ceaceca41 100644
--- a/data/maps/MtPyre_6F/header.inc
+++ b/data/maps/MtPyre_6F/header.inc
@@ -7,7 +7,7 @@ MtPyre_6F: @ 84840F0
.2byte 142
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 8
diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc
index aba767d32..c5e7576cf 100644
--- a/data/maps/MtPyre_Exterior/header.inc
+++ b/data/maps/MtPyre_Exterior/header.inc
@@ -7,7 +7,7 @@ MtPyre_Exterior: @ 848410C
.2byte 302
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc
index 10b8c44de..29597bceb 100644
--- a/data/maps/MtPyre_Summit/header.inc
+++ b/data/maps/MtPyre_Summit/header.inc
@@ -7,7 +7,7 @@ MtPyre_Summit: @ 8484128
.2byte 303
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 6
+ .byte WEATHER_FOG_1
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc
index 1d982d11f..2f8d472d2 100644
--- a/data/maps/NavelRock_B1F/header.inc
+++ b/data/maps/NavelRock_B1F/header.inc
@@ -7,7 +7,7 @@ NavelRock_B1F: @ 84858C8
.2byte 427
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc
index ccd6e4de4..ee2eeb102 100644
--- a/data/maps/NavelRock_Bottom/header.inc
+++ b/data/maps/NavelRock_Bottom/header.inc
@@ -7,7 +7,7 @@ NavelRock_Bottom: @ 8485AC0
.2byte 424
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc
index 2d6f6cdc1..8b11f8d93 100644
--- a/data/maps/NavelRock_Down01/header.inc
+++ b/data/maps/NavelRock_Down01/header.inc
@@ -7,7 +7,7 @@ NavelRock_Down01: @ 848598C
.2byte 425
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc
index 6146db29c..0b56cba11 100644
--- a/data/maps/NavelRock_Down02/header.inc
+++ b/data/maps/NavelRock_Down02/header.inc
@@ -7,7 +7,7 @@ NavelRock_Down02: @ 84859A8
.2byte 426
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc
index 0a0601117..a674e3849 100644
--- a/data/maps/NavelRock_Down03/header.inc
+++ b/data/maps/NavelRock_Down03/header.inc
@@ -7,7 +7,7 @@ NavelRock_Down03: @ 84859C4
.2byte 425
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc
index f1014f5e8..34359e5b8 100644
--- a/data/maps/NavelRock_Down04/header.inc
+++ b/data/maps/NavelRock_Down04/header.inc
@@ -7,7 +7,7 @@ NavelRock_Down04: @ 84859E0
.2byte 426
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc
index e638b9306..2be325bad 100644
--- a/data/maps/NavelRock_Down05/header.inc
+++ b/data/maps/NavelRock_Down05/header.inc
@@ -7,7 +7,7 @@ NavelRock_Down05: @ 84859FC
.2byte 425
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc
index db7bbbb92..c38950b20 100644
--- a/data/maps/NavelRock_Down06/header.inc
+++ b/data/maps/NavelRock_Down06/header.inc
@@ -7,7 +7,7 @@ NavelRock_Down06: @ 8485A18
.2byte 426
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc
index 27c228fe8..65af6ccd8 100644
--- a/data/maps/NavelRock_Down07/header.inc
+++ b/data/maps/NavelRock_Down07/header.inc
@@ -7,7 +7,7 @@ NavelRock_Down07: @ 8485A34
.2byte 425
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc
index 5cf41ad24..fd08b39ea 100644
--- a/data/maps/NavelRock_Down08/header.inc
+++ b/data/maps/NavelRock_Down08/header.inc
@@ -7,7 +7,7 @@ NavelRock_Down08: @ 8485A50
.2byte 426
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc
index b82c99552..9b22ca051 100644
--- a/data/maps/NavelRock_Down09/header.inc
+++ b/data/maps/NavelRock_Down09/header.inc
@@ -7,7 +7,7 @@ NavelRock_Down09: @ 8485A6C
.2byte 425
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc
index 2b1826572..4301b5f93 100644
--- a/data/maps/NavelRock_Down10/header.inc
+++ b/data/maps/NavelRock_Down10/header.inc
@@ -7,7 +7,7 @@ NavelRock_Down10: @ 8485A88
.2byte 426
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc
index 19fc50327..a45e05795 100644
--- a/data/maps/NavelRock_Down11/header.inc
+++ b/data/maps/NavelRock_Down11/header.inc
@@ -7,7 +7,7 @@ NavelRock_Down11: @ 8485AA4
.2byte 425
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc
index 2a302f904..5509d0cde 100644
--- a/data/maps/NavelRock_Entrance/header.inc
+++ b/data/maps/NavelRock_Entrance/header.inc
@@ -7,7 +7,7 @@ NavelRock_Entrance: @ 84858AC
.2byte 422
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc
index 4122b51cc..ed9234f34 100644
--- a/data/maps/NavelRock_Exterior/header.inc
+++ b/data/maps/NavelRock_Exterior/header.inc
@@ -7,7 +7,7 @@ NavelRock_Exterior: @ 8485874
.2byte 421
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 13
diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc
index d6da1a2c9..73aab8ad6 100644
--- a/data/maps/NavelRock_Fork/header.inc
+++ b/data/maps/NavelRock_Fork/header.inc
@@ -7,7 +7,7 @@ NavelRock_Fork: @ 84858E4
.2byte 428
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc
index f74ca0cdd..9e60e032f 100644
--- a/data/maps/NavelRock_Harbor/header.inc
+++ b/data/maps/NavelRock_Harbor/header.inc
@@ -7,7 +7,7 @@ NavelRock_Harbor: @ 8485890
.2byte 405
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc
index 464e1d3ec..3a1c8254d 100644
--- a/data/maps/NavelRock_Top/header.inc
+++ b/data/maps/NavelRock_Top/header.inc
@@ -7,7 +7,7 @@ NavelRock_Top: @ 8485970
.2byte 423
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc
index ebc18196d..41a342eb3 100644
--- a/data/maps/NavelRock_Up1/header.inc
+++ b/data/maps/NavelRock_Up1/header.inc
@@ -7,7 +7,7 @@ NavelRock_Up1: @ 8485900
.2byte 425
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc
index d259d7af2..db13a9adf 100644
--- a/data/maps/NavelRock_Up2/header.inc
+++ b/data/maps/NavelRock_Up2/header.inc
@@ -7,7 +7,7 @@ NavelRock_Up2: @ 848591C
.2byte 426
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc
index 12cc5aed7..e6e140696 100644
--- a/data/maps/NavelRock_Up3/header.inc
+++ b/data/maps/NavelRock_Up3/header.inc
@@ -7,7 +7,7 @@ NavelRock_Up3: @ 8485938
.2byte 425
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc
index 6455c8555..be297090a 100644
--- a/data/maps/NavelRock_Up4/header.inc
+++ b/data/maps/NavelRock_Up4/header.inc
@@ -7,7 +7,7 @@ NavelRock_Up4: @ 8485954
.2byte 426
.byte MAPSEC_NAVEL_ROCK2
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 12
diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc
index 212457f72..08df71885 100644
--- a/data/maps/NewMauville_Entrance/header.inc
+++ b/data/maps/NewMauville_Entrance/header.inc
@@ -7,7 +7,7 @@ NewMauville_Entrance: @ 8484470
.2byte 184
.byte MAPSEC_NEW_MAUVILLE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc
index 637ac378e..87628d4cf 100644
--- a/data/maps/NewMauville_Inside/header.inc
+++ b/data/maps/NewMauville_Inside/header.inc
@@ -7,7 +7,7 @@ NewMauville_Inside: @ 848448C
.2byte 185
.byte MAPSEC_NEW_MAUVILLE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc
index 16fb5aca0..de8566823 100644
--- a/data/maps/OldaleTown/header.inc
+++ b/data/maps/OldaleTown/header.inc
@@ -7,7 +7,7 @@ OldaleTown: @ 84825D0
.2byte 11
.byte MAPSEC_OLDALE_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 13
diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc
index f593d5769..0accc508b 100644
--- a/data/maps/OldaleTown_House1/header.inc
+++ b/data/maps/OldaleTown_House1/header.inc
@@ -7,7 +7,7 @@ OldaleTown_House1: @ 8482B80
.2byte 59
.byte MAPSEC_OLDALE_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc
index f7a265561..2d6cffcfa 100644
--- a/data/maps/OldaleTown_House2/header.inc
+++ b/data/maps/OldaleTown_House2/header.inc
@@ -7,7 +7,7 @@ OldaleTown_House2: @ 8482B9C
.2byte 60
.byte MAPSEC_OLDALE_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc
index 09fb145c8..d2bc44d39 100644
--- a/data/maps/OldaleTown_Mart/header.inc
+++ b/data/maps/OldaleTown_Mart/header.inc
@@ -7,7 +7,7 @@ OldaleTown_Mart: @ 8482BF0
.2byte 63
.byte MAPSEC_OLDALE_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
index dd942886a..2a0988475 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8
.2byte 61
.byte MAPSEC_OLDALE_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
index 21e6fc1f9..b1399a1b0 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4
.2byte 62
.byte MAPSEC_OLDALE_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc
index 3e4d88784..f903637a3 100644
--- a/data/maps/PacifidlogTown/header.inc
+++ b/data/maps/PacifidlogTown/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown: @ 848265C
.2byte 16
.byte MAPSEC_PACIFIDLOG_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 13
diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc
index 95d820a95..90098ec2c 100644
--- a/data/maps/PacifidlogTown_House1/header.inc
+++ b/data/maps/PacifidlogTown_House1/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_House1: @ 8482F8C
.2byte 77
.byte MAPSEC_PACIFIDLOG_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc
index 79c591b4a..a1433fbbc 100644
--- a/data/maps/PacifidlogTown_House2/header.inc
+++ b/data/maps/PacifidlogTown_House2/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_House2: @ 8482FA8
.2byte 78
.byte MAPSEC_PACIFIDLOG_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc
index 5222263f1..28d0fd8a5 100644
--- a/data/maps/PacifidlogTown_House3/header.inc
+++ b/data/maps/PacifidlogTown_House3/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_House3: @ 8482FC4
.2byte 77
.byte MAPSEC_PACIFIDLOG_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc
index 3774ccf3e..adbd42c6a 100644
--- a/data/maps/PacifidlogTown_House4/header.inc
+++ b/data/maps/PacifidlogTown_House4/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_House4: @ 8482FE0
.2byte 78
.byte MAPSEC_PACIFIDLOG_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc
index b8789b249..b30fb80d3 100644
--- a/data/maps/PacifidlogTown_House5/header.inc
+++ b/data/maps/PacifidlogTown_House5/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_House5: @ 8482FFC
.2byte 77
.byte MAPSEC_PACIFIDLOG_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
index 6fdc148e3..6d95c3b6e 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54
.2byte 61
.byte MAPSEC_PACIFIDLOG_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
index dc78b95ac..9cc1d0470 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70
.2byte 62
.byte MAPSEC_PACIFIDLOG_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc
index fab1f946c..bd94ab120 100644
--- a/data/maps/PetalburgCity/header.inc
+++ b/data/maps/PetalburgCity/header.inc
@@ -7,7 +7,7 @@ PetalburgCity: @ 84824B8
.2byte 1
.byte MAPSEC_PETALBURG_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 13
diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc
index 6d3a477be..661552e20 100644
--- a/data/maps/PetalburgCity_Gym/header.inc
+++ b/data/maps/PetalburgCity_Gym/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_Gym: @ 8483034
.2byte 79
.byte MAPSEC_PETALBURG_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc
index 7f9655153..00e26fe1a 100644
--- a/data/maps/PetalburgCity_House1/header.inc
+++ b/data/maps/PetalburgCity_House1/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_House1: @ 8483050
.2byte 59
.byte MAPSEC_PETALBURG_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc
index 8471a0f01..1a643f7e2 100644
--- a/data/maps/PetalburgCity_House2/header.inc
+++ b/data/maps/PetalburgCity_House2/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_House2: @ 848306C
.2byte 80
.byte MAPSEC_PETALBURG_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc
index d7b062ba2..85d8331a1 100644
--- a/data/maps/PetalburgCity_Mart/header.inc
+++ b/data/maps/PetalburgCity_Mart/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_Mart: @ 84830C0
.2byte 63
.byte MAPSEC_PETALBURG_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
index 6dc976d05..336958088 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_PokemonCenter_1F: @ 8483088
.2byte 61
.byte MAPSEC_PETALBURG_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
index 46f83636f..7b1e01861 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4
.2byte 62
.byte MAPSEC_PETALBURG_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc
index b6a064a8e..68c746b58 100644
--- a/data/maps/PetalburgCity_WallysHouse/header.inc
+++ b/data/maps/PetalburgCity_WallysHouse/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_WallysHouse: @ 8483018
.2byte 60
.byte MAPSEC_PETALBURG_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc
index b7f1ad818..bda2a3ab5 100644
--- a/data/maps/PetalburgWoods/header.inc
+++ b/data/maps/PetalburgWoods/header.inc
@@ -7,7 +7,7 @@ PetalburgWoods: @ 8483FF4
.2byte 135
.byte MAPSEC_PETALBURG_WOODS
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc
index aa3a7dd19..4d4583acf 100644
--- a/data/maps/RecordCorner/header.inc
+++ b/data/maps/RecordCorner/header.inc
@@ -7,7 +7,7 @@ RecordCorner: @ 8484D68
.2byte 223
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc
index 34a1ef764..0c76acfbc 100644
--- a/data/maps/Route101/header.inc
+++ b/data/maps/Route101/header.inc
@@ -7,7 +7,7 @@ Route101: @ 8482678
.2byte 17
.byte MAPSEC_ROUTE_101
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc
index 8a3b38d62..33e22d3bd 100644
--- a/data/maps/Route102/header.inc
+++ b/data/maps/Route102/header.inc
@@ -7,7 +7,7 @@ Route102: @ 8482694
.2byte 18
.byte MAPSEC_ROUTE_102
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc
index e59af7c13..22f0976d3 100644
--- a/data/maps/Route103/header.inc
+++ b/data/maps/Route103/header.inc
@@ -7,7 +7,7 @@ Route103: @ 84826B0
.2byte 19
.byte MAPSEC_ROUTE_103
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc
index 4d600499c..02019604d 100644
--- a/data/maps/Route104/header.inc
+++ b/data/maps/Route104/header.inc
@@ -7,7 +7,7 @@ Route104: @ 84826CC
.2byte 20
.byte MAPSEC_ROUTE_104
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc
index 14b8c1801..e67afc46c 100644
--- a/data/maps/Route104_MrBrineysHouse/header.inc
+++ b/data/maps/Route104_MrBrineysHouse/header.inc
@@ -7,7 +7,7 @@ Route104_MrBrineysHouse: @ 8483D70
.2byte 102
.byte MAPSEC_ROUTE_104
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
index b95129158..caf3f3f86 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
@@ -7,7 +7,7 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C
.2byte 117
.byte MAPSEC_ROUTE_104
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc
index 6c60ccfbe..ca694df00 100644
--- a/data/maps/Route104_Prototype/header.inc
+++ b/data/maps/Route104_Prototype/header.inc
@@ -7,7 +7,7 @@ Route104_Prototype: @ 8485AF8
.2byte 287
.byte MAPSEC_ROUTE_104
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 8
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
index 24cc091e9..87a794524 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
@@ -7,7 +7,7 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14
.2byte 117
.byte MAPSEC_ROUTE_104
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 8
diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc
index 3b34c3e70..a55cb3ede 100644
--- a/data/maps/Route105/header.inc
+++ b/data/maps/Route105/header.inc
@@ -7,7 +7,7 @@ Route105: @ 84826E8
.2byte 21
.byte MAPSEC_ROUTE_105
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc
index 51dfac9e3..df51d4222 100644
--- a/data/maps/Route106/header.inc
+++ b/data/maps/Route106/header.inc
@@ -7,7 +7,7 @@ Route106: @ 8482704
.2byte 22
.byte MAPSEC_ROUTE_106
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc
index 2c61323b5..09a47a2ae 100644
--- a/data/maps/Route107/header.inc
+++ b/data/maps/Route107/header.inc
@@ -7,7 +7,7 @@ Route107: @ 8482720
.2byte 23
.byte MAPSEC_ROUTE_107
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc
index eb982f2de..3b55160d8 100644
--- a/data/maps/Route108/header.inc
+++ b/data/maps/Route108/header.inc
@@ -7,7 +7,7 @@ Route108: @ 848273C
.2byte 24
.byte MAPSEC_ROUTE_108
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc
index b4e577678..30f3501a5 100644
--- a/data/maps/Route109/header.inc
+++ b/data/maps/Route109/header.inc
@@ -7,7 +7,7 @@ Route109: @ 8482758
.2byte 25
.byte MAPSEC_ROUTE_109
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc
index 68ae187ba..c9cbe2d23 100644
--- a/data/maps/Route109_SeashoreHouse/header.inc
+++ b/data/maps/Route109_SeashoreHouse/header.inc
@@ -7,7 +7,7 @@ Route109_SeashoreHouse: @ 8485B30
.2byte 243
.byte MAPSEC_ROUTE_109
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc
index 55bd7dbd0..92157a59d 100644
--- a/data/maps/Route110/header.inc
+++ b/data/maps/Route110/header.inc
@@ -7,7 +7,7 @@ Route110: @ 8482774
.2byte 26
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
index a271dba58..3105a321d 100644
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
@@ -7,7 +7,7 @@ Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80
.2byte 256
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
index 811184bd9..45260d6c4 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
@@ -7,7 +7,7 @@ Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C
.2byte 256
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc
index 07a795f3a..815a6a9e1 100644
--- a/data/maps/Route110_TrickHouseCorridor/header.inc
+++ b/data/maps/Route110_TrickHouseCorridor/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHouseCorridor: @ 8485B84
.2byte 246
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc
index 0ed34b2d1..86e923bb4 100644
--- a/data/maps/Route110_TrickHouseEnd/header.inc
+++ b/data/maps/Route110_TrickHouseEnd/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHouseEnd: @ 8485B68
.2byte 245
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc
index 5a90430fd..7eb37293a 100644
--- a/data/maps/Route110_TrickHouseEntrance/header.inc
+++ b/data/maps/Route110_TrickHouseEntrance/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHouseEntrance: @ 8485B4C
.2byte 244
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc
index c5620a2ce..1b8a7249b 100644
--- a/data/maps/Route110_TrickHousePuzzle1/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle1: @ 8485BA0
.2byte 247
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc
index 202a75774..1832db9ee 100644
--- a/data/maps/Route110_TrickHousePuzzle2/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle2: @ 8485BBC
.2byte 248
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc
index 2ad32f43f..b4f7a2ac8 100644
--- a/data/maps/Route110_TrickHousePuzzle3/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle3: @ 8485BD8
.2byte 249
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc
index 40b394a27..5c33fa74a 100644
--- a/data/maps/Route110_TrickHousePuzzle4/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle4: @ 8485BF4
.2byte 250
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc
index 9bb6f40b9..049a1b49b 100644
--- a/data/maps/Route110_TrickHousePuzzle5/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle5: @ 8485C10
.2byte 251
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc
index fa3bc610a..e312c1439 100644
--- a/data/maps/Route110_TrickHousePuzzle6/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle6: @ 8485C2C
.2byte 252
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc
index 8a9f6e6cd..d962c50ea 100644
--- a/data/maps/Route110_TrickHousePuzzle7/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle7: @ 8485C48
.2byte 253
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc
index 8023f4478..ce6caf06e 100644
--- a/data/maps/Route110_TrickHousePuzzle8/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle8: @ 8485C64
.2byte 254
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc
index a65a8c849..df43dd19c 100644
--- a/data/maps/Route111/header.inc
+++ b/data/maps/Route111/header.inc
@@ -7,7 +7,7 @@ Route111: @ 8482790
.2byte 27
.byte MAPSEC_ROUTE_111
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc
index 2f827017f..05d4e14f1 100644
--- a/data/maps/Route111_OldLadysRestStop/header.inc
+++ b/data/maps/Route111_OldLadysRestStop/header.inc
@@ -7,7 +7,7 @@ Route111_OldLadysRestStop: @ 8483DC4
.2byte 64
.byte MAPSEC_ROUTE_111
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc
index 909277b85..79e7c76de 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/header.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc
@@ -7,7 +7,7 @@ Route111_WinstrateFamilysHouse: @ 8483DA8
.2byte 60
.byte MAPSEC_ROUTE_111
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc
index 24589a71e..01bf8a437 100644
--- a/data/maps/Route112/header.inc
+++ b/data/maps/Route112/header.inc
@@ -7,7 +7,7 @@ Route112: @ 84827AC
.2byte 28
.byte MAPSEC_ROUTE_112
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc
index dff57293e..8a650439d 100644
--- a/data/maps/Route112_CableCarStation/header.inc
+++ b/data/maps/Route112_CableCarStation/header.inc
@@ -7,7 +7,7 @@ Route112_CableCarStation: @ 8483DE0
.2byte 118
.byte MAPSEC_ROUTE_112
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc
index 3ed0f5455..bbcb77d41 100644
--- a/data/maps/Route113/header.inc
+++ b/data/maps/Route113/header.inc
@@ -7,7 +7,7 @@ Route113: @ 84827C8
.2byte 29
.byte MAPSEC_ROUTE_113
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc
index 5298c41c2..77ecfd002 100644
--- a/data/maps/Route113_GlassWorkshop/header.inc
+++ b/data/maps/Route113_GlassWorkshop/header.inc
@@ -7,7 +7,7 @@ Route113_GlassWorkshop: @ 8485CB8
.2byte 67
.byte MAPSEC_ROUTE_113
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc
index d717c1235..ab90821ee 100644
--- a/data/maps/Route114/header.inc
+++ b/data/maps/Route114/header.inc
@@ -7,7 +7,7 @@ Route114: @ 84827E4
.2byte 30
.byte MAPSEC_ROUTE_114
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc
index 01ac3e4dd..459238ffd 100644
--- a/data/maps/Route114_FossilManiacsHouse/header.inc
+++ b/data/maps/Route114_FossilManiacsHouse/header.inc
@@ -7,7 +7,7 @@ Route114_FossilManiacsHouse: @ 8483E18
.2byte 119
.byte MAPSEC_ROUTE_114
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc
index b3794190b..47fabca3b 100644
--- a/data/maps/Route114_FossilManiacsTunnel/header.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/header.inc
@@ -7,7 +7,7 @@ Route114_FossilManiacsTunnel: @ 8483E34
.2byte 120
.byte MAPSEC_ROUTE_114
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc
index 031ae74b6..437aaef75 100644
--- a/data/maps/Route114_LanettesHouse/header.inc
+++ b/data/maps/Route114_LanettesHouse/header.inc
@@ -7,7 +7,7 @@ Route114_LanettesHouse: @ 8483E50
.2byte 121
.byte MAPSEC_ROUTE_114
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc
index 56cbab012..aa91043b6 100644
--- a/data/maps/Route115/header.inc
+++ b/data/maps/Route115/header.inc
@@ -7,7 +7,7 @@ Route115: @ 8482800
.2byte 31
.byte MAPSEC_ROUTE_115
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc
index 8fef8f257..ec37ba464 100644
--- a/data/maps/Route116/header.inc
+++ b/data/maps/Route116/header.inc
@@ -7,7 +7,7 @@ Route116: @ 848281C
.2byte 32
.byte MAPSEC_ROUTE_116
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc
index 8dad76407..566e0bf10 100644
--- a/data/maps/Route116_TunnelersRestHouse/header.inc
+++ b/data/maps/Route116_TunnelersRestHouse/header.inc
@@ -7,7 +7,7 @@ Route116_TunnelersRestHouse: @ 8483E6C
.2byte 122
.byte MAPSEC_ROUTE_116
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc
index 02804667c..3ed11a3ee 100644
--- a/data/maps/Route117/header.inc
+++ b/data/maps/Route117/header.inc
@@ -7,7 +7,7 @@ Route117: @ 8482838
.2byte 33
.byte MAPSEC_ROUTE_117
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc
index ea69af862..53e20cb54 100644
--- a/data/maps/Route117_PokemonDayCare/header.inc
+++ b/data/maps/Route117_PokemonDayCare/header.inc
@@ -7,7 +7,7 @@ Route117_PokemonDayCare: @ 8483E88
.2byte 123
.byte MAPSEC_ROUTE_117
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc
index ad90e8f55..47fa71638 100644
--- a/data/maps/Route118/header.inc
+++ b/data/maps/Route118/header.inc
@@ -7,7 +7,7 @@ Route118: @ 8482854
.2byte 34
.byte MAPSEC_ROUTE_118
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc
index af32f0bde..e5c3e5d54 100644
--- a/data/maps/Route119/header.inc
+++ b/data/maps/Route119/header.inc
@@ -7,7 +7,7 @@ Route119: @ 8482870
.2byte 35
.byte MAPSEC_ROUTE_119
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc
index 8f966eaf4..ee5c6ee43 100644
--- a/data/maps/Route119_House/header.inc
+++ b/data/maps/Route119_House/header.inc
@@ -7,7 +7,7 @@ Route119_House: @ 8485D28
.2byte 59
.byte MAPSEC_ROUTE_119
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc
index 7d324311e..a9e533460 100644
--- a/data/maps/Route119_WeatherInstitute_1F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/header.inc
@@ -7,7 +7,7 @@ Route119_WeatherInstitute_1F: @ 8485CF0
.2byte 271
.byte MAPSEC_ROUTE_119
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc
index d2a09b1b7..6b339317d 100644
--- a/data/maps/Route119_WeatherInstitute_2F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/header.inc
@@ -7,7 +7,7 @@ Route119_WeatherInstitute_2F: @ 8485D0C
.2byte 272
.byte MAPSEC_ROUTE_119
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc
index 1fa502a2b..75419c711 100644
--- a/data/maps/Route120/header.inc
+++ b/data/maps/Route120/header.inc
@@ -7,7 +7,7 @@ Route120: @ 848288C
.2byte 36
.byte MAPSEC_ROUTE_120
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc
index 588540fd4..9c441064f 100644
--- a/data/maps/Route121/header.inc
+++ b/data/maps/Route121/header.inc
@@ -7,7 +7,7 @@ Route121: @ 84828A8
.2byte 37
.byte MAPSEC_ROUTE_121
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc
index 9bb2b86fc..6fa3b0308 100644
--- a/data/maps/Route121_SafariZoneEntrance/header.inc
+++ b/data/maps/Route121_SafariZoneEntrance/header.inc
@@ -7,7 +7,7 @@ Route121_SafariZoneEntrance: @ 8483EA4
.2byte 124
.byte MAPSEC_ROUTE_121
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc
index d5bbaccf4..37d9a7a14 100644
--- a/data/maps/Route122/header.inc
+++ b/data/maps/Route122/header.inc
@@ -7,7 +7,7 @@ Route122: @ 84828C4
.2byte 38
.byte MAPSEC_ROUTE_122
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc
index e3fa357dd..f7d134894 100644
--- a/data/maps/Route123/header.inc
+++ b/data/maps/Route123/header.inc
@@ -7,7 +7,7 @@ Route123: @ 84828E0
.2byte 39
.byte MAPSEC_ROUTE_123
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc
index 89b03ed88..7516de239 100644
--- a/data/maps/Route123_BerryMastersHouse/header.inc
+++ b/data/maps/Route123_BerryMastersHouse/header.inc
@@ -7,7 +7,7 @@ Route123_BerryMastersHouse: @ 8485CD4
.2byte 60
.byte MAPSEC_ROUTE_123
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc
index 2ad541e81..6f4f3c540 100644
--- a/data/maps/Route124/header.inc
+++ b/data/maps/Route124/header.inc
@@ -7,7 +7,7 @@ Route124: @ 84828FC
.2byte 40
.byte MAPSEC_ROUTE_124
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 13
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
index d68c93985..fd405a128 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
@@ -7,7 +7,7 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44
.2byte 301
.byte MAPSEC_ROUTE_124
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc
index 30691d270..3e4affa65 100644
--- a/data/maps/Route125/header.inc
+++ b/data/maps/Route125/header.inc
@@ -7,7 +7,7 @@ Route125: @ 8482918
.2byte 41
.byte MAPSEC_ROUTE_125
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 13
diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc
index c00086a0b..ae2dae20f 100644
--- a/data/maps/Route126/header.inc
+++ b/data/maps/Route126/header.inc
@@ -7,7 +7,7 @@ Route126: @ 8482934
.2byte 42
.byte MAPSEC_ROUTE_126
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 13
diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc
index c242fe898..c92a963c7 100644
--- a/data/maps/Route127/header.inc
+++ b/data/maps/Route127/header.inc
@@ -7,7 +7,7 @@ Route127: @ 8482950
.2byte 43
.byte MAPSEC_ROUTE_127
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 13
diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc
index 6ced2f320..b4f08635f 100644
--- a/data/maps/Route128/header.inc
+++ b/data/maps/Route128/header.inc
@@ -7,7 +7,7 @@ Route128: @ 848296C
.2byte 44
.byte MAPSEC_ROUTE_128
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 13
diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc
index 4128e5dec..c16a9c91f 100644
--- a/data/maps/Route129/header.inc
+++ b/data/maps/Route129/header.inc
@@ -7,7 +7,7 @@ Route129: @ 8482988
.2byte 45
.byte MAPSEC_ROUTE_129
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 13
diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc
index 105e4316c..2787d369b 100644
--- a/data/maps/Route130/header.inc
+++ b/data/maps/Route130/header.inc
@@ -7,7 +7,7 @@ Route130: @ 84829A4
.2byte 263
.byte MAPSEC_ROUTE_130
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 13
diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc
index 0151fefde..eeb09e0ea 100644
--- a/data/maps/Route131/header.inc
+++ b/data/maps/Route131/header.inc
@@ -7,7 +7,7 @@ Route131: @ 84829C0
.2byte 47
.byte MAPSEC_ROUTE_131
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 13
diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc
index 77392dae8..672f4d3f7 100644
--- a/data/maps/Route132/header.inc
+++ b/data/maps/Route132/header.inc
@@ -7,7 +7,7 @@ Route132: @ 84829DC
.2byte 48
.byte MAPSEC_ROUTE_132
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 13
diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc
index 0233c4b1b..bd7ab0e10 100644
--- a/data/maps/Route133/header.inc
+++ b/data/maps/Route133/header.inc
@@ -7,7 +7,7 @@ Route133: @ 84829F8
.2byte 49
.byte MAPSEC_ROUTE_133
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 13
diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc
index b4bc18251..623db96b5 100644
--- a/data/maps/Route134/header.inc
+++ b/data/maps/Route134/header.inc
@@ -7,7 +7,7 @@ Route134: @ 8482A14
.2byte 50
.byte MAPSEC_ROUTE_134
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 13
diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc
index f26674d87..3aed4b2f2 100644
--- a/data/maps/RustboroCity/header.inc
+++ b/data/maps/RustboroCity/header.inc
@@ -7,7 +7,7 @@ RustboroCity: @ 848250C
.2byte 4
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 13
diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc
index b1e738b79..742a590e2 100644
--- a/data/maps/RustboroCity_CuttersHouse/header.inc
+++ b/data/maps/RustboroCity_CuttersHouse/header.inc
@@ -7,7 +7,7 @@ RustboroCity_CuttersHouse: @ 8483478
.2byte 98
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc
index 56dc26994..28b4a1d1c 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_DevonCorp_1F: @ 8483344
.2byte 92
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc
index 65046644f..f1bf1cd83 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_DevonCorp_2F: @ 8483360
.2byte 93
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc
index 7a5968b18..2bf6129fe 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_DevonCorp_3F: @ 848337C
.2byte 269
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc
index e9754f54f..792d6a87c 100644
--- a/data/maps/RustboroCity_Flat1_1F/header.inc
+++ b/data/maps/RustboroCity_Flat1_1F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Flat1_1F: @ 8483424
.2byte 313
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc
index a07f7fba9..50fbdf6d0 100644
--- a/data/maps/RustboroCity_Flat1_2F/header.inc
+++ b/data/maps/RustboroCity_Flat1_2F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Flat1_2F: @ 8483440
.2byte 314
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc
index 66e8b9e0e..271127402 100644
--- a/data/maps/RustboroCity_Flat2_1F/header.inc
+++ b/data/maps/RustboroCity_Flat2_1F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Flat2_1F: @ 84834B0
.2byte 294
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc
index 8a7884e58..f8bb6826d 100644
--- a/data/maps/RustboroCity_Flat2_2F/header.inc
+++ b/data/maps/RustboroCity_Flat2_2F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Flat2_2F: @ 84834CC
.2byte 295
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc
index 70e622e46..9fec8f298 100644
--- a/data/maps/RustboroCity_Flat2_3F/header.inc
+++ b/data/maps/RustboroCity_Flat2_3F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Flat2_3F: @ 84834E8
.2byte 296
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc
index f5297aaa2..fbac65351 100644
--- a/data/maps/RustboroCity_Gym/header.inc
+++ b/data/maps/RustboroCity_Gym/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Gym: @ 8483398
.2byte 94
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc
index e668e6327..7db64f8f9 100644
--- a/data/maps/RustboroCity_House1/header.inc
+++ b/data/maps/RustboroCity_House1/header.inc
@@ -7,7 +7,7 @@ RustboroCity_House1: @ 848345C
.2byte 97
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc
index bd075650e..db3ef40f4 100644
--- a/data/maps/RustboroCity_House2/header.inc
+++ b/data/maps/RustboroCity_House2/header.inc
@@ -7,7 +7,7 @@ RustboroCity_House2: @ 8483494
.2byte 96
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc
index f03668a60..08d31197b 100644
--- a/data/maps/RustboroCity_House3/header.inc
+++ b/data/maps/RustboroCity_House3/header.inc
@@ -7,7 +7,7 @@ RustboroCity_House3: @ 8483504
.2byte 96
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc
index 58a9f6075..d7126406e 100644
--- a/data/maps/RustboroCity_Mart/header.inc
+++ b/data/maps/RustboroCity_Mart/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Mart: @ 8483408
.2byte 63
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
index f482ba044..67070920e 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_PokemonCenter_1F: @ 84833D0
.2byte 61
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
index 48e731a3e..15e8537df 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_PokemonCenter_2F: @ 84833EC
.2byte 62
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc
index 6948dc366..13138b65e 100644
--- a/data/maps/RustboroCity_PokemonSchool/header.inc
+++ b/data/maps/RustboroCity_PokemonSchool/header.inc
@@ -7,7 +7,7 @@ RustboroCity_PokemonSchool: @ 84833B4
.2byte 95
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc
index 998208e80..e87800965 100644
--- a/data/maps/RusturfTunnel/header.inc
+++ b/data/maps/RusturfTunnel/header.inc
@@ -7,7 +7,7 @@ RusturfTunnel: @ 8483F30
.2byte 129
.byte MAPSEC_RUSTURF_TUNNEL
.byte 0
- .byte 6
+ .byte WEATHER_FOG_1
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc
index a33e236dd..6e66b473c 100644
--- a/data/maps/SSTidalCorridor/header.inc
+++ b/data/maps/SSTidalCorridor/header.inc
@@ -7,7 +7,7 @@ SSTidalCorridor: @ 8484F0C
.2byte 277
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc
index 2c627ad0b..1c7e1d01c 100644
--- a/data/maps/SSTidalLowerDeck/header.inc
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -7,7 +7,7 @@ SSTidalLowerDeck: @ 8484F28
.2byte 278
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc
index 935427cae..c02176a9b 100644
--- a/data/maps/SSTidalRooms/header.inc
+++ b/data/maps/SSTidalRooms/header.inc
@@ -7,7 +7,7 @@ SSTidalRooms: @ 8484F44
.2byte 279
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc
index 5452be556..745e608a2 100644
--- a/data/maps/SafariZone_North/header.inc
+++ b/data/maps/SafariZone_North/header.inc
@@ -7,7 +7,7 @@ SafariZone_North: @ 8485158
.2byte 239
.byte MAPSEC_SAFARI_ZONE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc
index 9e8be1352..e25a8497b 100644
--- a/data/maps/SafariZone_Northeast/header.inc
+++ b/data/maps/SafariZone_Northeast/header.inc
@@ -7,7 +7,7 @@ SafariZone_Northeast: @ 848528C
.2byte 394
.byte MAPSEC_SAFARI_ZONE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc
index b3c98ee11..01b7e8198 100644
--- a/data/maps/SafariZone_Northwest/header.inc
+++ b/data/maps/SafariZone_Northwest/header.inc
@@ -7,7 +7,7 @@ SafariZone_Northwest: @ 848513C
.2byte 238
.byte MAPSEC_SAFARI_ZONE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc
index b56865835..e6739ff66 100644
--- a/data/maps/SafariZone_RestHouse/header.inc
+++ b/data/maps/SafariZone_RestHouse/header.inc
@@ -7,7 +7,7 @@ SafariZone_RestHouse: @ 8485270
.2byte 329
.byte MAPSEC_SAFARI_ZONE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc
index 9780b80d9..e60f44f9e 100644
--- a/data/maps/SafariZone_South/header.inc
+++ b/data/maps/SafariZone_South/header.inc
@@ -7,7 +7,7 @@ SafariZone_South: @ 8485190
.2byte 241
.byte MAPSEC_SAFARI_ZONE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc
index 17d73acf8..5da814cff 100644
--- a/data/maps/SafariZone_Southeast/header.inc
+++ b/data/maps/SafariZone_Southeast/header.inc
@@ -7,7 +7,7 @@ SafariZone_Southeast: @ 84852A8
.2byte 395
.byte MAPSEC_SAFARI_ZONE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc
index 5c82a2c3a..25115a13a 100644
--- a/data/maps/SafariZone_Southwest/header.inc
+++ b/data/maps/SafariZone_Southwest/header.inc
@@ -7,7 +7,7 @@ SafariZone_Southwest: @ 8485174
.2byte 240
.byte MAPSEC_SAFARI_ZONE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc
index 23aab68fe..51666baf3 100644
--- a/data/maps/ScorchedSlab/header.inc
+++ b/data/maps/ScorchedSlab/header.inc
@@ -7,7 +7,7 @@ ScorchedSlab: @ 84846BC
.2byte 311
.byte MAPSEC_SCORCHED_SLAB
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc
index 32e0cbb75..68bb92066 100644
--- a/data/maps/SeafloorCavern_Entrance/header.inc
+++ b/data/maps/SeafloorCavern_Entrance/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Entrance: @ 84841B4
.2byte 147
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc
index 4dd67bdb3..56bfc32cd 100644
--- a/data/maps/SeafloorCavern_Room1/header.inc
+++ b/data/maps/SeafloorCavern_Room1/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room1: @ 84841D0
.2byte 148
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc
index bec8fc16a..bfb164520 100644
--- a/data/maps/SeafloorCavern_Room2/header.inc
+++ b/data/maps/SeafloorCavern_Room2/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room2: @ 84841EC
.2byte 149
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc
index 3e6b0f5c8..c49f283e1 100644
--- a/data/maps/SeafloorCavern_Room3/header.inc
+++ b/data/maps/SeafloorCavern_Room3/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room3: @ 8484208
.2byte 150
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc
index a45bb4f6a..e440157e1 100644
--- a/data/maps/SeafloorCavern_Room4/header.inc
+++ b/data/maps/SeafloorCavern_Room4/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room4: @ 8484224
.2byte 151
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc
index 831c85394..3cfd1b9d0 100644
--- a/data/maps/SeafloorCavern_Room5/header.inc
+++ b/data/maps/SeafloorCavern_Room5/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room5: @ 8484240
.2byte 152
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc
index 5e39909fc..e336955eb 100644
--- a/data/maps/SeafloorCavern_Room6/header.inc
+++ b/data/maps/SeafloorCavern_Room6/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room6: @ 848425C
.2byte 153
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc
index fa9e72804..9f8c89f6f 100644
--- a/data/maps/SeafloorCavern_Room7/header.inc
+++ b/data/maps/SeafloorCavern_Room7/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room7: @ 8484278
.2byte 154
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc
index 8248b89f7..f701d53f2 100644
--- a/data/maps/SeafloorCavern_Room8/header.inc
+++ b/data/maps/SeafloorCavern_Room8/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room8: @ 8484294
.2byte 155
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc
index 2fb1a3b70..8345ee188 100644
--- a/data/maps/SeafloorCavern_Room9/header.inc
+++ b/data/maps/SeafloorCavern_Room9/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room9: @ 84842B0
.2byte 156
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 6
+ .byte WEATHER_FOG_1
.byte 4
.2byte 0
.byte 14
diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc
index 5e2b0c363..1061ce4c1 100644
--- a/data/maps/SealedChamber_InnerRoom/header.inc
+++ b/data/maps/SealedChamber_InnerRoom/header.inc
@@ -7,7 +7,7 @@ SealedChamber_InnerRoom: @ 84846A0
.2byte 304
.byte MAPSEC_SEALED_CHAMBER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc
index 1fabd6be1..66d278fab 100644
--- a/data/maps/SealedChamber_OuterRoom/header.inc
+++ b/data/maps/SealedChamber_OuterRoom/header.inc
@@ -7,7 +7,7 @@ SealedChamber_OuterRoom: @ 8484684
.2byte 284
.byte MAPSEC_SEALED_CHAMBER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc
index 4783af7a7..ebf5eea00 100644
--- a/data/maps/SecretBase_BlueCave1/header.inc
+++ b/data/maps/SecretBase_BlueCave1/header.inc
@@ -7,7 +7,7 @@ SecretBase_BlueCave1: @ 8484AC8
.2byte 199
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc
index 208a27ae8..69d2cf860 100644
--- a/data/maps/SecretBase_BlueCave2/header.inc
+++ b/data/maps/SecretBase_BlueCave2/header.inc
@@ -7,7 +7,7 @@ SecretBase_BlueCave2: @ 8484B70
.2byte 205
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc
index 0bdfe5f0f..40a99dcdc 100644
--- a/data/maps/SecretBase_BlueCave3/header.inc
+++ b/data/maps/SecretBase_BlueCave3/header.inc
@@ -7,7 +7,7 @@ SecretBase_BlueCave3: @ 8484C18
.2byte 211
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc
index 490214803..1b22ee18e 100644
--- a/data/maps/SecretBase_BlueCave4/header.inc
+++ b/data/maps/SecretBase_BlueCave4/header.inc
@@ -7,7 +7,7 @@ SecretBase_BlueCave4: @ 8484CC0
.2byte 217
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc
index ad8dc034c..79c7f3e8d 100644
--- a/data/maps/SecretBase_BrownCave1/header.inc
+++ b/data/maps/SecretBase_BrownCave1/header.inc
@@ -7,7 +7,7 @@ SecretBase_BrownCave1: @ 8484AAC
.2byte 198
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc
index 2e10374ec..030ceea85 100644
--- a/data/maps/SecretBase_BrownCave2/header.inc
+++ b/data/maps/SecretBase_BrownCave2/header.inc
@@ -7,7 +7,7 @@ SecretBase_BrownCave2: @ 8484B54
.2byte 204
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc
index 213364166..2bdb4838e 100644
--- a/data/maps/SecretBase_BrownCave3/header.inc
+++ b/data/maps/SecretBase_BrownCave3/header.inc
@@ -7,7 +7,7 @@ SecretBase_BrownCave3: @ 8484BFC
.2byte 210
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc
index 2dc17b4e0..e3137603a 100644
--- a/data/maps/SecretBase_BrownCave4/header.inc
+++ b/data/maps/SecretBase_BrownCave4/header.inc
@@ -7,7 +7,7 @@ SecretBase_BrownCave4: @ 8484CA4
.2byte 216
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc
index 70dcb91af..f2f0a00fc 100644
--- a/data/maps/SecretBase_RedCave1/header.inc
+++ b/data/maps/SecretBase_RedCave1/header.inc
@@ -7,7 +7,7 @@ SecretBase_RedCave1: @ 8484A90
.2byte 197
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc
index 23f96fb4e..4d11b7da3 100644
--- a/data/maps/SecretBase_RedCave2/header.inc
+++ b/data/maps/SecretBase_RedCave2/header.inc
@@ -7,7 +7,7 @@ SecretBase_RedCave2: @ 8484B38
.2byte 203
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc
index 68e302a71..b935650d6 100644
--- a/data/maps/SecretBase_RedCave3/header.inc
+++ b/data/maps/SecretBase_RedCave3/header.inc
@@ -7,7 +7,7 @@ SecretBase_RedCave3: @ 8484BE0
.2byte 209
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc
index faf3fd44b..b5240755e 100644
--- a/data/maps/SecretBase_RedCave4/header.inc
+++ b/data/maps/SecretBase_RedCave4/header.inc
@@ -7,7 +7,7 @@ SecretBase_RedCave4: @ 8484C88
.2byte 215
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc
index 2a98c0dd7..cb9140852 100644
--- a/data/maps/SecretBase_Shrub1/header.inc
+++ b/data/maps/SecretBase_Shrub1/header.inc
@@ -7,7 +7,7 @@ SecretBase_Shrub1: @ 8484B1C
.2byte 202
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc
index b3ccb0446..5b14ac5ac 100644
--- a/data/maps/SecretBase_Shrub2/header.inc
+++ b/data/maps/SecretBase_Shrub2/header.inc
@@ -7,7 +7,7 @@ SecretBase_Shrub2: @ 8484BC4
.2byte 208
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc
index 7e408128e..725cbd9dc 100644
--- a/data/maps/SecretBase_Shrub3/header.inc
+++ b/data/maps/SecretBase_Shrub3/header.inc
@@ -7,7 +7,7 @@ SecretBase_Shrub3: @ 8484C6C
.2byte 214
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc
index ea2c263bb..7dc3af57e 100644
--- a/data/maps/SecretBase_Shrub4/header.inc
+++ b/data/maps/SecretBase_Shrub4/header.inc
@@ -7,7 +7,7 @@ SecretBase_Shrub4: @ 8484D14
.2byte 220
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc
index e3951f3c1..1ca8f4374 100644
--- a/data/maps/SecretBase_Tree1/header.inc
+++ b/data/maps/SecretBase_Tree1/header.inc
@@ -7,7 +7,7 @@ SecretBase_Tree1: @ 8484B00
.2byte 201
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc
index 23e8da9b9..880f0dd90 100644
--- a/data/maps/SecretBase_Tree2/header.inc
+++ b/data/maps/SecretBase_Tree2/header.inc
@@ -7,7 +7,7 @@ SecretBase_Tree2: @ 8484BA8
.2byte 207
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc
index 61378b8a3..3cf6fef74 100644
--- a/data/maps/SecretBase_Tree3/header.inc
+++ b/data/maps/SecretBase_Tree3/header.inc
@@ -7,7 +7,7 @@ SecretBase_Tree3: @ 8484C50
.2byte 213
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc
index b5f601189..2688c2eca 100644
--- a/data/maps/SecretBase_Tree4/header.inc
+++ b/data/maps/SecretBase_Tree4/header.inc
@@ -7,7 +7,7 @@ SecretBase_Tree4: @ 8484CF8
.2byte 219
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc
index 1eee3cfed..b6d42f0a2 100644
--- a/data/maps/SecretBase_YellowCave1/header.inc
+++ b/data/maps/SecretBase_YellowCave1/header.inc
@@ -7,7 +7,7 @@ SecretBase_YellowCave1: @ 8484AE4
.2byte 200
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc
index 27d5a0ecc..08253975a 100644
--- a/data/maps/SecretBase_YellowCave2/header.inc
+++ b/data/maps/SecretBase_YellowCave2/header.inc
@@ -7,7 +7,7 @@ SecretBase_YellowCave2: @ 8484B8C
.2byte 206
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc
index f2e986b1c..0c1464cd9 100644
--- a/data/maps/SecretBase_YellowCave3/header.inc
+++ b/data/maps/SecretBase_YellowCave3/header.inc
@@ -7,7 +7,7 @@ SecretBase_YellowCave3: @ 8484C34
.2byte 212
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc
index 292672976..b20409781 100644
--- a/data/maps/SecretBase_YellowCave4/header.inc
+++ b/data/maps/SecretBase_YellowCave4/header.inc
@@ -7,7 +7,7 @@ SecretBase_YellowCave4: @ 8484CDC
.2byte 218
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 12
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
index 3c02b2433..b263badba 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_HighTideEntranceRoom: @ 8484438
.2byte 168
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
index b58e12335..386cf2b50 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_HighTideInnerRoom: @ 8484454
.2byte 169
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
index c34c87a10..9f1423424 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8
.2byte 164
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc
index 69aa8114e..f280c6879 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_LowTideIceRoom: @ 84847D4
.2byte 328
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
index 9fea56a0f..bcb536380 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_LowTideInnerRoom: @ 84843E4
.2byte 165
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
index 3dc8cae94..9fde2f89d 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_LowTideLowerRoom: @ 848441C
.2byte 167
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
index 5123f9a80..d111213f4 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_LowTideStairsRoom: @ 8484400
.2byte 166
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc
index 9100eb6de..c3542e15f 100644
--- a/data/maps/SingleBattleColosseum/header.inc
+++ b/data/maps/SingleBattleColosseum/header.inc
@@ -7,7 +7,7 @@ SingleBattleColosseum: @ 8484D30
.2byte 221
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc
index 7f55c68fb..d634f1006 100644
--- a/data/maps/SkyPillar_1F/header.inc
+++ b/data/maps/SkyPillar_1F/header.inc
@@ -7,7 +7,7 @@ SkyPillar_1F: @ 8484764
.2byte 322
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc
index 2be149c00..0379980bb 100644
--- a/data/maps/SkyPillar_2F/header.inc
+++ b/data/maps/SkyPillar_2F/header.inc
@@ -7,7 +7,7 @@ SkyPillar_2F: @ 8484780
.2byte 323
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc
index e54ede745..da58b47e5 100644
--- a/data/maps/SkyPillar_3F/header.inc
+++ b/data/maps/SkyPillar_3F/header.inc
@@ -7,7 +7,7 @@ SkyPillar_3F: @ 848479C
.2byte 324
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc
index 9823646f4..54c9432b5 100644
--- a/data/maps/SkyPillar_4F/header.inc
+++ b/data/maps/SkyPillar_4F/header.inc
@@ -7,7 +7,7 @@ SkyPillar_4F: @ 84847B8
.2byte 325
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc
index f72124743..84c7a9ae8 100644
--- a/data/maps/SkyPillar_5F/header.inc
+++ b/data/maps/SkyPillar_5F/header.inc
@@ -7,7 +7,7 @@ SkyPillar_5F: @ 84847F0
.2byte 330
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc
index 8efd8c542..52a71aefc 100644
--- a/data/maps/SkyPillar_Entrance/header.inc
+++ b/data/maps/SkyPillar_Entrance/header.inc
@@ -7,7 +7,7 @@ SkyPillar_Entrance: @ 848472C
.2byte 320
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc
index 24a7a4e2b..50bc46b24 100644
--- a/data/maps/SkyPillar_Outside/header.inc
+++ b/data/maps/SkyPillar_Outside/header.inc
@@ -7,7 +7,7 @@ SkyPillar_Outside: @ 8484748
.2byte 321
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc
index 1f99a1cb8..578341f9c 100644
--- a/data/maps/SkyPillar_Top/header.inc
+++ b/data/maps/SkyPillar_Top/header.inc
@@ -7,7 +7,7 @@ SkyPillar_Top: @ 848480C
.2byte 331
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 12
diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc
index e617b0a91..e6ee88487 100644
--- a/data/maps/SlateportCity/header.inc
+++ b/data/maps/SlateportCity/header.inc
@@ -7,7 +7,7 @@ SlateportCity: @ 84824D4
.2byte 2
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 13
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
index c76e6230b..7d4879fc7 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
@@ -7,7 +7,7 @@ SlateportCity_BattleTentBattleRoom: @ 848314C
.2byte 386
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc
index ddc1bfcef..177c05db8 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/header.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc
@@ -7,7 +7,7 @@ SlateportCity_BattleTentCorridor: @ 8483130
.2byte 385
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc
index 767410cbb..562905e49 100644
--- a/data/maps/SlateportCity_BattleTentLobby/header.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/header.inc
@@ -7,7 +7,7 @@ SlateportCity_BattleTentLobby: @ 8483114
.2byte 384
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc
index 8ec8c294b..6cc9cda8e 100644
--- a/data/maps/SlateportCity_Harbor/header.inc
+++ b/data/maps/SlateportCity_Harbor/header.inc
@@ -7,7 +7,7 @@ SlateportCity_Harbor: @ 84831D8
.2byte 88
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc
index 8f221fcc7..102784c6f 100644
--- a/data/maps/SlateportCity_House1/header.inc
+++ b/data/maps/SlateportCity_House1/header.inc
@@ -7,7 +7,7 @@ SlateportCity_House1: @ 8483168
.2byte 80
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc
index bc4fc03ce..60faa1552 100644
--- a/data/maps/SlateportCity_House2/header.inc
+++ b/data/maps/SlateportCity_House2/header.inc
@@ -7,7 +7,7 @@ SlateportCity_House2: @ 84831F4
.2byte 60
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc
index 569969de3..8fd2113cb 100644
--- a/data/maps/SlateportCity_Mart/header.inc
+++ b/data/maps/SlateportCity_Mart/header.inc
@@ -7,7 +7,7 @@ SlateportCity_Mart: @ 8483248
.2byte 63
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
index 88c4e349b..9cb13d8cf 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
@@ -7,7 +7,7 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0
.2byte 86
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
index e300ced6a..69e244a91 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
@@ -7,7 +7,7 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC
.2byte 87
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
index 2b3d99694..085db4d85 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ SlateportCity_PokemonCenter_1F: @ 8483210
.2byte 61
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
index 6070cab3c..c2bbb5097 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ SlateportCity_PokemonCenter_2F: @ 848322C
.2byte 62
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc
index 34a3f1916..33796df81 100644
--- a/data/maps/SlateportCity_PokemonFanClub/header.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/header.inc
@@ -7,7 +7,7 @@ SlateportCity_PokemonFanClub: @ 8483184
.2byte 85
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
index d4b8e9aea..73b7c113d 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
@@ -7,7 +7,7 @@ SlateportCity_SternsShipyard_1F: @ 84830DC
.2byte 81
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
index 894aabb9a..f3bc5fde2 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
@@ -7,7 +7,7 @@ SlateportCity_SternsShipyard_2F: @ 84830F8
.2byte 82
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc
index 0b48dbca0..ccc9c1671 100644
--- a/data/maps/SootopolisCity/header.inc
+++ b/data/maps/SootopolisCity/header.inc
@@ -7,7 +7,7 @@ SootopolisCity: @ 848257C
.2byte 8
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 13
diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc
index 663a64800..2d51a6b91 100644
--- a/data/maps/SootopolisCity_Gym_1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_1F/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_Gym_1F: @ 8483A28
.2byte 109
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc
index 11bb3b502..420ee8f53 100644
--- a/data/maps/SootopolisCity_Gym_B1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_Gym_B1F: @ 8483A44
.2byte 110
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc
index 5eaa8d470..d60dd358f 100644
--- a/data/maps/SootopolisCity_House1/header.inc
+++ b/data/maps/SootopolisCity_House1/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House1: @ 8483AB4
.2byte 307
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc
index 36daf5bb2..817b67693 100644
--- a/data/maps/SootopolisCity_House2/header.inc
+++ b/data/maps/SootopolisCity_House2/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House2: @ 8483AD0
.2byte 308
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc
index dfe26c5ea..a5225747b 100644
--- a/data/maps/SootopolisCity_House3/header.inc
+++ b/data/maps/SootopolisCity_House3/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House3: @ 8483AEC
.2byte 309
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc
index 1275ccf91..2e2697d4d 100644
--- a/data/maps/SootopolisCity_House4/header.inc
+++ b/data/maps/SootopolisCity_House4/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House4: @ 8483B08
.2byte 307
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc
index 0d634d549..0ec392f92 100644
--- a/data/maps/SootopolisCity_House5/header.inc
+++ b/data/maps/SootopolisCity_House5/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House5: @ 8483B24
.2byte 308
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc
index 9f151e737..97d0a73e9 100644
--- a/data/maps/SootopolisCity_House6/header.inc
+++ b/data/maps/SootopolisCity_House6/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House6: @ 8483B40
.2byte 309
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc
index 7dac9a029..9318e6ebe 100644
--- a/data/maps/SootopolisCity_House7/header.inc
+++ b/data/maps/SootopolisCity_House7/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House7: @ 8483B5C
.2byte 307
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
index d0fa71556..96d0ea1d1 100644
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78
.2byte 297
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc
index f1fc07ae2..982ac6fa4 100644
--- a/data/maps/SootopolisCity_Mart/header.inc
+++ b/data/maps/SootopolisCity_Mart/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_Mart: @ 8483A98
.2byte 63
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
index 7828f6bbb..0fd0fbf5e 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94
.2byte 439
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
index 5ebbff88b..660f26ae2 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0
.2byte 440
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
index 537ab1709..f39608216 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60
.2byte 61
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
index 76493dcfa..0844847c8 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C
.2byte 62
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc
index 82948348b..e72b6f310 100644
--- a/data/maps/SouthernIsland_Exterior/header.inc
+++ b/data/maps/SouthernIsland_Exterior/header.inc
@@ -7,7 +7,7 @@ SouthernIsland_Exterior: @ 8485238
.2byte 290
.byte MAPSEC_SOUTHERN_ISLAND
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc
index be575d25b..42bb8497d 100644
--- a/data/maps/SouthernIsland_Interior/header.inc
+++ b/data/maps/SouthernIsland_Interior/header.inc
@@ -7,7 +7,7 @@ SouthernIsland_Interior: @ 8485254
.2byte 291
.byte MAPSEC_SOUTHERN_ISLAND
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 3
.2byte 0
.byte 13
diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc
index 94a871f6a..bda560677 100644
--- a/data/maps/TerraCave_End/header.inc
+++ b/data/maps/TerraCave_End/header.inc
@@ -7,7 +7,7 @@ TerraCave_End: @ 8484A3C
.2byte 409
.byte MAPSEC_TERRA_CAVE
.byte 0
- .byte 6
+ .byte WEATHER_FOG_1
.byte 4
.2byte 0
.byte 14
diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc
index 81c405cdf..e38dc2fa8 100644
--- a/data/maps/TerraCave_Entrance/header.inc
+++ b/data/maps/TerraCave_Entrance/header.inc
@@ -7,7 +7,7 @@ TerraCave_Entrance: @ 8484A20
.2byte 408
.byte MAPSEC_TERRA_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc
index 92d6c14a7..4b2c0f840 100644
--- a/data/maps/TradeCenter/header.inc
+++ b/data/maps/TradeCenter/header.inc
@@ -7,7 +7,7 @@ TradeCenter: @ 8484D4C
.2byte 222
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc
index fba54fabd..41fddfeed 100644
--- a/data/maps/TrainerHill_1F/header.inc
+++ b/data/maps/TrainerHill_1F/header.inc
@@ -7,7 +7,7 @@ TrainerHill_1F: @ 84857E8
.2byte 415
.byte MAPSEC_TRAINER_HILL
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc
index d47e960ed..740afdba7 100644
--- a/data/maps/TrainerHill_2F/header.inc
+++ b/data/maps/TrainerHill_2F/header.inc
@@ -7,7 +7,7 @@ TrainerHill_2F: @ 8485804
.2byte 416
.byte MAPSEC_TRAINER_HILL
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc
index 60f981e3d..79597b686 100644
--- a/data/maps/TrainerHill_3F/header.inc
+++ b/data/maps/TrainerHill_3F/header.inc
@@ -7,7 +7,7 @@ TrainerHill_3F: @ 8485820
.2byte 417
.byte MAPSEC_TRAINER_HILL
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc
index 6b7edf22b..8286c131a 100644
--- a/data/maps/TrainerHill_4F/header.inc
+++ b/data/maps/TrainerHill_4F/header.inc
@@ -7,7 +7,7 @@ TrainerHill_4F: @ 848583C
.2byte 418
.byte MAPSEC_TRAINER_HILL
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc
index dd5daa4e2..c6ed43e08 100644
--- a/data/maps/TrainerHill_Elevator/header.inc
+++ b/data/maps/TrainerHill_Elevator/header.inc
@@ -7,7 +7,7 @@ TrainerHill_Elevator: @ 8485ADC
.2byte 266
.byte MAPSEC_TRAINER_HILL
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc
index 60422a940..a45f77c99 100644
--- a/data/maps/TrainerHill_Entrance/header.inc
+++ b/data/maps/TrainerHill_Entrance/header.inc
@@ -7,7 +7,7 @@ TrainerHill_Entrance: @ 84857CC
.2byte 414
.byte MAPSEC_TRAINER_HILL
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc
index c6c3e626c..e6000a2d5 100644
--- a/data/maps/TrainerHill_Roof/header.inc
+++ b/data/maps/TrainerHill_Roof/header.inc
@@ -7,7 +7,7 @@ TrainerHill_Roof: @ 8485858
.2byte 419
.byte MAPSEC_TRAINER_HILL
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 4
diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc
index 6d3603bf5..3ce516a3d 100644
--- a/data/maps/Underwater1/header.inc
+++ b/data/maps/Underwater1/header.inc
@@ -7,7 +7,7 @@ Underwater1: @ 8482A30
.2byte 274
.byte MAPSEC_UNDERWATER_124
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc
index 03230042b..1109fd52a 100644
--- a/data/maps/Underwater2/header.inc
+++ b/data/maps/Underwater2/header.inc
@@ -7,7 +7,7 @@ Underwater2: @ 8482A4C
.2byte 51
.byte MAPSEC_UNDERWATER_125
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc
index 203cf8b3c..c132e8e84 100644
--- a/data/maps/Underwater3/header.inc
+++ b/data/maps/Underwater3/header.inc
@@ -7,7 +7,7 @@ Underwater3: @ 8482A68
.2byte 52
.byte MAPSEC_UNDERWATER_126
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc
index b5de8aa07..ec0818b57 100644
--- a/data/maps/Underwater4/header.inc
+++ b/data/maps/Underwater4/header.inc
@@ -7,7 +7,7 @@ Underwater4: @ 8482A84
.2byte 53
.byte MAPSEC_UNDERWATER_127
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc
index e6a846303..ba247e68d 100644
--- a/data/maps/Underwater5/header.inc
+++ b/data/maps/Underwater5/header.inc
@@ -7,7 +7,7 @@ Underwater5: @ 8482AA0
.2byte 412
.byte MAPSEC_UNDERWATER_129
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc
index 0aadca37d..259f04eec 100644
--- a/data/maps/Underwater6/header.inc
+++ b/data/maps/Underwater6/header.inc
@@ -7,7 +7,7 @@ Underwater6: @ 8482ABC
.2byte 410
.byte MAPSEC_UNDERWATER_TERRA_CAVE
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc
index 388c3510f..f04015ba8 100644
--- a/data/maps/Underwater7/header.inc
+++ b/data/maps/Underwater7/header.inc
@@ -7,7 +7,7 @@ Underwater7: @ 8482AD8
.2byte 411
.byte MAPSEC_UNDERWATER_UNK1
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc
index 4aca9a734..51980c78c 100644
--- a/data/maps/Underwater_MarineCave/header.inc
+++ b/data/maps/Underwater_MarineCave/header.inc
@@ -7,7 +7,7 @@ Underwater_MarineCave: @ 84849CC
.2byte 406
.byte MAPSEC_UNDERWATER_MARINE_CAVE
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc
index 5715c5e90..6c746e8f1 100644
--- a/data/maps/Underwater_Route134/header.inc
+++ b/data/maps/Underwater_Route134/header.inc
@@ -7,7 +7,7 @@ Underwater_Route134: @ 848464C
.2byte 282
.byte MAPSEC_UNDERWATER_SEALED_CHAMBER
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc
index b39773d23..e5efbacf7 100644
--- a/data/maps/Underwater_SeafloorCavern/header.inc
+++ b/data/maps/Underwater_SeafloorCavern/header.inc
@@ -7,7 +7,7 @@ Underwater_SeafloorCavern: @ 8484198
.2byte 146
.byte MAPSEC_UNDERWATER_128
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc
index 8ca54e9fb..d6f2c2202 100644
--- a/data/maps/Underwater_SealedChamber/header.inc
+++ b/data/maps/Underwater_SealedChamber/header.inc
@@ -7,7 +7,7 @@ Underwater_SealedChamber: @ 8484668
.2byte 283
.byte MAPSEC_UNDERWATER_SEALED_CHAMBER
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc
index 661c4d105..94b039292 100644
--- a/data/maps/Underwater_SootopolisCity/header.inc
+++ b/data/maps/Underwater_SootopolisCity/header.inc
@@ -7,7 +7,7 @@ Underwater_SootopolisCity: @ 8483F4C
.2byte 130
.byte MAPSEC_UNDERWATER_SOOTOPOLIS
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 13
diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc
index 55566ceef..ff4220697 100644
--- a/data/maps/UnionRoom/header.inc
+++ b/data/maps/UnionRoom/header.inc
@@ -7,7 +7,7 @@ UnionRoom: @ 8485120
.2byte 393
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc
index 79438a8d4..7ce8ad751 100644
--- a/data/maps/UnknownMap_25_29/header.inc
+++ b/data/maps/UnknownMap_25_29/header.inc
@@ -7,7 +7,7 @@ UnknownMap_25_29: @ 8484DBC
.2byte 226
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc
index f5a6fde39..5735bdc9d 100644
--- a/data/maps/UnknownMap_25_30/header.inc
+++ b/data/maps/UnknownMap_25_30/header.inc
@@ -7,7 +7,7 @@ UnknownMap_25_30: @ 8484DD8
.2byte 227
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc
index cf5318be0..be7d4d933 100644
--- a/data/maps/UnknownMap_25_31/header.inc
+++ b/data/maps/UnknownMap_25_31/header.inc
@@ -7,7 +7,7 @@ UnknownMap_25_31: @ 8484DF4
.2byte 228
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc
index 538798a4c..2040ed5c7 100644
--- a/data/maps/UnknownMap_25_32/header.inc
+++ b/data/maps/UnknownMap_25_32/header.inc
@@ -7,7 +7,7 @@ UnknownMap_25_32: @ 8484E10
.2byte 229
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc
index c4d384729..038e5d760 100644
--- a/data/maps/UnknownMap_25_33/header.inc
+++ b/data/maps/UnknownMap_25_33/header.inc
@@ -7,7 +7,7 @@ UnknownMap_25_33: @ 8484E2C
.2byte 230
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc
index 3d08bf4ba..c59bd0b7f 100644
--- a/data/maps/UnknownMap_25_34/header.inc
+++ b/data/maps/UnknownMap_25_34/header.inc
@@ -7,7 +7,7 @@ UnknownMap_25_34: @ 8484E48
.2byte 231
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc
index aa176dbfd..c7bd8ee44 100644
--- a/data/maps/VerdanturfTown/header.inc
+++ b/data/maps/VerdanturfTown/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown: @ 8482640
.2byte 15
.byte MAPSEC_VERDANTURF_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 13
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
index bcdd211ee..22d20c23d 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90
.2byte 387
.byte MAPSEC_VERDANTURF_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
index e704df2f0..0c24a5cd8 100644
--- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74
.2byte 385
.byte MAPSEC_VERDANTURF_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc
index 7c7bc244c..3afb04c31 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_BattleTentLobby: @ 8482E58
.2byte 384
.byte MAPSEC_VERDANTURF_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
index a83a7f2fe..a60b166fc 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C
.2byte 60
.byte MAPSEC_VERDANTURF_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc
index ebc8d2083..91e9b1179 100644
--- a/data/maps/VerdanturfTown_House/header.inc
+++ b/data/maps/VerdanturfTown_House/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_House: @ 8482F38
.2byte 59
.byte MAPSEC_VERDANTURF_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc
index 90b1e7e0a..c1c661654 100644
--- a/data/maps/VerdanturfTown_Mart/header.inc
+++ b/data/maps/VerdanturfTown_Mart/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_Mart: @ 8482EAC
.2byte 63
.byte MAPSEC_VERDANTURF_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
index 5a8e1183f..d4524d031 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8
.2byte 61
.byte MAPSEC_VERDANTURF_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
index 0de25d4fa..77113ff7f 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4
.2byte 62
.byte MAPSEC_VERDANTURF_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc
index 7f9a923ec..26752c39d 100644
--- a/data/maps/VerdanturfTown_WandasHouse/header.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_WandasHouse: @ 8482F00
.2byte 76
.byte MAPSEC_VERDANTURF_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc
index 7e13504a5..a7159f5e1 100644
--- a/data/maps/VictoryRoad_1F/header.inc
+++ b/data/maps/VictoryRoad_1F/header.inc
@@ -7,7 +7,7 @@ VictoryRoad_1F: @ 8484374
.2byte 163
.byte MAPSEC_VICTORY_ROAD
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc
index 107eb524f..5aa5b120e 100644
--- a/data/maps/VictoryRoad_B1F/header.inc
+++ b/data/maps/VictoryRoad_B1F/header.inc
@@ -7,7 +7,7 @@ VictoryRoad_B1F: @ 8484390
.2byte 285
.byte MAPSEC_VICTORY_ROAD
.byte 1
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15
diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc
index 3c9453154..95e0537a4 100644
--- a/data/maps/VictoryRoad_B2F/header.inc
+++ b/data/maps/VictoryRoad_B2F/header.inc
@@ -7,7 +7,7 @@ VictoryRoad_B2F: @ 84843AC
.2byte 286
.byte MAPSEC_VICTORY_ROAD
.byte 1
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 15