split gameplay_keep_0x34020.c into gBugCrawlAnim.c + bug_skel.c

assets/objects/gameplay_keep/bug_skel.c

@@ -1,19 +1,7 @@
-#include "gameplay_keep_0x34020.h"
+#include "bug_skel.h"
 #include "array_count.h"
 #include "gfx.h"
 
-s16 gBugCrawlFrameData[] = {
-#include "assets/objects/gameplay_keep/gBugCrawlFrameData.inc.c"
-};
-
-JointIndex gBugCrawlJointIndices[] = {
-#include "assets/objects/gameplay_keep/gBugCrawlJointIndices.inc.c"
-};
-
-AnimationHeader gBugCrawlAnim = {
-#include "assets/objects/gameplay_keep/gBugCrawlAnim.inc.c"
-};
-
 Gfx gBugLimb_1DL[20] = {
 #include "assets/objects/gameplay_keep/gBugLimb_1DL.inc.c"
 };

assets/objects/gameplay_keep/bug_skel.h

@@ -1,13 +1,10 @@
-#ifndef GAMEPLAY_KEEP_0x34020_H
+#ifndef GAMEPLAY_KEEP_BUG_SKEL_H
-#define GAMEPLAY_KEEP_0x34020_H
+#define GAMEPLAY_KEEP_BUG_SKEL_H
 
 #include "tex_len.h"
 #include "ultra64.h"
 #include "animation.h"
 
-extern s16 gBugCrawlFrameData[];
-extern JointIndex gBugCrawlJointIndices[];
-extern AnimationHeader gBugCrawlAnim;
 extern Gfx gBugLimb_1DL[20];
 extern Gfx gBugLimb_1WrapperDL[2];
 extern Gfx gBugLimb_1WrapperWrapperDL[2];

assets/objects/gameplay_keep/gBugCrawlAnim.c

@@ -0,0 +1,13 @@
+#include "gBugCrawlAnim.h"
+
+s16 gBugCrawlFrameData[] = {
+#include "assets/objects/gameplay_keep/gBugCrawlFrameData.inc.c"
+};
+
+JointIndex gBugCrawlJointIndices[] = {
+#include "assets/objects/gameplay_keep/gBugCrawlJointIndices.inc.c"
+};
+
+AnimationHeader gBugCrawlAnim = {
+#include "assets/objects/gameplay_keep/gBugCrawlAnim.inc.c"
+};

assets/objects/gameplay_keep/gBugCrawlAnim.h

@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_GBUGCRAWLANIM_H
+#define GAMEPLAY_KEEP_GBUGCRAWLANIM_H
+
+#include "ultra64.h"
+#include "animation.h"
+
+extern s16 gBugCrawlFrameData[];
+extern JointIndex gBugCrawlJointIndices[];
+extern AnimationHeader gBugCrawlAnim;
+
+#endif

assets/objects/gameplay_keep/gameplay_keep.h

@@ -62,7 +62,8 @@
 #include "gameplay_keep_0x33090.h"
 #include "eff_ice_fragments.h"
 #include "gameplay_keep_0x33910.h"
-#include "gameplay_keep_0x34020.h"
+#include "gBugCrawlAnim.h"
+#include "bug_skel.h"
 #include "cuttable_shrub.h"
 #include "lens_flare.h"
 #include "eff_sparkles.h"

spec/spec

@@ -1059,7 +1059,8 @@ beginseg
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x33090.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_ice_fragments.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x33910.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x34020.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gBugCrawlAnim.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/bug_skel.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/cuttable_shrub.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/lens_flare.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_sparkles.o"

src/overlays/actors/ovl_En_Insect/z_en_insect.c

@@ -22,7 +22,8 @@
 #include "player.h"
 #include "save.h"
 
-#include "assets/objects/gameplay_keep/gameplay_keep_0x34020.h"
+#include "assets/objects/gameplay_keep/bug_skel.h"
+#include "assets/objects/gameplay_keep/gBugCrawlAnim.h"
 
 #define FLAGS 0