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>
2025-08-06 14:20:11 +00:00 · 2025-06-04 14:38:33 -04:00 · 2025-06-04 14:38:33 -04:00 · 28cc9d68cf
commit 28cc9d68cf
parent e8b708a448
1255 changed files with 2596 additions and 2594 deletions
--- 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

--- 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
--- 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

--- 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
--- 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)];
--- 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)];
--- 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

--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {
--- 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)] = {