diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x34020.c b/assets/objects/gameplay_keep/bug_skel.c similarity index 94% rename from assets/objects/gameplay_keep/gameplay_keep_0x34020.c rename to assets/objects/gameplay_keep/bug_skel.c index 89710ca7a1..25bb27e0aa 100644 --- a/assets/objects/gameplay_keep/gameplay_keep_0x34020.c +++ b/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" }; diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x34020.h b/assets/objects/gameplay_keep/bug_skel.h similarity index 94% rename from assets/objects/gameplay_keep/gameplay_keep_0x34020.h rename to assets/objects/gameplay_keep/bug_skel.h index 39cb24611d..d742254c94 100644 --- a/assets/objects/gameplay_keep/gameplay_keep_0x34020.h +++ b/assets/objects/gameplay_keep/bug_skel.h @@ -1,13 +1,10 @@ -#ifndef GAMEPLAY_KEEP_0x34020_H -#define GAMEPLAY_KEEP_0x34020_H +#ifndef GAMEPLAY_KEEP_BUG_SKEL_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]; diff --git a/assets/objects/gameplay_keep/gBugCrawlAnim.c b/assets/objects/gameplay_keep/gBugCrawlAnim.c new file mode 100644 index 0000000000..1c34abcd9f --- /dev/null +++ b/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" +}; diff --git a/assets/objects/gameplay_keep/gBugCrawlAnim.h b/assets/objects/gameplay_keep/gBugCrawlAnim.h new file mode 100644 index 0000000000..554e80178a --- /dev/null +++ b/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 diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h index 6d25257c92..0cae382843 100644 --- a/assets/objects/gameplay_keep/gameplay_keep.h +++ b/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" diff --git a/spec/spec b/spec/spec index 0642cbb72e..efd880762c 100644 --- a/spec/spec +++ b/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" diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 7950e2d38d..ff279a98e3 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/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