Merge pull request #57 from SatoMew/master

Add weather labels and missing constants
author: PikalaxALT <PikalaxALT@users.noreply.github.com> 2019-05-19 12:10:26 -0400
committer: GitHub <noreply@github.com> 2019-05-19 12:10:26 -0400
commit: 4661be783654c654ba66c5e5fafa1aa18e7b9213 (patch)
tree: 414b3654d06ebe8431c1334874a336a0c1a6d354
parent: 6c2d5ea50d8b2505f7eccc4283bfc32961adfb92 (diff)
parent: 333d2f37a811c05672f785a13af47708ccc08613 (diff)
436 files changed, 901 insertions, 895 deletions
diff --git a/README.md b/README.md
index b8b9aa233..5165c65d3 100644
--- a/README.md
+++ b/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
diff --git a/berry_fix/payload/include/constants/vars.h b/berry_fix/payload/include/constants/vars.h
index 5243d9590..4b40c1d8c 100644
--- a/berry_fix/payload/include/constants/vars.h
+++ b/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.
diff --git a/constants/battle.inc b/constants/battle.inc
index 94b7a6d48..744399469 100644
--- a/constants/battle.inc
+++ b/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
diff --git a/data/map_events.s b/data/map_events.s
index aabafa21f..d5d0e2329 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -8,7 +8,7 @@
 #include "constants/maps.h"
 @#include "constants/secret_bases.h"
 #include "constants/vars.h"
-@#include "constants/weather.h"
+#include "constants/weather.h"
 @#include "constants/trainer_hill.h"
     .include "asm/macros.inc"
     .include "constants/constants.inc"
diff --git a/data/maps.s b/data/maps.s
index 9cb61ccb4..a0ff008cd 100644
--- a/data/maps.s
+++ b/data/maps.s
@@ -1,11 +1,10 @@
 #include "constants/layouts.h"
 @#include "constants/map_types.h"
 #include "constants/maps.h"
-@#include "constants/weather.h"
 #include "constants/region_map.h"
 #include "constants/songs.h"
 #include "constants/items.h"
-@#include "constants/weather.h"
+#include "constants/weather.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json
index 521d191fa..5ee37131f 100644
--- a/data/maps/BirthIsland_Exterior/map.json
+++ b/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,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json
index 4efbb12a4..cecda6ec5 100644
--- a/data/maps/BirthIsland_Harbor/map.json
+++ b/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,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
index 0bf834686..3c3483967 100644
--- a/data/maps/CeladonCity/map.json
+++ b/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,
@@ -381,4 +381,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json
index 443e9acd6..5665a7f51 100644
--- a/data/maps/CeladonCity_Condominiums_1F/map.json
+++ b/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,
@@ -127,4 +127,4 @@
       "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json
index 48559628c..1fdfd5746 100644
--- a/data/maps/CeladonCity_Condominiums_2F/map.json
+++ b/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,
@@ -87,4 +87,4 @@
       "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json
index c804ec6e7..0a98c9d67 100644
--- a/data/maps/CeladonCity_Condominiums_3F/map.json
+++ b/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,
@@ -155,4 +155,4 @@
       "script": "CeladonCity_Condominiums_3F_EventScript_16C447"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json
index 8e3cfdba6..cbbb754bb 100644
--- a/data/maps/CeladonCity_Condominiums_Roof/map.json
+++ b/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,
@@ -53,4 +53,4 @@
       "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
index 9b34fffdd..aa15b14a5 100644
--- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
+++ b/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,
@@ -87,4 +87,4 @@
       "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C519"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json
index 1318f0173..67badf749 100644
--- a/data/maps/CeladonCity_DepartmentStore_1F/map.json
+++ b/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,
@@ -102,4 +102,4 @@
       "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAEB"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json
index 9765467e4..7363a2af5 100644
--- a/data/maps/CeladonCity_DepartmentStore_2F/map.json
+++ b/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,
@@ -99,4 +99,4 @@
       "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB07"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json
index c6a314cc9..2c0cf0fbc 100644
--- a/data/maps/CeladonCity_DepartmentStore_3F/map.json
+++ b/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,
@@ -182,4 +182,4 @@
       "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json
index 8fc5e4f09..37c0841f7 100644
--- a/data/maps/CeladonCity_DepartmentStore_4F/map.json
+++ b/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,
@@ -86,4 +86,4 @@
       "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC01"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json
index 063d36602..691d9ff7c 100644
--- a/data/maps/CeladonCity_DepartmentStore_5F/map.json
+++ b/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,
@@ -99,4 +99,4 @@
       "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC53"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json
index 150bd1605..7a2c88c84 100644
--- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json
+++ b/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,
@@ -46,4 +46,4 @@
       "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json
index 461da4fcc..470ea3dd1 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json
+++ b/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,
@@ -80,4 +80,4 @@
       "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json
index fa2b1186a..a3b1df6f4 100644
--- a/data/maps/CeladonCity_GameCorner/map.json
+++ b/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,
@@ -466,4 +466,4 @@
       "script": "CeladonCity_GameCorner_EventScript_1B2867"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
index b9247574a..3e37651f5 100644
--- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
+++ b/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,
@@ -104,4 +104,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json
index ae83a1571..d294cb8eb 100644
--- a/data/maps/CeladonCity_Gym/map.json
+++ b/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,
@@ -197,4 +197,4 @@
       "script": "CeladonCity_Gym_EventScript_16D1CC"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json
index 85d79e8bc..5959cc9aa 100644
--- a/data/maps/CeladonCity_Hotel/map.json
+++ b/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,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json
index 58d6ee590..900c123a0 100644
--- a/data/maps/CeladonCity_House1/map.json
+++ b/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,
@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json
index 717206847..800dfbecf 100644
--- a/data/maps/CeladonCity_PokemonCenter_1F/map.json
+++ b/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,
@@ -98,4 +98,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json
index 89358eaa6..622a168d4 100644
--- a/data/maps/CeladonCity_PokemonCenter_2F/map.json
+++ b/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,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json
index 284856350..eb7afdbe2 100644
--- a/data/maps/CeladonCity_Restaurant/map.json
+++ b/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,
@@ -104,4 +104,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json
index 36bd0b680..64bf8c583 100644
--- a/data/maps/CeruleanCave_1F/map.json
+++ b/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,
@@ -201,4 +201,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json
index 061e13cc3..4b747735b 100644
--- a/data/maps/CeruleanCave_2F/map.json
+++ b/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,
@@ -229,4 +229,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json
index 44447c387..0dd6edb8c 100644
--- a/data/maps/CeruleanCave_B1F/map.json
+++ b/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,
@@ -181,4 +181,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json
index 602f84df8..df48d28c0 100644
--- a/data/maps/CeruleanCity/map.json
+++ b/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,
@@ -398,4 +398,4 @@
       "script": "CeruleanCity_EventScript_16AC94"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json
index f94bc3e7e..51ac0c1a6 100644
--- a/data/maps/CeruleanCity_BikeShop/map.json
+++ b/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,
@@ -135,4 +135,4 @@
       "script": "CeruleanCity_BikeShop_EventScript_16AC94"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json
index 715fbd067..a662cdf74 100644
--- a/data/maps/CeruleanCity_Gym/map.json
+++ b/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,
@@ -106,4 +106,4 @@
       "script": "CeruleanCity_Gym_EventScript_16AB9E"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json
index ad770bb63..248ba5b3f 100644
--- a/data/maps/CeruleanCity_House1/map.json
+++ b/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,
@@ -59,4 +59,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json
index 0c2d2e4cb..207ca1f40 100644
--- a/data/maps/CeruleanCity_House2/map.json
+++ b/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,
@@ -80,4 +80,4 @@
       "script": "CeruleanCity_House2_EventScript_16A99E"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json
index 748aac0e2..e74a6a675 100644
--- a/data/maps/CeruleanCity_House3/map.json
+++ b/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,
@@ -65,4 +65,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json
index c07927a27..2fdf6ad1e 100644
--- a/data/maps/CeruleanCity_House4/map.json
+++ b/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,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json
index 6619a1fb4..c96495d4a 100644
--- a/data/maps/CeruleanCity_House5/map.json
+++ b/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,
@@ -46,4 +46,4 @@
       "script": "CeruleanCity_House5_EventScript_16B0DA"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json
index f0f95490c..7f3076e12 100644
--- a/data/maps/CeruleanCity_Mart/map.json
+++ b/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,
@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json
index f85c99a58..16132e565 100644
--- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json
+++ b/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,
@@ -137,4 +137,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json
index c231d2b99..d5460e28f 100644
--- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json
+++ b/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,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json
index 395daeb62..4b680f47f 100644
--- a/data/maps/CinnabarIsland/map.json
+++ b/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,
@@ -155,4 +155,4 @@
       "script": "CinnabarIsland_EventScript_16721A"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json
index cb22dda7d..c583ac2f9 100644
--- a/data/maps/CinnabarIsland_Gym/map.json
+++ b/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,
@@ -262,4 +262,4 @@
       "script": "CinnabarIsland_Gym_EventScript_1ACF07"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json
index 5904c5e98..fa0972302 100644
--- a/data/maps/CinnabarIsland_Mart/map.json
+++ b/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,
@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json
index b325d8e96..134d89ac8 100644
--- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json
+++ b/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,
@@ -137,4 +137,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json
index 8eab88cd1..181acc569 100644
--- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json
+++ b/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,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
index 51bba9ff3..f1ee3023b 100644
--- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
+++ b/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,
@@ -102,4 +102,4 @@
       "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
index 8a12c33c7..7c7ac1268 100644
--- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
+++ b/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,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
index 6fb33bc66..1d9e1aa0e 100644
--- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
+++ b/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,
@@ -64,4 +64,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
index f1d049604..83f6135b7 100644
--- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
+++ b/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,
@@ -66,4 +66,4 @@
       "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json
index 0494960fb..202d9fb6a 100644
--- a/data/maps/DiglettsCave_B1F/map.json
+++ b/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,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json
index 77947f6db..1529d8592 100644
--- a/data/maps/DiglettsCave_NorthEntrance/map.json
+++ b/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,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json
index 2cbe9c6e0..27a17103e 100644
--- a/data/maps/DiglettsCave_SouthEntrance/map.json
+++ b/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,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json
index b34f0aaf0..0a087cd74 100644
--- a/data/maps/FiveIsland/map.json
+++ b/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,
@@ -104,4 +104,4 @@
       "script": "FiveIsland_EventScript_167E98"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json
index 96b4c12b2..f99fced10 100644
--- a/data/maps/FiveIsland_Harbor/map.json
+++ b/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,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json
index ffd475b42..817d17cda 100644
--- a/data/maps/FiveIsland_House1/map.json
+++ b/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,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json
index bc3d2853c..e9254cf3c 100644
--- a/data/maps/FiveIsland_House2/map.json
+++ b/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,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json
index c70a0558f..e34db7ec9 100644
--- a/data/maps/FiveIsland_LostCave_Entrance/map.json
+++ b/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,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json
index 195e53dcb..80c4a3ee1 100644
--- a/data/maps/FiveIsland_LostCave_Room1/map.json
+++ b/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,
@@ -66,4 +66,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json
index 42e7f0179..d155f030a 100644
--- a/data/maps/FiveIsland_LostCave_Room10/map.json
+++ b/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,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json
index 47155c19d..c7e948840 100644
--- a/data/maps/FiveIsland_LostCave_Room11/map.json
+++ b/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,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json
index cbe79bf74..da0d9ca31 100644
--- a/data/maps/FiveIsland_LostCave_Room12/map.json
+++ b/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,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json
index b39a12fd3..cef031273 100644
--- a/data/maps/FiveIsland_LostCave_Room13/map.json
+++ b/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,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json
index 5e4f7aa07..025120be6 100644
--- a/data/maps/FiveIsland_LostCave_Room14/map.json
+++ b/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,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json
index df991bd96..59da7ae72 100644
--- a/data/maps/FiveIsland_LostCave_Room2/map.json
+++ b/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,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json
index 0fc5622ff..129c50fe9 100644
--- a/data/maps/FiveIsland_LostCave_Room3/map.json
+++ b/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,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json
index b4d7633ac..98b31bca3 100644
--- a/data/maps/FiveIsland_LostCave_Room4/map.json
+++ b/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,
@@ -59,4 +59,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json
index dca189071..1df784d77 100644
--- a/data/maps/FiveIsland_LostCave_Room5/map.json
+++ b/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,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json
index e70d5d5cb..5a6be0290 100644
--- a/data/maps/FiveIsland_LostCave_Room6/map.json
+++ b/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,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json
index 90b129cb9..b18af46f7 100644
--- a/data/maps/FiveIsland_LostCave_Room7/map.json
+++ b/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,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json
index 7dd8dc00d..72057fbd1 100644
--- a/data/maps/FiveIsland_LostCave_Room8/map.json
+++ b/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,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json
index 857ef6332..54b9d6d2e 100644
--- a/data/maps/FiveIsland_LostCave_Room9/map.json
+++ b/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,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json
index b2c8232c8..cda0c4f2c 100644
--- a/data/maps/FiveIsland_Meadow/map.json
+++ b/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,
@@ -135,4 +135,4 @@
       "script": "FiveIsland_Meadow_EventScript_168942"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json
index c8a7325db..30418fb84 100644
--- a/data/maps/FiveIsland_MemorialPillar/map.json
+++ b/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,
@@ -132,4 +132,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json
index d5fffc7a9..e0e708bd2 100644
--- a/data/maps/FiveIsland_PokemonCenter_1F/map.json
+++ b/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,
@@ -97,4 +97,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json
index 2efdd61d5..e6b4d237b 100644
--- a/data/maps/FiveIsland_PokemonCenter_2F/map.json
+++ b/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,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json
index dfb2407d0..dc53baf54 100644
--- a/data/maps/FiveIsland_ResortGorgeous/map.json
+++ b/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,
@@ -186,4 +186,4 @@
       "script": "FiveIsland_ResortGorgeous_EventScript_168844"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json
index ec97e8cf0..f960fe89d 100644
--- a/data/maps/FiveIsland_ResortGorgeous_House/map.json
+++ b/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,
@@ -66,4 +66,4 @@
       "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json
index f545a0d38..2c45cdf29 100644
--- a/data/maps/FiveIsland_RocketWarehouse/map.json
+++ b/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,
@@ -363,4 +363,4 @@
       "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json
index f4ed982f2..97a0961fd 100644
--- a/data/maps/FiveIsland_WaterLabyrinth/map.json
+++ b/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,
@@ -54,4 +54,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json
index fdc2e8607..b167e2ba0 100644
--- a/data/maps/FourIsland/map.json
+++ b/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,
@@ -263,4 +263,4 @@
       "script": "FourIsland_EventScript_167E85"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json
index 9786e2b1f..2ec5e402b 100644
--- a/data/maps/FourIsland_Harbor/map.json
+++ b/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,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json
index 46c98ee57..99eb97da3 100644
--- a/data/maps/FourIsland_House1/map.json
+++ b/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,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json
index 9419ba2c6..6811c33ae 100644
--- a/data/maps/FourIsland_House2/map.json
+++ b/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,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json
index 57207c4e5..00fa4bac0 100644
--- a/data/maps/FourIsland_IcefallCave_1F/map.json
+++ b/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,
@@ -86,4 +86,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json
index 20aa98d20..940d888f1 100644
--- a/data/maps/FourIsland_IcefallCave_B1F/map.json
+++ b/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,
@@ -65,4 +65,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json
index 9c26325bd..0b3ca6e97 100644
--- a/data/maps/FourIsland_IcefallCave_Back/map.json
+++ b/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,
@@ -105,4 +105,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json
index 4214932de..babdb41da 100644
--- a/data/maps/FourIsland_IcefallCave_Entrance/map.json
+++ b/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,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json
index ccf6352d0..9c73e30f2 100644
--- a/data/maps/FourIsland_LoreleisHouse/map.json
+++ b/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,
@@ -220,4 +220,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json
index 999dad6c7..4fbd02275 100644
--- a/data/maps/FourIsland_Mart/map.json
+++ b/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,
@@ -64,4 +64,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json
index 1df35b78b..0ff5c17c2 100644
--- a/data/maps/FourIsland_PokemonCenter_1F/map.json
+++ b/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,
@@ -99,4 +99,4 @@
       "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json
index ef54040ea..f66cce064 100644
--- a/data/maps/FourIsland_PokemonCenter_2F/map.json
+++ b/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,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json
index 580fcc1c0..b9c45365a 100644
--- a/data/maps/FourIsland_PokemonDayCare/map.json
+++ b/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,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json
index 1bc5c6621..4fc30ef40 100644
--- a/data/maps/FuchsiaCity/map.json
+++ b/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,
@@ -406,4 +406,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json
index 694e7bc51..eea444164 100644
--- a/data/maps/FuchsiaCity_Building1/map.json
+++ b/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,
@@ -120,4 +120,4 @@
       "script": "FuchsiaCity_Building1_EventScript_16D80D"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json
index 775797674..c1106fb9c 100644
--- a/data/maps/FuchsiaCity_Gym/map.json
+++ b/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,
@@ -158,4 +158,4 @@
       "script": "FuchsiaCity_Gym_EventScript_16D6A7"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json
index 2686c6c25..8e4d8ad8c 100644
--- a/data/maps/FuchsiaCity_House1/map.json
+++ b/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,
@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json
index d18088c38..0e443e100 100644
--- a/data/maps/FuchsiaCity_House2/map.json
+++ b/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,
@@ -59,4 +59,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json
index a3445dd83..dc819ebfc 100644
--- a/data/maps/FuchsiaCity_House3/map.json
+++ b/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,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json
index 24dc3ba36..bfd8fe520 100644
--- a/data/maps/FuchsiaCity_Mart/map.json
+++ b/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,
@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json
index 04a1a80b3..bbf19625b 100644
--- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json
+++ b/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,
@@ -98,4 +98,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json
index ce72c9b33..62e56bf0b 100644
--- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json
+++ b/data/maps/FuchsiaCity_PokemonCenter_2F/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,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json
index b6fbd9ec6..d986f0c05 100644
--- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json
+++ b/data/maps/FuchsiaCity_SafariZone_Entrance/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,
@@ -100,4 +100,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/FuchsiaCity_ZooBuilding/map.json b/data/maps/FuchsiaCity_ZooBuilding/map.json
index 0448b9984..de3962e96 100644
--- a/data/maps/FuchsiaCity_ZooBuilding/map.json
+++ b/data/maps/FuchsiaCity_ZooBuilding/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,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json
index 29c62a76c..de82d21e1 100644
--- a/data/maps/IndigoPlateau_Exterior/map.json
+++ b/data/maps/IndigoPlateau_Exterior/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_INDIGO_PLATEAU",
   "region_map_section": "MAPSEC_INDIGO_PLATEAU",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -57,4 +57,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
index 89ba4f048..a68bf374b 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GYM",
   "region_map_section": "MAPSEC_INDIGO_PLATEAU",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -143,4 +143,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
index 3003616f3..5273ed61a 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
+++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_INDIGO_PLATEAU",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json
index 6231d9469..32071e5d2 100644
--- a/data/maps/LavenderTown/map.json
+++ b/data/maps/LavenderTown/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_LAVENDER_TOWN",
   "region_map_section": "MAPSEC_LAVENDER_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -144,4 +144,4 @@
       "script": "LavenderTown_EventScript_1668CA"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json
index 5674da210..b7b255588 100644
--- a/data/maps/LavenderTown_House1/map.json
+++ b/data/maps/LavenderTown_House1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_LAVENDER_TOWN",
   "region_map_section": "MAPSEC_LAVENDER_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -65,4 +65,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json
index 8617d5d03..fd7ec4f22 100644
--- a/data/maps/LavenderTown_House2/map.json
+++ b/data/maps/LavenderTown_House2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_LAVENDER_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -52,4 +52,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json
index 017950cb6..441f67cdd 100644
--- a/data/maps/LavenderTown_Mart/map.json
+++ b/data/maps/LavenderTown_Mart/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_LAVENDER_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json
index db62073d3..17ab5ac45 100644
--- a/data/maps/LavenderTown_PokemonCenter_1F/map.json
+++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_LAVENDER_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -111,4 +111,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json
index 8b88b91ce..8b3675c0f 100644
--- a/data/maps/LavenderTown_PokemonCenter_2F/map.json
+++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_LAVENDER_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
index a9646e5e6..f5d78cec5 100644
--- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
+++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_LAVENDER_TOWN",
   "region_map_section": "MAPSEC_LAVENDER_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -139,4 +139,4 @@
       "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B229"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json
index bae55d1c3..165086636 100644
--- a/data/maps/MtEmber_Exterior/map.json
+++ b/data/maps/MtEmber_Exterior/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_MT_EMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -367,4 +367,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json
index b3c9ad2aa..dfd51b629 100644
--- a/data/maps/MtEmber_RubyPath_1F/map.json
+++ b/data/maps/MtEmber_RubyPath_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_MT_EMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -104,4 +104,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json
index df6b4fcb5..e60856ad9 100644
--- a/data/maps/MtEmber_RubyPath_B1F/map.json
+++ b/data/maps/MtEmber_RubyPath_B1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_MT_EMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -84,4 +84,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
index 61c0cae51..c8175b887 100644
--- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
+++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_MT_EMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json
index e10a1762c..919bcc7c3 100644
--- a/data/maps/MtEmber_RubyPath_B2F/map.json
+++ b/data/maps/MtEmber_RubyPath_B2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_MT_EMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -123,4 +123,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
index 5d494f5a4..e1a7e7dbe 100644
--- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
+++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_MT_EMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -58,4 +58,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json
index 3b681233c..bd2088c30 100644
--- a/data/maps/MtEmber_RubyPath_B3F/map.json
+++ b/data/maps/MtEmber_RubyPath_B3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_MT_EMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -169,4 +169,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json
index 339c5e653..611d87ef4 100644
--- a/data/maps/MtEmber_RubyPath_B4F/map.json
+++ b/data/maps/MtEmber_RubyPath_B4F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_MT_EMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -214,4 +214,4 @@
       "script": "MtEmber_RubyPath_B4F_EventScript_16392B"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json
index 320bff06d..e6b80acc1 100644
--- a/data/maps/MtEmber_RubyPath_B5F/map.json
+++ b/data/maps/MtEmber_RubyPath_B5F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_MT_EMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -46,4 +46,4 @@
       "script": "MtEmber_RubyPath_B5F_EventScript_163BAB"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json
index eab46ccae..711f6f57d 100644
--- a/data/maps/MtEmber_Summit/map.json
+++ b/data/maps/MtEmber_Summit/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_MT_EMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -90,4 +90,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json
index 8e7ccc047..16438a729 100644
--- a/data/maps/MtEmber_SummitPath_1F/map.json
+++ b/data/maps/MtEmber_SummitPath_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_MT_EMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json
index 69067bbcc..161cdff31 100644
--- a/data/maps/MtEmber_SummitPath_2F/map.json
+++ b/data/maps/MtEmber_SummitPath_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_MT_EMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -149,4 +149,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json
index b30309a12..0d2f4c7b3 100644
--- a/data/maps/MtEmber_SummitPath_3F/map.json
+++ b/data/maps/MtEmber_SummitPath_3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_MT_EMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json
index 39138d94e..314eedb18 100644
--- a/data/maps/MtMoon_1F/map.json
+++ b/data/maps/MtMoon_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_MOON",
   "region_map_section": "MAPSEC_MT_MOON",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -236,4 +236,4 @@
       "script": "MtMoon_1F_EventScript_1605EE"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json
index 64e316565..44e8bec9d 100644
--- a/data/maps/MtMoon_B1F/map.json
+++ b/data/maps/MtMoon_B1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_MOON",
   "region_map_section": "MAPSEC_MT_MOON",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -128,4 +128,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json
index 9b3fa3658..093b40917 100644
--- a/data/maps/MtMoon_B2F/map.json
+++ b/data/maps/MtMoon_B2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_MOON",
   "region_map_section": "MAPSEC_MT_MOON",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -218,4 +218,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json
index 586d2c9b6..9cbfb1918 100644
--- a/data/maps/NavelRock_1F/map.json
+++ b/data/maps/NavelRock_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json
index 074a3e41f..643051c4a 100644
--- a/data/maps/NavelRock_B1F/map.json
+++ b/data/maps/NavelRock_B1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json
index 5e515e7e9..50742576b 100644
--- a/data/maps/NavelRock_Base/map.json
+++ b/data/maps/NavelRock_Base/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json
index c578caf34..41aaa26fe 100644
--- a/data/maps/NavelRock_BasePath_B10F/map.json
+++ b/data/maps/NavelRock_BasePath_B10F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json
index a25f66a8d..ca63d3f42 100644
--- a/data/maps/NavelRock_BasePath_B11F/map.json
+++ b/data/maps/NavelRock_BasePath_B11F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json
index 9127135f3..d91ec836f 100644
--- a/data/maps/NavelRock_BasePath_B1F/map.json
+++ b/data/maps/NavelRock_BasePath_B1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json
index 4ec9d4faf..795341b0d 100644
--- a/data/maps/NavelRock_BasePath_B2F/map.json
+++ b/data/maps/NavelRock_BasePath_B2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json
index c0a482b47..9ecce5260 100644
--- a/data/maps/NavelRock_BasePath_B3F/map.json
+++ b/data/maps/NavelRock_BasePath_B3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json
index c8ed7aa33..e4b6728a1 100644
--- a/data/maps/NavelRock_BasePath_B4F/map.json
+++ b/data/maps/NavelRock_BasePath_B4F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json
index 55c22da08..2a66f9652 100644
--- a/data/maps/NavelRock_BasePath_B5F/map.json
+++ b/data/maps/NavelRock_BasePath_B5F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json
index ad441261b..4d0f797b0 100644
--- a/data/maps/NavelRock_BasePath_B6F/map.json
+++ b/data/maps/NavelRock_BasePath_B6F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json
index ea16d9bd0..053282a88 100644
--- a/data/maps/NavelRock_BasePath_B7F/map.json
+++ b/data/maps/NavelRock_BasePath_B7F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json
index 27d4253f8..d46e80168 100644
--- a/data/maps/NavelRock_BasePath_B8F/map.json
+++ b/data/maps/NavelRock_BasePath_B8F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json
index fd4b0e4eb..43440ca9c 100644
--- a/data/maps/NavelRock_BasePath_B9F/map.json
+++ b/data/maps/NavelRock_BasePath_B9F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json
index 2caf50cac..8660ec6af 100644
--- a/data/maps/NavelRock_Exterior/map.json
+++ b/data/maps/NavelRock_Exterior/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json
index 8f58e4edc..55dc110b9 100644
--- a/data/maps/NavelRock_Fork/map.json
+++ b/data/maps/NavelRock_Fork/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json
index 575542128..1cd74326e 100644
--- a/data/maps/NavelRock_Harbor/map.json
+++ b/data/maps/NavelRock_Harbor/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json
index ec65f3a26..84bb51d62 100644
--- a/data/maps/NavelRock_Summit/map.json
+++ b/data/maps/NavelRock_Summit/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_11",
+  "weather": "WEATHER_CLOUDY",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -58,4 +58,4 @@
       "unknown": 129
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json
index ac1dfaeee..5ed9016d8 100644
--- a/data/maps/NavelRock_SummitPath_2F/map.json
+++ b/data/maps/NavelRock_SummitPath_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json
index 5964d839a..02873fa1a 100644
--- a/data/maps/NavelRock_SummitPath_3F/map.json
+++ b/data/maps/NavelRock_SummitPath_3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json
index 525326a31..cb655601a 100644
--- a/data/maps/NavelRock_SummitPath_4F/map.json
+++ b/data/maps/NavelRock_SummitPath_4F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json
index 5aeb1faa8..4ff37dd34 100644
--- a/data/maps/NavelRock_SummitPath_5F/map.json
+++ b/data/maps/NavelRock_SummitPath_5F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -31,4 +31,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json
index fd8c53409..3a1bc3f42 100644
--- a/data/maps/OneIsland/map.json
+++ b/data/maps/OneIsland/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_ONE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -111,4 +111,4 @@
       "script": "OneIsland_EventScript_16755B"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json
index 3bf9f7876..553c9156a 100644
--- a/data/maps/OneIsland_Harbor/map.json
+++ b/data/maps/OneIsland_Harbor/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_ONE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json
index dd815fcd5..17900e786 100644
--- a/data/maps/OneIsland_House1/map.json
+++ b/data/maps/OneIsland_House1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_ONE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json
index 0013b0de3..2eb71606a 100644
--- a/data/maps/OneIsland_House2/map.json
+++ b/data/maps/OneIsland_House2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_ONE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json
index 375dabd15..b14e36b13 100644
--- a/data/maps/OneIsland_KindleRoad/map.json
+++ b/data/maps/OneIsland_KindleRoad/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_KINDLE_ROAD",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -437,4 +437,4 @@
       "script": "OneIsland_KindleRoad_EventScript_168759"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
index 3045795db..1fc1d1cc4 100644
--- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
+++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_EMBER_SPA",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -113,4 +113,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json
index 381d1f9d4..ae6597955 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/map.json
+++ b/data/maps/OneIsland_PokemonCenter_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_NETWORK_CENTER",
   "region_map_section": "MAPSEC_ONE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -211,4 +211,4 @@
       "script": "OneIsland_PokemonCenter_1F_EventScript_171179"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json
index f9f5e5c81..f233af596 100644
--- a/data/maps/OneIsland_PokemonCenter_2F/map.json
+++ b/data/maps/OneIsland_PokemonCenter_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_NETWORK_CENTER",
   "region_map_section": "MAPSEC_ONE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json
index 4dbcb7a74..74517e890 100644
--- a/data/maps/OneIsland_TreasureBeach/map.json
+++ b/data/maps/OneIsland_TreasureBeach/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_TREASURE_BEACH",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -122,4 +122,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json
index 38e88b144..224a99322 100644
--- a/data/maps/PalletTown/map.json
+++ b/data/maps/PalletTown/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_PALLET_TOWN",
   "region_map_section": "MAPSEC_PALLET_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -153,4 +153,4 @@
       "script": "PalletTown_EventScript_16586B"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json
index 71b380a90..5db9cb1f6 100644
--- a/data/maps/PalletTown_GarysHouse/map.json
+++ b/data/maps/PalletTown_GarysHouse/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_PALLET_TOWN",
   "region_map_section": "MAPSEC_PALLET_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -87,4 +87,4 @@
       "script": "PalletTown_GarysHouse_EventScript_168F75"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json
index a573f0526..3db904de7 100644
--- a/data/maps/PalletTown_PlayersHouse_1F/map.json
+++ b/data/maps/PalletTown_PlayersHouse_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_PALLET_TOWN",
   "region_map_section": "MAPSEC_PALLET_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -67,4 +67,4 @@
       "script": "PalletTown_PlayersHouse_1F_EventScript_168C62"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json
index c9c62b631..dd470b406 100644
--- a/data/maps/PalletTown_PlayersHouse_2F/map.json
+++ b/data/maps/PalletTown_PlayersHouse_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_PALLET_TOWN",
   "region_map_section": "MAPSEC_PALLET_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -46,4 +46,4 @@
       "script": "PalletTown_PlayersHouse_2F_EventScript_168CDB"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json
index 8e651c9d8..9d74bea9c 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/map.json
+++ b/data/maps/PalletTown_ProfessorOaksLab/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_OAK_LAB",
   "region_map_section": "MAPSEC_PALLET_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -253,4 +253,4 @@
       "script": "PalletTown_ProfessorOaksLab_EventScript_169E7A"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json
index 4ac852cdc..4db31c4ce 100644
--- a/data/maps/PewterCity/map.json
+++ b/data/maps/PewterCity/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_PEWTER_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -278,4 +278,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json
index 81a12e91f..bd7ae17c2 100644
--- a/data/maps/PewterCity_Gym/map.json
+++ b/data/maps/PewterCity_Gym/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GYM",
   "region_map_section": "MAPSEC_PEWTER_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -93,4 +93,4 @@
       "script": "PewterCity_Gym_EventScript_16A6AF"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json
index 941fb3805..cb05ba932 100644
--- a/data/maps/PewterCity_House1/map.json
+++ b/data/maps/PewterCity_House1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_PEWTER_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json
index 8b60f9557..368dc049c 100644
--- a/data/maps/PewterCity_House2/map.json
+++ b/data/maps/PewterCity_House2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_PEWTER_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -65,4 +65,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json
index 7c7f2a616..ba1e82180 100644
--- a/data/maps/PewterCity_Mart/map.json
+++ b/data/maps/PewterCity_Mart/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_PEWTER_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json
index bfa941559..583d0f0db 100644
--- a/data/maps/PewterCity_Museum_1F/map.json
+++ b/data/maps/PewterCity_Museum_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_PEWTER_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -195,4 +195,4 @@
       "script": "PewterCity_Museum_1F_EventScript_1ACE1C"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json
index fc75fdbd7..0fba1289f 100644
--- a/data/maps/PewterCity_Museum_2F/map.json
+++ b/data/maps/PewterCity_Museum_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_PEWTER_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -147,4 +147,4 @@
       "script": "PewterCity_Museum_2F_EventScript_16A589"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json
index fd244b488..efff5db0c 100644
--- a/data/maps/PewterCity_PokemonCenter_1F/map.json
+++ b/data/maps/PewterCity_PokemonCenter_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_PEWTER_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -137,4 +137,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json
index 0b6b59689..f50a1608c 100644
--- a/data/maps/PewterCity_PokemonCenter_2F/map.json
+++ b/data/maps/PewterCity_PokemonCenter_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_PEWTER_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json
index 2f349ed52..84f663e66 100644
--- a/data/maps/PokemonLeague_AgathasRoom/map.json
+++ b/data/maps/PokemonLeague_AgathasRoom/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_TOWER",
   "region_map_section": "MAPSEC_POKEMON_LEAGUE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json
index c2e0209a5..bb94a0bbe 100644
--- a/data/maps/PokemonLeague_BrunosRoom/map.json
+++ b/data/maps/PokemonLeague_BrunosRoom/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROCKET_HIDEOUT",
   "region_map_section": "MAPSEC_POKEMON_LEAGUE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json
index 5c4da669c..cf1c5bfa2 100644
--- a/data/maps/PokemonLeague_ChampionsRoom/map.json
+++ b/data/maps/PokemonLeague_ChampionsRoom/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_INDIGO_PLATEAU",
   "region_map_section": "MAPSEC_POKEMON_LEAGUE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -58,4 +58,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json
index c7529d73f..c2b3725fa 100644
--- a/data/maps/PokemonLeague_HallOfFame/map.json
+++ b/data/maps/PokemonLeague_HallOfFame/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_HALL_OF_FAME_PALLET_TOWN",
   "region_map_section": "MAPSEC_POKEMON_LEAGUE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json
index f1f1a4dc8..c844c29d9 100644
--- a/data/maps/PokemonLeague_LancesRoom/map.json
+++ b/data/maps/PokemonLeague_LancesRoom/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_INDIGO_PLATEAU",
   "region_map_section": "MAPSEC_POKEMON_LEAGUE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json
index f853b99ba..33b250e35 100644
--- a/data/maps/PokemonLeague_LoreleisRoom/map.json
+++ b/data/maps/PokemonLeague_LoreleisRoom/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GYM",
   "region_map_section": "MAPSEC_POKEMON_LEAGUE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json
index a1de1c947..fb42651aa 100644
--- a/data/maps/PokemonMansion_1F/map.json
+++ b/data/maps/PokemonMansion_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_MANSION",
   "region_map_section": "MAPSEC_POKEMON_MANSION",
   "requires_flash": false,
-  "weather": "WEATHER_11",
+  "weather": "WEATHER_CLOUDY",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -170,4 +170,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json
index edfc69272..685e1dada 100644
--- a/data/maps/PokemonMansion_2F/map.json
+++ b/data/maps/PokemonMansion_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_MANSION",
   "region_map_section": "MAPSEC_POKEMON_MANSION",
   "requires_flash": false,
-  "weather": "WEATHER_11",
+  "weather": "WEATHER_CLOUDY",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -127,4 +127,4 @@
       "script": "PokemonMansion_2F_EventScript_162278"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json
index cabb1dae5..9372efde9 100644
--- a/data/maps/PokemonMansion_3F/map.json
+++ b/data/maps/PokemonMansion_3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_MANSION",
   "region_map_section": "MAPSEC_POKEMON_MANSION",
   "requires_flash": false,
-  "weather": "WEATHER_11",
+  "weather": "WEATHER_CLOUDY",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -150,4 +150,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json
index b12b4fc61..0eac3643d 100644
--- a/data/maps/PokemonMansion_B1F/map.json
+++ b/data/maps/PokemonMansion_B1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_MANSION",
   "region_map_section": "MAPSEC_POKEMON_MANSION",
   "requires_flash": false,
-  "weather": "WEATHER_11",
+  "weather": "WEATHER_CLOUDY",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -134,4 +134,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json
index 0a7c0726f..ec5026d87 100644
--- a/data/maps/PokemonTower_1F/map.json
+++ b/data/maps/PokemonTower_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_TOWER",
   "region_map_section": "MAPSEC_POKEMON_TOWER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 5,
@@ -111,4 +111,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json
index 1d83dc368..bcffe3fee 100644
--- a/data/maps/PokemonTower_2F/map.json
+++ b/data/maps/PokemonTower_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_TOWER",
   "region_map_section": "MAPSEC_POKEMON_TOWER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 5,
@@ -77,4 +77,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json
index e4109d22a..853179061 100644
--- a/data/maps/PokemonTower_3F/map.json
+++ b/data/maps/PokemonTower_3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_TOWER",
   "region_map_section": "MAPSEC_POKEMON_TOWER",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 5,
@@ -84,4 +84,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json
index e9262ecba..a1641b4e0 100644
--- a/data/maps/PokemonTower_4F/map.json
+++ b/data/maps/PokemonTower_4F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_TOWER",
   "region_map_section": "MAPSEC_POKEMON_TOWER",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 5,
@@ -110,4 +110,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json
index e44ded9f5..2609e8dfe 100644
--- a/data/maps/PokemonTower_5F/map.json
+++ b/data/maps/PokemonTower_5F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_TOWER",
   "region_map_section": "MAPSEC_POKEMON_TOWER",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 5,
@@ -287,4 +287,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json
index 8243176bb..ef96f5aa8 100644
--- a/data/maps/PokemonTower_6F/map.json
+++ b/data/maps/PokemonTower_6F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_TOWER",
   "region_map_section": "MAPSEC_POKEMON_TOWER",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 5,
@@ -116,4 +116,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json
index 71ca0d08e..880589588 100644
--- a/data/maps/PokemonTower_7F/map.json
+++ b/data/maps/PokemonTower_7F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_TOWER",
   "region_map_section": "MAPSEC_POKEMON_TOWER",
   "requires_flash": false,
-  "weather": "WEATHER_6",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 5,
@@ -87,4 +87,4 @@
       "unknown": 129
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json
index bc65392c2..21ffe2703 100644
--- a/data/maps/PowerPlant/map.json
+++ b/data/maps/PowerPlant/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_MANSION",
   "region_map_section": "MAPSEC_POWER_PLANT",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -176,4 +176,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json
index d1e0c78f6..94d643a8c 100644
--- a/data/maps/RockTunnel_1F/map.json
+++ b/data/maps/RockTunnel_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_MOON",
   "region_map_section": "MAPSEC_ROCK_TUNNEL",
   "requires_flash": true,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -198,4 +198,4 @@
       "script": "RockTunnel_1F_EventScript_162DE0"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json
index 474efd82f..3df881ece 100644
--- a/data/maps/RockTunnel_B1F/map.json
+++ b/data/maps/RockTunnel_B1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_MOON",
   "region_map_section": "MAPSEC_ROCK_TUNNEL",
   "requires_flash": true,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -384,4 +384,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json
index 6bcfd6dcb..0513b11d4 100644
--- a/data/maps/RocketHideout_B1F/map.json
+++ b/data/maps/RocketHideout_B1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROCKET_HIDEOUT",
   "region_map_section": "MAPSEC_ROCKET_HIDEOUT",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -161,4 +161,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json
index a5b3bbe4b..55cb6f583 100644
--- a/data/maps/RocketHideout_B2F/map.json
+++ b/data/maps/RocketHideout_B2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROCKET_HIDEOUT",
   "region_map_section": "MAPSEC_ROCKET_HIDEOUT",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -118,4 +118,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json
index 46a504ca0..5e44100bc 100644
--- a/data/maps/RocketHideout_B3F/map.json
+++ b/data/maps/RocketHideout_B3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROCKET_HIDEOUT",
   "region_map_section": "MAPSEC_ROCKET_HIDEOUT",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -107,4 +107,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json
index 8f28dd94e..fe5dc1de4 100644
--- a/data/maps/RocketHideout_B4F/map.json
+++ b/data/maps/RocketHideout_B4F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROCKET_HIDEOUT",
   "region_map_section": "MAPSEC_ROCKET_HIDEOUT",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -175,4 +175,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json
index 6b16ec8eb..806a91cda 100644
--- a/data/maps/RocketHideout_Elevator/map.json
+++ b/data/maps/RocketHideout_Elevator/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROCKET_HIDEOUT",
   "region_map_section": "MAPSEC_ROCKET_HIDEOUT",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -39,4 +39,4 @@
       "script": "RocketHideout_Elevator_EventScript_1614D9"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json
index 8996e5b45..eae0e3eb5 100644
--- a/data/maps/Route1/map.json
+++ b/data/maps/Route1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_1",
   "region_map_section": "MAPSEC_ROUTE_1",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -62,4 +62,4 @@
       "script": "Route1_EventScript_167F5B"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json
index 4314e572c..0038ec3d9 100644
--- a/data/maps/Route10/map.json
+++ b/data/maps/Route10/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_10",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -261,4 +261,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json
index 868607faf..0dcb36f49 100644
--- a/data/maps/Route10_PokemonCenter_1F/map.json
+++ b/data/maps/Route10_PokemonCenter_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_ROUTE_10",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -111,4 +111,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json
index 1f185774b..599efb07c 100644
--- a/data/maps/Route10_PokemonCenter_2F/map.json
+++ b/data/maps/Route10_PokemonCenter_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_ROUTE_10",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json
index 6800fad19..1403fe6de 100644
--- a/data/maps/Route11/map.json
+++ b/data/maps/Route11/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_11",
   "region_map_section": "MAPSEC_ROUTE_11",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -236,4 +236,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json
index 701eef973..a4e6448b4 100644
--- a/data/maps/Route11_EastEntrance_1F/map.json
+++ b/data/maps/Route11_EastEntrance_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VERMILION_CITY",
   "region_map_section": "MAPSEC_ROUTE_11",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 2,
@@ -79,4 +79,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json
index d8867ca6b..c6bdd37f5 100644
--- a/data/maps/Route11_EastEntrance_2F/map.json
+++ b/data/maps/Route11_EastEntrance_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VERMILION_CITY",
   "region_map_section": "MAPSEC_ROUTE_11",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -66,4 +66,4 @@
       "script": "Route11_EastEntrance_2F_EventScript_16FD53"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json
index 2b4da6469..76603c9d5 100644
--- a/data/maps/Route12/map.json
+++ b/data/maps/Route12/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_11",
   "region_map_section": "MAPSEC_ROUTE_12",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -286,4 +286,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json
index 016bd3f4f..6628b4966 100644
--- a/data/maps/Route12_FishingHouse/map.json
+++ b/data/maps/Route12_FishingHouse/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_ROUTE_12",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -60,4 +60,4 @@
       "script": "Route12_FishingHouse_EventScript_170067"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json
index e712f5608..4eb283e56 100644
--- a/data/maps/Route12_NorthEntrance_1F/map.json
+++ b/data/maps/Route12_NorthEntrance_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_12",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 2,
@@ -66,4 +66,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json
index 8dd3a5404..b14f95f2c 100644
--- a/data/maps/Route12_NorthEntrance_2F/map.json
+++ b/data/maps/Route12_NorthEntrance_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_12",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -53,4 +53,4 @@
       "script": "Route12_NorthEntrance_2F_EventScript_16FE81"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json
index 0417505f5..f67b3f3b5 100644
--- a/data/maps/Route13/map.json
+++ b/data/maps/Route13/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_11",
   "region_map_section": "MAPSEC_ROUTE_13",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -202,4 +202,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json
index cdfb7882e..95ba61886 100644
--- a/data/maps/Route14/map.json
+++ b/data/maps/Route14/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_11",
   "region_map_section": "MAPSEC_ROUTE_14",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -249,4 +249,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json
index 213b89fdc..84f075445 100644
--- a/data/maps/Route15/map.json
+++ b/data/maps/Route15/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_11",
   "region_map_section": "MAPSEC_ROUTE_15",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -233,4 +233,4 @@
       "script": "Route15_EventScript_1680DC"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json
index d39ee196e..81896d704 100644
--- a/data/maps/Route15_WestEntrance_1F/map.json
+++ b/data/maps/Route15_WestEntrance_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_15",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 2,
@@ -66,4 +66,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json
index 6be75b750..3d72c90e1 100644
--- a/data/maps/Route15_WestEntrance_2F/map.json
+++ b/data/maps/Route15_WestEntrance_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_15",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -53,4 +53,4 @@
       "script": "Route15_WestEntrance_2F_EventScript_1700B0"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json
index a8dd02f92..50bcad08a 100644
--- a/data/maps/Route16/map.json
+++ b/data/maps/Route16/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_16",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -218,4 +218,4 @@
       "unknown": 129
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json
index 890b5d9f4..834ef6ef6 100644
--- a/data/maps/Route16_House/map.json
+++ b/data/maps/Route16_House/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_ROUTE_16",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -65,4 +65,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json
index 1216fc987..bcb49452d 100644
--- a/data/maps/Route16_NorthEntrance_1F/map.json
+++ b/data/maps/Route16_NorthEntrance_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_16",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 2,
@@ -179,4 +179,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json
index e4cdf8626..85d1ccccb 100644
--- a/data/maps/Route16_NorthEntrance_2F/map.json
+++ b/data/maps/Route16_NorthEntrance_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_16",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -79,4 +79,4 @@
       "script": "Route16_NorthEntrance_2F_EventScript_1702DA"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json
index 3e2049c31..f51773f86 100644
--- a/data/maps/Route17/map.json
+++ b/data/maps/Route17/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_17",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -246,4 +246,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json
index 760f31bad..f18809806 100644
--- a/data/maps/Route18/map.json
+++ b/data/maps/Route18/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_18",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -97,4 +97,4 @@
       "script": "Route18_EventScript_16821F"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json
index 16286a240..1342a562e 100644
--- a/data/maps/Route18_EastEntrance_1F/map.json
+++ b/data/maps/Route18_EastEntrance_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_18",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 2,
@@ -152,4 +152,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json
index e304e53f9..c8be7d1e5 100644
--- a/data/maps/Route18_EastEntrance_2F/map.json
+++ b/data/maps/Route18_EastEntrance_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_18",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -53,4 +53,4 @@
       "script": "Route18_EastEntrance_2F_EventScript_170475"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json
index 055c49371..afa7b3b03 100644
--- a/data/maps/Route19/map.json
+++ b/data/maps/Route19/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_19",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -192,4 +192,4 @@
       "script": "Route19_EventScript_168232"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json
index a8fde02a1..92a7b66e8 100644
--- a/data/maps/Route2/map.json
+++ b/data/maps/Route2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_1",
   "region_map_section": "MAPSEC_ROUTE_2",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -205,4 +205,4 @@
       "script": "Route2_EventScript_167F65"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json
index 80213fc07..86db038c8 100644
--- a/data/maps/Route20/map.json
+++ b/data/maps/Route20/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_20",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -210,4 +210,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json
index 42b87c9bc..1a5a65b84 100644
--- a/data/maps/Route21_North/map.json
+++ b/data/maps/Route21_North/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_21",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -116,4 +116,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json
index 125dc88fc..324dd7ea0 100644
--- a/data/maps/Route21_South/map.json
+++ b/data/maps/Route21_South/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_21",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -93,4 +93,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json
index 2acb37549..5b6ea3621 100644
--- a/data/maps/Route22/map.json
+++ b/data/maps/Route22/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_22",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -119,4 +119,4 @@
       "script": "Route22_EventScript_1684E2"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json
index e68b94f7c..2f341b5fc 100644
--- a/data/maps/Route22_NorthEntrance/map.json
+++ b/data/maps/Route22_NorthEntrance/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_FOREST",
   "region_map_section": "MAPSEC_ROUTE_22",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -69,4 +69,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json
index 924371f26..54238b10e 100644
--- a/data/maps/Route23/map.json
+++ b/data/maps/Route23/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_INDIGO_PLATEAU",
   "region_map_section": "MAPSEC_ROUTE_23",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -607,4 +607,4 @@
       "script": "Route23_EventScript_168616"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json
index edc86edb8..f4b8dee3f 100644
--- a/data/maps/Route24/map.json
+++ b/data/maps/Route24/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_24",
   "region_map_section": "MAPSEC_ROUTE_24",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -161,4 +161,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json
index 4e6baf2be..de4155fe6 100644
--- a/data/maps/Route25/map.json
+++ b/data/maps/Route25/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_24",
   "region_map_section": "MAPSEC_ROUTE_25",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -244,4 +244,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json
index 62edc1927..7777ee3da 100644
--- a/data/maps/Route25_SeaCottage/map.json
+++ b/data/maps/Route25_SeaCottage/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_25",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -73,4 +73,4 @@
       "script": "Route25_SeaCottage_EventScript_1706DD"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json
index 97931c051..cf6552f51 100644
--- a/data/maps/Route2_EastBuilding/map.json
+++ b/data/maps/Route2_EastBuilding/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 2,
@@ -72,4 +72,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json
index cbb0eb947..78d88e7e5 100644
--- a/data/maps/Route2_House/map.json
+++ b/data/maps/Route2_House/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -65,4 +65,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json
index 271446b94..06dfcb2ad 100644
--- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json
+++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 2,
@@ -85,4 +85,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json
index 8dc14d62f..9fcf669d5 100644
--- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json
+++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 2,
@@ -72,4 +72,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json
index 01e64cf74..7dd795ed8 100644
--- a/data/maps/Route3/map.json
+++ b/data/maps/Route3/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_3",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -162,4 +162,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json
index d7c4363a4..2afb866f2 100644
--- a/data/maps/Route4/map.json
+++ b/data/maps/Route4/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_4",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -183,4 +183,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json
index 51492a5b3..066ee63c6 100644
--- a/data/maps/Route4_PokemonCenter_1F/map.json
+++ b/data/maps/Route4_PokemonCenter_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_ROUTE_4",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -124,4 +124,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json
index a601bf6fc..0852a5537 100644
--- a/data/maps/Route4_PokemonCenter_2F/map.json
+++ b/data/maps/Route4_PokemonCenter_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_ROUTE_4",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json
index b6f8cadef..0c79d7687 100644
--- a/data/maps/Route5/map.json
+++ b/data/maps/Route5/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_5",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -64,4 +64,4 @@
       "script": "Route5_EventScript_167FA8"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json
index 6ea473e4f..18409b100 100644
--- a/data/maps/Route5_PokemonDayCare/map.json
+++ b/data/maps/Route5_PokemonDayCare/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_5",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -52,4 +52,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json
index b153ebe11..fe0565acb 100644
--- a/data/maps/Route5_SouthEntrance/map.json
+++ b/data/maps/Route5_SouthEntrance/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_5",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 2,
@@ -87,4 +87,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json
index 13dc779ef..7a1c9b9f1 100644
--- a/data/maps/Route6/map.json
+++ b/data/maps/Route6/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_6",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -154,4 +154,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json
index 99fb33e28..e22d5be5d 100644
--- a/data/maps/Route6_NorthEntrance/map.json
+++ b/data/maps/Route6_NorthEntrance/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_6",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 2,
@@ -87,4 +87,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json
index 2974e7ba8..8c889d5c2 100644
--- a/data/maps/Route7/map.json
+++ b/data/maps/Route7/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_7",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -73,4 +73,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json
index 618183024..a2c775f2c 100644
--- a/data/maps/Route7_EastEntrance/map.json
+++ b/data/maps/Route7_EastEntrance/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_7",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 2,
@@ -87,4 +87,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json
index cec23d53d..6a5534a2c 100644
--- a/data/maps/Route8/map.json
+++ b/data/maps/Route8/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_8",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -273,4 +273,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json
index d46acda0f..d9736b5eb 100644
--- a/data/maps/Route8_WestEntrance/map.json
+++ b/data/maps/Route8_WestEntrance/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_ROUTE_8",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 2,
@@ -87,4 +87,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json
index 72877fc69..ec21a527b 100644
--- a/data/maps/Route9/map.json
+++ b/data/maps/Route9/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_9",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -219,4 +219,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json
index 864ebe0dd..4ba7c113d 100644
--- a/data/maps/SSAnne_1F_Corridor/map.json
+++ b/data/maps/SSAnne_1F_Corridor/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -135,4 +135,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json
index e83821225..c54bbc8de 100644
--- a/data/maps/SSAnne_1F_Room1/map.json
+++ b/data/maps/SSAnne_1F_Room1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json
index 4649e12ca..81fcf337b 100644
--- a/data/maps/SSAnne_1F_Room2/map.json
+++ b/data/maps/SSAnne_1F_Room2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -77,4 +77,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json
index b47bf6ddd..1e8b1f145 100644
--- a/data/maps/SSAnne_1F_Room3/map.json
+++ b/data/maps/SSAnne_1F_Room3/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -64,4 +64,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json
index 4a4c62769..56d910b4b 100644
--- a/data/maps/SSAnne_1F_Room4/map.json
+++ b/data/maps/SSAnne_1F_Room4/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json
index d7d2eb16f..c32c962d9 100644
--- a/data/maps/SSAnne_1F_Room5/map.json
+++ b/data/maps/SSAnne_1F_Room5/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json
index 75cc7b348..8dbbe1e1b 100644
--- a/data/maps/SSAnne_1F_Room6/map.json
+++ b/data/maps/SSAnne_1F_Room6/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json
index 0dffef5c4..323374027 100644
--- a/data/maps/SSAnne_1F_Room7/map.json
+++ b/data/maps/SSAnne_1F_Room7/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json
index d634f353e..6dcb6a7ee 100644
--- a/data/maps/SSAnne_2F_Corridor/map.json
+++ b/data/maps/SSAnne_2F_Corridor/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -135,4 +135,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json
index 2094f497b..10f3c8604 100644
--- a/data/maps/SSAnne_2F_Room1/map.json
+++ b/data/maps/SSAnne_2F_Room1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json
index c4c95231a..5fe5c9ff2 100644
--- a/data/maps/SSAnne_2F_Room2/map.json
+++ b/data/maps/SSAnne_2F_Room2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -64,4 +64,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json
index 266e87a29..7241e3d01 100644
--- a/data/maps/SSAnne_2F_Room3/map.json
+++ b/data/maps/SSAnne_2F_Room3/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json
index 9e3a3c62c..54ed72c44 100644
--- a/data/maps/SSAnne_2F_Room4/map.json
+++ b/data/maps/SSAnne_2F_Room4/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -64,4 +64,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json
index 64e5cdac3..3512aa723 100644
--- a/data/maps/SSAnne_2F_Room5/map.json
+++ b/data/maps/SSAnne_2F_Room5/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json
index c64e8a018..7b2d2666e 100644
--- a/data/maps/SSAnne_2F_Room6/map.json
+++ b/data/maps/SSAnne_2F_Room6/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json
index e60513ea2..c34977686 100644
--- a/data/maps/SSAnne_3F_Corridor/map.json
+++ b/data/maps/SSAnne_3F_Corridor/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -52,4 +52,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json
index a0c76bf1d..9accdb250 100644
--- a/data/maps/SSAnne_B1F_Corridor/map.json
+++ b/data/maps/SSAnne_B1F_Corridor/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -69,4 +69,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json
index 673c16c67..87ea2dc4c 100644
--- a/data/maps/SSAnne_B1F_Room1/map.json
+++ b/data/maps/SSAnne_B1F_Room1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json
index 2557bf329..0f1d75d5f 100644
--- a/data/maps/SSAnne_B1F_Room2/map.json
+++ b/data/maps/SSAnne_B1F_Room2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json
index 9c6634dd1..bb99ece2f 100644
--- a/data/maps/SSAnne_B1F_Room3/map.json
+++ b/data/maps/SSAnne_B1F_Room3/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json
index f8802f3bb..a587f56b3 100644
--- a/data/maps/SSAnne_B1F_Room4/map.json
+++ b/data/maps/SSAnne_B1F_Room4/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json
index 0d3ad10c8..0ea2a8747 100644
--- a/data/maps/SSAnne_B1F_Room5/map.json
+++ b/data/maps/SSAnne_B1F_Room5/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -64,4 +64,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json
index 204ab5a18..9870b5f09 100644
--- a/data/maps/SSAnne_CaptainsOffice/map.json
+++ b/data/maps/SSAnne_CaptainsOffice/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -60,4 +60,4 @@
       "script": "SSAnne_CaptainsOffice_EventScript_160BD2"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json
index 1ed41546e..d4bf928af 100644
--- a/data/maps/SSAnne_Deck/map.json
+++ b/data/maps/SSAnne_Deck/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -97,4 +97,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json
index 8ef5cbc5a..4694c1520 100644
--- a/data/maps/SSAnne_Exterior/map.json
+++ b/data/maps/SSAnne_Exterior/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -76,4 +76,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json
index bb094e87c..968c8c15c 100644
--- a/data/maps/SSAnne_Kitchen/map.json
+++ b/data/maps/SSAnne_Kitchen/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SS_ANNE",
   "region_map_section": "MAPSEC_S_S_ANNE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -157,4 +157,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SafariZone_Building1/map.json b/data/maps/SafariZone_Building1/map.json
index 09b84bb5b..93f66a692 100644
--- a/data/maps/SafariZone_Building1/map.json
+++ b/data/maps/SafariZone_Building1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SAFARI_ZONE",
   "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -65,4 +65,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json
index 96282855f..178ecdc06 100644
--- a/data/maps/SafariZone_Building2/map.json
+++ b/data/maps/SafariZone_Building2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SAFARI_ZONE",
   "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SafariZone_Building3/map.json b/data/maps/SafariZone_Building3/map.json
index 47480065a..768e83b94 100644
--- a/data/maps/SafariZone_Building3/map.json
+++ b/data/maps/SafariZone_Building3/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SAFARI_ZONE",
   "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SafariZone_Building4/map.json b/data/maps/SafariZone_Building4/map.json
index 2cfc647cd..0769bd7a2 100644
--- a/data/maps/SafariZone_Building4/map.json
+++ b/data/maps/SafariZone_Building4/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SAFARI_ZONE",
   "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json
index 0ef1fd180..2eec6d8da 100644
--- a/data/maps/SafariZone_Center/map.json
+++ b/data/maps/SafariZone_Center/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SAFARI_ZONE",
   "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -153,4 +153,4 @@
       "script": "SafariZone_Center_EventScript_162373"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json
index 6f7c8eeb7..23a6d3596 100644
--- a/data/maps/SafariZone_East/map.json
+++ b/data/maps/SafariZone_East/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SAFARI_ZONE",
   "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -141,4 +141,4 @@
       "script": "SafariZone_East_EventScript_162386"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json
index 4462b8485..f69e86fd5 100644
--- a/data/maps/SafariZone_North/map.json
+++ b/data/maps/SafariZone_North/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SAFARI_ZONE",
   "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -184,4 +184,4 @@
       "script": "SafariZone_North_EventScript_162399"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json
index 83c1c7c34..0616c4782 100644
--- a/data/maps/SafariZone_SecretHouse/map.json
+++ b/data/maps/SafariZone_SecretHouse/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SAFARI_ZONE",
   "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -52,4 +52,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json
index 9945f2516..e91ecd175 100644
--- a/data/maps/SafariZone_West/map.json
+++ b/data/maps/SafariZone_West/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SAFARI_ZONE",
   "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -185,4 +185,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json
index b705126ff..f86012a9a 100644
--- a/data/maps/SaffronCity/map.json
+++ b/data/maps/SaffronCity/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -37,4 +37,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json
index bbbbcaa96..a8d80bb8e 100644
--- a/data/maps/SaffronCity_Dojo/map.json
+++ b/data/maps/SaffronCity_Dojo/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -178,4 +178,4 @@
       "script": "SaffronCity_Dojo_EventScript_16ED3D"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SaffronCity_Duplicate/map.json b/data/maps/SaffronCity_Duplicate/map.json
index 0dc64583f..06bcbfd01 100644
--- a/data/maps/SaffronCity_Duplicate/map.json
+++ b/data/maps/SaffronCity_Duplicate/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -404,4 +404,4 @@
       "script": "SaffronCity_Duplicate_EventScript_16747A"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json
index 96f9f5ee3..8b27fea95 100644
--- a/data/maps/SaffronCity_Gym/map.json
+++ b/data/maps/SaffronCity_Gym/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GYM",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 1,
@@ -381,4 +381,4 @@
       "script": "SaffronCity_Gym_EventScript_16EF55"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json
index b48e123b6..20fca424a 100644
--- a/data/maps/SaffronCity_House1_1F/map.json
+++ b/data/maps/SaffronCity_House1_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -85,4 +85,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json
index ab0e164f9..3a1d497f9 100644
--- a/data/maps/SaffronCity_House1_2F/map.json
+++ b/data/maps/SaffronCity_House1_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -101,4 +101,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json
index de11d7982..81cbaddb9 100644
--- a/data/maps/SaffronCity_House2/map.json
+++ b/data/maps/SaffronCity_House2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -99,4 +99,4 @@
       "script": "SaffronCity_House2_EventScript_16EF99"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json
index eda6fe9fc..be9412971 100644
--- a/data/maps/SaffronCity_House3/map.json
+++ b/data/maps/SaffronCity_House3/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -52,4 +52,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json
index 00e191a94..b2882fff3 100644
--- a/data/maps/SaffronCity_Mart/map.json
+++ b/data/maps/SaffronCity_Mart/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json
index 46de82e0c..2e26f7368 100644
--- a/data/maps/SaffronCity_PokemonCenter_1F/map.json
+++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -124,4 +124,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json
index a79fb8efd..303a60ce7 100644
--- a/data/maps/SaffronCity_PokemonCenter_2F/map.json
+++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
index 0403a7806..875585c68 100644
--- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -155,4 +155,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json
index cdf4bcd0a..c2927eef5 100644
--- a/data/maps/SeafoamIslands_1F/map.json
+++ b/data/maps/SeafoamIslands_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_FOREST",
   "region_map_section": "MAPSEC_SEAFOAM_ISLANDS",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -106,4 +106,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json
index 94c850eb0..161ba065c 100644
--- a/data/maps/SeafoamIslands_B1F/map.json
+++ b/data/maps/SeafoamIslands_B1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_FOREST",
   "region_map_section": "MAPSEC_SEAFOAM_ISLANDS",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -147,4 +147,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json
index bb614f803..b4984b189 100644
--- a/data/maps/SeafoamIslands_B2F/map.json
+++ b/data/maps/SeafoamIslands_B2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_FOREST",
   "region_map_section": "MAPSEC_SEAFOAM_ISLANDS",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -134,4 +134,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json
index b9e12e16b..06815d1da 100644
--- a/data/maps/SeafoamIslands_B3F/map.json
+++ b/data/maps/SeafoamIslands_B3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_FOREST",
   "region_map_section": "MAPSEC_SEAFOAM_ISLANDS",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -169,4 +169,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json
index 64a6719d7..6f3a99b06 100644
--- a/data/maps/SeafoamIslands_B4F/map.json
+++ b/data/maps/SeafoamIslands_B4F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_FOREST",
   "region_map_section": "MAPSEC_SEAFOAM_ISLANDS",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -150,4 +150,4 @@
       "script": "SeafoamIslands_B4F_EventScript_163223"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json
index dd9a59fa6..003bd5192 100644
--- a/data/maps/SevenIsland/map.json
+++ b/data/maps/SevenIsland/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_SIX",
   "region_map_section": "MAPSEC_SEVEN_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -104,4 +104,4 @@
       "script": "SevenIsland_EventScript_167EBD"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json
index af0fce3fb..df4507662 100644
--- a/data/maps/SevenIsland_Harbor/map.json
+++ b/data/maps/SevenIsland_Harbor/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_SIX",
   "region_map_section": "MAPSEC_SEVEN_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json
index 50b67816d..f7181d41f 100644
--- a/data/maps/SevenIsland_House_Room1/map.json
+++ b/data/maps/SevenIsland_House_Room1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_SIX",
   "region_map_section": "MAPSEC_SEVEN_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -53,4 +53,4 @@
       "script": "SevenIsland_House_Room1_EventScript_170A75"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json
index 890afc5e4..474d071d5 100644
--- a/data/maps/SevenIsland_House_Room2/map.json
+++ b/data/maps/SevenIsland_House_Room2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_SIX",
   "region_map_section": "MAPSEC_SEVEN_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json
index 452e6e8b4..4d4be3485 100644
--- a/data/maps/SevenIsland_Mart/map.json
+++ b/data/maps/SevenIsland_Mart/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_SEVEN_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -77,4 +77,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json
index 4dfee823f..9cf243db6 100644
--- a/data/maps/SevenIsland_PokemonCenter_1F/map.json
+++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_SEVEN_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -110,4 +110,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json
index baca4a4c0..e7d48f819 100644
--- a/data/maps/SevenIsland_PokemonCenter_2F/map.json
+++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_SEVEN_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json
index ba4e6386b..fe1f030fd 100644
--- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json
+++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_TANOBY_KEY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -180,4 +180,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json
index a896d334d..fbdaec45b 100644
--- a/data/maps/SevenIsland_SevaultCanyon/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_SEVAULT_CANYON",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -320,4 +320,4 @@
       "script": "SevenIsland_SevaultCanyon_EventScript_168BFE"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
index 4975264fe..6011ec09d 100644
--- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_CANYON_ENTRANCE",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -136,4 +136,4 @@
       "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json
index 21f0ae7fe..a1a85b829 100644
--- a/data/maps/SevenIsland_SevaultCanyon_House/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_SIX",
   "region_map_section": "MAPSEC_SEVAULT_CANYON",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -64,4 +64,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json
index 33c2fb842..1659d862d 100644
--- a/data/maps/SevenIsland_TanobyRuins/map.json
+++ b/data/maps/SevenIsland_TanobyRuins/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_TANOBY_RUINS",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -162,4 +162,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json
index 3b00c0be4..7347361dc 100644
--- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json
+++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_DILFORD_CHAMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -24,4 +24,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json
index 9bb534692..42e25a9bd 100644
--- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json
+++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_LIPTOO_CHAMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -24,4 +24,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json
index 706cf4907..1bdee8840 100644
--- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json
+++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_MONEAN_CHAMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -24,4 +24,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json
index e92f18cba..af7181502 100644
--- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json
+++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_RIXY_CHAMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -24,4 +24,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json
index 03ca8f69a..58fa3d18c 100644
--- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json
+++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_SCUFIB_CHAMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -24,4 +24,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json
index 9f99b7b99..90cf4bd82 100644
--- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json
+++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_VIAPOIS_CHAMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -24,4 +24,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json
index 85294ca41..542f8f61e 100644
--- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json
+++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_WEEPTH_CHAMBER",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -24,4 +24,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json
index 3b7aa0b8a..3c509950e 100644
--- a/data/maps/SevenIsland_TrainerTower/map.json
+++ b/data/maps/SevenIsland_TrainerTower/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_TRAINER_TOWER",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -99,4 +99,4 @@
       "script": "SevenIsland_TrainerTower_EventScript_168BEA"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json
index 85be6d070..f894c679f 100644
--- a/data/maps/SevenIsland_TrainerTower_1F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TRAINER_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 2,
@@ -125,4 +125,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json
index 8df192771..1af583fc9 100644
--- a/data/maps/SevenIsland_TrainerTower_2F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TRAINER_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 2,
@@ -132,4 +132,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json
index 4e4b1c06b..1ada6e08b 100644
--- a/data/maps/SevenIsland_TrainerTower_3F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TRAINER_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 2,
@@ -132,4 +132,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json
index 59aca5b37..e16cdcc95 100644
--- a/data/maps/SevenIsland_TrainerTower_4F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_4F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TRAINER_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 2,
@@ -132,4 +132,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json
index 4e08a33b4..d30f293c6 100644
--- a/data/maps/SevenIsland_TrainerTower_5F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_5F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TRAINER_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 2,
@@ -132,4 +132,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json
index c548fa61a..03436ecc9 100644
--- a/data/maps/SevenIsland_TrainerTower_6F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_6F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TRAINER_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 2,
@@ -132,4 +132,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json
index 90eb22605..cc738186e 100644
--- a/data/maps/SevenIsland_TrainerTower_7F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_7F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TRAINER_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 2,
@@ -132,4 +132,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json
index cac6bbb6c..bcf7ce583 100644
--- a/data/maps/SevenIsland_TrainerTower_8F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_8F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TRAINER_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 2,
@@ -132,4 +132,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/map.json b/data/maps/SevenIsland_TrainerTower_Elevator/map.json
index 0525e1da2..a1130c118 100644
--- a/data/maps/SevenIsland_TrainerTower_Elevator/map.json
+++ b/data/maps/SevenIsland_TrainerTower_Elevator/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TRAINER_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 2,
@@ -32,4 +32,4 @@
       "script": "SevenIsland_TrainerTower_Elevator_EventScript_164B03"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json
index fcda1fb2e..d65c41577 100644
--- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json
+++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TRAINER_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 2,
@@ -122,4 +122,4 @@
       "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AD8"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json
index 23e94c0be..b8f8f858b 100644
--- a/data/maps/SevenIsland_TrainerTower_Roof/map.json
+++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TRAINER_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 2,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json
index d921ece8a..51dcc5ee6 100644
--- a/data/maps/SilphCo_10F/map.json
+++ b/data/maps/SilphCo_10F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SILPH",
   "region_map_section": "MAPSEC_SILPH_CO",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -183,4 +183,4 @@
       "script": "SilphCo_10F_EventScript_161DB7"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json
index 5f9090f8b..1d479e041 100644
--- a/data/maps/SilphCo_11F/map.json
+++ b/data/maps/SilphCo_11F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SILPH",
   "region_map_section": "MAPSEC_SILPH_CO",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -181,4 +181,4 @@
       "script": "SilphCo_11F_EventScript_161F37"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json
index 5cf3e4082..325cef8b5 100644
--- a/data/maps/SilphCo_1F/map.json
+++ b/data/maps/SilphCo_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SILPH",
   "region_map_section": "MAPSEC_SILPH_CO",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -74,4 +74,4 @@
       "script": "SilphCo_1F_EventScript_161638"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json
index 5e1d73414..51d1ba7a6 100644
--- a/data/maps/SilphCo_2F/map.json
+++ b/data/maps/SilphCo_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SILPH",
   "region_map_section": "MAPSEC_SILPH_CO",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -205,4 +205,4 @@
       "script": "SilphCo_2F_EventScript_161660"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json
index e1466fec7..b900dd5dd 100644
--- a/data/maps/SilphCo_3F/map.json
+++ b/data/maps/SilphCo_3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SILPH",
   "region_map_section": "MAPSEC_SILPH_CO",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -213,4 +213,4 @@
       "script": "SilphCo_3F_EventScript_1616FF"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json
index 080c7162a..04966c66f 100644
--- a/data/maps/SilphCo_4F/map.json
+++ b/data/maps/SilphCo_4F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SILPH",
   "region_map_section": "MAPSEC_SILPH_CO",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -244,4 +244,4 @@
       "script": "SilphCo_4F_EventScript_161770"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json
index 3ad8ee8df..b3f512516 100644
--- a/data/maps/SilphCo_5F/map.json
+++ b/data/maps/SilphCo_5F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SILPH",
   "region_map_section": "MAPSEC_SILPH_CO",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -315,4 +315,4 @@
       "script": "SilphCo_5F_EventScript_16181C"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json
index c1db9b3c1..c9c1b2f09 100644
--- a/data/maps/SilphCo_6F/map.json
+++ b/data/maps/SilphCo_6F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SILPH",
   "region_map_section": "MAPSEC_SILPH_CO",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -228,4 +228,4 @@
       "script": "SilphCo_6F_EventScript_161936"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json
index 575558327..36f2d0ba7 100644
--- a/data/maps/SilphCo_7F/map.json
+++ b/data/maps/SilphCo_7F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SILPH",
   "region_map_section": "MAPSEC_SILPH_CO",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -323,4 +323,4 @@
       "script": "SilphCo_7F_EventScript_161BFA"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json
index 763c9284b..9c23aac86 100644
--- a/data/maps/SilphCo_8F/map.json
+++ b/data/maps/SilphCo_8F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SILPH",
   "region_map_section": "MAPSEC_SILPH_CO",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -190,4 +190,4 @@
       "script": "SilphCo_8F_EventScript_161C90"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json
index 5e50d24ca..05bbe1138 100644
--- a/data/maps/SilphCo_9F/map.json
+++ b/data/maps/SilphCo_9F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SILPH",
   "region_map_section": "MAPSEC_SILPH_CO",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
@@ -243,4 +243,4 @@
       "script": "SilphCo_9F_EventScript_161D38"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json
index a1208a5d8..be61c86d2 100644
--- a/data/maps/SilphCo_Elevator/map.json
+++ b/data/maps/SilphCo_Elevator/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SILPH",
   "region_map_section": "MAPSEC_SILPH_CO",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -32,4 +32,4 @@
       "script": "SilphCo_Elevator_EventScript_161F6F"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json
index 0f5344713..f65e61afd 100644
--- a/data/maps/SixIsland/map.json
+++ b/data/maps/SixIsland/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_SIX",
   "region_map_section": "MAPSEC_SIX_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -95,4 +95,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json
index 123c8e6bb..c5376d59d 100644
--- a/data/maps/SixIsland_AlteringCave/map.json
+++ b/data/maps/SixIsland_AlteringCave/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_EMBER",
   "region_map_section": "MAPSEC_ALTERING_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -24,4 +24,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json
index 3edfe625f..bd7bb4933 100644
--- a/data/maps/SixIsland_DottedHole_1F/map.json
+++ b/data/maps/SixIsland_DottedHole_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_DOTTED_HOLE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -45,4 +45,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json
index 221b7f31a..497bde584 100644
--- a/data/maps/SixIsland_DottedHole_B1F/map.json
+++ b/data/maps/SixIsland_DottedHole_B1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_DOTTED_HOLE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -60,4 +60,4 @@
       "script": "SixIsland_DottedHole_B1F_EventScript_16418C"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json
index 7c43b1177..c01e689f5 100644
--- a/data/maps/SixIsland_DottedHole_B2F/map.json
+++ b/data/maps/SixIsland_DottedHole_B2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_DOTTED_HOLE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -60,4 +60,4 @@
       "script": "SixIsland_DottedHole_B2F_EventScript_1641A7"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json
index dddb7b32c..97bf261ca 100644
--- a/data/maps/SixIsland_DottedHole_B3F/map.json
+++ b/data/maps/SixIsland_DottedHole_B3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_DOTTED_HOLE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -60,4 +60,4 @@
       "script": "SixIsland_DottedHole_B3F_EventScript_16419E"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json
index 5d187df80..f418ee608 100644
--- a/data/maps/SixIsland_DottedHole_B4F/map.json
+++ b/data/maps/SixIsland_DottedHole_B4F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_DOTTED_HOLE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -60,4 +60,4 @@
       "script": "SixIsland_DottedHole_B4F_EventScript_164195"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
index 08894ae8c..db1a1715a 100644
--- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_TANOBY_RUINS",
   "region_map_section": "MAPSEC_DOTTED_HOLE",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -66,4 +66,4 @@
       "script": "SixIsland_DottedHole_SapphireRoom_EventScript_16441F"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json
index cbc6b6784..abcf7f0af 100644
--- a/data/maps/SixIsland_GreenPath/map.json
+++ b/data/maps/SixIsland_GreenPath/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_GREEN_PATH",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -94,4 +94,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json
index 3e5254f71..4af0b5351 100644
--- a/data/maps/SixIsland_Harbor/map.json
+++ b/data/maps/SixIsland_Harbor/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_SIX",
   "region_map_section": "MAPSEC_SIX_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json
index 3f50160d3..4444ed8af 100644
--- a/data/maps/SixIsland_House/map.json
+++ b/data/maps/SixIsland_House/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_SIX",
   "region_map_section": "MAPSEC_SIX_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json
index a30466efb..f6e686c5f 100644
--- a/data/maps/SixIsland_Mart/map.json
+++ b/data/maps/SixIsland_Mart/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_SIX_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -64,4 +64,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json
index dd19cb543..459fc1275 100644
--- a/data/maps/SixIsland_OutcastIsland/map.json
+++ b/data/maps/SixIsland_OutcastIsland/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_OUTCAST_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -141,4 +141,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json
index a72372cc5..8d0953181 100644
--- a/data/maps/SixIsland_PatternBush/map.json
+++ b/data/maps/SixIsland_PatternBush/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_FOREST",
   "region_map_section": "MAPSEC_PATTERN_BUSH",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -216,4 +216,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json
index d58082f97..5a22c24ba 100644
--- a/data/maps/SixIsland_PokemonCenter_1F/map.json
+++ b/data/maps/SixIsland_PokemonCenter_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_SIX_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -84,4 +84,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json
index 3ba0ff43a..d5865a28b 100644
--- a/data/maps/SixIsland_PokemonCenter_2F/map.json
+++ b/data/maps/SixIsland_PokemonCenter_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_SIX_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json
index 1262705c6..8e5fc1b9f 100644
--- a/data/maps/SixIsland_RuinValley/map.json
+++ b/data/maps/SixIsland_RuinValley/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_RUIN_VALLEY",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -260,4 +260,4 @@
       "script": "SixIsland_RuinValley_EventScript_168B94"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json
index 86bbb290b..2539323d8 100644
--- a/data/maps/SixIsland_WaterPath/map.json
+++ b/data/maps/SixIsland_WaterPath/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_WATER_PATH",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -207,4 +207,4 @@
       "script": "SixIsland_WaterPath_EventScript_168B4A"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json
index 84b136633..5a446e953 100644
--- a/data/maps/SixIsland_WaterPath_House1/map.json
+++ b/data/maps/SixIsland_WaterPath_House1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_WATER_PATH",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -46,4 +46,4 @@
       "script": "SixIsland_WaterPath_House1_EventScript_172157"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json
index c671d9f29..915052f9f 100644
--- a/data/maps/SixIsland_WaterPath_House2/map.json
+++ b/data/maps/SixIsland_WaterPath_House2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_WATER_PATH",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json
index 0b11d5bf2..8e45d33fc 100644
--- a/data/maps/ThreeIsland/map.json
+++ b/data/maps/ThreeIsland/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_THREE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -368,4 +368,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json
index 542a70dc9..9bafdc69d 100644
--- a/data/maps/ThreeIsland_BerryForest/map.json
+++ b/data/maps/ThreeIsland_BerryForest/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_FOREST",
   "region_map_section": "MAPSEC_BERRY_FOREST",
   "requires_flash": false,
-  "weather": "WEATHER_11",
+  "weather": "WEATHER_CLOUDY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -353,4 +353,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json
index 2afa51258..904817c10 100644
--- a/data/maps/ThreeIsland_BondBridge/map.json
+++ b/data/maps/ThreeIsland_BondBridge/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_BOND_BRIDGE",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -197,4 +197,4 @@
       "script": "ThreeIsland_BondBridge_EventScript_168780"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json
index 624dd99f2..3f22711d1 100644
--- a/data/maps/ThreeIsland_DunsparceTunnel/map.json
+++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_FOREST",
   "region_map_section": "MAPSEC_THREE_ISLE_PATH",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -55,4 +55,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json
index 4348bde2f..cd5781ee7 100644
--- a/data/maps/ThreeIsland_Harbor/map.json
+++ b/data/maps/ThreeIsland_Harbor/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_THREE_ISLE_PORT",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json
index b7d96db3c..b25e6eeb5 100644
--- a/data/maps/ThreeIsland_House1/map.json
+++ b/data/maps/ThreeIsland_House1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_THREE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -46,4 +46,4 @@
       "script": "ThreeIsland_House1_EventScript_171829"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json
index ca21bcb96..b8102556b 100644
--- a/data/maps/ThreeIsland_House2/map.json
+++ b/data/maps/ThreeIsland_House2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_THREE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json
index 87b46b302..6f4b8c555 100644
--- a/data/maps/ThreeIsland_House3/map.json
+++ b/data/maps/ThreeIsland_House3/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_THREE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json
index 42e328dbc..277a4bdc5 100644
--- a/data/maps/ThreeIsland_House4/map.json
+++ b/data/maps/ThreeIsland_House4/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_THREE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json
index ccc509b37..264b6cbcb 100644
--- a/data/maps/ThreeIsland_House5/map.json
+++ b/data/maps/ThreeIsland_House5/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_THREE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json
index ed3bb6395..f8cd93f18 100644
--- a/data/maps/ThreeIsland_Mart/map.json
+++ b/data/maps/ThreeIsland_Mart/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_THREE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -77,4 +77,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json
index 3292e5409..603c14528 100644
--- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json
+++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_THREE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -84,4 +84,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json
index b396f5897..70b900e08 100644
--- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json
+++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_THREE_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json
index dcc447fbb..c40740fee 100644
--- a/data/maps/ThreeIsland_Port/map.json
+++ b/data/maps/ThreeIsland_Port/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_THREE_ISLE_PORT",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -84,4 +84,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json
index 42e6a428e..17826d8fd 100644
--- a/data/maps/TwoIsland/map.json
+++ b/data/maps/TwoIsland/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_TWO_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -191,4 +191,4 @@
       "script": "TwoIsland_EventScript_1677A4"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json
index b5981e934..1661ef953 100644
--- a/data/maps/TwoIsland_CapeBrink/map.json
+++ b/data/maps/TwoIsland_CapeBrink/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_CAPE_BRINK",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -49,4 +49,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json
index e974ef1f0..12c9ff372 100644
--- a/data/maps/TwoIsland_CapeBrink_House/map.json
+++ b/data/maps/TwoIsland_CapeBrink_House/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_CAPE_BRINK",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json
index 9a715d4b0..29fe94fc7 100644
--- a/data/maps/TwoIsland_Harbor/map.json
+++ b/data/maps/TwoIsland_Harbor/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_TWO_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json
index 04a3d1b43..9289eb6b1 100644
--- a/data/maps/TwoIsland_House/map.json
+++ b/data/maps/TwoIsland_House/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_ONE",
   "region_map_section": "MAPSEC_TWO_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -38,4 +38,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json
index 40015e536..1017feaef 100644
--- a/data/maps/TwoIsland_JoyfulGameCorner/map.json
+++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GAMECORNER",
   "region_map_section": "MAPSEC_TWO_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -92,4 +92,4 @@
       "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2FC"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json
index b1987bbd4..f9bb96a3d 100644
--- a/data/maps/TwoIsland_PokemonCenter_1F/map.json
+++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_TWO_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -71,4 +71,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json
index acb0edbd2..719f84889 100644
--- a/data/maps/TwoIsland_PokemonCenter_2F/map.json
+++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_TWO_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json
index f443b0f6f..0b2af8aab 100644
--- a/data/maps/UndergroundPath_EastEntrance/map.json
+++ b/data/maps/UndergroundPath_EastEntrance/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_UNDERGROUND_PATH_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -59,4 +59,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json
index 1a015a69f..8797f8e3f 100644
--- a/data/maps/UndergroundPath_EastWestTunnel/map.json
+++ b/data/maps/UndergroundPath_EastWestTunnel/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_1",
   "region_map_section": "MAPSEC_UNDERGROUND_PATH_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -95,4 +95,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json
index 7ef24dda9..36ce0da5c 100644
--- a/data/maps/UndergroundPath_NorthEntrance/map.json
+++ b/data/maps/UndergroundPath_NorthEntrance/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_UNDERGROUND_PATH",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -59,4 +59,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json
index 2d049212a..238b408ea 100644
--- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json
+++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_1",
   "region_map_section": "MAPSEC_UNDERGROUND_PATH",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -95,4 +95,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json
index e6e3ee5f3..5e48882a8 100644
--- a/data/maps/UndergroundPath_SouthEntrance/map.json
+++ b/data/maps/UndergroundPath_SouthEntrance/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_UNDERGROUND_PATH",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -59,4 +59,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json
index e824381d4..54a036c06 100644
--- a/data/maps/UndergroundPath_WestEntrance/map.json
+++ b/data/maps/UndergroundPath_WestEntrance/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_UNDERGROUND_PATH_2",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -59,4 +59,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json
index 74edf8a09..edf3c52b7 100644
--- a/data/maps/UnknownMap_00_00/map.json
+++ b/data/maps/UnknownMap_00_00/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_SPECIAL_AREA",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -64,4 +64,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json
index a8136a755..ad1ec4084 100644
--- a/data/maps/UnknownMap_00_01/map.json
+++ b/data/maps/UnknownMap_00_01/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_SPECIAL_AREA",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -64,4 +64,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json
index 8a90d86ff..76294433e 100644
--- a/data/maps/UnknownMap_00_02/map.json
+++ b/data/maps/UnknownMap_00_02/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_SPECIAL_AREA",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -96,4 +96,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UnknownMap_00_03/map.json b/data/maps/UnknownMap_00_03/map.json
index 6ef7c2d04..05301e782 100644
--- a/data/maps/UnknownMap_00_03/map.json
+++ b/data/maps/UnknownMap_00_03/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_SPECIAL_AREA",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -82,4 +82,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json
index 10edd9838..851ad7f1d 100644
--- a/data/maps/UnknownMap_00_04/map.json
+++ b/data/maps/UnknownMap_00_04/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_UNION_ROOM",
   "region_map_section": "MAPSEC_SPECIAL_AREA",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -142,4 +142,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UnknownMap_03_50/map.json b/data/maps/UnknownMap_03_50/map.json
index 1a166cfc8..e3a542b51 100644
--- a/data/maps/UnknownMap_03_50/map.json
+++ b/data/maps/UnknownMap_03_50/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_SEVII_ISLE_6",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -22,4 +22,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UnknownMap_03_51/map.json b/data/maps/UnknownMap_03_51/map.json
index c96dcbb8a..80d857ec6 100644
--- a/data/maps/UnknownMap_03_51/map.json
+++ b/data/maps/UnknownMap_03_51/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_SEVII_ISLE_7",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -22,4 +22,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UnknownMap_03_52/map.json b/data/maps/UnknownMap_03_52/map.json
index 5141b16dc..23b9a845d 100644
--- a/data/maps/UnknownMap_03_52/map.json
+++ b/data/maps/UnknownMap_03_52/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_SEVII_ISLE_8",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -16,4 +16,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UnknownMap_03_53/map.json b/data/maps/UnknownMap_03_53/map.json
index 6c57c230e..f92091f77 100644
--- a/data/maps/UnknownMap_03_53/map.json
+++ b/data/maps/UnknownMap_03_53/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_SEVII_ISLANDS",
   "region_map_section": "MAPSEC_SEVII_ISLE_9",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -16,4 +16,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json
index 5a592a7e0..5d21e06d1 100644
--- a/data/maps/UnknownMap_18_01/map.json
+++ b/data/maps/UnknownMap_18_01/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_6",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -16,4 +16,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json
index a1b37a7f0..afa2d0b7a 100644
--- a/data/maps/UnusedHouse_27_00/map.json
+++ b/data/maps/UnusedHouse_27_00/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ROUTE_3",
   "region_map_section": "MAPSEC_ROUTE_19",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -16,4 +16,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json
index 685feaa61..34ef0104b 100644
--- a/data/maps/UnusedHouse_29_00/map.json
+++ b/data/maps/UnusedHouse_29_00/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_INDIGO_PLATEAU",
   "region_map_section": "MAPSEC_ROUTE_23",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -16,4 +16,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json
index 97996c85d..3445b9f56 100644
--- a/data/maps/UnusedHouse_31_05/map.json
+++ b/data/maps/UnusedHouse_31_05/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_ISLAND_SIX",
   "region_map_section": "MAPSEC_SEVEN_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -16,4 +16,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json
index eb3112c5c..30efc81c4 100644
--- a/data/maps/VermilionCity/map.json
+++ b/data/maps/VermilionCity/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VERMILION_CITY",
   "region_map_section": "MAPSEC_VERMILION_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -285,4 +285,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json
index cc98e944b..9545fed01 100644
--- a/data/maps/VermilionCity_Gym/map.json
+++ b/data/maps/VermilionCity_Gym/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GYM",
   "region_map_section": "MAPSEC_VERMILION_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -224,4 +224,4 @@
       "script": "VermilionCity_Gym_EventScript_16B837"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json
index 8195bf6ac..73b782e11 100644
--- a/data/maps/VermilionCity_House1/map.json
+++ b/data/maps/VermilionCity_House1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CERULEAN_CITY",
   "region_map_section": "MAPSEC_VERMILION_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -52,4 +52,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json
index 0e218b3d1..a4daf98d6 100644
--- a/data/maps/VermilionCity_House2/map.json
+++ b/data/maps/VermilionCity_House2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VERMILION_CITY",
   "region_map_section": "MAPSEC_VERMILION_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -52,4 +52,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json
index 2108ec768..da5d4b82a 100644
--- a/data/maps/VermilionCity_House3/map.json
+++ b/data/maps/VermilionCity_House3/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VERMILION_CITY",
   "region_map_section": "MAPSEC_VERMILION_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -99,4 +99,4 @@
       "script": "VermilionCity_House3_EventScript_16BACF"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json
index 9b014e0de..2dcf37084 100644
--- a/data/maps/VermilionCity_Mart/map.json
+++ b/data/maps/VermilionCity_Mart/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_VERMILION_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json
index c1f76237e..47d4a391e 100644
--- a/data/maps/VermilionCity_PokemonCenter_1F/map.json
+++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_VERMILION_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -137,4 +137,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json
index 942ef3885..5d077ec8f 100644
--- a/data/maps/VermilionCity_PokemonCenter_2F/map.json
+++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_VERMILION_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json
index 4be1c66f0..2f9255233 100644
--- a/data/maps/VermilionCity_PokemonFanClub/map.json
+++ b/data/maps/VermilionCity_PokemonFanClub/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VERMILION_CITY",
   "region_map_section": "MAPSEC_VERMILION_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -132,4 +132,4 @@
       "script": "VermilionCity_PokemonFanClub_EventScript_16B5CD"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
index fae861a3e..a62dd427d 100644
--- a/data/maps/VictoryRoad_1F/map.json
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_MOON",
   "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -152,4 +152,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json
index 6a0ba1819..058247ece 100644
--- a/data/maps/VictoryRoad_2F/map.json
+++ b/data/maps/VictoryRoad_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_MOON",
   "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -269,4 +269,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json
index 78a5c1b4e..5ba23ad2e 100644
--- a/data/maps/VictoryRoad_3F/map.json
+++ b/data/maps/VictoryRoad_3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_MT_MOON",
   "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -219,4 +219,4 @@
     }
   ],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json
index 5c15a8364..2c47e786f 100644
--- a/data/maps/ViridianCity/map.json
+++ b/data/maps/ViridianCity/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_VIRIDIAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -259,4 +259,4 @@
       "script": "ViridianCity_EventScript_1659B8"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json
index accf4290d..6b9738c4d 100644
--- a/data/maps/ViridianCity_Gym/map.json
+++ b/data/maps/ViridianCity_Gym/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GYM",
   "region_map_section": "MAPSEC_VIRIDIAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -193,4 +193,4 @@
       "unknown": 129
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json
index bbb006933..ef18aa4c4 100644
--- a/data/maps/ViridianCity_House1/map.json
+++ b/data/maps/ViridianCity_House1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_VIRIDIAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -86,4 +86,4 @@
       "script": "ViridianCity_House1_EventScript_169EC0"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json
index 021a26f6a..5f6b02a03 100644
--- a/data/maps/ViridianCity_House2/map.json
+++ b/data/maps/ViridianCity_House2/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_CITY",
   "region_map_section": "MAPSEC_VIRIDIAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -101,4 +101,4 @@
       "script": "ViridianCity_House2_EventScript_1ACD65"
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json
index 3b0216fde..3915e053d 100644
--- a/data/maps/ViridianCity_Mart/map.json
+++ b/data/maps/ViridianCity_Mart/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_VIRIDIAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json
index bed78482f..a63b5d733 100644
--- a/data/maps/ViridianCity_PokemonCenter_1F/map.json
+++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_VIRIDIAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -98,4 +98,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json
index 20f2abea7..5d66d7096 100644
--- a/data/maps/ViridianCity_PokemonCenter_2F/map.json
+++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_VIRIDIAN_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
-\ No newline at end of file
+}
diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json
index 5034e3afa..ca91c7017 100644
--- a/data/maps/ViridianForest/map.json
+++ b/data/maps/ViridianForest/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_VIRIDIAN_FOREST",
   "region_map_section": "MAPSEC_VIRIDIAN_FOREST",
   "requires_flash": false,
-  "weather": "WEATHER_11",
+  "weather": "WEATHER_CLOUDY",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 7,
@@ -264,4 +264,4 @@
       "unknown": 1
     }
   ]
-}
-\ No newline at end of file
+}
diff --git a/include/constants/battle.h b/include/constants/battle.h
index 25544ba3d..074c0d0cd 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -207,12 +207,12 @@
 #define WEATHER_SANDSTORM_TEMPORARY (1 << 3)
 #define WEATHER_SANDSTORM_PERMANENT (1 << 4)
 #define WEATHER_SANDSTORM_ANY       (WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT)
-#define WEATHER_SUN_TEMPORARY       (1 << 5)
-#define WEATHER_SUN_PERMANENT       (1 << 6)
-#define WEATHER_SUN_ANY             (WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT)
+#define WEATHER_SUNNY_TEMPORARY     (1 << 5)
+#define WEATHER_SUNNY_PERMANENT     (1 << 6)
+#define WEATHER_SUNNY_ANY           (WEATHER_SUNNY_TEMPORARY | WEATHER_SUNNY_PERMANENT)
 #define WEATHER_HAIL                (1 << 7)
 #define WEATHER_HAIL_ANY            (WEATHER_HAIL)
-#define WEATHER_ANY                 (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)
+#define WEATHER_ANY                 (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUNNY_ANY | WEATHER_HAIL_ANY)
 
 // Move Effects
 #define MOVE_EFFECT_SLEEP               0x1
diff --git a/include/constants/battle_ai.h b/include/constants/battle_ai.h
index 4c3a45dc6..f55661b91 100644
--- a/include/constants/battle_ai.h
+++ b/include/constants/battle_ai.h
@@ -23,10 +23,10 @@
 #define AI_EFFECTIVENESS_x0     0
 
 // ai weather
-#define AI_WEATHER_SUN 0
-#define AI_WEATHER_RAIN 1
+#define AI_WEATHER_SUNNY     0
+#define AI_WEATHER_RAIN      1
 #define AI_WEATHER_SANDSTORM 2
-#define AI_WEATHER_HAIL 3
+#define AI_WEATHER_HAIL      3
 
 // get_how_powerful_move_is
 #define MOVE_POWER_DISCOURAGED  0
diff --git a/include/constants/maps.h b/include/constants/maps.h
index fdef6ccb3..db8ee451c 100644
--- a/include/constants/maps.h
+++ b/include/constants/maps.h
@@ -40,17 +40,4 @@
 #define MAP_TYPE_8 8
 #define MAP_TYPE_9 9
 
-#define WEATHER_0 0
-#define WEATHER_1 1
-#define WEATHER_2 2
-#define WEATHER_3 3
-#define WEATHER_4 4
-#define WEATHER_5 5
-#define WEATHER_6 6
-#define WEATHER_7 7
-#define WEATHER_8 8
-#define WEATHER_9 9
-#define WEATHER_10 10
-#define WEATHER_11 11
-
 #endif  // GUARD_CONSTANTS_MAPS_H
diff --git a/include/constants/weather.h b/include/constants/weather.h
new file mode 100644
index 000000000..a45d2e523
--- /dev/null
+++ b/include/constants/weather.h
@@ -0,0 +1,20 @@
+#ifndef GUARD_CONSTANTS_WEATHER_H
+#define GUARD_CONSTANTS_WEATHER_H
+
+#define WEATHER_NONE               0
+#define WEATHER_SUNNY_CLOUDS       1   // unused
+#define WEATHER_SUNNY              2
+#define WEATHER_RAIN               3   // unused
+#define WEATHER_SNOW               4   // unused
+#define WEATHER_RAIN_THUNDERSTORM  5   // unused
+#define WEATHER_FOG_HORIZONTAL     6
+#define WEATHER_VOLCANIC_ASH       7   // unused
+#define WEATHER_SANDSTORM          8   // unused
+#define WEATHER_FOG_DIAGONAL       9   // unused
+#define WEATHER_UNDERWATER         10  // unused
+#define WEATHER_CLOUDY             11
+#define WEATHER_DROUGHT            12  // unused and broken in overworld
+#define WEATHER_DOWNPOUR           13  // unused
+#define WEATHER_UNDERWATER_BUBBLES 14  // unused
+
+#endif  // GUARD_CONSTANTS_WEATHER_H
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 6f5577f70..6343b55cd 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -1623,7 +1623,7 @@ static void BattleAICmd_if_status_not_in_party(void)
 
 enum
 {
-    WEATHER_TYPE_SUN,
+    WEATHER_TYPE_SUNNY,
     WEATHER_TYPE_RAIN,
     WEATHER_TYPE_SANDSTORM,
     WEATHER_TYPE_HAIL,
@@ -1637,8 +1637,8 @@ static void BattleAICmd_get_weather(void)
         AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_RAIN;
     if (gBattleWeather & WEATHER_SANDSTORM_ANY)
         AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SANDSTORM;
-    if (gBattleWeather & WEATHER_SUN_ANY)
-        AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SUN;
+    if (gBattleWeather & WEATHER_SUNNY_ANY)
+        AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SUNNY;
     if (gBattleWeather & WEATHER_HAIL)
         AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_HAIL;
 
diff --git a/src/pokemon.c b/src/pokemon.c
index 7700d537a..3a9fdbf04 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1001,7 +1001,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
                 damage /= 2;
 
             // sunny
-            if (gBattleWeather & WEATHER_SUN_ANY)
+            if (gBattleWeather & WEATHER_SUNNY_ANY)
             {
                 switch (type)
                 {
author	PikalaxALT <PikalaxALT@users.noreply.github.com>	2019-05-19 12:10:26 -0400
committer	GitHub <noreply@github.com>	2019-05-19 12:10:26 -0400
commit	4661be783654c654ba66c5e5fafa1aa18e7b9213 (patch)
tree	414b3654d06ebe8431c1334874a336a0c1a6d354
parent	6c2d5ea50d8b2505f7eccc4283bfc32961adfb92 (diff)
parent	333d2f37a811c05672f785a13af47708ccc08613 (diff)