Label weather

README.md

@@ -4,7 +4,7 @@ This is a disassembly of Pokémon FireRed and LeafGreen.
 
 It builds the following ROM:
 
-* **pokefirered.gba** `sha1: 41cb23d8dccc8ebd7c649cd8fbb58eeace6e2fdc`
+* [**pokefirered.gba**](https://datomatic.no-intro.org/?page=show_record&s=23&n=1616) `sha1: 41cb23d8dccc8ebd7c649cd8fbb58eeace6e2fdc`
 
 To set up the repository, see [INSTALL.md](INSTALL.md).
 
@@ -22,8 +22,8 @@ Other disassembly and/or decompilation projects:
 * [**Pokémon Crystal**](https://github.com/pret/pokecrystal)
 * [**Pokémon Ruby and Sapphire**](https://github.com/pret/pokeruby)
 * [**Pokémon Pinball: Ruby & Sapphire**](https://github.com/pret/pokepinballrs)
-* [**Pokémon Mystery Dungeon: Red Rescue Team**](https://github.com/pret/pmd-red)
 * [**Pokémon Emerald**](https://github.com/pret/pokeemerald)
+* [**Pokémon Mystery Dungeon: Red Rescue Team**](https://github.com/pret/pmd-red)
 
 
 ## Contacts

berry_fix/payload/include/constants/vars.h

@@ -159,18 +159,18 @@
 #define VAR_MT_PYRE_STATE                 0x40B9
 #define VAR_NEW_MAUVILLE_STATE            0x40BA
 
-#define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON 0x40BC
-#define VAR_JAGGED_PASS_ASH_WEATHER       0x40BD
-#define VAR_GLASS_WORKSHOP_STATE          0x40BE
-#define VAR_METEOR_FALLS_STATE            0x40BF
-#define VAR_GAME_CORNER_STATE             0x40C0
-#define VAR_TRICK_HOUSE_PRIZE_PICKUP      0x40C1
-#define VAR_PACIFIDLOG_TM_RECEIVED_DAY    0x40C2
-#define VAR_VICTORY_ROAD_1F_STATE         0x40C3
-#define VAR_FOSSIL_RESURRECTION_STATE     0x40C4
-#define VAR_WHICH_FOSSIL_REVIVED          0x40C5
-#define VAR_STEVENS_HOUSE_STATE           0x40C6
-#define VAR_OLDALE_STATE                  0x40C7
+#define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON    0x40BC
+#define VAR_JAGGED_PASS_VOLCANIC_ASH_WEATHER 0x40BD
+#define VAR_GLASS_WORKSHOP_STATE             0x40BE
+#define VAR_METEOR_FALLS_STATE               0x40BF
+#define VAR_GAME_CORNER_STATE                0x40C0
+#define VAR_TRICK_HOUSE_PRIZE_PICKUP         0x40C1
+#define VAR_PACIFIDLOG_TM_RECEIVED_DAY       0x40C2
+#define VAR_VICTORY_ROAD_1F_STATE            0x40C3
+#define VAR_FOSSIL_RESURRECTION_STATE        0x40C4
+#define VAR_WHICH_FOSSIL_REVIVED             0x40C5
+#define VAR_STEVENS_HOUSE_STATE              0x40C6
+#define VAR_OLDALE_STATE                     0x40C7
 
 // special vars
 // They are commonly used as parameters to commands, or return values from commands.

constants/battle.inc

@@ -40,10 +40,10 @@
 .equiv TARGET, 0
 .equiv USER, 1
 
-.equiv WEATHER_SUN, 0
-.equiv WEATHER_RAIN, 1
-.equiv WEATHER_SANDSTORM, 2
-.equiv WEATHER_HAIL, 3
+.equiv BATTLE_WEATHER_SUNNY, 0
+.equiv BATTLE_WEATHER_RAIN, 1
+.equiv BATTLE_WEATHER_SANDSTORM, 2
+.equiv BATTLE_WEATHER_HAIL, 3
 
 	enum_start 1
 	enum ATTACK

data/maps/BirthIsland_Exterior/map.json

@@ -5,7 +5,7 @@
   "music": "0xFFFF",
   "region_map_section": "MAPSEC_BIRTH_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 0,
   "unknown_19": 6,

data/maps/BirthIsland_Harbor/map.json

@@ -5,7 +5,7 @@
   "music": "0xFFFF",
   "region_map_section": "MAPSEC_BIRTH_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,

data/maps/CeladonCity_Condominiums_1F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity_Condominiums_2F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity_Condominiums_3F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity_Condominiums_Roof/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity_Condominiums_RoofRoom/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity_DepartmentStore_1F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 4,

data/maps/CeladonCity_DepartmentStore_2F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 4,

data/maps/CeladonCity_DepartmentStore_3F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 4,

data/maps/CeladonCity_DepartmentStore_4F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 4,

data/maps/CeladonCity_DepartmentStore_5F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 4,

data/maps/CeladonCity_DepartmentStore_Elevator/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity_DepartmentStore_Roof/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 4,

data/maps/CeladonCity_GameCorner/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GAMECORNER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity_GameCorner_PrizeRoom/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity_Gym/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GYM",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity_Hotel/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity_House1/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity_PokemonCenter_1F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity_PokemonCenter_2F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeladonCity_Restaurant/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeruleanCave_1F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROCKET_HIDEOUT",
   "region_map_section": "MAPSEC_CERULEAN_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/CeruleanCave_2F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROCKET_HIDEOUT",
   "region_map_section": "MAPSEC_CERULEAN_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/CeruleanCave_B1F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROCKET_HIDEOUT",
   "region_map_section": "MAPSEC_CERULEAN_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/CeruleanCity/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,

data/maps/CeruleanCity_BikeShop/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeruleanCity_Gym/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GYM",
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeruleanCity_House1/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeruleanCity_House2/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeruleanCity_House3/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeruleanCity_House4/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeruleanCity_House5/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeruleanCity_Mart/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeruleanCity_PokemonCenter_1F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CeruleanCity_PokemonCenter_2F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CinnabarIsland/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CINNABAR_ISLAND",
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,

data/maps/CinnabarIsland_Gym/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GYM",
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CinnabarIsland_Mart/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CinnabarIsland_PokemonCenter_1F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CinnabarIsland_PokemonCenter_2F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CinnabarIsland_PokemonLab_Entrance/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CINNABAR_ISLAND",
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CINNABAR_ISLAND",
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CinnabarIsland_PokemonLab_Lounge/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CINNABAR_ISLAND",
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CINNABAR_ISLAND",
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/DiglettsCave_B1F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_FOREST",
   "region_map_section": "MAPSEC_DIGLETTS_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/DiglettsCave_NorthEntrance/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_FOREST",
   "region_map_section": "MAPSEC_DIGLETTS_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/DiglettsCave_SouthEntrance/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_FOREST",
   "region_map_section": "MAPSEC_DIGLETTS_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_FOUR",
   "region_map_section": "MAPSEC_FIVE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,

data/maps/FiveIsland_Harbor/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_FOUR",
   "region_map_section": "MAPSEC_FIVE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FiveIsland_House1/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_FOUR",
   "region_map_section": "MAPSEC_FIVE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FiveIsland_House2/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_FOUR",
   "region_map_section": "MAPSEC_FIVE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FiveIsland_LostCave_Entrance/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room1/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room10/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room11/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room12/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room13/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room14/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room2/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room3/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room4/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room5/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room6/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room7/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room8/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_LostCave_Room9/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FiveIsland_Meadow/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_FIVE_ISLE_MEADOW",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,

data/maps/FiveIsland_MemorialPillar/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_MEMORIAL_PILLAR",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,

data/maps/FiveIsland_PokemonCenter_1F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_FIVE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FiveIsland_PokemonCenter_2F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_FIVE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FiveIsland_ResortGorgeous/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_RESORT_GORGEOUS",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,

data/maps/FiveIsland_ResortGorgeous_House/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_FOUR",
   "region_map_section": "MAPSEC_RESORT_GORGEOUS",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FiveIsland_RocketWarehouse/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROCKET_HIDEOUT",
   "region_map_section": "MAPSEC_ROCKET_WAREHOUSE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 5,

data/maps/FiveIsland_WaterLabyrinth/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_WATER_LABYRINTH",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,

data/maps/FourIsland/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_FOUR",
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,

data/maps/FourIsland_Harbor/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_FOUR",
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FourIsland_House1/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_FOUR",
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FourIsland_House2/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_FOUR",
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FourIsland_IcefallCave_1F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_ICEFALL_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FourIsland_IcefallCave_B1F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_ICEFALL_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FourIsland_IcefallCave_Back/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_ICEFALL_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FourIsland_IcefallCave_Entrance/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_ICEFALL_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/FourIsland_LoreleisHouse/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_FOUR",
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FourIsland_Mart/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FourIsland_PokemonCenter_1F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FourIsland_PokemonCenter_2F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FourIsland_PokemonDayCare/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_FOUR",
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FuchsiaCity/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,

data/maps/FuchsiaCity_Building1/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FuchsiaCity_Gym/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GYM",
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FuchsiaCity_House1/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FuchsiaCity_House2/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FuchsiaCity_House3/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FuchsiaCity_Mart/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,

data/maps/FuchsiaCity_PokemonCenter_1F/map.json

@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,