From b2c0bc85250a6c0290c8d510e9f51162544a6505 Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Sun, 8 Jun 2025 18:13:20 +0200
Subject: [PATCH] Rename files for some of the newly named unused NTSC stuff

---
 assets/objects/gameplay_keep/gameplay_keep.h           | 10 +++++-----
 ...p_ntsc_0x39B10.c => unused_arrow_icon_model_ntsc.c} |  2 +-
 ...p_ntsc_0x39B10.h => unused_arrow_icon_model_ntsc.h} |  4 ++--
 ...ep_ntsc_0x39970.c => unused_bomb_icon_model_ntsc.c} |  2 +-
 ...ep_ntsc_0x39970.h => unused_bomb_icon_model_ntsc.h} |  4 ++--
 ...D220.c => unused_heart_container_icon_model_ntsc.c} |  2 +-
 ...D220.h => unused_heart_container_icon_model_ntsc.h} |  4 ++--
 ...p_ntsc_0x39A40.c => unused_heart_icon_model_ntsc.c} |  2 +-
 ...p_ntsc_0x39A40.h => unused_heart_icon_model_ntsc.h} |  4 ++--
 ...sc_0x41580.c => unused_heart_piece_icon_tex_ntsc.c} |  2 +-
 ...sc_0x41580.h => unused_heart_piece_icon_tex_ntsc.h} |  4 ++--
 spec/spec                                              | 10 +++++-----
 12 files changed, 25 insertions(+), 25 deletions(-)
 rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x39B10.c => unused_arrow_icon_model_ntsc.c} (85%)
 rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x39B10.h => unused_arrow_icon_model_ntsc.h} (59%)
 rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x39970.c => unused_bomb_icon_model_ntsc.c} (85%)
 rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x39970.h => unused_bomb_icon_model_ntsc.h} (59%)
 rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x3D220.c => unused_heart_container_icon_model_ntsc.c} (84%)
 rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x3D220.h => unused_heart_container_icon_model_ntsc.h} (57%)
 rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x39A40.c => unused_heart_icon_model_ntsc.c} (85%)
 rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x39A40.h => unused_heart_icon_model_ntsc.h} (59%)
 rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x41580.c => unused_heart_piece_icon_tex_ntsc.c} (81%)
 rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x41580.h => unused_heart_piece_icon_tex_ntsc.h} (73%)

diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h
index 4cf7c9635b..c7e05bde21 100644
--- a/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/assets/objects/gameplay_keep/gameplay_keep.h
@@ -71,9 +71,9 @@
 #include "gameplay_keep_0x38FB0.h"
 #if OOT_REGION != REGION_EU
 #include "gameplay_keep_ntsc_0x39850.h"
-#include "gameplay_keep_ntsc_0x39970.h"
-#include "gameplay_keep_ntsc_0x39A40.h"
-#include "gameplay_keep_ntsc_0x39B10.h"
+#include "unused_bomb_icon_model_ntsc.h"
+#include "unused_heart_icon_model_ntsc.h"
+#include "unused_arrow_icon_model_ntsc.h"
 #endif
 #include "gameplay_keep_0x393B0.h"
 #include "liftable_rock_model.h"
@@ -94,7 +94,7 @@
 #include "gameplay_keep_0x3B1E0.h"
 #if OOT_REGION != REGION_EU
 #include "gameplay_keep_ntsc_0x3C610.h"
-#include "gameplay_keep_ntsc_0x3D220.h"
+#include "unused_heart_container_icon_model_ntsc.h"
 #endif
 #include "rectangular_sign_model.h"
 #include "gameplay_keep_0x3C2E0.h"
@@ -104,7 +104,7 @@
 #endif
 #include "drop_recovery_heart_tex.h"
 #if OOT_REGION != REGION_EU
-#include "gameplay_keep_ntsc_0x41580.h"
+#include "unused_heart_piece_icon_tex_ntsc.h"
 #endif
 #include "item_drop_dl.h"
 #include "gameplay_keep_0x3F140.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c b/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.c
similarity index 85%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
rename to assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.c
index f078ca357b..bf1ec33d42 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
+++ b/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_ntsc_0x39B10.h"
+#include "unused_arrow_icon_model_ntsc.h"
 #include "item_drops_ntsc.h"
 #include "gfx.h"
 
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h b/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.h
similarity index 59%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
rename to assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.h
index c02feb79af..3a98bdfc86 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
+++ b/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_NTSC_0x39B10
-#define GAMEPLAY_KEEP_NTSC_0x39B10
+#ifndef GAMEPLAY_KEEP_UNUSED_ARROW_ICON_MODEL_NTSC_H
+#define GAMEPLAY_KEEP_UNUSED_ARROW_ICON_MODEL_NTSC_H
 
 #include "ultra64.h"
 #include "region.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c b/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.c
similarity index 85%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
rename to assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.c
index fff2944433..a2382e6ea6 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
+++ b/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_ntsc_0x39970.h"
+#include "unused_bomb_icon_model_ntsc.h"
 #include "item_drops_ntsc.h"
 #include "gfx.h"
 
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h b/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.h
similarity index 59%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
rename to assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.h
index 7e15d2a83e..c811b1c727 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
+++ b/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_NTSC_0x39970_H
-#define GAMEPLAY_KEEP_NTSC_0x39970_H
+#ifndef GAMEPLAY_KEEP_UNUSED_BOMB_ICON_MODEL_NTSC_H
+#define GAMEPLAY_KEEP_UNUSED_BOMB_ICON_MODEL_NTSC_H
 
 #include "ultra64.h"
 #include "region.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c b/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.c
similarity index 84%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
rename to assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.c
index 6e2e217858..0299b05ca9 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
+++ b/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_ntsc_0x3D220.h"
+#include "unused_heart_container_icon_model_ntsc.h"
 #include "gameplay_keep_ntsc_0x46A40.h"
 #include "gfx.h"
 
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h b/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.h
similarity index 57%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
rename to assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.h
index 481bd6747d..4bc380b34a 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
+++ b/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_NTSC_0x3D220_H
-#define GAMEPLAY_KEEP_NTSC_0x3D220_H
+#ifndef GAMEPLAY_KEEP_UNUSED_HEART_CONTAINER_ICON_MODEL_NTSC_H
+#define GAMEPLAY_KEEP_UNUSED_HEART_CONTAINER_ICON_MODEL_NTSC_H
 
 #include "ultra64.h"
 #include "region.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c b/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.c
similarity index 85%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
rename to assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.c
index 11e34a2128..018bb9de95 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
+++ b/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_ntsc_0x39A40.h"
+#include "unused_heart_icon_model_ntsc.h"
 #include "item_drops_ntsc.h"
 #include "gfx.h"
 
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h b/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.h
similarity index 59%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
rename to assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.h
index f691e80501..657a8f24ba 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
+++ b/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_NTSC_0x39A40_H
-#define GAMEPLAY_KEEP_NTSC_0x39A40_H
+#ifndef GAMEPLAY_KEEP_UNUSED_HEART_ICON_MODEL_NTSC_H
+#define GAMEPLAY_KEEP_UNUSED_HEART_ICON_MODEL_NTSC_H
 
 #include "ultra64.h"
 #include "region.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c b/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.c
similarity index 81%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
rename to assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.c
index 48cfc3618a..9b34ac2b27 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
+++ b/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_ntsc_0x41580.h"
+#include "unused_heart_piece_icon_tex_ntsc.h"
 
 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/unused_heart_piece_icon_tex_ntsc.h
similarity index 73%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
rename to assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.h
index 8a0b3d2f96..ed4e24f0b2 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
+++ b/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_NTSC_0x41580_H
-#define GAMEPLAY_KEEP_NTSC_0x41580_H
+#ifndef GAMEPLAY_KEEP_UNUSED_HEART_PIECE_ICON_TEX_NTSC_H
+#define GAMEPLAY_KEEP_UNUSED_HEART_PIECE_ICON_TEX_NTSC_H
 
 #include "tex_len.h"
 #include "ultra64.h"
diff --git a/spec/spec b/spec/spec
index d8cc630766..87d7229e45 100644
--- a/spec/spec
+++ b/spec/spec
@@ -1067,9 +1067,9 @@ beginseg
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x38FB0.o"
 #if OOT_REGION != REGION_EU
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.o"
 #endif
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x393B0.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/liftable_rock_model.o"
@@ -1090,7 +1090,7 @@ beginseg
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.o"
 #if OOT_REGION != REGION_EU
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.o"
 #endif
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/rectangular_sign_model.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.o"
@@ -1100,7 +1100,7 @@ beginseg
 #endif
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/drop_recovery_heart_tex.o"
 #if OOT_REGION != REGION_EU
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.o"
 #endif
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/item_drop_dl.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3F140.o"