Remove "z64" prefix from all headers (#2518)

* z64 - a

* z64 - b

* z64 - c

* z64 - d

* z64 - e

* z64 - f

* z64 - g

* z64 - h

* z64 - i

* z64 - l

* z64 - m

* z64 - o

* z64 - p

* z64 - q

* z64 - r

* z64 - s

* z64 - t

* z64 - v

* restore file

* fix merge

* fix merge

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

64 files changed, 64 insertions, 64 deletions

diff --git a/assets/objects/object_link_boy/object_link_boy.c b/assets/objects/object_link_boy/object_link_boy.c
index 276e6b2b3..ea6fe8c9f 100644
--- a/assets/objects/object_link_boy/object_link_boy.c
+++ b/assets/objects/object_link_boy/object_link_boy.c
@@ -3,7 +3,7 @@
 
 #include "array_count.h"
 #include "gfx.h"
-#include "z64player.h"
+#include "player.h"
 
 // Eyes textures
 
diff --git a/assets/objects/object_link_boy/object_link_boy.h b/assets/objects/object_link_boy/object_link_boy.h
index 8fadf3292..349c36ade 100644
--- a/assets/objects/object_link_boy/object_link_boy.h
+++ b/assets/objects/object_link_boy/object_link_boy.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "tex_len.h"
-#include "z64animation.h"
+#include "animation.h"
 
 #define LINK_ADULT_EYES_TEX_WIDTH 64
 #define LINK_ADULT_EYES_TEX_HEIGHT 32
diff --git a/assets/objects/object_link_child/object_link_child.c b/assets/objects/object_link_child/object_link_child.c
index 035cbedb3..30411ab0b 100644
--- a/assets/objects/object_link_child/object_link_child.c
+++ b/assets/objects/object_link_child/object_link_child.c
@@ -3,7 +3,7 @@
 
 #include "array_count.h"
 #include "gfx.h"
-#include "z64player.h"
+#include "player.h"
 
 // Eyes textures
 
diff --git a/assets/objects/object_link_child/object_link_child.h b/assets/objects/object_link_child/object_link_child.h
index 7efc57680..064171408 100644
--- a/assets/objects/object_link_child/object_link_child.h
+++ b/assets/objects/object_link_child/object_link_child.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "tex_len.h"
-#include "z64animation.h"
+#include "animation.h"
 
 #define LINK_CHILD_EYES_TEX_WIDTH 64
 #define LINK_CHILD_EYES_TEX_HEIGHT 32
diff --git a/assets/textures/icon_item_24_static/icon_item_24_static.h b/assets/textures/icon_item_24_static/icon_item_24_static.h
index dbfa9c40e..2b9a1bc88 100644
--- a/assets/textures/icon_item_24_static/icon_item_24_static.h
+++ b/assets/textures/icon_item_24_static/icon_item_24_static.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "tex_len.h"
-#include "z64interface.h"
+#include "interface.h"
 
 extern u64 gQuestIconMedallionForestTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)];
 extern u64 gQuestIconMedallionFireTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)];
diff --git a/assets/textures/icon_item_static/icon_item_static.h b/assets/textures/icon_item_static/icon_item_static.h
index 74c837280..e8aff3823 100644
--- a/assets/textures/icon_item_static/icon_item_static.h
+++ b/assets/textures/icon_item_static/icon_item_static.h
@@ -5,7 +5,7 @@
 #include "src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64interface.h"
+#include "interface.h"
 
 extern u64 gItemIconDekuStickTex[TEX_LEN(u64, ITEM_ICON_WIDTH, ITEM_ICON_HEIGHT, 32)];
 extern u64 gItemIconDekuNutTex[TEX_LEN(u64, ITEM_ICON_WIDTH, ITEM_ICON_HEIGHT, 32)];
diff --git a/assets/textures/item_name_static/item_name_static.h b/assets/textures/item_name_static/item_name_static.h
index 7a4c6cf7b..22806a467 100644
--- a/assets/textures/item_name_static/item_name_static.h
+++ b/assets/textures/item_name_static/item_name_static.h
@@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64item.h"
+#include "item.h"
 
 #if OOT_NTSC
 
diff --git a/assets/textures/place_title_cards/g_pn_01.c b/assets/textures/place_title_cards/g_pn_01.c
index 2d4b46928..e91c30dd8 100644
--- a/assets/textures/place_title_cards/g_pn_01.c
+++ b/assets/textures/place_title_cards/g_pn_01.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gForestTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_02.c b/assets/textures/place_title_cards/g_pn_02.c
index 6daba3a74..f7a015376 100644
--- a/assets/textures/place_title_cards/g_pn_02.c
+++ b/assets/textures/place_title_cards/g_pn_02.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gShadowTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_03.c b/assets/textures/place_title_cards/g_pn_03.c
index 4ec878684..8f56f9852 100644
--- a/assets/textures/place_title_cards/g_pn_03.c
+++ b/assets/textures/place_title_cards/g_pn_03.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gFireTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_04.c b/assets/textures/place_title_cards/g_pn_04.c
index f09e7ef13..e7844ff89 100644
--- a/assets/textures/place_title_cards/g_pn_04.c
+++ b/assets/textures/place_title_cards/g_pn_04.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gWaterTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_05.c b/assets/textures/place_title_cards/g_pn_05.c
index cc47a408b..70dfa8332 100644
--- a/assets/textures/place_title_cards/g_pn_05.c
+++ b/assets/textures/place_title_cards/g_pn_05.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gSpiritTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_06.c b/assets/textures/place_title_cards/g_pn_06.c
index 46b04b482..4d1dfadc0 100644
--- a/assets/textures/place_title_cards/g_pn_06.c
+++ b/assets/textures/place_title_cards/g_pn_06.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gDekuTreeTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_07.c b/assets/textures/place_title_cards/g_pn_07.c
index 487159bbe..0eab2f386 100644
--- a/assets/textures/place_title_cards/g_pn_07.c
+++ b/assets/textures/place_title_cards/g_pn_07.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gJabuJabuTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_08.c b/assets/textures/place_title_cards/g_pn_08.c
index 90fdb1af4..bb5b3617b 100644
--- a/assets/textures/place_title_cards/g_pn_08.c
+++ b/assets/textures/place_title_cards/g_pn_08.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gDodongosCavernTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_09.c b/assets/textures/place_title_cards/g_pn_09.c
index f053c3e0e..37116ca72 100644
--- a/assets/textures/place_title_cards/g_pn_09.c
+++ b/assets/textures/place_title_cards/g_pn_09.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gInsideGanonsCastleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_10.c b/assets/textures/place_title_cards/g_pn_10.c
index ab5b3ea89..9b183245f 100644
--- a/assets/textures/place_title_cards/g_pn_10.c
+++ b/assets/textures/place_title_cards/g_pn_10.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gIceCavernTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_11.c b/assets/textures/place_title_cards/g_pn_11.c
index 4a02cc6f8..d24673a51 100644
--- a/assets/textures/place_title_cards/g_pn_11.c
+++ b/assets/textures/place_title_cards/g_pn_11.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gGERudoTrainingGroundTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_12.c b/assets/textures/place_title_cards/g_pn_12.c
index 81f82b6dc..e362af21c 100644
--- a/assets/textures/place_title_cards/g_pn_12.c
+++ b/assets/textures/place_title_cards/g_pn_12.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gCastleCourtyardTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_13.c b/assets/textures/place_title_cards/g_pn_13.c
index 174ac38be..57b78e009 100644
--- a/assets/textures/place_title_cards/g_pn_13.c
+++ b/assets/textures/place_title_cards/g_pn_13.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gGreatFairysFountainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_14.c b/assets/textures/place_title_cards/g_pn_14.c
index 870549c93..cd8bff53f 100644
--- a/assets/textures/place_title_cards/g_pn_14.c
+++ b/assets/textures/place_title_cards/g_pn_14.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gChamberOfTheSagesTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_15.c b/assets/textures/place_title_cards/g_pn_15.c
index ed2e76edd..8b1686735 100644
--- a/assets/textures/place_title_cards/g_pn_15.c
+++ b/assets/textures/place_title_cards/g_pn_15.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gShootingGalleryTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_16.c b/assets/textures/place_title_cards/g_pn_16.c
index f1088194d..02346a923 100644
--- a/assets/textures/place_title_cards/g_pn_16.c
+++ b/assets/textures/place_title_cards/g_pn_16.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gTempleOfTimeTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_17.c b/assets/textures/place_title_cards/g_pn_17.c
index 3b9b84512..e87e0a86a 100644
--- a/assets/textures/place_title_cards/g_pn_17.c
+++ b/assets/textures/place_title_cards/g_pn_17.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gMarketTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_18.c b/assets/textures/place_title_cards/g_pn_18.c
index f4b19ba69..5be4bc5d4 100644
--- a/assets/textures/place_title_cards/g_pn_18.c
+++ b/assets/textures/place_title_cards/g_pn_18.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gBackAlleyTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_19.c b/assets/textures/place_title_cards/g_pn_19.c
index 0cbbdad32..dc051b288 100644
--- a/assets/textures/place_title_cards/g_pn_19.c
+++ b/assets/textures/place_title_cards/g_pn_19.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gKokiriShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_20.c b/assets/textures/place_title_cards/g_pn_20.c
index 44aa12c09..dc682320c 100644
--- a/assets/textures/place_title_cards/g_pn_20.c
+++ b/assets/textures/place_title_cards/g_pn_20.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gGoronShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_21.c b/assets/textures/place_title_cards/g_pn_21.c
index c5faa7d69..e85604999 100644
--- a/assets/textures/place_title_cards/g_pn_21.c
+++ b/assets/textures/place_title_cards/g_pn_21.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gZoraShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_22.c b/assets/textures/place_title_cards/g_pn_22.c
index df6cfd28c..6ae7e0e81 100644
--- a/assets/textures/place_title_cards/g_pn_22.c
+++ b/assets/textures/place_title_cards/g_pn_22.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gHouseOfSkulltulaTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_23.c b/assets/textures/place_title_cards/g_pn_23.c
index ba7022212..dd086ab4e 100644
--- a/assets/textures/place_title_cards/g_pn_23.c
+++ b/assets/textures/place_title_cards/g_pn_23.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gBazaarTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_24.c b/assets/textures/place_title_cards/g_pn_24.c
index 8bf9f9f1b..580b54595 100644
--- a/assets/textures/place_title_cards/g_pn_24.c
+++ b/assets/textures/place_title_cards/g_pn_24.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gPotionShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_25.c b/assets/textures/place_title_cards/g_pn_25.c
index 7356e050d..de6c8e8bb 100644
--- a/assets/textures/place_title_cards/g_pn_25.c
+++ b/assets/textures/place_title_cards/g_pn_25.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gGravekeepersHutTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_26.c b/assets/textures/place_title_cards/g_pn_26.c
index abf67d83b..f0d9adaaf 100644
--- a/assets/textures/place_title_cards/g_pn_26.c
+++ b/assets/textures/place_title_cards/g_pn_26.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gLakesideLaboratoryTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_27.c b/assets/textures/place_title_cards/g_pn_27.c
index 826d96c95..e7608e08d 100644
--- a/assets/textures/place_title_cards/g_pn_27.c
+++ b/assets/textures/place_title_cards/g_pn_27.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gHyruleFieldTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_28.c b/assets/textures/place_title_cards/g_pn_28.c
index fbb228563..905ab306b 100644
--- a/assets/textures/place_title_cards/g_pn_28.c
+++ b/assets/textures/place_title_cards/g_pn_28.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gKakarikoVillageTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_29.c b/assets/textures/place_title_cards/g_pn_29.c
index 51adaffea..80833d758 100644
--- a/assets/textures/place_title_cards/g_pn_29.c
+++ b/assets/textures/place_title_cards/g_pn_29.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gGraveyardTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_30.c b/assets/textures/place_title_cards/g_pn_30.c
index 5fd7622dd..d4122a403 100644
--- a/assets/textures/place_title_cards/g_pn_30.c
+++ b/assets/textures/place_title_cards/g_pn_30.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gZorasRiverTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_31.c b/assets/textures/place_title_cards/g_pn_31.c
index 652d27da4..94096efe1 100644
--- a/assets/textures/place_title_cards/g_pn_31.c
+++ b/assets/textures/place_title_cards/g_pn_31.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gKokiriForestTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_32.c b/assets/textures/place_title_cards/g_pn_32.c
index d0ca0abb6..b0405f658 100644
--- a/assets/textures/place_title_cards/g_pn_32.c
+++ b/assets/textures/place_title_cards/g_pn_32.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gLakeHyliaTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_33.c b/assets/textures/place_title_cards/g_pn_33.c
index 05e67b78a..2437fba39 100644
--- a/assets/textures/place_title_cards/g_pn_33.c
+++ b/assets/textures/place_title_cards/g_pn_33.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gZorasDomainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_34.c b/assets/textures/place_title_cards/g_pn_34.c
index 2da3a0503..ebfc794a5 100644
--- a/assets/textures/place_title_cards/g_pn_34.c
+++ b/assets/textures/place_title_cards/g_pn_34.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gZorasFountainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_35.c b/assets/textures/place_title_cards/g_pn_35.c
index 8a0f49a6d..3884e6472 100644
--- a/assets/textures/place_title_cards/g_pn_35.c
+++ b/assets/textures/place_title_cards/g_pn_35.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gGERudoValleyTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_36.c b/assets/textures/place_title_cards/g_pn_36.c
index 781afb38b..d3cef30a4 100644
--- a/assets/textures/place_title_cards/g_pn_36.c
+++ b/assets/textures/place_title_cards/g_pn_36.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gLostWoodsTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_37.c b/assets/textures/place_title_cards/g_pn_37.c
index c0212c601..b71c93c77 100644
--- a/assets/textures/place_title_cards/g_pn_37.c
+++ b/assets/textures/place_title_cards/g_pn_37.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gHauntedWastelandTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_38.c b/assets/textures/place_title_cards/g_pn_38.c
index ddb5302ee..a44641fe7 100644
--- a/assets/textures/place_title_cards/g_pn_38.c
+++ b/assets/textures/place_title_cards/g_pn_38.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gHyruleCastleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_39.c b/assets/textures/place_title_cards/g_pn_39.c
index e4977dec1..c17a329fc 100644
--- a/assets/textures/place_title_cards/g_pn_39.c
+++ b/assets/textures/place_title_cards/g_pn_39.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gDeathMountainTrailTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_40.c b/assets/textures/place_title_cards/g_pn_40.c
index 7762ffbff..8ee973d9f 100644
--- a/assets/textures/place_title_cards/g_pn_40.c
+++ b/assets/textures/place_title_cards/g_pn_40.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gDeathMountainCraterTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_41.c b/assets/textures/place_title_cards/g_pn_41.c
index 418be49bc..a4303898e 100644
--- a/assets/textures/place_title_cards/g_pn_41.c
+++ b/assets/textures/place_title_cards/g_pn_41.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gGoronCityTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_42.c b/assets/textures/place_title_cards/g_pn_42.c
index 488e4ba5e..ab396dae5 100644
--- a/assets/textures/place_title_cards/g_pn_42.c
+++ b/assets/textures/place_title_cards/g_pn_42.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gLonLonRanchTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_43.c b/assets/textures/place_title_cards/g_pn_43.c
index 6483d0c6c..2e76c15aa 100644
--- a/assets/textures/place_title_cards/g_pn_43.c
+++ b/assets/textures/place_title_cards/g_pn_43.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gGanonsCastleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_44.c b/assets/textures/place_title_cards/g_pn_44.c
index 3a34bf725..e00b85263 100644
--- a/assets/textures/place_title_cards/g_pn_44.c
+++ b/assets/textures/place_title_cards/g_pn_44.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gRoyalFamilysTombTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_45.c b/assets/textures/place_title_cards/g_pn_45.c
index e91fdebd1..a90050209 100644
--- a/assets/textures/place_title_cards/g_pn_45.c
+++ b/assets/textures/place_title_cards/g_pn_45.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gFairysFountainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_46.c b/assets/textures/place_title_cards/g_pn_46.c
index 4f63e9288..23f91cde9 100644
--- a/assets/textures/place_title_cards/g_pn_46.c
+++ b/assets/textures/place_title_cards/g_pn_46.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gFishingPondTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_47.c b/assets/textures/place_title_cards/g_pn_47.c
index b6d6181f5..83feefdec 100644
--- a/assets/textures/place_title_cards/g_pn_47.c
+++ b/assets/textures/place_title_cards/g_pn_47.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gBombchuBowlingAlleyCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_48.c b/assets/textures/place_title_cards/g_pn_48.c
index bd93f6006..e73e11017 100644
--- a/assets/textures/place_title_cards/g_pn_48.c
+++ b/assets/textures/place_title_cards/g_pn_48.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gStableTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_49.c b/assets/textures/place_title_cards/g_pn_49.c
index 47218558d..3459eb447 100644
--- a/assets/textures/place_title_cards/g_pn_49.c
+++ b/assets/textures/place_title_cards/g_pn_49.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gThievesHideoutTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_50.c b/assets/textures/place_title_cards/g_pn_50.c
index e26838c13..fc96b5b4d 100644
--- a/assets/textures/place_title_cards/g_pn_50.c
+++ b/assets/textures/place_title_cards/g_pn_50.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gHappyMaskShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_51.c b/assets/textures/place_title_cards/g_pn_51.c
index 796f0d670..19eec8cba 100644
--- a/assets/textures/place_title_cards/g_pn_51.c
+++ b/assets/textures/place_title_cards/g_pn_51.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gTreasureBoxShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_52.c b/assets/textures/place_title_cards/g_pn_52.c
index 3dc2ccf7a..29b251503 100644
--- a/assets/textures/place_title_cards/g_pn_52.c
+++ b/assets/textures/place_title_cards/g_pn_52.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gSacredForestMeadowTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_53.c b/assets/textures/place_title_cards/g_pn_53.c
index ffb7d3b8b..028a643ed 100644
--- a/assets/textures/place_title_cards/g_pn_53.c
+++ b/assets/textures/place_title_cards/g_pn_53.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gGERudosFortressTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_54.c b/assets/textures/place_title_cards/g_pn_54.c
index 6b9fb0e2b..63a0d2275 100644
--- a/assets/textures/place_title_cards/g_pn_54.c
+++ b/assets/textures/place_title_cards/g_pn_54.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gBottomOfTheWellTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_55.c b/assets/textures/place_title_cards/g_pn_55.c
index 7721518bc..1f2c654cf 100644
--- a/assets/textures/place_title_cards/g_pn_55.c
+++ b/assets/textures/place_title_cards/g_pn_55.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gDesertColossusTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_56.c b/assets/textures/place_title_cards/g_pn_56.c
index 2083b354b..ba0e77af0 100644
--- a/assets/textures/place_title_cards/g_pn_56.c
+++ b/assets/textures/place_title_cards/g_pn_56.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gBombchuShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
diff --git a/assets/textures/place_title_cards/g_pn_57.c b/assets/textures/place_title_cards/g_pn_57.c
index 80f441b03..7318f30fb 100644
--- a/assets/textures/place_title_cards/g_pn_57.c
+++ b/assets/textures/place_title_cards/g_pn_57.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "tex_len.h"
 #include "versions.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #if OOT_NTSC
 u64 gQuestionMarkTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {