Merge master into ObjEvent rename

2019-12-06 21:37:17 -05:00
parent 1b30f0c973 47ea65b96e
commit b93101bbeb
167 changed files with 3292 additions and 1686 deletions
@@ -763,8 +763,8 @@ Common_EventScript_NoRoomForDecor:: @ 8272071
 	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	return
-Common_EventScript_SetAlternatingWeather:: @ 827207A
+Common_EventScript_SetAbnormalWeather:: @ 827207A
-	setweather WEATHER_ALTERNATING
+	setweather WEATHER_ABNORMAL
 	return
 Common_EventScript_PlayGymBadgeFanfare:: @ 827207E
@@ -1012,7 +1012,7 @@ gText_LegendaryFlewAway:: @ 8273204
 	.include "data/text/pc_transfer.inc"
 	.include "data/text/mevent.inc"
-	.include "data/text/unusual_weather.inc"
+	.include "data/text/abnormal_weather.inc"
 EventScript_SelectWithoutRegisteredItem:: @ 82736B3
 	msgbox gText_SelectWithoutRegisteredItem, MSGBOX_SIGN
@@ -1062,7 +1062,7 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776
 	.include "data/scripts/pc_transfer.inc"
 	.include "data/scripts/mevent.inc"
-	.include "data/scripts/unusual_weather.inc"
+	.include "data/scripts/abnormal_weather.inc"
 	.include "data/scripts/trainer_script.inc"
 	.include "data/scripts/berry_tree.inc"
 	.include "data/scripts/secret_base.inc"
@@ -5,7 +5,7 @@
  "music": "MUS_DEEPDEEP",
  "region_map_section": "MAPSEC_ABANDONED_SHIP",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -5,7 +5,7 @@
  "music": "MUS_DEEPDEEP",
  "region_map_section": "MAPSEC_ABANDONED_SHIP",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -5,7 +5,7 @@
  "music": "MUS_NONE",
  "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
  "requires_flash": false,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
  "map_type": "MAP_TYPE_UNDERGROUND",
  "allow_bike": false,
  "allow_escape_rope": true,
@@ -5,7 +5,7 @@
  "music": "MUS_DAN03",
  "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
  "requires_flash": true,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
  "map_type": "MAP_TYPE_UNDERGROUND",
  "allow_bike": true,
  "allow_escape_rope": true,
@@ -5,7 +5,7 @@
  "music": "MUS_DAN03",
  "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
  "requires_flash": true,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
  "map_type": "MAP_TYPE_UNDERGROUND",
  "allow_bike": true,
  "allow_escape_rope": true,
@@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B
 	.byte 0
 EverGrandeCity_OnTransition: @ 81E7D21
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	end
 EverGrandeCity_EventScript_VictoryRoadSign:: @ 81E7D2B
@@ -7,7 +7,7 @@ FarawayIsland_Entrance_OnTransition: @ 8267C94
 	end
 FarawayIsland_Entrance_EventScript_SetCloudsWeather:: @ 8267C98
-	setweather WEATHER_CLOUDS
+	setweather WEATHER_SUNNY_CLOUDS
 	doweather
 	end
@@ -156,7 +156,7 @@
      "x": 21,
      "y": 12,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
    },
    {
      "type": "weather",
@@ -26,7 +26,7 @@ JaggedPass_OnTransition: @ 823068B
 	end
 JaggedPass_EventScript_SetWeatherAsh:: @ 8230697
-	setweather WEATHER_ASH
+	setweather WEATHER_VOLCANIC_ASH
 	doweather
 	return
@@ -5,7 +5,7 @@
  "music": "MUS_GIM",
  "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
  "requires_flash": false,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
  "map_type": "MAP_TYPE_INDOOR",
  "allow_bike": false,
  "allow_escape_rope": false,
@@ -5,7 +5,7 @@
  "music": "MUS_GIM",
  "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
  "requires_flash": false,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
  "map_type": "MAP_TYPE_INDOOR",
  "allow_bike": false,
  "allow_escape_rope": false,
@@ -7,7 +7,7 @@ LilycoveCity_OnTransition: @ 81E2B47
 	setflag FLAG_VISITED_LILYCOVE_CITY
 	setvar VAR_CONTEST_HALL_STATE, 0
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	call Common_EventScript_SetupRivalGfxId
 	end
@@ -2,7 +2,7 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_OnWarp
 	.byte 0
-@ During the unusual weather from Kyogre/Groudon awakening the dept store rooftop is inaccessible
+@ During the abnormal weather from Kyogre/Groudon awakening the dept store rooftop is inaccessible
@ Likely done to avoid dealing with showing the weather. Technically the rooftop is indoors
 LilycoveCity_DepartmentStore_5F_OnWarp: @ 821FF80
 	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs
@@ -5,7 +5,7 @@
  "music": "MUS_DAN01",
  "region_map_section": "MAPSEC_MARINE_CAVE",
  "requires_flash": false,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
  "map_type": "MAP_TYPE_UNDERGROUND",
  "allow_bike": false,
  "allow_escape_rope": true,
@@ -47,13 +47,13 @@ MarineCave_End_EventScript_Kyogre:: @ 823B01B
 	goto_if_eq MarineCave_End_EventScript_RanFromKyogre
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
 	goto_if_eq MarineCave_End_EventScript_RanFromKyogre
-	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	setflag FLAG_DEFEATED_KYOGRE
 	releaseall
 	end
 MarineCave_End_EventScript_DefeatedKyogre:: @ 823B084
-	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	setflag FLAG_DEFEATED_KYOGRE
 	goto Common_EventScript_RemoveStaticPokemon
 	end
@@ -7,7 +7,7 @@ MossdeepCity_OnTransition: @ 81E4A9C
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	end
 MossdeepCity_EventScript_PokefanF:: @ 81E4AB2
@@ -5,7 +5,7 @@
  "music": "MUS_TOZAN",
  "region_map_section": "MAPSEC_MT_CHIMNEY",
  "requires_flash": false,
-  "weather": "WEATHER_ASH",
+  "weather": "WEATHER_VOLCANIC_ASH",
  "map_type": "MAP_TYPE_ROUTE",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -13,11 +13,11 @@ MtPyre_Exterior_EventScript_CheckEnterFromSummit:: @ 8231FD8
 	return
 MtPyre_Exterior_EventScript_EnterFromSummit:: @ 8231FE9
-	setweather WEATHER_FOG_1
+	setweather WEATHER_FOG_HORIZONTAL
 	return
 MtPyre_Exterior_EventScript_FogTrigger:: @ 8231FED
-	setweather WEATHER_FOG_1
+	setweather WEATHER_FOG_HORIZONTAL
 	doweather
 	end
@@ -5,7 +5,7 @@
  "music": "MUS_MACHUPI",
  "region_map_section": "MAPSEC_MT_PYRE",
  "requires_flash": false,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
  "map_type": "MAP_TYPE_ROUTE",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -6,10 +6,10 @@ Route105_MapScripts:: @ 81EE1DB
 Route105_OnLoad: @ 81EE1EB
 	call_if_unset FLAG_REGI_DOORS_OPENED, Route105_CloseRegiEntrance
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_NORTH
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute105North
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_SOUTH
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute105South
 	end
 Route105_CloseRegiEntrance:: @ 81EE20B
@@ -18,16 +18,16 @@ Route105_CloseRegiEntrance:: @ 81EE20B
 	return
 Route105_OnTransition: @ 81EE21E
-	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
-	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
+	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_NORTH
-	call_if_eq UnusualWeather_StartKyogreWeather
+	call_if_eq AbnormalWeather_StartKyogreWeather
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_SOUTH
-	call_if_eq UnusualWeather_StartKyogreWeather
+	call_if_eq AbnormalWeather_StartKyogreWeather
 	end
 Route105_OnFrame: @ 81EE240
-	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 Route105_EventScript_Foster:: @ 81EE24A
@@ -268,49 +268,49 @@
      "x": 19,
      "y": 11,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
    },
    {
      "type": "weather",
      "x": 19,
      "y": 10,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
    },
    {
      "type": "weather",
      "x": 19,
      "y": 12,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
    },
    {
      "type": "weather",
      "x": 19,
      "y": 13,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
    },
    {
      "type": "weather",
      "x": 86,
      "y": 9,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
    },
    {
      "type": "weather",
      "x": 85,
      "y": 10,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
    },
    {
      "type": "weather",
      "x": 85,
      "y": 11,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
    },
    {
      "type": "weather",
@@ -373,28 +373,28 @@
      "x": 19,
      "y": 14,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
    },
    {
      "type": "weather",
      "x": 87,
      "y": 8,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
    },
    {
      "type": "weather",
      "x": 87,
      "y": 6,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
    },
    {
      "type": "weather",
      "x": 87,
      "y": 7,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
    }
  ],
  "bg_events": [
@@ -18,7 +18,7 @@ Route113_EventScript_CheckSetAshWeather:: @ 81F216A
 	goto_if_lt Route113_EventScript_DontSetAshWeather
 	compare VAR_TEMP_0, 84
 	goto_if_gt Route113_EventScript_DontSetAshWeather
-	setweather WEATHER_ASH
+	setweather WEATHER_VOLCANIC_ASH
 	return
 Route113_EventScript_DontSetAshWeather:: @ 81F2189
@@ -5,23 +5,23 @@ Route114_MapScripts:: @ 81F252F
 	.byte 0
 Route114_OnTransition: @ 81F253F
-	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
-	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
+	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_NORTH
-	call_if_eq UnusualWeather_StartGroudonWeather
+	call_if_eq AbnormalWeather_StartGroudonWeather
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_SOUTH
-	call_if_eq UnusualWeather_StartGroudonWeather
+	call_if_eq AbnormalWeather_StartGroudonWeather
 	end
 Route114_OnLoad: @ 81F2561
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_NORTH
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute114North
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_SOUTH
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute114South
 	end
 Route114_OnFrame: @ 81F2578
-	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 Route114_EventScript_Man:: @ 81F2582
@@ -5,23 +5,23 @@ Route115_MapScripts:: @ 81F2920
 	.byte 0
 Route115_OnLoad: @ 81F2930
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_WEST
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115West
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute115West
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_EAST
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115East
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute115East
 	end
 Route115_OnTransition: @ 81F2947
-	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
-	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
+	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_WEST
-	call_if_eq UnusualWeather_StartGroudonWeather
+	call_if_eq AbnormalWeather_StartGroudonWeather
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_EAST
-	call_if_eq UnusualWeather_StartGroudonWeather
+	call_if_eq AbnormalWeather_StartGroudonWeather
 	end
 Route115_OnFrame: @ 81F2969
-	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 Route115_EventScript_Woman:: @ 81F2973
@@ -6,12 +6,12 @@ Route116_MapScripts:: @ 81F2C0C
 Route116_OnTransition: @ 81F2C1C
 	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_SetWandasBoyfriendPos
-	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
-	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
+	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_NORTH
-	call_if_eq UnusualWeather_StartGroudonWeather
+	call_if_eq AbnormalWeather_StartGroudonWeather
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_SOUTH
-	call_if_eq UnusualWeather_StartGroudonWeather
+	call_if_eq AbnormalWeather_StartGroudonWeather
 	end
 Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47
@@ -19,14 +19,14 @@ Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47
 	return
 Route116_OnLoad: @ 81F2C4F
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_NORTH
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116North
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute116North
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_SOUTH
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116South
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute116South
 	end
 Route116_OnFrame: @ 81F2C66
-	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 Route116_EventScript_WandasBoyfriend:: @ 81F2C70
@@ -6,23 +6,23 @@ Route118_MapScripts:: @ 81F3DBC
 Route118_OnTransition: @ 81F3DCC
 	call GabbyAndTy_EventScript_UpdateLocation
-	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
-	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
+	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST
-	call_if_eq UnusualWeather_StartGroudonWeather
+	call_if_eq AbnormalWeather_StartGroudonWeather
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST
-	call_if_eq UnusualWeather_StartGroudonWeather
+	call_if_eq AbnormalWeather_StartGroudonWeather
 	end
 Route118_OnLoad: @ 81F3DF3
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118East
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118West
 	end
 Route118_OnFrame: @ 81F3E0A
-	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 Route118_EventScript_GoodRodFisherman:: @ 81F3E14
@@ -36,7 +36,7 @@ Route119_WeatherInstitute_1F_EventScript_InstituteWorker1:: @ 826FAC8
 	call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated
 	compare VAR_0x8004, 2  @ Both defeated
 	goto_if_eq Route119_WeatherInstitute_1F_EventScript_StudyingRain
-	msgbox Route119_WeatherInstitute_1F_Text_NoticingUnusualWeather, MSGBOX_DEFAULT
+	msgbox Route119_WeatherInstitute_1F_Text_NoticingAbnormalWeather, MSGBOX_DEFAULT
 	release
 	end
@@ -116,7 +116,7 @@ Route119_WeatherInstitute_1F_Text_ProfStudyingRain: @ 826FD2E
 	.string "And thus, the PROFESSOR is studying\n"
 	.string "if the rain can be put to good use.$"
-Route119_WeatherInstitute_1F_Text_NoticingUnusualWeather: @ 826FDE8
+Route119_WeatherInstitute_1F_Text_NoticingAbnormalWeather: @ 826FDE8
 	.string "On the 2nd floor of the INSTITUTE,\n"
 	.string "we study the weather patterns over\l"
 	.string "the HOENN region.\p"
@@ -131,19 +131,19 @@ Route119_WeatherInstitute_2F_EventScript_ExplainCastform:: @ 82700EA
 	end
 Route119_WeatherInstitute_2F_EventScript_ScientistMentionWeather:: @ 82700F7
-	goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather
+	goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartAbnormalWeather
 	msgbox Route119_WeatherInstitute_2F_Text_ChangingWeatherRidiculous, MSGBOX_DEFAULT
 	release
 	end
-Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather:: @ 827010A
+Route119_WeatherInstitute_2F_EventScript_TryStartAbnormalWeather:: @ 827010A
 	setvar VAR_0x8004, 0
 	call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated
 	call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated
 	compare VAR_0x8004, 2  @ Both defeated
 	goto_if_eq Route119_WeatherInstitute_2F_EventScript_NoAbnormalWeather
-	call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather
+	call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_CreateAbnormalWeather
-	specialvar VAR_RESULT, GetUnusualWeatherMapNameAndType
+	specialvar VAR_RESULT, GetAbnormalWeatherMapNameAndType
 	compare VAR_RESULT, 1
 	goto_if_eq Route119_WeatherInstitute_2F_EventScript_KyogreWeather
 	msgbox Route119_WeatherInstitute_2F_Text_GroudonWeather, MSGBOX_DEFAULT
@@ -155,8 +155,8 @@ Route119_WeatherInstitute_2F_EventScript_KyogreWeather:: @ 827014F
 	release
 	end
-Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather:: @ 8270159
+Route119_WeatherInstitute_2F_EventScript_CreateAbnormalWeather:: @ 8270159
-	special CreateUnusualWeatherEvent
+	special CreateAbnormalWeatherEvent
 	setflag FLAG_TEMP_2
 	return
@@ -620,63 +620,63 @@
      "x": 7,
      "y": 15,
      "elevation": 0,
-      "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT"
+      "weather": "COORD_EVENT_WEATHER_RAIN"
    },
    {
      "type": "weather",
      "x": 7,
      "y": 16,
      "elevation": 0,
-      "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT"
+      "weather": "COORD_EVENT_WEATHER_RAIN"
    },
    {
      "type": "weather",
      "x": 22,
      "y": 61,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT"
+      "weather": "COORD_EVENT_WEATHER_RAIN"
    },
    {
      "type": "weather",
      "x": 12,
      "y": 64,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT"
+      "weather": "COORD_EVENT_WEATHER_RAIN"
    },
    {
      "type": "weather",
      "x": 35,
      "y": 63,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+      "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
    },
    {
      "type": "weather",
      "x": 36,
      "y": 63,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+      "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
    },
    {
      "type": "weather",
      "x": 37,
      "y": 63,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+      "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
    },
    {
      "type": "weather",
      "x": 38,
      "y": 63,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+      "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
    },
    {
      "type": "weather",
      "x": 32,
      "y": 88,
      "elevation": 5,
-      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+      "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
    },
    {
      "type": "weather",
@@ -704,49 +704,49 @@
      "x": 32,
      "y": 89,
      "elevation": 5,
-      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+      "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
    },
    {
      "type": "weather",
      "x": 32,
      "y": 90,
      "elevation": 5,
-      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+      "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
    },
    {
      "type": "weather",
      "x": 32,
      "y": 91,
      "elevation": 5,
-      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+      "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
    },
    {
      "type": "weather",
      "x": 10,
      "y": 75,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+      "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
    },
    {
      "type": "weather",
      "x": 11,
      "y": 75,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+      "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
    },
    {
      "type": "weather",
      "x": 12,
      "y": 75,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+      "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
    },
    {
      "type": "weather",
      "x": 13,
      "y": 75,
      "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+      "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
    }
  ],
  "bg_events": [
@@ -76,7 +76,7 @@ Route120_EventScript_SetWeather:: @ 81F54D8
 	return
 Route120_EventScript_SetCloudyWeather:: @ 81F54FF
-	setweather WEATHER_CLOUDS
+	setweather WEATHER_SUNNY_CLOUDS
 	return
 Route120_EventScript_SetSunnyWeather:: @ 81F5503
@@ -92,7 +92,7 @@ Route120_EventScript_TrySetRainyWeather:: @ 81F5507
 	end
 Route120_EventScript_SetRainyWeather:: @ 81F5523
-	setweather WEATHER_RAIN_LIGHT
+	setweather WEATHER_RAIN
 	return
 Route120_EventScript_BerryBeauty:: @ 81F5527
@@ -3,7 +3,7 @@ Route124_MapScripts:: @ 81F656C
 	.byte 0
 Route124_OnTransition: @ 81F6572
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	end
 Route124_EventScript_HuntersHouseSign:: @ 81F657C
@@ -5,24 +5,24 @@ Route125_MapScripts:: @ 81F6748
 	.byte 0
 Route125_OnTransition: @ 81F6758
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
-	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
-	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
+	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_WEST
-	call_if_eq UnusualWeather_StartKyogreWeather
+	call_if_eq AbnormalWeather_StartKyogreWeather
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_EAST
-	call_if_eq UnusualWeather_StartKyogreWeather
+	call_if_eq AbnormalWeather_StartKyogreWeather
 	end
 Route125_OnLoad: @ 81F6783
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_WEST
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125West
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute125West
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_EAST
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125East
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute125East
 	end
 Route125_OnFrame: @ 81F679A
-	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 Route125_EventScript_Nolen:: @ 81F67A4
@@ -3,7 +3,7 @@ Route126_MapScripts:: @ 81F68C6
 	.byte 0
 Route126_OnTransition: @ 81F68CC
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	end
 Route126_EventScript_Barry:: @ 81F68D6
@@ -5,24 +5,24 @@ Route127_MapScripts:: @ 81F69D9
 	.byte 0
 Route127_OnTransition: @ 81F69E9
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
-	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
-	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
+	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_NORTH
-	call_if_eq UnusualWeather_StartKyogreWeather
+	call_if_eq AbnormalWeather_StartKyogreWeather
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_SOUTH
-	call_if_eq UnusualWeather_StartKyogreWeather
+	call_if_eq AbnormalWeather_StartKyogreWeather
 	end
 Route127_OnLoad: @ 81F6A14
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_NORTH
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127North
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute127North
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_SOUTH
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127South
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute127South
 	end
 Route127_OnFrame: @ 81F6A2B
-	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 Route127_EventScript_Camden:: @ 81F6A35
@@ -4,7 +4,7 @@ Route128_MapScripts:: @ 81F6B38
 	.byte 0
 Route128_OnTransition: @ 81F6B43
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	end
 Route128_OnFrame: @ 81F6B4D
@@ -5,29 +5,29 @@ Route129_MapScripts:: @ 81F7284
 	.byte 0
 Route129_OnLoad: @ 81F7294
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_WEST
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129West
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute129West
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_EAST
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129East
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute129East
 	end
 Route129_OnTransition: @ 81F72AB
-	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
-	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
+	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_ge Route129_EventScript_CheckSetAlternatingWeather
+	call_if_ge Route129_EventScript_CheckSetAbnormalWeather
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_WEST
-	call_if_eq UnusualWeather_StartKyogreWeather
+	call_if_eq AbnormalWeather_StartKyogreWeather
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_EAST
-	call_if_eq UnusualWeather_StartKyogreWeather
+	call_if_eq AbnormalWeather_StartKyogreWeather
 	end
-Route129_EventScript_CheckSetAlternatingWeather:: @ 81F72D8
+Route129_EventScript_CheckSetAbnormalWeather:: @ 81F72D8
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	return
 Route129_OnFrame: @ 81F72E2
-	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 Route129_EventScript_Chase:: @ 81F72EC
@@ -4,7 +4,7 @@ Route130_MapScripts:: @ 81F735F
 Route130_OnTransition: @ 81F7365
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_ge Route130_EventScript_CheckSetAlternatingWeather
+	call_if_ge Route130_EventScript_CheckSetAbnormalWeather
 	specialvar VAR_RESULT, IsMirageIslandPresent
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route130_EventScript_SetMirageIslandLayout
@@ -30,8 +30,8 @@ Route130_EventScript_SetMirageIslandLayout:: @ 81F73B1
 	setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND
 	end
-Route130_EventScript_CheckSetAlternatingWeather:: @ 81F73B5
+Route130_EventScript_CheckSetAbnormalWeather:: @ 81F73B5
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	return
 Route130_EventScript_Rodney:: @ 81F73BF
@@ -4,7 +4,7 @@ Route131_MapScripts:: @ 81F7404
 Route131_OnTransition: @ 81F740A
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_ge Route131_EventScript_CheckSetAlternatingWeather
+	call_if_ge Route131_EventScript_CheckSetAbnormalWeather
 	call Route131_EventScript_SetLayout
 	end
@@ -12,8 +12,8 @@ Route131_EventScript_SetLayout:: @ 81F741B
 	setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR
 	return
-Route131_EventScript_CheckSetAlternatingWeather:: @ 81F741F
+Route131_EventScript_CheckSetAbnormalWeather:: @ 81F741F
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	return
 Route131_EventScript_Richard:: @ 81F7429
@@ -5,7 +5,7 @@
  "music": "MUS_DAN01",
  "region_map_section": "MAPSEC_RUSTURF_TUNNEL",
  "requires_flash": false,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
  "map_type": "MAP_TYPE_UNDERGROUND",
  "allow_bike": true,
  "allow_escape_rope": true,
@@ -5,7 +5,7 @@
  "music": "MUS_TOZAN",
  "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
  "requires_flash": false,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
  "map_type": "MAP_TYPE_UNDERGROUND",
  "allow_bike": false,
  "allow_escape_rope": true,
@@ -8,15 +8,15 @@ SkyPillar_Outside_OnTransition: @ 82392B8
 	compare VAR_SOOTOPOLIS_CITY_STATE, 3
 	call_if_eq SkyPillar_Outside_EventScript_HideMapNamePopup
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_ge SkyPillar_Outside_EventScript_CheckSetAlternatingWeather
+	call_if_ge SkyPillar_Outside_EventScript_CheckSetAbnormalWeather
 	end
 SkyPillar_Outside_EventScript_HideMapNamePopup:: @ 82392CF
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
-SkyPillar_Outside_EventScript_CheckSetAlternatingWeather:: @ 82392D3
+SkyPillar_Outside_EventScript_CheckSetAbnormalWeather:: @ 82392D3
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	return
 SkyPillar_Outside_OnLoad: @ 82392DD
@@ -72,7 +72,7 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
 	msgbox SkyPillar_Outside_Text_SituationGettingWorse, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_SYS_WEATHER_CTRL
-	setweather WEATHER_ALTERNATING
+	setweather WEATHER_ABNORMAL
 	doweather
 	special WaitWeather
 	waitstate
@@ -106,18 +106,18 @@ SootopolisCity_EventScript_SetWeather:: @ 81E5805
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
 	goto_if_ge SootopolisCity_EventScript_SetNormalWeather
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	goto_if_eq SootopolisCity_EventScript_SetHeavyRain
+	goto_if_eq SootopolisCity_EventScript_SetDownpour
 	compare VAR_SKY_PILLAR_STATE, 1
-	goto_if_eq SootopolisCity_EventScript_SetHeavyRain
+	goto_if_eq SootopolisCity_EventScript_SetDownpour
 	compare VAR_SKY_PILLAR_STATE, 1
-	goto_if_le Common_EventScript_SetAlternatingWeather
+	goto_if_le Common_EventScript_SetAbnormalWeather
 	return
 SootopolisCity_EventScript_SetNormalWeather:: @ 81E583D
 	return
-SootopolisCity_EventScript_SetHeavyRain:: @ 81E583E
+SootopolisCity_EventScript_SetDownpour:: @ 81E583E
-	setweather WEATHER_RAIN_HEAVY
+	setweather WEATHER_DOWNPOUR
 	return
 SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos:: @ 81E5842
@@ -215,7 +215,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
 	special RemoveCameraObject
 	delay 60
 	fadescreenspeed 1, 8
-	setweather WEATHER_ALTERNATING
+	setweather WEATHER_ABNORMAL
 	doweather
 	setvar VAR_0x8004, 0
 	special Script_DoRayquazaScene
@@ -315,7 +315,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
 	special RemoveCameraObject
 	delay 60
 	fadescreenspeed 1, 8
-	setweather WEATHER_ALTERNATING
+	setweather WEATHER_ABNORMAL
 	doweather
 	setvar VAR_0x8004, 0
 	special Script_DoRayquazaScene
@@ -5,7 +5,7 @@
  "music": "MUS_DAN01",
  "region_map_section": "MAPSEC_TERRA_CAVE",
  "requires_flash": false,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
  "map_type": "MAP_TYPE_UNDERGROUND",
  "allow_bike": false,
  "allow_escape_rope": true,
@@ -47,13 +47,13 @@ TerraCave_End_EventScript_Groudon:: @ 823B0EC
 	goto_if_eq TerraCave_End_EventScript_RanFromGroudon
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
 	goto_if_eq TerraCave_End_EventScript_RanFromGroudon
-	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	setflag FLAG_DEFEATED_GROUDON
 	releaseall
 	end
 TerraCave_End_EventScript_DefeatedGroudon:: @ 823B155
-	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	setflag FLAG_DEFEATED_GROUDON
 	goto Common_EventScript_RemoveStaticPokemon
 	end
@@ -5,7 +5,7 @@
  "music": "MUS_DEEPDEEP",
  "region_map_section": "MAPSEC_UNDERWATER_124",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -5,7 +5,7 @@
  "music": "MUS_DEEPDEEP",
  "region_map_section": "MAPSEC_UNDERWATER_125",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -5,7 +5,7 @@
  "music": "MUS_DEEPDEEP",
  "region_map_section": "MAPSEC_UNDERWATER_126",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -3,6 +3,6 @@ Underwater3_MapScripts:: @ 81F7724
 	.byte 0
 Underwater3_OnResume: @ 81F772A
-	call UnusualWeather_Underwater_SetupEscapeWarp
+	call AbnormalWeather_Underwater_SetupEscapeWarp
 	end
@@ -5,7 +5,7 @@
  "music": "MUS_DEEPDEEP",
  "region_map_section": "MAPSEC_UNDERWATER_127",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -5,7 +5,7 @@
  "music": "MUS_DEEPDEEP",
  "region_map_section": "MAPSEC_UNDERWATER_129",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -3,6 +3,6 @@ Underwater5_MapScripts:: @ 81F7731
 	.byte 0
 Underwater5_OnResume: @ 81F7737
-	call UnusualWeather_Underwater_SetupEscapeWarp
+	call AbnormalWeather_Underwater_SetupEscapeWarp
 	end
@@ -5,7 +5,7 @@
  "music": "MUS_DEEPDEEP",
  "region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -3,6 +3,6 @@ Underwater6_MapScripts:: @ 81F773D
 	.byte 0
 Underwater6_OnResume: @ 81F7743
-	call UnusualWeather_Underwater_SetupEscapeWarp
+	call AbnormalWeather_Underwater_SetupEscapeWarp
 	end
@@ -5,7 +5,7 @@
  "music": "MUS_DEEPDEEP",
  "region_map_section": "MAPSEC_UNDERWATER_UNK1",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -3,6 +3,6 @@ Underwater7_MapScripts:: @ 81F7749
 	.byte 0
 Underwater7_OnResume: @ 81F774F
-	call UnusualWeather_Underwater_SetupEscapeWarp
+	call AbnormalWeather_Underwater_SetupEscapeWarp
 	end
@@ -5,7 +5,7 @@
  "music": "MUS_DAN01",
  "region_map_section": "MAPSEC_UNDERWATER_MARINE_CAVE",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -5,7 +5,7 @@
  "music": "MUS_DEEPDEEP",
  "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -5,7 +5,7 @@
  "music": "MUS_DEEPDEEP",
  "region_map_section": "MAPSEC_UNDERWATER_128",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -5,7 +5,7 @@
  "music": "MUS_DEEPDEEP",
  "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -5,7 +5,7 @@
  "music": "MUS_DEEPDEEP",
  "region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS",
  "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
  "map_type": "MAP_TYPE_UNDERWATER",
  "allow_bike": true,
  "allow_escape_rope": false,
@@ -1,44 +1,44 @@
-UnusualWeather_EventScript_PlaceTilesRoute114North:: @ 8273913
+AbnormalWeather_EventScript_PlaceTilesRoute114North:: @ 8273913
 	setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1
 	setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute114South:: @ 8273926
+AbnormalWeather_EventScript_PlaceTilesRoute114South:: @ 8273926
 	setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
 	setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute115West:: @ 8273939
+AbnormalWeather_EventScript_PlaceTilesRoute115West:: @ 8273939
 	setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
 	setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute115East:: @ 827394C
+AbnormalWeather_EventScript_PlaceTilesRoute115East:: @ 827394C
 	setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
 	setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute116North:: @ 827395F
+AbnormalWeather_EventScript_PlaceTilesRoute116North:: @ 827395F
 	setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1
 	setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute116South:: @ 8273972
+AbnormalWeather_EventScript_PlaceTilesRoute116South:: @ 8273972
 	setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1
 	setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute118East:: @ 8273985
+AbnormalWeather_EventScript_PlaceTilesRoute118East:: @ 8273985
 	setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1
 	setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute118West:: @ 8273998
+AbnormalWeather_EventScript_PlaceTilesRoute118West:: @ 8273998
 	setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1
 	setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB
+AbnormalWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB
 	setmetatile 10, 28, METATILE_General_RoughWater, 0
 	setmetatile 11, 28, METATILE_General_RoughWater, 0
 	setmetatile 9, 29, METATILE_General_RoughWater, 0
@@ -53,7 +53,7 @@ UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB
 	setmetatile 11, 31, METATILE_General_RoughWater, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18
+AbnormalWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18
 	setmetatile 20, 53, METATILE_General_RoughWater, 0
 	setmetatile 21, 53, METATILE_General_RoughWater, 0
 	setmetatile 19, 54, METATILE_General_RoughWater, 0
@@ -68,7 +68,7 @@ UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18
 	setmetatile 21, 56, METATILE_General_RoughWater, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85
+AbnormalWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85
 	setmetatile 8, 16, METATILE_General_RoughWater, 0
 	setmetatile 9, 16, METATILE_General_RoughWater, 0
 	setmetatile 7, 17, METATILE_General_RoughWater, 0
@@ -83,7 +83,7 @@ UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85
 	setmetatile 9, 19, METATILE_General_RoughWater, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2
+AbnormalWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2
 	setmetatile 53, 18, METATILE_General_RoughWater, 0
 	setmetatile 54, 18, METATILE_General_RoughWater, 0
 	setmetatile 52, 19, METATILE_General_RoughWater, 0
@@ -98,7 +98,7 @@ UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2
 	setmetatile 54, 21, METATILE_General_RoughWater, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F
+AbnormalWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F
 	setmetatile 57, 9, METATILE_General_RoughWater, 0
 	setmetatile 58, 9, METATILE_General_RoughWater, 0
 	setmetatile 56, 10, METATILE_General_RoughWater, 0
@@ -113,7 +113,7 @@ UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F
 	setmetatile 58, 12, METATILE_General_RoughWater, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC
+AbnormalWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC
 	setmetatile 61, 30, METATILE_General_RoughWater, 0
 	setmetatile 62, 30, METATILE_General_RoughWater, 0
 	setmetatile 60, 31, METATILE_General_RoughWater, 0
@@ -128,7 +128,7 @@ UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC
 	setmetatile 62, 33, METATILE_General_RoughWater, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39
+AbnormalWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39
 	setmetatile 16, 14, METATILE_General_RoughWater, 0
 	setmetatile 17, 14, METATILE_General_RoughWater, 0
 	setmetatile 15, 15, METATILE_General_RoughWater, 0
@@ -143,7 +143,7 @@ UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39
 	setmetatile 17, 17, METATILE_General_RoughWater, 0
 	return
-UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
+AbnormalWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
 	setmetatile 42, 19, METATILE_General_RoughWater, 0
 	setmetatile 43, 19, METATILE_General_RoughWater, 0
 	setmetatile 41, 20, METATILE_General_RoughWater, 0
@@ -158,110 +158,110 @@ UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
 	setmetatile 43, 22, METATILE_General_RoughWater, 0
 	return
-UnusualWeather_EventScript_HideMapNamePopup:: @ 8273D13
+AbnormalWeather_EventScript_HideMapNamePopup:: @ 8273D13
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
-UnusualWeather_StartKyogreWeather:: @ 8273D17
+AbnormalWeather_StartKyogreWeather:: @ 8273D17
-	setweather WEATHER_RAIN_HEAVY
+	setweather WEATHER_DOWNPOUR
 	return
-UnusualWeather_StartGroudonWeather:: @ 8273D1B
+AbnormalWeather_StartGroudonWeather:: @ 8273D1B
 	setweather WEATHER_DROUGHT
 	return
-UnusualWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F
+AbnormalWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F
 	lockall
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START
-	goto_if_ge UnusualWeather_EventScript_ShowRainEndedMessage
+	goto_if_ge AbnormalWeather_EventScript_ShowRainEndedMessage
-	goto UnusualWeather_EventScript_ShowSunEndedMessage
+	goto AbnormalWeather_EventScript_ShowSunEndedMessage
 	end
-UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
+AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
 	closemessage
 	fadescreenswapbuffers 1
 	setweather WEATHER_SUNNY
 	doweather
-	call UnusualWeather_EventScript_CleanupMapTiles
+	call AbnormalWeather_EventScript_CleanupMapTiles
 	special DrawWholeMapView
-	setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE
+	setvar VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE
-	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0
+	setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 0
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	fadescreenswapbuffers 0
 	releaseall
 	end
-UnusualWeather_EventScript_ShowRainEndedMessage:: @ 8273D51
+AbnormalWeather_EventScript_ShowRainEndedMessage:: @ 8273D51
-	msgbox gText_UnusualWeatherEnded_Rain, MSGBOX_DEFAULT
+	msgbox gText_AbnormalWeatherEnded_Rain, MSGBOX_DEFAULT
-	goto UnusualWeather_EventScript_EndEventAndCleanup_2
+	goto AbnormalWeather_EventScript_EndEventAndCleanup_2
 	end
-UnusualWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F
+AbnormalWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F
-	msgbox gText_UnusualWeatherEnded_Sun, MSGBOX_DEFAULT
+	msgbox gText_AbnormalWeatherEnded_Sun, MSGBOX_DEFAULT
-	goto UnusualWeather_EventScript_EndEventAndCleanup_2
+	goto AbnormalWeather_EventScript_EndEventAndCleanup_2
 	end
-UnusualWeather_EventScript_CleanupMapTiles:: @ 8273D6D
+AbnormalWeather_EventScript_CleanupMapTiles:: @ 8273D6D
-	switch VAR_UNUSUAL_WEATHER_LOCATION
+	switch VAR_ABNORMAL_WEATHER_LOCATION
-	case UNUSUAL_WEATHER_ROUTE_114_NORTH, UnusualWeather_EventScript_CleanupRoute114North
+	case ABNORMAL_WEATHER_ROUTE_114_NORTH, AbnormalWeather_EventScript_CleanupRoute114North
-	case UNUSUAL_WEATHER_ROUTE_114_SOUTH, UnusualWeather_EventScript_CleanupRoute114South
+	case ABNORMAL_WEATHER_ROUTE_114_SOUTH, AbnormalWeather_EventScript_CleanupRoute114South
-	case UNUSUAL_WEATHER_ROUTE_115_WEST, UnusualWeather_EventScript_CleanupRoute115West
+	case ABNORMAL_WEATHER_ROUTE_115_WEST, AbnormalWeather_EventScript_CleanupRoute115West
-	case UNUSUAL_WEATHER_ROUTE_115_EAST, UnusualWeather_EventScript_CleanupRoute115East
+	case ABNORMAL_WEATHER_ROUTE_115_EAST, AbnormalWeather_EventScript_CleanupRoute115East
-	case UNUSUAL_WEATHER_ROUTE_116_NORTH, UnusualWeather_EventScript_CleanupRoute116North
+	case ABNORMAL_WEATHER_ROUTE_116_NORTH, AbnormalWeather_EventScript_CleanupRoute116North
-	case UNUSUAL_WEATHER_ROUTE_116_SOUTH, UnusualWeather_EventScript_CleanupRoute116South
+	case ABNORMAL_WEATHER_ROUTE_116_SOUTH, AbnormalWeather_EventScript_CleanupRoute116South
-	case UNUSUAL_WEATHER_ROUTE_118_EAST, UnusualWeather_EventScript_CleanupRoute118East
+	case ABNORMAL_WEATHER_ROUTE_118_EAST, AbnormalWeather_EventScript_CleanupRoute118East
-	case UNUSUAL_WEATHER_ROUTE_118_WEST, UnusualWeather_EventScript_CleanupRoute118West
+	case ABNORMAL_WEATHER_ROUTE_118_WEST, AbnormalWeather_EventScript_CleanupRoute118West
-	case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_EventScript_CleanupRoute105North
+	case ABNORMAL_WEATHER_ROUTE_105_NORTH, AbnormalWeather_EventScript_CleanupRoute105North
-	case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_EventScript_CleanupRoute105South
+	case ABNORMAL_WEATHER_ROUTE_105_SOUTH, AbnormalWeather_EventScript_CleanupRoute105South
-	case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_EventScript_CleanupRoute125West
+	case ABNORMAL_WEATHER_ROUTE_125_WEST, AbnormalWeather_EventScript_CleanupRoute125West
-	case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_EventScript_CleanupRoute125East
+	case ABNORMAL_WEATHER_ROUTE_125_EAST, AbnormalWeather_EventScript_CleanupRoute125East
-	case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_EventScript_CleanupRoute127North
+	case ABNORMAL_WEATHER_ROUTE_127_NORTH, AbnormalWeather_EventScript_CleanupRoute127North
-	case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_EventScript_CleanupRoute127South
+	case ABNORMAL_WEATHER_ROUTE_127_SOUTH, AbnormalWeather_EventScript_CleanupRoute127South
-	case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_EventScript_CleanupRoute129West
+	case ABNORMAL_WEATHER_ROUTE_129_WEST, AbnormalWeather_EventScript_CleanupRoute129West
-	case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_EventScript_CleanupRoute129East
+	case ABNORMAL_WEATHER_ROUTE_129_EAST, AbnormalWeather_EventScript_CleanupRoute129East
 	return
-UnusualWeather_EventScript_CleanupRoute114North:: @ 8273E23
+AbnormalWeather_EventScript_CleanupRoute114North:: @ 8273E23
 	setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1
 	setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1
 	return
-UnusualWeather_EventScript_CleanupRoute114South:: @ 8273E36
+AbnormalWeather_EventScript_CleanupRoute114South:: @ 8273E36
 	setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1
 	setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1
 	return
-UnusualWeather_EventScript_CleanupRoute115West:: @ 8273E49
+AbnormalWeather_EventScript_CleanupRoute115West:: @ 8273E49
 	setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1
 	setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1
 	return
-UnusualWeather_EventScript_CleanupRoute115East:: @ 8273E5C
+AbnormalWeather_EventScript_CleanupRoute115East:: @ 8273E5C
 	setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1
 	setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1
 	return
-UnusualWeather_EventScript_CleanupRoute116North:: @ 8273E6F
+AbnormalWeather_EventScript_CleanupRoute116North:: @ 8273E6F
 	setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1
 	setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1
 	return
-UnusualWeather_EventScript_CleanupRoute116South:: @ 8273E82
+AbnormalWeather_EventScript_CleanupRoute116South:: @ 8273E82
 	setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1
 	setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1
 	return
-UnusualWeather_EventScript_CleanupRoute118East:: @ 8273E95
+AbnormalWeather_EventScript_CleanupRoute118East:: @ 8273E95
 	setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1
 	setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1
 	return
-UnusualWeather_EventScript_CleanupRoute118West:: @ 8273EA8
+AbnormalWeather_EventScript_CleanupRoute118West:: @ 8273EA8
 	setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1
 	setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1
 	return
-UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB
+AbnormalWeather_EventScript_CleanupRoute105North:: @ 8273EBB
 	setmetatile 10, 28, METATILE_General_CalmWater, 0
 	setmetatile 11, 28, METATILE_General_CalmWater, 0
 	setmetatile 9, 29, METATILE_General_CalmWater, 0
@@ -276,7 +276,7 @@ UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB
 	setmetatile 11, 31, METATILE_General_CalmWater, 0
 	return
-UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28
+AbnormalWeather_EventScript_CleanupRoute105South:: @ 8273F28
 	setmetatile 20, 53, METATILE_General_CalmWater, 0
 	setmetatile 21, 53, METATILE_General_CalmWater, 0
 	setmetatile 19, 54, METATILE_General_CalmWater, 0
@@ -291,7 +291,7 @@ UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28
 	setmetatile 21, 56, METATILE_General_CalmWater, 0
 	return
-UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95
+AbnormalWeather_EventScript_CleanupRoute125West:: @ 8273F95
 	setmetatile 8, 16, METATILE_General_CalmWater, 0
 	setmetatile 9, 16, METATILE_General_CalmWater, 0
 	setmetatile 7, 17, METATILE_General_CalmWater, 0
@@ -306,7 +306,7 @@ UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95
 	setmetatile 9, 19, METATILE_General_CalmWater, 0
 	return
-UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002
+AbnormalWeather_EventScript_CleanupRoute125East:: @ 8274002
 	setmetatile 53, 18, METATILE_General_CalmWater, 0
 	setmetatile 54, 18, METATILE_General_CalmWater, 0
 	setmetatile 52, 19, METATILE_General_CalmWater, 0
@@ -321,7 +321,7 @@ UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002
 	setmetatile 54, 21, METATILE_General_CalmWater, 0
 	return
-UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F
+AbnormalWeather_EventScript_CleanupRoute127North:: @ 827406F
 	setmetatile 57, 9, METATILE_General_CalmWater, 0
 	setmetatile 58, 9, METATILE_General_CalmWater, 0
 	setmetatile 56, 10, METATILE_General_CalmWater, 0
@@ -336,7 +336,7 @@ UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F
 	setmetatile 58, 12, METATILE_General_CalmWater, 0
 	return
-UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC
+AbnormalWeather_EventScript_CleanupRoute127South:: @ 82740DC
 	setmetatile 61, 30, METATILE_General_CalmWater, 0
 	setmetatile 62, 30, METATILE_General_CalmWater, 0
 	setmetatile 60, 31, METATILE_General_CalmWater, 0
@@ -351,7 +351,7 @@ UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC
 	setmetatile 62, 33, METATILE_General_CalmWater, 0
 	return
-UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149
+AbnormalWeather_EventScript_CleanupRoute129West:: @ 8274149
 	setmetatile 16, 14, METATILE_General_CalmWater, 0
 	setmetatile 17, 14, METATILE_General_CalmWater, 0
 	setmetatile 15, 15, METATILE_General_CalmWater, 0
@@ -366,7 +366,7 @@ UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149
 	setmetatile 17, 17, METATILE_General_CalmWater, 0
 	return
-UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6
+AbnormalWeather_EventScript_CleanupRoute129East:: @ 82741B6
 	setmetatile 42, 19, METATILE_General_CalmWater, 0
 	setmetatile 43, 19, METATILE_General_CalmWater, 0
 	setmetatile 41, 20, METATILE_General_CalmWater, 0
@@ -381,46 +381,46 @@ UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6
 	setmetatile 43, 22, METATILE_General_CalmWater, 0
 	return
-UnusualWeather_Underwater_SetupEscapeWarp:: @ 8274223
+AbnormalWeather_Underwater_SetupEscapeWarp:: @ 8274223
-	switch VAR_UNUSUAL_WEATHER_LOCATION
+	switch VAR_ABNORMAL_WEATHER_LOCATION
-	case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105North
+	case ABNORMAL_WEATHER_ROUTE_105_NORTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute105North
-	case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105South
+	case ABNORMAL_WEATHER_ROUTE_105_SOUTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute105South
-	case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute125West
+	case ABNORMAL_WEATHER_ROUTE_125_WEST, AbnormalWeather_Underwater_SetupEscapeWarpRoute125West
-	case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute125East
+	case ABNORMAL_WEATHER_ROUTE_125_EAST, AbnormalWeather_Underwater_SetupEscapeWarpRoute125East
-	case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127North
+	case ABNORMAL_WEATHER_ROUTE_127_NORTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute127North
-	case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127South
+	case ABNORMAL_WEATHER_ROUTE_127_SOUTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute127South
-	case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute129West
+	case ABNORMAL_WEATHER_ROUTE_129_WEST, AbnormalWeather_Underwater_SetupEscapeWarpRoute129West
-	case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute129East
+	case ABNORMAL_WEATHER_ROUTE_129_EAST, AbnormalWeather_Underwater_SetupEscapeWarpRoute129East
 	return
-UnusualWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281
+AbnormalWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281
 	setescapewarp MAP_ROUTE105, 255, 11, 29
 	return
-UnusualWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A
+AbnormalWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A
 	setescapewarp MAP_ROUTE105, 255, 21, 54
 	return
-UnusualWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293
+AbnormalWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293
 	setescapewarp MAP_ROUTE125, 255, 9, 17
 	return
-UnusualWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C
+AbnormalWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C
 	setescapewarp MAP_ROUTE125, 255, 54, 19
 	return
-UnusualWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5
+AbnormalWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5
 	setescapewarp MAP_ROUTE127, 255, 58, 10
 	return
-UnusualWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE
+AbnormalWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE
 	setescapewarp MAP_ROUTE127, 255, 62, 31
 	return
-UnusualWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7
+AbnormalWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7
 	setescapewarp MAP_ROUTE129, 255, 17, 15
 	return
-UnusualWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0
+AbnormalWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0
 	setescapewarp MAP_ROUTE129, 255, 43, 20
 	return
@@ -499,8 +499,8 @@ gSpecials:: @ 81DBA64
 	def_special ShouldShowBoxWasFullMessage
 	def_special SetMatchCallRegisteredFlag
 	def_special sub_8175280
-	def_special CreateUnusualWeatherEvent
+	def_special CreateAbnormalWeatherEvent
-	def_special GetUnusualWeatherMapNameAndType
+	def_special GetAbnormalWeatherMapNameAndType
 	def_special GetMartEmployeeObjectEventId
 	def_special sub_80A08CC
 	def_special Unused_SetWeatherSunny
@@ -1,7 +1,7 @@
-gText_UnusualWeatherEnded_Rain:: @ 8273656
+gText_AbnormalWeatherEnded_Rain:: @ 8273656
 	.string "The massive downpour appears to\n"
 	.string "have stopped…$"
-gText_UnusualWeatherEnded_Sun:: @ 8273684
+gText_AbnormalWeatherEnded_Sun:: @ 8273684
 	.string "The intense sunshine appears to\n"
 	.string "have subsided…$"
@@ -264,23 +264,26 @@ static const s32 sUnknown_082EC6F4[3][4][2] =
 static const struct OamDimensions sOamDimensions[3][4] =
 {
-    {   // square
+    [ST_OAM_SQUARE] = 
-        {  8,  8 },
+    {
-        { 16, 16 },
+        [SPRITE_SIZE(8x8)]   = {  8,  8 },
-        { 32, 32 },
+        [SPRITE_SIZE(16x16)] = { 16, 16 },
-        { 64, 64 },
+        [SPRITE_SIZE(32x32)] = { 32, 32 },
        [SPRITE_SIZE(64x64)] = { 64, 64 },
    },
-    {   // horizontal rectangle
+    [ST_OAM_H_RECTANGLE] =
-        { 16,  8 },
+    {
-        { 32,  8 },
+        [SPRITE_SIZE(16x8)]  = { 16,  8 },
-        { 32, 16 },
+        [SPRITE_SIZE(32x8)]  = { 32,  8 },
-        { 64, 32 },
+        [SPRITE_SIZE(32x16)] = { 32, 16 },
        [SPRITE_SIZE(64x32)] = { 64, 32 },
    },
-    {   // vertical rectangle
+    [ST_OAM_V_RECTANGLE] = 
-        {  8, 16 },
+    {
-        {  8, 32 },
+        [SPRITE_SIZE(8x16)]  = {  8, 16 },
-        { 16, 32 },
+        [SPRITE_SIZE(8x32)]  = {  8, 32 },
-        { 32, 64 },
+        [SPRITE_SIZE(16x32)] = { 16, 32 },
        [SPRITE_SIZE(32x64)] = { 32, 64 },
    },
 };
@@ -406,10 +409,10 @@ void SortSprites(void)
            sprite2Y = sprite2Y - 256;
        if (sprite1->oam.affineMode == ST_OAM_AFFINE_DOUBLE
-         && sprite1->oam.size == 3)
+         && sprite1->oam.size == ST_OAM_SIZE_3)
        {
            u32 shape = sprite1->oam.shape;
-            if (shape == ST_OAM_SQUARE || shape == 2)
+            if (shape == ST_OAM_SQUARE || shape == ST_OAM_V_RECTANGLE)
            {
                if (sprite1Y > 128)
                    sprite1Y = sprite1Y - 256;
@@ -417,7 +420,7 @@ void SortSprites(void)
        }
        if (sprite2->oam.affineMode == ST_OAM_AFFINE_DOUBLE
-         && sprite2->oam.size == 3)
+         && sprite2->oam.size == ST_OAM_SIZE_3)
        {
            u32 shape = sprite2->oam.shape;
            if (shape == ST_OAM_SQUARE || shape == ST_OAM_V_RECTANGLE)
@@ -455,7 +458,7 @@ void SortSprites(void)
                sprite2Y = sprite2Y - 256;
            if (sprite1->oam.affineMode == ST_OAM_AFFINE_DOUBLE
-             && sprite1->oam.size == 3)
+             && sprite1->oam.size == ST_OAM_SIZE_3)
            {
                u32 shape = sprite1->oam.shape;
                if (shape == ST_OAM_SQUARE || shape == ST_OAM_V_RECTANGLE)
@@ -466,7 +469,7 @@ void SortSprites(void)
            }
            if (sprite2->oam.affineMode == ST_OAM_AFFINE_DOUBLE
-             && sprite2->oam.size == 3)
+             && sprite2->oam.size == ST_OAM_SIZE_3)
            {
                u32 shape = sprite2->oam.shape;
                if (shape == ST_OAM_SQUARE || shape == ST_OAM_V_RECTANGLE)
@@ -69,9 +69,9 @@
 #define VAR_DEOXYS_ROCK_STEP_COUNT           0x4034
 #define VAR_DEOXYS_ROCK_LEVEL                0x4035
 #define VAR_PC_BOX_TO_SEND_MON               0x4036
-#define VAR_UNUSUAL_WEATHER_LOCATION         0x4037
+#define VAR_ABNORMAL_WEATHER_LOCATION        0x4037
-#define VAR_UNUSUAL_WEATHER_STEP_COUNTER     0x4038
+#define VAR_ABNORMAL_WEATHER_STEP_COUNTER    0x4038
-#define VAR_SHOULD_END_UNUSUAL_WEATHER       0x4039
+#define VAR_SHOULD_END_ABNORMAL_WEATHER      0x4039
 #define VAR_FARAWAY_ISLAND_STEP_COUNTER      0x403A
 #define VAR_REGICE_STEPS_1                   0x403B
 #define VAR_REGICE_STEPS_2                   0x403C
@@ -2,65 +2,65 @@
 #define GUARD_CONSTANTS_WEATHER_H
 #define WEATHER_NONE                    0
-#define WEATHER_CLOUDS         1
+#define WEATHER_SUNNY_CLOUDS            1
 #define WEATHER_SUNNY                   2
-#define WEATHER_RAIN_LIGHT     3
+#define WEATHER_RAIN                    3
-#define WEATHER_SNOW           4
+#define WEATHER_SNOW                    4   // Unused
-#define WEATHER_RAIN_MED       5
+#define WEATHER_RAIN_THUNDERSTORM       5
-#define WEATHER_FOG_1          6
+#define WEATHER_FOG_HORIZONTAL          6
-#define WEATHER_ASH            7
+#define WEATHER_VOLCANIC_ASH            7
 #define WEATHER_SANDSTORM               8
-#define WEATHER_FOG_2          9
+#define WEATHER_FOG_DIAGONAL            9   // Unused
-#define WEATHER_FOG_3          10
+#define WEATHER_UNDERWATER              10  // Unused
-#define WEATHER_SHADE          11
+#define WEATHER_SHADE                   11  // Original name was closer to WEATHER_CLOUDY/OVERCAST
 #define WEATHER_DROUGHT                 12
-#define WEATHER_RAIN_HEAVY     13
+#define WEATHER_DOWNPOUR                13
-#define WEATHER_BUBBLES        14
+#define WEATHER_UNDERWATER_BUBBLES      14
-#define WEATHER_ALTERNATING    15
+#define WEATHER_ABNORMAL                15  // The alternating weather during Groudon/Kyogre conflict 
 #define WEATHER_ROUTE119_CYCLE          20
 #define WEATHER_ROUTE123_CYCLE          21
 // These are used in maps' coord_weather_event entries.
 // They are not a one-to-one mapping with the engine's
 // internal weather constants above.
-#define COORD_EVENT_WEATHER_CLOUDS         1
+#define COORD_EVENT_WEATHER_SUNNY_CLOUDS        1
 #define COORD_EVENT_WEATHER_SUNNY               2
-#define COORD_EVENT_WEATHER_RAIN_LIGHT     3
+#define COORD_EVENT_WEATHER_RAIN                3
 #define COORD_EVENT_WEATHER_SNOW                4
-#define COORD_EVENT_WEATHER_RAIN_MED       5
+#define COORD_EVENT_WEATHER_RAIN_THUNDERSTORM   5
-#define COORD_EVENT_WEATHER_FOG_1          6
+#define COORD_EVENT_WEATHER_FOG_HORIZONTAL      6
-#define COORD_EVENT_WEATHER_FOG_2          7
+#define COORD_EVENT_WEATHER_FOG_DIAGONAL        7
-#define COORD_EVENT_WEATHER_ASH            8
+#define COORD_EVENT_WEATHER_VOLCANIC_ASH        8
 #define COORD_EVENT_WEATHER_SANDSTORM           9
 #define COORD_EVENT_WEATHER_SHADE               10
 #define COORD_EVENT_WEATHER_DROUGHT             11
 #define COORD_EVENT_WEATHER_ROUTE119_CYCLE      20
 #define COORD_EVENT_WEATHER_ROUTE123_CYCLE      21
-// These are the "unusual weather events" that are used
+// These are the "abnormal weather events" that are used
 // to find Kyogre and Groudon.
-#define UNUSUAL_WEATHER_COUNT_PER_LEGENDARY 8
+#define ABNORMAL_WEATHER_COUNT_PER_LEGENDARY      8
-#define UNUSUAL_WEATHER_GROUDON_LOCATIONS_START 1
+#define ABNORMAL_WEATHER_GROUDON_LOCATIONS_START  1
-#define UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START 1 + UNUSUAL_WEATHER_COUNT_PER_LEGENDARY
+#define ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START   1 + ABNORMAL_WEATHER_COUNT_PER_LEGENDARY
-#define UNUSUAL_WEATHER_NONE 0
+#define ABNORMAL_WEATHER_NONE 0
 // Groudon locations
-#define UNUSUAL_WEATHER_ROUTE_114_NORTH 1
+#define ABNORMAL_WEATHER_ROUTE_114_NORTH    1
-#define UNUSUAL_WEATHER_ROUTE_114_SOUTH 2
+#define ABNORMAL_WEATHER_ROUTE_114_SOUTH    2
-#define UNUSUAL_WEATHER_ROUTE_115_WEST 3
+#define ABNORMAL_WEATHER_ROUTE_115_WEST     3
-#define UNUSUAL_WEATHER_ROUTE_115_EAST 4
+#define ABNORMAL_WEATHER_ROUTE_115_EAST     4
-#define UNUSUAL_WEATHER_ROUTE_116_NORTH 5
+#define ABNORMAL_WEATHER_ROUTE_116_NORTH    5
-#define UNUSUAL_WEATHER_ROUTE_116_SOUTH 6
+#define ABNORMAL_WEATHER_ROUTE_116_SOUTH    6
-#define UNUSUAL_WEATHER_ROUTE_118_EAST 7
+#define ABNORMAL_WEATHER_ROUTE_118_EAST     7
-#define UNUSUAL_WEATHER_ROUTE_118_WEST 8
+#define ABNORMAL_WEATHER_ROUTE_118_WEST     8
 // Kyogre locations
-#define UNUSUAL_WEATHER_ROUTE_105_NORTH 9
+#define ABNORMAL_WEATHER_ROUTE_105_NORTH    9
-#define UNUSUAL_WEATHER_ROUTE_105_SOUTH 10
+#define ABNORMAL_WEATHER_ROUTE_105_SOUTH    10
-#define UNUSUAL_WEATHER_ROUTE_125_WEST 11
+#define ABNORMAL_WEATHER_ROUTE_125_WEST     11
-#define UNUSUAL_WEATHER_ROUTE_125_EAST 12
+#define ABNORMAL_WEATHER_ROUTE_125_EAST     12
-#define UNUSUAL_WEATHER_ROUTE_127_NORTH 13
+#define ABNORMAL_WEATHER_ROUTE_127_NORTH    13
-#define UNUSUAL_WEATHER_ROUTE_127_SOUTH 14
+#define ABNORMAL_WEATHER_ROUTE_127_SOUTH    14
-#define UNUSUAL_WEATHER_ROUTE_129_WEST 15
+#define ABNORMAL_WEATHER_ROUTE_129_WEST     15
-#define UNUSUAL_WEATHER_ROUTE_129_EAST 16
+#define ABNORMAL_WEATHER_ROUTE_129_EAST     16
 #endif // GUARD_CONSTANTS_WEATHER_H
@@ -546,7 +546,7 @@ extern const u8 EventScript_FallDownHole[];
 extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8[];
 extern const u8 EventScript_FieldPoison[];
 extern const u8 EventScript_EggHatch[];
-extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[];
+extern const u8 AbnormalWeather_EventScript_EndEventAndCleanup_1[];
 extern const u8 IslandCave_EventScript_OpenRegiEntrance[];
 extern const u8 MauvilleCity_EventScript_RegisterWallyCall[];
 extern const u8 Route119_EventScript_ScottWonAtFortreeGymCall[];
@@ -10,7 +10,7 @@ u16 GetPCBoxToSendMon(void);
 bool8 InMultiBattleRoom(void);
 void UpdateTrainerFansAfterLinkBattle(void);
 void IncrementBirthIslandRockStepCount(void);
-bool8 UnusualWeatherHasExpired(void);
+bool8 AbnormalWeatherHasExpired(void);
 bool8 ShouldDoBrailleRegicePuzzle(void);
 bool32 ShouldDoWallyCall(void);
 bool32 ShouldDoScottFortreeCall(void);
@@ -5,9 +5,9 @@
 #define MAX_RAIN_SPRITES             24
 #define NUM_CLOUD_SPRITES            3
-#define NUM_FOG1_SPRITES      20
+#define NUM_FOG_HORIZONTAL_SPRITES   20
 #define NUM_ASH_SPRITES              20
-#define NUM_FOG2_SPRITES      20
+#define NUM_FOG_DIAGONAL_SPRITES     20
 #define NUM_SANDSTORM_SPRITES        20
 #define NUM_SWIRL_SANDSTORM_SPRITES  5
@@ -42,9 +42,9 @@ struct Weather
        struct
        {
            u8 filler0[0xA0];
-            struct Sprite *fog1Sprites[NUM_FOG1_SPRITES];
+            struct Sprite *fogHSprites[NUM_FOG_HORIZONTAL_SPRITES];
            struct Sprite *ashSprites[NUM_ASH_SPRITES];
-            struct Sprite *fog2Sprites[NUM_FOG2_SPRITES];
+            struct Sprite *fogDSprites[NUM_FOG_DIAGONAL_SPRITES];
            struct Sprite *sandstormSprites1[NUM_SANDSTORM_SPRITES];
            struct Sprite *sandstormSprites2[NUM_SWIRL_SANDSTORM_SPRITES];
        } s2;
@@ -75,7 +75,7 @@ struct Weather
    u8 targetRainSpriteCount;
    u8 rainSpriteCount;
    u8 rainSpriteVisibleDelay;
-    u8 isHeavyRain;
+    u8 isDownpour;
    u8 rainStrength;
    /*0x6DE*/ u8 cloudSpritesCreated;
    u8 filler_6DF[1];
@@ -89,12 +89,12 @@ struct Weather
    u8 unknown_6EB;
    u8 unknown_6EC;
    u8 thunderTriggered;
-    u16 fog1ScrollPosX;
+    u16 fogHScrollPosX;
-    u16 fog1ScrollCounter;
+    u16 fogHScrollCounter;
-    u16 fog1ScrollOffset;
+    u16 fogHScrollOffset;
    u8 lightenedFogSpritePals[6];
    u8 lightenedFogSpritePalsCount;
-    u8 fog1SpritesCreated;
+    u8 fogHSpritesCreated;
    u16 ashBaseSpritesX;
    u16 unknown_6FE;
    u8 ashSpritesCreated;
@@ -108,13 +108,13 @@ struct Weather
    u16 sandstormWaveCounter;
    u8 sandstormSpritesCreated;
    u8 sandstormSwirlSpritesCreated;
-    u16 fog2BaseSpritesX;
+    u16 fogDBaseSpritesX;
-    u16 fog2PosY;
+    u16 fogDPosY;
-    u16 fog2ScrollXCounter;
+    u16 fogDScrollXCounter;
-    u16 fog2ScrollYCounter;
+    u16 fogDScrollYCounter;
-    u16 fog2XOffset;
+    u16 fogDXOffset;
-    u16 fog2YOffset;
+    u16 fogDYOffset;
-    u8 fog2SpritesCreated;
+    u8 fogDSpritesCreated;
    u8 filler_725[1];
    u16 bubblesDelayCounter;
    u16 bubblesDelayIndex;
@@ -145,7 +145,7 @@ extern struct Weather *const gWeatherPtr;
 extern const u16 gUnknown_083970E8[];
 // field_weather_effect.c
-extern const u8 gWeatherFog1Tiles[];
+extern const u8 gWeatherFogHorizontalTiles[];
 void StartWeather(void);
 void SetNextWeather(u8 weather);
@@ -186,22 +186,22 @@ void Sunny_InitVars(void);
 void Sunny_Main(void);
 void Sunny_InitAll(void);
 bool8 Sunny_Finish(void);
-void LightRain_InitVars(void);
+void Rain_InitVars(void);
-void LightRain_Main(void);
+void Rain_Main(void);
-void LightRain_InitAll(void);
+void Rain_InitAll(void);
-bool8 LightRain_Finish(void);
+bool8 Rain_Finish(void);
 void Snow_InitVars(void);
 void Snow_Main(void);
 void Snow_InitAll(void);
 bool8 Snow_Finish(void);
-void MedRain_InitVars(void);
+void Thunderstorm_InitVars(void);
-void Rain_Main(void);
+void Thunderstorm_Main(void);
-void MedRain_InitAll(void);
+void Thunderstorm_InitAll(void);
-bool8 Rain_Finish(void);
+bool8 Thunderstorm_Finish(void);
-void Fog1_InitVars(void);
+void FogHorizontal_InitVars(void);
-void Fog1_Main(void);
+void FogHorizontal_Main(void);
-void Fog1_InitAll(void);
+void FogHorizontal_InitAll(void);
-bool8 Fog1_Finish(void);
+bool8 FogHorizontal_Finish(void);
 void Ash_InitVars(void);
 void Ash_Main(void);
 void Ash_InitAll(void);
@@ -210,14 +210,10 @@ void Sandstorm_InitVars(void);
 void Sandstorm_Main(void);
 void Sandstorm_InitAll(void);
 bool8 Sandstorm_Finish(void);
-void Fog2_InitVars(void);
+void FogDiagonal_InitVars(void);
-void Fog2_Main(void);
+void FogDiagonal_Main(void);
-void Fog2_InitAll(void);
+void FogDiagonal_InitAll(void);
-bool8 Fog2_Finish(void);
+bool8 FogDiagonal_Finish(void);
 void Fog1_InitVars(void);
 void Fog1_Main(void);
 void Fog1_InitAll(void);
 bool8 Fog1_Finish(void);
 void Shade_InitVars(void);
 void Shade_Main(void);
 void Shade_InitAll(void);
@@ -226,10 +222,8 @@ void Drought_InitVars(void);
 void Drought_Main(void);
 void Drought_InitAll(void);
 bool8 Drought_Finish(void);
-void HeavyRain_InitVars(void);
+void Downpour_InitVars(void);
-void Rain_Main(void);
+void Downpour_InitAll(void);
 void HeavyRain_InitAll(void);
 bool8 Rain_Finish(void);
 void Bubbles_InitVars(void);
 void Bubbles_Main(void);
 void Bubbles_InitAll(void);
@@ -4947,8 +4947,8 @@ void AnimMoon(struct Sprite* sprite)
        sprite->pos1.y = gBattleAnimArgs[1];
    }
-    sprite->oam.shape = 0;
+    sprite->oam.shape = SPRITE_SHAPE(64x64);
-    sprite->oam.size = 3;
+    sprite->oam.size = SPRITE_SIZE(64x64);
    sprite->data[0] = 0;
    sprite->callback = AnimMoonStep;
 }
@@ -2124,7 +2124,7 @@ static void CreateMinimizeSprite(struct Task* task, u8 taskId)
            gSprites[spriteId].data[2] = 6;
            gSprites[spriteId].callback = ClonedMinizeSprite_Step;
            SetSpriteRotScale(spriteId, task->data[4], task->data[4], 0);
-            gSprites[spriteId].oam.affineMode = 1;
+            gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
            CalcCenterToCornerVec(&gSprites[spriteId], gSprites[spriteId].oam.shape, gSprites[spriteId].oam.size, gSprites[spriteId].oam.affineMode);
        }
    }
@@ -4709,7 +4709,7 @@ void AnimTask_MonToSubstitute(u8 taskId)
    if (gTasks[taskId].data[0] == 0)
    {
-        PrepareBattlerSpriteForRotScale(spriteId, FALSE);
+        PrepareBattlerSpriteForRotScale(spriteId, ST_OAM_OBJ_NORMAL);
        gTasks[taskId].data[1] = 0x100;
        gTasks[taskId].data[2] = 0x100;
        gTasks[taskId].data[0]++;
@@ -1253,7 +1253,7 @@ void ResetSpriteRotScale(u8 spriteId)
 {
    SetSpriteRotScale(spriteId, 0x100, 0x100, 0);
    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
-    gSprites[spriteId].oam.objMode = 0;
+    gSprites[spriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
    gSprites[spriteId].affineAnimPaused = FALSE;
    CalcCenterToCornerVec(&gSprites[spriteId], gSprites[spriteId].oam.shape, gSprites[spriteId].oam.size, gSprites[spriteId].oam.affineMode);
 }
@@ -2267,7 +2267,7 @@ u8 sub_80A89C8(int battlerId, u8 spriteId, int species)
    gSprites[newSpriteId] = gSprites[spriteId];
    gSprites[newSpriteId].usingSheet = TRUE;
    gSprites[newSpriteId].oam.priority = 0;
-    gSprites[newSpriteId].oam.objMode = 2;
+    gSprites[newSpriteId].oam.objMode = ST_OAM_OBJ_WINDOW;
    gSprites[newSpriteId].oam.tileNum = gSprites[spriteId].oam.tileNum;
    gSprites[newSpriteId].callback = SpriteCallbackDummy;
    return newSpriteId;
@@ -206,10 +206,38 @@ const struct SpriteTemplate gUnknown_0853EF18 =
 static const struct Subsprite gUnknown_0853EF30[] =
 {
-    {.x = -16, .y = -16, .shape = ST_OAM_SQUARE,      .size = 3, .tileOffset =   0, .priority = 2},
+    {
-    {.x = -16, .y =  48, .shape = ST_OAM_H_RECTANGLE, .size = 3, .tileOffset =  64, .priority = 2},
+        .x = -16, 
-    {.x =  48, .y = -16, .shape = ST_OAM_V_RECTANGLE, .size = 3, .tileOffset =  96, .priority = 2},
+        .y = -16, 
-    {.x =  48, .y =  48, .shape = ST_OAM_SQUARE,      .size = 2, .tileOffset = 128, .priority = 2},
+        .shape = SPRITE_SHAPE(64x64),      
        .size = SPRITE_SIZE(64x64), 
        .tileOffset = 0, 
        .priority = 2
    },
    {
        .x = -16, 
        .y =  48, 
        .shape = SPRITE_SHAPE(64x32), 
        .size = SPRITE_SIZE(64x32), 
        .tileOffset = 64, 
        .priority = 2
    },
    {
        .x =  48, 
        .y = -16, 
        .shape = SPRITE_SHAPE(32x64), 
        .size = SPRITE_SIZE(32x64),
        .tileOffset = 96, 
        .priority = 2
    },
    {
        .x =  48, 
        .y =  48, 
        .shape = SPRITE_SHAPE(32x32),   
        .size = SPRITE_SIZE(32x32), 
        .tileOffset = 128, 
        .priority = 2
    },
 };
 static const struct SubspriteTable gUnknown_0853EF40[] =
@@ -404,10 +404,10 @@ static const s8 sMindRatings[] =
 static const struct OamData sJudgementIconOamData =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(16x16),
    .x = 0,
    .matrixNum = 0,
@@ -39,10 +39,10 @@ static const u16 sUnrefArray[] = {0x0300, 0x0000}; //OamData?
 static const struct OamData sVsLetter_V_OamData =
 {
    .y = 0,
-    .affineMode = 3,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(64x64),
    .x = 0,
    .matrixNum = 0,
@@ -56,10 +56,10 @@ static const struct OamData sVsLetter_V_OamData =
 static const struct OamData sVsLetter_S_OamData =
 {
    .y = 0,
-    .affineMode = 3,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(64x64),
    .x = 0,
    .matrixNum = 0,
@@ -1429,7 +1429,7 @@ static void LinkOpponentDoMoveAnimation(void)
    case 1:
        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
        {
-            sub_805EB9C(0);
+            sub_805EB9C(ST_OAM_AFFINE_OFF);
            DoMoveAnim(move);
            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
        }
@@ -1438,7 +1438,7 @@ static void LinkOpponentDoMoveAnimation(void)
        gAnimScriptCallback();
        if (!gAnimScriptActive)
        {
-            sub_805EB9C(1);
+            sub_805EB9C(ST_OAM_AFFINE_NORMAL);
            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
            {
                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
@@ -1253,7 +1253,7 @@ static void LinkPartnerDoMoveAnimation(void)
    case 1:
        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
        {
-            sub_805EB9C(0);
+            sub_805EB9C(ST_OAM_AFFINE_OFF);
            DoMoveAnim(move);
            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
        }
@@ -1262,7 +1262,7 @@ static void LinkPartnerDoMoveAnimation(void)
        gAnimScriptCallback();
        if (!gAnimScriptActive)
        {
-            sub_805EB9C(1);
+            sub_805EB9C(ST_OAM_AFFINE_NORMAL);
            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
            {
                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
@@ -1465,7 +1465,7 @@ static void OpponentDoMoveAnimation(void)
    case 1:
        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
        {
-            sub_805EB9C(0);
+            sub_805EB9C(ST_OAM_AFFINE_OFF);
            DoMoveAnim(move);
            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
        }
@@ -1474,7 +1474,7 @@ static void OpponentDoMoveAnimation(void)
        gAnimScriptCallback();
        if (!gAnimScriptActive)
        {
-            sub_805EB9C(1);
+            sub_805EB9C(ST_OAM_AFFINE_NORMAL);
            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
            {
                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
@@ -2313,7 +2313,7 @@ static void PlayerHandleDrawTrainerPic(void)
        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y = 48;
        gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
        gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
-        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = ST_OAM_AFFINE_OFF;
        gSprites[gBattlerSpriteIds[gActiveBattler]].hFlip = 1;
    }
    // Use the back pic in any other scenario.
@@ -2485,7 +2485,7 @@ static void PlayerDoMoveAnimation(void)
    case 1:
        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
        {
-            sub_805EB9C(0);
+            sub_805EB9C(ST_OAM_AFFINE_OFF);
            DoMoveAnim(move);
            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
        }
@@ -2494,7 +2494,7 @@ static void PlayerDoMoveAnimation(void)
        gAnimScriptCallback();
        if (!gAnimScriptActive)
        {
-            sub_805EB9C(1);
+            sub_805EB9C(ST_OAM_AFFINE_NORMAL);
            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
            {
                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
@@ -1334,7 +1334,7 @@ static void PlayerPartnerHandleDrawTrainerPic(void)
        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y = 48;
        gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
        gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
-        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = ST_OAM_AFFINE_OFF;
        gSprites[gBattlerSpriteIds[gActiveBattler]].hFlip = 1;
    }
@@ -1444,7 +1444,7 @@ static void PlayerPartnerDoMoveAnimation(void)
    case 1:
        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
        {
-            sub_805EB9C(0);
+            sub_805EB9C(ST_OAM_AFFINE_OFF);
            DoMoveAnim(move);
            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
        }
@@ -1453,7 +1453,7 @@ static void PlayerPartnerDoMoveAnimation(void)
        gAnimScriptCallback();
        if (!gAnimScriptActive)
        {
-            sub_805EB9C(1);
+            sub_805EB9C(ST_OAM_AFFINE_NORMAL);
            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
            {
                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
@@ -1355,7 +1355,7 @@ static void RecordedOpponentDoMoveAnimation(void)
    case 1:
        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
        {
-            sub_805EB9C(0);
+            sub_805EB9C(ST_OAM_AFFINE_OFF);
            DoMoveAnim(move);
            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
        }
@@ -1364,7 +1364,7 @@ static void RecordedOpponentDoMoveAnimation(void)
        gAnimScriptCallback();
        if (!gAnimScriptActive)
        {
-            sub_805EB9C(1);
+            sub_805EB9C(ST_OAM_AFFINE_NORMAL);
            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
            {
                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
@@ -1238,7 +1238,7 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y = 48;
        gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
        gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
-        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = ST_OAM_AFFINE_OFF;
        gSprites[gBattlerSpriteIds[gActiveBattler]].hFlip = 1;
    }
    else
@@ -1359,7 +1359,7 @@ static void RecordedPlayerDoMoveAnimation(void)
    case 1:
        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
        {
-            sub_805EB9C(0);
+            sub_805EB9C(ST_OAM_AFFINE_OFF);
            DoMoveAnim(move);
            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
        }
@@ -1368,7 +1368,7 @@ static void RecordedPlayerDoMoveAnimation(void)
        gAnimScriptCallback();
        if (!gAnimScriptActive)
        {
-            sub_805EB9C(1);
+            sub_805EB9C(ST_OAM_AFFINE_NORMAL);
            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
            {
                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
@@ -1134,7 +1134,7 @@ static void WallyDoMoveAnimation(void)
    case 1:
        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
        {
-            sub_805EB9C(0);
+            sub_805EB9C(ST_OAM_AFFINE_OFF);
            DoMoveAnim(move);
            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
        }
@@ -1143,7 +1143,7 @@ static void WallyDoMoveAnimation(void)
        gAnimScriptCallback();
        if (!gAnimScriptActive)
        {
-            sub_805EB9C(1);
+            sub_805EB9C(ST_OAM_AFFINE_NORMAL);
            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
            {
                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
@@ -860,10 +860,10 @@ static const struct CompressedSpritePalette gUnknown_0860CF60[] =
 static const struct OamData gUnknown_0860CF70 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(16x16),
    .x = 0,
    .matrixNum = 0,
@@ -877,10 +877,10 @@ static const struct OamData gUnknown_0860CF70 =
 static const struct OamData gUnknown_0860CF78 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(32x16),
    .x = 0,
    .matrixNum = 0,
@@ -894,10 +894,10 @@ static const struct OamData gUnknown_0860CF78 =
 static const struct OamData gUnknown_0860CF80 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(16x8),
    .x = 0,
    .matrixNum = 0,
@@ -911,10 +911,10 @@ static const struct OamData gUnknown_0860CF80 =
 static const struct OamData gUnknown_0860CF88 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(8x16),
    .x = 0,
    .matrixNum = 0,
@@ -381,10 +381,10 @@ static const u8 gUnknown_08610479[] = {0x00, 0x04, 0x00};
 static const struct OamData gUnknown_0861047C =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(32x32),
    .x = 0,
    .matrixNum = 0,
@@ -398,10 +398,10 @@ static const struct OamData gUnknown_0861047C =
 static const struct OamData gUnknown_08610484 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(16x16),
    .x = 0,
    .matrixNum = 0,
@@ -415,10 +415,10 @@ static const struct OamData gUnknown_08610484 =
 static const struct OamData gUnknown_0861048C =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(32x16),
    .x = 0,
    .matrixNum = 0,
@@ -432,10 +432,10 @@ static const struct OamData gUnknown_0861048C =
 static const struct OamData gUnknown_08610494 =
 {
    .y = 0,
-    .affineMode = 3,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
-    .objMode = 1,
+    .objMode = ST_OAM_OBJ_BLEND,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(64x64),
    .x = 0,
    .matrixNum = 0,
@@ -632,14 +632,14 @@ static const struct SpritePalette gUnknown_086106B0[] =
 static const struct OamData gUnknown_086106D8 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
    .x = 0,
    .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
    .tileNum = 0,
    .priority = 3,
    .paletteNum = 0,
@@ -649,14 +649,14 @@ static const struct OamData gUnknown_086106D8 =
 static const struct OamData gUnknown_086106E0 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
    .x = 0,
    .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
    .tileNum = 0,
    .priority = 3,
    .paletteNum = 0,
@@ -666,14 +666,14 @@ static const struct OamData gUnknown_086106E0 =
 static const struct OamData gUnknown_086106E8 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x16),
    .x = 0,
    .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x16),
    .tileNum = 0,
    .priority = 2,
    .paletteNum = 0,
@@ -683,14 +683,14 @@ static const struct OamData gUnknown_086106E8 =
 static const struct OamData gUnknown_086106F0 =
 {
    .y = 0,
-    .affineMode = 3,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
-    .objMode = 1,
+    .objMode = ST_OAM_OBJ_BLEND,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
    .x = 0,
    .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
    .tileNum = 0,
    .priority = 0,
    .paletteNum = 0,
@@ -202,10 +202,10 @@ static void sub_8074F88(struct TestingBar *barInfo, s32 *arg1, u16 *arg2);
 static const struct OamData sUnknown_0832C138 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(64x32),
    .x = 0,
    .matrixNum = 0,
@@ -274,10 +274,10 @@ static const struct SpriteTemplate sHealthboxSafariSpriteTemplate =
 static const struct OamData sOamData_Healthbar =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(32x8),
    .x = 0,
    .matrixNum = 0,
@@ -330,45 +330,178 @@ static const struct SpriteTemplate sHealthbarSpriteTemplates[MAX_BATTLERS_COUNT]
 static const struct Subsprite sUnknown_0832C220[] =
 {
-    {240,   0,  1,  3,  0,      1},
+    {
-    {48,    0,  0,  2,  32,     1},
+        .x = 240,   
-    {240,   32, 1,  1,  48,     1},
+        .y = 0,  
-    {16,    32, 1,  1,  52,     1},
+        .shape = SPRITE_SHAPE(64x32),  
-    {48,    32, 1,  1,  56,     1}
+        .size = SPRITE_SIZE(64x32),  
        .tileOffset = 0,      
        .priority = 1
    },
    {
        .x = 48,    
        .y = 0,  
        .shape = SPRITE_SHAPE(32x32),  
        .size = SPRITE_SIZE(32x32),  
        .tileOffset = 32,     
        .priority = 1
    },
    {
        .x = 240,   
        .y = 32, 
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 48,     
        .priority = 1
    },
    {
        .x = 16,    
        .y = 32, 
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 52,     
        .priority = 1
    },
    {
        .x = 48,    
        .y = 32, 
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 56,     
        .priority = 1
    }
 };
 static const struct Subsprite sUnknown_0832C234[] =
 {
-    {240,   0,  1,  3,  64,     1},
+    {
-    {48,    0,  0,  2,  96,     1},
+        .x = 240,   
-    {240,   32, 1,  1,  112,    1},
+        .y = 0,  
-    {16,    32, 1,  1,  116,    1},
+        .shape = SPRITE_SHAPE(64x32),  
-    {48,    32, 1,  1,  120,    1}
+        .size = SPRITE_SIZE(64x32),  
        .tileOffset = 64,     
        .priority = 1
    },
    {
        .x = 48,    
        .y = 0,  
        .shape = SPRITE_SHAPE(32x32),  
        .size = SPRITE_SIZE(32x32),  
        .tileOffset = 96,     
        .priority = 1
    },
    {
        .x = 240,   
        .y = 32, 
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 112,    
        .priority = 1
    },
    {
        .x = 16,    
        .y = 32, 
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 116,    
        .priority = 1
    },
    {
        .x = 48,    
        .y = 32, 
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 120,    
        .priority = 1
    }
 };
 static const struct Subsprite sUnknown_0832C248[] =
 {
-    {240,   0,  1,  3,  0,      1},
+    {
-    {48,    0,  0,  2,  32,     1}
+        .x = 240,   
        .y = 0,  
        .shape = SPRITE_SHAPE(64x32),  
        .size = SPRITE_SIZE(64x32),
        .tileOffset = 0,      
        .priority = 1
    },
    {
        .x = 48,    
        .y = 0,  
        .shape = SPRITE_SHAPE(32x32),  
        .size = SPRITE_SIZE(32x32),  
        .tileOffset = 32,     
        .priority = 1
    }
 };
 static const struct Subsprite sUnknown_0832C250[] =
 {
-    {240,   0,  1,  3,  0,      1},
+    {
-    {48,    0,  0,  2,  32,     1}
+        .x = 240,   
        .y = 0,  
        .shape = SPRITE_SHAPE(64x32),  
        .size = SPRITE_SIZE(64x32),
        .tileOffset = 0,      
        .priority = 1
    },
    {
        .x = 48,    
        .y = 0,  
        .shape = SPRITE_SHAPE(32x32),  
        .size = SPRITE_SIZE(32x32),  
        .tileOffset = 32,     
        .priority = 1
    }
 };
 static const struct Subsprite sUnknown_0832C258[] =
 {
-    {240,   0,  1,  1,  0,      1},
+    {
-    {16,    0,  1,  1,  4,      1}
+        .x = 240,   
        .y = 0,  
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 0,      
        .priority = 1
    },
    {
        .x = 16,    
        .y = 0,  
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 4,      
        .priority = 1
    }
 };
 static const struct Subsprite sUnknown_0832C260[] =
 {
-    {240,   0,  1,  1,  0,      1},
+    {
-    {16,    0,  1,  1,  4,      1},
+        .x = 240,   
-    {224,   0,  0,  0,  8,      1}
+        .y = 0,  
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 0,      
        .priority = 1
    },
    {
        .x = 16,    
        .y = 0,  
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 4,      
        .priority = 1
    },
    {
        .x = 224,   
        .y = 0,  
        .shape = SPRITE_SHAPE(8x8),  
        .size = SPRITE_SIZE(8x8),  
        .tileOffset = 8,      
        .priority = 1
    }
 };
 // unused subsprite table
@@ -388,20 +521,90 @@ static const struct SubspriteTable sUnknown_0832C28C[] =
 static const struct Subsprite sStatusSummaryBar_Subsprites_0[] =
 {
-    {160,   0,  1,  1,  0,      1},
+    {
-    {192,   0,  1,  1,  4,      1},
+        .x = 160,   
-    {224,   0,  1,  1,  8,      1},
+        .y = 0,  
-    {0,     0,  1,  1,  12,     1}
+        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 0,      
        .priority = 1
    },
    {
        .x = 192,   
        .y = 0,  
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 4,     
        .priority = 1
    },
    {
        .x = 224,   
        .y = 0,  
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 8,      
        .priority = 1
    },
    {
        .x = 0,     
        .y = 0,  
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 12,     
        .priority = 1
    }
 };
 static const struct Subsprite sUnknown_0832C2AC[] =
 {
-    {160,   0,  1,  1,  0,      1},
+    {
-    {192,   0,  1,  1,  4,      1},
+        .x = 160,   
-    {224,   0,  1,  1,  8,      1},
+        .y = 0,  
-    {0,     0,  1,  1,  8,      1},
+        .shape = SPRITE_SHAPE(32x8),  
-    {32,    0,  1,  1,  8,      1},
+        .size = SPRITE_SIZE(32x8),  
-    {64,    0,  1,  1,  12,     1}
+        .tileOffset = 0,      
        .priority = 1
    },
    {
        .x = 192,   
        .y = 0,  
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 4,      
        .priority = 1
    },
    {
        .x = 224,   
        .y = 0,  
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 8,      
        .priority = 1
    },
    {
        .x = 0,     
        .y = 0,  
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 8,      
        .priority = 1
    },
    {
        .x = 32,    
        .y = 0,  
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 8,      
        .priority = 1
    },
    {
        .x = 64,    
        .y = 0,  
        .shape = SPRITE_SHAPE(32x8),  
        .size = SPRITE_SIZE(32x8),  
        .tileOffset = 12,     
        .priority = 1
    }
 };
 static const struct SubspriteTable sStatusSummaryBar_SubspriteTable[] =
@@ -441,10 +644,10 @@ static const struct SpriteSheet sStatusSummaryBallsSpriteSheet =
 static const struct OamData sUnknown_0832C354 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(64x32),
    .x = 0,
    .matrixNum = 0,
@@ -458,10 +661,10 @@ static const struct OamData sUnknown_0832C354 =
 static const struct OamData sOamData_StatusSummaryBalls =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(8x8),
    .x = 0,
    .matrixNum = 0,
@@ -910,9 +1113,9 @@ u8 CreateBattlerHealthboxSprites(u8 battlerId)
            healthboxLeftSpriteId = CreateSprite(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1);
            healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1);
-            gSprites[healthboxLeftSpriteId].oam.shape = 0;
+            gSprites[healthboxLeftSpriteId].oam.shape = ST_OAM_SQUARE;
-            gSprites[healthboxRightSpriteId].oam.shape = 0;
+            gSprites[healthboxRightSpriteId].oam.shape = ST_OAM_SQUARE;
            gSprites[healthboxRightSpriteId].oam.tileNum += 64;
        }
        else
@@ -962,7 +1165,7 @@ u8 CreateBattlerHealthboxSprites(u8 battlerId)
    healthbarSpriteId = CreateSpriteAtEnd(&sHealthbarSpriteTemplates[gBattlerPositions[battlerId]], 140, 60, 0);
    healthBarSpritePtr = &gSprites[healthbarSpriteId];
    SetSubspriteTables(healthBarSpritePtr, &sUnknown_0832C28C[GetBattlerSide(battlerId)]);
-    healthBarSpritePtr->subspriteMode = 2;
+    healthBarSpritePtr->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
    healthBarSpritePtr->oam.priority = 1;
    CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void*)(OBJ_VRAM0 + healthBarSpritePtr->oam.tileNum * TILE_SIZE_4BPP), 64);
@@ -987,8 +1190,8 @@ u8 CreateSafariPlayerHealthboxSprites(void)
    healthboxLeftSpriteId = CreateSprite(&sHealthboxSafariSpriteTemplate, 240, 160, 1);
    healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxSafariSpriteTemplate, 240, 160, 1);
-    gSprites[healthboxLeftSpriteId].oam.shape = 0;
+    gSprites[healthboxLeftSpriteId].oam.shape = ST_OAM_SQUARE;
-    gSprites[healthboxRightSpriteId].oam.shape = 0;
+    gSprites[healthboxRightSpriteId].oam.shape = ST_OAM_SQUARE;
    gSprites[healthboxRightSpriteId].oam.tileNum += 64;
@@ -1711,9 +1914,9 @@ void Task_HidePartyStatusSummary(u8 taskId)
    gTasks[taskId].tData15 = 16;
    for (i = 0; i < PARTY_SIZE; i++)
-        gSprites[ballIconSpriteIds[i]].oam.objMode = 1;
+        gSprites[ballIconSpriteIds[i]].oam.objMode = ST_OAM_OBJ_BLEND;
-    gSprites[summaryBarSpriteId].oam.objMode = 1;
+    gSprites[summaryBarSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
    if (isBattleStart)
    {
@@ -278,10 +278,10 @@ static const struct WindowTemplate gUnknown_0861F350[] =
 static const struct OamData gOamData_861F378 =
 {
    .y = 0,
-    .affineMode = 1,
+    .affineMode = ST_OAM_AFFINE_NORMAL,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(64x64),
    .x = 0,
    .matrixNum = 0,
@@ -730,10 +730,10 @@ static const u8 sRubyLevelUpStatBoxStats[] =
 static const struct OamData sOamData_MonIconOnLvlUpBox =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(32x32),
    .x = 0,
    .matrixNum = 0,
@@ -760,10 +760,10 @@ static const struct SpriteTemplate gUnknown_085C8E68 =
 static const struct OamData gOamData_85C8E80 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(64x64),
    .x = 0,
    .matrixNum = 0,
@@ -1672,7 +1672,7 @@ bool8 FldEff_Pokeball(void)
 {
    u8 spriteId = CreateSpriteAtEnd(&gUnknown_085C8E68, gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
    gSprites[spriteId].oam.priority = 0;
-    gSprites[spriteId].oam.affineMode = 1;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
    gSprites[spriteId].data[0] = gFieldEffectArguments[2];
    gSprites[spriteId].data[1] = gFieldEffectArguments[3];
    gSprites[spriteId].data[2] = -1;
@@ -2394,20 +2394,20 @@ static void Mugshots_CreateOpponentPlayerSprites(struct Task *task)
    opponentSprite->callback = sub_8148380;
    playerSprite->callback = sub_8148380;
-    opponentSprite->oam.affineMode = 3;
+    opponentSprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
-    playerSprite->oam.affineMode = 3;
+    playerSprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
    opponentSprite->oam.matrixNum = AllocOamMatrix();
    playerSprite->oam.matrixNum = AllocOamMatrix();
-    opponentSprite->oam.shape = 1;
+    opponentSprite->oam.shape = SPRITE_SHAPE(64x32);
-    playerSprite->oam.shape = 1;
+    playerSprite->oam.shape = SPRITE_SHAPE(64x32);
-    opponentSprite->oam.size = 3;
+    opponentSprite->oam.size = SPRITE_SIZE(64x32);
-    playerSprite->oam.size = 3;
+    playerSprite->oam.size = SPRITE_SIZE(64x32);
-    CalcCenterToCornerVec(opponentSprite, 1, 3, 3);
+    CalcCenterToCornerVec(opponentSprite, SPRITE_SHAPE(64x32), SPRITE_SIZE(64x32), ST_OAM_AFFINE_DOUBLE);
-    CalcCenterToCornerVec(playerSprite, 1, 3, 3);
+    CalcCenterToCornerVec(playerSprite, SPRITE_SHAPE(64x32), SPRITE_SIZE(64x32), ST_OAM_AFFINE_DOUBLE);
    SetOamMatrixRotationScaling(opponentSprite->oam.matrixNum, sMugshotsOpponentRotationScales[mugshotId][0], sMugshotsOpponentRotationScales[mugshotId][1], 0);
    SetOamMatrixRotationScaling(playerSprite->oam.matrixNum, -512, 512, 0);
@@ -1830,9 +1830,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                {
                    switch (GetCurrentWeather())
                    {
-                    case WEATHER_RAIN_LIGHT:
+                    case WEATHER_RAIN:
-                    case WEATHER_RAIN_MED:
+                    case WEATHER_RAIN_THUNDERSTORM:
-                    case WEATHER_RAIN_HEAVY:
+                    case WEATHER_DOWNPOUR:
                        if (!(gBattleWeather & WEATHER_RAIN_ANY))
                        {
                            gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT);
@@ -402,10 +402,10 @@ static const TaskFunc sUnknown_083399EC[] =
 static const struct OamData sOamData_8216314 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(32x32),
    .x = 0,
    .matrixNum = 0,
@@ -545,10 +545,10 @@ static const struct SpriteTemplate sBlenderSyncArrow_SpriteTemplate =
 static const struct OamData sOamData_821640C =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(16x16),
    .x = 0,
    .matrixNum = 0,
@@ -614,10 +614,10 @@ static const struct SpriteTemplate sUnknown_08339B40 =
 static const struct OamData sOamData_8216474 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(8x8),
    .x = 0,
    .matrixNum = 0,
@@ -701,10 +701,10 @@ static const struct SpriteTemplate sUnknown_08339BE0 =
 static const struct OamData sOamData_8216514 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(32x32),
    .x = 0,
    .matrixNum = 0,
@@ -759,10 +759,10 @@ static const struct SpriteTemplate sUnknown_08339C2C =
 static const struct OamData sOamData_8216560 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(64x32),
    .x = 0,
    .matrixNum = 0,
@@ -307,7 +307,7 @@ static void CableCarMainCallback_Setup(void)
        gMain.state++;
        break;
    case 5:
-        if (sCableCar->weather == WEATHER_ASH)
+        if (sCableCar->weather == WEATHER_VOLCANIC_ASH)
        {
            gMain.state++;
        }
@@ -425,7 +425,7 @@ static void sub_81503E4(u8 taskId)
    case 1:
        switch (sCableCar->weather)
        {
-        case WEATHER_ASH:
+        case WEATHER_VOLCANIC_ASH:
            if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL && gWeatherPtr->sprites.s2.ashSprites[0]->oam.priority != 0)
            {
                for (; i < NUM_ASH_SPRITES; i++)
@@ -815,7 +815,7 @@ static void LoadCableCarSprites(void)
            gSprites[spriteId].pos2.y = 4;
            gSprites[spriteId].data[0] = 200;
            gSprites[spriteId].data[1] = 99;
-            sCableCar->weather = WEATHER_ASH;
+            sCableCar->weather = WEATHER_VOLCANIC_ASH;
            sCableCar->unk4 = 0x15e;
            SetCurrentAndNextWeatherNoDelay(WEATHER_SUNNY);
            break;
@@ -841,7 +841,7 @@ static void LoadCableCarSprites(void)
            gSprites[spriteId].data[1] = 0x41;
            sCableCar->weather = WEATHER_SUNNY;
            sCableCar->unk4 = 0x109;
-            SetCurrentAndNextWeatherNoDelay(WEATHER_ASH);
+            SetCurrentAndNextWeatherNoDelay(WEATHER_VOLCANIC_ASH);
            break;
    }
    for (i = 0; i < 9; i++)
@@ -270,10 +270,10 @@ static const struct SpriteSheet gUnknown_08587A74 =
 static const struct OamData gOamData_8587A7C =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(8x8),
    .x = 0,
    .matrixNum = 0,
@@ -355,10 +355,10 @@ static const struct SpritePalette gUnknown_08587B08 =
 static const struct OamData gOamData_8587B10 =
 {
    .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(32x8),
    .x = 0,
    .matrixNum = 0,
@@ -414,16 +414,16 @@ const struct Subsprite gSubspriteTable_8587B78[] =
    {
        .x = -28,
        .y = -4,
-        .shape = ST_OAM_H_RECTANGLE,
+        .shape = SPRITE_SHAPE(32x8),
-        .size = 1,
+        .size = SPRITE_SIZE(32x8),
        .tileOffset = 0,
        .priority = 0
    },
    {
        .x = 4,
        .y = -4,
-        .shape = ST_OAM_H_RECTANGLE,
+        .shape = SPRITE_SHAPE(32x8),
-        .size = 1,
+        .size = SPRITE_SIZE(32x8),
        .tileOffset = 4,
        .priority = 0
    }
@@ -5021,7 +5021,7 @@ static void sub_80DE69C(u8 a)
    for (i = 0; i < CONTESTANT_COUNT; i++)
    {
        gSprites[gContestResources->field_14[i].unk0].oam.matrixNum = AllocOamMatrix();
-        gSprites[gContestResources->field_14[i].unk0].oam.affineMode = 1;
+        gSprites[gContestResources->field_14[i].unk0].oam.affineMode = ST_OAM_AFFINE_NORMAL;
        StartSpriteAffineAnim(&gSprites[gContestResources->field_14[i].unk0], a);
        if (a == 2)
        {
@@ -11,30 +11,30 @@ struct CoordEventWeather
 static void CoordEventWeather_Clouds(void);
 static void CoordEventWeather_Sunny(void);
-static void CoordEventWeather_LightRain(void);
+static void CoordEventWeather_Rain(void);
 static void CoordEventWeather_Snow(void);
 static void CoordEventWeather_Thunderstorm(void);
-static void CoordEventWeather_Fog(void);
+static void CoordEventWeather_HorizontalFog(void);
 static void CoordEventWeather_DiagonalFog(void);
 static void CoordEventWeather_Ash(void);
 static void CoordEventWeather_Sandstorm(void);
-static void CoordEventWeather_Dark(void);
+static void CoordEventWeather_Shade(void);
 static void CoordEventWeather_Drought(void);
 static void CoordEventWeather_Route119Cycle(void);
 static void CoordEventWeather_Route123Cycle(void);
 static const struct CoordEventWeather sCoordEventWeatherFuncs[] =
 {
-    { COORD_EVENT_WEATHER_CLOUDS, CoordEventWeather_Clouds },
+    { COORD_EVENT_WEATHER_SUNNY_CLOUDS,      CoordEventWeather_Clouds },
    { COORD_EVENT_WEATHER_SUNNY,             CoordEventWeather_Sunny },
-    { COORD_EVENT_WEATHER_RAIN_LIGHT, CoordEventWeather_LightRain },
+    { COORD_EVENT_WEATHER_RAIN,              CoordEventWeather_Rain },
    { COORD_EVENT_WEATHER_SNOW,              CoordEventWeather_Snow },
-    { COORD_EVENT_WEATHER_RAIN_MED, CoordEventWeather_Thunderstorm },
+    { COORD_EVENT_WEATHER_RAIN_THUNDERSTORM, CoordEventWeather_Thunderstorm },
-    { COORD_EVENT_WEATHER_FOG_1, CoordEventWeather_Fog },
+    { COORD_EVENT_WEATHER_FOG_HORIZONTAL,    CoordEventWeather_HorizontalFog },
-    { COORD_EVENT_WEATHER_FOG_2, CoordEventWeather_DiagonalFog },
+    { COORD_EVENT_WEATHER_FOG_DIAGONAL,      CoordEventWeather_DiagonalFog },
-    { COORD_EVENT_WEATHER_ASH, CoordEventWeather_Ash },
+    { COORD_EVENT_WEATHER_VOLCANIC_ASH,      CoordEventWeather_Ash },
    { COORD_EVENT_WEATHER_SANDSTORM,         CoordEventWeather_Sandstorm },
-    { COORD_EVENT_WEATHER_SHADE, CoordEventWeather_Dark },
+    { COORD_EVENT_WEATHER_SHADE,             CoordEventWeather_Shade },
    { COORD_EVENT_WEATHER_DROUGHT,           CoordEventWeather_Drought },
    { COORD_EVENT_WEATHER_ROUTE119_CYCLE,    CoordEventWeather_Route119Cycle },
    { COORD_EVENT_WEATHER_ROUTE123_CYCLE,    CoordEventWeather_Route123Cycle },
@@ -42,7 +42,7 @@ static const struct CoordEventWeather sCoordEventWeatherFuncs[] =
 static void CoordEventWeather_Clouds(void)
 {
-    SetWeather(WEATHER_CLOUDS);
+    SetWeather(WEATHER_SUNNY_CLOUDS);
 }
 static void CoordEventWeather_Sunny(void)
@@ -50,9 +50,9 @@ static void CoordEventWeather_Sunny(void)
    SetWeather(WEATHER_SUNNY);
 }
-static void CoordEventWeather_LightRain(void)
+static void CoordEventWeather_Rain(void)
 {
-    SetWeather(WEATHER_RAIN_LIGHT);
+    SetWeather(WEATHER_RAIN);
 }
 static void CoordEventWeather_Snow(void)
@@ -62,22 +62,22 @@ static void CoordEventWeather_Snow(void)
 static void CoordEventWeather_Thunderstorm(void)
 {
-    SetWeather(WEATHER_RAIN_MED);
+    SetWeather(WEATHER_RAIN_THUNDERSTORM);
 }
-static void CoordEventWeather_Fog(void)
+static void CoordEventWeather_HorizontalFog(void)
 {
-    SetWeather(WEATHER_FOG_1);
+    SetWeather(WEATHER_FOG_HORIZONTAL);
 }
 static void CoordEventWeather_DiagonalFog(void)
 {
-    SetWeather(WEATHER_FOG_2);
+    SetWeather(WEATHER_FOG_DIAGONAL);
 }
 static void CoordEventWeather_Ash(void)
 {
-    SetWeather(WEATHER_ASH);
+    SetWeather(WEATHER_VOLCANIC_ASH);
 }
 static void CoordEventWeather_Sandstorm(void)
@@ -85,7 +85,7 @@ static void CoordEventWeather_Sandstorm(void)
    SetWeather(WEATHER_SANDSTORM);
 }
-static void CoordEventWeather_Dark(void)
+static void CoordEventWeather_Shade(void)
 {
    SetWeather(WEATHER_SHADE);
 }
@@ -1053,10 +1053,10 @@ static const struct SpritePalette gUnknown_085E702C[] = {
 static const struct OamData gUnknown_085E703C =
 {
    .y = 160,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
    .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
    .shape = SPRITE_SHAPE(64x64),
    .x = 0,
    .matrixNum = 0,
@@ -2183,7 +2183,7 @@ static void sub_8177050(struct Sprite *sprite)
    {
    case 0:
    default:
-        sprite->oam.affineMode = 1;
+        sprite->oam.affineMode = ST_OAM_AFFINE_NORMAL;
        sprite->oam.matrixNum = sprite->data[1];
        sprite->data[2] = 16;
        SetOamMatrix(sprite->data[1], 0x10000 / sprite->data[2], 0, 0, 0x10000 / sprite->data[2]);
@@ -2225,7 +2225,7 @@ static void sub_8177050(struct Sprite *sprite)
        {
            SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3);
            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0));
-            sprite->oam.objMode = 1;
+            sprite->oam.objMode = ST_OAM_OBJ_BLEND;
            sprite->data[3] = 16;
            sprite->data[0] += 1;
        }
--- a/Show More
+++ b/Show More