1 files changed, 83 insertions, 83 deletions

diff --git a/src/data/object_events/object_event_subsprites.h b/src/data/object_events/object_event_subsprites.h
index 63df1f777..0d55c2df2 100755
--- a/src/data/object_events/object_event_subsprites.h
+++ b/src/data/object_events/object_event_subsprites.h
@@ -1,4 +1,4 @@
-const struct Subsprite gObjectEventSpriteOamTable_16x16_0[] = {
+static const struct Subsprite sOamTable_16x16_0[] = {
     { 
         .x = -8,  
         .y = -8, 
@@ -9,7 +9,7 @@ const struct Subsprite gObjectEventSpriteOamTable_16x16_0[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_16x16_1[] = {
+static const struct Subsprite sOamTable_16x16_1[] = {
     { 
         .x = -8,  
         .y = -8, 
@@ -20,7 +20,7 @@ const struct Subsprite gObjectEventSpriteOamTable_16x16_1[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_16x16_2[] = {
+static const struct Subsprite sOamTable_16x16_2[] = {
     { 
         .x = -8,  
         .y = -8, 
@@ -39,7 +39,7 @@ const struct Subsprite gObjectEventSpriteOamTable_16x16_2[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_16x16_3[] = {
+static const struct Subsprite sOamTable_16x16_3[] = {
     { 
         .x = -8,  
         .y = -8, 
@@ -58,7 +58,7 @@ const struct Subsprite gObjectEventSpriteOamTable_16x16_3[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_16x16_4[] = {
+static const struct Subsprite sOamTable_16x16_4[] = {
     { 
         .x = -8,  
         .y = -8, 
@@ -77,16 +77,16 @@ const struct Subsprite gObjectEventSpriteOamTable_16x16_4[] = {
     }
 };
 
-const struct SubspriteTable gObjectEventSpriteOamTables_16x16[] = {
+static const struct SubspriteTable sOamTables_16x16[] = {
     {0, NULL},
-    {1, gObjectEventSpriteOamTable_16x16_0},
-    {1, gObjectEventSpriteOamTable_16x16_1},
-    {2, gObjectEventSpriteOamTable_16x16_2},
-    {2, gObjectEventSpriteOamTable_16x16_3},
-    {2, gObjectEventSpriteOamTable_16x16_4}
+    {1, sOamTable_16x16_0},
+    {1, sOamTable_16x16_1},
+    {2, sOamTable_16x16_2},
+    {2, sOamTable_16x16_3},
+    {2, sOamTable_16x16_4}
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_16x32_0[] = {
+static const struct Subsprite sOamTable_16x32_0[] = {
     { 
         .x = -8, 
         .y = -16, 
@@ -97,7 +97,7 @@ const struct Subsprite gObjectEventSpriteOamTable_16x32_0[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_16x32_1[] = {
+static const struct Subsprite sOamTable_16x32_1[] = {
     { 
         .x = -8, 
         .y = -16, 
@@ -108,7 +108,7 @@ const struct Subsprite gObjectEventSpriteOamTable_16x32_1[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_16x32_2[] = {
+static const struct Subsprite sOamTable_16x32_2[] = {
     { 
         .x = -8, 
         .y = -16, 
@@ -135,7 +135,7 @@ const struct Subsprite gObjectEventSpriteOamTable_16x32_2[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_16x32_3[] = {
+static const struct Subsprite sOamTable_16x32_3[] = {
     { 
         .x = -8, 
         .y = -16, 
@@ -154,7 +154,7 @@ const struct Subsprite gObjectEventSpriteOamTable_16x32_3[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_16x32_4[] = {
+static const struct Subsprite sOamTable_16x32_4[] = {
     { 
         .x = -8, 
         .y = -16, 
@@ -173,16 +173,16 @@ const struct Subsprite gObjectEventSpriteOamTable_16x32_4[] = {
     }
 };
 
-const struct SubspriteTable gObjectEventSpriteOamTables_16x32[] = {
+static const struct SubspriteTable sOamTables_16x32[] = {
     {0, NULL},
-    {1, gObjectEventSpriteOamTable_16x32_0},
-    {1, gObjectEventSpriteOamTable_16x32_1},
-    {3, gObjectEventSpriteOamTable_16x32_2},
-    {2, gObjectEventSpriteOamTable_16x32_3},
-    {2, gObjectEventSpriteOamTable_16x32_4}
+    {1, sOamTable_16x32_0},
+    {1, sOamTable_16x32_1},
+    {3, sOamTable_16x32_2},
+    {2, sOamTable_16x32_3},
+    {2, sOamTable_16x32_4}
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_32x32_0[] = {
+static const struct Subsprite sOamTable_32x32_0[] = {
     {
         .x = -16, 
         .y = -16, 
@@ -193,7 +193,7 @@ const struct Subsprite gObjectEventSpriteOamTable_32x32_0[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_32x32_1[] = {
+static const struct Subsprite sOamTable_32x32_1[] = {
     {
         .x = -16, 
         .y = -16, 
@@ -204,7 +204,7 @@ const struct Subsprite gObjectEventSpriteOamTable_32x32_1[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_32x32_2[] = {
+static const struct Subsprite sOamTable_32x32_2[] = {
     {
         .x = -16, 
         .y = -16, 
@@ -231,7 +231,7 @@ const struct Subsprite gObjectEventSpriteOamTable_32x32_2[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_32x32_3[] = {
+static const struct Subsprite sOamTable_32x32_3[] = {
     {
         .x = -16, 
         .y = -16, 
@@ -250,7 +250,7 @@ const struct Subsprite gObjectEventSpriteOamTable_32x32_3[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_32x32_4[] = {
+static const struct Subsprite sOamTable_32x32_4[] = {
     {
         .x = -16, 
         .y = -16, 
@@ -269,16 +269,16 @@ const struct Subsprite gObjectEventSpriteOamTable_32x32_4[] = {
     }
 };
 
-const struct SubspriteTable gObjectEventSpriteOamTables_32x32[] = {
+static const struct SubspriteTable sOamTables_32x32[] = {
     {0, NULL},
-    {1, gObjectEventSpriteOamTable_32x32_0},
-    {1, gObjectEventSpriteOamTable_32x32_1},
-    {3, gObjectEventSpriteOamTable_32x32_2},
-    {2, gObjectEventSpriteOamTable_32x32_3},
-    {2, gObjectEventSpriteOamTable_32x32_4}
+    {1, sOamTable_32x32_0},
+    {1, sOamTable_32x32_1},
+    {3, sOamTable_32x32_2},
+    {2, sOamTable_32x32_3},
+    {2, sOamTable_32x32_4}
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_48x48[] = {
+static const struct Subsprite sOamTable_48x48[] = {
     {
         .x = -24, 
         .y = -24, 
@@ -377,16 +377,16 @@ const struct Subsprite gObjectEventSpriteOamTable_48x48[] = {
     }
 };
 
-const struct SubspriteTable gObjectEventSpriteOamTables_48x48[] = {
-    {12, gObjectEventSpriteOamTable_48x48},
-    {12, gObjectEventSpriteOamTable_48x48},
-    {12, gObjectEventSpriteOamTable_48x48},
-    {12, gObjectEventSpriteOamTable_48x48},
-    {12, gObjectEventSpriteOamTable_48x48},
-    {12, gObjectEventSpriteOamTable_48x48}
+static const struct SubspriteTable sOamTables_48x48[] = {
+    {12, sOamTable_48x48},
+    {12, sOamTable_48x48},
+    {12, sOamTable_48x48},
+    {12, sOamTable_48x48},
+    {12, sOamTable_48x48},
+    {12, sOamTable_48x48}
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_64x32_0[] = {
+static const struct Subsprite sOamTable_64x32_0[] = {
     {
         .x = -32, 
         .y = -16, 
@@ -397,7 +397,7 @@ const struct Subsprite gObjectEventSpriteOamTable_64x32_0[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_64x32_1[] = {
+static const struct Subsprite sOamTable_64x32_1[] = {
     {
         .x = -32, 
         .y = -16, 
@@ -408,7 +408,7 @@ const struct Subsprite gObjectEventSpriteOamTable_64x32_1[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_64x32_2[] = {
+static const struct Subsprite sOamTable_64x32_2[] = {
     {
         .x = -32, 
         .y = -16, 
@@ -419,7 +419,7 @@ const struct Subsprite gObjectEventSpriteOamTable_64x32_2[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_64x32_3[] = {
+static const struct Subsprite sOamTable_64x32_3[] = {
     {
         .x = -32, 
         .y = -16, 
@@ -431,16 +431,16 @@ const struct Subsprite gObjectEventSpriteOamTable_64x32_3[] = {
 };
 
 // Unused
-const struct SubspriteTable gObjectEventSpriteOamTables_64x32[] = {
+static const struct SubspriteTable sOamTables_64x32[] = {
     {0, NULL},
-    {1, gObjectEventSpriteOamTable_64x32_0},
-    {1, gObjectEventSpriteOamTable_64x32_1},
-    {1, gObjectEventSpriteOamTable_64x32_2},
-    {1, gObjectEventSpriteOamTable_64x32_3},
-    {1, gObjectEventSpriteOamTable_64x32_3}
+    {1, sOamTable_64x32_0},
+    {1, sOamTable_64x32_1},
+    {1, sOamTable_64x32_2},
+    {1, sOamTable_64x32_3},
+    {1, sOamTable_64x32_3}
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_64x64_0[] = {
+static const struct Subsprite sOamTable_64x64_0[] = {
     {
         .x = -32, 
         .y = -32, 
@@ -451,7 +451,7 @@ const struct Subsprite gObjectEventSpriteOamTable_64x64_0[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_64x64_1[] = {
+static const struct Subsprite sOamTable_64x64_1[] = {
     {
         .x = -32, 
         .y = -32, 
@@ -462,7 +462,7 @@ const struct Subsprite gObjectEventSpriteOamTable_64x64_1[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_64x64_2[] = {
+static const struct Subsprite sOamTable_64x64_2[] = {
     {
         .x = -32, 
         .y = -32, 
@@ -473,7 +473,7 @@ const struct Subsprite gObjectEventSpriteOamTable_64x64_2[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_64x64_3[] = {
+static const struct Subsprite sOamTable_64x64_3[] = {
     {
         .x = -32, 
         .y = -32, 
@@ -484,16 +484,16 @@ const struct Subsprite gObjectEventSpriteOamTable_64x64_3[] = {
     }
 };
 
-const struct SubspriteTable gObjectEventSpriteOamTables_64x64[] = {
+static const struct SubspriteTable sOamTables_64x64[] = {
     {0, NULL},
-    {1, gObjectEventSpriteOamTable_64x64_0},
-    {1, gObjectEventSpriteOamTable_64x64_1},
-    {1, gObjectEventSpriteOamTable_64x64_2},
-    {1, gObjectEventSpriteOamTable_64x64_3},
-    {1, gObjectEventSpriteOamTable_64x64_3}
+    {1, sOamTable_64x64_0},
+    {1, sOamTable_64x64_1},
+    {1, sOamTable_64x64_2},
+    {1, sOamTable_64x64_3},
+    {1, sOamTable_64x64_3}
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_96x40_0[] = {
+static const struct Subsprite sOamTable_96x40_0[] = {
     {
         .x = -48, 
         .y = -20, 
@@ -616,7 +616,7 @@ const struct Subsprite gObjectEventSpriteOamTable_96x40_0[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_96x40_1[] = {
+static const struct Subsprite sOamTable_96x40_1[] = {
     {
         .x = -48, 
         .y = -20, 
@@ -739,7 +739,7 @@ const struct Subsprite gObjectEventSpriteOamTable_96x40_1[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_96x40_2[] = {
+static const struct Subsprite sOamTable_96x40_2[] = {
     {
         .x = -48, 
         .y = -20, 
@@ -862,7 +862,7 @@ const struct Subsprite gObjectEventSpriteOamTable_96x40_2[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_96x40_3[] = {
+static const struct Subsprite sOamTable_96x40_3[] = {
     {
         .x = -48, 
         .y = -20, 
@@ -986,16 +986,16 @@ const struct Subsprite gObjectEventSpriteOamTable_96x40_3[] = {
 };
 
 // Used by SS Tidal
-const struct SubspriteTable gObjectEventSpriteOamTables_96x40[] = {
-    {15, gObjectEventSpriteOamTable_96x40_0},
-    {15, gObjectEventSpriteOamTable_96x40_0},
-    {15, gObjectEventSpriteOamTable_96x40_1},
-    {15, gObjectEventSpriteOamTable_96x40_2},
-    {15, gObjectEventSpriteOamTable_96x40_3},
-    {15, gObjectEventSpriteOamTable_96x40_3}
+static const struct SubspriteTable sOamTables_96x40[] = {
+    {15, sOamTable_96x40_0},
+    {15, sOamTable_96x40_0},
+    {15, sOamTable_96x40_1},
+    {15, sOamTable_96x40_2},
+    {15, sOamTable_96x40_3},
+    {15, sOamTable_96x40_3}
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_88x32_0[] = {
+static const struct Subsprite sOamTable_88x32_0[] = {
     {
         .x = -48, 
         .y = -20, 
@@ -1126,7 +1126,7 @@ const struct Subsprite gObjectEventSpriteOamTable_88x32_0[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_88x32_1[] = {
+static const struct Subsprite sOamTable_88x32_1[] = {
     {
         .x = -48, 
         .y = -20, 
@@ -1257,7 +1257,7 @@ const struct Subsprite gObjectEventSpriteOamTable_88x32_1[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_88x32_2[] = {
+static const struct Subsprite sOamTable_88x32_2[] = {
     {
         .x = -48, 
         .y = -20, 
@@ -1388,7 +1388,7 @@ const struct Subsprite gObjectEventSpriteOamTable_88x32_2[] = {
     }
 };
 
-const struct Subsprite gObjectEventSpriteOamTable_88x32_3[] = {
+static const struct Subsprite sOamTable_88x32_3[] = {
     {
         .x = -48, 
         .y = -20, 
@@ -1520,11 +1520,11 @@ const struct Subsprite gObjectEventSpriteOamTable_88x32_3[] = {
 };
 
 // Used by Submarine Shadow
-const struct SubspriteTable gObjectEventSpriteOamTables_88x32[] = {
-    {16, gObjectEventSpriteOamTable_88x32_0},
-    {16, gObjectEventSpriteOamTable_88x32_0},
-    {16, gObjectEventSpriteOamTable_88x32_1},
-    {16, gObjectEventSpriteOamTable_88x32_2},
-    {16, gObjectEventSpriteOamTable_88x32_3},
-    {16, gObjectEventSpriteOamTable_88x32_3}
+static const struct SubspriteTable sOamTables_88x32[] = {
+    {16, sOamTable_88x32_0},
+    {16, sOamTable_88x32_0},
+    {16, sOamTable_88x32_1},
+    {16, sOamTable_88x32_2},
+    {16, sOamTable_88x32_3},
+    {16, sOamTable_88x32_3}
 };