diff --git a/assets/objects/gameplay_keep/arrow_skel.c b/assets/objects/gameplay_keep/arrow_skel.c
index b11cf8786a..493728e9c4 100644
--- a/assets/objects/gameplay_keep/arrow_skel.c
+++ b/assets/objects/gameplay_keep/arrow_skel.c
@@ -27,20 +27,20 @@ Gfx gArrowFarDL[52] = {
#include "assets/objects/gameplay_keep/gArrowFarDL.inc.c"
};
-LodLimb gArrowSkelLimb0 = {
-#include "assets/objects/gameplay_keep/gArrowSkelLimb0.inc.c"
+LodLimb gArrowSkelLimb_0 = {
+#include "assets/objects/gameplay_keep/gArrowSkelLimb_0.inc.c"
};
-LodLimb gArrowSkelLimb1 = {
-#include "assets/objects/gameplay_keep/gArrowSkelLimb1.inc.c"
+LodLimb gArrowSkelLimb_1 = {
+#include "assets/objects/gameplay_keep/gArrowSkelLimb_1.inc.c"
};
-LodLimb gArrowSkelLimb2 = {
-#include "assets/objects/gameplay_keep/gArrowSkelLimb2.inc.c"
+LodLimb gArrowSkelLimb_2 = {
+#include "assets/objects/gameplay_keep/gArrowSkelLimb_2.inc.c"
};
-LodLimb gArrowSkelLimb3 = {
-#include "assets/objects/gameplay_keep/gArrowSkelLimb3.inc.c"
+LodLimb gArrowSkelLimb_3 = {
+#include "assets/objects/gameplay_keep/gArrowSkelLimb_3.inc.c"
};
void* gArrowLimbs[] = {
diff --git a/assets/objects/gameplay_keep/arrow_skel.h b/assets/objects/gameplay_keep/arrow_skel.h
index e7d3ab020f..268c1cf559 100644
--- a/assets/objects/gameplay_keep/arrow_skel.h
+++ b/assets/objects/gameplay_keep/arrow_skel.h
@@ -14,10 +14,10 @@ extern Vtx gArrowNearVtx[];
extern Gfx gArrowNearDL[60];
extern Vtx gArrowFarVtx[];
extern Gfx gArrowFarDL[52];
-extern LodLimb gArrowSkelLimb0;
-extern LodLimb gArrowSkelLimb1;
-extern LodLimb gArrowSkelLimb2;
-extern LodLimb gArrowSkelLimb3;
+extern LodLimb gArrowSkelLimb_0;
+extern LodLimb gArrowSkelLimb_1;
+extern LodLimb gArrowSkelLimb_2;
+extern LodLimb gArrowSkelLimb_3;
extern void* gArrowLimbs[];
typedef enum gArrowSkelLimb {
/* 0 */ ARROW_LIMB_NONE,
diff --git a/assets/objects/gameplay_keep/door.c b/assets/objects/gameplay_keep/door.c
index 1bcb9f0a75..6d370fbd19 100644
--- a/assets/objects/gameplay_keep/door.c
+++ b/assets/objects/gameplay_keep/door.c
@@ -30,20 +30,20 @@ u64 gWoodenDoorTex[TEX_LEN(u64, gWoodenDoorTex_WIDTH, gWoodenDoorTex_HEIGHT, 16)
#include "assets/objects/gameplay_keep/gWoodenDoorTex.rgba16.inc.c"
};
-StandardLimb gDoorSkelLimb0 = {
-#include "assets/objects/gameplay_keep/gDoorSkelLimb0.inc.c"
+StandardLimb gDoorSkelLimb_0 = {
+#include "assets/objects/gameplay_keep/gDoorSkelLimb_0.inc.c"
};
-StandardLimb gDoorSkelLimb1 = {
-#include "assets/objects/gameplay_keep/gDoorSkelLimb1.inc.c"
+StandardLimb gDoorSkelLimb_1 = {
+#include "assets/objects/gameplay_keep/gDoorSkelLimb_1.inc.c"
};
-StandardLimb gDoorSkelLimb2 = {
-#include "assets/objects/gameplay_keep/gDoorSkelLimb2.inc.c"
+StandardLimb gDoorSkelLimb_2 = {
+#include "assets/objects/gameplay_keep/gDoorSkelLimb_2.inc.c"
};
-StandardLimb gDoorSkelLimb3 = {
-#include "assets/objects/gameplay_keep/gDoorSkelLimb3.inc.c"
+StandardLimb gDoorSkelLimb_3 = {
+#include "assets/objects/gameplay_keep/gDoorSkelLimb_3.inc.c"
};
void* gDoorLimbs[] = {
diff --git a/assets/objects/gameplay_keep/door.h b/assets/objects/gameplay_keep/door.h
index 7e210f7b09..5d7477a848 100644
--- a/assets/objects/gameplay_keep/door.h
+++ b/assets/objects/gameplay_keep/door.h
@@ -14,10 +14,10 @@ extern Gfx gDoorRightDL[39];
#define gWoodenDoorTex_WIDTH 32
#define gWoodenDoorTex_HEIGHT 64
extern u64 gWoodenDoorTex[TEX_LEN(u64, gWoodenDoorTex_WIDTH, gWoodenDoorTex_HEIGHT, 16)];
-extern StandardLimb gDoorSkelLimb0;
-extern StandardLimb gDoorSkelLimb1;
-extern StandardLimb gDoorSkelLimb2;
-extern StandardLimb gDoorSkelLimb3;
+extern StandardLimb gDoorSkelLimb_0;
+extern StandardLimb gDoorSkelLimb_1;
+extern StandardLimb gDoorSkelLimb_2;
+extern StandardLimb gDoorSkelLimb_3;
extern void* gDoorLimbs[];
typedef enum gDoorSkelLimb {
/* 0 */ DOOR_LIMB_NONE,
diff --git a/assets/objects/gameplay_keep/fairy_skel.c b/assets/objects/gameplay_keep/fairy_skel.c
index ae8a84d19a..cb39f8a715 100644
--- a/assets/objects/gameplay_keep/fairy_skel.c
+++ b/assets/objects/gameplay_keep/fairy_skel.c
@@ -64,60 +64,60 @@ u64 gUnusedFairyWingTex[TEX_LEN(u64, gUnusedFairyWingTex_WIDTH, gUnusedFairyWing
#include "assets/objects/gameplay_keep/gUnusedFairyWingTex.rgba16.inc.c"
};
-StandardLimb gFairySkelLimb0 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb0.inc.c"
+StandardLimb gFairySkelLimb_0 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_0.inc.c"
};
-StandardLimb gFairySkelLimb1 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb1.inc.c"
+StandardLimb gFairySkelLimb_1 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_1.inc.c"
};
-StandardLimb gFairySkelLimb2 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb2.inc.c"
+StandardLimb gFairySkelLimb_2 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_2.inc.c"
};
-StandardLimb gFairySkelLimb3 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb3.inc.c"
+StandardLimb gFairySkelLimb_3 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_3.inc.c"
};
-StandardLimb gFairySkelLimb4 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb4.inc.c"
+StandardLimb gFairySkelLimb_4 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_4.inc.c"
};
-StandardLimb gFairySkelLimb5 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb5.inc.c"
+StandardLimb gFairySkelLimb_5 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_5.inc.c"
};
-StandardLimb gFairySkelLimb6 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb6.inc.c"
+StandardLimb gFairySkelLimb_6 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_6.inc.c"
};
-StandardLimb gFairySkelLimb7 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb7.inc.c"
+StandardLimb gFairySkelLimb_7 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_7.inc.c"
};
-StandardLimb gFairySkelLimb8 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb8.inc.c"
+StandardLimb gFairySkelLimb_8 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_8.inc.c"
};
-StandardLimb gFairySkelLimb9 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb9.inc.c"
+StandardLimb gFairySkelLimb_9 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_9.inc.c"
};
-StandardLimb gFairySkelLimb10 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb10.inc.c"
+StandardLimb gFairySkelLimb_10 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_10.inc.c"
};
-StandardLimb gFairySkelLimb11 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb11.inc.c"
+StandardLimb gFairySkelLimb_11 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_11.inc.c"
};
-StandardLimb gFairySkelLimb12 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb12.inc.c"
+StandardLimb gFairySkelLimb_12 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_12.inc.c"
};
-StandardLimb gFairySkelLimb13 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb13.inc.c"
+StandardLimb gFairySkelLimb_13 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_13.inc.c"
};
void* gFairyLimbs[] = {
diff --git a/assets/objects/gameplay_keep/fairy_skel.h b/assets/objects/gameplay_keep/fairy_skel.h
index cb5e5356bc..dcdf2f22e3 100644
--- a/assets/objects/gameplay_keep/fairy_skel.h
+++ b/assets/objects/gameplay_keep/fairy_skel.h
@@ -24,20 +24,20 @@ extern Vtx gGlowCircleSmallVtx[];
#define gUnusedFairyWingTex_WIDTH 32
#define gUnusedFairyWingTex_HEIGHT 64
extern u64 gUnusedFairyWingTex[TEX_LEN(u64, gUnusedFairyWingTex_WIDTH, gUnusedFairyWingTex_HEIGHT, 16)];
-extern StandardLimb gFairySkelLimb0;
-extern StandardLimb gFairySkelLimb1;
-extern StandardLimb gFairySkelLimb2;
-extern StandardLimb gFairySkelLimb3;
-extern StandardLimb gFairySkelLimb4;
-extern StandardLimb gFairySkelLimb5;
-extern StandardLimb gFairySkelLimb6;
-extern StandardLimb gFairySkelLimb7;
-extern StandardLimb gFairySkelLimb8;
-extern StandardLimb gFairySkelLimb9;
-extern StandardLimb gFairySkelLimb10;
-extern StandardLimb gFairySkelLimb11;
-extern StandardLimb gFairySkelLimb12;
-extern StandardLimb gFairySkelLimb13;
+extern StandardLimb gFairySkelLimb_0;
+extern StandardLimb gFairySkelLimb_1;
+extern StandardLimb gFairySkelLimb_2;
+extern StandardLimb gFairySkelLimb_3;
+extern StandardLimb gFairySkelLimb_4;
+extern StandardLimb gFairySkelLimb_5;
+extern StandardLimb gFairySkelLimb_6;
+extern StandardLimb gFairySkelLimb_7;
+extern StandardLimb gFairySkelLimb_8;
+extern StandardLimb gFairySkelLimb_9;
+extern StandardLimb gFairySkelLimb_10;
+extern StandardLimb gFairySkelLimb_11;
+extern StandardLimb gFairySkelLimb_12;
+extern StandardLimb gFairySkelLimb_13;
extern void* gFairyLimbs[];
typedef enum gFairySkelLimb {
/* 0 */ FAIRY_LIMB_NONE,
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x18610.c b/assets/objects/gameplay_keep/gameplay_keep_0x18610.c
index 5755cb6a8b..07aad27e6c 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x18610.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x18610.c
@@ -34,28 +34,28 @@ u64 gFishBodyTex[TEX_LEN(u64, gFishBodyTex_WIDTH, gFishBodyTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gFishBodyTex.rgba16.inc.c"
};
-StandardLimb gFishSkelLimb0 = {
-#include "assets/objects/gameplay_keep/gFishSkelLimb0.inc.c"
+StandardLimb gFishSkelLimb_0 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb_0.inc.c"
};
-StandardLimb gFishSkelLimb1 = {
-#include "assets/objects/gameplay_keep/gFishSkelLimb1.inc.c"
+StandardLimb gFishSkelLimb_1 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb_1.inc.c"
};
-StandardLimb gFishSkelLimb2 = {
-#include "assets/objects/gameplay_keep/gFishSkelLimb2.inc.c"
+StandardLimb gFishSkelLimb_2 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb_2.inc.c"
};
-StandardLimb gFishSkelLimb3 = {
-#include "assets/objects/gameplay_keep/gFishSkelLimb3.inc.c"
+StandardLimb gFishSkelLimb_3 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb_3.inc.c"
};
-StandardLimb gFishSkelLimb4 = {
-#include "assets/objects/gameplay_keep/gFishSkelLimb4.inc.c"
+StandardLimb gFishSkelLimb_4 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb_4.inc.c"
};
-StandardLimb gFishSkelLimb5 = {
-#include "assets/objects/gameplay_keep/gFishSkelLimb5.inc.c"
+StandardLimb gFishSkelLimb_5 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb_5.inc.c"
};
void* gFishLimbs[] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x18610.h b/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
index 4f9195201a..edba23e871 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
@@ -17,12 +17,12 @@ extern u64 gFishTailTex[TEX_LEN(u64, gFishTailTex_WIDTH, gFishTailTex_HEIGHT, 16
#define gFishBodyTex_WIDTH 32
#define gFishBodyTex_HEIGHT 8
extern u64 gFishBodyTex[TEX_LEN(u64, gFishBodyTex_WIDTH, gFishBodyTex_HEIGHT, 16)];
-extern StandardLimb gFishSkelLimb0;
-extern StandardLimb gFishSkelLimb1;
-extern StandardLimb gFishSkelLimb2;
-extern StandardLimb gFishSkelLimb3;
-extern StandardLimb gFishSkelLimb4;
-extern StandardLimb gFishSkelLimb5;
+extern StandardLimb gFishSkelLimb_0;
+extern StandardLimb gFishSkelLimb_1;
+extern StandardLimb gFishSkelLimb_2;
+extern StandardLimb gFishSkelLimb_3;
+extern StandardLimb gFishSkelLimb_4;
+extern StandardLimb gFishSkelLimb_5;
extern void* gFishLimbs[];
typedef enum gFishSkelLimb {
/* 0 */ FISH_LIMB_NONE,
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x34020.c b/assets/objects/gameplay_keep/gameplay_keep_0x34020.c
index d16c4bd9c9..89710ca7a1 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x34020.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x34020.c
@@ -14,148 +14,148 @@ AnimationHeader gBugCrawlAnim = {
#include "assets/objects/gameplay_keep/gBugCrawlAnim.inc.c"
};
-Gfx gBugLimb1DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb1DL.inc.c"
+Gfx gBugLimb_1DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_1DL.inc.c"
};
-Gfx gBugLimb1WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb1WrapperDL.inc.c"
+Gfx gBugLimb_1WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_1WrapperDL.inc.c"
};
-Gfx gBugLimb1WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb1WrapperWrapperDL.inc.c"
+Gfx gBugLimb_1WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_1WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb1Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb1Vtx.inc.c"
+Vtx gBugLimb_1Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_1Vtx.inc.c"
};
-Gfx gBugLimb2DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb2DL.inc.c"
+Gfx gBugLimb_2DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_2DL.inc.c"
};
-Gfx gBugLimb2WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb2WrapperDL.inc.c"
+Gfx gBugLimb_2WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_2WrapperDL.inc.c"
};
-Gfx gBugLimb2WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb2WrapperWrapperDL.inc.c"
+Gfx gBugLimb_2WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_2WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb2Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb2Vtx.inc.c"
+Vtx gBugLimb_2Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_2Vtx.inc.c"
};
-Gfx gBugLimb3DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb3DL.inc.c"
+Gfx gBugLimb_3DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_3DL.inc.c"
};
-Gfx gBugLimb3WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb3WrapperDL.inc.c"
+Gfx gBugLimb_3WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_3WrapperDL.inc.c"
};
-Gfx gBugLimb3WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb3WrapperWrapperDL.inc.c"
+Gfx gBugLimb_3WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_3WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb3Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb3Vtx.inc.c"
+Vtx gBugLimb_3Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_3Vtx.inc.c"
};
-Gfx gBugLimb4DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb4DL.inc.c"
+Gfx gBugLimb_4DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_4DL.inc.c"
};
-Gfx gBugLimb4WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb4WrapperDL.inc.c"
+Gfx gBugLimb_4WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_4WrapperDL.inc.c"
};
-Gfx gBugLimb4WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb4WrapperWrapperDL.inc.c"
+Gfx gBugLimb_4WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_4WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb4Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb4Vtx.inc.c"
+Vtx gBugLimb_4Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_4Vtx.inc.c"
};
-Gfx gBugLimb5DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb5DL.inc.c"
+Gfx gBugLimb_5DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_5DL.inc.c"
};
-Gfx gBugLimb5WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb5WrapperDL.inc.c"
+Gfx gBugLimb_5WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_5WrapperDL.inc.c"
};
-Gfx gBugLimb5WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb5WrapperWrapperDL.inc.c"
+Gfx gBugLimb_5WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_5WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb5Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb5Vtx.inc.c"
+Vtx gBugLimb_5Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_5Vtx.inc.c"
};
-Gfx gBugLimb6DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb6DL.inc.c"
+Gfx gBugLimb_6DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_6DL.inc.c"
};
-Gfx gBugLimb6WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb6WrapperDL.inc.c"
+Gfx gBugLimb_6WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_6WrapperDL.inc.c"
};
-Gfx gBugLimb6WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb6WrapperWrapperDL.inc.c"
+Gfx gBugLimb_6WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_6WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb6Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb6Vtx.inc.c"
+Vtx gBugLimb_6Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_6Vtx.inc.c"
};
-Gfx gBugLimb7DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb7DL.inc.c"
+Gfx gBugLimb_7DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_7DL.inc.c"
};
-Gfx gBugLimb7WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb7WrapperDL.inc.c"
+Gfx gBugLimb_7WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_7WrapperDL.inc.c"
};
-Gfx gBugLimb7WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb7WrapperWrapperDL.inc.c"
+Gfx gBugLimb_7WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_7WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb7Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb7Vtx.inc.c"
+Vtx gBugLimb_7Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_7Vtx.inc.c"
};
-Gfx gBugLimb8DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb8DL.inc.c"
+Gfx gBugLimb_8DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_8DL.inc.c"
};
-Gfx gBugLimb8WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb8WrapperDL.inc.c"
+Gfx gBugLimb_8WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_8WrapperDL.inc.c"
};
-Gfx gBugLimb8WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb8WrapperWrapperDL.inc.c"
+Gfx gBugLimb_8WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_8WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb8Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb8Vtx.inc.c"
+Vtx gBugLimb_8Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_8Vtx.inc.c"
};
-Gfx gBugLimb9DL[22] = {
-#include "assets/objects/gameplay_keep/gBugLimb9DL.inc.c"
+Gfx gBugLimb_9DL[22] = {
+#include "assets/objects/gameplay_keep/gBugLimb_9DL.inc.c"
};
-Gfx gBugLimb9WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb9WrapperDL.inc.c"
+Gfx gBugLimb_9WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_9WrapperDL.inc.c"
};
-Gfx gBugLimb9WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb9WrapperWrapperDL.inc.c"
+Gfx gBugLimb_9WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_9WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb9Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb9Vtx.inc.c"
+Vtx gBugLimb_9Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_9Vtx.inc.c"
};
u64 gBugBodyTex[TEX_LEN(u64, gBugBodyTex_WIDTH, gBugBodyTex_HEIGHT, 16)] = {
@@ -166,96 +166,96 @@ u64 gBugLegTex[TEX_LEN(u64, gBugLegTex_WIDTH, gBugLegTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gBugLegTex.rgba16.inc.c"
};
-StandardLimb gBugSkelLimb0 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb0.inc.c"
+StandardLimb gBugSkelLimb_0 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_0.inc.c"
};
-StandardLimb gBugSkelLimb1 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb1.inc.c"
+StandardLimb gBugSkelLimb_1 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_1.inc.c"
};
-StandardLimb gBugSkelLimb2 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb2.inc.c"
+StandardLimb gBugSkelLimb_2 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_2.inc.c"
};
-StandardLimb gBugSkelLimb3 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb3.inc.c"
+StandardLimb gBugSkelLimb_3 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_3.inc.c"
};
-StandardLimb gBugSkelLimb4 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb4.inc.c"
+StandardLimb gBugSkelLimb_4 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_4.inc.c"
};
-StandardLimb gBugSkelLimb5 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb5.inc.c"
+StandardLimb gBugSkelLimb_5 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_5.inc.c"
};
-StandardLimb gBugSkelLimb6 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb6.inc.c"
+StandardLimb gBugSkelLimb_6 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_6.inc.c"
};
-StandardLimb gBugSkelLimb7 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb7.inc.c"
+StandardLimb gBugSkelLimb_7 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_7.inc.c"
};
-StandardLimb gBugSkelLimb8 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb8.inc.c"
+StandardLimb gBugSkelLimb_8 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_8.inc.c"
};
-StandardLimb gBugSkelLimb9 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb9.inc.c"
+StandardLimb gBugSkelLimb_9 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_9.inc.c"
};
-StandardLimb gBugSkelLimb10 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb10.inc.c"
+StandardLimb gBugSkelLimb_10 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_10.inc.c"
};
-StandardLimb gBugSkelLimb11 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb11.inc.c"
+StandardLimb gBugSkelLimb_11 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_11.inc.c"
};
-StandardLimb gBugSkelLimb12 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb12.inc.c"
+StandardLimb gBugSkelLimb_12 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_12.inc.c"
};
-StandardLimb gBugSkelLimb13 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb13.inc.c"
+StandardLimb gBugSkelLimb_13 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_13.inc.c"
};
-StandardLimb gBugSkelLimb14 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb14.inc.c"
+StandardLimb gBugSkelLimb_14 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_14.inc.c"
};
-StandardLimb gBugSkelLimb15 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb15.inc.c"
+StandardLimb gBugSkelLimb_15 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_15.inc.c"
};
-StandardLimb gBugSkelLimb16 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb16.inc.c"
+StandardLimb gBugSkelLimb_16 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_16.inc.c"
};
-StandardLimb gBugSkelLimb17 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb17.inc.c"
+StandardLimb gBugSkelLimb_17 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_17.inc.c"
};
-StandardLimb gBugSkelLimb18 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb18.inc.c"
+StandardLimb gBugSkelLimb_18 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_18.inc.c"
};
-StandardLimb gBugSkelLimb19 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb19.inc.c"
+StandardLimb gBugSkelLimb_19 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_19.inc.c"
};
-StandardLimb gBugSkelLimb20 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb20.inc.c"
+StandardLimb gBugSkelLimb_20 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_20.inc.c"
};
-StandardLimb gBugSkelLimb21 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb21.inc.c"
+StandardLimb gBugSkelLimb_21 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_21.inc.c"
};
-StandardLimb gBugSkelLimb22 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb22.inc.c"
+StandardLimb gBugSkelLimb_22 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_22.inc.c"
};
void* gBugLimbs[] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x34020.h b/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
index e2d4a72f7b..37d742e869 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
@@ -8,71 +8,71 @@
extern s16 gBugCrawlFrameData[];
extern JointIndex gBugCrawlJointIndices[];
extern AnimationHeader gBugCrawlAnim;
-extern Gfx gBugLimb1DL[20];
-extern Gfx gBugLimb1WrapperDL[2];
-extern Gfx gBugLimb1WrapperWrapperDL[2];
-extern Vtx gBugLimb1Vtx[];
-extern Gfx gBugLimb2DL[20];
-extern Gfx gBugLimb2WrapperDL[2];
-extern Gfx gBugLimb2WrapperWrapperDL[2];
-extern Vtx gBugLimb2Vtx[];
-extern Gfx gBugLimb3DL[20];
-extern Gfx gBugLimb3WrapperDL[2];
-extern Gfx gBugLimb3WrapperWrapperDL[2];
-extern Vtx gBugLimb3Vtx[];
-extern Gfx gBugLimb4DL[20];
-extern Gfx gBugLimb4WrapperDL[2];
-extern Gfx gBugLimb4WrapperWrapperDL[2];
-extern Vtx gBugLimb4Vtx[];
-extern Gfx gBugLimb5DL[20];
-extern Gfx gBugLimb5WrapperDL[2];
-extern Gfx gBugLimb5WrapperWrapperDL[2];
-extern Vtx gBugLimb5Vtx[];
-extern Gfx gBugLimb6DL[20];
-extern Gfx gBugLimb6WrapperDL[2];
-extern Gfx gBugLimb6WrapperWrapperDL[2];
-extern Vtx gBugLimb6Vtx[];
-extern Gfx gBugLimb7DL[20];
-extern Gfx gBugLimb7WrapperDL[2];
-extern Gfx gBugLimb7WrapperWrapperDL[2];
-extern Vtx gBugLimb7Vtx[];
-extern Gfx gBugLimb8DL[20];
-extern Gfx gBugLimb8WrapperDL[2];
-extern Gfx gBugLimb8WrapperWrapperDL[2];
-extern Vtx gBugLimb8Vtx[];
-extern Gfx gBugLimb9DL[22];
-extern Gfx gBugLimb9WrapperDL[2];
-extern Gfx gBugLimb9WrapperWrapperDL[2];
-extern Vtx gBugLimb9Vtx[];
+extern Gfx gBugLimb_1DL[20];
+extern Gfx gBugLimb_1WrapperDL[2];
+extern Gfx gBugLimb_1WrapperWrapperDL[2];
+extern Vtx gBugLimb_1Vtx[];
+extern Gfx gBugLimb_2DL[20];
+extern Gfx gBugLimb_2WrapperDL[2];
+extern Gfx gBugLimb_2WrapperWrapperDL[2];
+extern Vtx gBugLimb_2Vtx[];
+extern Gfx gBugLimb_3DL[20];
+extern Gfx gBugLimb_3WrapperDL[2];
+extern Gfx gBugLimb_3WrapperWrapperDL[2];
+extern Vtx gBugLimb_3Vtx[];
+extern Gfx gBugLimb_4DL[20];
+extern Gfx gBugLimb_4WrapperDL[2];
+extern Gfx gBugLimb_4WrapperWrapperDL[2];
+extern Vtx gBugLimb_4Vtx[];
+extern Gfx gBugLimb_5DL[20];
+extern Gfx gBugLimb_5WrapperDL[2];
+extern Gfx gBugLimb_5WrapperWrapperDL[2];
+extern Vtx gBugLimb_5Vtx[];
+extern Gfx gBugLimb_6DL[20];
+extern Gfx gBugLimb_6WrapperDL[2];
+extern Gfx gBugLimb_6WrapperWrapperDL[2];
+extern Vtx gBugLimb_6Vtx[];
+extern Gfx gBugLimb_7DL[20];
+extern Gfx gBugLimb_7WrapperDL[2];
+extern Gfx gBugLimb_7WrapperWrapperDL[2];
+extern Vtx gBugLimb_7Vtx[];
+extern Gfx gBugLimb_8DL[20];
+extern Gfx gBugLimb_8WrapperDL[2];
+extern Gfx gBugLimb_8WrapperWrapperDL[2];
+extern Vtx gBugLimb_8Vtx[];
+extern Gfx gBugLimb_9DL[22];
+extern Gfx gBugLimb_9WrapperDL[2];
+extern Gfx gBugLimb_9WrapperWrapperDL[2];
+extern Vtx gBugLimb_9Vtx[];
#define gBugBodyTex_WIDTH 16
#define gBugBodyTex_HEIGHT 64
extern u64 gBugBodyTex[TEX_LEN(u64, gBugBodyTex_WIDTH, gBugBodyTex_HEIGHT, 16)];
#define gBugLegTex_WIDTH 8
#define gBugLegTex_HEIGHT 16
extern u64 gBugLegTex[TEX_LEN(u64, gBugLegTex_WIDTH, gBugLegTex_HEIGHT, 16)];
-extern StandardLimb gBugSkelLimb0;
-extern StandardLimb gBugSkelLimb1;
-extern StandardLimb gBugSkelLimb2;
-extern StandardLimb gBugSkelLimb3;
-extern StandardLimb gBugSkelLimb4;
-extern StandardLimb gBugSkelLimb5;
-extern StandardLimb gBugSkelLimb6;
-extern StandardLimb gBugSkelLimb7;
-extern StandardLimb gBugSkelLimb8;
-extern StandardLimb gBugSkelLimb9;
-extern StandardLimb gBugSkelLimb10;
-extern StandardLimb gBugSkelLimb11;
-extern StandardLimb gBugSkelLimb12;
-extern StandardLimb gBugSkelLimb13;
-extern StandardLimb gBugSkelLimb14;
-extern StandardLimb gBugSkelLimb15;
-extern StandardLimb gBugSkelLimb16;
-extern StandardLimb gBugSkelLimb17;
-extern StandardLimb gBugSkelLimb18;
-extern StandardLimb gBugSkelLimb19;
-extern StandardLimb gBugSkelLimb20;
-extern StandardLimb gBugSkelLimb21;
-extern StandardLimb gBugSkelLimb22;
+extern StandardLimb gBugSkelLimb_0;
+extern StandardLimb gBugSkelLimb_1;
+extern StandardLimb gBugSkelLimb_2;
+extern StandardLimb gBugSkelLimb_3;
+extern StandardLimb gBugSkelLimb_4;
+extern StandardLimb gBugSkelLimb_5;
+extern StandardLimb gBugSkelLimb_6;
+extern StandardLimb gBugSkelLimb_7;
+extern StandardLimb gBugSkelLimb_8;
+extern StandardLimb gBugSkelLimb_9;
+extern StandardLimb gBugSkelLimb_10;
+extern StandardLimb gBugSkelLimb_11;
+extern StandardLimb gBugSkelLimb_12;
+extern StandardLimb gBugSkelLimb_13;
+extern StandardLimb gBugSkelLimb_14;
+extern StandardLimb gBugSkelLimb_15;
+extern StandardLimb gBugSkelLimb_16;
+extern StandardLimb gBugSkelLimb_17;
+extern StandardLimb gBugSkelLimb_18;
+extern StandardLimb gBugSkelLimb_19;
+extern StandardLimb gBugSkelLimb_20;
+extern StandardLimb gBugSkelLimb_21;
+extern StandardLimb gBugSkelLimb_22;
extern void* gBugLimbs[];
typedef enum gBugSkelLimb {
/* 0 */ BUG_LIMB_NONE,
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index 5dba196989..0021e84479 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -640,10 +640,10 @@
-
-
-
-
+
+
+
+
@@ -737,10 +737,10 @@
-
-
-
-
+
+
+
+
@@ -811,20 +811,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -850,12 +850,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1010,85 +1010,85 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml
index c2a8d54c4a..9fc248ee5c 100644
--- a/assets/xml/objects/gameplay_keep_pal.xml
+++ b/assets/xml/objects/gameplay_keep_pal.xml
@@ -640,10 +640,10 @@
-
-
-
-
+
+
+
+
@@ -729,10 +729,10 @@
-
-
-
-
+
+
+
+
@@ -803,20 +803,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -842,12 +842,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1002,85 +1002,85 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+