Merge remote-tracking branch 'upstream' into tustin2121-patch-5

6 files changed, 1409 insertions, 201 deletions

diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h
index f7f1f33ba..1702392ca 100755
--- a/src/data/field_event_obj/event_object_graphics.h
+++ b/src/data/field_event_obj/event_object_graphics.h
@@ -326,7 +326,7 @@ const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics
 const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/event_objects/pics/effects/hot_springs_water.4bpp");
 const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_02.gbapal");
 const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash.4bpp");
-const u32 gFieldEffectObjectPic_Unknown33[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33.4bpp");
+const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/event_objects/pics/effects/lavaridge_gym_warp.4bpp");
 const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles.4bpp");
 const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35.4bpp");
 const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal");
diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h
index 0b8aa79b2..661539d57 100755
--- a/src/data/field_event_obj/event_object_graphics_info_pointers.h
+++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h
@@ -489,11 +489,11 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] =
 };
 
 const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = {
-    &gEventObjectGraphicsInfo_Bard,
-    &gEventObjectGraphicsInfo_Hipster,
-    &gEventObjectGraphicsInfo_Trader,
-    &gEventObjectGraphicsInfo_Storyteller,
-    &gEventObjectGraphicsInfo_Giddy,
-    &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
-    &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
+    [MAUVILLE_MAN_BARD]        = &gEventObjectGraphicsInfo_Bard,
+    [MAUVILLE_MAN_HIPSTER]     = &gEventObjectGraphicsInfo_Hipster,
+    [MAUVILLE_MAN_TRADER]      = &gEventObjectGraphicsInfo_Trader,
+    [MAUVILLE_MAN_STORYTELLER] = &gEventObjectGraphicsInfo_Storyteller,
+    [MAUVILLE_MAN_GIDDY]       = &gEventObjectGraphicsInfo_Giddy,
+    [MAUVILLE_MAN_UNUSED1]     = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
+    [MAUVILLE_MAN_UNUSED2]     = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
 };
diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/field_event_obj/event_object_subsprites.h
index 5da262731..0b4a80f72 100755
--- a/src/data/field_event_obj/event_object_subsprites.h
+++ b/src/data/field_event_obj/event_object_subsprites.h
@@ -1,24 +1,80 @@
 const struct Subsprite gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTables_16x16[] = {
@@ -31,27 +87,90 @@ const struct SubspriteTable gEventObjectSpriteOamTables_16x16[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTables_16x32[] = {
@@ -64,27 +183,90 @@ const struct SubspriteTable gEventObjectSpriteOamTables_16x32[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTables_32x32[] = {
@@ -97,18 +279,102 @@ const struct SubspriteTable gEventObjectSpriteOamTables_32x32[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTables_Truck[] = {
@@ -121,19 +387,47 @@ const struct SubspriteTable gEventObjectSpriteOamTables_Truck[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTables_Unused[] = {
@@ -146,19 +440,47 @@ const struct SubspriteTable gEventObjectSpriteOamTables_Unused[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTables_64x64[] = {
@@ -171,75 +493,495 @@ const struct SubspriteTable gEventObjectSpriteOamTables_64x64[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTables_SSTidal[] = {
@@ -252,79 +994,527 @@ const struct SubspriteTable gEventObjectSpriteOamTables_SSTidal[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTable_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 gEventObjectSpriteOamTables_SubmarineShadow[] = {
diff --git a/src/data/field_event_obj/field_effect_object_template_pointers.h b/src/data/field_event_obj/field_effect_object_template_pointers.h
index 32d2b069a..de39e6db3 100755
--- a/src/data/field_event_obj/field_effect_object_template_pointers.h
+++ b/src/data/field_event_obj/field_effect_object_template_pointers.h
@@ -31,7 +31,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29;
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass;
 const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater;
 const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh;
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33;
+const struct SpriteTemplate gFieldEffectObjectTemplate_LavaridgeGymWarp;
 const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles;
 const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35;
 const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza;
@@ -70,7 +70,7 @@ const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = {
     &gFieldEffectObjectTemplate_ShortGrass,
     &gFieldEffectObjectTemplate_HotSpringsWater,
     &gFieldEffectObjectTemplate_JumpOutOfAsh,
-    &gFieldEffectObjectTemplate_Unknown33,
+    &gFieldEffectObjectTemplate_LavaridgeGymWarp,
     &gFieldEffectObjectTemplate_Bubbles,
     &gFieldEffectObjectTemplate_Unknown35,
     &gFieldEffectObjectTemplate_Rayquaza,
diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h
index a3944de36..d28357765 100755
--- a/src/data/field_event_obj/field_effect_objects.h
+++ b/src/data/field_event_obj/field_effect_objects.h
@@ -892,19 +892,28 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpOutOfAsh[] =
     gFieldEffectObjectImageAnim_850D54C,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC};
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = 
+{
+    .tileTag = 0xFFFF, 
+    .paletteTag = 0x100D, 
+    .oam = &gEventObjectBaseOam_16x16, 
+    .anims = gFieldEffectObjectImageAnimTable_JumpOutOfAsh, 
+    .images = gFieldEffectObjectPicTable_JumpOutOfAsh, 
+    .affineAnims = gDummySpriteAffineAnimTable, 
+    .callback = SpriteCB_PopOutOfAsh
+};
 
 const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown33[] = {
-    overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 0),
-    overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 1),
-    overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 2),
-    overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 3),
-    overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 4),
+const struct SpriteFrameImage gFieldEffectObjectPicTable_LavaridgeGymWarp[] = {
+    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 2),
+    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 3),
+    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 4),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D5B0[] =
+const union AnimCmd gFieldEffectObjectImageAnim_LavaridgeGymWarp[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -914,12 +923,21 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D5B0[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown33[] =
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_LavaridgeGymWarp[] =
 {
-    gFieldEffectObjectImageAnim_850D5B0,
+    gFieldEffectObjectImageAnim_LavaridgeGymWarp,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58};
+const struct SpriteTemplate gFieldEffectObjectTemplate_LavaridgeGymWarp = 
+{
+    .tileTag = 0xFFFF, 
+    .paletteTag = 0x100D, 
+    .oam = &gEventObjectBaseOam_16x16, 
+    .anims = gFieldEffectObjectImageAnimTable_LavaridgeGymWarp, 
+    .images = gFieldEffectObjectPicTable_LavaridgeGymWarp, 
+    .affineAnims = gDummySpriteAffineAnimTable, 
+    .callback = SpriteCB_LavaridgeGymWarp
+};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = {
     overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0),
diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h
index 712988f5e..8e136b58b 100755
--- a/src/data/field_event_obj/movement_action_func_tables.h
+++ b/src/data/field_event_obj/movement_action_func_tables.h
@@ -170,8 +170,8 @@ u8 MovementAction_SetFixedPriority_Step0(struct EventObject *, struct Sprite *);
 u8 MovementAction_ClearFixedPriority_Step0(struct EventObject *, struct Sprite *);
 u8 MovementAction_InitAffineAnim_Step0(struct EventObject *, struct Sprite *);
 u8 MovementAction_ClearAffineAnim_Step0(struct EventObject *, struct Sprite *);
-u8 MovementAction_Unknown1_Step0(struct EventObject *, struct Sprite *);
-u8 MovementAction_Unknown2_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_HideReflection_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_ShowReflection_Step0(struct EventObject *, struct Sprite *);
 u8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *, struct Sprite *);
 u8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *);
 u8 MovementAction_WalkDownAffine_Step0(struct EventObject *, struct Sprite *);
@@ -358,8 +358,8 @@ u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct
 u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *);
 u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *);
 u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *);
-u8 (*const gMovementActionFuncs_Unknown1[])(struct EventObject *, struct Sprite *);
-u8 (*const gMovementActionFuncs_Unknown2[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_HideReflection[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_ShowReflection[])(struct EventObject *, struct Sprite *);
 u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *);
 u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *);
 u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *);
@@ -518,8 +518,8 @@ u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *)
     [MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY] = gMovementActionFuncs_ClearFixedPriority,
     [MOVEMENT_ACTION_INIT_AFFINE_ANIM] = gMovementActionFuncs_InitAffineAnim,
     [MOVEMENT_ACTION_CLEAR_AFFINE_ANIM] = gMovementActionFuncs_ClearAffineAnim,
-    [MOVEMENT_ACTION_UNKNOWN1] = gMovementActionFuncs_Unknown1,
-    [MOVEMENT_ACTION_UNKNOWN2] = gMovementActionFuncs_Unknown2,
+    [MOVEMENT_ACTION_HIDE_REFLECTION] = gMovementActionFuncs_HideReflection,
+    [MOVEMENT_ACTION_SHOW_REFLECTION] = gMovementActionFuncs_ShowReflection,
     [MOVEMENT_ACTION_WALK_DOWN_START_AFFINE] = gMovementActionFuncs_WalkDownStartAffine,
     [MOVEMENT_ACTION_WALK_DOWN_AFFINE] = gMovementActionFuncs_WalkDownAffine,
     [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN] = gMovementActionFuncs_AcroWheelieFaceDown,
@@ -1197,13 +1197,13 @@ u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct
     MovementAction_Finish,
 };
 
-u8 (*const gMovementActionFuncs_Unknown1[])(struct EventObject *, struct Sprite *) = {
-    MovementAction_Unknown1_Step0,
+u8 (*const gMovementActionFuncs_HideReflection[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_HideReflection_Step0,
     MovementAction_Finish,
 };
 
-u8 (*const gMovementActionFuncs_Unknown2[])(struct EventObject *, struct Sprite *) = {
-    MovementAction_Unknown2_Step0,
+u8 (*const gMovementActionFuncs_ShowReflection[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_ShowReflection_Step0,
     MovementAction_Finish,
 };