diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
index b1f4b856fd..fff2944433 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
@@ -2,10 +2,10 @@
#include "item_drops_ntsc.h"
#include "gfx.h"
-Vtx gameplay_keep_Vtx_039970[] = {
-#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_039970.inc.c"
+Vtx gUnusedBombIconVtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedBombIconVtx.inc.c"
};
-Gfx gGameplayKeepDL_399B0[17] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepDL_399B0.inc.c"
+Gfx gUnusedBombIconDL[17] = {
+#include "assets/objects/gameplay_keep/gUnusedBombIconDL.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
index 2c652a06a3..7e15d2a83e 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
@@ -5,8 +5,8 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-extern Vtx gameplay_keep_Vtx_039970[];
-extern Gfx gGameplayKeepDL_399B0[17];
+extern Vtx gUnusedBombIconVtx[];
+extern Gfx gUnusedBombIconDL[17];
#endif
#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
index 2639baf8b8..11e34a2128 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
@@ -2,10 +2,10 @@
#include "item_drops_ntsc.h"
#include "gfx.h"
-Vtx gameplay_keep_Vtx_039A40[] = {
-#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_039A40.inc.c"
+Vtx gUnusedHeartIconVtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartIconVtx.inc.c"
};
-Gfx gGameplayKeepDL_39A80[17] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepDL_39A80.inc.c"
+Gfx gUnusedHeartIconDL[17] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartIconDL.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
index 1526f1e101..f691e80501 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
@@ -5,8 +5,8 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-extern Vtx gameplay_keep_Vtx_039A40[];
-extern Gfx gGameplayKeepDL_39A80[17];
+extern Vtx gUnusedHeartIconVtx[];
+extern Gfx gUnusedHeartIconDL[17];
#endif
#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
index 29dede5c82..f078ca357b 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
@@ -2,10 +2,10 @@
#include "item_drops_ntsc.h"
#include "gfx.h"
-Vtx gameplay_keep_Vtx_039B10[] = {
-#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_039B10.inc.c"
+Vtx gUnusedArrowIconVtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedArrowIconVtx.inc.c"
};
-Gfx gGameplayKeepDL_39B50[17] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepDL_39B50.inc.c"
+Gfx gUnusedArrowIconDL[17] = {
+#include "assets/objects/gameplay_keep/gUnusedArrowIconDL.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
index c90445eee2..c02feb79af 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
@@ -5,8 +5,8 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-extern Vtx gameplay_keep_Vtx_039B10[];
-extern Gfx gGameplayKeepDL_39B50[17];
+extern Vtx gUnusedArrowIconVtx[];
+extern Gfx gUnusedArrowIconDL[17];
#endif
#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
index d038f02985..6e2e217858 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
@@ -2,10 +2,10 @@
#include "gameplay_keep_ntsc_0x46A40.h"
#include "gfx.h"
-Vtx gameplay_keep_Vtx_03D220[] = {
-#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_03D220.inc.c"
+Vtx gUnusedHeartContainerIconVtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartContainerIconVtx.inc.c"
};
-Gfx gGameplayKeepDL_3D260[17] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepDL_3D260.inc.c"
+Gfx gUnusedHeartContainerIconDL[17] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartContainerIconDL.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
index 692252d098..481bd6747d 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
@@ -5,8 +5,8 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-extern Vtx gameplay_keep_Vtx_03D220[];
-extern Gfx gGameplayKeepDL_3D260[17];
+extern Vtx gUnusedHeartContainerIconVtx[];
+extern Gfx gUnusedHeartContainerIconDL[17];
#endif
#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.c
index 32e5231747..0d5a5aad53 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.c
@@ -1,7 +1,7 @@
#include "gameplay_keep_ntsc_0x3FD80.h"
-u64 gGameplayKeepTex_3FD80[TEX_LEN(u64, gGameplayKeepTex_3FD80_WIDTH, gGameplayKeepTex_3FD80_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_3FD80.rgba16.inc.c"
+u64 gUnusedBombchuIconTex[TEX_LEN(u64, gUnusedBombchuIconTex_WIDTH, gUnusedBombchuIconTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedBombchuIconTex.rgba16.inc.c"
};
u64 gGameplayKeepTex_40580[TEX_LEN(u64, gGameplayKeepTex_40580_WIDTH, gGameplayKeepTex_40580_HEIGHT, 16)] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h
index db26e01d76..d9cadcb861 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h
@@ -6,9 +6,9 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-#define gGameplayKeepTex_3FD80_WIDTH 32
-#define gGameplayKeepTex_3FD80_HEIGHT 32
-extern u64 gGameplayKeepTex_3FD80[TEX_LEN(u64, gGameplayKeepTex_3FD80_WIDTH, gGameplayKeepTex_3FD80_HEIGHT, 16)];
+#define gUnusedBombchuIconTex_WIDTH 32
+#define gUnusedBombchuIconTex_HEIGHT 32
+extern u64 gUnusedBombchuIconTex[TEX_LEN(u64, gUnusedBombchuIconTex_WIDTH, gUnusedBombchuIconTex_HEIGHT, 16)];
#define gGameplayKeepTex_40580_WIDTH 32
#define gGameplayKeepTex_40580_HEIGHT 32
extern u64 gGameplayKeepTex_40580[TEX_LEN(u64, gGameplayKeepTex_40580_WIDTH, gGameplayKeepTex_40580_HEIGHT, 16)];
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
index 08a7e1db21..48cfc3618a 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
@@ -1,5 +1,5 @@
#include "gameplay_keep_ntsc_0x41580.h"
-u64 gGameplayKeepTex_41580[TEX_LEN(u64, gGameplayKeepTex_41580_WIDTH, gGameplayKeepTex_41580_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_41580.rgba16.inc.c"
+u64 gUnusedHeartPieceIconTex[TEX_LEN(u64, gUnusedHeartPieceIconTex_WIDTH, gUnusedHeartPieceIconTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartPieceIconTex.rgba16.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
index 5400c4f488..8a0b3d2f96 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
@@ -6,9 +6,9 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-#define gGameplayKeepTex_41580_WIDTH 32
-#define gGameplayKeepTex_41580_HEIGHT 32
-extern u64 gGameplayKeepTex_41580[TEX_LEN(u64, gGameplayKeepTex_41580_WIDTH, gGameplayKeepTex_41580_HEIGHT, 16)];
+#define gUnusedHeartPieceIconTex_WIDTH 32
+#define gUnusedHeartPieceIconTex_HEIGHT 32
+extern u64 gUnusedHeartPieceIconTex[TEX_LEN(u64, gUnusedHeartPieceIconTex_WIDTH, gUnusedHeartPieceIconTex_HEIGHT, 16)];
#endif
#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c
index 6b4a6d8749..cae4d61fb5 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c
@@ -4,10 +4,10 @@ u64 gGameplayKeepTex_46A40[TEX_LEN(u64, gGameplayKeepTex_46A40_WIDTH, gGameplayK
#include "assets/objects/gameplay_keep/gGameplayKeepTex_46A40.rgba16.inc.c"
};
-u64 gGameplayKeepTex_46A60[TEX_LEN(u64, gGameplayKeepTex_46A60_WIDTH, gGameplayKeepTex_46A60_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_46A60.rgba16.inc.c"
+u64 gUnusedHeartContainerIconTex[TEX_LEN(u64, gUnusedHeartContainerIconTex_WIDTH, gUnusedHeartContainerIconTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartContainerIconTex.rgba16.inc.c"
};
-u64 gGameplayKeepTex_47260[TEX_LEN(u64, gGameplayKeepTex_47260_WIDTH, gGameplayKeepTex_47260_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_47260.rgba16.inc.c"
+u64 gUnusedTreeBarkTex[TEX_LEN(u64, gUnusedTreeBarkTex_WIDTH, gUnusedTreeBarkTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedTreeBarkTex.rgba16.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.h
index 670e335b0c..7b8e2d5c1e 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.h
@@ -7,11 +7,11 @@
#define gGameplayKeepTex_46A40_WIDTH 4
#define gGameplayKeepTex_46A40_HEIGHT 4
extern u64 gGameplayKeepTex_46A40[TEX_LEN(u64, gGameplayKeepTex_46A40_WIDTH, gGameplayKeepTex_46A40_HEIGHT, 16)];
-#define gGameplayKeepTex_46A60_WIDTH 32
-#define gGameplayKeepTex_46A60_HEIGHT 32
-extern u64 gGameplayKeepTex_46A60[TEX_LEN(u64, gGameplayKeepTex_46A60_WIDTH, gGameplayKeepTex_46A60_HEIGHT, 16)];
-#define gGameplayKeepTex_47260_WIDTH 32
-#define gGameplayKeepTex_47260_HEIGHT 32
-extern u64 gGameplayKeepTex_47260[TEX_LEN(u64, gGameplayKeepTex_47260_WIDTH, gGameplayKeepTex_47260_HEIGHT, 16)];
+#define gUnusedHeartContainerIconTex_WIDTH 32
+#define gUnusedHeartContainerIconTex_HEIGHT 32
+extern u64 gUnusedHeartContainerIconTex[TEX_LEN(u64, gUnusedHeartContainerIconTex_WIDTH, gUnusedHeartContainerIconTex_HEIGHT, 16)];
+#define gUnusedTreeBarkTex_WIDTH 32
+#define gUnusedTreeBarkTex_HEIGHT 32
+extern u64 gUnusedTreeBarkTex[TEX_LEN(u64, gUnusedTreeBarkTex_WIDTH, gUnusedTreeBarkTex_HEIGHT, 16)];
#endif
diff --git a/assets/objects/gameplay_keep/item_drops_ntsc.c b/assets/objects/gameplay_keep/item_drops_ntsc.c
index 3857482745..ad409fd0c6 100644
--- a/assets/objects/gameplay_keep/item_drops_ntsc.c
+++ b/assets/objects/gameplay_keep/item_drops_ntsc.c
@@ -1,13 +1,13 @@
#include "item_drops_ntsc.h"
-u64 gGameplayKeepTex_45220[TEX_LEN(u64, gGameplayKeepTex_45220_WIDTH, gGameplayKeepTex_45220_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_45220.rgba16.inc.c"
+u64 gUnusedHeartIconTex[TEX_LEN(u64, gUnusedHeartIconTex_WIDTH, gUnusedHeartIconTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartIconTex.rgba16.inc.c"
};
-u64 gGameplayKeepTex_45A20[TEX_LEN(u64, gGameplayKeepTex_45A20_WIDTH, gGameplayKeepTex_45A20_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_45A20.rgba16.inc.c"
+u64 gUnusedBombIconTex[TEX_LEN(u64, gUnusedBombIconTex_WIDTH, gUnusedBombIconTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedBombIconTex.rgba16.inc.c"
};
-u64 gGameplayKeepTex_46220[TEX_LEN(u64, gGameplayKeepTex_46220_WIDTH, gGameplayKeepTex_46220_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_46220.rgba16.inc.c"
+u64 gUnusedArrowIconTex[TEX_LEN(u64, gUnusedArrowIconTex_WIDTH, gUnusedArrowIconTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedArrowIconTex.rgba16.inc.c"
};
diff --git a/assets/objects/gameplay_keep/item_drops_ntsc.h b/assets/objects/gameplay_keep/item_drops_ntsc.h
index 50bd638430..15e90e0809 100644
--- a/assets/objects/gameplay_keep/item_drops_ntsc.h
+++ b/assets/objects/gameplay_keep/item_drops_ntsc.h
@@ -6,15 +6,15 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-#define gGameplayKeepTex_45220_WIDTH 32
-#define gGameplayKeepTex_45220_HEIGHT 32
-extern u64 gGameplayKeepTex_45220[TEX_LEN(u64, gGameplayKeepTex_45220_WIDTH, gGameplayKeepTex_45220_HEIGHT, 16)];
-#define gGameplayKeepTex_45A20_WIDTH 32
-#define gGameplayKeepTex_45A20_HEIGHT 32
-extern u64 gGameplayKeepTex_45A20[TEX_LEN(u64, gGameplayKeepTex_45A20_WIDTH, gGameplayKeepTex_45A20_HEIGHT, 16)];
-#define gGameplayKeepTex_46220_WIDTH 32
-#define gGameplayKeepTex_46220_HEIGHT 32
-extern u64 gGameplayKeepTex_46220[TEX_LEN(u64, gGameplayKeepTex_46220_WIDTH, gGameplayKeepTex_46220_HEIGHT, 16)];
+#define gUnusedHeartIconTex_WIDTH 32
+#define gUnusedHeartIconTex_HEIGHT 32
+extern u64 gUnusedHeartIconTex[TEX_LEN(u64, gUnusedHeartIconTex_WIDTH, gUnusedHeartIconTex_HEIGHT, 16)];
+#define gUnusedBombIconTex_WIDTH 32
+#define gUnusedBombIconTex_HEIGHT 32
+extern u64 gUnusedBombIconTex[TEX_LEN(u64, gUnusedBombIconTex_WIDTH, gUnusedBombIconTex_HEIGHT, 16)];
+#define gUnusedArrowIconTex_WIDTH 32
+#define gUnusedArrowIconTex_HEIGHT 32
+extern u64 gUnusedArrowIconTex[TEX_LEN(u64, gUnusedArrowIconTex_WIDTH, gUnusedArrowIconTex_HEIGHT, 16)];
#endif
#endif
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index aa52b535ac..24990118e3 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -1129,18 +1129,18 @@
-
+
-
-
+
+
-
-
+
+
-
+
@@ -1205,10 +1205,10 @@
-
+
-
+
@@ -1223,12 +1223,12 @@
-
+
-
+
@@ -1251,15 +1251,15 @@
-
-
-
+
+
+
-
-
+
+