diff --git a/assets/objects/gameplay_keep/bottle.c b/assets/objects/gameplay_hacker_keep/bottle.c similarity index 97% rename from assets/objects/gameplay_keep/bottle.c rename to assets/objects/gameplay_hacker_keep/bottle.c index dba048c60..ff9136d1d 100644 --- a/assets/objects/gameplay_keep/bottle.c +++ b/assets/objects/gameplay_hacker_keep/bottle.c @@ -2,11 +2,11 @@ #include "gfx.h" u64 gBottleContentsTex[] = { -#include "assets/objects/gameplay_keep/bottle_contents.i8.inc.c" +#include "assets/objects/gameplay_hacker_keep/bottle_contents.i8.inc.c" }; u64 gBottleGlassNewTex[] = { -#include "assets/objects/gameplay_keep/bottle_glass.i8.inc.c" +#include "assets/objects/gameplay_hacker_keep/bottle_glass.i8.inc.c" }; Vtx gameplay_keepVtx_000080[] = { diff --git a/assets/objects/gameplay_keep/bottle_contents.i8.png b/assets/objects/gameplay_hacker_keep/bottle_contents.i8.png similarity index 100% rename from assets/objects/gameplay_keep/bottle_contents.i8.png rename to assets/objects/gameplay_hacker_keep/bottle_contents.i8.png diff --git a/assets/objects/gameplay_keep/bottle_glass.i8.png b/assets/objects/gameplay_hacker_keep/bottle_glass.i8.png similarity index 100% rename from assets/objects/gameplay_keep/bottle_glass.i8.png rename to assets/objects/gameplay_hacker_keep/bottle_glass.i8.png diff --git a/assets/objects/gameplay_keep/gLinkMMBottleDL.inc.c b/assets/objects/gameplay_hacker_keep/gLinkMMBottleDL.inc.c similarity index 100% rename from assets/objects/gameplay_keep/gLinkMMBottleDL.inc.c rename to assets/objects/gameplay_hacker_keep/gLinkMMBottleDL.inc.c diff --git a/assets/objects/gameplay_hacker_keep/gameplay_hacker_keep.c b/assets/objects/gameplay_hacker_keep/gameplay_hacker_keep.c new file mode 100644 index 000000000..20fd90ec6 --- /dev/null +++ b/assets/objects/gameplay_hacker_keep/gameplay_hacker_keep.c @@ -0,0 +1,5 @@ +#include "config.h" + +#if MM_BOTTLE_MODEL +#include "assets/objects/gameplay_hacker_keep/bottle.c" +#endif diff --git a/assets/objects/gameplay_keep/gameplay_hacker_keep.h b/assets/objects/gameplay_hacker_keep/gameplay_hacker_keep.h similarity index 100% rename from assets/objects/gameplay_keep/gameplay_hacker_keep.h rename to assets/objects/gameplay_hacker_keep/gameplay_hacker_keep.h diff --git a/assets/objects/gameplay_keep/gameplay_hacker_keep.c b/assets/objects/gameplay_keep/gameplay_hacker_keep.c deleted file mode 100644 index b1b1bb9c9..000000000 --- a/assets/objects/gameplay_keep/gameplay_hacker_keep.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "config.h" - -#if MM_BOTTLE_MODEL -#include "assets/objects/gameplay_keep/bottle.c" -#endif diff --git a/assets/objects/object_link_boy/object_link_boy.c b/assets/objects/object_link_boy/object_link_boy.c index 2900968a4..d8b348d2a 100644 --- a/assets/objects/object_link_boy/object_link_boy.c +++ b/assets/objects/object_link_boy/object_link_boy.c @@ -1,6 +1,6 @@ #include "object_link_boy.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#include "assets/objects/gameplay_keep/gameplay_hacker_keep.h" +#include "assets/objects/gameplay_hacker_keep/gameplay_hacker_keep.h" #include "array_count.h" #include "gfx.h" @@ -898,7 +898,7 @@ Gfx gLinkAdultRightHandHoldingHookshotFarDL[196] = { #if MM_BOTTLE_MODEL Gfx gLinkAdultBottleDL[] = { -#include "assets/objects/gameplay_keep/gLinkMMBottleDL.inc.c" +#include "assets/objects/gameplay_hacker_keep/gLinkMMBottleDL.inc.c" }; #else Gfx gLinkAdultBottleDL[35] = { diff --git a/assets/objects/object_link_child/object_link_child.c b/assets/objects/object_link_child/object_link_child.c index 457d79017..67b6b4f9b 100644 --- a/assets/objects/object_link_child/object_link_child.c +++ b/assets/objects/object_link_child/object_link_child.c @@ -1,6 +1,6 @@ #include "object_link_child.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#include "assets/objects/gameplay_keep/gameplay_hacker_keep.h" +#include "assets/objects/gameplay_hacker_keep/gameplay_hacker_keep.h" #include "array_count.h" #include "gfx.h" @@ -569,7 +569,7 @@ Gfx gLinkChildRightArmStretchedSlingshotDL[134] = { #if MM_BOTTLE_MODEL Gfx gLinkChildBottleDL[] = { -#include "assets/objects/gameplay_keep/gLinkMMBottleDL.inc.c" +#include "assets/objects/gameplay_hacker_keep/gLinkMMBottleDL.inc.c" }; #else Gfx gLinkChildBottleDL[33] = { diff --git a/spec/spec b/spec/spec index 54b6b2cec..a2535f78b 100644 --- a/spec/spec +++ b/spec/spec @@ -1148,7 +1148,7 @@ beginseg compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep.o" - include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_hacker_keep.o" + include "$(BUILD_DIR)/assets/objects/gameplay_hacker_keep/gameplay_hacker_keep.o" number 4 endseg