Merge master into ObjEvent rename

3 files changed, 1375 insertions, 185 deletions

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