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>
2026-01-21 10:37:37 -08:00 · 2025-06-04 14:38:33 -04:00
parent e8b708a448
commit 28cc9d68cf
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/Show More
+++ b/Show More