summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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/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/BattleTower_BattleRoom/header.inc2
-rw-r--r--data/maps/BattleTower_Corridor/header.inc2
-rw-r--r--data/maps/BattleTower_Elevator/header.inc2
-rw-r--r--data/maps/BattleTower_Lobby/header.inc2
-rw-r--r--data/maps/BattleTower_Outside/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_B2F/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_B3F/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_B4F/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_Entrance/header.inc2
-rw-r--r--data/maps/DesertRuins/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_Corridor1/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Corridor2/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Corridor3/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Corridor4/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Corridor5/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_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/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_ContestHall/header.inc2
-rw-r--r--data/maps/FallarborTown_ContestLobby/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/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_EmptyMap/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_B1F/header.inc2
-rw-r--r--data/maps/MagmaHideout_B2F/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/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/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_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_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_ContestHall/header.inc2
-rw-r--r--data/maps/SlateportCity_ContestLobby/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_House8/header.inc2
-rw-r--r--data/maps/SootopolisCity_Mart/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/TradeCenter/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/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/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_ContestHall/header.inc2
-rw-r--r--data/maps/VerdanturfTown_ContestLobby/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
395 files changed, 395 insertions, 394 deletions
diff --git a/data/maps.s b/data/maps.s
index b0cf69d9d..ed1a6bed6 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 "include/macros.inc"
.include "constants/constants.inc"
diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc
index d00ed43da..8cec689af 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/header.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice:: @ 8307454
.2byte 196
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc
index 1f1c3ae27..54e660513 100644
--- a/data/maps/AbandonedShip_Corridors_1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Corridors_1F:: @ 8307374
.2byte 188
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc
index 91bb7808e..87c3b7f7b 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Corridors_B1F:: @ 83073AC
.2byte 190
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc
index 86b21b7ff..b4a526392 100644
--- a/data/maps/AbandonedShip_Deck/header.inc
+++ b/data/maps/AbandonedShip_Deck/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Deck:: @ 8307358
.2byte 187
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
index ecf1ba891..4a79ed9d1 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_HiddenFloorCorridors:: @ 830748C
.2byte 290
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
index 49e5519a1..d00d48363 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_HiddenFloorRooms:: @ 83074A8
.2byte 311
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 0
diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc
index f0d3167e9..efea716b2 100644
--- a/data/maps/AbandonedShip_Room_B1F/header.inc
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Room_B1F:: @ 830741C
.2byte 194
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc
index e7b172bd5..13362610f 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Rooms2_1F:: @ 8307438
.2byte 195
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
index 7150ed946..2bb3d1c35 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Rooms2_B1F:: @ 83073E4
.2byte 192
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc
index 6b44c3244..818e1bf37 100644
--- a/data/maps/AbandonedShip_Rooms_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Rooms_1F:: @ 8307390
.2byte 189
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc
index e633cb467..a5e23f06d 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Rooms_B1F:: @ 83073C8
.2byte 191
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc
index d948fcc74..9c20b5253 100644
--- a/data/maps/AbandonedShip_Underwater1/header.inc
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Underwater1:: @ 8307400
.2byte 193
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 1
diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc
index 45d3c6008..6238607c2 100644
--- a/data/maps/AbandonedShip_Underwater2/header.inc
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
@@ -7,7 +7,7 @@ AbandonedShip_Underwater2:: @ 8307470
.2byte 197
.byte MAPSEC_ABANDONED_SHIP
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 1
diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc
index f5354ca7e..7281a0ed2 100644
--- a/data/maps/AncientTomb/header.inc
+++ b/data/maps/AncientTomb/header.inc
@@ -7,7 +7,7 @@ AncientTomb:: @ 83074E0
.2byte 282
.byte MAPSEC_ANCIENT_TOMB
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc
index f3527ccfd..3eb77788b 100644
--- a/data/maps/AquaHideout_1F/header.inc
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -7,7 +7,7 @@ AquaHideout_1F:: @ 8306FF4
.2byte 144
.byte MAPSEC_EVIL_TEAM_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc
index 82244295e..97b0c3d41 100644
--- a/data/maps/AquaHideout_B1F/header.inc
+++ b/data/maps/AquaHideout_B1F/header.inc
@@ -7,7 +7,7 @@ AquaHideout_B1F:: @ 8307010
.2byte 145
.byte MAPSEC_EVIL_TEAM_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc
index f72dc8bd3..bed8c39c7 100644
--- a/data/maps/AquaHideout_B2F/header.inc
+++ b/data/maps/AquaHideout_B2F/header.inc
@@ -7,7 +7,7 @@ AquaHideout_B2F:: @ 830702C
.2byte 146
.byte MAPSEC_EVIL_TEAM_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc
index 6e7a51ca5..dd0d0a715 100644
--- a/data/maps/BattleTower_BattleRoom/header.inc
+++ b/data/maps/BattleTower_BattleRoom/header.inc
@@ -7,7 +7,7 @@ BattleTower_BattleRoom:: @ 8307C88
.2byte 269
.byte MAPSEC_BATTLE_TOWER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc
index f0eff7fc3..34304ab0f 100644
--- a/data/maps/BattleTower_Corridor/header.inc
+++ b/data/maps/BattleTower_Corridor/header.inc
@@ -7,7 +7,7 @@ BattleTower_Corridor:: @ 8307C6C
.2byte 268
.byte MAPSEC_BATTLE_TOWER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc
index c1e15c213..d455c8d2d 100644
--- a/data/maps/BattleTower_Elevator/header.inc
+++ b/data/maps/BattleTower_Elevator/header.inc
@@ -7,7 +7,7 @@ BattleTower_Elevator:: @ 8307C50
.2byte 267
.byte MAPSEC_BATTLE_TOWER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc
index eeee38922..9595fc740 100644
--- a/data/maps/BattleTower_Lobby/header.inc
+++ b/data/maps/BattleTower_Lobby/header.inc
@@ -7,7 +7,7 @@ BattleTower_Lobby:: @ 8307C34
.2byte 265
.byte MAPSEC_BATTLE_TOWER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc
index 5af2c97cb..7963d80a1 100644
--- a/data/maps/BattleTower_Outside/header.inc
+++ b/data/maps/BattleTower_Outside/header.inc
@@ -7,7 +7,7 @@ BattleTower_Outside:: @ 8307C18
.2byte 266
.byte MAPSEC_BATTLE_TOWER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc
index d17d56acc..8a956b330 100644
--- a/data/maps/CaveOfOrigin_1F/header.inc
+++ b/data/maps/CaveOfOrigin_1F/header.inc
@@ -7,7 +7,7 @@ CaveOfOrigin_1F:: @ 8307198
.2byte 159
.byte MAPSEC_CAVE_OF_ORIGIN
.byte 1
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc
index 18e24047a..1c53aee5a 100644
--- a/data/maps/CaveOfOrigin_B1F/header.inc
+++ b/data/maps/CaveOfOrigin_B1F/header.inc
@@ -7,7 +7,7 @@ CaveOfOrigin_B1F:: @ 83071B4
.2byte 160
.byte MAPSEC_CAVE_OF_ORIGIN
.byte 1
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc
index e9c6d472a..5cfe0b079 100644
--- a/data/maps/CaveOfOrigin_B2F/header.inc
+++ b/data/maps/CaveOfOrigin_B2F/header.inc
@@ -7,7 +7,7 @@ CaveOfOrigin_B2F:: @ 83071D0
.2byte 161
.byte MAPSEC_CAVE_OF_ORIGIN
.byte 1
- .byte 6
+ .byte WEATHER_FOG_1
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc
index 80529906d..272595dd8 100644
--- a/data/maps/CaveOfOrigin_B3F/header.inc
+++ b/data/maps/CaveOfOrigin_B3F/header.inc
@@ -7,7 +7,7 @@ CaveOfOrigin_B3F:: @ 83071EC
.2byte 162
.byte MAPSEC_CAVE_OF_ORIGIN
.byte 1
- .byte 6
+ .byte WEATHER_FOG_1
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/CaveOfOrigin_B4F/header.inc b/data/maps/CaveOfOrigin_B4F/header.inc
index af47ad097..c12476d63 100644
--- a/data/maps/CaveOfOrigin_B4F/header.inc
+++ b/data/maps/CaveOfOrigin_B4F/header.inc
@@ -7,7 +7,7 @@ CaveOfOrigin_B4F:: @ 8307208
.2byte 163
.byte MAPSEC_CAVE_OF_ORIGIN
.byte 0
- .byte 6
+ .byte WEATHER_FOG_1
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc
index bd63d13d8..877948756 100644
--- a/data/maps/CaveOfOrigin_Entrance/header.inc
+++ b/data/maps/CaveOfOrigin_Entrance/header.inc
@@ -7,7 +7,7 @@ CaveOfOrigin_Entrance:: @ 830717C
.2byte 158
.byte MAPSEC_CAVE_OF_ORIGIN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc
index 5181cd77d..55feda880 100644
--- a/data/maps/DesertRuins/header.inc
+++ b/data/maps/DesertRuins/header.inc
@@ -7,7 +7,7 @@ DesertRuins:: @ 8306E18
.2byte 132
.byte MAPSEC_DESERT_RUINS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc
index 02aeb91dc..1bbfba597 100644
--- a/data/maps/DewfordTown/header.inc
+++ b/data/maps/DewfordTown/header.inc
@@ -7,7 +7,7 @@ DewfordTown:: @ 830557C
.2byte 12
.byte MAPSEC_DEWFORD_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 1
diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc
index 2a7cb88dd..e001c5346 100644
--- a/data/maps/DewfordTown_Gym/header.inc
+++ b/data/maps/DewfordTown_Gym/header.inc
@@ -7,7 +7,7 @@ DewfordTown_Gym:: @ 8305B9C
.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 9bcbe90f3..516039595 100644
--- a/data/maps/DewfordTown_Hall/header.inc
+++ b/data/maps/DewfordTown_Hall/header.inc
@@ -7,7 +7,7 @@ DewfordTown_Hall:: @ 8305BB8
.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 1414d620e..efd85c949 100644
--- a/data/maps/DewfordTown_House1/header.inc
+++ b/data/maps/DewfordTown_House1/header.inc
@@ -7,7 +7,7 @@ DewfordTown_House1:: @ 8305B48
.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 1e2736ebe..625c4cce8 100644
--- a/data/maps/DewfordTown_House2/header.inc
+++ b/data/maps/DewfordTown_House2/header.inc
@@ -7,7 +7,7 @@ DewfordTown_House2:: @ 8305BD4
.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 6cb407275..48032deca 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ DewfordTown_PokemonCenter_1F:: @ 8305B64
.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 07a4f63f1..6f65eba2c 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ DewfordTown_PokemonCenter_2F:: @ 8305B80
.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 91750d7f7..1bcd8ff52 100644
--- a/data/maps/DoubleBattleColosseum/header.inc
+++ b/data/maps/DoubleBattleColosseum/header.inc
@@ -7,7 +7,7 @@ DoubleBattleColosseum:: @ 83079CC
.2byte 225
.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 d391a9409..e2698bca6 100644
--- a/data/maps/EverGrandeCity/header.inc
+++ b/data/maps/EverGrandeCity/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity:: @ 8305528
.2byte 9
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 1
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
index 43e8c9443..fbf4a207d 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_ChampionsRoom:: @ 8306B08
.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_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc
index ffb682ee5..5f0094f42 100644
--- a/data/maps/EverGrandeCity_Corridor1/header.inc
+++ b/data/maps/EverGrandeCity_Corridor1/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_Corridor1:: @ 8306B24
.2byte 117
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc
index 1240cf7e6..3ef9c7ecf 100644
--- a/data/maps/EverGrandeCity_Corridor2/header.inc
+++ b/data/maps/EverGrandeCity_Corridor2/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_Corridor2:: @ 8306B40
.2byte 117
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc
index 34047aab0..b20ca5309 100644
--- a/data/maps/EverGrandeCity_Corridor3/header.inc
+++ b/data/maps/EverGrandeCity_Corridor3/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_Corridor3:: @ 8306B5C
.2byte 117
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc
index 27ae6772c..1f4249601 100644
--- a/data/maps/EverGrandeCity_Corridor4/header.inc
+++ b/data/maps/EverGrandeCity_Corridor4/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_Corridor4:: @ 8306B78
.2byte 316
.byte MAPSEC_EVER_GRANDE_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc
index 6efeed94c..bab472a2e 100644
--- a/data/maps/EverGrandeCity_Corridor5/header.inc
+++ b/data/maps/EverGrandeCity_Corridor5/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_Corridor5:: @ 8306B94
.2byte 117
.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 6fa06eb1c..9d636477b 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/header.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_DrakesRoom:: @ 8306AEC
.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_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
index 37dcc4de4..379f5c6ad 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_GlaciasRoom:: @ 8306AD0
.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_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc
index ada0e84d3..e80e06438 100644
--- a/data/maps/EverGrandeCity_HallOfFame/header.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_HallOfFame:: @ 8306BCC
.2byte 299
.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 4a1f9ee07..ef989ba1d 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_PhoebesRoom:: @ 8306AB4
.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_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
index 9394714a3..c1132827d 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_PokemonCenter_1F:: @ 8306BE8
.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 86d5a5894..7d9025d64 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_PokemonCenter_2F:: @ 8306C04
.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/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc
index 519a20fab..ed461a017 100644
--- a/data/maps/EverGrandeCity_PokemonLeague/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_PokemonLeague:: @ 8306BB0
.2byte 271
.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 5f0684ea4..780b231a0 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/header.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc
@@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom:: @ 8306A98
.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/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc
index 892e58628..c369416e9 100644
--- a/data/maps/FallarborTown/header.inc
+++ b/data/maps/FallarborTown/header.inc
@@ -7,7 +7,7 @@ FallarborTown:: @ 83055B4
.2byte 14
.byte MAPSEC_FALLARBOR_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 1
diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc
index 8f69223a5..38ebb2471 100644
--- a/data/maps/FallarborTown_ContestHall/header.inc
+++ b/data/maps/FallarborTown_ContestHall/header.inc
@@ -7,7 +7,7 @@ FallarborTown_ContestHall:: @ 8305CEC
.2byte 73
.byte MAPSEC_FALLARBOR_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc
index f9031d69d..8ade4110f 100644
--- a/data/maps/FallarborTown_ContestLobby/header.inc
+++ b/data/maps/FallarborTown_ContestLobby/header.inc
@@ -7,7 +7,7 @@ FallarborTown_ContestLobby:: @ 8305CD0
.2byte 72
.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 21acaf42b..b62e28430 100644
--- a/data/maps/FallarborTown_House1/header.inc
+++ b/data/maps/FallarborTown_House1/header.inc
@@ -7,7 +7,7 @@ FallarborTown_House1:: @ 8305D40
.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 ef8fb0f2e..f2d509782 100644
--- a/data/maps/FallarborTown_House2/header.inc
+++ b/data/maps/FallarborTown_House2/header.inc
@@ -7,7 +7,7 @@ FallarborTown_House2:: @ 8305D5C
.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 e6e8d837f..ca22edf3e 100644
--- a/data/maps/FallarborTown_Mart/header.inc
+++ b/data/maps/FallarborTown_Mart/header.inc
@@ -7,7 +7,7 @@ FallarborTown_Mart:: @ 8305CB4
.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 cab60710f..4908d9fd0 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ FallarborTown_PokemonCenter_1F:: @ 8305D08
.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 f093c8feb..832987fb0 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24
.2byte 62
.byte MAPSEC_FALLARBOR_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc
index 512f5af55..05437213c 100644
--- a/data/maps/FieryPath/header.inc
+++ b/data/maps/FieryPath/header.inc
@@ -7,7 +7,7 @@ FieryPath:: @ 8306EF8
.2byte 294
.byte MAPSEC_FIERY_PATH
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc
index 23dc10dd6..fe916ca3c 100644
--- a/data/maps/FortreeCity/header.inc
+++ b/data/maps/FortreeCity/header.inc
@@ -7,7 +7,7 @@ FortreeCity:: @ 83054B8
.2byte 5
.byte MAPSEC_FORTREE_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 1
diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc
index 7c61563ae..31271754b 100644
--- a/data/maps/FortreeCity_DecorationShop/header.inc
+++ b/data/maps/FortreeCity_DecorationShop/header.inc
@@ -7,7 +7,7 @@ FortreeCity_DecorationShop:: @ 8306504
.2byte 256
.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 adb4179c8..5a2c428ea 100644
--- a/data/maps/FortreeCity_Gym/header.inc
+++ b/data/maps/FortreeCity_Gym/header.inc
@@ -7,7 +7,7 @@ FortreeCity_Gym:: @ 8306424
.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 3349b857b..96d70e9ae 100644
--- a/data/maps/FortreeCity_House1/header.inc
+++ b/data/maps/FortreeCity_House1/header.inc
@@ -7,7 +7,7 @@ FortreeCity_House1:: @ 8306408
.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 7baf0aa63..fadf57dd9 100644
--- a/data/maps/FortreeCity_House2/header.inc
+++ b/data/maps/FortreeCity_House2/header.inc
@@ -7,7 +7,7 @@ FortreeCity_House2:: @ 8306494
.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 d9d65297a..30997ef40 100644
--- a/data/maps/FortreeCity_House3/header.inc
+++ b/data/maps/FortreeCity_House3/header.inc
@@ -7,7 +7,7 @@ FortreeCity_House3:: @ 83064B0
.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 3b905352b..306914ca1 100644
--- a/data/maps/FortreeCity_House4/header.inc
+++ b/data/maps/FortreeCity_House4/header.inc
@@ -7,7 +7,7 @@ FortreeCity_House4:: @ 83064CC
.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 c3c361104..0dca5438d 100644
--- a/data/maps/FortreeCity_House5/header.inc
+++ b/data/maps/FortreeCity_House5/header.inc
@@ -7,7 +7,7 @@ FortreeCity_House5:: @ 83064E8
.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 a4dd40285..3c82dbab1 100644
--- a/data/maps/FortreeCity_Mart/header.inc
+++ b/data/maps/FortreeCity_Mart/header.inc
@@ -7,7 +7,7 @@ FortreeCity_Mart:: @ 8306478
.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 d606c08d8..229410991 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_1F:: @ 8306440
.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 9c5b3af3c..ca8700a84 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_2F:: @ 830645C
.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 707197625..bb37b2323 100644
--- a/data/maps/GraniteCave_1F/header.inc
+++ b/data/maps/GraniteCave_1F/header.inc
@@ -7,7 +7,7 @@ GraniteCave_1F:: @ 8306E34
.2byte 133
.byte MAPSEC_GRANITE_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc
index c9b9a85f4..6cf10e555 100644
--- a/data/maps/GraniteCave_B1F/header.inc
+++ b/data/maps/GraniteCave_B1F/header.inc
@@ -7,7 +7,7 @@ GraniteCave_B1F:: @ 8306E50
.2byte 134
.byte MAPSEC_GRANITE_CAVE
.byte 1
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc
index a6db19127..39347ab71 100644
--- a/data/maps/GraniteCave_B2F/header.inc
+++ b/data/maps/GraniteCave_B2F/header.inc
@@ -7,7 +7,7 @@ GraniteCave_B2F:: @ 8306E6C
.2byte 135
.byte MAPSEC_GRANITE_CAVE
.byte 1
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc
index 75a3089b3..f599bd9ce 100644
--- a/data/maps/GraniteCave_StevensRoom/header.inc
+++ b/data/maps/GraniteCave_StevensRoom/header.inc
@@ -7,7 +7,7 @@ GraniteCave_StevensRoom:: @ 8306E88
.2byte 289
.byte MAPSEC_GRANITE_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc
index 05478e8f3..0a7d172b2 100644
--- a/data/maps/InsideOfTruck/header.inc
+++ b/data/maps/InsideOfTruck/header.inc
@@ -7,7 +7,7 @@ InsideOfTruck:: @ 8307B38
.2byte 238
.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 baccbc500..a225616e6 100644
--- a/data/maps/IslandCave/header.inc
+++ b/data/maps/IslandCave/header.inc
@@ -7,7 +7,7 @@ IslandCave:: @ 83074C4
.2byte 281
.byte MAPSEC_ISLAND_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc
index c70af745f..4229556bc 100644
--- a/data/maps/JaggedPass/header.inc
+++ b/data/maps/JaggedPass/header.inc
@@ -7,7 +7,7 @@ JaggedPass:: @ 8306EDC
.2byte 293
.byte MAPSEC_JAGGED_PASS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc
index 57eae401c..ff1247e0c 100644
--- a/data/maps/LavaridgeTown/header.inc
+++ b/data/maps/LavaridgeTown/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown:: @ 8305598
.2byte 13
.byte MAPSEC_LAVARIDGE_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 1
diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc
index add939b34..cc7b6a041 100644
--- a/data/maps/LavaridgeTown_Gym_1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_Gym_1F:: @ 8305C0C
.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 393e0a72a..28a526f9d 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_Gym_B1F:: @ 8305C28
.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 69aa9b41f..fc647bca7 100644
--- a/data/maps/LavaridgeTown_HerbShop/header.inc
+++ b/data/maps/LavaridgeTown_HerbShop/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_HerbShop:: @ 8305BF0
.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 acb853281..01c1c07ed 100644
--- a/data/maps/LavaridgeTown_House/header.inc
+++ b/data/maps/LavaridgeTown_House/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_House:: @ 8305C44
.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 2dde392de..e110eb8d1 100644
--- a/data/maps/LavaridgeTown_Mart/header.inc
+++ b/data/maps/LavaridgeTown_Mart/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_Mart:: @ 8305C60
.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 a7ed83dcf..63fff42ab 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_PokemonCenter_1F:: @ 8305C7C
.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 ae3bde4ee..c8c4d647d 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ LavaridgeTown_PokemonCenter_2F:: @ 8305C98
.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 d46ea1da3..894507849 100644
--- a/data/maps/LilycoveCity/header.inc
+++ b/data/maps/LilycoveCity/header.inc
@@ -7,7 +7,7 @@ LilycoveCity:: @ 83054D4
.2byte 6
.byte MAPSEC_LILYCOVE_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 1
diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc
index 354a87c68..e2c30ab32 100644
--- a/data/maps/LilycoveCity_ContestHall/header.inc
+++ b/data/maps/LilycoveCity_ContestHall/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_ContestHall:: @ 83065AC
.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 b3ecad4e6..df2d526d2 100644
--- a/data/maps/LilycoveCity_ContestLobby/header.inc
+++ b/data/maps/LilycoveCity_ContestLobby/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_ContestLobby:: @ 8306590
.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 6931785d9..39b5e3601 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_1F:: @ 8306520
.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_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
index adeb46f6d..660c3f4b7 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_2F:: @ 830653C
.2byte 301
.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 83b55aa11..ebf5ca0b6 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreElevator:: @ 83067A4
.2byte 274
.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 21883b620..7497fcdbd 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreRooftop:: @ 8306788
.2byte 263
.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 5c7496738..9d08da924 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_1F:: @ 83066FC
.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_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
index 9bdbe7b5c..27403ca84 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_2F:: @ 8306718
.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_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
index 558a4ba33..574f3bc8b 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_3F:: @ 8306734
.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_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
index 3d207e42d..f395a6c07 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_4F:: @ 8306750
.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_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
index d5ff57c67..bf6e8463d 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_5F:: @ 830676C
.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_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc
index 5dfb291b2..463ffe1c4 100644
--- a/data/maps/LilycoveCity_EmptyMap/header.inc
+++ b/data/maps/LilycoveCity_EmptyMap/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_EmptyMap:: @ 8306654
.2byte 108
.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 eb5be90b5..b673fc6c6 100644
--- a/data/maps/LilycoveCity_Harbor/header.inc
+++ b/data/maps/LilycoveCity_Harbor/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_Harbor:: @ 8306638
.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 ac84648bf..79f604787 100644
--- a/data/maps/LilycoveCity_House1/header.inc
+++ b/data/maps/LilycoveCity_House1/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_House1:: @ 830668C
.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 f511a39fc..fe11ad801 100644
--- a/data/maps/LilycoveCity_House2/header.inc
+++ b/data/maps/LilycoveCity_House2/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_House2:: @ 83066A8
.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 5f4e49c44..4b068d0cd 100644
--- a/data/maps/LilycoveCity_House3/header.inc
+++ b/data/maps/LilycoveCity_House3/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_House3:: @ 83066C4
.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 e84ade915..a814cf979 100644
--- a/data/maps/LilycoveCity_House4/header.inc
+++ b/data/maps/LilycoveCity_House4/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_House4:: @ 83066E0
.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 a8d3a44b2..ace7e9249 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F:: @ 8306558
.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 da1fcadba..e39663e7a 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_2F:: @ 8306574
.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 d31f1403f..ec4d01087 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670
.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 05d628be7..174043d19 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_1F:: @ 83065C8
.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 9458e81e3..1b01f3f10 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_2F:: @ 83065E4
.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 8902c8a3e..00892a27e 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_PokemonTrainerFanClub:: @ 830661C
.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 a01efd98a..246dc32be 100644
--- a/data/maps/LilycoveCity_UnusedMart/header.inc
+++ b/data/maps/LilycoveCity_UnusedMart/header.inc
@@ -7,7 +7,7 @@ LilycoveCity_UnusedMart:: @ 8306600
.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 e762efb22..86468e12a 100644
--- a/data/maps/LinkContestRoom1/header.inc
+++ b/data/maps/LinkContestRoom1/header.inc
@@ -7,7 +7,7 @@ LinkContestRoom1:: @ 83079E8
.2byte 226
.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 636b94c72..b692a095a 100644
--- a/data/maps/LinkContestRoom2/header.inc
+++ b/data/maps/LinkContestRoom2/header.inc
@@ -7,7 +7,7 @@ LinkContestRoom2:: @ 8307AAC
.2byte 233
.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 ed19b4610..0e6dc2892 100644
--- a/data/maps/LinkContestRoom3/header.inc
+++ b/data/maps/LinkContestRoom3/header.inc
@@ -7,7 +7,7 @@ LinkContestRoom3:: @ 8307AC8
.2byte 234
.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 f93f2f429..81eef5228 100644
--- a/data/maps/LinkContestRoom4/header.inc
+++ b/data/maps/LinkContestRoom4/header.inc
@@ -7,7 +7,7 @@ LinkContestRoom4:: @ 8307AE4
.2byte 235
.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 904ad041f..8cfccbefd 100644
--- a/data/maps/LinkContestRoom5/header.inc
+++ b/data/maps/LinkContestRoom5/header.inc
@@ -7,7 +7,7 @@ LinkContestRoom5:: @ 8307B00
.2byte 236
.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 e3e736c11..b192f855f 100644
--- a/data/maps/LinkContestRoom6/header.inc
+++ b/data/maps/LinkContestRoom6/header.inc
@@ -7,7 +7,7 @@ LinkContestRoom6:: @ 8307B1C
.2byte 237
.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 d81a753a4..22cafceda 100644
--- a/data/maps/LittlerootTown/header.inc
+++ b/data/maps/LittlerootTown/header.inc
@@ -7,7 +7,7 @@ LittlerootTown:: @ 8305544
.2byte 10
.byte MAPSEC_LITTLEROOT_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 1
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
index cec139767..b52e72f56 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
@@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_1F:: @ 8305A30
.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 e7d78680d..30fa363a5 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
@@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_2F:: @ 8305A4C
.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 10e6e58e7..841b4292d 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
@@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_1F:: @ 8305A68
.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 c4f3682ab..82f9e51da 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
@@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_2F:: @ 8305A84
.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 acb0882ff..fbcd67c94 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
@@ -7,7 +7,7 @@ LittlerootTown_ProfessorBirchsLab:: @ 8305AA0
.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 d6c31983e..30e74f114 100644
--- a/data/maps/MagmaHideout_1F/header.inc
+++ b/data/maps/MagmaHideout_1F/header.inc
@@ -7,7 +7,7 @@ MagmaHideout_1F:: @ 8307588
.2byte 317
.byte MAPSEC_EVIL_TEAM_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc
index 67b117125..9d62ae97e 100644
--- a/data/maps/MagmaHideout_B1F/header.inc
+++ b/data/maps/MagmaHideout_B1F/header.inc
@@ -7,7 +7,7 @@ MagmaHideout_B1F:: @ 83075A4
.2byte 318
.byte MAPSEC_EVIL_TEAM_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc
index 10bd7266d..aaf19142c 100644
--- a/data/maps/MagmaHideout_B2F/header.inc
+++ b/data/maps/MagmaHideout_B2F/header.inc
@@ -7,7 +7,7 @@ MagmaHideout_B2F:: @ 83075C0
.2byte 319
.byte MAPSEC_EVIL_TEAM_HIDEOUT
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc
index ffd7f9145..ce31e4c56 100644
--- a/data/maps/MauvilleCity/header.inc
+++ b/data/maps/MauvilleCity/header.inc
@@ -7,7 +7,7 @@ MauvilleCity:: @ 8305480
.2byte 3
.byte MAPSEC_MAUVILLE_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 1
diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc
index e29d2d1cf..88c493a1f 100644
--- a/data/maps/MauvilleCity_BikeShop/header.inc
+++ b/data/maps/MauvilleCity_BikeShop/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_BikeShop:: @ 8306168
.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 af7ab0b1e..4ff122c70 100644
--- a/data/maps/MauvilleCity_GameCorner/header.inc
+++ b/data/maps/MauvilleCity_GameCorner/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_GameCorner:: @ 83061A0
.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 a16bdf7de..7ac3e60db 100644
--- a/data/maps/MauvilleCity_Gym/header.inc
+++ b/data/maps/MauvilleCity_Gym/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_Gym:: @ 830614C
.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 c0053d42a..ce170e2ea 100644
--- a/data/maps/MauvilleCity_House1/header.inc
+++ b/data/maps/MauvilleCity_House1/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_House1:: @ 8306184
.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 0446fb462..114991fb2 100644
--- a/data/maps/MauvilleCity_House2/header.inc
+++ b/data/maps/MauvilleCity_House2/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_House2:: @ 83061BC
.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 67fcf17ac..b8b5543e7 100644
--- a/data/maps/MauvilleCity_Mart/header.inc
+++ b/data/maps/MauvilleCity_Mart/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_Mart:: @ 8306210
.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 fd9dc4050..a040b8302 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_PokemonCenter_1F:: @ 83061D8
.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 988d2941b..1558e9805 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ MauvilleCity_PokemonCenter_2F:: @ 83061F4
.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 908cb3d75..a37240eb3 100644
--- a/data/maps/MeteorFalls_1F_1R/header.inc
+++ b/data/maps/MeteorFalls_1F_1R/header.inc
@@ -7,7 +7,7 @@ MeteorFalls_1F_1R:: @ 8306D70
.2byte 126
.byte MAPSEC_METEOR_FALLS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc
index 9b4a00a03..f8ae25204 100644
--- a/data/maps/MeteorFalls_1F_2R/header.inc
+++ b/data/maps/MeteorFalls_1F_2R/header.inc
@@ -7,7 +7,7 @@ MeteorFalls_1F_2R:: @ 8306D8C
.2byte 127
.byte MAPSEC_METEOR_FALLS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc
index 021440754..b18035650 100644
--- a/data/maps/MeteorFalls_B1F_1R/header.inc
+++ b/data/maps/MeteorFalls_B1F_1R/header.inc
@@ -7,7 +7,7 @@ MeteorFalls_B1F_1R:: @ 8306DA8
.2byte 128
.byte MAPSEC_METEOR_FALLS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc
index 7bbfdb6c2..88a145b9a 100644
--- a/data/maps/MeteorFalls_B1F_2R/header.inc
+++ b/data/maps/MeteorFalls_B1F_2R/header.inc
@@ -7,7 +7,7 @@ MeteorFalls_B1F_2R:: @ 8306DC4
.2byte 129
.byte MAPSEC_METEOR_FALLS
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc
index 77049e9cc..6602cc4c0 100644
--- a/data/maps/MossdeepCity/header.inc
+++ b/data/maps/MossdeepCity/header.inc
@@ -7,7 +7,7 @@ MossdeepCity:: @ 83054F0
.2byte 7
.byte MAPSEC_MOSSDEEP_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 1
diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc
index ac4f95a11..0aec2853a 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F:: @ 83068F4
.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_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
index 8f25b162b..afa7bde80 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_GameCorner_B1F:: @ 8306910
.2byte 307
.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 f815d2654..5968775c0 100644
--- a/data/maps/MossdeepCity_Gym/header.inc
+++ b/data/maps/MossdeepCity_Gym/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_Gym:: @ 83067C0
.2byte 109
.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 3619ee650..ca0150822 100644
--- a/data/maps/MossdeepCity_House1/header.inc
+++ b/data/maps/MossdeepCity_House1/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_House1:: @ 83067DC
.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 cb67f3876..4a41ce5b0 100644
--- a/data/maps/MossdeepCity_House2/header.inc
+++ b/data/maps/MossdeepCity_House2/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_House2:: @ 83067F8
.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 498487232..52b897474 100644
--- a/data/maps/MossdeepCity_House3/header.inc
+++ b/data/maps/MossdeepCity_House3/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_House3:: @ 8306868
.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 751c4e344..e7471fd62 100644
--- a/data/maps/MossdeepCity_House4/header.inc
+++ b/data/maps/MossdeepCity_House4/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_House4:: @ 83068A0
.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 a9c359807..fce4c42df 100644
--- a/data/maps/MossdeepCity_Mart/header.inc
+++ b/data/maps/MossdeepCity_Mart/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_Mart:: @ 830684C
.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 0dbd52d01..55b2b5ff0 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_1F:: @ 8306814
.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 64fa94ed7..cd1506e76 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_2F:: @ 8306830
.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 4b195f109..1ffe38a89 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_SpaceCenter_1F:: @ 83068BC
.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_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
index 2ea7660f0..adfefc039 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_SpaceCenter_2F:: @ 83068D8
.2byte 277
.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 c488186d7..fb1c1e84b 100644
--- a/data/maps/MossdeepCity_StevensHouse/header.inc
+++ b/data/maps/MossdeepCity_StevensHouse/header.inc
@@ -7,7 +7,7 @@ MossdeepCity_StevensHouse:: @ 8306884
.2byte 328
.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 bd3d1a404..84871bbce 100644
--- a/data/maps/MtChimney/header.inc
+++ b/data/maps/MtChimney/header.inc
@@ -7,7 +7,7 @@ MtChimney:: @ 8306EC0
.2byte 137
.byte MAPSEC_MT_CHIMNEY
.byte 0
- .byte 7
+ .byte WEATHER_ASH
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc
index 4489e2050..0e1f7e70d 100644
--- a/data/maps/MtChimney_CableCarStation/header.inc
+++ b/data/maps/MtChimney_CableCarStation/header.inc
@@ -7,7 +7,7 @@ MtChimney_CableCarStation:: @ 8306CAC
.2byte 119
.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 b9613f8f5..fbfe0ce06 100644
--- a/data/maps/MtPyre_1F/header.inc
+++ b/data/maps/MtPyre_1F/header.inc
@@ -7,7 +7,7 @@ MtPyre_1F:: @ 8306F14
.2byte 138
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc
index 8b6c62f95..726d0b074 100644
--- a/data/maps/MtPyre_2F/header.inc
+++ b/data/maps/MtPyre_2F/header.inc
@@ -7,7 +7,7 @@ MtPyre_2F:: @ 8306F30
.2byte 139
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc
index 7f380ebbc..cef743b5b 100644
--- a/data/maps/MtPyre_3F/header.inc
+++ b/data/maps/MtPyre_3F/header.inc
@@ -7,7 +7,7 @@ MtPyre_3F:: @ 8306F4C
.2byte 140
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc
index 8f4ec2190..85e3b82fc 100644
--- a/data/maps/MtPyre_4F/header.inc
+++ b/data/maps/MtPyre_4F/header.inc
@@ -7,7 +7,7 @@ MtPyre_4F:: @ 8306F68
.2byte 141
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc
index 990e55706..c2793a829 100644
--- a/data/maps/MtPyre_5F/header.inc
+++ b/data/maps/MtPyre_5F/header.inc
@@ -7,7 +7,7 @@ MtPyre_5F:: @ 8306F84
.2byte 142
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc
index 59376a8a5..091951b0f 100644
--- a/data/maps/MtPyre_6F/header.inc
+++ b/data/maps/MtPyre_6F/header.inc
@@ -7,7 +7,7 @@ MtPyre_6F:: @ 8306FA0
.2byte 143
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc
index 4947de176..f2978daf7 100644
--- a/data/maps/MtPyre_Exterior/header.inc
+++ b/data/maps/MtPyre_Exterior/header.inc
@@ -7,7 +7,7 @@ MtPyre_Exterior:: @ 8306FBC
.2byte 303
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc
index 4af2bb0cd..32d205526 100644
--- a/data/maps/MtPyre_Summit/header.inc
+++ b/data/maps/MtPyre_Summit/header.inc
@@ -7,7 +7,7 @@ MtPyre_Summit:: @ 8306FD8
.2byte 304
.byte MAPSEC_MT_PYRE
.byte 0
- .byte 6
+ .byte WEATHER_FOG_1
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc
index 452a89a1e..a90bb8d98 100644
--- a/data/maps/NewMauville_Entrance/header.inc
+++ b/data/maps/NewMauville_Entrance/header.inc
@@ -7,7 +7,7 @@ NewMauville_Entrance:: @ 8307320
.2byte 185
.byte MAPSEC_NEW_MAUVILLE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc
index c76ee0b84..9b5d04a42 100644
--- a/data/maps/NewMauville_Inside/header.inc
+++ b/data/maps/NewMauville_Inside/header.inc
@@ -7,7 +7,7 @@ NewMauville_Inside:: @ 830733C
.2byte 186
.byte MAPSEC_NEW_MAUVILLE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc
index 5ae65bc80..822507c96 100644
--- a/data/maps/OldaleTown/header.inc
+++ b/data/maps/OldaleTown/header.inc
@@ -7,7 +7,7 @@ OldaleTown:: @ 8305560
.2byte 11
.byte MAPSEC_OLDALE_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 1
diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc
index 9eef00f1b..05d20a2c3 100644
--- a/data/maps/OldaleTown_House1/header.inc
+++ b/data/maps/OldaleTown_House1/header.inc
@@ -7,7 +7,7 @@ OldaleTown_House1:: @ 8305ABC
.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 49e6e363b..e62c95dfb 100644
--- a/data/maps/OldaleTown_House2/header.inc
+++ b/data/maps/OldaleTown_House2/header.inc
@@ -7,7 +7,7 @@ OldaleTown_House2:: @ 8305AD8
.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 2cb202aff..bfc8b43fa 100644
--- a/data/maps/OldaleTown_Mart/header.inc
+++ b/data/maps/OldaleTown_Mart/header.inc
@@ -7,7 +7,7 @@ OldaleTown_Mart:: @ 8305B2C
.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 71570da63..53305c00d 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ OldaleTown_PokemonCenter_1F:: @ 8305AF4
.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 73eaa3e7a..74a468d80 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ OldaleTown_PokemonCenter_2F:: @ 8305B10
.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 0c3f8dc14..1ed15c94b 100644
--- a/data/maps/PacifidlogTown/header.inc
+++ b/data/maps/PacifidlogTown/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown:: @ 83055EC
.2byte 16
.byte MAPSEC_PACIFIDLOG_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 1
diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc
index 960510a10..f1f377547 100644
--- a/data/maps/PacifidlogTown_House1/header.inc
+++ b/data/maps/PacifidlogTown_House1/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_House1:: @ 8305E90
.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 e1389d640..5d586fb3e 100644
--- a/data/maps/PacifidlogTown_House2/header.inc
+++ b/data/maps/PacifidlogTown_House2/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_House2:: @ 8305EAC
.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 370c68fb9..f889259ce 100644
--- a/data/maps/PacifidlogTown_House3/header.inc
+++ b/data/maps/PacifidlogTown_House3/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_House3:: @ 8305EC8
.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 a4696948f..bd5ab6270 100644
--- a/data/maps/PacifidlogTown_House4/header.inc
+++ b/data/maps/PacifidlogTown_House4/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_House4:: @ 8305EE4
.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 7e784c5d9..90515cc79 100644
--- a/data/maps/PacifidlogTown_House5/header.inc
+++ b/data/maps/PacifidlogTown_House5/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_House5:: @ 8305F00
.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 c482332f2..332274802 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_1F:: @ 8305E58
.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 95818df6e..2f71ff564 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_2F:: @ 8305E74
.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 ecd98a176..db85c511a 100644
--- a/data/maps/PetalburgCity/header.inc
+++ b/data/maps/PetalburgCity/header.inc
@@ -7,7 +7,7 @@ PetalburgCity:: @ 8305448
.2byte 1
.byte MAPSEC_PETALBURG_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 1
diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc
index 2307f6c4c..4d225221c 100644
--- a/data/maps/PetalburgCity_Gym/header.inc
+++ b/data/maps/PetalburgCity_Gym/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_Gym:: @ 8305F38
.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 318b4701e..d4ca14c65 100644
--- a/data/maps/PetalburgCity_House1/header.inc
+++ b/data/maps/PetalburgCity_House1/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_House1:: @ 8305F54
.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 530a7fee6..5637a2bef 100644
--- a/data/maps/PetalburgCity_House2/header.inc
+++ b/data/maps/PetalburgCity_House2/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_House2:: @ 8305F70
.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 8a7109207..aef1d717b 100644
--- a/data/maps/PetalburgCity_Mart/header.inc
+++ b/data/maps/PetalburgCity_Mart/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_Mart:: @ 8305FC4
.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 d7b4c6631..281733cce 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_PokemonCenter_1F:: @ 8305F8C
.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 c74854e62..3da47f4a7 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_PokemonCenter_2F:: @ 8305FA8
.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 01c75ceb4..d6f106ce2 100644
--- a/data/maps/PetalburgCity_WallysHouse/header.inc
+++ b/data/maps/PetalburgCity_WallysHouse/header.inc
@@ -7,7 +7,7 @@ PetalburgCity_WallysHouse:: @ 8305F1C
.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 88a9b5782..31b8491b6 100644
--- a/data/maps/PetalburgWoods/header.inc
+++ b/data/maps/PetalburgWoods/header.inc
@@ -7,7 +7,7 @@ PetalburgWoods:: @ 8306EA4
.2byte 136
.byte MAPSEC_PETALBURG_WOODS
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc
index d45299b9b..983654e2d 100644
--- a/data/maps/RecordCorner/header.inc
+++ b/data/maps/RecordCorner/header.inc
@@ -7,7 +7,7 @@ RecordCorner:: @ 83079B0
.2byte 224
.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 a5fa12d17..fc21038b4 100644
--- a/data/maps/Route101/header.inc
+++ b/data/maps/Route101/header.inc
@@ -7,7 +7,7 @@ Route101:: @ 8305608
.2byte 17
.byte MAPSEC_ROUTE_101
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc
index 47474298f..874d665f0 100644
--- a/data/maps/Route102/header.inc
+++ b/data/maps/Route102/header.inc
@@ -7,7 +7,7 @@ Route102:: @ 8305624
.2byte 18
.byte MAPSEC_ROUTE_102
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc
index 22659ecde..0c3cc1803 100644
--- a/data/maps/Route103/header.inc
+++ b/data/maps/Route103/header.inc
@@ -7,7 +7,7 @@ Route103:: @ 8305640
.2byte 19
.byte MAPSEC_ROUTE_103
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc
index 4f2c4f972..c90a091c9 100644
--- a/data/maps/Route104/header.inc
+++ b/data/maps/Route104/header.inc
@@ -7,7 +7,7 @@ Route104:: @ 830565C
.2byte 20
.byte MAPSEC_ROUTE_104
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc
index 008c91ec1..05632e3b0 100644
--- a/data/maps/Route104_MrBrineysHouse/header.inc
+++ b/data/maps/Route104_MrBrineysHouse/header.inc
@@ -7,7 +7,7 @@ Route104_MrBrineysHouse:: @ 8306C20
.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 ebcdaf716..3ff72f780 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
@@ -7,7 +7,7 @@ Route104_PrettyPetalFlowerShop:: @ 8306C3C
.2byte 118
.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 a6226895e..ba6601509 100644
--- a/data/maps/Route104_Prototype/header.inc
+++ b/data/maps/Route104_Prototype/header.inc
@@ -7,7 +7,7 @@ Route104_Prototype:: @ 8307CF8
.2byte 288
.byte MAPSEC_ROUTE_104
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
index 55d13f166..cc2c17416 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
@@ -7,7 +7,7 @@ Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14
.2byte 118
.byte MAPSEC_ROUTE_104
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 1
diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc
index 596cd3f2f..29480a593 100644
--- a/data/maps/Route105/header.inc
+++ b/data/maps/Route105/header.inc
@@ -7,7 +7,7 @@ Route105:: @ 8305678
.2byte 21
.byte MAPSEC_ROUTE_105
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc
index a27e29335..06100a263 100644
--- a/data/maps/Route106/header.inc
+++ b/data/maps/Route106/header.inc
@@ -7,7 +7,7 @@ Route106:: @ 8305694
.2byte 22
.byte MAPSEC_ROUTE_106
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc
index cbb0a51d4..164b31f41 100644
--- a/data/maps/Route107/header.inc
+++ b/data/maps/Route107/header.inc
@@ -7,7 +7,7 @@ Route107:: @ 83056B0
.2byte 23
.byte MAPSEC_ROUTE_107
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc
index 10b5577a7..e0bf0a4cf 100644
--- a/data/maps/Route108/header.inc
+++ b/data/maps/Route108/header.inc
@@ -7,7 +7,7 @@ Route108:: @ 83056CC
.2byte 24
.byte MAPSEC_ROUTE_108
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc
index fb6a4cfa5..d89810726 100644
--- a/data/maps/Route109/header.inc
+++ b/data/maps/Route109/header.inc
@@ -7,7 +7,7 @@ Route109:: @ 83056E8
.2byte 25
.byte MAPSEC_ROUTE_109
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc
index 2b862890c..2bcef541a 100644
--- a/data/maps/Route109_SeashoreHouse/header.inc
+++ b/data/maps/Route109_SeashoreHouse/header.inc
@@ -7,7 +7,7 @@ Route109_SeashoreHouse:: @ 8307D30
.2byte 244
.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 44f9171c5..dc8c879e2 100644
--- a/data/maps/Route110/header.inc
+++ b/data/maps/Route110/header.inc
@@ -7,7 +7,7 @@ Route110:: @ 8305704
.2byte 26
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
index 3c8cbc913..a58634ce9 100644
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
@@ -7,7 +7,7 @@ Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C
.2byte 257
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
index 92a567e79..648eb731a 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
@@ -7,7 +7,7 @@ Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80
.2byte 257
.byte MAPSEC_ROUTE_110
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc
index 1917ca9e8..b443725c7 100644
--- a/data/maps/Route110_TrickHouseCorridor/header.inc
+++ b/data/maps/Route110_TrickHouseCorridor/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHouseCorridor:: @ 8307D84
.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_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc
index bbd71f6e0..c93534396 100644
--- a/data/maps/Route110_TrickHouseEnd/header.inc
+++ b/data/maps/Route110_TrickHouseEnd/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHouseEnd:: @ 8307D68
.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_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc
index 9e85c08b4..6a292f3be 100644
--- a/data/maps/Route110_TrickHouseEntrance/header.inc
+++ b/data/maps/Route110_TrickHouseEntrance/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHouseEntrance:: @ 8307D4C
.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_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc
index 5ccf92339..25c8ac058 100644
--- a/data/maps/Route110_TrickHousePuzzle1/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle1:: @ 8307DA0
.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_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc
index 79956b4ce..6bc98e718 100644
--- a/data/maps/Route110_TrickHousePuzzle2/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle2:: @ 8307DBC
.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_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc
index 39757f11c..e4da788a6 100644
--- a/data/maps/Route110_TrickHousePuzzle3/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle3:: @ 8307DD8
.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_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc
index 42240589e..9648e360b 100644
--- a/data/maps/Route110_TrickHousePuzzle4/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle4:: @ 8307DF4
.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_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc
index 66633e116..5188630fd 100644
--- a/data/maps/Route110_TrickHousePuzzle5/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle5:: @ 8307E10
.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_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc
index 8e481c0d2..214460bf8 100644
--- a/data/maps/Route110_TrickHousePuzzle6/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle6:: @ 8307E2C
.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_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc
index 7dbfeee9c..6e9a22746 100644
--- a/data/maps/Route110_TrickHousePuzzle7/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle7:: @ 8307E48
.2byte 254
.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 b5c19da8c..6e7683b8c 100644
--- a/data/maps/Route110_TrickHousePuzzle8/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/header.inc
@@ -7,7 +7,7 @@ Route110_TrickHousePuzzle8:: @ 8307E64
.2byte 255
.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 08bdee199..973e43ad3 100644
--- a/data/maps/Route111/header.inc
+++ b/data/maps/Route111/header.inc
@@ -7,7 +7,7 @@ Route111:: @ 8305720
.2byte 27
.byte MAPSEC_ROUTE_111
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc
index da9e9f2b2..af1b5d7f0 100644
--- a/data/maps/Route111_OldLadysRestStop/header.inc
+++ b/data/maps/Route111_OldLadysRestStop/header.inc
@@ -7,7 +7,7 @@ Route111_OldLadysRestStop:: @ 8306C74
.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 286ba879b..100cd4b8a 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/header.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc
@@ -7,7 +7,7 @@ Route111_WinstrateFamilysHouse:: @ 8306C58
.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 9181e6742..845b656d9 100644
--- a/data/maps/Route112/header.inc
+++ b/data/maps/Route112/header.inc
@@ -7,7 +7,7 @@ Route112:: @ 830573C
.2byte 28
.byte MAPSEC_ROUTE_112
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc
index 3621f354d..c04ae3a85 100644
--- a/data/maps/Route112_CableCarStation/header.inc
+++ b/data/maps/Route112_CableCarStation/header.inc
@@ -7,7 +7,7 @@ Route112_CableCarStation:: @ 8306C90
.2byte 119
.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 fb951f745..bcad63fca 100644
--- a/data/maps/Route113/header.inc
+++ b/data/maps/Route113/header.inc
@@ -7,7 +7,7 @@ Route113:: @ 8305758
.2byte 29
.byte MAPSEC_ROUTE_113
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc
index b91ea7e31..66bfc8b21 100644
--- a/data/maps/Route113_GlassWorkshop/header.inc
+++ b/data/maps/Route113_GlassWorkshop/header.inc
@@ -7,7 +7,7 @@ Route113_GlassWorkshop:: @ 8307EB8
.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 463b73fc6..d51ee825e 100644
--- a/data/maps/Route114/header.inc
+++ b/data/maps/Route114/header.inc
@@ -7,7 +7,7 @@ Route114:: @ 8305774
.2byte 30
.byte MAPSEC_ROUTE_114
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc
index 6d3a91f9b..8d22a1314 100644
--- a/data/maps/Route114_FossilManiacsHouse/header.inc
+++ b/data/maps/Route114_FossilManiacsHouse/header.inc
@@ -7,7 +7,7 @@ Route114_FossilManiacsHouse:: @ 8306CC8
.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_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc
index fb13a0014..f5f2c877c 100644
--- a/data/maps/Route114_FossilManiacsTunnel/header.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/header.inc
@@ -7,7 +7,7 @@ Route114_FossilManiacsTunnel:: @ 8306CE4
.2byte 121
.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 5ec566a97..44f4d47bc 100644
--- a/data/maps/Route114_LanettesHouse/header.inc
+++ b/data/maps/Route114_LanettesHouse/header.inc
@@ -7,7 +7,7 @@ Route114_LanettesHouse:: @ 8306D00
.2byte 122
.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 2b4ed1a8e..640735ac3 100644
--- a/data/maps/Route115/header.inc
+++ b/data/maps/Route115/header.inc
@@ -7,7 +7,7 @@ Route115:: @ 8305790
.2byte 31
.byte MAPSEC_ROUTE_115
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc
index ca397e802..2ba0a7ade 100644
--- a/data/maps/Route116/header.inc
+++ b/data/maps/Route116/header.inc
@@ -7,7 +7,7 @@ Route116:: @ 83057AC
.2byte 32
.byte MAPSEC_ROUTE_116
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc
index 1dfc79fd7..802c04403 100644
--- a/data/maps/Route116_TunnelersRestHouse/header.inc
+++ b/data/maps/Route116_TunnelersRestHouse/header.inc
@@ -7,7 +7,7 @@ Route116_TunnelersRestHouse:: @ 8306D1C
.2byte 123
.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 05481f3f6..c19c87950 100644
--- a/data/maps/Route117/header.inc
+++ b/data/maps/Route117/header.inc
@@ -7,7 +7,7 @@ Route117:: @ 83057C8
.2byte 33
.byte MAPSEC_ROUTE_117
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc
index 1f3e8ab1b..46923947b 100644
--- a/data/maps/Route117_PokemonDayCare/header.inc
+++ b/data/maps/Route117_PokemonDayCare/header.inc
@@ -7,7 +7,7 @@ Route117_PokemonDayCare:: @ 8306D38
.2byte 124
.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 7db58629e..944a9695d 100644
--- a/data/maps/Route118/header.inc
+++ b/data/maps/Route118/header.inc
@@ -7,7 +7,7 @@ Route118:: @ 83057E4
.2byte 34
.byte MAPSEC_ROUTE_118
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc
index 31ff54e69..b8a2d42bc 100644
--- a/data/maps/Route119/header.inc
+++ b/data/maps/Route119/header.inc
@@ -7,7 +7,7 @@ Route119:: @ 8305800
.2byte 35
.byte MAPSEC_ROUTE_119
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc
index 3f3a674c1..4ff380fed 100644
--- a/data/maps/Route119_House/header.inc
+++ b/data/maps/Route119_House/header.inc
@@ -7,7 +7,7 @@ Route119_House:: @ 8307F28
.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 c1d5e4a19..26ff382a1 100644
--- a/data/maps/Route119_WeatherInstitute_1F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/header.inc
@@ -7,7 +7,7 @@ Route119_WeatherInstitute_1F:: @ 8307EF0
.2byte 272
.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 cab0cff36..27aa20836 100644
--- a/data/maps/Route119_WeatherInstitute_2F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/header.inc
@@ -7,7 +7,7 @@ Route119_WeatherInstitute_2F:: @ 8307F0C
.2byte 273
.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 329aad838..6c1f1cde3 100644
--- a/data/maps/Route120/header.inc
+++ b/data/maps/Route120/header.inc
@@ -7,7 +7,7 @@ Route120:: @ 830581C
.2byte 36
.byte MAPSEC_ROUTE_120
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc
index 096e898e7..fb8fc3838 100644
--- a/data/maps/Route121/header.inc
+++ b/data/maps/Route121/header.inc
@@ -7,7 +7,7 @@ Route121:: @ 8305838
.2byte 37
.byte MAPSEC_ROUTE_121
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc
index eaf333fab..f00791155 100644
--- a/data/maps/Route121_SafariZoneEntrance/header.inc
+++ b/data/maps/Route121_SafariZoneEntrance/header.inc
@@ -7,7 +7,7 @@ Route121_SafariZoneEntrance:: @ 8306D54
.2byte 125
.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 8dbd09231..8154c3934 100644
--- a/data/maps/Route122/header.inc
+++ b/data/maps/Route122/header.inc
@@ -7,7 +7,7 @@ Route122:: @ 8305854
.2byte 38
.byte MAPSEC_ROUTE_122
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc
index 49d62bc91..fdd481274 100644
--- a/data/maps/Route123/header.inc
+++ b/data/maps/Route123/header.inc
@@ -7,7 +7,7 @@ Route123:: @ 8305870
.2byte 39
.byte MAPSEC_ROUTE_123
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc
index 8925ce819..2942daf3b 100644
--- a/data/maps/Route123_BerryMastersHouse/header.inc
+++ b/data/maps/Route123_BerryMastersHouse/header.inc
@@ -7,7 +7,7 @@ Route123_BerryMastersHouse:: @ 8307ED4
.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 ec5f01fa1..4e08e972b 100644
--- a/data/maps/Route124/header.inc
+++ b/data/maps/Route124/header.inc
@@ -7,7 +7,7 @@ Route124:: @ 830588C
.2byte 40
.byte MAPSEC_ROUTE_124
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 1
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
index 48c9a240b..474d3ec5d 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
@@ -7,7 +7,7 @@ Route124_DivingTreasureHuntersHouse:: @ 8307F44
.2byte 302
.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 baadfc335..1fb334b25 100644
--- a/data/maps/Route125/header.inc
+++ b/data/maps/Route125/header.inc
@@ -7,7 +7,7 @@ Route125:: @ 83058A8
.2byte 41
.byte MAPSEC_ROUTE_125
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 1
diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc
index de5cd84ff..92fdbf714 100644
--- a/data/maps/Route126/header.inc
+++ b/data/maps/Route126/header.inc
@@ -7,7 +7,7 @@ Route126:: @ 83058C4
.2byte 42
.byte MAPSEC_ROUTE_126
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 1
diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc
index b29d15194..7d9cf6d0f 100644
--- a/data/maps/Route127/header.inc
+++ b/data/maps/Route127/header.inc
@@ -7,7 +7,7 @@ Route127:: @ 83058E0
.2byte 43
.byte MAPSEC_ROUTE_127
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 1
diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc
index 76abd4ac8..b0b4e1cee 100644
--- a/data/maps/Route128/header.inc
+++ b/data/maps/Route128/header.inc
@@ -7,7 +7,7 @@ Route128:: @ 83058FC
.2byte 44
.byte MAPSEC_ROUTE_128
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 1
diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc
index 608152d59..a6f5bf6c7 100644
--- a/data/maps/Route129/header.inc
+++ b/data/maps/Route129/header.inc
@@ -7,7 +7,7 @@ Route129:: @ 8305918
.2byte 45
.byte MAPSEC_ROUTE_129
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 1
diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc
index c52b1a515..db1c520e8 100644
--- a/data/maps/Route130/header.inc
+++ b/data/maps/Route130/header.inc
@@ -7,7 +7,7 @@ Route130:: @ 8305934
.2byte 264
.byte MAPSEC_ROUTE_130
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 1
diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc
index fbda14a39..4e5a506f8 100644
--- a/data/maps/Route131/header.inc
+++ b/data/maps/Route131/header.inc
@@ -7,7 +7,7 @@ Route131:: @ 8305950
.2byte 47
.byte MAPSEC_ROUTE_131
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 1
diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc
index 591450ca8..5cd03df69 100644
--- a/data/maps/Route132/header.inc
+++ b/data/maps/Route132/header.inc
@@ -7,7 +7,7 @@ Route132:: @ 830596C
.2byte 48
.byte MAPSEC_ROUTE_132
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 1
diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc
index 37673de99..5f96d2fcd 100644
--- a/data/maps/Route133/header.inc
+++ b/data/maps/Route133/header.inc
@@ -7,7 +7,7 @@ Route133:: @ 8305988
.2byte 49
.byte MAPSEC_ROUTE_133
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 1
diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc
index 7583194dc..69cfa8900 100644
--- a/data/maps/Route134/header.inc
+++ b/data/maps/Route134/header.inc
@@ -7,7 +7,7 @@ Route134:: @ 83059A4
.2byte 50
.byte MAPSEC_ROUTE_134
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 6
.2byte 0
.byte 1
diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc
index 6bb3148f3..4e766abdc 100644
--- a/data/maps/RustboroCity/header.inc
+++ b/data/maps/RustboroCity/header.inc
@@ -7,7 +7,7 @@ RustboroCity:: @ 830549C
.2byte 4
.byte MAPSEC_RUSTBORO_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 1
diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc
index da7f7fc19..24f14733b 100644
--- a/data/maps/RustboroCity_CuttersHouse/header.inc
+++ b/data/maps/RustboroCity_CuttersHouse/header.inc
@@ -7,7 +7,7 @@ RustboroCity_CuttersHouse:: @ 8306360
.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 50d4eb0a1..fe6db5565 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_DevonCorp_1F:: @ 830622C
.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 3824d26af..65f4831a1 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_DevonCorp_2F:: @ 8306248
.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 5b9c9f610..06f287b0b 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_DevonCorp_3F:: @ 8306264
.2byte 270
.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 c8651f6e4..db75752ef 100644
--- a/data/maps/RustboroCity_Flat1_1F/header.inc
+++ b/data/maps/RustboroCity_Flat1_1F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Flat1_1F:: @ 830630C
.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_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc
index 623105877..6db4c4517 100644
--- a/data/maps/RustboroCity_Flat1_2F/header.inc
+++ b/data/maps/RustboroCity_Flat1_2F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Flat1_2F:: @ 8306328
.2byte 315
.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 7a3e8e6ed..98c12c63f 100644
--- a/data/maps/RustboroCity_Flat2_1F/header.inc
+++ b/data/maps/RustboroCity_Flat2_1F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Flat2_1F:: @ 8306398
.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_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc
index b3d46b826..8ada38a32 100644
--- a/data/maps/RustboroCity_Flat2_2F/header.inc
+++ b/data/maps/RustboroCity_Flat2_2F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Flat2_2F:: @ 83063B4
.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_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc
index 26340c97f..af691c218 100644
--- a/data/maps/RustboroCity_Flat2_3F/header.inc
+++ b/data/maps/RustboroCity_Flat2_3F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Flat2_3F:: @ 83063D0
.2byte 297
.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 eff57079b..9b7d28c1f 100644
--- a/data/maps/RustboroCity_Gym/header.inc
+++ b/data/maps/RustboroCity_Gym/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Gym:: @ 8306280
.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 d8186a144..b118dded3 100644
--- a/data/maps/RustboroCity_House1/header.inc
+++ b/data/maps/RustboroCity_House1/header.inc
@@ -7,7 +7,7 @@ RustboroCity_House1:: @ 8306344
.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 51c2df96d..b78218af5 100644
--- a/data/maps/RustboroCity_House2/header.inc
+++ b/data/maps/RustboroCity_House2/header.inc
@@ -7,7 +7,7 @@ RustboroCity_House2:: @ 830637C
.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 3fe416c2e..8ad464628 100644
--- a/data/maps/RustboroCity_House3/header.inc
+++ b/data/maps/RustboroCity_House3/header.inc
@@ -7,7 +7,7 @@ RustboroCity_House3:: @ 83063EC
.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 dc4e5fa95..e702ddeb4 100644
--- a/data/maps/RustboroCity_Mart/header.inc
+++ b/data/maps/RustboroCity_Mart/header.inc
@@ -7,7 +7,7 @@ RustboroCity_Mart:: @ 83062F0
.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 c6d157934..e2be65513 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_PokemonCenter_1F:: @ 83062B8
.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 519a795b3..7ec96a5f1 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4
.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 c2fcd9dcb..d561151f6 100644
--- a/data/maps/RustboroCity_PokemonSchool/header.inc
+++ b/data/maps/RustboroCity_PokemonSchool/header.inc
@@ -7,7 +7,7 @@ RustboroCity_PokemonSchool:: @ 830629C
.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 8ad0d2d1a..849bb8b26 100644
--- a/data/maps/RusturfTunnel/header.inc
+++ b/data/maps/RusturfTunnel/header.inc
@@ -7,7 +7,7 @@ RusturfTunnel:: @ 8306DE0
.2byte 130
.byte MAPSEC_RUSTURF_TUNNEL
.byte 0
- .byte 6
+ .byte WEATHER_FOG_1
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc
index ddb74ae22..e0f4a7272 100644
--- a/data/maps/SSTidalCorridor/header.inc
+++ b/data/maps/SSTidalCorridor/header.inc
@@ -7,7 +7,7 @@ SSTidalCorridor:: @ 8307B54
.2byte 278
.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 dac40a5a8..9cb467b69 100644
--- a/data/maps/SSTidalLowerDeck/header.inc
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -7,7 +7,7 @@ SSTidalLowerDeck:: @ 8307B70
.2byte 279
.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 837feae65..b109ebfdf 100644
--- a/data/maps/SSTidalRooms/header.inc
+++ b/data/maps/SSTidalRooms/header.inc
@@ -7,7 +7,7 @@ SSTidalRooms:: @ 8307B8C
.2byte 280
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc
index 07e2a6b79..52f9ef066 100644
--- a/data/maps/SafariZone_Northeast/header.inc
+++ b/data/maps/SafariZone_Northeast/header.inc
@@ -7,7 +7,7 @@ SafariZone_Northeast:: @ 8307BC4
.2byte 240
.byte MAPSEC_SAFARI_ZONE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc
index 850d29f3b..c5237f87e 100644
--- a/data/maps/SafariZone_Northwest/header.inc
+++ b/data/maps/SafariZone_Northwest/header.inc
@@ -7,7 +7,7 @@ SafariZone_Northwest:: @ 8307BA8
.2byte 239
.byte MAPSEC_SAFARI_ZONE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc
index b6bc6ec1a..1bd2bdfe0 100644
--- a/data/maps/SafariZone_RestHouse/header.inc
+++ b/data/maps/SafariZone_RestHouse/header.inc
@@ -7,7 +7,7 @@ SafariZone_RestHouse:: @ 8307CDC
.2byte 330
.byte MAPSEC_SAFARI_ZONE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc
index 41aa821c7..6d73c00a0 100644
--- a/data/maps/SafariZone_Southeast/header.inc
+++ b/data/maps/SafariZone_Southeast/header.inc
@@ -7,7 +7,7 @@ SafariZone_Southeast:: @ 8307BFC
.2byte 242
.byte MAPSEC_SAFARI_ZONE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc
index 823c795b5..a1072acdd 100644
--- a/data/maps/SafariZone_Southwest/header.inc
+++ b/data/maps/SafariZone_Southwest/header.inc
@@ -7,7 +7,7 @@ SafariZone_Southwest:: @ 8307BE0
.2byte 241
.byte MAPSEC_SAFARI_ZONE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc
index 73a32b237..2ba712fb1 100644
--- a/data/maps/ScorchedSlab/header.inc
+++ b/data/maps/ScorchedSlab/header.inc
@@ -7,7 +7,7 @@ ScorchedSlab:: @ 830756C
.2byte 312
.byte MAPSEC_SCORCHED_SLAB
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc
index 17791949a..e87d6da67 100644
--- a/data/maps/SeafloorCavern_Entrance/header.inc
+++ b/data/maps/SeafloorCavern_Entrance/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Entrance:: @ 8307064
.2byte 148
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc
index 0114d308c..6cb956807 100644
--- a/data/maps/SeafloorCavern_Room1/header.inc
+++ b/data/maps/SeafloorCavern_Room1/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room1:: @ 8307080
.2byte 149
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc
index bf7fd880b..b0091d99c 100644
--- a/data/maps/SeafloorCavern_Room2/header.inc
+++ b/data/maps/SeafloorCavern_Room2/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room2:: @ 830709C
.2byte 150
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc
index 6cee15884..5bcbdc4b2 100644
--- a/data/maps/SeafloorCavern_Room3/header.inc
+++ b/data/maps/SeafloorCavern_Room3/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room3:: @ 83070B8
.2byte 151
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc
index f905e314a..113aad4cb 100644
--- a/data/maps/SeafloorCavern_Room4/header.inc
+++ b/data/maps/SeafloorCavern_Room4/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room4:: @ 83070D4
.2byte 152
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc
index 01aa3fa28..e65505a88 100644
--- a/data/maps/SeafloorCavern_Room5/header.inc
+++ b/data/maps/SeafloorCavern_Room5/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room5:: @ 83070F0
.2byte 153
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc
index f5b5834b4..3f6b78090 100644
--- a/data/maps/SeafloorCavern_Room6/header.inc
+++ b/data/maps/SeafloorCavern_Room6/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room6:: @ 830710C
.2byte 154
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc
index db9b37207..e1c507457 100644
--- a/data/maps/SeafloorCavern_Room7/header.inc
+++ b/data/maps/SeafloorCavern_Room7/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room7:: @ 8307128
.2byte 155
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc
index eab61c222..5e777fdf9 100644
--- a/data/maps/SeafloorCavern_Room8/header.inc
+++ b/data/maps/SeafloorCavern_Room8/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room8:: @ 8307144
.2byte 156
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc
index dce89bbbc..8b723673a 100644
--- a/data/maps/SeafloorCavern_Room9/header.inc
+++ b/data/maps/SeafloorCavern_Room9/header.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room9:: @ 8307160
.2byte 157
.byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 6
+ .byte WEATHER_FOG_1
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc
index 70bdac83d..540fdc24c 100644
--- a/data/maps/SealedChamber_InnerRoom/header.inc
+++ b/data/maps/SealedChamber_InnerRoom/header.inc
@@ -7,7 +7,7 @@ SealedChamber_InnerRoom:: @ 8307550
.2byte 305
.byte MAPSEC_SEALED_CHAMBER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc
index 52c512435..c7b0e4dd5 100644
--- a/data/maps/SealedChamber_OuterRoom/header.inc
+++ b/data/maps/SealedChamber_OuterRoom/header.inc
@@ -7,7 +7,7 @@ SealedChamber_OuterRoom:: @ 8307534
.2byte 285
.byte MAPSEC_SEALED_CHAMBER
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc
index f6394943b..c37b41b1e 100644
--- a/data/maps/SecretBase_BlueCave1/header.inc
+++ b/data/maps/SecretBase_BlueCave1/header.inc
@@ -7,7 +7,7 @@ SecretBase_BlueCave1:: @ 8307710
.2byte 200
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc
index c9c12aaeb..759c16247 100644
--- a/data/maps/SecretBase_BlueCave2/header.inc
+++ b/data/maps/SecretBase_BlueCave2/header.inc
@@ -7,7 +7,7 @@ SecretBase_BlueCave2:: @ 83077B8
.2byte 206
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc
index b8595d2d2..1d6d65078 100644
--- a/data/maps/SecretBase_BlueCave3/header.inc
+++ b/data/maps/SecretBase_BlueCave3/header.inc
@@ -7,7 +7,7 @@ SecretBase_BlueCave3:: @ 8307860
.2byte 212
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc
index a14dc57db..0eae6d791 100644
--- a/data/maps/SecretBase_BlueCave4/header.inc
+++ b/data/maps/SecretBase_BlueCave4/header.inc
@@ -7,7 +7,7 @@ SecretBase_BlueCave4:: @ 8307908
.2byte 218
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc
index baf7cf883..2554d358e 100644
--- a/data/maps/SecretBase_BrownCave1/header.inc
+++ b/data/maps/SecretBase_BrownCave1/header.inc
@@ -7,7 +7,7 @@ SecretBase_BrownCave1:: @ 83076F4
.2byte 199
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc
index 7b1d7426e..070800a35 100644
--- a/data/maps/SecretBase_BrownCave2/header.inc
+++ b/data/maps/SecretBase_BrownCave2/header.inc
@@ -7,7 +7,7 @@ SecretBase_BrownCave2:: @ 830779C
.2byte 205
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc
index 4fabbe72e..52d6b6520 100644
--- a/data/maps/SecretBase_BrownCave3/header.inc
+++ b/data/maps/SecretBase_BrownCave3/header.inc
@@ -7,7 +7,7 @@ SecretBase_BrownCave3:: @ 8307844
.2byte 211
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc
index 84bddecc5..c8687802e 100644
--- a/data/maps/SecretBase_BrownCave4/header.inc
+++ b/data/maps/SecretBase_BrownCave4/header.inc
@@ -7,7 +7,7 @@ SecretBase_BrownCave4:: @ 83078EC
.2byte 217
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc
index 556c9f570..e3a8d5435 100644
--- a/data/maps/SecretBase_RedCave1/header.inc
+++ b/data/maps/SecretBase_RedCave1/header.inc
@@ -7,7 +7,7 @@ SecretBase_RedCave1:: @ 83076D8
.2byte 198
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc
index 9a2cc0779..9d4ae63b3 100644
--- a/data/maps/SecretBase_RedCave2/header.inc
+++ b/data/maps/SecretBase_RedCave2/header.inc
@@ -7,7 +7,7 @@ SecretBase_RedCave2:: @ 8307780
.2byte 204
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc
index 9f35ae51f..035210198 100644
--- a/data/maps/SecretBase_RedCave3/header.inc
+++ b/data/maps/SecretBase_RedCave3/header.inc
@@ -7,7 +7,7 @@ SecretBase_RedCave3:: @ 8307828
.2byte 210
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc
index fa8fd1873..dbf6961b7 100644
--- a/data/maps/SecretBase_RedCave4/header.inc
+++ b/data/maps/SecretBase_RedCave4/header.inc
@@ -7,7 +7,7 @@ SecretBase_RedCave4:: @ 83078D0
.2byte 216
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc
index c533388d6..a06331e0c 100644
--- a/data/maps/SecretBase_Shrub1/header.inc
+++ b/data/maps/SecretBase_Shrub1/header.inc
@@ -7,7 +7,7 @@ SecretBase_Shrub1:: @ 8307764
.2byte 203
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc
index 1eabc4746..d3acc11aa 100644
--- a/data/maps/SecretBase_Shrub2/header.inc
+++ b/data/maps/SecretBase_Shrub2/header.inc
@@ -7,7 +7,7 @@ SecretBase_Shrub2:: @ 830780C
.2byte 209
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc
index 28f64c790..7b5a24771 100644
--- a/data/maps/SecretBase_Shrub3/header.inc
+++ b/data/maps/SecretBase_Shrub3/header.inc
@@ -7,7 +7,7 @@ SecretBase_Shrub3:: @ 83078B4
.2byte 215
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc
index 1cd544da9..5555137bc 100644
--- a/data/maps/SecretBase_Shrub4/header.inc
+++ b/data/maps/SecretBase_Shrub4/header.inc
@@ -7,7 +7,7 @@ SecretBase_Shrub4:: @ 830795C
.2byte 221
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc
index 05d689a97..a39b150cd 100644
--- a/data/maps/SecretBase_Tree1/header.inc
+++ b/data/maps/SecretBase_Tree1/header.inc
@@ -7,7 +7,7 @@ SecretBase_Tree1:: @ 8307748
.2byte 202
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc
index 302beabbc..0ac8aa572 100644
--- a/data/maps/SecretBase_Tree2/header.inc
+++ b/data/maps/SecretBase_Tree2/header.inc
@@ -7,7 +7,7 @@ SecretBase_Tree2:: @ 83077F0
.2byte 208
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc
index 0064346c7..378aefaa8 100644
--- a/data/maps/SecretBase_Tree3/header.inc
+++ b/data/maps/SecretBase_Tree3/header.inc
@@ -7,7 +7,7 @@ SecretBase_Tree3:: @ 8307898
.2byte 214
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc
index 802125e65..58c7b3ce7 100644
--- a/data/maps/SecretBase_Tree4/header.inc
+++ b/data/maps/SecretBase_Tree4/header.inc
@@ -7,7 +7,7 @@ SecretBase_Tree4:: @ 8307940
.2byte 220
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc
index 3d56690c5..788638a91 100644
--- a/data/maps/SecretBase_YellowCave1/header.inc
+++ b/data/maps/SecretBase_YellowCave1/header.inc
@@ -7,7 +7,7 @@ SecretBase_YellowCave1:: @ 830772C
.2byte 201
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc
index 62a4c15b3..4c62fade3 100644
--- a/data/maps/SecretBase_YellowCave2/header.inc
+++ b/data/maps/SecretBase_YellowCave2/header.inc
@@ -7,7 +7,7 @@ SecretBase_YellowCave2:: @ 83077D4
.2byte 207
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc
index 64b67fa80..2d0c8fa9d 100644
--- a/data/maps/SecretBase_YellowCave3/header.inc
+++ b/data/maps/SecretBase_YellowCave3/header.inc
@@ -7,7 +7,7 @@ SecretBase_YellowCave3:: @ 830787C
.2byte 213
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc
index 31e96a7a4..7f5af843f 100644
--- a/data/maps/SecretBase_YellowCave4/header.inc
+++ b/data/maps/SecretBase_YellowCave4/header.inc
@@ -7,7 +7,7 @@ SecretBase_YellowCave4:: @ 8307924
.2byte 219
.byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 9
.2byte 0
.byte 1
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
index c835cf25b..6b8f0637d 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_HighTideEntranceRoom:: @ 83072E8
.2byte 169
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
index 19f7c3a5c..7fdb587c9 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_HighTideInnerRoom:: @ 8307304
.2byte 170
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
index 81e4ac4c9..ced8bb210 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_LowTideEntranceRoom:: @ 8307278
.2byte 165
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc
index 3a2b4d823..7d7189c2b 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_LowTideIceRoom:: @ 8307684
.2byte 329
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
index 5f519df30..2b837b8f9 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_LowTideInnerRoom:: @ 8307294
.2byte 166
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
index b2c727d43..8e10fd6a6 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_LowTideLowerRoom:: @ 83072CC
.2byte 168
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
index bf0cb0e99..c757f8a36 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
@@ -7,7 +7,7 @@ ShoalCave_LowTideStairsRoom:: @ 83072B0
.2byte 167
.byte MAPSEC_SHOAL_CAVE
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc
index 66aec206f..a6b7f487b 100644
--- a/data/maps/SingleBattleColosseum/header.inc
+++ b/data/maps/SingleBattleColosseum/header.inc
@@ -7,7 +7,7 @@ SingleBattleColosseum:: @ 8307978
.2byte 222
.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 2df988714..d37645b47 100644
--- a/data/maps/SkyPillar_1F/header.inc
+++ b/data/maps/SkyPillar_1F/header.inc
@@ -7,7 +7,7 @@ SkyPillar_1F:: @ 8307614
.2byte 323
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc
index 934d1b34b..f3b6c4c66 100644
--- a/data/maps/SkyPillar_2F/header.inc
+++ b/data/maps/SkyPillar_2F/header.inc
@@ -7,7 +7,7 @@ SkyPillar_2F:: @ 8307630
.2byte 324
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc
index 5dc93b962..cfb84b3a4 100644
--- a/data/maps/SkyPillar_3F/header.inc
+++ b/data/maps/SkyPillar_3F/header.inc
@@ -7,7 +7,7 @@ SkyPillar_3F:: @ 830764C
.2byte 325
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc
index bfbaa0ff6..b35218337 100644
--- a/data/maps/SkyPillar_4F/header.inc
+++ b/data/maps/SkyPillar_4F/header.inc
@@ -7,7 +7,7 @@ SkyPillar_4F:: @ 8307668
.2byte 326
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc
index 3f31f0dbf..1582e7d1f 100644
--- a/data/maps/SkyPillar_5F/header.inc
+++ b/data/maps/SkyPillar_5F/header.inc
@@ -7,7 +7,7 @@ SkyPillar_5F:: @ 83076A0
.2byte 331
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc
index 144431800..75e7f3c3b 100644
--- a/data/maps/SkyPillar_Entrance/header.inc
+++ b/data/maps/SkyPillar_Entrance/header.inc
@@ -7,7 +7,7 @@ SkyPillar_Entrance:: @ 83075DC
.2byte 321
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc
index 02812eca8..8af620469 100644
--- a/data/maps/SkyPillar_Outside/header.inc
+++ b/data/maps/SkyPillar_Outside/header.inc
@@ -7,7 +7,7 @@ SkyPillar_Outside:: @ 83075F8
.2byte 322
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc
index 106b3284e..1cc0877b3 100644
--- a/data/maps/SkyPillar_Top/header.inc
+++ b/data/maps/SkyPillar_Top/header.inc
@@ -7,7 +7,7 @@ SkyPillar_Top:: @ 83076BC
.2byte 332
.byte MAPSEC_SKY_PILLAR
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc
index 07a0ee53b..c9ba2d7ae 100644
--- a/data/maps/SlateportCity/header.inc
+++ b/data/maps/SlateportCity/header.inc
@@ -7,7 +7,7 @@ SlateportCity:: @ 8305464
.2byte 2
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 1
diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc
index 2e17d0f9c..19e3b3209 100644
--- a/data/maps/SlateportCity_ContestHall/header.inc
+++ b/data/maps/SlateportCity_ContestHall/header.inc
@@ -7,7 +7,7 @@ SlateportCity_ContestHall:: @ 8306034
.2byte 73
.byte MAPSEC_SLATEPORT_CITY
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc
index a040be082..3aad36973 100644
--- a/data/maps/SlateportCity_ContestLobby/header.inc
+++ b/data/maps/SlateportCity_ContestLobby/header.inc
@@ -7,7 +7,7 @@ SlateportCity_ContestLobby:: @ 8306018
.2byte 72
.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 05c2ef2c8..029761fa9 100644
--- a/data/maps/SlateportCity_Harbor/header.inc
+++ b/data/maps/SlateportCity_Harbor/header.inc
@@ -7,7 +7,7 @@ SlateportCity_Harbor:: @ 83060C0
.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 04f67d4bb..a78f96ed2 100644
--- a/data/maps/SlateportCity_House1/header.inc
+++ b/data/maps/SlateportCity_House1/header.inc
@@ -7,7 +7,7 @@ SlateportCity_House1:: @ 8306050
.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 191ff10fb..e56231708 100644
--- a/data/maps/SlateportCity_House2/header.inc
+++ b/data/maps/SlateportCity_House2/header.inc
@@ -7,7 +7,7 @@ SlateportCity_House2:: @ 83060DC
.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 ee7297450..fe58052f5 100644
--- a/data/maps/SlateportCity_Mart/header.inc
+++ b/data/maps/SlateportCity_Mart/header.inc
@@ -7,7 +7,7 @@ SlateportCity_Mart:: @ 8306130
.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 6374023f6..bcd9e3dcd 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
@@ -7,7 +7,7 @@ SlateportCity_OceanicMuseum_1F:: @ 8306088
.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 2e0446fb2..ddd200725 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
@@ -7,7 +7,7 @@ SlateportCity_OceanicMuseum_2F:: @ 83060A4
.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 cb52dece1..8061b9468 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ SlateportCity_PokemonCenter_1F:: @ 83060F8
.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 6129dda83..b04bf1901 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ SlateportCity_PokemonCenter_2F:: @ 8306114
.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 2a48b1895..af654837f 100644
--- a/data/maps/SlateportCity_PokemonFanClub/header.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/header.inc
@@ -7,7 +7,7 @@ SlateportCity_PokemonFanClub:: @ 830606C
.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 76b3f037f..89e348681 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
@@ -7,7 +7,7 @@ SlateportCity_SternsShipyard_1F:: @ 8305FE0
.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 56f613dcf..b3f381a45 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
@@ -7,7 +7,7 @@ SlateportCity_SternsShipyard_2F:: @ 8305FFC
.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 9c169ab6d..b42a46ef6 100644
--- a/data/maps/SootopolisCity/header.inc
+++ b/data/maps/SootopolisCity/header.inc
@@ -7,7 +7,7 @@ SootopolisCity:: @ 830550C
.2byte 8
.byte MAPSEC_SOOTOPOLIS_CITY
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 2
.2byte 0
.byte 1
diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc
index 1e1e16868..fd5e53dbd 100644
--- a/data/maps/SootopolisCity_Gym_1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_1F/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_Gym_1F:: @ 830692C
.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_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc
index c9745ae62..2a5c973c5 100644
--- a/data/maps/SootopolisCity_Gym_B1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_Gym_B1F:: @ 8306948
.2byte 111
.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 612e3f71e..f12f6368b 100644
--- a/data/maps/SootopolisCity_House1/header.inc
+++ b/data/maps/SootopolisCity_House1/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House1:: @ 83069B8
.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_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc
index 63fb280c6..c6137c048 100644
--- a/data/maps/SootopolisCity_House2/header.inc
+++ b/data/maps/SootopolisCity_House2/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House2:: @ 83069D4
.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_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc
index b59e13c13..1ba3a435a 100644
--- a/data/maps/SootopolisCity_House3/header.inc
+++ b/data/maps/SootopolisCity_House3/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House3:: @ 83069F0
.2byte 310
.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 f6fe5781e..fee4fc065 100644
--- a/data/maps/SootopolisCity_House4/header.inc
+++ b/data/maps/SootopolisCity_House4/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House4:: @ 8306A0C
.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_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc
index 0b3f89d67..10732a09f 100644
--- a/data/maps/SootopolisCity_House5/header.inc
+++ b/data/maps/SootopolisCity_House5/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House5:: @ 8306A28
.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_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc
index 34df34e66..7a22cb836 100644
--- a/data/maps/SootopolisCity_House6/header.inc
+++ b/data/maps/SootopolisCity_House6/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House6:: @ 8306A44
.2byte 310
.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 26501506c..b833f255a 100644
--- a/data/maps/SootopolisCity_House7/header.inc
+++ b/data/maps/SootopolisCity_House7/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House7:: @ 8306A60
.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_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc
index c9710a4b5..20564785d 100644
--- a/data/maps/SootopolisCity_House8/header.inc
+++ b/data/maps/SootopolisCity_House8/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_House8:: @ 8306A7C
.2byte 298
.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 2f40d838e..09af97233 100644
--- a/data/maps/SootopolisCity_Mart/header.inc
+++ b/data/maps/SootopolisCity_Mart/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_Mart:: @ 830699C
.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_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
index e73cff2cc..b93aa58b2 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_1F:: @ 8306964
.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 bffe4d8fc..743d08d4b 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_2F:: @ 8306980
.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 9552a0238..160722472 100644
--- a/data/maps/SouthernIsland_Exterior/header.inc
+++ b/data/maps/SouthernIsland_Exterior/header.inc
@@ -7,7 +7,7 @@ SouthernIsland_Exterior:: @ 8307CA4
.2byte 291
.byte MAPSEC_SOUTHERN_ISLAND
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc
index 83a5d4deb..61a3461d6 100644
--- a/data/maps/SouthernIsland_Interior/header.inc
+++ b/data/maps/SouthernIsland_Interior/header.inc
@@ -7,7 +7,7 @@ SouthernIsland_Interior:: @ 8307CC0
.2byte 292
.byte MAPSEC_SOUTHERN_ISLAND
.byte 0
- .byte 11
+ .byte WEATHER_SHADE
.byte 3
.2byte 0
.byte 1
diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc
index 9a8ed09ca..8d6b70be7 100644
--- a/data/maps/TradeCenter/header.inc
+++ b/data/maps/TradeCenter/header.inc
@@ -7,7 +7,7 @@ TradeCenter:: @ 8307994
.2byte 223
.byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc
index e932d4d8e..8335e0505 100644
--- a/data/maps/Underwater1/header.inc
+++ b/data/maps/Underwater1/header.inc
@@ -7,7 +7,7 @@ Underwater1:: @ 83059C0
.2byte 275
.byte MAPSEC_UNDERWATER_124
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 1
diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc
index e8da93769..0eed7b084 100644
--- a/data/maps/Underwater2/header.inc
+++ b/data/maps/Underwater2/header.inc
@@ -7,7 +7,7 @@ Underwater2:: @ 83059DC
.2byte 51
.byte MAPSEC_UNDERWATER_125
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 1
diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc
index ade3cc87d..7e800027e 100644
--- a/data/maps/Underwater3/header.inc
+++ b/data/maps/Underwater3/header.inc
@@ -7,7 +7,7 @@ Underwater3:: @ 83059F8
.2byte 52
.byte MAPSEC_UNDERWATER_126
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 1
diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc
index eaec11402..bba0b83ae 100644
--- a/data/maps/Underwater4/header.inc
+++ b/data/maps/Underwater4/header.inc
@@ -7,7 +7,7 @@ Underwater4:: @ 8305A14
.2byte 53
.byte MAPSEC_UNDERWATER_127
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 1
diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc
index 7a80a7562..b88d2bd4d 100644
--- a/data/maps/Underwater_Route134/header.inc
+++ b/data/maps/Underwater_Route134/header.inc
@@ -7,7 +7,7 @@ Underwater_Route134:: @ 83074FC
.2byte 283
.byte MAPSEC_UNDERWATER_SEALED_CHAMBER
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 1
diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc
index 08dbac56e..c11dd164a 100644
--- a/data/maps/Underwater_SeafloorCavern/header.inc
+++ b/data/maps/Underwater_SeafloorCavern/header.inc
@@ -7,7 +7,7 @@ Underwater_SeafloorCavern:: @ 8307048
.2byte 147
.byte MAPSEC_UNDERWATER_128
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 1
diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc
index dcdf4e82f..19b01fdc7 100644
--- a/data/maps/Underwater_SealedChamber/header.inc
+++ b/data/maps/Underwater_SealedChamber/header.inc
@@ -7,7 +7,7 @@ Underwater_SealedChamber:: @ 8307518
.2byte 284
.byte MAPSEC_UNDERWATER_SEALED_CHAMBER
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 1
diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc
index 9c42e65e9..866b45a1f 100644
--- a/data/maps/Underwater_SootopolisCity/header.inc
+++ b/data/maps/Underwater_SootopolisCity/header.inc
@@ -7,7 +7,7 @@ Underwater_SootopolisCity:: @ 8306DFC
.2byte 131
.byte MAPSEC_UNDERWATER_SOOTOPOLIS
.byte 0
- .byte 14
+ .byte WEATHER_BUBBLES
.byte 5
.2byte 0
.byte 1
diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc
index 2d0894c97..ed72b6209 100644
--- a/data/maps/UnknownMap_25_29/header.inc
+++ b/data/maps/UnknownMap_25_29/header.inc
@@ -7,7 +7,7 @@ UnknownMap_25_29:: @ 8307A04
.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_30/header.inc b/data/maps/UnknownMap_25_30/header.inc
index 5227b240d..010d4853e 100644
--- a/data/maps/UnknownMap_25_30/header.inc
+++ b/data/maps/UnknownMap_25_30/header.inc
@@ -7,7 +7,7 @@ UnknownMap_25_30:: @ 8307A20
.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_31/header.inc b/data/maps/UnknownMap_25_31/header.inc
index 46ff55e2a..6b7cbfbda 100644
--- a/data/maps/UnknownMap_25_31/header.inc
+++ b/data/maps/UnknownMap_25_31/header.inc
@@ -7,7 +7,7 @@ UnknownMap_25_31:: @ 8307A3C
.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_32/header.inc b/data/maps/UnknownMap_25_32/header.inc
index c54f50c7e..e8ac58478 100644
--- a/data/maps/UnknownMap_25_32/header.inc
+++ b/data/maps/UnknownMap_25_32/header.inc
@@ -7,7 +7,7 @@ UnknownMap_25_32:: @ 8307A58
.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_33/header.inc b/data/maps/UnknownMap_25_33/header.inc
index 3c8177616..1291fa5a6 100644
--- a/data/maps/UnknownMap_25_33/header.inc
+++ b/data/maps/UnknownMap_25_33/header.inc
@@ -7,7 +7,7 @@ UnknownMap_25_33:: @ 8307A74
.2byte 231
.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 7eaf0d349..c45afd47e 100644
--- a/data/maps/UnknownMap_25_34/header.inc
+++ b/data/maps/UnknownMap_25_34/header.inc
@@ -7,7 +7,7 @@ UnknownMap_25_34:: @ 8307A90
.2byte 232
.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 bbf9f1634..94c6c09c9 100644
--- a/data/maps/VerdanturfTown/header.inc
+++ b/data/maps/VerdanturfTown/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown:: @ 83055D0
.2byte 15
.byte MAPSEC_VERDANTURF_TOWN
.byte 0
- .byte 2
+ .byte WEATHER_SUNNY
.byte 1
.2byte 0
.byte 1
diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc
index 24e8ad4a6..3ec1402a4 100644
--- a/data/maps/VerdanturfTown_ContestHall/header.inc
+++ b/data/maps/VerdanturfTown_ContestHall/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_ContestHall:: @ 8305D94
.2byte 73
.byte MAPSEC_VERDANTURF_TOWN
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 8
.2byte 0
.byte 0
diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc
index 89093874f..332369ace 100644
--- a/data/maps/VerdanturfTown_ContestLobby/header.inc
+++ b/data/maps/VerdanturfTown_ContestLobby/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_ContestLobby:: @ 8305D78
.2byte 72
.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 8d7bbb286..739bf5cb8 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20
.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 311688d18..01e797186 100644
--- a/data/maps/VerdanturfTown_House/header.inc
+++ b/data/maps/VerdanturfTown_House/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_House:: @ 8305E3C
.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 5b2334b53..ddf6e9f02 100644
--- a/data/maps/VerdanturfTown_Mart/header.inc
+++ b/data/maps/VerdanturfTown_Mart/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_Mart:: @ 8305DB0
.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 eb8415d15..de9a5e73f 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_PokemonCenter_1F:: @ 8305DCC
.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 a2dbaf237..9245e50a2 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_PokemonCenter_2F:: @ 8305DE8
.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 11752a9d1..6f7c607b7 100644
--- a/data/maps/VerdanturfTown_WandasHouse/header.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/header.inc
@@ -7,7 +7,7 @@ VerdanturfTown_WandasHouse:: @ 8305E04
.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 20fe01115..d9092f38a 100644
--- a/data/maps/VictoryRoad_1F/header.inc
+++ b/data/maps/VictoryRoad_1F/header.inc
@@ -7,7 +7,7 @@ VictoryRoad_1F:: @ 8307224
.2byte 164
.byte MAPSEC_VICTORY_ROAD
.byte 0
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc
index 3ba564a4b..6dfaaf100 100644
--- a/data/maps/VictoryRoad_B1F/header.inc
+++ b/data/maps/VictoryRoad_B1F/header.inc
@@ -7,7 +7,7 @@ VictoryRoad_B1F:: @ 8307240
.2byte 286
.byte MAPSEC_VICTORY_ROAD
.byte 1
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1
diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc
index 17eb818ba..e1e51ede5 100644
--- a/data/maps/VictoryRoad_B2F/header.inc
+++ b/data/maps/VictoryRoad_B2F/header.inc
@@ -7,7 +7,7 @@ VictoryRoad_B2F:: @ 830725C
.2byte 287
.byte MAPSEC_VICTORY_ROAD
.byte 1
- .byte 0
+ .byte WEATHER_NONE
.byte 4
.2byte 0
.byte 1