Merge master into ObjEvent rename

95 files changed, 2886 insertions, 1277 deletions

diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 1efa860d3..1efb29ecd 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -4947,8 +4947,8 @@ void AnimMoon(struct Sprite* sprite)
         sprite->pos1.y = gBattleAnimArgs[1];
     }
 
-    sprite->oam.shape = 0;
-    sprite->oam.size = 3;
+    sprite->oam.shape = SPRITE_SHAPE(64x64);
+    sprite->oam.size = SPRITE_SIZE(64x64);
     sprite->data[0] = 0;
     sprite->callback = AnimMoonStep;
 }
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index 273dedc38..dcbcced39 100755
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -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);
         }
     }
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index 248228847..1778ce881 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -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]++;
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c
index 43890f24a..b356d57e0 100644
--- a/src/battle_anim_mons.c
+++ b/src/battle_anim_mons.c
@@ -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;
diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c
index e608cf041..003b6d2ef 100644
--- a/src/battle_anim_status_effects.c
+++ b/src/battle_anim_status_effects.c
@@ -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 =  48, .y = -16, .shape = ST_OAM_V_RECTANGLE, .size = 3, .tileOffset =  96, .priority = 2},
-    {.x =  48, .y =  48, .shape = ST_OAM_SQUARE,      .size = 2, .tileOffset = 128, .priority = 2},
+    {
+        .x = -16, 
+        .y = -16, 
+        .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[] =
diff --git a/src/battle_arena.c b/src/battle_arena.c
index 7202cf7b5..67f0cc90e 100644
--- a/src/battle_arena.c
+++ b/src/battle_arena.c
@@ -404,10 +404,10 @@ static const s8 sMindRatings[] =
 static const struct OamData sJudgementIconOamData =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 567625a99..01d05e68d 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -39,10 +39,10 @@ static const u16 sUnrefArray[] = {0x0300, 0x0000}; //OamData?
 static const struct OamData sVsLetter_V_OamData =
 {
     .y = 0,
-    .affineMode = 3,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index d3842e416..e888531cb 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -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);
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 1c92aaaad..1382e3a8b 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -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);
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index e096536c9..daf2c260e 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -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);
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 57239bca6..0bd1ea363 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -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);
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index e625f24de..21c1fdd5b 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -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);
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index b21d8288c..7c1bff64a 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -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);
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index b59a4f25d..5f3b3ea65 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -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);
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index f7035540b..a5b1ae2f7 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -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);
diff --git a/src/battle_dome.c b/src/battle_dome.c
index eca6eb466..7ff83f328 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -860,10 +860,10 @@ static const struct CompressedSpritePalette gUnknown_0860CF60[] =
 static const struct OamData gUnknown_0860CF70 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x16),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c
index 36839cde5..0d1dbb077 100644
--- a/src/battle_factory_screen.c
+++ b/src/battle_factory_screen.c
@@ -381,10 +381,10 @@ static const u8 gUnknown_08610479[] = {0x00, 0x04, 0x00};
 static const struct OamData gUnknown_0861047C =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-    .objMode = 1,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .bpp = ST_OAM_4BPP,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .bpp = ST_OAM_4BPP,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 1,
+    .bpp = ST_OAM_4BPP,
+    .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,
-    .objMode = 1,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_BLEND,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 8fabfed68..cf9aa7f1b 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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},
-    {240,   32, 1,  1,  48,     1},
-    {16,    32, 1,  1,  52,     1},
-    {48,    32, 1,  1,  56,     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
+    },
+    {
+        .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},
-    {240,   32, 1,  1,  112,    1},
-    {16,    32, 1,  1,  116,    1},
-    {48,    32, 1,  1,  120,    1}
+    {
+        .x = 240,   
+        .y = 0,  
+        .shape = SPRITE_SHAPE(64x32),  
+        .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},
-    {224,   0,  0,  0,  8,      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
+    },
+    {
+        .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},
-    {224,   0,  1,  1,  8,      1},
-    {0,     0,  1,  1,  12,     1}
+    {
+        .x = 160,   
+        .y = 0,  
+        .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},
-    {224,   0,  1,  1,  8,      1},
-    {0,     0,  1,  1,  8,      1},
-    {32,    0,  1,  1,  8,      1},
-    {64,    0,  1,  1,  12,     1}
+    {
+        .x = 160,   
+        .y = 0,  
+        .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 = 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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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[healthboxRightSpriteId].oam.shape = 0;
+    gSprites[healthboxLeftSpriteId].oam.shape = ST_OAM_SQUARE;
+    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)
     {
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index c904d4e98..040dab122 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -278,10 +278,10 @@ static const struct WindowTemplate gUnknown_0861F350[] =
 static const struct OamData gOamData_861F378 =
 {
     .y = 0,
-    .affineMode = 1,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_NORMAL,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index eab7b7d04..c44411f8d 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -730,10 +730,10 @@ static const u8 sRubyLevelUpStatBoxStats[] =
 static const struct OamData sOamData_MonIconOnLvlUpBox =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/battle_transition.c b/src/battle_transition.c
index 0e719115f..bf1ced2f8 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -760,10 +760,10 @@ static const struct SpriteTemplate gUnknown_085C8E68 =
 static const struct OamData gOamData_85C8E80 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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;
-    playerSprite->oam.affineMode = 3;
+    opponentSprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
+    playerSprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
 
     opponentSprite->oam.matrixNum = AllocOamMatrix();
     playerSprite->oam.matrixNum = AllocOamMatrix();
 
-    opponentSprite->oam.shape = 1;
-    playerSprite->oam.shape = 1;
+    opponentSprite->oam.shape = SPRITE_SHAPE(64x32);
+    playerSprite->oam.shape = SPRITE_SHAPE(64x32);
 
-    opponentSprite->oam.size = 3;
-    playerSprite->oam.size = 3;
+    opponentSprite->oam.size = SPRITE_SIZE(64x32);
+    playerSprite->oam.size = SPRITE_SIZE(64x32);
 
-    CalcCenterToCornerVec(opponentSprite, 1, 3, 3);
-    CalcCenterToCornerVec(playerSprite, 1, 3, 3);
+    CalcCenterToCornerVec(opponentSprite, SPRITE_SHAPE(64x32), SPRITE_SIZE(64x32), ST_OAM_AFFINE_DOUBLE);
+    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);
diff --git a/src/battle_util.c b/src/battle_util.c
index 8587bb88e..4352a02c2 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -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_MED:
-                    case WEATHER_RAIN_HEAVY:
+                    case WEATHER_RAIN:
+                    case WEATHER_RAIN_THUNDERSTORM:
+                    case WEATHER_DOWNPOUR:
                         if (!(gBattleWeather & WEATHER_RAIN_ANY))
                         {
                             gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT);
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 72f3056d3..2a122541d 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -402,10 +402,10 @@ static const TaskFunc sUnknown_083399EC[] =
 static const struct OamData sOamData_8216314 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/cable_car.c b/src/cable_car.c
index e629300b1..00eedfdae 100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -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++)
diff --git a/src/contest.c b/src/contest.c
index 63d5ecc07..f1741d16a 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -270,10 +270,10 @@ static const struct SpriteSheet gUnknown_08587A74 =
 static const struct OamData gOamData_8587A7C =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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,
-        .size = 1,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
         .tileOffset = 0,
         .priority = 0
     },
     {
         .x = 4,
         .y = -4,
-        .shape = ST_OAM_H_RECTANGLE,
-        .size = 1,
+        .shape = SPRITE_SHAPE(32x8),
+        .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)
         {
diff --git a/src/coord_event_weather.c b/src/coord_event_weather.c
index 60b87fa30..85f22a8b7 100644
--- a/src/coord_event_weather.c
+++ b/src/coord_event_weather.c
@@ -11,38 +11,38 @@ 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, CoordEventWeather_Sunny },
-    { COORD_EVENT_WEATHER_RAIN_LIGHT, CoordEventWeather_LightRain },
-    { COORD_EVENT_WEATHER_SNOW, CoordEventWeather_Snow },
-    { COORD_EVENT_WEATHER_RAIN_MED, CoordEventWeather_Thunderstorm },
-    { COORD_EVENT_WEATHER_FOG_1, CoordEventWeather_Fog },
-    { COORD_EVENT_WEATHER_FOG_2, CoordEventWeather_DiagonalFog },
-    { COORD_EVENT_WEATHER_ASH, CoordEventWeather_Ash },
-    { COORD_EVENT_WEATHER_SANDSTORM, CoordEventWeather_Sandstorm },
-    { COORD_EVENT_WEATHER_SHADE, CoordEventWeather_Dark },
-    { COORD_EVENT_WEATHER_DROUGHT, CoordEventWeather_Drought },
-    { COORD_EVENT_WEATHER_ROUTE119_CYCLE, CoordEventWeather_Route119Cycle },
-    { COORD_EVENT_WEATHER_ROUTE123_CYCLE, CoordEventWeather_Route123Cycle },
+    { COORD_EVENT_WEATHER_SUNNY_CLOUDS,      CoordEventWeather_Clouds },
+    { COORD_EVENT_WEATHER_SUNNY,             CoordEventWeather_Sunny },
+    { COORD_EVENT_WEATHER_RAIN,              CoordEventWeather_Rain },
+    { COORD_EVENT_WEATHER_SNOW,              CoordEventWeather_Snow },
+    { COORD_EVENT_WEATHER_RAIN_THUNDERSTORM, CoordEventWeather_Thunderstorm },
+    { COORD_EVENT_WEATHER_FOG_HORIZONTAL,    CoordEventWeather_HorizontalFog },
+    { COORD_EVENT_WEATHER_FOG_DIAGONAL,      CoordEventWeather_DiagonalFog },
+    { COORD_EVENT_WEATHER_VOLCANIC_ASH,      CoordEventWeather_Ash },
+    { COORD_EVENT_WEATHER_SANDSTORM,         CoordEventWeather_Sandstorm },
+    { 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 },
 };
 
 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);
 }
diff --git a/src/credits.c b/src/credits.c
index 323146f1e..a8bed9a3f 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -1053,10 +1053,10 @@ static const struct SpritePalette gUnknown_085E702C[] = {
 static const struct OamData gUnknown_085E703C =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .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;
         }
diff --git a/src/data/object_event/event_object_subsprites.h b/src/data/object_event/event_object_subsprites.h
index 3beccb416..79e75f1e1 100755
--- a/src/data/object_event/event_object_subsprites.h
+++ b/src/data/object_event/event_object_subsprites.h
@@ -1,24 +1,80 @@
 const struct Subsprite gObjectEventSpriteOamTable_16x16_0[] = {
-    { -8,  -8, 0, 1, 0, 2}
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_16x16_1[] = {
-    { -8,  -8, 0, 1, 0, 1}
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16),
+        .tileOffset = 0, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_16x16_2[] = {
-    { -8,  -8, 1, 0, 0, 2},
-    { -8,   0, 1, 0, 2, 3}
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    { 
+        .x = -8,  
+        .y =  0, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 2, 
+        .priority = 3
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_16x16_3[] = {
-    { -8,  -8, 0, 1, 0, 2},
-    { -8,  -8, 0, 1, 0, 3}
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 3
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_16x16_4[] = {
-    { -8,  -8, 0, 1, 0, 1},
-    { -8,  -8, 0, 1, 0, 3}
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 3
+    }
 };
 
 const struct SubspriteTable gObjectEventSpriteOamTables_16x16[] = {
@@ -31,27 +87,90 @@ const struct SubspriteTable gObjectEventSpriteOamTables_16x16[] = {
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_16x32_0[] = {
-    { -8, -16, 2, 2, 0, 2}
+    { 
+        .x = -8, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(16x32), 
+        .size = SPRITE_SIZE(16x32), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_16x32_1[] = {
-    { -8, -16, 2, 2, 0, 1}
+    { 
+        .x = -8, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(16x32), 
+        .size = SPRITE_SIZE(16x32),
+        .tileOffset = 0, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_16x32_2[] = {
-    { -8, -16, 0, 1, 0, 2},
-    { -8,   0, 1, 0, 4, 2},
-    { -8,   8, 1, 0, 6, 3}
+    { 
+        .x = -8, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    { 
+        .x = -8, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 4, 
+        .priority = 2
+    },
+    { 
+        .x = -8, 
+        .y =   8, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 6, 
+        .priority = 3
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_16x32_3[] = {
-    { -8, -16, 0, 1, 0, 2},
-    { -8,   0, 0, 1, 4, 3}
+    { 
+        .x = -8, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    { 
+        .x = -8, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 4, 
+        .priority = 3
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_16x32_4[] = {
-    { -8, -16, 0, 1, 0, 1},
-    { -8,   0, 0, 1, 4, 3}
+    { 
+        .x = -8, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    { 
+        .x = -8, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 4, 
+        .priority = 3
+    }
 };
 
 const struct SubspriteTable gObjectEventSpriteOamTables_16x32[] = {
@@ -64,27 +183,90 @@ const struct SubspriteTable gObjectEventSpriteOamTables_16x32[] = {
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_32x32_0[] = {
-    {-16, -16, 0, 2, 0, 2}
+    {
+        .x = -16, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(32x32), 
+        .size = SPRITE_SIZE(32x32), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_32x32_1[] = {
-    {-16, -16, 0, 2, 0, 1}
+    {
+        .x = -16, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(32x32), 
+        .size = SPRITE_SIZE(32x32),
+        .tileOffset = 0, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_32x32_2[] = {
-    {-16, -16, 1, 2, 0, 2},
-    {-16,   0, 1, 1, 8, 2},
-    {-16,   8, 1, 1, 12, 3}
+    {
+        .x = -16, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(32x16), 
+        .size = SPRITE_SIZE(32x16), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 8, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   8, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 12, 
+        .priority = 3
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_32x32_3[] = {
-    {-16, -16, 1, 2, 0, 2},
-    {-16,   0, 1, 2, 8, 3}
+    {
+        .x = -16, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(32x16), 
+        .size = SPRITE_SIZE(32x16), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(32x16), 
+        .size = SPRITE_SIZE(32x16),
+        .tileOffset = 8, 
+        .priority = 3
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_32x32_4[] = {
-    {-16, -16, 1, 2, 0, 1},
-    {-16,   0, 1, 2, 8, 3}
+    {
+        .x = -16, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(32x16), 
+        .size = SPRITE_SIZE(32x16),
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(32x16), 
+        .size = SPRITE_SIZE(32x16),
+        .tileOffset = 8, 
+        .priority = 3
+    }
 };
 
 const struct SubspriteTable gObjectEventSpriteOamTables_32x32[] = {
@@ -97,18 +279,102 @@ const struct SubspriteTable gObjectEventSpriteOamTables_32x32[] = {
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_Truck_0[] = {
-    {-24, -24, 1, 1, 0, 2},
-    {  8, -24, 1, 0, 4, 2},
-    {-24, -16, 1, 1, 6, 2},
-    {  8, -16, 1, 0, 10, 2},
-    {-24,  -8, 1, 1, 12, 2},
-    {  8,  -8, 1, 0, 16, 2},
-    {-24,   0, 1, 1, 18, 2},
-    {  8,   0, 1, 0, 22, 2},
-    {-24,   8, 1, 1, 24, 2},
-    {  8,   8, 1, 0, 28, 2},
-    {-24,  16, 1, 1, 30, 2},
-    {  8,  16, 1, 0, 34, 2}
+    {
+        .x = -24, 
+        .y = -24, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x =   8, 
+        .y = -24, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 4, 
+        .priority = 2
+    },
+    {
+        .x = -24, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 6, 
+        .priority = 2
+    },
+    {
+        .x =   8, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 10, 
+        .priority = 2
+    },
+    {
+        .x = -24, 
+        .y =  -8, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 12, 
+        .priority = 2
+    },
+    {
+        .x =   8, 
+        .y =  -8, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 16, 
+        .priority = 2
+    },
+    {
+        .x = -24, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 18, 
+        .priority = 2
+    },
+    {
+        .x =   8, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 22, 
+        .priority = 2
+    },
+    {
+        .x = -24, 
+        .y =   8, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 24, 
+        .priority = 2
+    },
+    {
+        .x =   8, 
+        .y =   8, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 28, 
+        .priority = 2
+    },
+    {
+        .x = -24, 
+        .y =  16, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 30, 
+        .priority = 2
+    },
+    {
+        .x =   8, 
+        .y =  16, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 34, 
+        .priority = 2
+    }
 };
 
 const struct SubspriteTable gObjectEventSpriteOamTables_Truck[] = {
@@ -121,19 +387,47 @@ const struct SubspriteTable gObjectEventSpriteOamTables_Truck[] = {
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_Unused_0[] = {
-    {-32, -16, 1, 3, 0, 2}
+    {
+        .x = -32, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(64x32), 
+        .size = SPRITE_SIZE(64x32), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_Unused_1[] = {
-    {-32, -16, 1, 3, 0, 1}
+    {
+        .x = -32, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(64x32), 
+        .size = SPRITE_SIZE(64x32), 
+        .tileOffset = 0, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_Unused_2[] = {
-    {-32, -16, 1, 3, 0, 2}
+    {
+        .x = -32, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(64x32), 
+        .size = SPRITE_SIZE(64x32), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_Unused_3[] = {
-    {-32, -16, 1, 3, 0, 2}
+    {
+        .x = -32, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(64x32), 
+        .size = SPRITE_SIZE(64x32), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct SubspriteTable gObjectEventSpriteOamTables_Unused[] = {
@@ -146,19 +440,47 @@ const struct SubspriteTable gObjectEventSpriteOamTables_Unused[] = {
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_64x64_0[] = {
-    {-32, -32, 0, 3, 0, 2}
+    {
+        .x = -32, 
+        .y = -32, 
+        .shape = SPRITE_SHAPE(64x64), 
+        .size = SPRITE_SIZE(64x64), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_64x64_1[] = {
-    {-32, -32, 0, 3, 0, 1}
+    {
+        .x = -32, 
+        .y = -32, 
+        .shape = SPRITE_SHAPE(64x64), 
+        .size = SPRITE_SIZE(64x64), 
+        .tileOffset = 0, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_64x64_2[] = {
-    {-32, -32, 0, 3, 0, 2}
+    {
+        .x = -32, 
+        .y = -32, 
+        .shape = SPRITE_SHAPE(64x64), 
+        .size = SPRITE_SIZE(64x64), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_64x64_3[] = {
-    {-32, -32, 0, 3, 0, 2}
+    {
+        .x = -32, 
+        .y = -32, 
+        .shape = SPRITE_SHAPE(64x64), 
+        .size = SPRITE_SIZE(64x64), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct SubspriteTable gObjectEventSpriteOamTables_64x64[] = {
@@ -171,75 +493,495 @@ const struct SubspriteTable gObjectEventSpriteOamTables_64x64[] = {
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_SSTidal_0[] = {
-    {-48, -20, 1, 1, 0, 2},
-    {-16, -20, 1, 1, 4, 2},
-    { 16, -20, 1, 1, 8, 2},
-    {-48, -12, 1, 1, 12, 2},
-    {-16, -12, 1, 1, 16, 2},
-    { 16, -12, 1, 1, 20, 2},
-    {-48,  -4, 1, 1, 24, 2},
-    {-16,  -4, 1, 1, 28, 2},
-    { 16,  -4, 1, 1, 32, 2},
-    {-48,   4, 1, 1, 36, 2},
-    {-16,   4, 1, 1, 40, 2},
-    { 16,   4, 1, 1, 44, 2},
-    {-48,  12, 1, 1, 48, 2},
-    {-16,  12, 1, 1, 52, 2},
-    { 16,  12, 1, 1, 56, 2}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 8, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 12, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 16, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 20, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 24, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 28, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 32, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 36, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 40, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 44, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 48, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 52, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 56, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_SSTidal_1[] = {
-    {-48, -20, 1, 1, 0, 1},
-    {-16, -20, 1, 1, 4, 1},
-    { 16, -20, 1, 1, 8, 1},
-    {-48, -12, 1, 1, 12, 1},
-    {-16, -12, 1, 1, 16, 1},
-    { 16, -12, 1, 1, 20, 1},
-    {-48,  -4, 1, 1, 24, 1},
-    {-16,  -4, 1, 1, 28, 1},
-    { 16,  -4, 1, 1, 32, 1},
-    {-48,   4, 1, 1, 36, 1},
-    {-16,   4, 1, 1, 40, 1},
-    { 16,   4, 1, 1, 44, 1},
-    {-48,  12, 1, 1, 48, 1},
-    {-16,  12, 1, 1, 52, 1},
-    { 16,  12, 1, 1, 56, 1}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 8, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 12, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 16, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 20, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 24, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 28, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 32, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 36, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 40, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 44, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 48, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 52, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 56, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_SSTidal_2[] = {
-    {-48, -20, 1, 1, 0, 2},
-    {-16, -20, 1, 1, 4, 2},
-    { 16, -20, 1, 1, 8, 2},
-    {-48, -12, 1, 1, 12, 2},
-    {-16, -12, 1, 1, 16, 2},
-    { 16, -12, 1, 1, 20, 2},
-    {-48,  -4, 1, 1, 24, 2},
-    {-16,  -4, 1, 1, 28, 2},
-    { 16,  -4, 1, 1, 32, 2},
-    {-48,   4, 1, 1, 36, 2},
-    {-16,   4, 1, 1, 40, 2},
-    { 16,   4, 1, 1, 44, 2},
-    {-48,  12, 1, 1, 48, 2},
-    {-16,  12, 1, 1, 52, 2},
-    { 16,  12, 1, 1, 56, 2}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 8, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 12, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 16, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 20, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 24, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 28, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 32, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 36, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 40, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 44, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 48, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 52, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 56, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_SSTidal_3[] = {
-    {-48, -20, 1, 1, 0, 1},
-    {-16, -20, 1, 1, 4, 1},
-    { 16, -20, 1, 1, 8, 1},
-    {-48, -12, 1, 1, 12, 1},
-    {-16, -12, 1, 1, 16, 1},
-    { 16, -12, 1, 1, 20, 1},
-    {-48,  -4, 1, 1, 24, 2},
-    {-16,  -4, 1, 1, 28, 2},
-    { 16,  -4, 1, 1, 32, 2},
-    {-48,   4, 1, 1, 36, 2},
-    {-16,   4, 1, 1, 40, 2},
-    { 16,   4, 1, 1, 44, 2},
-    {-48,  12, 1, 1, 48, 2},
-    {-16,  12, 1, 1, 52, 2},
-    { 16,  12, 1, 1, 56, 2}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 8, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 12, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 16, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 20, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 24, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 28, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 32, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 36, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 40, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 44, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 48, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 52, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 56, 
+        .priority = 2
+    }
 };
 
 const struct SubspriteTable gObjectEventSpriteOamTables_SSTidal[] = {
@@ -252,79 +994,527 @@ const struct SubspriteTable gObjectEventSpriteOamTables_SSTidal[] = {
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_0[] = {
-    {-48, -20, 1, 1, 0, 2},
-    {-16, -20, 1, 1, 4, 2},
-    { 16, -20, 1, 0, 8, 2},
-    { 32, -20, 0, 0, 10, 2},
-    {-48, -12, 1, 1, 11, 2},
-    {-16, -12, 1, 1, 15, 2},
-    { 16, -12, 1, 0, 19, 2},
-    { 32, -12, 0, 0, 21, 2},
-    {-48,  -4, 1, 1, 22, 2},
-    {-16,  -4, 1, 1, 26, 2},
-    { 16,  -4, 1, 0, 30, 2},
-    { 32,  -4, 0, 0, 32, 2},
-    {-48,   4, 1, 1, 33, 2},
-    {-16,   4, 1, 1, 37, 2},
-    { 16,   4, 1, 0, 41, 2},
-    { 32,   4, 0, 0, 43, 2}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 8, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 10, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 11, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 15, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 19, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 21, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 22, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 26, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 30, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 32, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 33, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 37, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 41, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 43, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_1[] = {
-    {-48, -20, 1, 1, 0, 1},
-    {-16, -20, 1, 1, 4, 1},
-    { 16, -20, 1, 0, 8, 1},
-    { 32, -20, 0, 0, 10, 1},
-    {-48, -12, 1, 1, 11, 1},
-    {-16, -12, 1, 1, 15, 1},
-    { 16, -12, 1, 0, 19, 1},
-    { 32, -12, 0, 0, 21, 1},
-    {-48,  -4, 1, 1, 22, 1},
-    {-16,  -4, 1, 1, 26, 1},
-    { 16,  -4, 1, 0, 30, 1},
-    { 32,  -4, 0, 0, 32, 1},
-    {-48,   4, 1, 1, 33, 1},
-    {-16,   4, 1, 1, 37, 1},
-    { 16,   4, 1, 0, 41, 1},
-    { 32,   4, 0, 0, 43, 1}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 8, 
+        .priority = 1
+    },
+    {
+        .x =  32, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 10, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 11, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 15, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 19, 
+        .priority = 1
+    },
+    {
+        .x =  32, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 21, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 22, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 26, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 30, 
+        .priority = 1
+    },
+    {
+        .x =  32, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 32, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 33, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 37, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 41, 
+        .priority = 1
+    },
+    {
+        .x =  32, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 43, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_2[] = {
-    {-48, -20, 1, 1, 0, 2},
-    {-16, -20, 1, 1, 4, 2},
-    { 16, -20, 1, 0, 8, 2},
-    { 32, -20, 0, 0, 10, 2},
-    {-48, -12, 1, 1, 11, 2},
-    {-16, -12, 1, 1, 15, 2},
-    { 16, -12, 1, 0, 19, 2},
-    { 32, -12, 0, 0, 21, 2},
-    {-48,  -4, 1, 1, 22, 2},
-    {-16,  -4, 1, 1, 26, 2},
-    { 16,  -4, 1, 0, 30, 2},
-    { 32,  -4, 0, 0, 32, 2},
-    {-48,   4, 1, 1, 33, 2},
-    {-16,   4, 1, 1, 37, 2},
-    { 16,   4, 1, 0, 41, 2},
-    { 32,   4, 0, 0, 43, 2}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 8, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 10, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 11, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 15, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 19, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 21, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 22, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 26, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 30, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 32, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 33, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 37, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 41, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 43, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_3[] = {
-    {-48, -20, 1, 1, 0, 1},
-    {-16, -20, 1, 1, 4, 1},
-    { 16, -20, 1, 0, 8, 1},
-    { 32, -20, 0, 0, 10, 1},
-    {-48, -12, 1, 1, 11, 1},
-    {-16, -12, 1, 1, 15, 1},
-    { 16, -12, 1, 0, 19, 1},
-    { 32, -12, 0, 0, 21, 1},
-    {-48,  -4, 1, 1, 22, 2},
-    {-16,  -4, 1, 1, 26, 2},
-    { 16,  -4, 1, 0, 30, 2},
-    { 32,  -4, 0, 0, 32, 2},
-    {-48,   4, 1, 1, 33, 2},
-    {-16,   4, 1, 1, 37, 2},
-    { 16,   4, 1, 0, 41, 2},
-    { 32,   4, 0, 0, 43, 2}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 8, 
+        .priority = 1
+    },
+    {
+        .x =  32, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 10, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 11, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 15, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 19, 
+        .priority = 1
+    },
+    {
+        .x =  32, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 21, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 22, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 26, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 30, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 32, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 33, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 37, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 41, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 43, 
+        .priority = 2
+    }
 };
 
 const struct SubspriteTable gObjectEventSpriteOamTables_SubmarineShadow[] = {
diff --git a/src/data/party_menu.h b/src/data/party_menu.h
index 6af8ee2a6..3c3a3e1ce 100644
--- a/src/data/party_menu.h
+++ b/src/data/party_menu.h
@@ -879,10 +879,10 @@ static const u16 sHeldItemPalette[] = INCBIN_U16("graphics/interface/hold_icons.
 static const struct OamData sOamData_HeldItem =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
@@ -935,10 +935,10 @@ static const struct SpriteTemplate sSpriteTemplate_HeldItem =
 static const struct OamData sOamData_MenuPokeball =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -992,10 +992,10 @@ static const struct SpriteTemplate sSpriteTemplate_MenuPokeball =
 static const struct OamData sOamData_MenuPokeballSmall =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
@@ -1073,10 +1073,10 @@ static const struct SpriteTemplate sSpriteTemplate_MenuPokeballSmall =
 static const struct OamData sOamData_StatusCondition =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/data/trade.h b/src/data/trade.h
index 13310185e..739132093 100644
--- a/src/data/trade.h
+++ b/src/data/trade.h
@@ -633,7 +633,7 @@ static const u32 sTradeTilemap_WirelessSignal[] = INCBIN_U32("graphics/trade/wir
 
 static const struct OamData sTradeOamData_16x16 =
 {
-    .affineMode = 1,
+    .affineMode = ST_OAM_AFFINE_NORMAL,
     .shape = SPRITE_SHAPE(16x16),
     .size = SPRITE_SIZE(16x16)
 };
@@ -735,8 +735,8 @@ static const struct SpriteTemplate gSpriteTemplate_8338D28 =
 
 static const struct OamData sTradeOamData_32x32 =
 {
-    .affineMode = 1,
-    .objMode = 1,
+    .affineMode = ST_OAM_AFFINE_NORMAL,
+    .objMode = ST_OAM_OBJ_BLEND,
     .shape = SPRITE_SHAPE(32x32),
     .size = SPRITE_SIZE(32x32),
     .priority = 1
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 2e0cfbc7e..e731c73c7 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -3555,14 +3555,14 @@ static const u32 gDodrioBerryBgTilemap2Left[] = INCBIN_U32("graphics/link_games/
 static const struct OamData sOamData_82FB1E0 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -3572,14 +3572,14 @@ static const struct OamData sOamData_82FB1E0 =
 static const struct OamData sOamData_82FB1E8 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -3589,14 +3589,14 @@ static const struct OamData sOamData_82FB1E8 =
 static const struct OamData sOamData_82FB1F0 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -3606,14 +3606,14 @@ static const struct OamData sOamData_82FB1F0 =
 static const struct OamData sOamData_82FB1F8 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 1,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 3,
     .paletteNum = 0,
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 9e9d1c2c5..2ce2c04bb 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -83,10 +83,10 @@ static const u8 sEggShardTiles[] = INCBIN_U8("graphics/misc/egg_shard.4bpp");
 static const struct OamData sOamData_EggHatch =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -163,10 +163,10 @@ static const struct SpriteTemplate sSpriteTemplate_EggHatch =
 static const struct OamData sOamData_EggShard =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/electric.c b/src/electric.c
index 7a0cd542c..3344db7bf 100644
--- a/src/electric.c
+++ b/src/electric.c
@@ -757,13 +757,13 @@ static void sub_810A9DC(struct Sprite *sprite)
 {
     if (!sprite->data[0])
     {
-        sprite->oam.shape = 2;
-        sprite->oam.size = 0;
+        sprite->oam.shape = SPRITE_SHAPE(8x16);
+        sprite->oam.size = SPRITE_SIZE(8x16);
     }
     else
     {
-        sprite->oam.shape = 0;
-        sprite->oam.size = 1;
+        sprite->oam.shape = SPRITE_SHAPE(16x16);
+        sprite->oam.size = SPRITE_SIZE(16x16);
     }
     if (++sprite->data[1] == 15)
         DestroySprite(sprite);
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 515171b31..7a152ba21 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1121,13 +1121,13 @@ void ResetObjectEvents(void)
 static void CreateReflectionEffectSprites(void)
 {
     u8 spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31);
-    gSprites[spriteId].oam.affineMode = 1;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     InitSpriteAffineAnim(&gSprites[spriteId]);
     StartSpriteAffineAnim(&gSprites[spriteId], 0);
     gSprites[spriteId].invisible = TRUE;
 
     spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31);
-    gSprites[spriteId].oam.affineMode = 1;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     InitSpriteAffineAnim(&gSprites[spriteId]);
     StartSpriteAffineAnim(&gSprites[spriteId], 1);
     gSprites[spriteId].invisible = TRUE;
@@ -1676,7 +1676,7 @@ u8 AddPseudoObjectEvent(u16 graphicsId, void (*callback)(struct Sprite *), s16 x
     {
         sprite = &gSprites[spriteId];
         SetSubspriteTables(sprite, subspriteTables);
-        sprite->subspriteMode = 2;
+        sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
     }
     return spriteId;
 }
@@ -1721,7 +1721,7 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction)
         if (subspriteTables != NULL)
         {
             SetSubspriteTables(sprite, subspriteTables);
-            sprite->subspriteMode = 2;
+            sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
         }
         InitObjectPriorityByZCoord(sprite, z);
         SetObjectSubpriorityByZCoord(z, sprite, 1);
@@ -4586,7 +4586,7 @@ void MovementType_Hidden(struct Sprite *sprite)
     if (!sprite->data[7])
     {
         gObjectEvents[sprite->data[0]].fixedPriority = TRUE;
-        sprite->subspriteMode = 2;
+        sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
         sprite->oam.priority = 3;
         sprite->data[7]++;
     }
@@ -6814,7 +6814,7 @@ bool8 MovementAction_InitAffineAnim_Step0(struct ObjectEvent *objectEvent, struc
     sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
     InitSpriteAffineAnim(sprite);
     sprite->affineAnimPaused = TRUE;
-    sprite->subspriteMode = 0;
+    sprite->subspriteMode = SUBSPRITES_OFF;
     return TRUE;
 }
 
@@ -8844,12 +8844,12 @@ void sub_8097BB4(u8 var1, u8 graphicsId)
         {
             sprite->subspriteTables = NULL;
             sprite->subspriteTableNum = 0;
-            sprite->subspriteMode = 0;
+            sprite->subspriteMode = SUBSPRITES_OFF;
         }
         else
         {
             SetSubspriteTables(sprite, graphicsInfo->subspriteTables);
-            sprite->subspriteMode = 2;
+            sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
         }
         StartSpriteAnim(sprite, 0);
     }
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index 816929f8b..849c676b3 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -50,10 +50,10 @@ static const struct SpritePalette sEvoSparkleSpritePals[] =
 static const struct OamData sOamData_EvoSparkle =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
@@ -141,7 +141,7 @@ static void CreatePreEvoSparkleSet1(u8 arg0)
         gSprites[spriteID].data[5] = 48;
         gSprites[spriteID].data[6] = arg0;
         gSprites[spriteID].data[7] = 0;
-        gSprites[spriteID].oam.affineMode = 1;
+        gSprites[spriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
         gSprites[spriteID].oam.matrixNum = 31;
         gSprites[spriteID].callback = SpriteCB_PreEvoSparkleSet1;
     }
@@ -169,7 +169,7 @@ static void CreatePreEvoSparkleSet2(u8 arg0)
         gSprites[spriteID].data[5] = 8;
         gSprites[spriteID].data[6] = arg0;
         gSprites[spriteID].data[7] = 0;
-        gSprites[spriteID].oam.affineMode = 1;
+        gSprites[spriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
         gSprites[spriteID].oam.matrixNum = 25;
         gSprites[spriteID].subpriority = 1;
         gSprites[spriteID].callback = SpriteCB_PreEvoSparkleSet2;
@@ -198,7 +198,7 @@ static void CreatePostEvoSparkleSet1(u8 arg0, u8 arg1)
         gSprites[spriteID].data[5] = 120;
         gSprites[spriteID].data[6] = arg0;
         gSprites[spriteID].data[7] = 0;
-        gSprites[spriteID].oam.affineMode = 1;
+        gSprites[spriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
         gSprites[spriteID].oam.matrixNum = 31;
         gSprites[spriteID].subpriority = 1;
         gSprites[spriteID].callback = SpriteCB_PostEvoSparkleSet1;
@@ -243,7 +243,7 @@ static void CreatePostEvoSparkleSet2(u8 arg0)
         gSprites[spriteID].data[3] = 3 - (Random() % 7);
         gSprites[spriteID].data[5] = 48 + (Random() & 0x3F);
         gSprites[spriteID].data[7] = 0;
-        gSprites[spriteID].oam.affineMode = 1;
+        gSprites[spriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
         gSprites[spriteID].oam.matrixNum = 31;
         gSprites[spriteID].subpriority = 20;
         gSprites[spriteID].callback = SpriteCB_PostEvoSparkleSet2;
@@ -497,13 +497,13 @@ u8 sub_817C3A0(u8 preEvoSpriteID, u8 postEvoSpriteID)
     SetOamMatrix(31, toDiv / gTasks[taskID].data[4], 0, 0, toDiv / gTasks[taskID].data[4]);
 
     gSprites[preEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB;
-    gSprites[preEvoSpriteID].oam.affineMode = 1;
+    gSprites[preEvoSpriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[preEvoSpriteID].oam.matrixNum = 30;
     gSprites[preEvoSpriteID].invisible = FALSE;
     CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[preEvoSpriteID].oam.paletteNum * 16)], 16);
 
     gSprites[postEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB;
-    gSprites[postEvoSpriteID].oam.affineMode = 1;
+    gSprites[postEvoSpriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[postEvoSpriteID].oam.matrixNum = 31;
     gSprites[postEvoSpriteID].invisible = FALSE;
     CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[postEvoSpriteID].oam.paletteNum * 16)], 16);
@@ -587,11 +587,11 @@ static void sub_817C560(u8 taskID)
 
 static void PreEvoInvisible_PostEvoVisible_KillTask(u8 taskID)
 {
-    gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = 0;
+    gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = ST_OAM_AFFINE_OFF;
     gSprites[gTasks[taskID].tPreEvoSpriteID].oam.matrixNum = 0;
     gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = TRUE;
 
-    gSprites[gTasks[taskID].tPostEvoSpriteID].oam.affineMode = 0;
+    gSprites[gTasks[taskID].tPostEvoSpriteID].oam.affineMode = ST_OAM_AFFINE_OFF;
     gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0;
     gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = FALSE;
 
@@ -600,11 +600,11 @@ static void PreEvoInvisible_PostEvoVisible_KillTask(u8 taskID)
 
 static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskID)
 {
-    gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = 0;
+    gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = ST_OAM_AFFINE_OFF;
     gSprites[gTasks[taskID].tPreEvoSpriteID].oam.matrixNum = 0;
     gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = FALSE;
 
-    gSprites[gTasks[taskID].tPostEvoSpriteID].oam.affineMode = 0;
+    gSprites[gTasks[taskID].tPostEvoSpriteID].oam.affineMode = ST_OAM_AFFINE_OFF;
     gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0;
     gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = TRUE;
 
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 52b619dbf..004d72614 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -558,9 +558,9 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
             ScriptContext1_SetupScript(EventScript_EggHatch);
             return TRUE;
         }
-        if (UnusualWeatherHasExpired() == TRUE)
+        if (AbnormalWeatherHasExpired() == TRUE)
         {
-            ScriptContext1_SetupScript(UnusualWeather_EventScript_EndEventAndCleanup_1);
+            ScriptContext1_SetupScript(AbnormalWeather_EventScript_EndEventAndCleanup_1);
             return TRUE;
         }
         if (ShouldDoBrailleRegicePuzzle() == TRUE)
diff --git a/src/field_effect.c b/src/field_effect.c
index 3cb34c05e..f5f6b1cba 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -406,20 +406,76 @@ const struct SpriteFrameImage gSpriteImageTable_855C294[] =
 
 const struct Subsprite gSubspriteTable_855C29C[] =
 {
-    {.x = -12, .y = -8, .priority = 2, .tileOffset = 0, .shape = 1, .size = 0},
-    {.x =   4, .y = -8, .priority = 2, .tileOffset = 2, .shape = 0, .size = 0},
-    {.x = -12, .y =  0, .priority = 2, .tileOffset = 3, .shape = 1, .size = 0},
-    {.x =   4, .y =  0, .priority = 2, .tileOffset = 5, .shape = 0, .size = 0}
+    {
+        .x = -12, 
+        .y =  -8, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x =  4, 
+        .y = -8,
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 2, 
+        .priority = 2 
+    },
+    {
+        .x = -12, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 3, 
+        .priority = 2
+    },
+    {
+        .x = 4, 
+        .y = 0, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 5, 
+        .priority = 2
+    }
 };
 
 const struct SubspriteTable gUnknown_0855C2AC = subsprite_table(gSubspriteTable_855C29C);
 
 const struct Subsprite gSubspriteTable_855C2B4[] =
 {
-    {.x = -32, .y = -8, .priority = 2, .tileOffset =  0, .shape = 1, .size = 1},
-    {.x =   0, .y = -8, .priority = 2, .tileOffset =  4, .shape = 1, .size = 1},
-    {.x = -32, .y =  0, .priority = 2, .tileOffset =  8, .shape = 1, .size = 1},
-    {.x =   0, .y =  0, .priority = 2, .tileOffset = 12, .shape = 1, .size = 1}
+    {
+        .x = -32, 
+        .y = -8, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x =  0, 
+        .y = -8, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 4, 
+        .priority = 2
+    },
+    {
+        .x = -32, 
+        .y =  0, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 8, 
+        .priority = 2
+    },
+    {
+        .x =   0, 
+        .y =  0, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 12, 
+        .priority = 2
+    }
 };
 
 const struct SubspriteTable gUnknown_0855C2C4 = subsprite_table(gSubspriteTable_855C2B4);
@@ -870,7 +926,7 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio
 void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId)
 {
     ResetPreservedPalettesInWeather();
-    if (sprite->oam.affineMode != 0)
+    if (sprite->oam.affineMode != ST_OAM_AFFINE_OFF)
     {
         FreeOamMatrix(sprite->oam.matrixNum);
     }
@@ -1473,7 +1529,7 @@ static bool8 sub_80B6BCC(struct Task *task) // gUnknown_0855C3C8[0]
     task->data[4] = playerSprite->subspriteMode;
     playerObject->fixedPriority = 1;
     playerSprite->oam.priority = 1;
-    playerSprite->subspriteMode = 2;
+    playerSprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
     task->data[0]++;
     return TRUE;
 }
@@ -2021,7 +2077,7 @@ static bool8 sub_80B7704(struct Task *task, struct ObjectEvent *objectEvent, str
         task->data[5]++;
         objectEvent->fixedPriority = 1;
         sprite->oam.priority = 1;
-        sprite->subspriteMode = 2;
+        sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
     }
     if (task->data[1] == 0 && task->data[4] != 0)
     {
@@ -2396,9 +2452,9 @@ static void TeleportFieldEffectTask3(struct Task *task)
     {
         task->data[3] <<= 1;
     }
-    if (task->data[4] > 8 && (sprite->oam.priority = 1, sprite->subspriteMode != 0))
+    if (task->data[4] > 8 && (sprite->oam.priority = 1, sprite->subspriteMode != SUBSPRITES_OFF))
     {
-        sprite->subspriteMode = 2;
+        sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
     }
     if (task->data[4] >= 0xa8)
     {
@@ -2487,9 +2543,9 @@ static void sub_80B830C(struct Task *task)
     } else
     {
         sprite->oam.priority = 1;
-        if (sprite->subspriteMode != 0)
+        if (sprite->subspriteMode != SUBSPRITES_OFF)
         {
-            sprite->subspriteMode = 2;
+            sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
         }
     }
     if (sprite->pos2.y >= -0x30 && task->data[1] > 1 && !(sprite->pos2.y & 1))
@@ -3284,7 +3340,7 @@ static void sub_80B957C(struct Sprite *sprite)
     {
         if (sprite->data[0] == 0)
         {
-            sprite->oam.affineMode = 3;
+            sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
             sprite->affineAnims = gSpriteAffineAnimTable_0855C548;
             InitSpriteAffineAnim(sprite);
             StartSpriteAffineAnim(sprite, 0);
@@ -3304,9 +3360,9 @@ static void sub_80B957C(struct Sprite *sprite)
         if (sprite->data[1] > 0x81)
         {
             sprite->data[7]++;
-            sprite->oam.affineMode = 0;
+            sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
             FreeOamMatrix(sprite->oam.matrixNum);
-            CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, 0);
+            CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, ST_OAM_AFFINE_OFF);
         }
     }
 }
@@ -3337,7 +3393,7 @@ void sub_80B96B0(struct Sprite *sprite)
     {
         if (sprite->data[0] == 0)
         {
-            sprite->oam.affineMode = 3;
+            sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
             sprite->affineAnims = gSpriteAffineAnimTable_0855C548;
             InitSpriteAffineAnim(sprite);
             StartSpriteAffineAnim(sprite, 1);
@@ -3368,7 +3424,7 @@ void sub_80B96B0(struct Sprite *sprite)
         if (sprite->data[3] >= 60)
         {
             sprite->data[7]++;
-            sprite->oam.affineMode = 0;
+            sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
             FreeOamMatrix(sprite->oam.matrixNum);
             sprite->invisible = TRUE;
         }
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 9c38b61f5..52c30ab0f 100755
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -129,7 +129,7 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite)
         reflectionSprite->oam.paletteNum = gReflectionEffectPaletteMap[mainSprite->oam.paletteNum];
         reflectionSprite->oam.shape = mainSprite->oam.shape;
         reflectionSprite->oam.size = mainSprite->oam.size;
-        reflectionSprite->oam.matrixNum = mainSprite->oam.matrixNum | 0x10;
+        reflectionSprite->oam.matrixNum = mainSprite->oam.matrixNum | ST_OAM_VFLIP;
         reflectionSprite->oam.tileNum = mainSprite->oam.tileNum;
         reflectionSprite->subspriteTables = mainSprite->subspriteTables;
         reflectionSprite->subspriteTableNum = mainSprite->subspriteTableNum;
@@ -153,7 +153,7 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite)
             // matrix based on whether or not the main sprite is horizontally flipped.
             // If the sprite is facing to the east, then it is flipped, and its matrixNum is 8.
             reflectionSprite->oam.matrixNum = 0;
-            if (mainSprite->oam.matrixNum & 0x8)
+            if (mainSprite->oam.matrixNum & ST_OAM_HFLIP)
                 reflectionSprite->oam.matrixNum = 1;
         }
     }
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 3b0d4542f..ac05bb2fd 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -2092,7 +2092,7 @@ static void sub_808D094(u8 taskId)
             object->fixedPriority = TRUE;
             sprite->oam.priority = 0;
             sprite->subpriority = 0;
-            sprite->subspriteMode = 0;
+            sprite->subspriteMode = SUBSPRITES_OFF;
             data[0]++;
         case 1:
             sub_808D38C(object, &data[1]);
@@ -2156,7 +2156,7 @@ static void sub_808D1FC(u8 taskId)
             object->fixedPriority = TRUE;
             sprite->oam.priority = 1;
             sprite->subpriority = 0;
-            sprite->subspriteMode = 0;
+            sprite->subspriteMode = SUBSPRITES_OFF;
             data[0]++;
         case 1:
             sub_808D38C(object, &data[1]);
diff --git a/src/field_specials.c b/src/field_specials.c
index 035e13351..143e61477 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3542,36 +3542,36 @@ bool8 IsDestinationBoxFull(void)
     return FALSE;
 }
 
-void CreateUnusualWeatherEvent(void)
+void CreateAbnormalWeatherEvent(void)
 {
     u16 randomValue = Random();
-    VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, 0);
+    VarSet(VAR_ABNORMAL_WEATHER_STEP_COUNTER, 0);
 
     if (FlagGet(FLAG_DEFEATED_KYOGRE) == TRUE)
     {
-        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START);
+        VarSet(VAR_ABNORMAL_WEATHER_LOCATION, (randomValue % ABNORMAL_WEATHER_COUNT_PER_LEGENDARY) + ABNORMAL_WEATHER_GROUDON_LOCATIONS_START);
     }
     else if (FlagGet(FLAG_DEFEATED_GROUDON) == TRUE)
     {
-        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START);
+        VarSet(VAR_ABNORMAL_WEATHER_LOCATION, (randomValue % ABNORMAL_WEATHER_COUNT_PER_LEGENDARY) + ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START);
     }
     else if ((randomValue & 1) == 0)
     {
         randomValue = Random();
-        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START);
+        VarSet(VAR_ABNORMAL_WEATHER_LOCATION, (randomValue % ABNORMAL_WEATHER_COUNT_PER_LEGENDARY) + ABNORMAL_WEATHER_GROUDON_LOCATIONS_START);
     }
     else
     {
         randomValue = Random();
-        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START);
+        VarSet(VAR_ABNORMAL_WEATHER_LOCATION, (randomValue % ABNORMAL_WEATHER_COUNT_PER_LEGENDARY) + ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START);
     }
 }
 
-// Saves the map name for the current unusual weather location in gStringVar1, then
+// Saves the map name for the current abnormal weather location in gStringVar1, then
 // returns TRUE if the weather is for Kyogre, and FALSE if it's for Groudon.
-bool32 GetUnusualWeatherMapNameAndType(void)
+bool32 GetAbnormalWeatherMapNameAndType(void)
 {
-    static const u8 sUnusualWeatherMapNumbers[] = {
+    static const u8 sAbnormalWeatherMapNumbers[] = {
         MAP_NUM(ROUTE114),
         MAP_NUM(ROUTE114),
         MAP_NUM(ROUTE115),
@@ -3590,11 +3590,11 @@ bool32 GetUnusualWeatherMapNameAndType(void)
         MAP_NUM(ROUTE129)
     };
 
-    u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
+    u16 abnormalWeather = VarGet(VAR_ABNORMAL_WEATHER_LOCATION);
 
-    GetMapName(gStringVar1, sUnusualWeatherMapNumbers[unusualWeather - 1], 0);
+    GetMapName(gStringVar1, sAbnormalWeatherMapNumbers[abnormalWeather - 1], 0);
 
-    if (unusualWeather < UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START)
+    if (abnormalWeather < ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START)
     {
         return FALSE;
     }
@@ -3604,10 +3604,10 @@ bool32 GetUnusualWeatherMapNameAndType(void)
     }
 }
 
-bool8 UnusualWeatherHasExpired(void)
+bool8 AbnormalWeatherHasExpired(void)
 {
     // Duplicate array.
-    static const u8 sUnusualWeatherMapNumbers_2[] = {
+    static const u8 sAbnormalWeatherMapNumbers[] = {
         MAP_NUM(ROUTE114),
         MAP_NUM(ROUTE114),
         MAP_NUM(ROUTE115),
@@ -3626,17 +3626,17 @@ bool8 UnusualWeatherHasExpired(void)
         MAP_NUM(ROUTE129)
     };
 
-    u16 steps = VarGet(VAR_UNUSUAL_WEATHER_STEP_COUNTER);
-    u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
+    u16 steps = VarGet(VAR_ABNORMAL_WEATHER_STEP_COUNTER);
+    u16 abnormalWeather = VarGet(VAR_ABNORMAL_WEATHER_LOCATION);
 
-    if (unusualWeather == UNUSUAL_WEATHER_NONE)
+    if (abnormalWeather == ABNORMAL_WEATHER_NONE)
     {
         return FALSE;
     }
 
     if (++steps > 999)
     {
-        VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, 0);
+        VarSet(VAR_ABNORMAL_WEATHER_STEP_COUNTER, 0);
         if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER_MARINE_CAVE))
         {
             switch (gSaveBlock1Ptr->location.mapNum)
@@ -3646,7 +3646,7 @@ bool8 UnusualWeatherHasExpired(void)
                 case MAP_NUM(MARINE_CAVE_END):
                 case MAP_NUM(TERRA_CAVE_ENTRANCE):
                 case MAP_NUM(TERRA_CAVE_END):
-                    VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 1);
+                    VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1);
                     return FALSE;
                 default:
                     break;
@@ -3661,27 +3661,27 @@ bool8 UnusualWeatherHasExpired(void)
                 case MAP_NUM(UNDERWATER5):
                 case MAP_NUM(UNDERWATER6):
                 case MAP_NUM(UNDERWATER7):
-                    VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 1);
+                    VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1);
                     return FALSE;
                 default:
                     break;
             }
         }
 
-        if (gSaveBlock1Ptr->location.mapNum == sUnusualWeatherMapNumbers_2[unusualWeather - 1] &&
+        if (gSaveBlock1Ptr->location.mapNum == sAbnormalWeatherMapNumbers[abnormalWeather - 1] &&
             gSaveBlock1Ptr->location.mapGroup == 0)
         {
             return TRUE;
         }
         else
         {
-            VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE);
+            VarSet(VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE);
             return FALSE;
         }
     }
     else
     {
-        VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, steps);
+        VarSet(VAR_ABNORMAL_WEATHER_STEP_COUNTER, steps);
         return FALSE;
     }
 }
diff --git a/src/field_weather.c b/src/field_weather.c
index 024b6631f..684a86479 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -56,7 +56,7 @@ static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 bl
 static void ApplyFogBlend(u8 blendCoeff, u16 blendColor);
 static bool8 FadeInScreen_RainShowShade(void);
 static bool8 FadeInScreen_Drought(void);
-static bool8 FadeInScreen_Fog1(void);
+static bool8 FadeInScreen_FogHorizontal(void);
 static void FadeInScreenWithWeather(void);
 static void DoNothing(void);
 static void Task_WeatherInit(u8 taskId);
@@ -89,29 +89,29 @@ struct Weather *const gWeatherPtr = &gWeather;
 
 static const struct WeatherCallbacks sWeatherFuncs[] =
 {
-    {None_Init,          None_Main,      None_Init,         None_Finish},
-    {Clouds_InitVars,    Clouds_Main,    Clouds_InitAll,    Clouds_Finish},
-    {Sunny_InitVars,     Sunny_Main,     Sunny_InitAll,     Sunny_Finish},
-    {LightRain_InitVars, LightRain_Main, LightRain_InitAll, LightRain_Finish},
-    {Snow_InitVars,      Snow_Main,      Snow_InitAll,      Snow_Finish},
-    {MedRain_InitVars,   Rain_Main,      MedRain_InitAll,   Rain_Finish},
-    {Fog1_InitVars,      Fog1_Main,      Fog1_InitAll,      Fog1_Finish},
-    {Ash_InitVars,       Ash_Main,       Ash_InitAll,       Ash_Finish},
-    {Sandstorm_InitVars, Sandstorm_Main, Sandstorm_InitAll, Sandstorm_Finish},
-    {Fog2_InitVars,      Fog2_Main,      Fog2_InitAll,      Fog2_Finish},
-    {Fog1_InitVars,      Fog1_Main,      Fog1_InitAll,      Fog1_Finish},
-    {Shade_InitVars,     Shade_Main,     Shade_InitAll,     Shade_Finish},
-    {Drought_InitVars,   Drought_Main,   Drought_InitAll,   Drought_Finish},
-    {HeavyRain_InitVars, Rain_Main,      HeavyRain_InitAll, Rain_Finish},
-    {Bubbles_InitVars,   Bubbles_Main,   Bubbles_InitAll,   Bubbles_Finish},
+    [WEATHER_NONE]               = {None_Init,              None_Main,          None_Init,             None_Finish},
+    [WEATHER_SUNNY_CLOUDS]       = {Clouds_InitVars,        Clouds_Main,        Clouds_InitAll,        Clouds_Finish},
+    [WEATHER_SUNNY]              = {Sunny_InitVars,         Sunny_Main,         Sunny_InitAll,         Sunny_Finish},
+    [WEATHER_RAIN]               = {Rain_InitVars,          Rain_Main,          Rain_InitAll,          Rain_Finish},
+    [WEATHER_SNOW]               = {Snow_InitVars,          Snow_Main,          Snow_InitAll,          Snow_Finish},
+    [WEATHER_RAIN_THUNDERSTORM]  = {Thunderstorm_InitVars,  Thunderstorm_Main,  Thunderstorm_InitAll,  Thunderstorm_Finish},
+    [WEATHER_FOG_HORIZONTAL]     = {FogHorizontal_InitVars, FogHorizontal_Main, FogHorizontal_InitAll, FogHorizontal_Finish},
+    [WEATHER_VOLCANIC_ASH]       = {Ash_InitVars,           Ash_Main,           Ash_InitAll,           Ash_Finish},
+    [WEATHER_SANDSTORM]          = {Sandstorm_InitVars,     Sandstorm_Main,     Sandstorm_InitAll,     Sandstorm_Finish},
+    [WEATHER_FOG_DIAGONAL]       = {FogDiagonal_InitVars,   FogDiagonal_Main,   FogDiagonal_InitAll,   FogDiagonal_Finish},
+    [WEATHER_UNDERWATER]         = {FogHorizontal_InitVars, FogHorizontal_Main, FogHorizontal_InitAll, FogHorizontal_Finish},
+    [WEATHER_SHADE]              = {Shade_InitVars,         Shade_Main,         Shade_InitAll,         Shade_Finish},
+    [WEATHER_DROUGHT]            = {Drought_InitVars,       Drought_Main,       Drought_InitAll,       Drought_Finish},
+    [WEATHER_DOWNPOUR]           = {Downpour_InitVars,      Thunderstorm_Main,  Downpour_InitAll,      Thunderstorm_Finish},
+    [WEATHER_UNDERWATER_BUBBLES] = {Bubbles_InitVars,       Bubbles_Main,       Bubbles_InitAll,       Bubbles_Finish},
 };
 
 void (*const gWeatherPalStateFuncs[])(void) =
 {
-    UpdateWeatherGammaShift, // WEATHER_PAL_STATE_CHANGING_WEATHER
-    FadeInScreenWithWeather, // WEATHER_PAL_STATE_SCREEN_FADING_IN
-    DoNothing,               // WEATHER_PAL_STATE_SCREEN_FADING_OUT
-    DoNothing,               // WEATHER_PAL_STATE_IDLE
+    [WEATHER_PAL_STATE_CHANGING_WEATHER]  = UpdateWeatherGammaShift,
+    [WEATHER_PAL_STATE_SCREEN_FADING_IN]  = FadeInScreenWithWeather,
+    [WEATHER_PAL_STATE_SCREEN_FADING_OUT] = DoNothing,               
+    [WEATHER_PAL_STATE_IDLE]              = DoNothing,             
 };
 
 // This table specifies which of the gamma shift tables should be
@@ -171,8 +171,8 @@ void StartWeather(void)
         gWeatherPtr->cloudSpritesCreated = 0;
         gWeatherPtr->snowflakeSpriteCount = 0;
         gWeatherPtr->ashSpritesCreated = 0;
-        gWeatherPtr->fog1SpritesCreated = 0;
-        gWeatherPtr->fog2SpritesCreated = 0;
+        gWeatherPtr->fogHSpritesCreated = 0;
+        gWeatherPtr->fogDSpritesCreated = 0;
         gWeatherPtr->sandstormSpritesCreated = 0;
         gWeatherPtr->sandstormSwirlSpritesCreated = 0;
         gWeatherPtr->bubblesSpritesCreated = 0;
@@ -188,7 +188,7 @@ void StartWeather(void)
 
 void SetNextWeather(u8 weather)
 {
-    if (weather != WEATHER_RAIN_LIGHT && weather != WEATHER_RAIN_MED && weather != WEATHER_RAIN_HEAVY)
+    if (weather != WEATHER_RAIN && weather != WEATHER_RAIN_THUNDERSTORM && weather != WEATHER_DOWNPOUR)
     {
         PlayRainStoppingSoundEffect();
     }
@@ -371,9 +371,9 @@ static void FadeInScreenWithWeather(void)
 
     switch (gWeatherPtr->currWeather)
     {
-    case WEATHER_RAIN_LIGHT:
-    case WEATHER_RAIN_MED:
-    case WEATHER_RAIN_HEAVY:
+    case WEATHER_RAIN:
+    case WEATHER_RAIN_THUNDERSTORM:
+    case WEATHER_DOWNPOUR:
     case WEATHER_SNOW:
     case WEATHER_SHADE:
         if (FadeInScreen_RainShowShade() == FALSE)
@@ -389,17 +389,17 @@ static void FadeInScreenWithWeather(void)
             gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
         }
         break;
-    case WEATHER_FOG_1:
-        if (FadeInScreen_Fog1() == FALSE)
+    case WEATHER_FOG_HORIZONTAL:
+        if (FadeInScreen_FogHorizontal() == FALSE)
         {
             gWeatherPtr->gammaIndex = 0;
             gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
         }
         break;
-    case WEATHER_ASH:
+    case WEATHER_VOLCANIC_ASH:
     case WEATHER_SANDSTORM:
-    case WEATHER_FOG_2:
-    case WEATHER_FOG_3:
+    case WEATHER_FOG_DIAGONAL:
+    case WEATHER_UNDERWATER:
     default:
         if (!gPaletteFade.active)
         {
@@ -442,7 +442,7 @@ static bool8 FadeInScreen_Drought(void)
     return TRUE;
 }
 
-static bool8 FadeInScreen_Fog1(void)
+static bool8 FadeInScreen_FogHorizontal(void)
 {
     if (gWeatherPtr->fadeScreenCounter == 16)
         return FALSE;
@@ -763,11 +763,11 @@ void FadeScreen(u8 mode, s8 delay)
 
     switch (gWeatherPtr->currWeather)
     {
-    case WEATHER_RAIN_LIGHT:
-    case WEATHER_RAIN_MED:
-    case WEATHER_RAIN_HEAVY:
+    case WEATHER_RAIN:
+    case WEATHER_RAIN_THUNDERSTORM:
+    case WEATHER_DOWNPOUR:
     case WEATHER_SNOW:
-    case WEATHER_FOG_1:
+    case WEATHER_FOG_HORIZONTAL:
     case WEATHER_SHADE:
     case WEATHER_DROUGHT:
         useWeatherPal = TRUE;
@@ -816,7 +816,7 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
     case WEATHER_PAL_STATE_SCREEN_FADING_IN:
         if (gWeatherPtr->unknown_6CA != 0)
         {
-            if (gWeatherPtr->currWeather == WEATHER_FOG_1)
+            if (gWeatherPtr->currWeather == WEATHER_FOG_HORIZONTAL)
                 MarkFogSpritePalToLighten(paletteIndex);
             paletteIndex *= 16;
             for (i = 0; i < 16; i++)
@@ -831,7 +831,7 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
     // WEATHER_PAL_STATE_CHANGING_WEATHER
     // WEATHER_PAL_STATE_CHANGING_IDLE
     default:
-        if (gWeatherPtr->currWeather != WEATHER_FOG_1)
+        if (gWeatherPtr->currWeather != WEATHER_FOG_HORIZONTAL)
         {
             ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex);
         }
@@ -995,28 +995,28 @@ void sub_80AC274(u8 a)
     switch (a)
     {
     case 1:
-        SetWeather(WEATHER_CLOUDS);
+        SetWeather(WEATHER_SUNNY_CLOUDS);
         break;
     case 2:
         SetWeather(WEATHER_SUNNY);
         break;
     case 3:
-        SetWeather(WEATHER_RAIN_LIGHT);
+        SetWeather(WEATHER_RAIN);
         break;
     case 4:
         SetWeather(WEATHER_SNOW);
         break;
     case 5:
-        SetWeather(WEATHER_RAIN_MED);
+        SetWeather(WEATHER_RAIN_THUNDERSTORM);
         break;
     case 6:
-        SetWeather(WEATHER_FOG_1);
+        SetWeather(WEATHER_FOG_HORIZONTAL);
         break;
     case 7:
-        SetWeather(WEATHER_FOG_2);
+        SetWeather(WEATHER_FOG_DIAGONAL);
         break;
     case 8:
-        SetWeather(WEATHER_ASH);
+        SetWeather(WEATHER_VOLCANIC_ASH);
         break;
     case 9:
         SetWeather(WEATHER_SANDSTORM);
diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c
index 7f955c10a..5a48f3434 100644
--- a/src/field_weather_effect.c
+++ b/src/field_weather_effect.c
@@ -14,14 +14,14 @@
 #include "gpu_regs.h"
 
 // EWRAM
-EWRAM_DATA static u8 gCurrentAlternatingWeather = 0;
+EWRAM_DATA static u8 gCurrentAbnormalWeather = 0;
 EWRAM_DATA static u16 gUnusedWeatherRelated = 0;
 
 // CONST
 const u16 gCloudsWeatherPalette[] = INCBIN_U16("graphics/weather/cloud.gbapal");
 const u16 gSandstormWeatherPalette[] = INCBIN_U16("graphics/weather/sandstorm.gbapal");
-const u8 gWeatherFog2Tiles[] = INCBIN_U8("graphics/weather/fog2.4bpp");
-const u8 gWeatherFog1Tiles[] = INCBIN_U8("graphics/weather/fog1.4bpp");
+const u8 gWeatherFogDiagonalTiles[] = INCBIN_U8("graphics/weather/fog_diagonal.4bpp");
+const u8 gWeatherFogHorizontalTiles[] = INCBIN_U8("graphics/weather/fog_horizontal.4bpp");
 const u8 gWeatherCloudTiles[] = INCBIN_U8("graphics/weather/cloud.4bpp");
 const u8 gWeatherSnow1Tiles[] = INCBIN_U8("graphics/weather/snow0.4bpp");
 const u8 gWeatherSnow2Tiles[] = INCBIN_U8("graphics/weather/snow1.4bpp");
@@ -31,7 +31,7 @@ const u8 gWeatherRainTiles[] = INCBIN_U8("graphics/weather/rain.4bpp");
 const u8 gWeatherSandstormTiles[] = INCBIN_U8("graphics/weather/sandstorm.4bpp");
 
 //------------------------------------------------------------------------------
-// Clouds
+// WEATHER_SUNNY_CLOUDS
 //------------------------------------------------------------------------------
 
 static void CreateCloudSprites(void);
@@ -57,10 +57,10 @@ static const struct SpriteSheet sCloudSpriteSheet =
 static const struct OamData sCloudSpriteOamData =
 {
     .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -227,7 +227,7 @@ static void UpdateCloudSprite(struct Sprite *sprite)
 }
 
 //------------------------------------------------------------------------------
-// Drought
+// WEATHER_DROUGHT
 //------------------------------------------------------------------------------
 
 static void UpdateDroughtBlend(u8);
@@ -352,7 +352,7 @@ static void UpdateDroughtBlend(u8 taskId)
 #undef tWinRange
 
 //------------------------------------------------------------------------------
-// Light Rain
+// WEATHER_RAIN
 //------------------------------------------------------------------------------
 
 static void LoadRainSpriteSheet(void);
@@ -392,10 +392,10 @@ static const struct Coords16 sRainSpriteCoords[] =
 static const struct OamData sRainSpriteOamData =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x32),
     .x = 0,
     .matrixNum = 0,
@@ -469,27 +469,27 @@ static const struct SpriteSheet sRainSpriteSheet =
     .tag = 0x1206,
 };
 
-void LightRain_InitVars(void)
+void Rain_InitVars(void)
 {
     gWeatherPtr->initStep = 0;
     gWeatherPtr->weatherGfxLoaded = FALSE;
     gWeatherPtr->rainSpriteVisibleCounter = 0;
     gWeatherPtr->rainSpriteVisibleDelay = 8;
-    gWeatherPtr->isHeavyRain = 0;
+    gWeatherPtr->isDownpour = FALSE;
     gWeatherPtr->targetRainSpriteCount = 10;
     gWeatherPtr->gammaTargetIndex = 3;
     gWeatherPtr->gammaStepDelay = 20;
     SetRainStrengthFromSoundEffect(SE_T_KOAME);
 }
 
-void LightRain_InitAll(void)
+void Rain_InitAll(void)
 {
-    LightRain_InitVars();
+    Rain_InitVars();
     while (!gWeatherPtr->weatherGfxLoaded)
-        LightRain_Main();
+        Rain_Main();
 }
 
-void LightRain_Main(void)
+void Rain_Main(void)
 {
     switch (gWeatherPtr->initStep)
     {
@@ -511,14 +511,14 @@ void LightRain_Main(void)
     }
 }
 
-bool8 LightRain_Finish(void)
+bool8 Rain_Finish(void)
 {
     switch (gWeatherPtr->finishStep)
     {
     case 0:
-        if (gWeatherPtr->nextWeather == WEATHER_RAIN_LIGHT
-         || gWeatherPtr->nextWeather == WEATHER_RAIN_MED
-         || gWeatherPtr->nextWeather == WEATHER_RAIN_HEAVY)
+        if (gWeatherPtr->nextWeather == WEATHER_RAIN
+         || gWeatherPtr->nextWeather == WEATHER_RAIN_THUNDERSTORM
+         || gWeatherPtr->nextWeather == WEATHER_DOWNPOUR)
         {
             gWeatherPtr->finishStep = 0xFF;
             return FALSE;
@@ -563,7 +563,7 @@ static void StartRainSpriteFall(struct Sprite *sprite)
     rand = sprite->tRandom * 1103515245 + 12345;
     sprite->tRandom = ((rand & 0x7FFF0000) >> 16) % 600;
 
-    numFallingFrames = sRainSpriteFallingDurations[gWeatherPtr->isHeavyRain][0];
+    numFallingFrames = sRainSpriteFallingDurations[gWeatherPtr->isDownpour][0];
 
     tileX = sprite->tRandom % 30;
     sprite->tPosX = tileX * 8; // Useless assignment, leftover from before fixed-point values were used
@@ -578,8 +578,8 @@ static void StartRainSpriteFall(struct Sprite *sprite)
     sprite->tPosY <<= 7; // This is tileX * 8, using a fixed-point value with 4 decimal places
 
     // "Rewind" the rain sprites, from their ending position.
-    sprite->tPosX -= sRainSpriteMovement[gWeatherPtr->isHeavyRain][0] * numFallingFrames;
-    sprite->tPosY -= sRainSpriteMovement[gWeatherPtr->isHeavyRain][1] * numFallingFrames;
+    sprite->tPosX -= sRainSpriteMovement[gWeatherPtr->isDownpour][0] * numFallingFrames;
+    sprite->tPosY -= sRainSpriteMovement[gWeatherPtr->isDownpour][1] * numFallingFrames;
 
     StartSpriteAnim(sprite, 0);
     sprite->tState = 0;
@@ -592,8 +592,8 @@ static void UpdateRainSprite(struct Sprite *sprite)
     if (sprite->tState == 0)
     {
         // Raindrop is in its "falling" motion.
-        sprite->tPosX += sRainSpriteMovement[gWeatherPtr->isHeavyRain][0];
-        sprite->tPosY += sRainSpriteMovement[gWeatherPtr->isHeavyRain][1];
+        sprite->tPosX += sRainSpriteMovement[gWeatherPtr->isDownpour][0];
+        sprite->tPosY += sRainSpriteMovement[gWeatherPtr->isDownpour][1];
         sprite->pos1.x = sprite->tPosX >> 4;
         sprite->pos1.y = sprite->tPosY >> 4;
 
@@ -607,7 +607,7 @@ static void UpdateRainSprite(struct Sprite *sprite)
         if (--sprite->tCounter == 0)
         {
             // Make raindrop splash on the ground
-            StartSpriteAnim(sprite, gWeatherPtr->isHeavyRain + 1);
+            StartSpriteAnim(sprite, gWeatherPtr->isDownpour + 1);
             sprite->tState = 1;
             sprite->pos1.x -= gSpriteCoordOffsetX;
             sprite->pos1.y -= gSpriteCoordOffsetY;
@@ -637,9 +637,9 @@ static void WaitRainSprite(struct Sprite *sprite)
 
 static void InitRainSpriteMovement(struct Sprite *sprite, u16 val)
 {
-    u16 numFallingFrames = sRainSpriteFallingDurations[gWeatherPtr->isHeavyRain][0];
-    u16 numAdvanceRng = val / (sRainSpriteFallingDurations[gWeatherPtr->isHeavyRain][1] + numFallingFrames);
-    u16 frameVal = val % (sRainSpriteFallingDurations[gWeatherPtr->isHeavyRain][1] + numFallingFrames);
+    u16 numFallingFrames = sRainSpriteFallingDurations[gWeatherPtr->isDownpour][0];
+    u16 numAdvanceRng = val / (sRainSpriteFallingDurations[gWeatherPtr->isDownpour][1] + numFallingFrames);
+    u16 frameVal = val % (sRainSpriteFallingDurations[gWeatherPtr->isDownpour][1] + numFallingFrames);
 
     while (--numAdvanceRng != 0xFFFF)
         StartRainSpriteFall(sprite);
@@ -839,10 +839,10 @@ static bool8 UpdateVisibleSnowflakeSprites(void)
 static const struct OamData sSnowflakeSpriteOamData =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
@@ -1009,16 +1009,16 @@ static void UpdateSnowflakeSprite(struct Sprite *sprite)
 #undef tDeltaY2
 
 //------------------------------------------------------------------------------
-// Medium Rain
+// WEATHER_RAIN_THUNDERSTORM
 //------------------------------------------------------------------------------
 
-void MedRain_InitVars(void)
+void Thunderstorm_InitVars(void)
 {
     gWeatherPtr->initStep = 0;
     gWeatherPtr->weatherGfxLoaded = FALSE;
     gWeatherPtr->rainSpriteVisibleCounter = 0;
     gWeatherPtr->rainSpriteVisibleDelay = 4;
-    gWeatherPtr->isHeavyRain = 0;
+    gWeatherPtr->isDownpour = FALSE;
     gWeatherPtr->targetRainSpriteCount = 16;
     gWeatherPtr->gammaTargetIndex = 3;
     gWeatherPtr->gammaStepDelay = 20;
@@ -1027,27 +1027,27 @@ void MedRain_InitVars(void)
     SetRainStrengthFromSoundEffect(SE_T_AME);
 }
 
-void MedRain_InitAll(void)
+void Thunderstorm_InitAll(void)
 {
-    MedRain_InitVars();
+    Thunderstorm_InitVars();
     while (gWeatherPtr->weatherGfxLoaded == FALSE)
-        Rain_Main();
+        Thunderstorm_Main();
 }
 
 //------------------------------------------------------------------------------
-// Heavy Rain
+// WEATHER_DOWNPOUR
 //------------------------------------------------------------------------------
 
 static void UpdateThunderSound(void);
 static void SetThunderCounter(u16);
 
-void HeavyRain_InitVars(void)
+void Downpour_InitVars(void)
 {
     gWeatherPtr->initStep = 0;
     gWeatherPtr->weatherGfxLoaded = FALSE;
     gWeatherPtr->rainSpriteVisibleCounter = 0;
     gWeatherPtr->rainSpriteVisibleDelay = 4;
-    gWeatherPtr->isHeavyRain = 1;
+    gWeatherPtr->isDownpour = TRUE;
     gWeatherPtr->targetRainSpriteCount = 24;
     gWeatherPtr->gammaTargetIndex = 3;
     gWeatherPtr->gammaStepDelay = 20;
@@ -1055,14 +1055,14 @@ void HeavyRain_InitVars(void)
     SetRainStrengthFromSoundEffect(SE_T_OOAME);
 }
 
-void HeavyRain_InitAll(void)
+void Downpour_InitAll(void)
 {
-    HeavyRain_InitVars();
+    Downpour_InitVars();
     while (gWeatherPtr->weatherGfxLoaded == FALSE)
-        Rain_Main();
+        Thunderstorm_Main();
 }
 
-void Rain_Main(void)
+void Thunderstorm_Main(void)
 {
     UpdateThunderSound();
     switch (gWeatherPtr->initStep)
@@ -1166,7 +1166,7 @@ void Rain_Main(void)
     }
 }
 
-bool8 Rain_Finish(void)
+bool8 Thunderstorm_Finish(void)
 {
     switch (gWeatherPtr->finishStep)
     {
@@ -1175,12 +1175,12 @@ bool8 Rain_Finish(void)
         gWeatherPtr->finishStep++;
         // fall through
     case 1:
-        Rain_Main();
+        Thunderstorm_Main();
         if (gWeatherPtr->unknown_6EA)
         {
-            if (gWeatherPtr->nextWeather == WEATHER_RAIN_LIGHT
-             || gWeatherPtr->nextWeather == WEATHER_RAIN_MED
-             || gWeatherPtr->nextWeather == WEATHER_RAIN_HEAVY)
+            if (gWeatherPtr->nextWeather == WEATHER_RAIN
+             || gWeatherPtr->nextWeather == WEATHER_RAIN_THUNDERSTORM
+             || gWeatherPtr->nextWeather == WEATHER_DOWNPOUR)
                 return FALSE;
 
             gWeatherPtr->targetRainSpriteCount = 0;
@@ -1235,7 +1235,7 @@ static void UpdateThunderSound(void)
 }
 
 //------------------------------------------------------------------------------
-// Fog 1
+// WEATHER_FOG_HORIZONTAL and WEATHER_UNDERWATER
 //------------------------------------------------------------------------------
 
 // unused data
@@ -1244,10 +1244,10 @@ static const u16 unusedData_839AB1C[] = {0, 6, 6, 12, 18, 42, 300, 300};
 static const struct OamData gOamData_839AB2C =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 1,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_BLEND,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -1315,8 +1315,8 @@ static const union AffineAnimCmd *const gSpriteAffineAnimTable_839AB8C[] =
     gSpriteAffineAnim_839AB7C,
 };
 
-static void Fog1SpriteCallback(struct Sprite *);
-static const struct SpriteTemplate sFog1SpriteTemplate =
+static void FogHorizontalSpriteCallback(struct Sprite *);
+static const struct SpriteTemplate sFogHorizontalSpriteTemplate =
 {
     .tileTag = 0x1201,
     .paletteTag = 0x1200,
@@ -1324,48 +1324,48 @@ static const struct SpriteTemplate sFog1SpriteTemplate =
     .anims = gSpriteAnimTable_839AB64,
     .images = NULL,
     .affineAnims = gSpriteAffineAnimTable_839AB8C,
-    .callback = Fog1SpriteCallback,
+    .callback = FogHorizontalSpriteCallback,
 };
 
-void Fog1_Main(void);
-static void CreateFog1Sprites(void);
-static void DestroyFog1Sprites(void);
+void FogHorizontal_Main(void);
+static void CreateFogHorizontalSprites(void);
+static void DestroyFogHorizontalSprites(void);
 
-void Fog1_InitVars(void)
+void FogHorizontal_InitVars(void)
 {
     gWeatherPtr->initStep = 0;
     gWeatherPtr->weatherGfxLoaded = FALSE;
     gWeatherPtr->gammaTargetIndex = 0;
     gWeatherPtr->gammaStepDelay = 20;
-    if (gWeatherPtr->fog1SpritesCreated == 0)
+    if (gWeatherPtr->fogHSpritesCreated == 0)
     {
-        gWeatherPtr->fog1ScrollCounter = 0;
-        gWeatherPtr->fog1ScrollOffset = 0;
-        gWeatherPtr->fog1ScrollPosX = 0;
+        gWeatherPtr->fogHScrollCounter = 0;
+        gWeatherPtr->fogHScrollOffset = 0;
+        gWeatherPtr->fogHScrollPosX = 0;
         Weather_SetBlendCoeffs(0, 16);
     }
 }
 
-void Fog1_InitAll(void)
+void FogHorizontal_InitAll(void)
 {
-    Fog1_InitVars();
+    FogHorizontal_InitVars();
     while (gWeatherPtr->weatherGfxLoaded == FALSE)
-        Fog1_Main();
+        FogHorizontal_Main();
 }
 
-void Fog1_Main(void)
+void FogHorizontal_Main(void)
 {
-    gWeatherPtr->fog1ScrollPosX = (gSpriteCoordOffsetX - gWeatherPtr->fog1ScrollOffset) & 0xFF;
-    if (++gWeatherPtr->fog1ScrollCounter > 3)
+    gWeatherPtr->fogHScrollPosX = (gSpriteCoordOffsetX - gWeatherPtr->fogHScrollOffset) & 0xFF;
+    if (++gWeatherPtr->fogHScrollCounter > 3)
     {
-        gWeatherPtr->fog1ScrollCounter = 0;
-        gWeatherPtr->fog1ScrollOffset++;
+        gWeatherPtr->fogHScrollCounter = 0;
+        gWeatherPtr->fogHScrollOffset++;
     }
     switch (gWeatherPtr->initStep)
     {
     case 0:
-        CreateFog1Sprites();
-        if (gWeatherPtr->currWeather == WEATHER_FOG_1)
+        CreateFogHorizontalSprites();
+        if (gWeatherPtr->currWeather == WEATHER_FOG_HORIZONTAL)
             Weather_SetTargetBlendCoeffs(12, 8, 3);
         else
             Weather_SetTargetBlendCoeffs(4, 16, 0);
@@ -1381,13 +1381,13 @@ void Fog1_Main(void)
     }
 }
 
-bool8 Fog1_Finish(void)
+bool8 FogHorizontal_Finish(void)
 {
-    gWeatherPtr->fog1ScrollPosX = (gSpriteCoordOffsetX - gWeatherPtr->fog1ScrollOffset) & 0xFF;
-    if (++gWeatherPtr->fog1ScrollCounter > 3)
+    gWeatherPtr->fogHScrollPosX = (gSpriteCoordOffsetX - gWeatherPtr->fogHScrollOffset) & 0xFF;
+    if (++gWeatherPtr->fogHScrollCounter > 3)
     {
-        gWeatherPtr->fog1ScrollCounter = 0;
-        gWeatherPtr->fog1ScrollOffset++;
+        gWeatherPtr->fogHScrollCounter = 0;
+        gWeatherPtr->fogHScrollOffset++;
     }
 
     switch (gWeatherPtr->finishStep)
@@ -1401,7 +1401,7 @@ bool8 Fog1_Finish(void)
             gWeatherPtr->finishStep++;
         break;
     case 2:
-        DestroyFog1Sprites();
+        DestroyFogHorizontalSprites();
         gWeatherPtr->finishStep++;
         break;
     default:
@@ -1412,73 +1412,73 @@ bool8 Fog1_Finish(void)
 
 #define tSpriteColumn data[0]
 
-static void Fog1SpriteCallback(struct Sprite *sprite)
+static void FogHorizontalSpriteCallback(struct Sprite *sprite)
 {
     sprite->pos2.y = (u8)gSpriteCoordOffsetY;
-    sprite->pos1.x = gWeatherPtr->fog1ScrollPosX + 32 + sprite->tSpriteColumn * 64;
+    sprite->pos1.x = gWeatherPtr->fogHScrollPosX + 32 + sprite->tSpriteColumn * 64;
     if (sprite->pos1.x > 271)
     {
-        sprite->pos1.x = 480 + gWeatherPtr->fog1ScrollPosX - (4 - sprite->tSpriteColumn) * 64;
+        sprite->pos1.x = 480 + gWeatherPtr->fogHScrollPosX - (4 - sprite->tSpriteColumn) * 64;
         sprite->pos1.x &= 0x1FF;
     }
 }
 
-static void CreateFog1Sprites(void)
+static void CreateFogHorizontalSprites(void)
 {
     u16 i;
     u8 spriteId;
     struct Sprite *sprite;
 
-    if (!gWeatherPtr->fog1SpritesCreated)
+    if (!gWeatherPtr->fogHSpritesCreated)
     {
-        struct SpriteSheet fog1SpriteSheet = {
-            .data = gWeatherFog1Tiles,
-            .size = sizeof(gWeatherFog1Tiles),
+        struct SpriteSheet fogHorizontalSpriteSheet = {
+            .data = gWeatherFogHorizontalTiles,
+            .size = sizeof(gWeatherFogHorizontalTiles),
             .tag = 0x1201,
         };
-        LoadSpriteSheet(&fog1SpriteSheet);
-        for (i = 0; i < NUM_FOG1_SPRITES; i++)
+        LoadSpriteSheet(&fogHorizontalSpriteSheet);
+        for (i = 0; i < NUM_FOG_HORIZONTAL_SPRITES; i++)
         {
-            spriteId = CreateSpriteAtEnd(&sFog1SpriteTemplate, 0, 0, 0xFF);
+            spriteId = CreateSpriteAtEnd(&sFogHorizontalSpriteTemplate, 0, 0, 0xFF);
             if (spriteId != MAX_SPRITES)
             {
                 sprite = &gSprites[spriteId];
                 sprite->tSpriteColumn = i % 5;
                 sprite->pos1.x = (i % 5) * 64 + 32;
                 sprite->pos1.y = (i / 5) * 64 + 32;
-                gWeatherPtr->sprites.s2.fog1Sprites[i] = sprite;
+                gWeatherPtr->sprites.s2.fogHSprites[i] = sprite;
             }
             else
             {
-                gWeatherPtr->sprites.s2.fog1Sprites[i] = NULL;
+                gWeatherPtr->sprites.s2.fogHSprites[i] = NULL;
             }
         }
 
-        gWeatherPtr->fog1SpritesCreated = TRUE;
+        gWeatherPtr->fogHSpritesCreated = TRUE;
     }
 }
 
-static void DestroyFog1Sprites(void)
+static void DestroyFogHorizontalSprites(void)
 {
     u16 i;
 
-    if (gWeatherPtr->fog1SpritesCreated)
+    if (gWeatherPtr->fogHSpritesCreated)
     {
-        for (i = 0; i < NUM_FOG1_SPRITES; i++)
+        for (i = 0; i < NUM_FOG_HORIZONTAL_SPRITES; i++)
         {
-            if (gWeatherPtr->sprites.s2.fog1Sprites[i] != NULL)
-                DestroySprite(gWeatherPtr->sprites.s2.fog1Sprites[i]);
+            if (gWeatherPtr->sprites.s2.fogHSprites[i] != NULL)
+                DestroySprite(gWeatherPtr->sprites.s2.fogHSprites[i]);
         }
 
         FreeSpriteTilesByTag(0x1201);
-        gWeatherPtr->fog1SpritesCreated = 0;
+        gWeatherPtr->fogHSpritesCreated = 0;
     }
 }
 
 #undef tSpriteColumn
 
 //------------------------------------------------------------------------------
-// Volcanic ash
+// WEATHER_VOLCANIC_ASH
 //------------------------------------------------------------------------------
 
 static void LoadAshSpriteSheet(void);
@@ -1688,48 +1688,48 @@ static void UpdateAshSprite(struct Sprite *sprite)
 #undef tSpriteRow
 
 //------------------------------------------------------------------------------
-// Fog 2
+// WEATHER_FOG_DIAGONAL
 //------------------------------------------------------------------------------
 
-static void UpdateFog2Movement(void);
-static void CreateFog2Sprites(void);
-static void DestroyFog2Sprites(void);
-static void UpdateFog2Sprite(struct Sprite *);
+static void UpdateFogDiagonalMovement(void);
+static void CreateFogDiagonalSprites(void);
+static void DestroyFogDiagonalSprites(void);
+static void UpdateFogDiagonalSprite(struct Sprite *);
 
-void Fog2_InitVars(void)
+void FogDiagonal_InitVars(void)
 {
     gWeatherPtr->initStep = 0;
     gWeatherPtr->weatherGfxLoaded = 0;
     gWeatherPtr->gammaTargetIndex = 0;
     gWeatherPtr->gammaStepDelay = 20;
-    gWeatherPtr->fog1ScrollCounter = 0;
-    gWeatherPtr->fog1ScrollOffset = 1;
-    if (!gWeatherPtr->fog2SpritesCreated)
-    {
-        gWeatherPtr->fog2ScrollXCounter = 0;
-        gWeatherPtr->fog2ScrollYCounter = 0;
-        gWeatherPtr->fog2XOffset = 0;
-        gWeatherPtr->fog2YOffset = 0;
-        gWeatherPtr->fog2BaseSpritesX = 0;
-        gWeatherPtr->fog2PosY = 0;
+    gWeatherPtr->fogHScrollCounter = 0;
+    gWeatherPtr->fogHScrollOffset = 1;
+    if (!gWeatherPtr->fogDSpritesCreated)
+    {
+        gWeatherPtr->fogDScrollXCounter = 0;
+        gWeatherPtr->fogDScrollYCounter = 0;
+        gWeatherPtr->fogDXOffset = 0;
+        gWeatherPtr->fogDYOffset = 0;
+        gWeatherPtr->fogDBaseSpritesX = 0;
+        gWeatherPtr->fogDPosY = 0;
         Weather_SetBlendCoeffs(0, 16);
     }
 }
 
-void Fog2_InitAll(void)
+void FogDiagonal_InitAll(void)
 {
-    Fog2_InitVars();
+    FogDiagonal_InitVars();
     while (gWeatherPtr->weatherGfxLoaded == FALSE)
-        Fog2_Main();
+        FogDiagonal_Main();
 }
 
-void Fog2_Main(void)
+void FogDiagonal_Main(void)
 {
-    UpdateFog2Movement();
+    UpdateFogDiagonalMovement();
     switch (gWeatherPtr->initStep)
     {
     case 0:
-        CreateFog2Sprites();
+        CreateFogDiagonalSprites();
         gWeatherPtr->initStep++;
         break;
     case 1:
@@ -1745,9 +1745,9 @@ void Fog2_Main(void)
     }
 }
 
-bool8 Fog2_Finish(void)
+bool8 FogDiagonal_Finish(void)
 {
-    UpdateFog2Movement();
+    UpdateFogDiagonalMovement();
     switch (gWeatherPtr->finishStep)
     {
     case 0:
@@ -1760,7 +1760,7 @@ bool8 Fog2_Finish(void)
         gWeatherPtr->finishStep++;
         break;
     case 2:
-        DestroyFog2Sprites();
+        DestroyFogDiagonalSprites();
         gWeatherPtr->finishStep++;
         break;
     default:
@@ -1769,32 +1769,32 @@ bool8 Fog2_Finish(void)
     return TRUE;
 }
 
-static void UpdateFog2Movement(void)
+static void UpdateFogDiagonalMovement(void)
 {
-    if (++gWeatherPtr->fog2ScrollXCounter > 2)
+    if (++gWeatherPtr->fogDScrollXCounter > 2)
     {
-        gWeatherPtr->fog2XOffset++;
-        gWeatherPtr->fog2ScrollXCounter = 0;
+        gWeatherPtr->fogDXOffset++;
+        gWeatherPtr->fogDScrollXCounter = 0;
     }
 
-    if (++gWeatherPtr->fog2ScrollYCounter > 4)
+    if (++gWeatherPtr->fogDScrollYCounter > 4)
     {
-        gWeatherPtr->fog2YOffset++;
-        gWeatherPtr->fog2ScrollYCounter = 0;
+        gWeatherPtr->fogDYOffset++;
+        gWeatherPtr->fogDScrollYCounter = 0;
     }
 
-    gWeatherPtr->fog2BaseSpritesX = (gSpriteCoordOffsetX - gWeatherPtr->fog2XOffset) & 0xFF;
-    gWeatherPtr->fog2PosY = gSpriteCoordOffsetY + gWeatherPtr->fog2YOffset;
+    gWeatherPtr->fogDBaseSpritesX = (gSpriteCoordOffsetX - gWeatherPtr->fogDXOffset) & 0xFF;
+    gWeatherPtr->fogDPosY = gSpriteCoordOffsetY + gWeatherPtr->fogDYOffset;
 }
 
-static const struct SpriteSheet gFog2SpriteSheet =
+static const struct SpriteSheet gFogDiagonalSpriteSheet =
 {
-    .data = gWeatherFog2Tiles,
-    .size = sizeof(gWeatherFog2Tiles),
+    .data = gWeatherFogDiagonalTiles,
+    .size = sizeof(gWeatherFogDiagonalTiles),
     .tag = 0x1203,
 };
 
-static const struct OamData sFog2SpriteOamData =
+static const struct OamData sFogDiagonalSpriteOamData =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -1808,86 +1808,86 @@ static const struct OamData sFog2SpriteOamData =
     .paletteNum = 0,
 };
 
-static const union AnimCmd sFog2SpriteAnimCmd0[] =
+static const union AnimCmd sFogDiagonalSpriteAnimCmd0[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const sFog2SpriteAnimCmds[] =
+static const union AnimCmd *const sFogDiagonalSpriteAnimCmds[] =
 {
-    sFog2SpriteAnimCmd0,
+    sFogDiagonalSpriteAnimCmd0,
 };
 
-static const struct SpriteTemplate sFog2SpriteTemplate =
+static const struct SpriteTemplate sFogDiagonalSpriteTemplate =
 {
     .tileTag = 0x1203,
     .paletteTag = 0x1200,
-    .oam = &sFog2SpriteOamData,
-    .anims = sFog2SpriteAnimCmds,
+    .oam = &sFogDiagonalSpriteOamData,
+    .anims = sFogDiagonalSpriteAnimCmds,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = UpdateFog2Sprite,
+    .callback = UpdateFogDiagonalSprite,
 };
 
 #define tSpriteColumn data[0]
 #define tSpriteRow    data[1]
 
-static void CreateFog2Sprites(void)
+static void CreateFogDiagonalSprites(void)
 {
     u16 i;
-    struct SpriteSheet fog2SpriteSheet;
+    struct SpriteSheet fogDiagonalSpriteSheet;
     u8 spriteId;
     struct Sprite *sprite;
 
-    if (!gWeatherPtr->fog2SpritesCreated)
+    if (!gWeatherPtr->fogDSpritesCreated)
     {
-        fog2SpriteSheet = gFog2SpriteSheet;
-        LoadSpriteSheet(&fog2SpriteSheet);
-        for (i = 0; i < NUM_FOG2_SPRITES; i++)
+        fogDiagonalSpriteSheet = gFogDiagonalSpriteSheet;
+        LoadSpriteSheet(&fogDiagonalSpriteSheet);
+        for (i = 0; i < NUM_FOG_DIAGONAL_SPRITES; i++)
         {
-            spriteId = CreateSpriteAtEnd(&sFog2SpriteTemplate, 0, (i / 5) * 64, 0xFF);
+            spriteId = CreateSpriteAtEnd(&sFogDiagonalSpriteTemplate, 0, (i / 5) * 64, 0xFF);
             if (spriteId != MAX_SPRITES)
             {
                 sprite = &gSprites[spriteId];
                 sprite->tSpriteColumn = i % 5;
                 sprite->tSpriteRow = i / 5;
-                gWeatherPtr->sprites.s2.fog2Sprites[i] = sprite;
+                gWeatherPtr->sprites.s2.fogDSprites[i] = sprite;
             }
             else
             {
-                gWeatherPtr->sprites.s2.fog2Sprites[i] = NULL;
+                gWeatherPtr->sprites.s2.fogDSprites[i] = NULL;
             }
         }
 
-        gWeatherPtr->fog2SpritesCreated = TRUE;
+        gWeatherPtr->fogDSpritesCreated = TRUE;
     }
 }
 
-static void DestroyFog2Sprites(void)
+static void DestroyFogDiagonalSprites(void)
 {
     u16 i;
 
-    if (gWeatherPtr->fog2SpritesCreated)
+    if (gWeatherPtr->fogDSpritesCreated)
     {
-        for (i = 0; i < NUM_FOG2_SPRITES; i++)
+        for (i = 0; i < NUM_FOG_DIAGONAL_SPRITES; i++)
         {
-            if (gWeatherPtr->sprites.s2.fog2Sprites[i])
-                DestroySprite(gWeatherPtr->sprites.s2.fog2Sprites[i]);
+            if (gWeatherPtr->sprites.s2.fogDSprites[i])
+                DestroySprite(gWeatherPtr->sprites.s2.fogDSprites[i]);
         }
 
         FreeSpriteTilesByTag(0x1203);
-        gWeatherPtr->fog2SpritesCreated = FALSE;
+        gWeatherPtr->fogDSpritesCreated = FALSE;
     }
 }
 
-static void UpdateFog2Sprite(struct Sprite *sprite)
+static void UpdateFogDiagonalSprite(struct Sprite *sprite)
 {
-    sprite->pos2.y = gWeatherPtr->fog2PosY;
-    sprite->pos1.x = gWeatherPtr->fog2BaseSpritesX + 32 + sprite->tSpriteColumn * 64;
+    sprite->pos2.y = gWeatherPtr->fogDPosY;
+    sprite->pos1.x = gWeatherPtr->fogDBaseSpritesX + 32 + sprite->tSpriteColumn * 64;
     if (sprite->pos1.x > 271)
     {
-        sprite->pos1.x = gWeatherPtr->fog2BaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
+        sprite->pos1.x = gWeatherPtr->fogDBaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
         sprite->pos1.x &= 0x1FF;
     }
 }
@@ -1896,7 +1896,7 @@ static void UpdateFog2Sprite(struct Sprite *sprite)
 #undef tSpriteRow
 
 //------------------------------------------------------------------------------
-// Sandstorm
+// WEATHER_SANDSTORM
 //------------------------------------------------------------------------------
 
 static void UpdateSandstormWaveIndex(void);
@@ -2137,14 +2137,14 @@ static void CreateSwirlSandstormSprites(void)
             if (spriteId != MAX_SPRITES)
             {
                 gWeatherPtr->sprites.s2.sandstormSprites2[i] = &gSprites[spriteId];
-                gWeatherPtr->sprites.s2.sandstormSprites2[i]->oam.size = 2;
+                gWeatherPtr->sprites.s2.sandstormSprites2[i]->oam.size = ST_OAM_SIZE_2;
                 gWeatherPtr->sprites.s2.sandstormSprites2[i]->tSpriteRow = i * 51;
                 gWeatherPtr->sprites.s2.sandstormSprites2[i]->tRadius = 8;
                 gWeatherPtr->sprites.s2.sandstormSprites2[i]->tRadiusCounter = 0;
                 gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[4] = 0x6730; // unused value
                 gWeatherPtr->sprites.s2.sandstormSprites2[i]->tEntranceDelay = sSwirlEntranceDelays[i];
                 StartSpriteAnim(gWeatherPtr->sprites.s2.sandstormSprites2[i], 1);
-                CalcCenterToCornerVec(gWeatherPtr->sprites.s2.sandstormSprites2[i], 0, 2, 0);
+                CalcCenterToCornerVec(gWeatherPtr->sprites.s2.sandstormSprites2[i], SPRITE_SHAPE(32x32), SPRITE_SIZE(32x32), ST_OAM_AFFINE_OFF);
                 gWeatherPtr->sprites.s2.sandstormSprites2[i]->callback = WaitSandSwirlSpriteEntrance;
             }
             else
@@ -2205,7 +2205,7 @@ static void UpdateSandstormSwirlSprite(struct Sprite *sprite)
 #undef tEntranceDelay
 
 //------------------------------------------------------------------------------
-// Shade
+// WEATHER_SHADE
 //------------------------------------------------------------------------------
 
 void Shade_InitVars(void)
@@ -2230,7 +2230,7 @@ bool8 Shade_Finish(void)
 }
 
 //------------------------------------------------------------------------------
-// Bubbles
+// WEATHER_UNDERWATER_BUBBLES
 //------------------------------------------------------------------------------
 
 static void CreateBubbleSprite(u16);
@@ -2265,7 +2265,7 @@ static const s16 sBubbleStartCoords[][2] =
 
 void Bubbles_InitVars(void)
 {
-    Fog1_InitVars();
+    FogHorizontal_InitVars();
     if (!gWeatherPtr->bubblesSpritesCreated)
     {
         LoadSpriteSheet(&sWeatherBubbleSpriteSheet);
@@ -2285,7 +2285,7 @@ void Bubbles_InitAll(void)
 
 void Bubbles_Main(void)
 {
-    Fog1_Main();
+    FogHorizontal_Main();
     if (++gWeatherPtr->bubblesDelayCounter > sBubbleStartDelays[gWeatherPtr->bubblesDelayIndex])
     {
         gWeatherPtr->bubblesDelayCounter = 0;
@@ -2300,7 +2300,7 @@ void Bubbles_Main(void)
 
 bool8 Bubbles_Finish(void)
 {
-    if (!Fog1_Finish())
+    if (!FogHorizontal_Finish())
     {
         DestroyBubbleSprites();
         return FALSE;
@@ -2399,13 +2399,13 @@ static void UpdateBubbleSprite(struct Sprite *sprite)
 //------------------------------------------------------------------------------
 
 // Unused function.
-static void UnusedSetCurrentAlternatingWeather(u32 a0, u32 a1)
+static void UnusedSetCurrentAbnormalWeather(u32 a0, u32 a1)
 {
-    gCurrentAlternatingWeather = a0;
+    gCurrentAbnormalWeather = a0;
     gUnusedWeatherRelated = a1;
 }
 
-static void Task_DoAlternatingWeather(u8 taskId)
+static void Task_DoAbnormalWeather(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
@@ -2415,7 +2415,7 @@ static void Task_DoAlternatingWeather(u8 taskId)
         if (data[15]-- <= 0)
         {
             SetNextWeather(data[1]);
-            gCurrentAlternatingWeather = data[1];
+            gCurrentAbnormalWeather = data[1];
             data[15] = 600;
             data[0]++;
         }
@@ -2424,7 +2424,7 @@ static void Task_DoAlternatingWeather(u8 taskId)
         if (data[15]-- <= 0)
         {
             SetNextWeather(data[2]);
-            gCurrentAlternatingWeather = data[2];
+            gCurrentAbnormalWeather = data[2];
             data[15] = 600;
             data[0] = 0;
         }
@@ -2432,27 +2432,27 @@ static void Task_DoAlternatingWeather(u8 taskId)
     }
 }
 
-static void CreateAlternatingWeatherTask(void)
+static void CreateAbnormalWeatherTask(void)
 {
-    u8 taskId = CreateTask(Task_DoAlternatingWeather, 0);
+    u8 taskId = CreateTask(Task_DoAbnormalWeather, 0);
     s16 *data = gTasks[taskId].data;
 
     data[15] = 600;
-    if (gCurrentAlternatingWeather == WEATHER_RAIN_HEAVY)
+    if (gCurrentAbnormalWeather == WEATHER_DOWNPOUR)
     {
         data[1] = WEATHER_DROUGHT;
-        data[2] = WEATHER_RAIN_HEAVY;
+        data[2] = WEATHER_DOWNPOUR;
     }
-    else if (gCurrentAlternatingWeather == WEATHER_DROUGHT)
+    else if (gCurrentAbnormalWeather == WEATHER_DROUGHT)
     {
-        data[1] = WEATHER_RAIN_HEAVY;
+        data[1] = WEATHER_DOWNPOUR;
         data[2] = WEATHER_DROUGHT;
     }
     else
     {
-        gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY;
+        gCurrentAbnormalWeather = WEATHER_DOWNPOUR;
         data[1] = WEATHER_DROUGHT;
-        data[2] = WEATHER_RAIN_HEAVY;
+        data[2] = WEATHER_DOWNPOUR;
     }
 }
 
@@ -2494,17 +2494,17 @@ void DoCurrentWeather(void)
 {
     u8 weather = GetSav1Weather();
 
-    if (weather == WEATHER_ALTERNATING)
+    if (weather == WEATHER_ABNORMAL)
     {
-        if (!FuncIsActiveTask(Task_DoAlternatingWeather))
-            CreateAlternatingWeatherTask();
-        weather = gCurrentAlternatingWeather;
+        if (!FuncIsActiveTask(Task_DoAbnormalWeather))
+            CreateAbnormalWeatherTask();
+        weather = gCurrentAbnormalWeather;
     }
     else
     {
-        if (FuncIsActiveTask(Task_DoAlternatingWeather))
-            DestroyTask(FindTaskIdByFunc(Task_DoAlternatingWeather));
-        gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY;
+        if (FuncIsActiveTask(Task_DoAbnormalWeather))
+            DestroyTask(FindTaskIdByFunc(Task_DoAbnormalWeather));
+        gCurrentAbnormalWeather = WEATHER_DOWNPOUR;
     }
     SetNextWeather(weather);
 }
@@ -2513,17 +2513,17 @@ void ResumePausedWeather(void)
 {
     u8 weather = GetSav1Weather();
 
-    if (weather == WEATHER_ALTERNATING)
+    if (weather == WEATHER_ABNORMAL)
     {
-        if (!FuncIsActiveTask(Task_DoAlternatingWeather))
-            CreateAlternatingWeatherTask();
-        weather = gCurrentAlternatingWeather;
+        if (!FuncIsActiveTask(Task_DoAbnormalWeather))
+            CreateAbnormalWeatherTask();
+        weather = gCurrentAbnormalWeather;
     }
     else
     {
-        if (FuncIsActiveTask(Task_DoAlternatingWeather))
-            DestroyTask(FindTaskIdByFunc(Task_DoAlternatingWeather));
-        gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY;
+        if (FuncIsActiveTask(Task_DoAbnormalWeather))
+            DestroyTask(FindTaskIdByFunc(Task_DoAbnormalWeather));
+        gCurrentAbnormalWeather = WEATHER_DOWNPOUR;
     }
     SetCurrentAndNextWeather(weather);
 }
@@ -2531,15 +2531,15 @@ void ResumePausedWeather(void)
 static const u8 sWeatherCycleRoute119[] =
 {
     WEATHER_SUNNY,
-    WEATHER_RAIN_LIGHT,
-    WEATHER_RAIN_MED,
-    WEATHER_RAIN_LIGHT,
+    WEATHER_RAIN,
+    WEATHER_RAIN_THUNDERSTORM,
+    WEATHER_RAIN,
 };
 static const u8 sWeatherCycleRoute123[] =
 {
     WEATHER_SUNNY,
     WEATHER_SUNNY,
-    WEATHER_RAIN_LIGHT,
+    WEATHER_RAIN,
     WEATHER_SUNNY,
 };
 
@@ -2547,25 +2547,25 @@ static u8 TranslateWeatherNum(u8 weather)
 {
     switch (weather)
     {
-    case WEATHER_NONE:           return WEATHER_NONE;
-    case WEATHER_CLOUDS:         return WEATHER_CLOUDS;
-    case WEATHER_SUNNY:          return WEATHER_SUNNY;
-    case WEATHER_RAIN_LIGHT:     return WEATHER_RAIN_LIGHT;
-    case WEATHER_SNOW:           return WEATHER_SNOW;
-    case WEATHER_RAIN_MED:       return WEATHER_RAIN_MED;
-    case WEATHER_FOG_1:          return WEATHER_FOG_1;
-    case WEATHER_ASH:            return WEATHER_ASH;
-    case WEATHER_SANDSTORM:      return WEATHER_SANDSTORM;
-    case WEATHER_FOG_2:          return WEATHER_FOG_2;
-    case WEATHER_FOG_3:          return WEATHER_FOG_3;
-    case WEATHER_SHADE:          return WEATHER_SHADE;
-    case WEATHER_DROUGHT:        return WEATHER_DROUGHT;
-    case WEATHER_RAIN_HEAVY:     return WEATHER_RAIN_HEAVY;
-    case WEATHER_BUBBLES:        return WEATHER_BUBBLES;
-    case WEATHER_ALTERNATING:    return WEATHER_ALTERNATING;
-    case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage];
-    case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage];
-    default:                     return WEATHER_NONE;
+    case WEATHER_NONE:               return WEATHER_NONE;
+    case WEATHER_SUNNY_CLOUDS:       return WEATHER_SUNNY_CLOUDS;
+    case WEATHER_SUNNY:              return WEATHER_SUNNY;
+    case WEATHER_RAIN:               return WEATHER_RAIN;
+    case WEATHER_SNOW:               return WEATHER_SNOW;
+    case WEATHER_RAIN_THUNDERSTORM:  return WEATHER_RAIN_THUNDERSTORM;
+    case WEATHER_FOG_HORIZONTAL:     return WEATHER_FOG_HORIZONTAL;
+    case WEATHER_VOLCANIC_ASH:       return WEATHER_VOLCANIC_ASH;
+    case WEATHER_SANDSTORM:          return WEATHER_SANDSTORM;
+    case WEATHER_FOG_DIAGONAL:       return WEATHER_FOG_DIAGONAL;
+    case WEATHER_UNDERWATER:         return WEATHER_UNDERWATER;
+    case WEATHER_SHADE:              return WEATHER_SHADE;
+    case WEATHER_DROUGHT:            return WEATHER_DROUGHT;
+    case WEATHER_DOWNPOUR:           return WEATHER_DOWNPOUR;
+    case WEATHER_UNDERWATER_BUBBLES: return WEATHER_UNDERWATER_BUBBLES;
+    case WEATHER_ABNORMAL:           return WEATHER_ABNORMAL;
+    case WEATHER_ROUTE119_CYCLE:     return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage];
+    case WEATHER_ROUTE123_CYCLE:     return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage];
+    default:                         return WEATHER_NONE;
     }
 }
 
@@ -2579,7 +2579,7 @@ void UpdateWeatherPerDay(u16 increment)
 static void UpdateRainCounter(u8 newWeather, u8 oldWeather)
 {
     if (newWeather != oldWeather
-     && (newWeather == WEATHER_RAIN_LIGHT || newWeather == WEATHER_RAIN_MED))
+     && (newWeather == WEATHER_RAIN || newWeather == WEATHER_RAIN_THUNDERSTORM))
         IncrementGameStat(GAME_STAT_GOT_RAINED_ON);
 }
 
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 3f9857897..88927959e 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -92,10 +92,10 @@ static const struct HyperCutterUnk sHyperCutStruct[] =
 static const struct OamData sOamData_CutGrass =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/flying.c b/src/flying.c
index 43682ee42..774018f0f 100644
--- a/src/flying.c
+++ b/src/flying.c
@@ -540,7 +540,7 @@ void sub_810E2C8(struct Sprite *sprite)
         if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)
         {
             FreeOamMatrix(sprite->oam.matrixNum);
-            sprite->oam.affineMode = 0;
+            sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
         }
 
         DestroySprite(sprite);
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index d138abbb1..7c519c830 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -174,10 +174,10 @@ static const s16 sHallOfFame_MonHalfTeamPositions[3][4] =
 static const struct OamData sOamData_85E53FC =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
@@ -580,7 +580,7 @@ static void Task_Hof_PrintMonInfoAfterAnimating(u8 taskId)
 
     if (monSprite->callback == SpriteCallbackDummy)
     {
-        monSprite->oam.affineMode = 0;
+        monSprite->oam.affineMode = ST_OAM_AFFINE_OFF;
         HallOfFame_PrintMonInfo(currMon, 0, 14);
         gTasks[taskId].tFrameCount = 120;
         gTasks[taskId].func = Task_Hof_TryDisplayAnotherMon;
diff --git a/src/ice.c b/src/ice.c
index 1697cab2a..cc8b1d333 100644
--- a/src/ice.c
+++ b/src/ice.c
@@ -998,7 +998,7 @@ void AnimTask_Haze1(u8 taskId)
     SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
 
     sub_80A6B30(&animBg);
-    LoadBgTiles(animBg.bgId, gWeatherFog1Tiles, 0x800, animBg.tilesOffset);
+    LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset);
     sub_80A6D60(&animBg, gBattleAnimFogTilemap, 0);
     LoadPalette(&gUnknown_083970E8, animBg.paletteId * 16, 32);
 
@@ -1105,7 +1105,7 @@ void AnimTask_LoadMistTiles(u8 taskId)
     SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
 
     sub_80A6B30(&animBg);
-    LoadBgTiles(animBg.bgId, gWeatherFog1Tiles, 0x800, animBg.tilesOffset);
+    LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset);
     sub_80A6D60(&animBg, gBattleAnimFogTilemap, 0);
     LoadPalette(&gUnknown_083970E8, animBg.paletteId * 16, 32);
 
diff --git a/src/intro.c b/src/intro.c
index 58f2509cc..539b07a75 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -141,10 +141,10 @@ static const struct SpritePalette gIntroPalette_Lightning[] =
 static const struct OamData gUnknown_085E4A94 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
@@ -210,10 +210,10 @@ static const struct SpritePalette gIntroPokemonRunningPalette[] =
 static const struct OamData gUnknown_085E4B28 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -247,10 +247,10 @@ static const struct SpriteTemplate gUnknown_085E4B40 =
 static const struct OamData gUnknown_085E4B58 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -303,10 +303,10 @@ static const struct SpriteTemplate gUnknown_085E4BA4 =
 static const struct OamData gUnknown_085E4BBC =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -352,10 +352,10 @@ static const struct SpritePalette gIntroRayquazaLightningPalette[] =
 static const struct OamData gUnknown_085E4C14 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -437,10 +437,10 @@ static const s16 gIntroKyogreBubbleData[][3] =
 static const struct OamData gUnknown_085E4CF0 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x32),
     .x = 0,
     .matrixNum = 0,
@@ -477,10 +477,10 @@ static const struct SpriteTemplate gUnknown_085E4D14 =
 static const struct OamData gUnknown_085E4D2C =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -568,10 +568,10 @@ static const union AnimCmd *const gIntroBicycleAnimationCommands[] =
 static const struct OamData gUnknown_085E4DD4 =
 {
     .y = 160,
-    .affineMode = 3,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
@@ -584,10 +584,10 @@ static const struct OamData gUnknown_085E4DD4 =
 static const struct OamData gUnknown_085E4DDC =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
@@ -600,10 +600,10 @@ static const struct OamData gUnknown_085E4DDC =
 static const struct OamData gUnknown_085E4DE4 =
 {
     .y = 160,
-    .affineMode = 3,
-    .objMode = 1,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_BLEND,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x64),
     .x = 0,
     .matrixNum = 0,
@@ -800,10 +800,10 @@ static const u8 gUnknown_085E4FA4[] =
 static const struct OamData gUnknown_085E4FB0 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
@@ -853,10 +853,10 @@ static const struct SpritePalette gIntroPalette_DropLogoFlygon[] =
 static const struct OamData gUnknown_085E501C =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -2568,9 +2568,9 @@ static void sub_816F3A4(struct Sprite *sprite)
         sprite->data[2] = 1024;
         sprite->data[3] = 8 * (sprite->data[1] & 3);
         sprite->callback = sub_816F318;
-        sprite->oam.shape = 1;
-        sprite->oam.size = 3;
-        CalcCenterToCornerVec(sprite, 1, 3, 2);
+        sprite->oam.shape = SPRITE_SHAPE(64x32);
+        sprite->oam.size = SPRITE_SIZE(64x32);
+        CalcCenterToCornerVec(sprite, SPRITE_SHAPE(64x32), SPRITE_SIZE(64x32), ST_OAM_AFFINE_ERASE);
     }
     else
     {
@@ -2690,9 +2690,9 @@ static void SpriteCB_WaterDropFall(struct Sprite *sprite)
         sprite->data[2] = 1024;
         sprite->data[3] = 8 * (sprite->data[1] & 3);
         sprite->callback = sub_816F318;
-        sprite->oam.shape = 1;
-        sprite->oam.size = 3;
-        CalcCenterToCornerVec(sprite, 1, 3, 2);
+        sprite->oam.shape = SPRITE_SHAPE(64x32);
+        sprite->oam.size = SPRITE_SIZE(64x32);
+        CalcCenterToCornerVec(sprite, SPRITE_SHAPE(64x32), SPRITE_SIZE(64x32), ST_OAM_AFFINE_ERASE);
     }
 }
 
@@ -2713,9 +2713,9 @@ static void SpriteCB_WaterDropFall_2(struct Sprite *sprite)
         sprite->data[2] = 1024;
         sprite->data[3] = 8 * (sprite->data[1] & 3);
         sprite->callback = sub_816F318;
-        sprite->oam.shape = 1;
-        sprite->oam.size = 3;
-        CalcCenterToCornerVec(sprite, 1, 3, 2);
+        sprite->oam.shape = SPRITE_SHAPE(64x32);
+        sprite->oam.size = SPRITE_SIZE(64x32);
+        CalcCenterToCornerVec(sprite, SPRITE_SHAPE(64x32), SPRITE_SIZE(64x32), ST_OAM_AFFINE_ERASE);
     }
 }
 
@@ -2732,9 +2732,9 @@ static u8 CreateWaterDrop(s16 x, s16 y, u16 c, u16 d, u16 e, u8 fallImmediately)
     gSprites[spriteId].data[3] = c;
     gSprites[spriteId].data[5] = e;
     gSprites[spriteId].data[6] = c;
-    gSprites[spriteId].oam.affineMode = 3;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_DOUBLE;
     gSprites[spriteId].oam.matrixNum = d;
-    CalcCenterToCornerVec(&gSprites[spriteId], 0, 2, 2);
+    CalcCenterToCornerVec(&gSprites[spriteId], SPRITE_SHAPE(32x32), SPRITE_SIZE(32x32), ST_OAM_AFFINE_ERASE);
     StartSpriteAnim(&gSprites[spriteId], 2);
     if (!fallImmediately)
         gSprites[spriteId].callback = sub_816F454;
@@ -2745,18 +2745,18 @@ static u8 CreateWaterDrop(s16 x, s16 y, u16 c, u16 d, u16 e, u8 fallImmediately)
     spriteId = CreateSprite(&gIntroWaterDropSprite, x, y, 1);
     gSprites[spriteId].data[7] = oldSpriteId;
     gSprites[spriteId].data[1] = d + 1;
-    gSprites[spriteId].oam.affineMode = 3;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_DOUBLE;
     gSprites[spriteId].oam.matrixNum = d + 1;
-    CalcCenterToCornerVec(&gSprites[spriteId], 0, 2, 2);
+    CalcCenterToCornerVec(&gSprites[spriteId], SPRITE_SHAPE(32x32), SPRITE_SIZE(32x32), ST_OAM_AFFINE_ERASE);
     gSprites[spriteId].callback = sub_816F3A4;
 
     spriteId = CreateSprite(&gIntroWaterDropSprite, x, y, 1);
     gSprites[spriteId].data[7] = oldSpriteId;
     gSprites[spriteId].data[1] = d + 2;
     StartSpriteAnim(&gSprites[spriteId], 1);
-    gSprites[spriteId].oam.affineMode = 3;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_DOUBLE;
     gSprites[spriteId].oam.matrixNum = d + 2;
-    CalcCenterToCornerVec(&gSprites[spriteId], 0, 2, 2);
+    CalcCenterToCornerVec(&gSprites[spriteId], SPRITE_SHAPE(32x32), SPRITE_SIZE(32x32), ST_OAM_AFFINE_ERASE);
     gSprites[spriteId].callback = sub_816F3A4;
 
     SetOamMatrix(d, c + 32, 0, 0, c + 32);
@@ -2915,7 +2915,7 @@ static void sub_816FB38(struct Sprite *sprite)
         if (gIntroFrameCounter == 0x110)
         {
             StartSpriteAffineAnim(sprite, 2);
-            sprite->oam.objMode = 1;
+            sprite->oam.objMode = ST_OAM_OBJ_BLEND;
             sprite->data[0]++;
         }
         break;
@@ -3008,9 +3008,9 @@ static void sub_816FEDC(struct Sprite *sprite)
     {
     case 0:
     default:
-        sprite->oam.affineMode = 3;
+        sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
         sprite->oam.matrixNum = 1;
-        CalcCenterToCornerVec(sprite, 1, 3, 3);
+        CalcCenterToCornerVec(sprite, SPRITE_SHAPE(64x32), SPRITE_SIZE(64x32), ST_OAM_AFFINE_DOUBLE);
         sprite->invisible = FALSE;
         sprite->data[0] = 1;
         sprite->data[1] = 0x80;
@@ -3054,9 +3054,9 @@ static void SpriteCB_IntroRayquazaHyperbeam(struct Sprite *sprite)
     case 0:
     default:
         sprite->invisible = FALSE;
-        sprite->oam.affineMode = 3;
+        sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
         sprite->oam.matrixNum = 18;
-        CalcCenterToCornerVec(sprite, 0, 3, 3);
+        CalcCenterToCornerVec(sprite, SPRITE_SHAPE(64x64), SPRITE_SIZE(64x64), ST_OAM_AFFINE_DOUBLE);
         sprite->data[1] = 0;
         sprite->data[0] = 1;
         //fall through
diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c
index 059c1079e..04e2216f6 100644
--- a/src/intro_credits_graphics.c
+++ b/src/intro_credits_graphics.c
@@ -1026,7 +1026,7 @@ static void sub_817B698(u8 a, const struct IntroCreditsSpriteMetadata *b, const
     for(i = 0; i < d; i++)
     {
         u8 sprite = CreateSprite(&gUnknown_085F504C, b[i].x, b[i].y, b[i].subpriority);
-        CalcCenterToCornerVec(&gSprites[sprite], b[i].shape, b[i].size, 0);
+        CalcCenterToCornerVec(&gSprites[sprite], b[i].shape, b[i].size, ST_OAM_AFFINE_OFF);
         gSprites[sprite].oam.priority = 3;
         gSprites[sprite].oam.shape = b[i].shape;
         gSprites[sprite].oam.size = b[i].size;
diff --git a/src/item_icon.c b/src/item_icon.c
index 6ae7eac58..487b89b71 100644
--- a/src/item_icon.c
+++ b/src/item_icon.c
@@ -16,10 +16,10 @@ EWRAM_DATA void *gItemIcon4x4Buffer = NULL;
 static const struct OamData sOamData_ItemIcon =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c
index 780a50160..cbc038d8c 100644
--- a/src/item_menu_icons.c
+++ b/src/item_menu_icons.c
@@ -32,10 +32,10 @@ static const u16 gCherryUnused_Pal[] = INCBIN_U16("graphics/unused/cherry.gbapal
 static const struct OamData sBagOamData =
 {
     .y = 0,
-    .affineMode = 1,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_NORMAL,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -142,10 +142,10 @@ static const struct SpriteTemplate gBagSpriteTemplate =
 static const struct OamData sRotatingBallOamData =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 4,
@@ -213,10 +213,10 @@ static const struct SpriteTemplate gRotatingBallSpriteTemplate =
 static const struct OamData sBerryPicOamData =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -230,10 +230,10 @@ static const struct OamData sBerryPicOamData =
 static const struct OamData sBerryPicRotatingOamData =
 {
     .y = 0,
-    .affineMode = 3,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -370,10 +370,10 @@ const struct CompressedSpritePalette gBerryCheckCirclePaletteTable =
 static const struct OamData sBerryCheckCircleOamData =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -492,7 +492,7 @@ static void UpdateSwitchPocketRotatingBallCoords(struct Sprite *sprite)
 
 static void SpriteCB_SwitchPocketRotatingBallInit(struct Sprite *sprite)
 {
-    sprite->oam.affineMode = 1;
+    sprite->oam.affineMode = ST_OAM_AFFINE_NORMAL;
     if (sprite->data[0] == -1)
         sprite->affineAnims = sRotatingBallAnimCmds;
     else
diff --git a/src/list_menu.c b/src/list_menu.c
index 797aff5f8..ddcad0fe9 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -125,10 +125,10 @@ static const struct
 static const struct OamData sOamData_ScrollArrowIndicator =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
@@ -265,10 +265,10 @@ static const struct Subsprite sSubsprite_RedOutline8 =
 static const struct OamData sOamData_RedArrowCursor =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/main_menu.c b/src/main_menu.c
index 95c64b3bd..ee63b1810 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -1312,7 +1312,7 @@ static void Task_NewGameBirchSpeech_WaitToShowBirch(u8 taskId)
         gSprites[spriteId].pos1.x = 136;
         gSprites[spriteId].pos1.y = 60;
         gSprites[spriteId].invisible = FALSE;
-        gSprites[spriteId].oam.objMode = 1;
+        gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         NewGameBirchSpeech_StartFadeInTarget1OutTarget2(taskId, 10);
         NewGameBirchSpeech_StartFadePlatformOut(taskId, 20);
         gTasks[taskId].tTimer = 80;
@@ -1324,7 +1324,7 @@ static void Task_NewGameBirchSpeech_WaitForSpriteFadeInWelcome(u8 taskId)
 {
     if (gTasks[taskId].tIsDoneFadingSprites)
     {
-        gSprites[gTasks[taskId].tBirchSpriteId].oam.objMode = 0;
+        gSprites[gTasks[taskId].tBirchSpriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
         if (gTasks[taskId].tTimer)
         {
             gTasks[taskId].tTimer--;
@@ -1392,7 +1392,7 @@ static void Task_NewGameBirchSpeechSub_WaitForLotad(u8 taskId)
         case 0:
             if (sprite->callback == SpriteCallbackDummy)
             {
-                sprite->oam.affineMode = 0;
+                sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
                 goto incrementStateAndTimer;
             }
             break;
@@ -1430,8 +1430,8 @@ static void Task_NewGameBirchSpeech_StartBirchLotadPlatformFade(u8 taskId)
 {
     if (!RunTextPrintersAndIsPrinter0Active())
     {
-        gSprites[gTasks[taskId].tBirchSpriteId].oam.objMode = 1;
-        gSprites[gTasks[taskId].tLotadSpriteId].oam.objMode = 1;
+        gSprites[gTasks[taskId].tBirchSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
+        gSprites[gTasks[taskId].tLotadSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         NewGameBirchSpeech_StartFadeOutTarget1InTarget2(taskId, 2);
         NewGameBirchSpeech_StartFadePlatformIn(taskId, 1);
         gTasks[taskId].tTimer = 64;
@@ -1470,7 +1470,7 @@ static void Task_NewGameBirchSpeech_StartPlayerFadeIn(u8 taskId)
             gSprites[spriteId].pos1.x = 180;
             gSprites[spriteId].pos1.y = 60;
             gSprites[spriteId].invisible = FALSE;
-            gSprites[spriteId].oam.objMode = 1;
+            gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
             gTasks[taskId].tPlayerSpriteId = spriteId;
             gTasks[taskId].tPlayerGender = MALE;
             NewGameBirchSpeech_StartFadeInTarget1OutTarget2(taskId, 2);
@@ -1484,7 +1484,7 @@ static void Task_NewGameBirchSpeech_WaitForPlayerFadeIn(u8 taskId)
 {
     if (gTasks[taskId].tIsDoneFadingSprites)
     {
-        gSprites[gTasks[taskId].tPlayerSpriteId].oam.objMode = 0;
+        gSprites[gTasks[taskId].tPlayerSpriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
         gTasks[taskId].func = Task_NewGameBirchSpeech_BoyOrGirl;
     }
 }
@@ -1530,7 +1530,7 @@ static void Task_NewGameBirchSpeech_ChooseGender(u8 taskId)
     if (gender2 != gTasks[taskId].tPlayerGender)
     {
         gTasks[taskId].tPlayerGender = gender2;
-        gSprites[gTasks[taskId].tPlayerSpriteId].oam.objMode = 1;
+        gSprites[gTasks[taskId].tPlayerSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         NewGameBirchSpeech_StartFadeOutTarget1InTarget2(taskId, 0);
         gTasks[taskId].func = Task_NewGameBirchSpeech_SlideOutOldGenderSprite;
     }
@@ -1554,7 +1554,7 @@ static void Task_NewGameBirchSpeech_SlideOutOldGenderSprite(u8 taskId)
         gSprites[spriteId].pos1.y = 60;
         gSprites[spriteId].invisible = FALSE;
         gTasks[taskId].tPlayerSpriteId = spriteId;
-        gSprites[spriteId].oam.objMode = 1;
+        gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         NewGameBirchSpeech_StartFadeInTarget1OutTarget2(taskId, 0);
         gTasks[taskId].func = Task_NewGameBirchSpeech_SlideInNewGenderSprite;
     }
@@ -1573,7 +1573,7 @@ static void Task_NewGameBirchSpeech_SlideInNewGenderSprite(u8 taskId)
         gSprites[spriteId].pos1.x = 180;
         if (gTasks[taskId].tIsDoneFadingSprites)
         {
-            gSprites[spriteId].oam.objMode = 0;
+            gSprites[spriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
             gTasks[taskId].func = Task_NewGameBirchSpeech_ChooseGender;
         }
     }
@@ -1637,7 +1637,7 @@ static void Task_NewGameBirchSpeech_ProcessNameYesNoMenu(u8 taskId)
     {
         case 0:
             PlaySE(SE_SELECT);
-            gSprites[gTasks[taskId].tPlayerSpriteId].oam.objMode = 1;
+            gSprites[gTasks[taskId].tPlayerSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
             NewGameBirchSpeech_StartFadeOutTarget1InTarget2(taskId, 2);
             NewGameBirchSpeech_StartFadePlatformIn(taskId, 1);
             gTasks[taskId].func = Task_NewGameBirchSpeech_SlidePlatformAway2;
@@ -1674,12 +1674,12 @@ static void Task_NewGameBirchSpeech_ReshowBirchLotad(u8 taskId)
         gSprites[spriteId].pos1.x = 136;
         gSprites[spriteId].pos1.y = 60;
         gSprites[spriteId].invisible = FALSE;
-        gSprites[spriteId].oam.objMode = 1;
+        gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         spriteId = gTasks[taskId].tLotadSpriteId;
         gSprites[spriteId].pos1.x = 100;
         gSprites[spriteId].pos1.y = 75;
         gSprites[spriteId].invisible = FALSE;
-        gSprites[spriteId].oam.objMode = 1;
+        gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         NewGameBirchSpeech_StartFadeInTarget1OutTarget2(taskId, 2);
         NewGameBirchSpeech_StartFadePlatformOut(taskId, 1);
         NewGameBirchSpeech_ClearWindow(0);
@@ -1693,12 +1693,12 @@ static void Task_NewGameBirchSpeech_WaitForSpriteFadeInAndTextPrinter(u8 taskId)
 {
     if (gTasks[taskId].tIsDoneFadingSprites)
     {
-        gSprites[gTasks[taskId].tBirchSpriteId].oam.objMode = 0;
-        gSprites[gTasks[taskId].tLotadSpriteId].oam.objMode = 0;
+        gSprites[gTasks[taskId].tBirchSpriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
+        gSprites[gTasks[taskId].tLotadSpriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
         if (!RunTextPrintersAndIsPrinter0Active())
         {
-            gSprites[gTasks[taskId].tBirchSpriteId].oam.objMode = 1;
-            gSprites[gTasks[taskId].tLotadSpriteId].oam.objMode = 1;
+            gSprites[gTasks[taskId].tBirchSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
+            gSprites[gTasks[taskId].tLotadSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
             NewGameBirchSpeech_StartFadeOutTarget1InTarget2(taskId, 2);
             NewGameBirchSpeech_StartFadePlatformIn(taskId, 1);
             gTasks[taskId].tTimer = 64;
@@ -1727,7 +1727,7 @@ static void Task_NewGameBirchSpeech_AreYouReady(u8 taskId)
         gSprites[spriteId].pos1.x = 120;
         gSprites[spriteId].pos1.y = 60;
         gSprites[spriteId].invisible = FALSE;
-        gSprites[spriteId].oam.objMode = 1;
+        gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         gTasks[taskId].tPlayerSpriteId = spriteId;
         NewGameBirchSpeech_StartFadeInTarget1OutTarget2(taskId, 2);
         NewGameBirchSpeech_StartFadePlatformOut(taskId, 1);
@@ -1743,11 +1743,11 @@ static void Task_NewGameBirchSpeech_ShrinkPlayer(u8 taskId)
 
     if (gTasks[taskId].tIsDoneFadingSprites)
     {
-        gSprites[gTasks[taskId].tPlayerSpriteId].oam.objMode = 0;
+        gSprites[gTasks[taskId].tPlayerSpriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
         if (!RunTextPrintersAndIsPrinter0Active())
         {
             spriteId = gTasks[taskId].tPlayerSpriteId;
-            gSprites[spriteId].oam.affineMode = 1;
+            gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
             gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_PlayerShrink;
             InitSpriteAffineAnim(&gSprites[spriteId]);
             StartSpriteAffineAnim(&gSprites[spriteId], 0);
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index d95b808e9..b84489a17 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -371,7 +371,7 @@ static void LoadMapNamePopUpWindowBg(void)
     LoadBgTiles(GetWindowAttribute(popupWindowId, WINDOW_BG), gMapPopUp_Outline_Table[popUpThemeId], 0x400, 0x21D);
     CallWindowFunction(popupWindowId, sub_80D4A78);
     PutWindowTilemap(popupWindowId);
-    if(gMapHeader.weather == WEATHER_BUBBLES)
+    if (gMapHeader.weather == WEATHER_UNDERWATER_BUBBLES)
         LoadPalette(&gUnknown_0857F444, 0xE0, 0x20);
     else
         LoadPalette(gMapPopUp_Palette_Table[popUpThemeId], 0xE0, 0x20);
diff --git a/src/menu_helpers.c b/src/menu_helpers.c
index 2b7a7f419..5b68828c8 100644
--- a/src/menu_helpers.c
+++ b/src/menu_helpers.c
@@ -33,10 +33,10 @@ static TaskFunc gUnknown_0300117C;
 static const struct OamData sOamData_859F4E8 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index 75317e3ff..c0f7c510d 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -1104,14 +1104,14 @@ static const u32 gUnknown_086256A0[] = INCBIN_U32("graphics/pokenav/sparkle.4bpp
 static const struct OamData sOamData_8625A20 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -1121,14 +1121,14 @@ static const struct OamData sOamData_8625A20 =
 static const struct OamData sOamData_8625A28 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
diff --git a/src/mirage_tower.c b/src/mirage_tower.c
index 66a799005..2a6d6d6c4 100644
--- a/src/mirage_tower.c
+++ b/src/mirage_tower.c
@@ -139,10 +139,10 @@ static const union AnimCmd gSpriteAnim_8617DEC[] =
 static const struct OamData gOamData_8617DF4 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/mon_markings.c b/src/mon_markings.c
index f4d6b3818..db5df07e8 100644
--- a/src/mon_markings.c
+++ b/src/mon_markings.c
@@ -26,10 +26,10 @@ static const u8 gUnknown_0859E67C[] = INCBIN_U8("graphics/misc/mon_markings.4bpp
 static const struct OamData gUnknown_0859EE7C =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -43,10 +43,10 @@ static const struct OamData gUnknown_0859EE7C =
 static const struct OamData gUnknown_0859EE84 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
@@ -152,10 +152,10 @@ static const union AnimCmd *const gUnknown_0859EF14[] =
 static const struct OamData gUnknown_0859EF1C =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .matrixNum = 0,
@@ -520,12 +520,12 @@ static void sub_811FC80(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag)
     if (spriteId != MAX_SPRITES)
     {
         sMenu->menuTextSprite = &gSprites[spriteId];
-        sMenu->menuTextSprite->oam.shape = ST_OAM_SQUARE;
-        sMenu->menuTextSprite->oam.size = 2;
+        sMenu->menuTextSprite->oam.shape = SPRITE_SHAPE(32x32);
+        sMenu->menuTextSprite->oam.size = SPRITE_SIZE(32x32);
         StartSpriteAnim(sMenu->menuTextSprite, 9);
         sMenu->menuTextSprite->pos1.x = x + MENU_TEXT_SPRITE_X_OFFSET;
         sMenu->menuTextSprite->pos1.y = y + 80;
-        CalcCenterToCornerVec(sMenu->menuTextSprite, 1, 2, 0);
+        CalcCenterToCornerVec(sMenu->menuTextSprite, SPRITE_SHAPE(32x16), SPRITE_SIZE(32x16), ST_OAM_AFFINE_OFF);
     }
     else
     {
diff --git a/src/money.c b/src/money.c
index 7b95a75ab..6213f2dd0 100644
--- a/src/money.c
+++ b/src/money.c
@@ -20,10 +20,10 @@ EWRAM_DATA static u8 sMoneyLabelSpriteId = 0;
 static const struct OamData sOamData_MoneyLabel =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/move_relearner.c b/src/move_relearner.c
index b5202e006..6d9b5865b 100644
--- a/src/move_relearner.c
+++ b/src/move_relearner.c
@@ -183,14 +183,14 @@ static const u8 sMoveRelearnerSpriteSheetData[] = INCBIN_U8("graphics/interface/
 static const struct OamData sHeartSpriteOamData =
 {
     .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -200,14 +200,14 @@ static const struct OamData sHeartSpriteOamData =
 static const struct OamData sUnusedOam1 =
 {
     .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_V_RECTANGLE,
+    .shape = SPRITE_SHAPE(8x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -217,14 +217,14 @@ static const struct OamData sUnusedOam1 =
 static const struct OamData sUnusedOam2 =
 {
     .y = 0,
-    .affineMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_H_RECTANGLE,
+    .shape = SPRITE_SHAPE(16x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(16x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/naming_screen.c b/src/naming_screen.c
index b394cd2f7..480f62064 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -914,7 +914,7 @@ static void CursorInit(void)
     gNamingScreenData->cursorSpriteId = CreateSprite(&gUnknown_0858C138, 38, 88, 1);
     sub_80E3E3C(1);
     gSprites[gNamingScreenData->cursorSpriteId].oam.priority = 1;
-    gSprites[gNamingScreenData->cursorSpriteId].oam.objMode = 1;
+    gSprites[gNamingScreenData->cursorSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
     gSprites[gNamingScreenData->cursorSpriteId].data[6] = 1;
     gSprites[gNamingScreenData->cursorSpriteId].data[6] = 2;
     SetCursorPos(0, 0);
@@ -1949,37 +1949,170 @@ const struct OamData gOamData_858BFFC =
 
 static const struct Subsprite gUnknown_0858C004[] =
 {
-    {-20,  -16, 1,  1,   0,     1},
-    { 12,  -16, 0,  0,   4,     1},
-    {-20,  -8,  1,  1,   5,     1},
-    { 12,  -8,  0,  0,   9,     1},
-    {-20,   0,  1,  1,  10,     1},
-    { 12,   0,  0,  0,  14,     1},
-    {-20,   8,  1,  1,  15,     1},
-    { 12,   8,  0,  0,  19,     1}
+    {
+        .x = -20,  
+        .y = -16, 
+        .shape = SPRITE_SHAPE(32x8),  
+        .size = SPRITE_SIZE(32x8),  
+        .tileOffset = 0,     
+        .priority = 1
+    },
+    {
+        .x =  12,  
+        .y = -16, 
+        .shape = SPRITE_SHAPE(8x8),  
+        .size = SPRITE_SIZE(8x8),  
+        .tileOffset = 4,     
+        .priority = 1
+    },
+    {
+        .x = -20,  
+        .y = -8,  
+        .shape = SPRITE_SHAPE(32x8),  
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 5,     
+        .priority = 1
+    },
+    {
+        .x =  12,  
+        .y = -8,  
+        .shape = SPRITE_SHAPE(8x8),  
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 9,     
+        .priority = 1
+    },
+    {
+        .x = -20,  
+        .y =  0,  
+        .shape = SPRITE_SHAPE(32x8),  
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 10,    
+        .priority = 1
+    },
+    {
+        .x =  12,  
+        .y =  0,  
+        .shape = SPRITE_SHAPE(8x8),  
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 14,    
+        .priority = 1
+    },
+    {
+        .x = -20,  
+        .y =  8,  
+        .shape = SPRITE_SHAPE(32x8),  
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 15,    
+        .priority = 1
+    },
+    {
+        .x =  12,  
+        .y =  8,  
+        .shape = SPRITE_SHAPE(8x8),  
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 19,    
+        .priority = 1
+    }
 };
 
 static const struct Subsprite gUnknown_0858C024[] =
 {
-    {-12,  -4,  1,  0,   0,     1},
-    {  4,  -4,  0,  0,   2,     1}
+    {
+        .x = -12,  
+        .y = -4,  
+        .shape = SPRITE_SHAPE(16x8),  
+        .size = SPRITE_SIZE(16x8),  
+        .tileOffset = 0,     
+        .priority = 1
+    },
+    {
+        .x =   4,  
+        .y = -4,  
+        .shape = SPRITE_SHAPE(8x8),  
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 2,     
+        .priority = 1
+    }
 };
 
 static const struct Subsprite gUnknown_0858C02C[] =
 {
-    {-20,  -12, 1,  1,   0,     1},
-    { 12,  -12, 0,  0,   4,     1},
-    {-20,  -4,  1,  1,   5,     1},
-    { 12,  -4,  0,  0,   9,     1},
-    {-20,   4,  1,  1,  10,     1},
-    { 12,   4,  0,  0,  14,     1}
+    {
+        .x = -20,  
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8),  
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,     
+        .priority = 1
+    },
+    {
+        .x =  12,  
+        .y = -12, 
+        .shape = SPRITE_SHAPE(8x8),  
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 4,     
+        .priority = 1
+    },
+    {
+        .x = -20,  
+        .y = -4,  
+        .shape = SPRITE_SHAPE(32x8),  
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 5,     
+        .priority = 1
+    },
+    {
+        .x =  12,  
+        .y = -4,  
+        .shape = SPRITE_SHAPE(8x8),  
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 9,     
+        .priority = 1
+    },
+    {
+        .x = -20,  
+        .y =  4,  
+        .shape = SPRITE_SHAPE(32x8),  
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 10,    
+        .priority = 1
+    },
+    {
+        .x =  12,  
+        .y =  4,  
+        .shape = SPRITE_SHAPE(8x8),  
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 14,    
+        .priority = 1
+    }
 };
 
 static const struct Subsprite gUnknown_0858C044[] =
 {
-    {-8,   -12, 1,  0,   0,     3},
-    {-8,   -4,  1,  0,   2,     3},
-    {-8,    4,  1,  0,   4,     3}
+    {
+        .x = -8,   
+        .y = -12, 
+        .shape = SPRITE_SHAPE(16x8),  
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 0,     
+        .priority = 3
+    },
+    {
+        .x = -8,   
+        .y = -4,  
+        .shape = SPRITE_SHAPE(16x8),  
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 2,     
+        .priority = 3
+    },
+    {
+        .x = -8,   
+        .y =  4,  
+        .shape = SPRITE_SHAPE(16x8),  
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 4,     
+        .priority = 3
+    }
 };
 
 static const struct SubspriteTable gUnknown_0858C050[] =
diff --git a/src/overworld.c b/src/overworld.c
index c625b3b45..bb0f40a56 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -432,11 +432,11 @@ static void Overworld_ResetStateAfterWhiteOut(void)
     FlagClear(FLAG_SYS_USE_STRENGTH);
     FlagClear(FLAG_SYS_USE_FLASH);
     // If you were defeated by Kyogre/Groudon and the step counter has
-    // maxed out, end the unusual weather.
-    if (VarGet(VAR_SHOULD_END_UNUSUAL_WEATHER) == 1)
+    // maxed out, end the abnormal weather.
+    if (VarGet(VAR_SHOULD_END_ABNORMAL_WEATHER) == 1)
     {
-        VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 0);
-        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE);
+        VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 0);
+        VarSet(VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE);
     }
 }
 
diff --git a/src/pokeball.c b/src/pokeball.c
index f10bbd49c..d473f9ba0 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -95,10 +95,10 @@ const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] =
 static const struct OamData sBallOamData =
 {
     .y = 0,
-    .affineMode = 3,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 4c744b537..03d5f4da4 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -219,10 +219,10 @@ static const u8 sContestStatsMonData[] = {MON_DATA_COOL, MON_DATA_BEAUTY, MON_DA
 static const struct OamData sOamData_PokeblockCase =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -928,7 +928,7 @@ static void sub_8136470(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->oam.affineMode = 1;
+        sprite->oam.affineMode = ST_OAM_AFFINE_NORMAL;
         sprite->affineAnims = sSpriteAffineAnimTable_85B26F0;
         InitSpriteAffineAnim(sprite);
         sprite->data[0] = 1;
@@ -937,7 +937,7 @@ static void sub_8136470(struct Sprite *sprite)
     case 1:
         if (++sprite->data[1] > 11)
         {
-            sprite->oam.affineMode = 0;
+            sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
             sprite->data[0] = 0;
             sprite->data[1] = 0;
             FreeOamMatrix(sprite->oam.matrixNum);
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index 2c0b68dc6..5edf14309 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -459,10 +459,10 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_85F066C[] =
 static const struct OamData sThrownPokeblockOamData =
 {
     .y = 0,
-    .affineMode = 3,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
@@ -833,7 +833,7 @@ static u8 CreateMonSprite(struct Pokemon* mon)
     if (!IsMonSpriteNotFlipped(species))
     {
         gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_MonNoFlip;
-        gSprites[spriteId].oam.affineMode = 3;
+        gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_DOUBLE;
         CalcCenterToCornerVec(&gSprites[spriteId], gSprites[spriteId].oam.shape, gSprites[spriteId].oam.size, gSprites[spriteId].oam.affineMode);
         sPokeblockFeed->noMonFlip = FALSE;
     }
@@ -869,7 +869,7 @@ static void sub_817A468(struct Sprite* sprite)
 static u8 CreatePokeblockCaseSpriteForFeeding(void)
 {
     u8 spriteId = CreatePokeblockCaseSprite(188, 100, 2);
-    gSprites[spriteId].oam.affineMode = 1;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_85F0664;
     gSprites[spriteId].callback = SpriteCallbackDummy;
     InitSpriteAffineAnim(&gSprites[spriteId]);
@@ -879,7 +879,7 @@ static u8 CreatePokeblockCaseSpriteForFeeding(void)
 static void DoPokeblockCaseThrowEffect(u8 spriteId, bool8 a1)
 {
     FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
-    gSprites[spriteId].oam.affineMode = 3;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_DOUBLE;
 
     if (!a1)
         gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_85F0668;
@@ -947,7 +947,7 @@ static void sub_817A634(void)
         sub_817A91C();
         if (sNatureToMonPokeblockAnim[pokeblockFeed->nature][1] != 0)
         {
-            pokeblockFeed->monSpritePtr->oam.affineMode = 3;
+            pokeblockFeed->monSpritePtr->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
             pokeblockFeed->monSpritePtr->oam.matrixNum = 0;
             pokeblockFeed->monSpritePtr->affineAnims = sSpriteAffineAnimTable_85F04FC;
             InitSpriteAffineAnim(pokeblockFeed->monSpritePtr);
diff --git a/src/pokedex.c b/src/pokedex.c
index 2aa5e30ea..821296370 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -164,7 +164,7 @@ static void CreateInitialPokemonSprites(u16, u16);
 bool8 sub_80BD404(u8, u8, u8);
 u16 sub_80BD69C(u16, u16);
 void sub_80BD8D0(void);
-bool8 sub_80BD930(void);
+static bool8 UpdateSelectedMon(void);
 u8 sub_80BDA40(void);
 u16 GetPokemonSpriteToDisplay(u16);
 u32 sub_80BDACC(u16, s16, s16);
@@ -186,7 +186,7 @@ void LoadSelectedScreen(u8);
 void BeginChangeInfoScreen(u8);
 void BeginReturnToPokedex(u8);
 void LoadAreaScreen(u8);
-void sub_80BF1B4(u8);
+static void WaitForAreaScreenInput(u8 taskId);
 void sub_80BF1EC(u8);
 void LoadCryScreen(u8);
 void sub_80BF5CC(u8);
@@ -203,12 +203,12 @@ static void Task_DisplayNewMonData(u8);
 void sub_80C0088(u8);
 void blockset_load_palette_to_gpu(u8);
 void sub_80C01CC(struct Sprite *sprite);
-void sub_80C020C(u32, u32, u32, u32);
-void sub_80C0354(u16, u8, u8);
-void sub_80C0460(u16 weight, u8 left, u8 top);
-void sub_80C09B0(u16);
+static void PrintMonInfo(u32 num, u32, u32 owned, u32 newEntry);
+static void PrintMonHeight(u16 height, u8 left, u8 top);
+static void PrintMonWeight(u16 weight, u8 left, u8 top);
+static void ResetOtherVideoRegisters(u16);
 u8 sub_80C0B44(u8, u16, u8, u8);
-void sub_80C0D30(u8, u16);
+static void PrintFootprint(u8 windowId, u16 dexNum);
 u16 sub_80C0EF8(u16, s16, s16, s8);
 u16 sub_80C0E0C(u8, u16, u16, u16);
 u8 LoadSearchMenu(void);
@@ -244,10 +244,10 @@ void sub_80C267C(void);
 static const struct OamData sOamData_855CFE4 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
@@ -261,10 +261,10 @@ static const struct OamData sOamData_855CFE4 =
 static const struct OamData sOamData_855CFEC =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x8),
     .x = 0,
     .matrixNum = 0,
@@ -278,10 +278,10 @@ static const struct OamData sOamData_855CFEC =
 static const struct OamData sOamData_855CFF4 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .matrixNum = 0,
@@ -295,10 +295,10 @@ static const struct OamData sOamData_855CFF4 =
 static const struct OamData sOamData_855CFFC =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 2,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_WINDOW,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -312,10 +312,10 @@ static const struct OamData sOamData_855CFFC =
 static const struct OamData sOamData_855D004 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
@@ -329,10 +329,10 @@ static const struct OamData sOamData_855D004 =
 static const struct OamData sOamData_855D00C =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x16),
     .x = 0,
     .matrixNum = 0,
@@ -1323,7 +1323,7 @@ void CB2_Pokedex(void)
         case 0:
         default:
             SetVBlankCallback(NULL);
-            sub_80C09B0(0);
+            ResetOtherVideoRegisters(0);
             DmaFillLarge16(3, 0, (u8 *)VRAM, VRAM_SIZE, 0x1000);
             DmaClear32(3, OAM, OAM_SIZE);
             DmaClear16(3, PLTT, PLTT_SIZE);
@@ -1527,7 +1527,7 @@ void sub_80BBC74(u8 taskId)
 {
     if (gTasks[gTasks[taskId].data[0]].isActive)
     {
-        if (sPokedexView->unk64A == 1 && !sub_80BE9C4(gTasks[taskId].data[0]) && sub_80BD930())
+        if (sPokedexView->unk64A == 1 && !sub_80BE9C4(gTasks[taskId].data[0]) && UpdateSelectedMon())
             sub_80BE9F8(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], gTasks[taskId].data[0]);
     }
     else
@@ -1727,7 +1727,7 @@ void sub_80BC360(u8 taskId)
 {
     if (gTasks[gTasks[taskId].data[0]].isActive)
     {
-        if (sPokedexView->unk64A == 1 && !sub_80BE9C4(gTasks[taskId].data[0]) && sub_80BD930())
+        if (sPokedexView->unk64A == 1 && !sub_80BE9C4(gTasks[taskId].data[0]) && UpdateSelectedMon())
             sub_80BE9F8(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], gTasks[taskId].data[0]);
     }
     else
@@ -1776,7 +1776,7 @@ bool8 sub_80BC514(u8 a)
                 return 0;
             SetVBlankCallback(NULL);
             sPokedexView->unk64A = a;
-            sub_80C09B0(0);
+            ResetOtherVideoRegisters(0);
             SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->initialVOffset);
             ResetBgsAndClearDma3BusyFlags(0);
             InitBgsFromTemplates(0, sPokedex_BgTemplate, 4);
@@ -2378,7 +2378,7 @@ void sub_80BD8D0(void)
     }
 }
 
-u8 sub_80BD930(void)
+static bool8 UpdateSelectedMon(void)
 {
     u16 r2;
     u16 r4 = sPokedexView->selectedPokemon;
@@ -2467,7 +2467,7 @@ u32 sub_80BDACC(u16 num, s16 x, s16 y)
         {
             u8 spriteId = CreateMonSpriteFromNationalDexNumber(num, x, y, i);
 
-            gSprites[spriteId].oam.affineMode = 1;
+            gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
             gSprites[spriteId].oam.priority = 3;
             gSprites[spriteId].data[0] = 0;
             gSprites[spriteId].data[1] = i;
@@ -2506,13 +2506,13 @@ static void CreateInterfaceSprites(u8 a)
     StartSpriteAnim(&gSprites[spriteId], 1);
 
     spriteId = CreateSprite(&sRotatingPokeballSpriteTemplate, 0, 80, 2);
-    gSprites[spriteId].oam.affineMode = 1;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 30;
     gSprites[spriteId].data[0] = 0x1E;
     gSprites[spriteId].data[1] = 0;
 
     spriteId = CreateSprite(&sRotatingPokeballSpriteTemplate, 0, 80, 2);
-    gSprites[spriteId].oam.affineMode = 1;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 31;
     gSprites[spriteId].data[0] = 0x1F;
     gSprites[spriteId].data[1] = 0x80;
@@ -2698,7 +2698,7 @@ void sub_80BE44C(struct Sprite *sprite)
 void MoveMonIntoPosition(struct Sprite *sprite)
 {
     sprite->oam.priority = 0;
-    sprite->oam.affineMode = 0;
+    sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
     sprite->pos2.x = 0;
     sprite->pos2.y = 0;
     if (sprite->pos1.x != 48 || sprite->pos1.y != 56)
@@ -2855,7 +2855,7 @@ void sub_80BE834(struct Sprite *sprite)
     }
 }
 
-void sub_80BE8DC(const u8* str, u8 left, u8 top)
+static void PrintInfoPageText(const u8* str, u8 left, u8 top)
 {
     u8 color[3];
     color[0] = 0;
@@ -2924,21 +2924,21 @@ void LoadInfoScreen(u8 taskId)
                 SetVBlankCallback(NULL);
                 r2 = 0;
                 if (gTasks[taskId].data[1] != 0)
-                    r2 += 0x1000;
+                    r2 += DISPCNT_OBJ_ON;
                 if (gTasks[taskId].data[2] != 0)
-                    r2 |= 0x200;
-                sub_80C09B0(r2);
+                    r2 |= DISPCNT_BG1_ON;
+                ResetOtherVideoRegisters(r2);
                 gMain.state = 1;
             }
             break;
         case 1:
             DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
             CopyToBgTilemapBuffer(3, gPokedexTilemap_DescriptionScreen, 0, 0);
-            FillWindowPixelBuffer(0, PIXEL_FILL(0));
-            PutWindowTilemap(0);
-            PutWindowTilemap(1);
-            sub_80C0D30(1, sPokedexListItem->dexNum);
-            CopyWindowToVram(1, 2);
+            FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
+            PutWindowTilemap(WIN_INFO);
+            PutWindowTilemap(WIN_FOOTPRINT);
+            PrintFootprint(WIN_FOOTPRINT, sPokedexListItem->dexNum);
+            CopyWindowToVram(WIN_FOOTPRINT, 2);
             gMain.state++;
             break;
         case 2:
@@ -2951,10 +2951,10 @@ void LoadInfoScreen(u8 taskId)
             gMain.state++;
             break;
         case 4:
-            sub_80C020C(sPokedexListItem->dexNum, sPokedexView->dexMode == 0 ? 0 : 1, sPokedexListItem->owned, 0);
+            PrintMonInfo(sPokedexListItem->dexNum, sPokedexView->dexMode == 0 ? 0 : 1, sPokedexListItem->owned, 0);
             if (!sPokedexListItem->owned)
                 LoadPalette(gPlttBufferUnfaded + 1, 0x31, 0x1E);
-            CopyWindowToVram(0, 3);
+            CopyWindowToVram(WIN_INFO, 3);
             CopyBgTilemapBufferToVram(1);
             CopyBgTilemapBufferToVram(2);
             CopyBgTilemapBufferToVram(3);
@@ -2970,13 +2970,13 @@ void LoadInfoScreen(u8 taskId)
             break;
         case 6:
             {
-                u32 r3 = 0;
+                u32 preservedPalettes = 0;
 
                 if (gTasks[taskId].data[2] != 0)
-                    r3 = 0x14;
+                    preservedPalettes = 0x14; // each bit represents a palette index
                 if (gTasks[taskId].data[1] != 0)
-                    r3 |= (1 << (gSprites[gTasks[taskId].tMonSpriteId].oam.paletteNum + 16));
-                BeginNormalPaletteFade(~r3, 0, 16, 0, RGB_BLACK);
+                    preservedPalettes |= (1 << (gSprites[gTasks[taskId].tMonSpriteId].oam.paletteNum + 16));
+                BeginNormalPaletteFade(~preservedPalettes, 0, 16, 0, RGB_BLACK);
                 SetVBlankCallback(gUnknown_030060B4);
                 gMain.state++;
             }
@@ -3022,7 +3022,7 @@ void LoadInfoScreen(u8 taskId)
     }
 }
 
-void sub_80BEDB0(void)
+static void FreeWindowAndBgBuffers(void)
 {
     void *r0;
     FreeAllWindowBuffers();
@@ -3148,7 +3148,7 @@ void BeginReturnToPokedex(u8 taskId)
     if (!gPaletteFade.active)
     {
         FreeAndDestroyMonPicSprite(gTasks[taskId].tMonSpriteId);
-        sub_80BEDB0();
+        FreeWindowAndBgBuffers();
         DestroyTask(taskId);
     }
 }
@@ -3164,7 +3164,7 @@ void LoadAreaScreen(u8 taskId)
                 sPokedexView->unk64A = 5;
                 gUnknown_030060B4 = gMain.vblankCallback;
                 SetVBlankCallback(NULL);
-                sub_80C09B0(0x200);
+                ResetOtherVideoRegisters(DISPCNT_BG1_ON);
                 sPokedexView->selectedScreen = AREA_SCREEN;
                 gMain.state = 1;
             }
@@ -3181,13 +3181,14 @@ void LoadAreaScreen(u8 taskId)
             SetVBlankCallback(gUnknown_030060B4);
             sPokedexView->unk64E = 0;
             gMain.state = 0;
-            gTasks[taskId].func = sub_80BF1B4;
+            gTasks[taskId].func = WaitForAreaScreenInput;
             break;
     }
 }
 
-void sub_80BF1B4(u8 taskId)
+static void WaitForAreaScreenInput(u8 taskId)
 {
+// See Task_PokedexAreaScreen_1() in pokedex_area_screen.c
     if (sPokedexView->unk64E != 0)
         gTasks[taskId].func = sub_80BF1EC;
 }
@@ -3221,7 +3222,7 @@ void LoadCryScreen(u8 taskId)
                 sPokedexView->unk64A = 6;
                 gUnknown_030060B4 = gMain.vblankCallback;
                 SetVBlankCallback(NULL);
-                sub_80C09B0(0x200);
+                ResetOtherVideoRegisters(DISPCNT_BG1_ON);
                 sPokedexView->selectedScreen = CRY_SCREEN;
                 gMain.state = 1;
             }
@@ -3246,7 +3247,7 @@ void LoadCryScreen(u8 taskId)
             gMain.state++;
             break;
         case 4:
-            sub_80BE8DC(gText_CryOf, 0x52, 33);
+            PrintInfoPageText(gText_CryOf, 0x52, 33);
             sub_80C0B44(0, sPokedexListItem->dexNum, 0x52, 49);
             gMain.state++;
             break;
@@ -3415,7 +3416,7 @@ void LoadSizeScreen(u8 taskId)
                 sPokedexView->unk64A = 7;
                 gUnknown_030060B4 = gMain.vblankCallback;
                 SetVBlankCallback(NULL);
-                sub_80C09B0(0x200);
+                ResetOtherVideoRegisters(DISPCNT_BG1_ON);
                 sPokedexView->selectedScreen = SIZE_SCREEN;
                 gMain.state = 1;
             }
@@ -3439,7 +3440,7 @@ void LoadSizeScreen(u8 taskId)
 
                 StringCopy(string, gText_SizeComparedTo);
                 StringAppend(string, gSaveBlock2Ptr->playerName);
-                sub_80BE8DC(string, GetStringCenterAlignXOffset(1, string, 0xF0), 0x79);
+                PrintInfoPageText(string, GetStringCenterAlignXOffset(1, string, 0xF0), 0x79);
                 gMain.state++;
             }
             break;
@@ -3449,7 +3450,7 @@ void LoadSizeScreen(u8 taskId)
             break;
         case 5:
             spriteId = sub_80C0EF8(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), 152, 56, 0);
-            gSprites[spriteId].oam.affineMode = 1;
+            gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
             gSprites[spriteId].oam.matrixNum = 1;
             gSprites[spriteId].oam.priority = 0;
             gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].trainerOffset;
@@ -3460,7 +3461,7 @@ void LoadSizeScreen(u8 taskId)
             break;
         case 6:
             spriteId = CreateMonSpriteFromNationalDexNumber(sPokedexListItem->dexNum, 88, 56, 1);
-            gSprites[spriteId].oam.affineMode = 1;
+            gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
             gSprites[spriteId].oam.matrixNum = 2;
             gSprites[spriteId].oam.priority = 0;
             gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].pokemonOffset;
@@ -3760,7 +3761,7 @@ static void Task_DisplayNewMonData(u8 taskId)
             {
                 gUnknown_030060B4 = gMain.vblankCallback;
                 SetVBlankCallback(NULL);
-                sub_80C09B0(0x100);
+                ResetOtherVideoRegisters(DISPCNT_BG0_ON);
                 ResetBgsAndClearDma3BusyFlags(0);
                 InitBgsFromTemplates(0, sNewEntryInfoScreen_BgTemplate, 2);
                 SetBgTilemapBuffer(3, AllocZeroed(0x800));
@@ -3776,7 +3777,7 @@ static void Task_DisplayNewMonData(u8 taskId)
             FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
             PutWindowTilemap(WIN_INFO);
             PutWindowTilemap(WIN_FOOTPRINT);
-            sub_80C0D30(1, gTasks[taskId].data[1]);
+            PrintFootprint(WIN_FOOTPRINT, gTasks[taskId].data[1]);
             CopyWindowToVram(WIN_FOOTPRINT, 2);
             ResetPaletteFade();
             LoadPokedexBgPalette(0);
@@ -3786,7 +3787,7 @@ static void Task_DisplayNewMonData(u8 taskId)
             gTasks[taskId].data[0]++;
             break;
         case 3:
-            sub_80C020C(dexNum, IsNationalPokedexEnabled(), 1, 1);
+            PrintMonInfo(dexNum, IsNationalPokedexEnabled(), 1, 1);
             CopyWindowToVram(WIN_INFO, 3);
             CopyBgTilemapBufferToVram(2);
             CopyBgTilemapBufferToVram(3);
@@ -3881,7 +3882,7 @@ void sub_80C01CC(struct Sprite *sprite)
         sprite->pos1.y -= 1;
 }
 
-void sub_80C020C(u32 num, u32 value, u32 c, u32 d)
+static void PrintMonInfo(u32 num, u32 value, u32 owned, u32 newEntry)
 {
     u8 str[0x10];
     u8 str2[0x20];
@@ -3890,21 +3891,21 @@ void sub_80C020C(u32 num, u32 value, u32 c, u32 d)
     const u8 *text2;
     const u8 *text3;
 
-    if (d)
-        sub_80BE8DC(gText_PokedexRegistration, GetStringCenterAlignXOffset(1, gText_PokedexRegistration, 0xF0), 0);
+    if (newEntry)
+        PrintInfoPageText(gText_PokedexRegistration, GetStringCenterAlignXOffset(1, gText_PokedexRegistration, 0xF0), 0);
     if (value == 0)
         value = NationalToHoennOrder(num);
     else
         value = num;
     ConvertIntToDecimalStringN(StringCopy(str, gText_UnkCtrlF908Clear01), value, STR_CONV_MODE_LEADING_ZEROS, 3);
-    sub_80BE8DC(str, 0x60, 0x19);
+    PrintInfoPageText(str, 0x60, 0x19);
     natNum = NationalPokedexNumToSpecies(num);
     if (natNum)
         text = gSpeciesNames[natNum];
     else
         text = sText_TenDashes2;
-    sub_80BE8DC(text, 0x84, 0x19);
-    if (c)
+    PrintInfoPageText(text, 0x84, 0x19);
+    if (owned)
     {
         CopyMonCategoryText(num, str2);
         text2 = str2;
@@ -3913,27 +3914,27 @@ void sub_80C020C(u32 num, u32 value, u32 c, u32 d)
     {
         text2 = gText_5MarksPokemon;
     }
-    sub_80BE8DC(text2, 0x64, 0x29);
-    sub_80BE8DC(gText_HTHeight, 0x60, 0x39);
-    sub_80BE8DC(gText_WTWeight, 0x60, 0x49);
-    if (c)
+    PrintInfoPageText(text2, 0x64, 0x29);
+    PrintInfoPageText(gText_HTHeight, 0x60, 0x39);
+    PrintInfoPageText(gText_WTWeight, 0x60, 0x49);
+    if (owned)
     {
-        sub_80C0354(gPokedexEntries[num].height, 0x81, 0x39);
-        sub_80C0460(gPokedexEntries[num].weight, 0x81, 0x49);
+        PrintMonHeight(gPokedexEntries[num].height, 0x81, 0x39);
+        PrintMonWeight(gPokedexEntries[num].weight, 0x81, 0x49);
     }
     else
     {
-        sub_80BE8DC(gText_UnkHeight, 0x81, 0x39);
-        sub_80BE8DC(gText_UnkWeight, 0x81, 0x49);
+        PrintInfoPageText(gText_UnkHeight, 0x81, 0x39);
+        PrintInfoPageText(gText_UnkWeight, 0x81, 0x49);
     }
-    if (c)
+    if (owned)
         text3 = gPokedexEntries[num].description;
     else
         text3 = gExpandedPlaceholder_PokedexDescription;
-    sub_80BE8DC(text3, GetStringCenterAlignXOffset(1, text3, 0xF0), 0x5F);
+    PrintInfoPageText(text3, GetStringCenterAlignXOffset(1, text3, 0xF0), 0x5F);
 }
 
-void sub_80C0354(u16 height, u8 left, u8 top)
+static void PrintMonHeight(u16 height, u8 left, u8 top)
 {
     u8 buffer[16];
     u32 inches, feet;
@@ -3963,13 +3964,13 @@ void sub_80C0354(u16 height, u8 left, u8 top)
     buffer[i++] = (inches % 10) + CHAR_0;
     buffer[i++] = CHAR_DBL_QUOT_RIGHT;
     buffer[i++] = EOS;
-    sub_80BE8DC(buffer, left, top);
+    PrintInfoPageText(buffer, left, top);
 }
 
 #ifdef NONMATCHING
 // This doesn't match because gcc manages to avoid using the stack
 // to store local variables.
-void sub_80C0460(u16 weight, u8 left, u8 top)
+static void PrintMonWeight(u16 weight, u8 left, u8 top)
 {
     u8 buffer[16];
     bool8 output;
@@ -4025,11 +4026,11 @@ void sub_80C0460(u16 weight, u8 left, u8 top)
     buffer[i++] = CHAR_s;
     buffer[i++] = CHAR_PERIOD;
     buffer[i++] = EOS;
-    sub_80BE8DC(buffer, left, top);
+    PrintInfoPageText(buffer, left, top);
 }
 #else
 __attribute__((naked))
-void sub_80C0460(u16 weight, u8 left, u8 top)
+static void PrintMonWeight(u16 weight, u8 left, u8 top)
 {
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
@@ -4234,7 +4235,7 @@ _080C0552:\n\
     mov r0, sp\n\
     mov r1, r10\n\
     ldr r2, [sp, 0x10]\n\
-    bl sub_80BE8DC\n\
+    bl PrintInfoPageText\n\
     add sp, 0x14\n\
     pop {r3-r5}\n\
     mov r8, r3\n\
@@ -4247,7 +4248,7 @@ _080C0552:\n\
 }
 #endif
 
-const u8 *sub_80C0620(u16 dexNum)
+const u8 *GetPokedexCategoryName(u16 dexNum) // unused
 {
     return gPokedexEntries[dexNum].categoryName;
 }
@@ -4435,7 +4436,7 @@ bool16 HasAllMons(void)
     return TRUE;
 }
 
-void sub_80C09B0(u16 a)
+static void ResetOtherVideoRegisters(u16 a)
 {
     if (!(a & DISPCNT_BG0_ON))
     {
@@ -4484,7 +4485,7 @@ void sub_80C0A88(u8 windowId, const u8 *str, u8 left, u8 top)
     AddTextPrinterParameterized4(windowId, 1, left, top, 0, 0, color, -1, str);
 }
 
-void sub_80C0AC4(u8 windowId, u16 order, u8 left, u8 top)
+void sub_80C0AC4(u8 windowId, u16 order, u8 left, u8 top) // unused
 {
     u8 str[4];
 
@@ -4518,7 +4519,7 @@ u8 sub_80C0B44(u8 windowId, u16 num, u8 left, u8 top)
     return i;
 }
 
-void sub_80C0BF0(u8 windowId, const u8* str, u8 left, u8 top)
+void sub_80C0BF0(u8 windowId, const u8* str, u8 left, u8 top) // unused
 {
     u8 str2[11];
     u8 i;
@@ -4534,7 +4535,7 @@ void sub_80C0BF0(u8 windowId, const u8* str, u8 left, u8 top)
     sub_80C0A88(windowId, str2, left, top);
 }
 
-void sub_80C0C6C(u8 windowId, u16 b, u8 left, u8 top)
+void sub_80C0C6C(u8 windowId, u16 b, u8 left, u8 top) // unused
 {
     u8 str[6];
     bool8 outputted = FALSE;
@@ -4571,10 +4572,10 @@ void sub_80C0C6C(u8 windowId, u16 b, u8 left, u8 top)
     sub_80C0A88(windowId, str, left, top);
 }
 
-void sub_80C0D30(u8 windowId, u16 a1)
+static void PrintFootprint(u8 windowId, u16 dexNum)
 {
     u8 image[32 * 4];
-    const u8 * r12 = gMonFootprintTable[NationalPokedexNumToSpecies(a1)];
+    const u8 * r12 = gMonFootprintTable[NationalPokedexNumToSpecies(dexNum)];
     u16 r5 = 0;
     u16 i;
     u16 j;
@@ -4802,7 +4803,7 @@ void Task_LoadSearchMenu(u8 taskId)
             if (!gPaletteFade.active)
             {
                 sPokedexView->unk64A = 2;
-                sub_80C09B0(0);
+                ResetOtherVideoRegisters(0);
                 ResetBgsAndClearDma3BusyFlags(0);
                 InitBgsFromTemplates(0, sSearchMenu_BgTemplate, 4);
                 SetBgTilemapBuffer(3, AllocZeroed(0x800));
diff --git a/src/pokemon.c b/src/pokemon.c
index 2b9483c53..12820aa76 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2083,10 +2083,10 @@ static const struct SpeciesItem sAlteringCaveWildMonHeldItems[] =
 static const struct OamData sOamData_8329F20 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index 340327475..622e1d584 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -970,7 +970,7 @@ static void SetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rot
 
 static void HandleStartAffineAnim(struct Sprite *sprite)
 {
-    sprite->oam.affineMode = 3;
+    sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
     sprite->affineAnims = sSpriteAffineAnimTable_860AD68;
 
     if (sUnknown_03001274 == TRUE)
@@ -1028,7 +1028,7 @@ static u8 sub_817F758(void)
 
 static void sub_817F77C(struct Sprite *sprite)
 {
-    sprite->oam.affineMode = 1;
+    sprite->oam.affineMode = ST_OAM_AFFINE_NORMAL;
     CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
 
     if (sUnknown_03001274 == TRUE)
@@ -1040,7 +1040,7 @@ static void sub_817F77C(struct Sprite *sprite)
 
         FreeOamMatrix(sprite->oam.matrixNum);
         sprite->oam.matrixNum |= (sprite->hFlip << 3);
-        sprite->oam.affineMode = 0;
+        sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
     }
 }
 
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 70af9f956..2c11ca293 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1004,28 +1004,26 @@ const union AffineAnimCmd *const sMonIconAffineAnims[] =
 
 const u16 sSpriteImageSizes[3][4] =
 {
-    // square
+    [ST_OAM_SQUARE] = 
     {
-         0x20, // 1×1
-         0x80, // 2×2
-        0x200, // 4×4
-        0x800, // 8×8
+        [SPRITE_SIZE(8x8)]   =  0x20,
+        [SPRITE_SIZE(16x16)] =  0x80,
+        [SPRITE_SIZE(32x32)] = 0x200,
+        [SPRITE_SIZE(64x64)] = 0x800,
     },
-
-    // horizontal rectangle
+    [ST_OAM_H_RECTANGLE] = 
     {
-         0x40, // 2×1
-         0x80, // 4×1
-        0x100, // 4×2
-        0x400, // 8×4
+        [SPRITE_SIZE(16x8)]  =  0x40,
+        [SPRITE_SIZE(32x8)]  =  0x80,
+        [SPRITE_SIZE(32x16)] = 0x100,
+        [SPRITE_SIZE(64x32)] = 0x400,
     },
-
-    // vertical rectangle
+    [ST_OAM_V_RECTANGLE] = 
     {
-         0x40, // 1×2
-         0x80, // 1×4
-        0x100, // 2×4
-        0x400, // 4×8
+        [SPRITE_SIZE(8x16)]  =  0x40,
+        [SPRITE_SIZE(8x32)]  =  0x80,
+        [SPRITE_SIZE(16x32)] = 0x100,
+        [SPRITE_SIZE(32x64)] = 0x400,
     },
 };
 
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c
index ccf64b8a2..b876fdb68 100755
--- a/src/pokemon_jump.c
+++ b/src/pokemon_jump.c
@@ -2294,14 +2294,14 @@ static const struct SpriteTemplate *const gUnknown_082FBEB8[] =
 static const struct OamData sOamData_82FBEC8 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -2311,14 +2311,14 @@ static const struct OamData sOamData_82FBEC8 =
 static const struct OamData sOamData_82FBED0 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 2,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(16x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(16x32),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -2328,14 +2328,14 @@ static const struct OamData sOamData_82FBED0 =
 static const struct OamData sOamData_82FBED8 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -2345,14 +2345,14 @@ static const struct OamData sOamData_82FBED8 =
 static const struct OamData sOamData_82FBEE0 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 1,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x16),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -2498,14 +2498,14 @@ static const struct SpriteTemplate gUnknown_082FBFC0 =
 static const struct OamData sOamData_82FBFD8 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -3557,8 +3557,8 @@ static void sub_802DD08(void)
     struct UnkStruct3 unkStruct;
     struct UnkStruct3 *ptr = &unkStruct; // This temp variable is needed to match, don't ask me why.
 
-    ptr->shape = 0;
-    ptr->size = 0;
+    ptr->shape = SPRITE_SHAPE(8x8);
+    ptr->size = SPRITE_SIZE(8x8);
     ptr->field_0_0 = 0;
     ptr->priority = 1;
     ptr->field_1 = 5;
@@ -4483,14 +4483,14 @@ static void sub_802EF50(u16 tileTag, u16 palTag)
 static const struct OamData sOamData_82FEBDC =
 {
     .y = 0,
-    .affineMode = 3,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -4500,14 +4500,14 @@ static const struct OamData sOamData_82FEBDC =
 static const struct OamData sOamData_82FEBE4 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
-    .shape = 1,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 69a0161e1..bddf24cb1 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -963,10 +963,10 @@ static const struct WindowTemplate sYesNoWindowTemplate =
 static const struct OamData sOamData_857286C =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -980,10 +980,10 @@ static const struct OamData sOamData_857286C =
 static const struct OamData sOamData_8572874 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x8),
     .x = 0,
     .matrixNum = 0,
@@ -1056,10 +1056,10 @@ static const struct SpriteTemplate gUnknown_085728D4 =
 static const struct OamData sOamData_85728EC =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -4569,7 +4569,7 @@ static void sub_80CB028(u8 boxId)
         for (boxPosition = 0; boxPosition < IN_BOX_COUNT; boxPosition++)
         {
             if (GetBoxMonDataAt(boxId, boxPosition, MON_DATA_HELD_ITEM) == 0)
-                sPSSData->boxMonsSprites[boxPosition]->oam.objMode = 1;
+                sPSSData->boxMonsSprites[boxPosition]->oam.objMode = ST_OAM_OBJ_BLEND;
         }
     }
 }
@@ -4586,7 +4586,7 @@ static void sub_80CB140(u8 boxPosition)
 
         sPSSData->boxMonsSprites[boxPosition] = CreateMonIconSprite(species, personality, x, y, 2, 19 - (boxPosition % IN_BOX_ROWS));
         if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
-            sPSSData->boxMonsSprites[boxPosition]->oam.objMode = 1;
+            sPSSData->boxMonsSprites[boxPosition]->oam.objMode = ST_OAM_OBJ_BLEND;
     }
 }
 
@@ -4699,7 +4699,7 @@ static u8 sub_80CB2F8(u8 row, u16 times, s16 xDelta)
                     sPSSData->boxMonsSprites[boxPosition]->data[3] = xDest;
                     sPSSData->boxMonsSprites[boxPosition]->callback = sub_80CB234;
                     if (GetBoxMonDataAt(sPSSData->field_C5C, boxPosition, MON_DATA_HELD_ITEM) == 0)
-                        sPSSData->boxMonsSprites[boxPosition]->oam.objMode = 1;
+                        sPSSData->boxMonsSprites[boxPosition]->oam.objMode = ST_OAM_OBJ_BLEND;
                     count++;
                 }
             }
@@ -4846,7 +4846,7 @@ static void CreatePartyMonsSprites(bool8 arg0)
         for (i = 0; i < PARTY_SIZE; i++)
         {
             if (sPSSData->partySprites[i] != NULL && GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM) == 0)
-                sPSSData->partySprites[i]->oam.objMode = 1;
+                sPSSData->partySprites[i]->oam.objMode = ST_OAM_OBJ_BLEND;
         }
     }
 }
@@ -5087,7 +5087,7 @@ static void sub_80CBF14(u8 mode, u8 position)
     if (*sPSSData->field_B04 != NULL)
     {
         InitSpriteAffineAnim(*sPSSData->field_B04);
-        (*sPSSData->field_B04)->oam.affineMode = 1;
+        (*sPSSData->field_B04)->oam.affineMode = ST_OAM_AFFINE_NORMAL;
         (*sPSSData->field_B04)->affineAnims = gSpriteAffineAnimTable_857291C;
         StartSpriteAffineAnim(*sPSSData->field_B04, 0);
     }
@@ -9358,10 +9358,10 @@ static const u32 gUnknown_0857BB24[] = INCBIN_U32("graphics/pokemon_storage/unkn
 static const struct OamData sOamData_857BBA4 =
 {
     .y = 0,
-    .affineMode = 1,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_NORMAL,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 41c48d008..32469bb4b 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -706,10 +706,10 @@ static const u8 sMovesPPLayout[] = _("{PP}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}");
 static const struct OamData sOamData_MoveTypes =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .matrixNum = 0,
@@ -882,10 +882,10 @@ static const u8 sMoveTypeToOamPaletteNum[NUMBER_OF_MON_TYPES + CONTEST_CATEGORIE
 static const struct OamData gOamData_861CFF4 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
@@ -971,10 +971,10 @@ static const struct SpriteTemplate gUnknown_0861D084 =
 static const struct OamData sOamData_StatusCondition =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c
index 4422a70e3..accc5a2bf 100644
--- a/src/pokenav_main_menu.c
+++ b/src/pokenav_main_menu.c
@@ -288,7 +288,7 @@ static const struct OamData sUnknown_0861FB24 =
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/pokenav_unk_10.c b/src/pokenav_unk_10.c
index 135ff24b3..a98938a60 100644
--- a/src/pokenav_unk_10.c
+++ b/src/pokenav_unk_10.c
@@ -1057,10 +1057,10 @@ static const struct SpritePalette gUnknown_08624C80[] =
 static const struct OamData sOamData_8624CB0 =
 {
     .y = 0,
-    .affineMode = 1,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_NORMAL,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/pokenav_unk_2.c b/src/pokenav_unk_2.c
index cb9467a9c..e335d74e9 100644
--- a/src/pokenav_unk_2.c
+++ b/src/pokenav_unk_2.c
@@ -243,9 +243,9 @@ static const u8 gUnknown_0862030F[] = {6, 8, 7, 0, 0};
 static const struct OamData gUnknown_08620314 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .size = SPRITE_SIZE(32x16),
@@ -287,9 +287,9 @@ static const struct SpriteTemplate gUnknown_0862034C =
 static const struct OamData gUnknown_08620364 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .size = SPRITE_SIZE(32x16),
@@ -1030,7 +1030,7 @@ static void sub_81CA4AC(struct Sprite * sprite)
             {
                 sprite->invisible = TRUE;
                 FreeOamMatrix(sprite->oam.matrixNum);
-                CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, 0);
+                CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, ST_OAM_AFFINE_OFF);
                 sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
                 sprite->oam.objMode = ST_OAM_OBJ_NORMAL;
                 sprite->callback = SpriteCallbackDummy;
diff --git a/src/pokenav_unk_4.c b/src/pokenav_unk_4.c
index 0f05c6f5d..b8d9a51e7 100755
--- a/src/pokenav_unk_4.c
+++ b/src/pokenav_unk_4.c
@@ -231,9 +231,9 @@ const struct SpritePalette gUnknown_08622818[] =
 const struct OamData gUnknown_08622828 = 
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x16),
     .x = 0,
     .size = SPRITE_SIZE(8x16),
@@ -256,9 +256,9 @@ const struct SpriteTemplate gUnknown_08622830 =
 const struct OamData gUnknown_08622848 = 
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .size = SPRITE_SIZE(64x64),
diff --git a/src/pokenav_unk_5.c b/src/pokenav_unk_5.c
index 03ac05d4d..a42d08e15 100755
--- a/src/pokenav_unk_5.c
+++ b/src/pokenav_unk_5.c
@@ -144,9 +144,9 @@ const struct WindowTemplate gUnknown_08623110 =
 const struct OamData gUnknown_086231C8 = 
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .size = SPRITE_SIZE(32x8),
diff --git a/src/pokenav_unk_7.c b/src/pokenav_unk_7.c
index 34432a077..bcc608380 100644
--- a/src/pokenav_unk_7.c
+++ b/src/pokenav_unk_7.c
@@ -719,8 +719,8 @@ void sub_81CE9E4(void)
         if (spriteId != MAX_SPRITES)
         {
             structPtr->unk1806[i] = spriteId;
-            gSprites[spriteId].oam.shape = 1;
-            gSprites[spriteId].oam.size = 2;
+            gSprites[spriteId].oam.shape = SPRITE_SHAPE(32x16);
+            gSprites[spriteId].oam.size = SPRITE_SIZE(32x16);
         }
         else
         {
diff --git a/src/psychic.c b/src/psychic.c
index 7ad8e14cb..656608740 100644
--- a/src/psychic.c
+++ b/src/psychic.c
@@ -659,7 +659,7 @@ void sub_810F6B0(struct Sprite *sprite)
 
 static void sub_810F740(struct Sprite *sprite)
 {
-    sprite->oam.affineMode = 1;
+    sprite->oam.affineMode = ST_OAM_AFFINE_NORMAL;
     sprite->affineAnims = gUnknown_08596740;
     sprite->data[0] = 0;
     InitSpriteAffineAnim(sprite);
@@ -674,7 +674,7 @@ static void sub_810F774(struct Sprite *sprite)
         if (sprite->affineAnimEnded)
         {
             FreeOamMatrix(sprite->oam.matrixNum);
-            sprite->oam.affineMode = 0;
+            sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
             sprite->data[1] = 18;
             sprite->data[0]++;
         }
diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index 4e5e492f2..cef7f4cdd 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -101,10 +101,10 @@ static const TaskFunc sTasksForAnimations[] =
 static const struct OamData sOamData_862A6BC =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -118,10 +118,10 @@ static const struct OamData sOamData_862A6BC =
 static const struct OamData sOamData_862A6C4 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -135,10 +135,10 @@ static const struct OamData sOamData_862A6C4 =
 static const struct OamData sOamData_862A6CC =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
@@ -152,10 +152,10 @@ static const struct OamData sOamData_862A6CC =
 static const struct OamData sOamData_862A6D4 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .matrixNum = 0,
@@ -169,10 +169,10 @@ static const struct OamData sOamData_862A6D4 =
 static const struct OamData sOamData_862A6DC =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x8),
     .x = 0,
     .matrixNum = 0,
@@ -186,10 +186,10 @@ static const struct OamData sOamData_862A6DC =
 static const struct OamData sOamData_862A6E4 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x32),
     .x = 0,
     .matrixNum = 0,
@@ -203,10 +203,10 @@ static const struct OamData sOamData_862A6E4 =
 static const struct OamData sOamData_862A6EC =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
@@ -220,10 +220,10 @@ static const struct OamData sOamData_862A6EC =
 static const struct OamData sOamData_862A6F4 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .matrixNum = 0,
@@ -2045,8 +2045,8 @@ static void sub_81D81A4(u8 taskId)
                                    (sUnknown_0862AAB8[data[0]][1] * 4) + 80,
                                    0);
         gSprites[spriteId].data[0] = (s8)(data[0]);
-        gSprites[spriteId].oam.objMode = 1;
-        gSprites[spriteId].oam.affineMode = 3;
+        gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
+        gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_DOUBLE;
         gSprites[spriteId].oam.priority = 2;
         InitSpriteAffineAnim(&gSprites[spriteId]);
         if (data[0] == 9)
diff --git a/src/region_map.c b/src/region_map.c
index b6133ee0d..b1ba2795c 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1259,7 +1259,7 @@ static u16 RegionMap_GetTerraCaveMapSecId(void)
 {
     s16 idx;
 
-    idx = VarGet(VAR_UNUSUAL_WEATHER_LOCATION) - 1;
+    idx = VarGet(VAR_ABNORMAL_WEATHER_LOCATION) - 1;
     if (idx < 0 || idx > 15)
     {
         idx = 0;
@@ -1271,7 +1271,7 @@ static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y)
 {
     u16 idx;
 
-    idx = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
+    idx = VarGet(VAR_ABNORMAL_WEATHER_LOCATION);
     if (idx < 9 || idx > 16)
     {
         idx = 9;
@@ -1416,14 +1416,14 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag)
         gRegionMap->cursorSprite = &gSprites[spriteId];
         if (gRegionMap->zoomed == TRUE)
         {
-            gRegionMap->cursorSprite->oam.size = 2;
+            gRegionMap->cursorSprite->oam.size = SPRITE_SIZE(32x32);
             gRegionMap->cursorSprite->pos1.x -= 8;
             gRegionMap->cursorSprite->pos1.y -= 8;
             StartSpriteAnim(gRegionMap->cursorSprite, 1);
         }
         else
         {
-            gRegionMap->cursorSprite->oam.size = 1;
+            gRegionMap->cursorSprite->oam.size = SPRITE_SIZE(16x16);
             gRegionMap->cursorSprite->pos1.x = 8 * gRegionMap->cursorPosX + 4;
             gRegionMap->cursorSprite->pos1.y = 8 * gRegionMap->cursorPosY + 4;
         }
@@ -1863,15 +1863,15 @@ static void sub_8124AD4(void)
         y = (y + MAPCURSOR_Y_MIN) * 8 + 4;
         if (width == 2)
         {
-            shape = ST_OAM_H_RECTANGLE;
+            shape = SPRITE_SHAPE(16x8);
         }
         else if (height == 2)
         {
-            shape = ST_OAM_V_RECTANGLE;
+            shape = SPRITE_SHAPE(8x16);
         }
         else
         {
-            shape = ST_OAM_SQUARE;
+            shape = SPRITE_SHAPE(8x8);
         }
         spriteId = CreateSprite(&gUnknown_085A1F7C, x, y, 10);
         if (spriteId != MAX_SPRITES)
@@ -1913,7 +1913,7 @@ static void sub_8124BE4(void)
             spriteId = CreateSprite(&gUnknown_085A1F7C, x, y, 10);
             if (spriteId != MAX_SPRITES)
             {
-                gSprites[spriteId].oam.size = 1;
+                gSprites[spriteId].oam.size = SPRITE_SIZE(16x16);
                 gSprites[spriteId].callback = sub_8124CBC;
                 StartSpriteAnim(&gSprites[spriteId], 6);
                 gSprites[spriteId].data[0] = mapSecId;
diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c
index 2bbf7d782..8c4843ab5 100644
--- a/src/reset_rtc_screen.c
+++ b/src/reset_rtc_screen.c
@@ -105,10 +105,10 @@ static const struct ResetRtcStruct sUnknown_08510428[5] =
 static const struct OamData sOamData_08510464 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/rock.c b/src/rock.c
index 7bba6f603..28566f1b7 100644
--- a/src/rock.c
+++ b/src/rock.c
@@ -136,8 +136,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8596BA0 =
 
 const struct Subsprite gUnknown_08596BB8[] =
 {
-    {.x = -16, .y = 0, .shape = ST_OAM_H_RECTANGLE, .size = 2, .tileOffset = 0, .priority = 1},
-    {.x =  16, .y = 0, .shape = ST_OAM_H_RECTANGLE, .size = 2, .tileOffset = 8, .priority = 1},
+    {.x = -16, .y = 0, .shape = SPRITE_SHAPE(32x16), .size = SPRITE_SIZE(32x16), .tileOffset = 0, .priority = 1},
+    {.x =  16, .y = 0, .shape = SPRITE_SHAPE(32x16), .size = SPRITE_SIZE(32x16), .tileOffset = 8, .priority = 1},
 };
 
 const struct SubspriteTable gUnknown_08596BC0[] =
diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c
index 7cc30c775..029696526 100644
--- a/src/rom_8034C54.c
+++ b/src/rom_8034C54.c
@@ -189,7 +189,7 @@ static void sub_8034EFC(struct UnkStruct2 *arg0)
 
     oamId--;
     gMain.oamBuffer[oamId].x = arg0->x - arg0->xDelta;
-    gMain.oamBuffer[oamId].affineMode = 2;
+    gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
     gMain.oamBuffer[oamId].tileNum = arg0->tileStart + (arg0->field_9 * 10);
 }
 
@@ -244,9 +244,9 @@ static void sub_80350B0(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
     }
 
     if (arg2)
-        gMain.oamBuffer[oamId].affineMode = 0;
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
     else
-        gMain.oamBuffer[oamId].affineMode = 2;
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
 }
 
 static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
@@ -265,14 +265,14 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
         if (r4 != 0 || gUnknown_03000DDC != -1 || r5 == 0)
         {
             gMain.oamBuffer[gUnknown_03000DD4].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
-            gMain.oamBuffer[gUnknown_03000DD4].affineMode = 0;
+            gMain.oamBuffer[gUnknown_03000DD4].affineMode = ST_OAM_AFFINE_OFF;
 
             if (gUnknown_03000DDC == -1)
                 gUnknown_03000DDC = gUnknown_03000DD8;
         }
         else
         {
-            gMain.oamBuffer[gUnknown_03000DD4].affineMode = 2;
+            gMain.oamBuffer[gUnknown_03000DD4].affineMode = ST_OAM_AFFINE_ERASE;
         }
 
         gUnknown_03000DD4++;
@@ -281,12 +281,12 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
 
     if (arg2)
     {
-        gMain.oamBuffer[gUnknown_03000DD4].affineMode = 0;
+        gMain.oamBuffer[gUnknown_03000DD4].affineMode = ST_OAM_AFFINE_OFF;
         gMain.oamBuffer[gUnknown_03000DD4].x = arg0->x + ((gUnknown_03000DDC - 1) * arg0->xDelta);
     }
     else
     {
-        gMain.oamBuffer[gUnknown_03000DD4].affineMode = 2;
+        gMain.oamBuffer[gUnknown_03000DD4].affineMode = ST_OAM_AFFINE_ERASE;
     }
 }
 
@@ -307,7 +307,7 @@ static void sub_80352C0(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
         {
             var_28 = 1;
             gMain.oamBuffer[oamId].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
-            gMain.oamBuffer[oamId].affineMode = 0;
+            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
 
             oamId++;
             r9++;
@@ -316,15 +316,15 @@ static void sub_80352C0(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
 
     while (r9 < arg0->oamCount)
     {
-        gMain.oamBuffer[oamId].affineMode = 2;
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
         oamId++;
         r9++;
     }
 
     if (arg2)
-        gMain.oamBuffer[oamId].affineMode = 0;
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
     else
-        gMain.oamBuffer[oamId].affineMode = 2;
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
 }
 
 void sub_80353DC(u32 id)
@@ -340,7 +340,7 @@ void sub_80353DC(u32 id)
     oamId = gUnknown_02022E10->array[id].firstOamId;
 
     for (i = 0; i < oamCount; i++, oamId++)
-        gMain.oamBuffer[oamId].affineMode = 2;
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
 
     if (!SharesTileWithAnyActive(id))
         FreeSpriteTilesByTag(gUnknown_02022E10->array[id].tileTag);
@@ -364,12 +364,12 @@ void sub_803547C(u32 id, bool32 arg1)
     if (arg1)
     {
         for (i = 0; i < oamCount; i++, oamId++)
-            gMain.oamBuffer[oamId].affineMode = 2;
+            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
     }
     else
     {
         for (i = 0; i < oamCount; i++, oamId++)
-            gMain.oamBuffer[oamId].affineMode = 0;
+            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
 
         sub_8035044(id, gUnknown_02022E10->array[id].field_18);
     }
diff --git a/src/rotating_gate.c b/src/rotating_gate.c
index 44d291dc4..340fc58dd 100644
--- a/src/rotating_gate.c
+++ b/src/rotating_gate.c
@@ -233,7 +233,7 @@ static const struct OamData sOamData_RotatingGateLarge =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
@@ -250,7 +250,7 @@ static const struct OamData sOamData_RotatingGateRegular =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
-    .objMode = 0,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
diff --git a/src/roulette.c b/src/roulette.c
index 26002e773..fb0677cbf 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -4043,7 +4043,7 @@ static void sub_81446DC(struct Sprite *sprite)
     gUnknown_0203AB88->var3C[55] = CreateSprite(&gSpriteTemplate_85B79F8, 36, -12, 50);
     gUnknown_0203AB88->var3C[56] = CreateSprite(&gSpriteTemplate_85B7ABC[0], s[sprite->data[0]][0], s[sprite->data[0]][1], 59);
     gUnknown_0203AB88->var3C[57] = CreateSprite(&gSpriteTemplate_85B7ABC[1], 36, 140, 51);
-    gSprites[gUnknown_0203AB88->var3C[57]].oam.objMode = 1;
+    gSprites[gUnknown_0203AB88->var3C[57]].oam.objMode = ST_OAM_OBJ_BLEND;
     for (i = 0; i < 3; i++)
     {
         gSprites[gUnknown_0203AB88->var3C[i + 55]].coordOffsetEnabled = FALSE;
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 6d45370b8..a2a2acc8d 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -48,10 +48,10 @@ EWRAM_DATA u8 gSaveFailedUnused2[4] = {0};
 static const struct OamData sClockOamData =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/shop.c b/src/shop.c
index 465a581b2..5f796f307 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -439,7 +439,7 @@ static void CB2_InitBuyMenu(void)
     {
     case 0:
         SetVBlankHBlankCallbacksToNull();
-        CpuFastFill(0, (void *)OAM, 0x400);
+        CpuFastFill(0, (void *)OAM, OAM_SIZE);
         ScanlineEffect_Stop();
         reset_temp_tile_data_buffers();
         FreeAllSpritePalettes();
@@ -856,7 +856,7 @@ static void BuyMenuDrawObjectEvents(void)
         if (BuyMenuCheckIfObjectEventOverlapsMenuBg(gShopDataPtr->viewportObjects[i]) == TRUE)
         {
             gSprites[spriteId].subspriteTableNum = 4;
-            gSprites[spriteId].subspriteMode = 1;
+            gSprites[spriteId].subspriteMode = SUBSPRITES_ON;
         }
 
         StartSpriteAnim(&gSprites[spriteId], gShopDataPtr->viewportObjects[i][ANIM_NUM]);
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 5524d407b..7f390372e 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -167,10 +167,10 @@ static const u8 gUnknown_085B1E0C[] = {0x00, 0x01, 0x03};
 static const struct OamData gOamData_85B1E10 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -184,10 +184,10 @@ static const struct OamData gOamData_85B1E10 =
 static const struct OamData gOamData_85B1E18 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -201,10 +201,10 @@ static const struct OamData gOamData_85B1E18 =
 static const struct OamData gOamData_85B1E20 =
 {
     .y = 160,
-    .affineMode = 3,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/title_screen.c b/src/title_screen.c
index 8310ef811..c20e1ba70 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -102,10 +102,10 @@ const u16 gIntroWaterDropAlphaBlend[] =
 static const struct OamData sVersionBannerLeftOamData =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 1,
+    .bpp = ST_OAM_8BPP,
     .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
@@ -119,10 +119,10 @@ static const struct OamData sVersionBannerLeftOamData =
 static const struct OamData sVersionBannerRightOamData =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 1,
+    .bpp = ST_OAM_8BPP,
     .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
@@ -190,10 +190,10 @@ static const struct CompressedSpriteSheet sSpriteSheet_EmeraldVersion[] =
 static const struct OamData sOamData_CopyrightBanner =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .matrixNum = 0,
@@ -302,10 +302,10 @@ static const struct SpritePalette sSpritePalette_PressStart[] =
 static const struct OamData sPokemonLogoShineOamData =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -353,7 +353,7 @@ static void SpriteCB_VersionBannerLeft(struct Sprite *sprite)
 {
     if (gTasks[sprite->data[1]].data[1] != 0)
     {
-        sprite->oam.objMode = 0;
+        sprite->oam.objMode = ST_OAM_OBJ_NORMAL;
         sprite->pos1.y = VERSION_BANNER_Y_GOAL;
     }
     else
@@ -370,7 +370,7 @@ static void SpriteCB_VersionBannerRight(struct Sprite *sprite)
 {
     if (gTasks[sprite->data[1]].data[1] != 0)
     {
-        sprite->oam.objMode = 0;
+        sprite->oam.objMode = ST_OAM_OBJ_NORMAL;
         sprite->pos1.y = VERSION_BANNER_Y_GOAL;
     }
     else
@@ -484,22 +484,22 @@ static void StartPokemonLogoShine(u8 flashBg)
     case 0:
     case 2:
         spriteId = CreateSprite(&sPokemonLogoShineSpriteTemplate, 0, 68, 0);
-        gSprites[spriteId].oam.objMode = 2;
+        gSprites[spriteId].oam.objMode = ST_OAM_OBJ_WINDOW;
         gSprites[spriteId].data[0] = flashBg;
         break;
     case 1:
         spriteId = CreateSprite(&sPokemonLogoShineSpriteTemplate, 0, 68, 0);
-        gSprites[spriteId].oam.objMode = 2;
+        gSprites[spriteId].oam.objMode = ST_OAM_OBJ_WINDOW;
         gSprites[spriteId].data[0] = flashBg;
         gSprites[spriteId].invisible = TRUE;
 
         spriteId = CreateSprite(&sPokemonLogoShineSpriteTemplate, 0, 68, 0);
         gSprites[spriteId].callback = SpriteCB_PokemonLogoShine2;
-        gSprites[spriteId].oam.objMode = 2;
+        gSprites[spriteId].oam.objMode = ST_OAM_OBJ_WINDOW;
 
         spriteId = CreateSprite(&sPokemonLogoShineSpriteTemplate, -80, 68, 0);
         gSprites[spriteId].callback = SpriteCB_PokemonLogoShine2;
-        gSprites[spriteId].oam.objMode = 2;
+        gSprites[spriteId].oam.objMode = ST_OAM_OBJ_WINDOW;
         break;
     }
 }
diff --git a/src/trade.c b/src/trade.c
index 909abe540..91b514067 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -3672,8 +3672,8 @@ static bool8 AnimateTradeSequenceCable(void)
         if (!IsMonSpriteNotFlipped(sTradeData->monSpecies[TRADE_PLAYER]))
         {
             gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].affineAnims = gSpriteAffineAnimTable_8338ECC;
-            gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].oam.affineMode = 3;
-            CalcCenterToCornerVec(&gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]], 0, 3, 3);
+            gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].oam.affineMode = ST_OAM_AFFINE_DOUBLE;
+            CalcCenterToCornerVec(&gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]], SPRITE_SHAPE(64x64), SPRITE_SIZE(64x64), ST_OAM_AFFINE_DOUBLE);
             StartSpriteAffineAnim(&gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]], 0);
         }
         else
@@ -4170,8 +4170,8 @@ static bool8 AnimateTradeSequenceWireless(void)
         if (!IsMonSpriteNotFlipped(sTradeData->monSpecies[TRADE_PLAYER]))
         {
             gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].affineAnims = gSpriteAffineAnimTable_8338ECC;
-            gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].oam.affineMode = 3;
-            CalcCenterToCornerVec(&gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]], 0, 3, 3);
+            gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].oam.affineMode = ST_OAM_AFFINE_DOUBLE;
+            CalcCenterToCornerVec(&gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]], SPRITE_SHAPE(64x64), SPRITE_SIZE(64x64), ST_OAM_AFFINE_DOUBLE);
             StartSpriteAffineAnim(&gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]], 0);
         }
         else
diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c
index f360ec84c..99a3fd4c5 100644
--- a/src/trainer_pokemon_sprites.c
+++ b/src/trainer_pokemon_sprites.c
@@ -41,7 +41,7 @@ static const struct OamData gUnknown_0860B064 =
 
 static const struct OamData gUnknown_0860B06C =
 {
-    .affineMode = 1,
+    .affineMode = ST_OAM_AFFINE_NORMAL,
     .shape = SPRITE_SHAPE(64x64),
     .size = SPRITE_SIZE(64x64)
 };
diff --git a/src/trainer_see.c b/src/trainer_see.c
index b155754f6..b34b8f106 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -97,10 +97,10 @@ static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struc
 static const struct OamData sOamData_Icons =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/union_room_chat.c b/src/union_room_chat.c
index f8ea1b781..be2269522 100755
--- a/src/union_room_chat.c
+++ b/src/union_room_chat.c
@@ -461,8 +461,8 @@ const struct SpritePalette gUnknown_082F315C = {
 };
 
 const struct OamData gUnknown_082F3164 = {
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
     .priority = 1
 };
 
@@ -504,8 +504,8 @@ const struct SpriteTemplate gUnknown_082F319C = {
 };
 
 const struct OamData gUnknown_082F31B4 = {
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x16),
+    .size = SPRITE_SIZE(8x16),
     .priority = 2
 };
 
@@ -530,14 +530,14 @@ const struct SpriteTemplate gUnknown_082F31D4 = {
 };
 
 const struct OamData gUnknown_082F31EC = {
-    .shape = ST_OAM_SQUARE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 2
 };
 
 const struct OamData gUnknown_082F31F4 = {
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
     .priority = 2
 };
 
diff --git a/src/unk_transition.c b/src/unk_transition.c
index cd91af07e..09e194be3 100644
--- a/src/unk_transition.c
+++ b/src/unk_transition.c
@@ -47,10 +47,10 @@ static const u8 sFiller[0x1C0] = {0};
 static const struct OamData sOamData_862B71C =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 4d7605c50..bd3abe0e4 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -299,9 +299,9 @@ const s16 gUnknown_085DFD28[][2] =
 const struct OamData gOamData_085DFD3C = 
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .size = SPRITE_SIZE(32x16),
@@ -342,9 +342,9 @@ const struct SpriteTemplate gSpriteTemplate_085DFD5C =
 const struct OamData gOamData_085DFD74 = 
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .size = SPRITE_SIZE(64x32),
@@ -1302,8 +1302,8 @@ void sub_8167760(void)
     if (spriteId != MAX_SPRITES)
     {
         gUnknown_0203BCAC->field_7B06[i] = spriteId;
-        gSprites[spriteId].oam.shape = 1;
-        gSprites[spriteId].oam.size = 2;
+        gSprites[spriteId].oam.shape = SPRITE_SHAPE(32x16);
+        gSprites[spriteId].oam.size = SPRITE_SIZE(32x16);
     }
     else
     {