diff --git a/assets/objects/object_link_boy/object_link_boy.c b/assets/objects/object_link_boy/object_link_boy.c
index 276e6b2b34..ea6fe8c9f2 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 8fadf32923..349c36adeb 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 035cbedb30..30411ab0b4 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 7efc576808..0641714080 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 dbfa9c40e0..2b9a1bc88b 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 e3ca81b6df..176ea71e84 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 7a4c6cf7b7..22806a4670 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
new file mode 100644
index 0000000000..e91c30dd8c
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_01.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gForestTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gForestTempleTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gForestTempleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gForestTempleTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gForestTempleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gForestTempleTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gForestTempleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gForestTempleTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_02.c b/assets/textures/place_title_cards/g_pn_02.c
new file mode 100644
index 0000000000..f7a0153764
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_02.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gShadowTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gShadowTempleTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gShadowTempleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gShadowTempleTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gShadowTempleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gShadowTempleTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gShadowTempleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gShadowTempleTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_03.c b/assets/textures/place_title_cards/g_pn_03.c
new file mode 100644
index 0000000000..8f56f98522
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_03.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gFireTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gFireTempleTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gFireTempleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gFireTempleTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gFireTempleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gFireTempleTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gFireTempleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gFireTempleTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_04.c b/assets/textures/place_title_cards/g_pn_04.c
new file mode 100644
index 0000000000..e7844ff898
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_04.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gWaterTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gWaterTempleTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gWaterTempleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gWaterTempleTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gWaterTempleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gWaterTempleTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gWaterTempleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gWaterTempleTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_05.c b/assets/textures/place_title_cards/g_pn_05.c
new file mode 100644
index 0000000000..70dfa83325
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_05.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gSpiritTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gSpiritTempleTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gSpiritTempleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gSpiritTempleTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gSpiritTempleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gSpiritTempleTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gSpiritTempleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gSpiritTempleTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_06.c b/assets/textures/place_title_cards/g_pn_06.c
new file mode 100644
index 0000000000..4d1dfadc06
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_06.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gDekuTreeTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDekuTreeTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gDekuTreeTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDekuTreeTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gDekuTreeTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDekuTreeTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gDekuTreeTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDekuTreeTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_07.c b/assets/textures/place_title_cards/g_pn_07.c
new file mode 100644
index 0000000000..0eab2f3868
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_07.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gJabuJabuTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gJabuJabuTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gJabuJabuTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gJabuJabuTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gJabuJabuTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gJabuJabuTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gJabuJabuTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gJabuJabuTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_08.c b/assets/textures/place_title_cards/g_pn_08.c
new file mode 100644
index 0000000000..bb5b3617b9
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_08.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gDodongosCavernTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDodongosCavernTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gDodongosCavernTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDodongosCavernTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gDodongosCavernTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDodongosCavernTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gDodongosCavernTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDodongosCavernTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_09.c b/assets/textures/place_title_cards/g_pn_09.c
new file mode 100644
index 0000000000..37116ca729
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_09.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gInsideGanonsCastleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gInsideGanonsCastleTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gInsideGanonsCastleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gInsideGanonsCastleTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gInsideGanonsCastleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gInsideGanonsCastleTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gInsideGanonsCastleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gInsideGanonsCastleTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_10.c b/assets/textures/place_title_cards/g_pn_10.c
new file mode 100644
index 0000000000..9b183245f4
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_10.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gIceCavernTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gIceCavernTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gIceCavernTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gIceCavernTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gIceCavernTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gIceCavernTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gIceCavernTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gIceCavernTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_11.c b/assets/textures/place_title_cards/g_pn_11.c
new file mode 100644
index 0000000000..d24673a514
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_11.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gGERudoTrainingGroundTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGERudoTrainingGroundTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gGERudoTrainingGroundTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGERudoTrainingGroundTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gGERudoTrainingGroundTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGERudoTrainingGroundTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gGERudoTrainingGroundTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGERudoTrainingGroundTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_12.c b/assets/textures/place_title_cards/g_pn_12.c
new file mode 100644
index 0000000000..e362af21c7
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_12.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gCastleCourtyardTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gCastleCourtyardTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gCastleCourtyardTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gCastleCourtyardTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gCastleCourtyardTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gCastleCourtyardTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gCastleCourtyardTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gCastleCourtyardTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_13.c b/assets/textures/place_title_cards/g_pn_13.c
new file mode 100644
index 0000000000..57b78e009c
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_13.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gGreatFairysFountainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGreatFairysFountainTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gGreatFairysFountainTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGreatFairysFountainTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gGreatFairysFountainTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGreatFairysFountainTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gGreatFairysFountainTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGreatFairysFountainTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_14.c b/assets/textures/place_title_cards/g_pn_14.c
new file mode 100644
index 0000000000..cd8bff53f4
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_14.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gChamberOfTheSagesTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gChamberOfTheSagesTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gChamberOfTheSagesTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gChamberOfTheSagesTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gChamberOfTheSagesTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gChamberOfTheSagesTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gChamberOfTheSagesTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gChamberOfTheSagesTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_15.c b/assets/textures/place_title_cards/g_pn_15.c
new file mode 100644
index 0000000000..8b16867359
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_15.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gShootingGalleryTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gShootingGalleryTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gShootingGalleryTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gShootingGalleryTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gShootingGalleryTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gShootingGalleryTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gShootingGalleryTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gShootingGalleryTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_16.c b/assets/textures/place_title_cards/g_pn_16.c
new file mode 100644
index 0000000000..02346a9235
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_16.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gTempleOfTimeTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gTempleOfTimeTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gTempleOfTimeTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gTempleOfTimeTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gTempleOfTimeTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gTempleOfTimeTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gTempleOfTimeTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gTempleOfTimeTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_17.c b/assets/textures/place_title_cards/g_pn_17.c
new file mode 100644
index 0000000000..e87e0a86a0
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_17.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gMarketTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gMarketTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gMarketTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gMarketTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gMarketTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gMarketTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gMarketTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gMarketTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_18.c b/assets/textures/place_title_cards/g_pn_18.c
new file mode 100644
index 0000000000..5be4bc5d40
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_18.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gBackAlleyTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBackAlleyTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gBackAlleyTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBackAlleyTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gBackAlleyTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBackAlleyTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gBackAlleyTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBackAlleyTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_19.c b/assets/textures/place_title_cards/g_pn_19.c
new file mode 100644
index 0000000000..dc051b288f
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_19.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gKokiriShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gKokiriShopTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gKokiriShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gKokiriShopTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gKokiriShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gKokiriShopTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gKokiriShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gKokiriShopTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_20.c b/assets/textures/place_title_cards/g_pn_20.c
new file mode 100644
index 0000000000..dc682320ca
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_20.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gGoronShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGoronShopTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gGoronShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGoronShopTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gGoronShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGoronShopTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gGoronShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGoronShopTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_21.c b/assets/textures/place_title_cards/g_pn_21.c
new file mode 100644
index 0000000000..e856049995
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_21.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gZoraShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZoraShopTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gZoraShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZoraShopTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gZoraShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZoraShopTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gZoraShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZoraShopTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_22.c b/assets/textures/place_title_cards/g_pn_22.c
new file mode 100644
index 0000000000..6ae7e0e81d
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_22.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gHouseOfSkulltulaTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHouseOfSkulltulaTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gHouseOfSkulltulaTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHouseOfSkulltulaTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gHouseOfSkulltulaTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHouseOfSkulltulaTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gHouseOfSkulltulaTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHouseOfSkulltulaTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_23.c b/assets/textures/place_title_cards/g_pn_23.c
new file mode 100644
index 0000000000..dd086ab4e1
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_23.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gBazaarTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBazaarTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gBazaarTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBazaarTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gBazaarTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBazaarTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gBazaarTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBazaarTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_24.c b/assets/textures/place_title_cards/g_pn_24.c
new file mode 100644
index 0000000000..580b545955
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_24.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gPotionShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gPotionShopTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gPotionShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gPotionShopTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gPotionShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gPotionShopTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gPotionShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gPotionShopTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_25.c b/assets/textures/place_title_cards/g_pn_25.c
new file mode 100644
index 0000000000..de6c8e8bb1
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_25.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gGravekeepersHutTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGravekeepersHutTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gGravekeepersHutTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGravekeepersHutTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gGravekeepersHutTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGravekeepersHutTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gGravekeepersHutTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGravekeepersHutTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_26.c b/assets/textures/place_title_cards/g_pn_26.c
new file mode 100644
index 0000000000..f0d9adaaf9
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_26.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gLakesideLaboratoryTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLakesideLaboratoryTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gLakesideLaboratoryTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLakesideLaboratoryTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gLakesideLaboratoryTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLakesideLaboratoryTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gLakesideLaboratoryTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLakesideLaboratoryTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_27.c b/assets/textures/place_title_cards/g_pn_27.c
new file mode 100644
index 0000000000..e7608e08dd
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_27.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gHyruleFieldTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHyruleFieldTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gHyruleFieldTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHyruleFieldTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gHyruleFieldTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHyruleFieldTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gHyruleFieldTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHyruleFieldTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_28.c b/assets/textures/place_title_cards/g_pn_28.c
new file mode 100644
index 0000000000..905ab306b0
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_28.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gKakarikoVillageTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gKakarikoVillageTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gKakarikoVillageTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gKakarikoVillageTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gKakarikoVillageTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gKakarikoVillageTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gKakarikoVillageTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gKakarikoVillageTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_29.c b/assets/textures/place_title_cards/g_pn_29.c
new file mode 100644
index 0000000000..80833d7586
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_29.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gGraveyardTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGraveyardTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gGraveyardTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGraveyardTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gGraveyardTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGraveyardTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gGraveyardTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGraveyardTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_30.c b/assets/textures/place_title_cards/g_pn_30.c
new file mode 100644
index 0000000000..d4122a403a
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_30.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gZorasRiverTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZorasRiverTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gZorasRiverTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZorasRiverTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gZorasRiverTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZorasRiverTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gZorasRiverTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZorasRiverTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_31.c b/assets/textures/place_title_cards/g_pn_31.c
new file mode 100644
index 0000000000..94096efe1f
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_31.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gKokiriForestTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gKokiriForestTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gKokiriForestTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gKokiriForestTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gKokiriForestTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gKokiriForestTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gKokiriForestTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gKokiriForestTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_32.c b/assets/textures/place_title_cards/g_pn_32.c
new file mode 100644
index 0000000000..b0405f6584
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_32.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gLakeHyliaTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLakeHyliaTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gLakeHyliaTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLakeHyliaTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gLakeHyliaTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLakeHyliaTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gLakeHyliaTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLakeHyliaTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_33.c b/assets/textures/place_title_cards/g_pn_33.c
new file mode 100644
index 0000000000..2437fba398
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_33.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gZorasDomainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZorasDomainTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gZorasDomainTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZorasDomainTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gZorasDomainTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZorasDomainTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gZorasDomainTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZorasDomainTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_34.c b/assets/textures/place_title_cards/g_pn_34.c
new file mode 100644
index 0000000000..ebfc794a55
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_34.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gZorasFountainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZorasFountainTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gZorasFountainTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZorasFountainTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gZorasFountainTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZorasFountainTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gZorasFountainTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gZorasFountainTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_35.c b/assets/textures/place_title_cards/g_pn_35.c
new file mode 100644
index 0000000000..3884e64722
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_35.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gGERudoValleyTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGERudoValleyTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gGERudoValleyTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGERudoValleyTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gGERudoValleyTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGERudoValleyTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gGERudoValleyTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGERudoValleyTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_36.c b/assets/textures/place_title_cards/g_pn_36.c
new file mode 100644
index 0000000000..d3cef30a4e
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_36.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gLostWoodsTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLostWoodsTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gLostWoodsTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLostWoodsTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gLostWoodsTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLostWoodsTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gLostWoodsTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLostWoodsTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_37.c b/assets/textures/place_title_cards/g_pn_37.c
new file mode 100644
index 0000000000..b71c93c778
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_37.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gHauntedWastelandTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHauntedWastelandTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gHauntedWastelandTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHauntedWastelandTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gHauntedWastelandTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHauntedWastelandTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gHauntedWastelandTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHauntedWastelandTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_38.c b/assets/textures/place_title_cards/g_pn_38.c
new file mode 100644
index 0000000000..a44641fe76
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_38.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gHyruleCastleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHyruleCastleTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gHyruleCastleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHyruleCastleTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gHyruleCastleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHyruleCastleTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gHyruleCastleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHyruleCastleTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_39.c b/assets/textures/place_title_cards/g_pn_39.c
new file mode 100644
index 0000000000..c17a329fc0
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_39.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gDeathMountainTrailTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDeathMountainTrailTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gDeathMountainTrailTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDeathMountainTrailTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gDeathMountainTrailTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDeathMountainTrailTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gDeathMountainTrailTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDeathMountainTrailTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_40.c b/assets/textures/place_title_cards/g_pn_40.c
new file mode 100644
index 0000000000..8ee973d9fa
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_40.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gDeathMountainCraterTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDeathMountainCraterTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gDeathMountainCraterTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDeathMountainCraterTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gDeathMountainCraterTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDeathMountainCraterTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gDeathMountainCraterTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDeathMountainCraterTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_41.c b/assets/textures/place_title_cards/g_pn_41.c
new file mode 100644
index 0000000000..a4303898e5
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_41.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gGoronCityTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGoronCityTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gGoronCityTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGoronCityTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gGoronCityTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGoronCityTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gGoronCityTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGoronCityTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_42.c b/assets/textures/place_title_cards/g_pn_42.c
new file mode 100644
index 0000000000..ab396dae5e
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_42.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gLonLonRanchTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLonLonRanchTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gLonLonRanchTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLonLonRanchTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gLonLonRanchTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLonLonRanchTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gLonLonRanchTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gLonLonRanchTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_43.c b/assets/textures/place_title_cards/g_pn_43.c
new file mode 100644
index 0000000000..2e76c15aac
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_43.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gGanonsCastleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGanonsCastleTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gGanonsCastleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGanonsCastleTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gGanonsCastleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGanonsCastleTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gGanonsCastleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGanonsCastleTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_44.c b/assets/textures/place_title_cards/g_pn_44.c
new file mode 100644
index 0000000000..e00b852631
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_44.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gRoyalFamilysTombTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gRoyalFamilysTombTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gRoyalFamilysTombTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gRoyalFamilysTombTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gRoyalFamilysTombTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gRoyalFamilysTombTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gRoyalFamilysTombTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gRoyalFamilysTombTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_45.c b/assets/textures/place_title_cards/g_pn_45.c
new file mode 100644
index 0000000000..a900502094
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_45.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gFairysFountainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gFairysFountainTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gFairysFountainTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gFairysFountainTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gFairysFountainTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gFairysFountainTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gFairysFountainTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gFairysFountainTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_46.c b/assets/textures/place_title_cards/g_pn_46.c
new file mode 100644
index 0000000000..23f91cde98
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_46.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gFishingPondTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gFishingPondTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gFishingPondTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gFishingPondTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gFishingPondTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gFishingPondTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gFishingPondTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gFishingPondTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_47.c b/assets/textures/place_title_cards/g_pn_47.c
new file mode 100644
index 0000000000..83feefdec6
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_47.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gBombchuBowlingAlleyCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBombchuBowlingAlleyCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gBombchuBowlingAlleyCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBombchuBowlingAlleyCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gBombchuBowlingAlleyCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBombchuBowlingAlleyCardGERTex.ia8.inc.c"
+};
+
+u64 gBombchuBowlingAlleyCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBombchuBowlingAlleyCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_48.c b/assets/textures/place_title_cards/g_pn_48.c
new file mode 100644
index 0000000000..e73e110171
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_48.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gStableTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gStableTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gStableTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gStableTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gStableTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gStableTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gStableTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gStableTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_49.c b/assets/textures/place_title_cards/g_pn_49.c
new file mode 100644
index 0000000000..3459eb447f
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_49.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gThievesHideoutTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gThievesHideoutTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gThievesHideoutTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gThievesHideoutTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gThievesHideoutTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gThievesHideoutTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gThievesHideoutTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gThievesHideoutTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_50.c b/assets/textures/place_title_cards/g_pn_50.c
new file mode 100644
index 0000000000..fc96b5b4d4
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_50.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gHappyMaskShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHappyMaskShopTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gHappyMaskShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHappyMaskShopTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gHappyMaskShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHappyMaskShopTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gHappyMaskShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gHappyMaskShopTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_51.c b/assets/textures/place_title_cards/g_pn_51.c
new file mode 100644
index 0000000000..19eec8cbae
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_51.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gTreasureBoxShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gTreasureBoxShopTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gTreasureBoxShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gTreasureBoxShopTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gTreasureBoxShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gTreasureBoxShopTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gTreasureBoxShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gTreasureBoxShopTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_52.c b/assets/textures/place_title_cards/g_pn_52.c
new file mode 100644
index 0000000000..29b2515037
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_52.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gSacredForestMeadowTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gSacredForestMeadowTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gSacredForestMeadowTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gSacredForestMeadowTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gSacredForestMeadowTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gSacredForestMeadowTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gSacredForestMeadowTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gSacredForestMeadowTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_53.c b/assets/textures/place_title_cards/g_pn_53.c
new file mode 100644
index 0000000000..028a643edf
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_53.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gGERudosFortressTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGERudosFortressTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gGERudosFortressTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGERudosFortressTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gGERudosFortressTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGERudosFortressTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gGERudosFortressTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gGERudosFortressTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_54.c b/assets/textures/place_title_cards/g_pn_54.c
new file mode 100644
index 0000000000..63a0d22755
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_54.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gBottomOfTheWellTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBottomOfTheWellTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gBottomOfTheWellTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBottomOfTheWellTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gBottomOfTheWellTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBottomOfTheWellTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gBottomOfTheWellTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBottomOfTheWellTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_55.c b/assets/textures/place_title_cards/g_pn_55.c
new file mode 100644
index 0000000000..1f2c654cf5
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_55.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gDesertColossusTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDesertColossusTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gDesertColossusTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDesertColossusTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gDesertColossusTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDesertColossusTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gDesertColossusTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gDesertColossusTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_56.c b/assets/textures/place_title_cards/g_pn_56.c
new file mode 100644
index 0000000000..ba0e77af02
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_56.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gBombchuShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBombchuShopTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gBombchuShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBombchuShopTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gBombchuShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBombchuShopTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gBombchuShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gBombchuShopTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/textures/place_title_cards/g_pn_57.c b/assets/textures/place_title_cards/g_pn_57.c
new file mode 100644
index 0000000000..7318f30fb7
--- /dev/null
+++ b/assets/textures/place_title_cards/g_pn_57.c
@@ -0,0 +1,24 @@
+#include "ultra64.h"
+#include "tex_len.h"
+#include "versions.h"
+#include "actor.h"
+
+#if OOT_NTSC
+u64 gQuestionMarkTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gQuestionMarkTitleCardJPNTex.ia8.inc.c"
+};
+#endif
+
+u64 gQuestionMarkTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gQuestionMarkTitleCardENGTex.ia8.inc.c"
+};
+
+#if OOT_PAL
+u64 gQuestionMarkTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gQuestionMarkTitleCardGERTex.ia8.inc.c"
+};
+
+u64 gQuestionMarkTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = {
+#include "assets/textures/place_title_cards/gQuestionMarkTitleCardFRATex.ia8.inc.c"
+};
+#endif
diff --git a/assets/xml/objects/gameplay_dangeon_keep.xml b/assets/xml/objects/gameplay_dangeon_keep.xml
index 4dcfa922b1..4b1360a558 100644
--- a/assets/xml/objects/gameplay_dangeon_keep.xml
+++ b/assets/xml/objects/gameplay_dangeon_keep.xml
@@ -1,5 +1,7 @@
 <Root>
     <File Name="gameplay_dangeon_keep" Segment="5">
+        <Texture Name="gameplay_dangeon_keep_000000_Tex" Format="i8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="gameplay_dangeon_keep_000200_Tex" Format="i8" Width="16" Height="32" Offset="0x200"/>
         <Array Name="gUnusedCandleVtx" Count="4" Offset="0x400">
             <Vtx/>
         </Array>
@@ -8,6 +10,7 @@
             <Vtx/>
         </Array>
         <DList Name="gBrownFragmentDL" Offset="0x530"/>
+        <Texture Name="gameplay_dangeon_keep_0005C0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5C0"/>
         <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
         <Array Name="gDoorLockVtx" Count="20" Offset="0xFC0">
             <Vtx/>
@@ -17,6 +20,7 @@
             <Vtx/>
         </Array>
         <DList Name="gDoorChainDL" Offset="0x11F0"/>
+        <Texture Name="gameplay_dangeon_keep_001280_Tex" Format="rgba16" Width="32" Height="32" Offset="0x1280"/>
         <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
         <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
         <Array Name="gUnusedBombBagVtx" Count="4" Offset="0x3280">
@@ -104,6 +108,10 @@
             <Vtx/>
         </Array>
         <DList Name="gBetaCrystalSwitchDL" Offset="0x77B0"/>
+        <Texture Name="gameplay_dangeon_keep_0078A0_Tex" Format="i8" Width="32" Height="32" Offset="0x78A0"/>
+        <Texture Name="gameplay_dangeon_keep_007CA0_Tex" Format="i8" Width="32" Height="32" Offset="0x7CA0"/>
+        <Texture Name="gameplay_dangeon_keep_0080A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x80A0"/>
+        <Texture Name="gameplay_dangeon_keep_0088A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x88A0"/>
         <Texture Name="gEyeSwitchGoldClosedTex" OutName="eye_gold_closed" Format="rgba16" Width="32" Height="32" Offset="0x90A0"/>
         <Texture Name="gEyeSwitchGoldOpeningTex" OutName="eye_gold_opening" Format="rgba16" Width="32" Height="32" Offset="0x98A0"/>
         <Texture Name="gEyeSwitchGoldClosingTex" OutName="eye_gold_closing" Format="rgba16" Width="32" Height="32" Offset="0xA0A0"/>
@@ -113,11 +121,26 @@
         <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0A0"/>
         <Texture Name="gDungeonKeepTex_00C8A0" OutName="dungeon_keep_tex_00C8A0" Format="rgba16" Width="32" Height="32" Offset="0xC8A0"/>
         <Texture Name="gDungeonkeepTex_00D0A0" OutName="dungeon_keep_tex_00D0A0" Format="rgba16" Width="32" Height="32" Offset="0xD0A0"/>
+        <Texture Name="gameplay_dangeon_keep_00D8A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0xD8A0"/>
+        <Texture Name="gameplay_dangeon_keep_00E0A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0xE0A0"/>
         <Texture Name="gDungeonKeepTex_00E8A0" OutName="dungeon_keep_tex_00E8A0" Format="i8" Width="32" Height="32" Offset="0xE8A0"/>
         <Texture Name="gDungeonKeepTex_00ECA0" OutName="dungeon_keep_tex_00ECA0" Format="i8" Width="32" Height="32" Offset="0xECA0"/>
         <Texture Name="gDungeonKeepTex_00F0A0" OutName="dungeon_keep_tex_00F0A0" Format="rgba16" Width="32" Height="32" Offset="0xF0A0"/>
+        <Texture Name="gameplay_dangeon_keep_00F8A0_Tex" Format="rgba16" Width="64" Height="32" Offset="0xF8A0"/>
+        <Texture Name="gameplay_dangeon_keep_0108A0_Tex" Format="rgba16" Width="32" Height="64" Offset="0x108A0"/>
+        <Texture Name="gameplay_dangeon_keep_0118A0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x118A0"/>
+        <Texture Name="gameplay_dangeon_keep_011AA0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x11AA0"/>
+        <Texture Name="gameplay_dangeon_keep_011CA0_Tex" Format="rgba16" Width="32" Height="64" Offset="0x11CA0"/>
+        <Texture Name="gameplay_dangeon_keep_012CA0_Tex" Format="rgba16" Width="64" Height="16" Offset="0x12CA0"/>
+        <Texture Name="gameplay_dangeon_keep_0134A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x134A0"/>
+        <Texture Name="gameplay_dangeon_keep_013CA0_Tex" Format="ia8" Width="4" Height="4" Offset="0x13CA0"/>
+        <Texture Name="gameplay_dangeon_keep_013CB0_Tex" Format="i4" Width="64" Height="64" Offset="0x13CB0"/>
         <Texture Name="gCrstalSwitchRedTex" OutName="crystal_red" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/>
         <Texture Name="gCrstalSwitchBlueTex" OutName="crystal_blue" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/>
+        <Texture Name="gameplay_dangeon_keep_0154B0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x154B0"/>
+        <Texture Name="gameplay_dangeon_keep_015CB0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x15CB0"/>
+        <Texture Name="gameplay_dangeon_keep_0164B0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x164B0"/>
+        <Texture Name="gameplay_dangeon_keep_016CB0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x16CB0"/>
         <Array Name="gPotVtx" Count="60" Offset="0x174B0">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index 2555cf68dc..d41a28b8d9 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -603,29 +603,63 @@
 
         <!-- Probably a file boundary here. -->
 
+        <Array Name="gDebugPyramidVtx" Count="12" Offset="0x3500">
+            <Vtx/>
+        </Array>
         <DList Name="gDebugPyramidDL" Offset="0x35C0"/>
         <Texture Name="gDebugCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x35F0"/>
         <Texture Name="gDebugBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x36F0"/>
         <Texture Name="gDebugCursorTex" OutName="debug_cursor" Format="i8" Width="16" Height="16" Offset="0x37F0"/>
         <Texture Name="gDebugCrossTex" OutName="debug_cross" Format="i8" Width="16" Height="16" Offset="0x38F0"/>
         <DList Name="gDebugArrowDL" Offset="0x39F0"/>
+        <Array Name="gDebugArrowVtx" Count="36" Offset="0x3A50">
+            <Vtx/>
+        </Array>
         <DList Name="gDebugCameraDL" Offset="0x3C90"/>
+        <Array Name="gDebugCameraVtx" Count="40" Offset="0x3D08">
+            <Vtx/>
+        </Array>
+        <Array Name="gDebugCheckeredFloorVtx" Count="4" Offset="0x3F88">
+            <Vtx/>
+        </Array>
         <DList Name="gDebugCheckeredFloorDL" Offset="0x3FC8"/>
         <Texture Name="gDebugCheckeredFloorTex" OutName="debug_checkered_floor" Format="ia4" Width="32" Height="32" Offset="0x4058"/>
+        <Array Name="gDebugSpriteVtx" Count="4" Offset="0x4258">
+            <Vtx/>
+        </Array>
         <DList Name="gDebugSpriteDL" Offset="0x4298"/>
         <Animation Name="gArrow1Anim" Offset="0x4310"/>
         <Animation Name="gArrow2Anim" Offset="0x436C"/>
         <Texture Name="gArrowShaftTex" OutName="arrow_shaft" Format="rgba16" Width="16" Height="128" Offset="0x4380"/>
         <Texture Name="gArrowFletchingTex" OutName="arrow_fletching" Format="rgba16" Width="32" Height="16" Offset="0x5380"/>
+        <Array Name="gArrowNearVtx" Count="50" Offset="0x5780">
+            <Vtx/>
+        </Array>
         <DList Name="gArrowNearDL" Offset="0x5AA0"/>
+        <Array Name="gArrowFarVtx" Count="26" Offset="0x5C80">
+            <Vtx/>
+        </Array>
         <DList Name="gArrowFarDL" Offset="0x5E20"/>
+        <Limb Name="gameplay_keep_005FC0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FC0" Offset="0x5FC0"/>
+        <Limb Name="gameplay_keep_005FD0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FD0" Offset="0x5FD0"/>
+        <Limb Name="gameplay_keep_005FE0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FE0" Offset="0x5FE0"/>
+        <Limb Name="gameplay_keep_005FF0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FF0" Offset="0x5FF0"/>
         <Skeleton Name="gArrowSkel" Type="Normal" LimbType="LOD" Offset="0x6010"/> <!-- fix pointer for this! -->
         <Texture Name="gUnknownEffBlureTex" OutName="unknown_eff_blure" Format="i8" Width="64" Height="32" Offset="0x6020"/>
         <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x6820"/>
+        <Array Name="gBombBodyVtx" Count="4" Offset="0x7820">
+            <Vtx/>
+        </Array>
         <DList Name="gBombBodyDL" Offset="0x7860"/>
         <Texture Name="gBombCapTex" OutName="bomb_cap" Format="rgba16" Width="8" Height="8" Offset="0x78F0"/>
+        <Array Name="gBombCapVtx" Count="14" Offset="0x7970">
+            <Vtx/>
+        </Array>
         <DList Name="gBombCapDL" Offset="0x7A50"/>
         <Texture Name="gBombchuBodyTex" OutName="bombchu_body" Format="rgba16" Width="8" Height="8" Offset="0x7B10"/>
+        <Array Name="gBombchuVtx" Count="40" Offset="0x7B90">
+            <Vtx/>
+        </Array>
         <DList Name="gBombchuDL" Offset="0x7E10"/>
         <Texture Name="gEffBombExplosion1Tex" OutName="eff_bomb_explosion_1" Format="ia16" Width="32" Height="32" Offset="0x7F80"/>
         <Texture Name="gEffBombExplosion2Tex" OutName="eff_bomb_explosion_2" Format="ia16" Width="32" Height="32" Offset="0x8780"/>
@@ -638,17 +672,38 @@
         <DList Name="gEffBombExplosion1DL" Offset="0xBF80"/>
         <DList Name="gEffBombExplosion2DL" Offset="0xBFE8"/>
         <DList Name="gEffBombExplosion3DL" Offset="0xC040"/>
+        <Array Name="gEffBombExplosionVtx" Count="4" Offset="0xC058">
+            <Vtx/>
+        </Array>
+        <Array Name="gEffFragments1Vtx" Count="3" Offset="0xC0A0">
+            <Vtx/>
+        </Array>
         <DList Name="gEffFragments1DL" Offset="0xC0D0"/>
         <Texture Name="gWitheredLeafTex" OutName="withered_leaf" Format="rgba16" Width="16" Height="16" Offset="0xC160"/>
+        <Array Name="gBoomerangVtx" Count="51" Offset="0xC360">
+            <Vtx/>
+        </Array>
         <DList Name="gUnknownBlankDL" Offset="0xC690"/>
         <DList Name="gBoomerangDL" Offset="0xC698"/>
         <DList Name="gBoomerangRefDL" Offset="0xC808"/>
         <DList Name="gCompassArrowDL" Offset="0xC820"/>
 
+        <Array Name="gCompassArrowVtx" Count="3" Offset="0xC848">
+            <Vtx/>
+        </Array>
+        <Array Name="gameplay_keep_Vtx_00C880" Count="3" Offset="0xC880">
+            <Vtx/>
+        </Array>
         <DList Name="gGameplayKeepDL_C8B0" Offset="0xC8B0"/>
 
+        <Array Name="gLockOnArrowVtx" Count="47" Offset="0xC920">
+            <Vtx/>
+        </Array>
         <DList Name="gLockOnArrowDL" Offset="0xCC10"/>
         <Texture Name="gHilite3Tex" OutName="hilite_3" Format="i8" Width="8" Height="8" Offset="0xCD20"/>
+        <Array Name="gEffFragments2Vtx" Count="12" Offset="0xCD60">
+            <Vtx/>
+        </Array>
         <DList Name="gEffFragments2DL" Offset="0xCE20"/>
 
         <Texture Name="gGameplayKeepTex_CE60" OutName="gameplay_keep_tex_CE60" Format="ia8" Width="32" Height="32" Offset="0xCE60"/>
@@ -656,55 +711,151 @@
         <Texture Name="gSelectionCursorTex" OutName="selection_cursor" Format="ia4" Width="16" Height="16" Offset="0xD260"/>
         <Texture Name="gControlStickTex" OutName="control_stick" Format="ia8" Width="16" Height="16" Offset="0xD2E0"/>
         <Texture Name="gArrowCursorTex" OutName="arrow_cursor" Format="ia8" Width="16" Height="24" Offset="0xD3E0"/>
+        <Array Name="gUnusedRockFragmentVtx" Count="24" Offset="0xD560">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedRockFragmentDL" Offset="0xD6E0"/>
         <DList Name="gBoulderFragmentsDL" Offset="0xD7E0"/>
+        <Array Name="gBoulderFragmentsVtx" Count="12" Offset="0xD8B8">
+            <Vtx/>
+        </Array>
         <Texture Name="gRockFragment1Tex" OutName="rock_fragment_1" Format="rgba16" Width="32" Height="32" Offset="0xD980"/>
         <Texture Name="gRockFragment2Tex" OutName="rock_fragment_2" Format="rgba16" Width="32" Height="32" Offset="0xE180"/>
         <Animation Name="gDoorChildOpeningLeftAnim" Offset="0xEA54"/>
         <Animation Name="gDoorChildOpeningRightAnim" Offset="0xEB40"/>
         <Animation Name="gDoorAdultOpeningLeftAnim" Offset="0xEBF8"/>
+        <Array Name="gDoorLeftVtx" Count="34" Offset="0xEC10">
+            <Vtx/>
+        </Array>
+        <Array Name="gDoorRightVtx" Count="34" Offset="0xEE30">
+            <Vtx/>
+        </Array>
+        <Array Name="gDoorFrameVtx" Count="8" Offset="0xF050">
+            <Vtx/>
+        </Array>
         <DList Name="gDoorFrameDL" Offset="0xF0D0"/>
         <DList Name="gDoorLeftDL" Offset="0xF158"/>
         <DList Name="gDoorRightDL" Offset="0xF2A0"/>
         <Texture Name="gWoodenDoorTex" OutName="wooden_door" Format="rgba16" Width="32" Height="64" Offset="0xF3D8"/>
+        <Limb Name="gameplay_keep_0103D8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0103D8" Offset="0x103D8"/>
+        <Limb Name="gameplay_keep_0103E4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0103E4" Offset="0x103E4"/>
+        <Limb Name="gameplay_keep_0103F0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0103F0" Offset="0x103F0"/>
+        <Limb Name="gameplay_keep_0103FC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0103FC" Offset="0x103FC"/>
         <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0x10418"/>
         <Animation Name="gDoorAdultOpeningRightAnim" Offset="0x104D8"/>
         <DList Name="gEffDustDL" Offset="0x104F0"/>
+        <Array Name="gEffDustVtx" Count="4" Offset="0x10548">
+            <Vtx/>
+        </Array>
+        <Array Name="gEffFlashVtx" Count="4" Offset="0x10590">
+            <Vtx/>
+        </Array>
         <DList Name="gEffFlash1DL" Offset="0x105D0"/>
         <DList Name="gEffFlash2DL" Offset="0x10648"/>
         <Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x106C8"/>
         <Texture Name="gTorchFlameTex" OutName="torch_flame" Format="i8" Width="64" Height="32" Offset="0x116D0"/>
         <Texture Name="gEffUnknown1Tex" OutName="eff_unknown_1" Format="i8" Width="64" Height="32" Offset="0x11ED0"/>
+        <Array Name="gSpinAttack1Vtx" Count="26" Offset="0x126D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gSpinAttack2Vtx" Count="26" Offset="0x12870">
+            <Vtx/>
+        </Array>
         <DList Name="gSpinAttack1DL" Offset="0x12A10"/>
         <DList Name="gSpinAttack2DL" Offset="0x12B30"/>
+        <Array Name="gSpinAttack3Vtx" Count="26" Offset="0x12C50">
+            <Vtx/>
+        </Array>
+        <Array Name="gSpinAttack4Vtx" Count="26" Offset="0x12DF0">
+            <Vtx/>
+        </Array>
         <DList Name="gSpinAttack3DL" Offset="0x12F90"/>
         <DList Name="gSpinAttack4DL" Offset="0x130B0"/>
         <Texture Name="gFlameWall1Tex" OutName="flame_wall_1" Format="i8" Width="32" Height="32" Offset="0x131D0"/>
         <Texture Name="gFlameWall2Tex" OutName="flame_wall_2" Format="i8" Width="32" Height="32" Offset="0x135D0"/>
+        <Array Name="gSpinAttackChargingVtx" Count="14" Offset="0x139D0">
+            <Vtx/>
+        </Array>
         <DList Name="gSpinAttackChargingDL" Offset="0x13AB0"/>
         <Texture Name="gEffUnknown2Tex" OutName="eff_unknown_2" Format="i8" Width="32" Height="64" Offset="0x13BA0"/>
         <Texture Name="gEffUnknown3Tex" OutName="eff_unknown_3" Format="i8" Width="32" Height="64" Offset="0x143A0"/>
+        <Array Name="gUnusedBeamBladeVtx" Count="44" Offset="0x14BA0">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedBeamBladeDL" Offset="0x14E60"/>
         <Animation Name="gFairyAnim" Offset="0x15044"/>
         <Texture Name="gFairyWingTex" OutName="fairy_wing" Format="i8" Width="32" Height="64" Offset="0x15060"/>
+        <Array Name="gFairyWing1Vtx" Count="4" Offset="0x15860">
+            <Vtx/>
+        </Array>
         <DList Name="gFairyWing1DL" Offset="0x158A0"/>
+        <Array Name="gFairyWing2Vtx" Count="4" Offset="0x15928">
+            <Vtx/>
+        </Array>
         <DList Name="gFairyWing2DL" Offset="0x15968"/>
+        <Array Name="gFairyWing3Vtx" Count="4" Offset="0x159F0">
+            <Vtx/>
+        </Array>
         <DList Name="gFairyWing3DL" Offset="0x15A30"/>
+        <Array Name="gFairyWing4Vtx" Count="4" Offset="0x15AB8">
+            <Vtx/>
+        </Array>
         <DList Name="gFairyWing4DL" Offset="0x15AF8"/>
+        <Array Name="gGlowCircleVtx" Count="4" Offset="0x15B80">
+            <Vtx/>
+        </Array>
         <DList Name="gGlowCircleTextureLoadDL" Offset="0x15BC0"/>
         <DList Name="gGlowCircleDL" Offset="0x15C00"/>
         <DList Name="gGlowCircleSmallDL" Offset="0x15C20"/>
+        <Array Name="gGlowCircleSmallVtx" Count="8" Offset="0x15D88">
+            <Vtx/>
+        </Array>
         <Texture Name="gUnusedFairyWingTex" OutName="unused_fairy_wing" Format="rgba16" Width="32" Height="64" Offset="0x15E08"/>
+        <Limb Name="gameplay_keep_016E08_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E08" Offset="0x16E08"/>
+        <Limb Name="gameplay_keep_016E14_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E14" Offset="0x16E14"/>
+        <Limb Name="gameplay_keep_016E20_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E20" Offset="0x16E20"/>
+        <Limb Name="gameplay_keep_016E2C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E2C" Offset="0x16E2C"/>
+        <Limb Name="gameplay_keep_016E38_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E38" Offset="0x16E38"/>
+        <Limb Name="gameplay_keep_016E44_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E44" Offset="0x16E44"/>
+        <Limb Name="gameplay_keep_016E50_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E50" Offset="0x16E50"/>
+        <Limb Name="gameplay_keep_016E5C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E5C" Offset="0x16E5C"/>
+        <Limb Name="gameplay_keep_016E68_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E68" Offset="0x16E68"/>
+        <Limb Name="gameplay_keep_016E74_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E74" Offset="0x16E74"/>
+        <Limb Name="gameplay_keep_016E80_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E80" Offset="0x16E80"/>
+        <Limb Name="gameplay_keep_016E8C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E8C" Offset="0x16E8C"/>
+        <Limb Name="gameplay_keep_016E98_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E98" Offset="0x16E98"/>
+        <Limb Name="gameplay_keep_016EA4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016EA4" Offset="0x16EA4"/>
         <Skeleton Name="gFairySkel" Type="Normal" LimbType="Standard" Offset="0x16EE8"/>
         <Texture Name="gUnknownCircle3Tex" OutName="unknown_circle_3" Format="i4" Width="16" Height="16" Offset="0x16EF0"/>
         <Texture Name="gUnknownCircle4Tex" OutName="unknown_circle_4" Format="i8" Width="16" Height="16" Offset="0x16F70"/>
         <Texture Name="gHilite4Tex" OutName="hilite_4" Format="rgba16" Width="32" Height="32" Offset="0x17070"/>
         <Texture Name="gEffUnknown4Tex" OutName="eff_unknown_4" Format="i8" Width="32" Height="64" Offset="0x17870"/>
         <Texture Name="gEffUnknown5Tex" OutName="eff_unknown_5" Format="i8" Width="32" Height="64" Offset="0x18070"/>
+        <Array Name="gEffFireCircleVtx" Count="14" Offset="0x18870">
+            <Vtx/>
+        </Array>
         <DList Name="gEffFireCircleDL" Offset="0x18950"/>
         <Animation Name="gFishOutOfWaterAnim" Offset="0x18A9C"/>
+        <Array Name="gameplay_keep_Vtx_018AB0" Count="4" Offset="0x18AB0">
+            <Vtx/>
+        </Array>
+        <Array Name="gameplay_keep_Vtx_018AF0" Count="16" Offset="0x18AF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gameplay_keep_Vtx_018BF0" Count="22" Offset="0x18BF0">
+            <Vtx/>
+        </Array>
+        <DList Name="gameplay_keep_018D50_DL" Offset="0x18D50"/>
+        <DList Name="gameplay_keep_018DF0_DL" Offset="0x18DF0"/>
+        <DList Name="gameplay_keep_018F08_DL" Offset="0x18F08"/>
         <Texture Name="gFishTailTex" OutName="fish_tail" Format="rgba16" Width="16" Height="16" Offset="0x19020"/>
         <Texture Name="gFishBodyTex" OutName="fish_body" Format="rgba16" Width="32" Height="8" Offset="0x19220"/>
+        <Limb Name="gameplay_keep_019420_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_019420" Offset="0x19420"/>
+        <Limb Name="gameplay_keep_01942C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_01942C" Offset="0x1942C"/>
+        <Limb Name="gameplay_keep_019438_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_019438" Offset="0x19438"/>
+        <Limb Name="gameplay_keep_019444_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_019444" Offset="0x19444"/>
+        <Limb Name="gameplay_keep_019450_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_019450" Offset="0x19450"/>
+        <Limb Name="gameplay_keep_01945C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_01945C" Offset="0x1945C"/>
         <Skeleton Name="gFishSkel" Type="Flex" LimbType="Standard" Offset="0x19480"/>
         <Animation Name="gFishInWaterAnim" Offset="0x1953C"/>
         <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x19550"/>
@@ -713,6 +864,9 @@
             <Vtx/>
         </Array>
         <DList Name="gEffBubbleDL" Offset="0x1A600"/>
+        <Array Name="gEffBubbleVtx" Count="4" Offset="0x1A678">
+            <Vtx/>
+        </Array>
 
         <Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x1A6C0"/>
         <Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x1AAC0"/>
@@ -723,6 +877,9 @@
         <Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x1BEC0"/>
         <Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x1C2C0"/>
         <DList Name="gEffFireFootprintDL" Offset="0x1C6C0"/>
+        <Array Name="gEffFireFootprintVtx" Count="4" Offset="0x1C720">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffUnusedBubbles1Tex" OutName="eff_unused_bubbles_1" Format="ia8" Width="32" Height="32" Offset="0x1C760"/>
         <Texture Name="gEffUnusedBubbles2Tex" OutName="eff_unused_bubbles_2" Format="ia8" Width="32" Height="32" Offset="0x1CB60"/>
         <Texture Name="gEffUnusedBubbles3Tex" OutName="eff_unused_bubbles_3" Format="ia8" Width="32" Height="32" Offset="0x1CF60"/>
@@ -732,6 +889,9 @@
         <Texture Name="gEffUnusedBubbles7Tex" OutName="eff_unused_bubbles_7" Format="ia8" Width="32" Height="32" Offset="0x1DF60"/>
         <Texture Name="gEffUnusedBubbles8Tex" OutName="eff_unused_bubbles_8" Format="ia8" Width="32" Height="32" Offset="0x1E360"/>
         <DList Name="gEffUnusedBubblesDL" Offset="0x1E760"/>
+        <Array Name="gEffUnusedBubblesVtx" Count="4" Offset="0x1E7D0">
+            <Vtx/>
+        </Array>
         <Texture Name="gLensOfTruthMaskTex" OutName="lens_of_truth_mask" Format="i8" Width="64" Height="64" Offset="0x1E810"/>
         <Texture Name="gEffHitMark1Tex" OutName="eff_hit_mark_1" Format="i4" Width="32" Height="24" Offset="0x1F810"/>
         <Texture Name="gEffHitMark2Tex" OutName="eff_hit_mark_2" Format="i4" Width="32" Height="24" Offset="0x1F990"/>
@@ -758,6 +918,9 @@
         <Texture Name="gEffHitMark23Tex" OutName="eff_hit_mark_23" Format="i4" Width="32" Height="24" Offset="0x21910"/>
         <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x21A90"/>
         <DList Name="gEffHitMarkDL" Offset="0x21C10"/>
+        <Array Name="gEffHitMarkVtx" Count="4" Offset="0x21C68">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21CB0"/>
         <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i4" Width="64" Height="64" Offset="0x224B0"/>
         <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22CB0"/>
@@ -770,9 +933,18 @@
         <Texture Name="gEffMagmaBubble7Tex" OutName="eff_magma_bubbles_7" Format="ia8" Width="16" Height="24" Offset="0x245B0"/>
         <Texture Name="gEffMagmaBubble8Tex" OutName="eff_magma_bubbles_8" Format="ia8" Width="16" Height="24" Offset="0x24730"/>
         <DList Name="gEffMagmaBubbleDL" Offset="0x248B0"/>
+        <Array Name="gEffMagmaBubbleVtx" Count="4" Offset="0x24910">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffWaterRippleTex" OutName="eff_ss_g_ripple" Format="i8" Width="64" Height="64" Offset="0x24950"/>
         <DList Name="gEffWaterRippleDL" Offset="0x25950"/>
+        <Array Name="gEffWaterRippleVtx" Count="4" Offset="0x259B0">
+            <Vtx/>
+        </Array>
         <DList Name="gEffSparkDL" Offset="0x259F0"/>
+        <Array Name="gEffSparkVtx" Count="4" Offset="0x25A50">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffWaterSplash1Tex" OutName="eff_water_splash_1" Format="i8" Width="32" Height="40" Offset="0x25A90"/>
         <Texture Name="gEffWaterSplash2Tex" OutName="eff_water_splash_2" Format="i8" Width="32" Height="40" Offset="0x25F90"/>
         <Texture Name="gEffWaterSplash3Tex" OutName="eff_water_splash_3" Format="i8" Width="32" Height="40" Offset="0x26490"/>
@@ -782,6 +954,9 @@
         <Texture Name="gEffWaterSplash7Tex" OutName="eff_water_splash_7" Format="i8" Width="32" Height="40" Offset="0x27890"/>
         <Texture Name="gEffWaterSplash8Tex" OutName="eff_water_splash_8" Format="i8" Width="32" Height="40" Offset="0x27D90"/>
         <DList Name="gEffWaterSplashDL" Offset="0x28290"/>
+        <Array Name="gEffWaterSplashVtx" Count="4" Offset="0x282F0">
+            <Vtx/>
+        </Array>
         <Texture Name="gUnknownEffStone1Tex" OutName="unknown_eff_stone_1" Format="ia8" Width="32" Height="32" Offset="0x28330"/>
         <Texture Name="gUnknownEffStone2Tex" OutName="unknown_eff_stone_2" Format="ia8" Width="32" Height="32" Offset="0x28730"/>
         <Texture Name="gUnknownEffStone3Tex" OutName="unknown_eff_stone_3" Format="ia8" Width="32" Height="32" Offset="0x28B30"/>
@@ -791,6 +966,9 @@
         <Texture Name="gUnknownEffStone7Tex" OutName="unknown_eff_stone_7" Format="ia8" Width="32" Height="32" Offset="0x29B30"/>
         <Texture Name="gUnknownEffStone8Tex" OutName="unknown_eff_stone_8" Format="ia8" Width="32" Height="32" Offset="0x29F30"/>
         <DList Name="gUnknownEffStoneDL" Offset="0x2A330"/>
+        <Array Name="gUnknownEffStoneVtx" Count="4" Offset="0x2A390">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffLightning1Tex" OutName="eff_lightning_1" Format="i8" Width="16" Height="96" Offset="0x2A3D0"/>
         <Texture Name="gEffLightning2Tex" OutName="eff_lightning_2" Format="i8" Width="16" Height="96" Offset="0x2A9D0"/>
         <Texture Name="gEffLightning3Tex" OutName="eff_lightning_3" Format="i8" Width="16" Height="96" Offset="0x2AFD0"/>
@@ -800,6 +978,9 @@
         <Texture Name="gEffLightning7Tex" OutName="eff_lightning_7" Format="i8" Width="16" Height="96" Offset="0x2C7D0"/>
         <Texture Name="gEffLightning8Tex" OutName="eff_lightning_8" Format="i8" Width="16" Height="96" Offset="0x2CDD0"/>
         <DList Name="gEffLightningDL" Offset="0x2D3D0"/>
+        <Array Name="gEffLightningVtx" Count="4" Offset="0x2D438">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffEnemyDeathFlame1Tex" OutName="eff_enemy_death_flame_1" Format="i8" Width="32" Height="64" Offset="0x2D480"/>
         <Texture Name="gEffEnemyDeathFlame2Tex" OutName="eff_enemy_death_flame_2" Format="i8" Width="32" Height="64" Offset="0x2DC80"/>
         <Texture Name="gEffEnemyDeathFlame3Tex" OutName="eff_enemy_death_flame_3" Format="i8" Width="32" Height="64" Offset="0x2E480"/>
@@ -811,46 +992,111 @@
         <Texture Name="gEffEnemyDeathFlame9Tex" OutName="eff_enemy_death_flame_9" Format="i8" Width="32" Height="64" Offset="0x31480"/>
         <Texture Name="gEffEnemyDeathFlame10Tex" OutName="eff_enemy_death_flame_10" Format="i8" Width="32" Height="64" Offset="0x31C80"/>
         <DList Name="gEffEnemyDeathFlameDL" Offset="0x32480"/>
+        <Array Name="gEffEnemyDeathFlameVtx" Count="4" Offset="0x324E8">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffUnknown9Tex" OutName="eff_unknown_9" Format="i8" Width="32" Height="32" Offset="0x32530"/>
         <Texture Name="gEffUnknown10Tex" OutName="eff_unknown_10" Format="i8" Width="32" Height="32" Offset="0x32930"/>
         <Texture Name="gEffUnknown11Tex" OutName="eff_unknown_11" Format="i8" Width="32" Height="32" Offset="0x32D30"/>
         <Texture Name="gEffUnknown12Tex" OutName="eff_unknown_12" Format="i8" Width="32" Height="32" Offset="0x33130"/>
         <Texture Name="gUnknownWoodBoardTex" OutName="unknown_wood_board" Format="i8" Width="32" Height="32" Offset="0x33530"/>
+        <Array Name="gEffIceFragmentVtx" Count="41" Offset="0x33930">
+            <Vtx/>
+        </Array>
         <DList Name="gEffIceFragment1DL" Offset="0x33BC0"/>
         <DList Name="gEffIceFragment2DL" Offset="0x33CB8"/>
+        <Array Name="gEffIceFragment3Vtx" Count="93" Offset="0x33DB0">
+            <Vtx/>
+        </Array>
         <DList Name="gEffIceFragment3DL" Offset="0x34380"/>
         <Animation Name="gBugCrawlAnim" Offset="0x3469C"/>
         <DList Name="gBugLimb1DL" Offset="0x346B0"/>
         <DList Name="gBugLimb1WrapperDL" Offset="0x34750"/>
         <DList Name="gBugLimb1WrapperWrapperDL" Offset="0x34760"/>
+        <Array Name="gBugLimb1Vtx" Count="3" Offset="0x34770">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb2DL" Offset="0x347A0"/>
         <DList Name="gBugLimb2WrapperDL" Offset="0x34840"/>
         <DList Name="gBugLimb2WrapperWrapperDL" Offset="0x34850"/>
+        <Array Name="gBugLimb2Vtx" Count="3" Offset="0x34860">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb3DL" Offset="0x34890"/>
         <DList Name="gBugLimb3WrapperDL" Offset="0x34930"/>
         <DList Name="gBugLimb3WrapperWrapperDL" Offset="0x34940"/>
+        <Array Name="gBugLimb3Vtx" Count="3" Offset="0x34950">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb4DL" Offset="0x34980"/>
         <DList Name="gBugLimb4WrapperDL" Offset="0x34A20"/>
         <DList Name="gBugLimb4WrapperWrapperDL" Offset="0x34A30"/>
+        <Array Name="gBugLimb4Vtx" Count="3" Offset="0x34A40">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb5DL" Offset="0x34A70"/>
         <DList Name="gBugLimb5WrapperDL" Offset="0x34B10"/>
         <DList Name="gBugLimb5WrapperWrapperDL" Offset="0x34B20"/>
+        <Array Name="gBugLimb5Vtx" Count="3" Offset="0x34B30">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb6DL" Offset="0x34B60"/>
         <DList Name="gBugLimb6WrapperDL" Offset="0x34C00"/>
         <DList Name="gBugLimb6WrapperWrapperDL" Offset="0x34C10"/>
+        <Array Name="gBugLimb6Vtx" Count="3" Offset="0x34C20">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb7DL" Offset="0x34C50"/>
         <DList Name="gBugLimb7WrapperDL" Offset="0x34CF0"/>
         <DList Name="gBugLimb7WrapperWrapperDL" Offset="0x34D00"/>
+        <Array Name="gBugLimb7Vtx" Count="3" Offset="0x34D10">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb8DL" Offset="0x34D40"/>
         <DList Name="gBugLimb8WrapperDL" Offset="0x34DE0"/>
         <DList Name="gBugLimb8WrapperWrapperDL" Offset="0x34DF0"/>
+        <Array Name="gBugLimb8Vtx" Count="3" Offset="0x34E00">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb9DL" Offset="0x34E30"/>
         <DList Name="gBugLimb9WrapperDL" Offset="0x34EE0"/>
         <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34EF0"/>
+        <Array Name="gBugLimb9Vtx" Count="12" Offset="0x34F00">
+            <Vtx/>
+        </Array>
         <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34FC0"/>
         <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="8" Height="16" Offset="0x357C0"/>
+        <Limb Name="gameplay_keep_0358C0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0358C0" Offset="0x358C0"/>
+        <Limb Name="gameplay_keep_0358CC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0358CC" Offset="0x358CC"/>
+        <Limb Name="gameplay_keep_0358D8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0358D8" Offset="0x358D8"/>
+        <Limb Name="gameplay_keep_0358E4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0358E4" Offset="0x358E4"/>
+        <Limb Name="gameplay_keep_0358F0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0358F0" Offset="0x358F0"/>
+        <Limb Name="gameplay_keep_0358FC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0358FC" Offset="0x358FC"/>
+        <Limb Name="gameplay_keep_035908_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035908" Offset="0x35908"/>
+        <Limb Name="gameplay_keep_035914_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035914" Offset="0x35914"/>
+        <Limb Name="gameplay_keep_035920_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035920" Offset="0x35920"/>
+        <Limb Name="gameplay_keep_03592C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03592C" Offset="0x3592C"/>
+        <Limb Name="gameplay_keep_035938_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035938" Offset="0x35938"/>
+        <Limb Name="gameplay_keep_035944_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035944" Offset="0x35944"/>
+        <Limb Name="gameplay_keep_035950_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035950" Offset="0x35950"/>
+        <Limb Name="gameplay_keep_03595C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03595C" Offset="0x3595C"/>
+        <Limb Name="gameplay_keep_035968_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035968" Offset="0x35968"/>
+        <Limb Name="gameplay_keep_035974_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035974" Offset="0x35974"/>
+        <Limb Name="gameplay_keep_035980_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035980" Offset="0x35980"/>
+        <Limb Name="gameplay_keep_03598C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03598C" Offset="0x3598C"/>
+        <Limb Name="gameplay_keep_035998_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035998" Offset="0x35998"/>
+        <Limb Name="gameplay_keep_0359A4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0359A4" Offset="0x359A4"/>
+        <Limb Name="gameplay_keep_0359B0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0359B0" Offset="0x359B0"/>
+        <Limb Name="gameplay_keep_0359BC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0359BC" Offset="0x359BC"/>
+        <Limb Name="gameplay_keep_0359C8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0359C8" Offset="0x359C8"/>
         <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35A30"/>
+        <Array Name="gCuttableShrubStalkVtx" Count="4" Offset="0x35A40">
+            <Vtx/>
+        </Array>
         <DList Name="gCuttableShrubStalkDL" Offset="0x35A80"/>
+        <Array Name="gCuttableShrubTipVtx" Count="3" Offset="0x35B10">
+            <Vtx/>
+        </Array>
         <DList Name="gCuttableShrubTipDL" Offset="0x35B40"/>
         <Texture Name="gCuttableShrubLeafTFragmentTex" OutName="cuttable_shrub_leaf_fragment" Format="rgba16" Width="32" Height="32" Offset="0x35BD0"/>
         <Texture Name="gCuttableShrubTex" OutName="cuttanble_shrub" Format="rgba16" Width="32" Height="32" Offset="0x363D0"/>
@@ -858,47 +1104,119 @@
         <Texture Name="gLensFlareRingTex" OutName="lens_flare_ring" Format="i4" Width="64" Height="64" Offset="0x373D0"/>
         <DList Name="gLensFlareCircleDL" Offset="0x37BD0"/>
         <DList Name="gLensFlareRingDL" Offset="0x37C38"/>
+        <Array Name="gLensFlareVtx" Count="4" Offset="0x37CA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gEffSparklesVtx" Count="4" Offset="0x37CE0">
+            <Vtx/>
+        </Array>
         <DList Name="gEffSparklesDL" Offset="0x37D20"/>
         <Texture Name="gEffSparklesTex" OutName="eff_sparkles" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
         <Texture Name="gEffUnknown13Tex" OutName="eff_unknown_tex_13" Format="i8" Width="16" Height="32" Offset="0x37E00"/>
         <Texture Name="gEffUnknown14Tex" OutName="eff_unknown_tex_14" Format="i8" Width="16" Height="32" Offset="0x38000"/>
+        <Array Name="gHoverBootsCircleVtx" Count="13" Offset="0x38200">
+            <Vtx/>
+        </Array>
         <DList Name="gHoverBootsCircleDL" Offset="0x382D0"/>
         <Texture Name="gMoonTex" OutName="moon" Format="ia8" Width="64" Height="64" Offset="0x383A0"/>
         <DList Name="gMoonDL" Offset="0x393A0"/>
+        <Array Name="gMoonVtx" Count="4" Offset="0x39410">
+            <Vtx/>
+        </Array>
         <Texture Name="gUnknownCircle6Tex" OutName="unknown_circle_6" Format="i8" Width="32" Height="32" Offset="0x39450"/>
 
+        <Array Name="gameplay_keep_Vtx_039850" Count="4" Offset="0x39850">
+            <Vtx/>
+        </Array>
         <DList Name="gGameplayKeepDL_39890" Offset="0x39890"/>
+        <Array Name="gameplay_keep_Vtx_039970" Count="4" Offset="0x39970">
+            <Vtx/>
+        </Array>
         <DList Name="gGameplayKeepDL_399B0" Offset="0x399B0"/>
+        <Array Name="gameplay_keep_Vtx_039A40" Count="4" Offset="0x39A40">
+            <Vtx/>
+        </Array>
         <DList Name="gGameplayKeepDL_39A80" Offset="0x39A80"/>
+        <Array Name="gameplay_keep_Vtx_039B10" Count="4" Offset="0x39B10">
+            <Vtx/>
+        </Array>
         <DList Name="gGameplayKeepDL_39B50" Offset="0x39B50"/>
 
         <Collision Name="gLargerCubeCol" Offset="0x39CE0"/> <!-- unused in game -->
+        <Array Name="gLiftableRockVtx" Count="24" Offset="0x39D10">
+            <Vtx/>
+        </Array>
         <DList Name="gLiftableRockDL" Offset="0x39E90"/>
 
         <!-- unused in game -->
+        <Array Name="gUnusedRockRectangularPrism1Vtx" Count="24" Offset="0x39F40">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedRockRectangularPrism1DL" Offset="0x3A0C0"/>
         <Collision Name="gWideTallBlockCol" Offset="0x3A278"/>
+        <Array Name="gFlatBlockVtx" Count="24" Offset="0x3A2B0">
+            <Vtx/>
+        </Array>
         <DList Name="gFlatBlockDL" Offset="0x3A430"/>
         <Collision Name="gTallBlockCol" Offset="0x3A5F0"/>
+        <Array Name="gUnusedRockRectangularPrism3Vtx" Count="24" Offset="0x3A620">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedRockRectangularPrism3DL" Offset="0x3A7A0"/>
         <Collision Name="gSmallerFlatBlockCol" Offset="0x3A950"/>
+        <Array Name="gFlatRotBlockVtx" Count="24" Offset="0x3A980">
+            <Vtx/>
+        </Array>
         <DList Name="gFlatRotBlockDL" Offset="0x3AB00"/>
         <Collision Name="gLargerFlatBlockCol" Offset="0x3ACB0"/>
+        <Array Name="gSmallCubeVtx" Count="24" Offset="0x3ACE0">
+            <Vtx/>
+        </Array>
         <DList Name="gSmallCubeDL" Offset="0x3AE60"/>
         <Collision Name="gSmallerCubeCol" Offset="0x3B020"/>
+        <Array Name="gTreeStumpVtx" Count="25" Offset="0x3B050">
+            <Vtx/>
+        </Array>
         <DList Name="gTreeStumpDL" Offset="0x3B1E0"/>
+        <Array Name="gGrassBladesVtx" Count="12" Offset="0x3B2F0">
+            <Vtx/>
+        </Array>
         <DList Name="gGrassBladesDL" Offset="0x3B3B0"/>
 
         <Texture Name="gHeartShapeTex" OutName="heart_shape" Format="i8" Width="16" Height="16" Offset="0x3B460"/>
+        <Array Name="gHeartPieceInteriorVtx" Count="48" Offset="0x3B560">
+            <Vtx/>
+        </Array>
         <DList Name="gHeartPieceInteriorDL" Offset="0x3B860"/>
+        <Array Name="gHeartPieceExteriorVtx" Count="80" Offset="0x3BA10">
+            <Vtx/>
+        </Array>
+        <Array Name="gHeartContainerInteriorVtx" Count="76" Offset="0x3BF10">
+            <Vtx/>
+        </Array>
         <DList Name="gHeartPieceExteriorDL" Offset="0x3C3D0"/>
         <DList Name="gHeartContainerInteriorDL" Offset="0x3C508"/>
 
+        <Array Name="gameplay_keep_Vtx_03C610" Count="80" Offset="0x3C610">
+            <Vtx/>
+        </Array>
+        <Array Name="gameplay_keep_Vtx_03CB10" Count="76" Offset="0x3CB10">
+            <Vtx/>
+        </Array>
         <DList Name="gGameplayKeepDL_3CFD0" Offset="0x3CFD0"/>
         <DList Name="gGameplayKeepDL_3D108" Offset="0x3D108"/>
+        <Array Name="gameplay_keep_Vtx_03D220" Count="4" Offset="0x3D220">
+            <Vtx/>
+        </Array>
         <DList Name="gGameplayKeepDL_3D260" Offset="0x3D260"/>
 
+        <Array Name="gSignRectangularVtx" Count="39" Offset="0x3D2F0">
+            <Vtx/>
+        </Array>
         <DList Name="gSignRectangularDL" Offset="0x3D560"/>
+        <Array Name="gSignDirectionalVtx" Count="45" Offset="0x3D7F0">
+            <Vtx/>
+        </Array>
         <DList Name="gSignDirectionalDL" Offset="0x3DAC0"/>
         <Texture Name="gDropArrows2Tex" OutName="drop_arrows_2" Format="rgba16" Width="32" Height="32" Offset="0x3DD80"/>
         <Texture Name="gDropArrows1Tex" OutName="drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x3E580"/>
@@ -913,6 +1231,9 @@
         <Texture Name="gGameplayKeepTex_41580" OutName="gameplay_keep_tex_41580" Format="rgba16" Width="32" Height="32" Offset="0x41580"/>
 
         <DList Name="gItemDropDL" Offset="0x41D80"/>
+        <Array Name="gItemDropVtx" Count="4" Offset="0x41E08">
+            <Vtx/>
+        </Array>
         <Texture Name="gDropKeySmallTex" OutName="drop_key_small" Format="rgba16" Width="32" Height="32" Offset="0x41E50"/>
         <Texture Name="gDropMagicSmallTex" OutName="drop_magic_small" Format="rgba16" Width="32" Height="32" Offset="0x42650"/>
         <Texture Name="gDropDekuNutTex" OutName="drop_deku_nut" Format="rgba16" Width="32" Height="32" Offset="0x42E50"/>
@@ -925,6 +1246,9 @@
         <Texture Name="gRupeeOrangeTex" OutName="rupee_orange" Format="rgba16" Width="4" Height="4" Offset="0x44EB0"/>
         <Texture Name="gRupeePinkTex" OutName="rupee_pink" Format="rgba16" Width="4" Height="4" Offset="0x44ED0"/>
         <Texture Name="gRupeeSilverTex" OutName="rupee_silver" Format="rgba16" Width="4" Height="4" Offset="0x44EF0"/>
+        <Array Name="gRupeeVtx" Count="36" Offset="0x44F10">
+            <Vtx/>
+        </Array>
         <DList Name="gRupeeDL" Offset="0x45150"/>
 
         <Texture Name="gGameplayKeepTex_45220" OutName="gameplay_keep_tex_45220" Format="rgba16" Width="32" Height="32" Offset="0x45220"/>
@@ -948,15 +1272,33 @@
         <Texture Name="gSignRectangularFrontTex" OutName="sign_rectangular_front" Format="rgba16" Width="32" Height="16" Offset="0x4BE60"/>
         <Texture Name="gSignPostWoodTex" OutName="sign_post_wood" Format="rgba16" Width="64" Height="8" Offset="0x4C260"/>
         <Texture Name="gSignLetteringTex" OutName="sign_lettering" Format="rgba16" Width="64" Height="32" Offset="0x4C660"/>
+        <Array Name="gRaindropVtx" Count="3" Offset="0x4D660">
+            <Vtx/>
+        </Array>
         <DList Name="gRaindropDL" Offset="0x4D690"/>
         <DList Name="gFootShadowDL" Offset="0x4D6B0"/>
+        <Array Name="gFootShadowVtx" Count="3" Offset="0x4D710">
+            <Vtx/>
+        </Array>
         <Texture Name="gFootShadowTex" OutName="footprint_shadow" Format="ia16" Width="32" Height="64" Offset="0x4D740"/>
         <DList Name="gCircleShadowDL" Offset="0x4E740"/>
+        <Array Name="gCircleShadowVtx" Count="3" Offset="0x4E790">
+            <Vtx/>
+        </Array>
         <Texture Name="gCircleShadowTex" OutName="circular_shadow" Format="ia16" Width="32" Height="32" Offset="0x4E7C0"/>
+        <Array Name="gHorseShadowVtx" Count="4" Offset="0x4EFC0">
+            <Vtx/>
+        </Array>
         <DList Name="gHorseShadowDL" Offset="0x4F000"/>
         <Texture Name="gHorseShadowTex" OutName="horse_shadow" Format="i8" Width="16" Height="64" Offset="0x4F050"/>
+        <Array Name="gDungeonDoorVtx" Count="12" Offset="0x4F450">
+            <Vtx/>
+        </Array>
         <DList Name="gDungeonDoorDL" Offset="0x4F510"/>
         <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4F5C0"/>
+        <Array Name="gDoorMetalBarsVtx" Count="4" Offset="0x505C0">
+            <Vtx/>
+        </Array>
         <DList Name="gDoorMetalBarsDL" Offset="0x50600"/>
         <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x50690"/>
         <Texture Name="gSun1Tex" OutName="sun_1" Format="i4" Width="64" Height="31" Offset="0x51690"/>
@@ -968,15 +1310,36 @@
         <DList Name="gKokiriDustMoteMaterialDL" Offset="0x52690"/>
         <DList Name="gKokiriDustMoteModelDL" Offset="0x526D8"/>
         <DList Name="gSunDL" Offset="0x526F0"/>
+        <Array Name="gSunVtx" Count="12" Offset="0x52878">
+            <Vtx/>
+        </Array>
+        <Array Name="gKokiriDustMoteModelVtx" Count="4" Offset="0x52938">
+            <Vtx/>
+        </Array>
         <DList Name="gLockOnReticleTriangleDL" Offset="0x52980"/>
+        <Array Name="gLockOnReticleTriangleVtx" Count="3" Offset="0x52998">
+            <Vtx/>
+        </Array>
+        <Array Name="gEffFireVtx" Count="4" Offset="0x529D0">
+            <Vtx/>
+        </Array>
         <DList Name="gEffFire1DL" Offset="0x52A10"/>
         <DList Name="gEffFire2DL" Offset="0x52AD0"/>
         <Texture Name="gDecorativeFlameMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x52B90"/>
         <Texture Name="gDecorativeFlameTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x53390"/>
+        <Array Name="gUnusedUnknownShape1Vtx" Count="197" Offset="0x53B90">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedUnknownShape1DL" Offset="0x547E0"/>
         <DList Name="gUnusedUnknownShape1RefDL" Offset="0x54B60"/>
+        <Array Name="gUnusedUnknownShape2Vtx" Count="202" Offset="0x54B70">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedUnknownShape2DL" Offset="0x55810"/>
         <DList Name="gUnusedUnknownShape2RefDL" Offset="0x55B30"/>
+        <Array Name="gUnusedUnknownShape3Vtx" Count="199" Offset="0x55B40">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedUnknownShape3DL" Offset="0x567B0"/>
         <DList Name="gUnusedUnknownShape3RefDL" Offset="0x56AC8"/>
         <Texture Name="gUnusedUpsideDownZeldaTex" OutName="upside_down_zelda" Format="i8" Width="64" Height="32" Offset="0x56AE0"/>
diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml
index 90bf296c85..2c5f147386 100644
--- a/assets/xml/objects/gameplay_keep_pal.xml
+++ b/assets/xml/objects/gameplay_keep_pal.xml
@@ -603,29 +603,63 @@
 
         <!-- Probably a file boundary here. -->
 
+        <Array Name="gDebugPyramidVtx" Count="12" Offset="0x3500">
+            <Vtx/>
+        </Array>
         <DList Name="gDebugPyramidDL" Offset="0x35C0"/>
         <Texture Name="gDebugCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x35F0"/>
         <Texture Name="gDebugBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x36F0"/>
         <Texture Name="gDebugCursorTex" OutName="debug_cursor" Format="i8" Width="16" Height="16" Offset="0x37F0"/>
         <Texture Name="gDebugCrossTex" OutName="debug_cross" Format="i8" Width="16" Height="16" Offset="0x38F0"/>
         <DList Name="gDebugArrowDL" Offset="0x39F0"/>
+        <Array Name="gDebugArrowVtx" Count="36" Offset="0x3A50">
+            <Vtx/>
+        </Array>
         <DList Name="gDebugCameraDL" Offset="0x3C90"/>
+        <Array Name="gDebugCameraVtx" Count="40" Offset="0x3D08">
+            <Vtx/>
+        </Array>
+        <Array Name="gDebugCheckeredFloorVtx" Count="4" Offset="0x3F88">
+            <Vtx/>
+        </Array>
         <DList Name="gDebugCheckeredFloorDL" Offset="0x3FC8"/>
         <Texture Name="gDebugCheckeredFloorTex" OutName="debug_checkered_floor" Format="ia4" Width="32" Height="32" Offset="0x4058"/>
+        <Array Name="gDebugSpriteVtx" Count="4" Offset="0x4258">
+            <Vtx/>
+        </Array>
         <DList Name="gDebugSpriteDL" Offset="0x4298"/>
         <Animation Name="gArrow1Anim" Offset="0x4310"/>
         <Animation Name="gArrow2Anim" Offset="0x436C"/>
         <Texture Name="gArrowShaftTex" OutName="arrow_shaft" Format="rgba16" Width="16" Height="128" Offset="0x4380"/>
         <Texture Name="gArrowFletchingTex" OutName="arrow_fletching" Format="rgba16" Width="32" Height="16" Offset="0x5380"/>
+        <Array Name="gArrowNearVtx" Count="50" Offset="0x5780">
+            <Vtx/>
+        </Array>
         <DList Name="gArrowNearDL" Offset="0x5AA0"/>
+        <Array Name="gArrowFarVtx" Count="26" Offset="0x5C80">
+            <Vtx/>
+        </Array>
         <DList Name="gArrowFarDL" Offset="0x5E20"/>
+        <Limb Name="gameplay_keep_005FC0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FC0" Offset="0x5FC0"/>
+        <Limb Name="gameplay_keep_005FD0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FD0" Offset="0x5FD0"/>
+        <Limb Name="gameplay_keep_005FE0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FE0" Offset="0x5FE0"/>
+        <Limb Name="gameplay_keep_005FF0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FF0" Offset="0x5FF0"/>
         <Skeleton Name="gArrowSkel" Type="Normal" LimbType="LOD" Offset="0x6010"/> <!-- fix pointer for this! -->
         <Texture Name="gUnknownEffBlureTex" OutName="unknown_eff_blure" Format="i8" Width="64" Height="32" Offset="0x6020"/>
         <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x6820"/>
+        <Array Name="gBombBodyVtx" Count="4" Offset="0x7820">
+            <Vtx/>
+        </Array>
         <DList Name="gBombBodyDL" Offset="0x7860"/>
         <Texture Name="gBombCapTex" OutName="bomb_cap" Format="rgba16" Width="8" Height="8" Offset="0x78F0"/>
+        <Array Name="gBombCapVtx" Count="14" Offset="0x7970">
+            <Vtx/>
+        </Array>
         <DList Name="gBombCapDL" Offset="0x7A50"/>
         <Texture Name="gBombchuBodyTex" OutName="bombchu_body" Format="rgba16" Width="8" Height="8" Offset="0x7B10"/>
+        <Array Name="gBombchuVtx" Count="40" Offset="0x7B90">
+            <Vtx/>
+        </Array>
         <DList Name="gBombchuDL" Offset="0x7E10"/>
         <Texture Name="gEffBombExplosion1Tex" OutName="eff_bomb_explosion_1" Format="ia16" Width="32" Height="32" Offset="0x7F80"/>
         <Texture Name="gEffBombExplosion2Tex" OutName="eff_bomb_explosion_2" Format="ia16" Width="32" Height="32" Offset="0x8780"/>
@@ -638,67 +672,181 @@
         <DList Name="gEffBombExplosion1DL" Offset="0xBF80"/>
         <DList Name="gEffBombExplosion2DL" Offset="0xBFE8"/>
         <DList Name="gEffBombExplosion3DL" Offset="0xC040"/>
+        <Array Name="gEffBombExplosionVtx" Count="4" Offset="0xC058">
+            <Vtx/>
+        </Array>
+        <Array Name="gEffFragments1Vtx" Count="3" Offset="0xC0A0">
+            <Vtx/>
+        </Array>
         <DList Name="gEffFragments1DL" Offset="0xC0D0"/>
         <Texture Name="gWitheredLeafTex" OutName="withered_leaf" Format="rgba16" Width="16" Height="16" Offset="0xC160"/>
+        <Array Name="gBoomerangVtx" Count="51" Offset="0xC360">
+            <Vtx/>
+        </Array>
         <DList Name="gUnknownBlankDL" Offset="0xC690"/>
         <DList Name="gBoomerangDL" Offset="0xC698"/>
         <DList Name="gBoomerangRefDL" Offset="0xC808"/>
         <DList Name="gCompassArrowDL" Offset="0xC820"/>
+        <Array Name="gCompassArrowVtx" Count="3" Offset="0xC848">
+            <Vtx/>
+        </Array>
+        <Array Name="gLockOnArrowVtx" Count="47" Offset="0xC880">
+            <Vtx/>
+        </Array>
         <DList Name="gLockOnArrowDL" Offset="0xCB70"/>
         <Texture Name="gHilite3Tex" OutName="hilite_3" Format="i8" Width="8" Height="8" Offset="0xCC80"/>
+        <Array Name="gEffFragments2Vtx" Count="12" Offset="0xCCC0">
+            <Vtx/>
+        </Array>
         <DList Name="gEffFragments2DL" Offset="0xCD80"/>
         <Texture Name="gSelectionCursorTex" OutName="selection_cursor" Format="ia4" Width="16" Height="16" Offset="0xCDC0"/>
         <Texture Name="gControlStickTex" OutName="control_stick" Format="ia8" Width="16" Height="16" Offset="0xCE40"/>
         <Texture Name="gArrowCursorTex" OutName="arrow_cursor" Format="ia8" Width="16" Height="24" Offset="0xCF40"/>
+        <Array Name="gUnusedRockFragmentVtx" Count="24" Offset="0xD0C0">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedRockFragmentDL" Offset="0xD240"/>
         <DList Name="gBoulderFragmentsDL" Offset="0xD340"/>
+        <Array Name="gBoulderFragmentsVtx" Count="12" Offset="0xD418">
+            <Vtx/>
+        </Array>
         <Texture Name="gRockFragment1Tex" OutName="rock_fragment_1" Format="rgba16" Width="32" Height="32" Offset="0xD4E0"/>
         <Texture Name="gRockFragment2Tex" OutName="rock_fragment_2" Format="rgba16" Width="32" Height="32" Offset="0xDCE0"/>
         <Animation Name="gDoorChildOpeningLeftAnim" Offset="0xE5B4"/>
         <Animation Name="gDoorChildOpeningRightAnim" Offset="0xE6A0"/>
         <Animation Name="gDoorAdultOpeningLeftAnim" Offset="0xE758"/>
+        <Array Name="gDoorLeftVtx" Count="34" Offset="0xE770">
+            <Vtx/>
+        </Array>
+        <Array Name="gDoorRightVtx" Count="34" Offset="0xE990">
+            <Vtx/>
+        </Array>
+        <Array Name="gDoorFrameVtx" Count="8" Offset="0xEBB0">
+            <Vtx/>
+        </Array>
         <DList Name="gDoorFrameDL" Offset="0xEC30"/>
         <DList Name="gDoorLeftDL" Offset="0xECB8"/>
         <DList Name="gDoorRightDL" Offset="0xEE00"/>
         <Texture Name="gWoodenDoorTex" OutName="wooden_door" Format="rgba16" Width="32" Height="64" Offset="0xEF38"/>
+        <Limb Name="gameplay_keep_00FF38_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_00FF38" Offset="0xFF38"/>
+        <Limb Name="gameplay_keep_00FF44_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_00FF44" Offset="0xFF44"/>
+        <Limb Name="gameplay_keep_00FF50_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_00FF50" Offset="0xFF50"/>
+        <Limb Name="gameplay_keep_00FF5C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_00FF5C" Offset="0xFF5C"/>
         <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0xFF78"/>
         <Animation Name="gDoorAdultOpeningRightAnim" Offset="0x10038"/>
         <DList Name="gEffDustDL" Offset="0x10050"/>
+        <Array Name="gEffDustVtx" Count="4" Offset="0x100A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gEffFlashVtx" Count="4" Offset="0x100F0">
+            <Vtx/>
+        </Array>
         <DList Name="gEffFlash1DL" Offset="0x10130"/>
         <DList Name="gEffFlash2DL" Offset="0x101A8"/>
         <Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x10228"/>
         <Texture Name="gTorchFlameTex" OutName="torch_flame" Format="i8" Width="64" Height="32" Offset="0x11230"/>
         <Texture Name="gEffUnknown1Tex" OutName="eff_unknown_1" Format="i8" Width="64" Height="32" Offset="0x11A30"/>
+        <Array Name="gSpinAttack1Vtx" Count="26" Offset="0x12230">
+            <Vtx/>
+        </Array>
+        <Array Name="gSpinAttack2Vtx" Count="26" Offset="0x123D0">
+            <Vtx/>
+        </Array>
         <DList Name="gSpinAttack1DL" Offset="0x12570"/>
         <DList Name="gSpinAttack2DL" Offset="0x12690"/>
+        <Array Name="gSpinAttack3Vtx" Count="26" Offset="0x127B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gSpinAttack4Vtx" Count="26" Offset="0x12950">
+            <Vtx/>
+        </Array>
         <DList Name="gSpinAttack3DL" Offset="0x12AF0"/>
         <DList Name="gSpinAttack4DL" Offset="0x12C10"/>
         <Texture Name="gFlameWall1Tex" OutName="flame_wall_1" Format="i8" Width="32" Height="32" Offset="0x12D30"/>
         <Texture Name="gFlameWall2Tex" OutName="flame_wall_2" Format="i8" Width="32" Height="32" Offset="0x13130"/>
+        <Array Name="gSpinAttackChargingVtx" Count="14" Offset="0x13530">
+            <Vtx/>
+        </Array>
         <DList Name="gSpinAttackChargingDL" Offset="0x13610"/>
         <Texture Name="gEffUnknown2Tex" OutName="eff_unknown_2" Format="i8" Width="32" Height="64" Offset="0x13700"/>
         <Texture Name="gEffUnknown3Tex" OutName="eff_unknown_3" Format="i8" Width="32" Height="64" Offset="0x13F00"/>
+        <Array Name="gUnusedBeamBladeVtx" Count="44" Offset="0x14700">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedBeamBladeDL" Offset="0x149C0"/>
         <Animation Name="gFairyAnim" Offset="0x14BA4"/>
         <Texture Name="gFairyWingTex" OutName="fairy_wing" Format="i8" Width="32" Height="64" Offset="0x14BC0"/>
+        <Array Name="gFairyWing1Vtx" Count="4" Offset="0x153C0">
+            <Vtx/>
+        </Array>
         <DList Name="gFairyWing1DL" Offset="0x15400"/>
+        <Array Name="gFairyWing2Vtx" Count="4" Offset="0x15488">
+            <Vtx/>
+        </Array>
         <DList Name="gFairyWing2DL" Offset="0x154C8"/>
+        <Array Name="gFairyWing3Vtx" Count="4" Offset="0x15550">
+            <Vtx/>
+        </Array>
         <DList Name="gFairyWing3DL" Offset="0x15590"/>
+        <Array Name="gFairyWing4Vtx" Count="4" Offset="0x15618">
+            <Vtx/>
+        </Array>
         <DList Name="gFairyWing4DL" Offset="0x15658"/>
+        <Array Name="gGlowCircleVtx" Count="4" Offset="0x156E0">
+            <Vtx/>
+        </Array>
         <DList Name="gGlowCircleTextureLoadDL" Offset="0x15720"/>
         <DList Name="gGlowCircleDL" Offset="0x15760"/>
         <DList Name="gGlowCircleSmallDL" Offset="0x15780"/>
+        <Array Name="gGlowCircleSmallVtx" Count="8" Offset="0x158E8">
+            <Vtx/>
+        </Array>
         <Texture Name="gUnusedFairyWingTex" OutName="unused_fairy_wing" Format="rgba16" Width="32" Height="64" Offset="0x15968"/>
+        <Limb Name="gameplay_keep_016968_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016968" Offset="0x16968"/>
+        <Limb Name="gameplay_keep_016974_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016974" Offset="0x16974"/>
+        <Limb Name="gameplay_keep_016980_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016980" Offset="0x16980"/>
+        <Limb Name="gameplay_keep_01698C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_01698C" Offset="0x1698C"/>
+        <Limb Name="gameplay_keep_016998_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016998" Offset="0x16998"/>
+        <Limb Name="gameplay_keep_0169A4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169A4" Offset="0x169A4"/>
+        <Limb Name="gameplay_keep_0169B0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169B0" Offset="0x169B0"/>
+        <Limb Name="gameplay_keep_0169BC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169BC" Offset="0x169BC"/>
+        <Limb Name="gameplay_keep_0169C8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169C8" Offset="0x169C8"/>
+        <Limb Name="gameplay_keep_0169D4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169D4" Offset="0x169D4"/>
+        <Limb Name="gameplay_keep_0169E0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169E0" Offset="0x169E0"/>
+        <Limb Name="gameplay_keep_0169EC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169EC" Offset="0x169EC"/>
+        <Limb Name="gameplay_keep_0169F8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169F8" Offset="0x169F8"/>
+        <Limb Name="gameplay_keep_016A04_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016A04" Offset="0x16A04"/>
         <Skeleton Name="gFairySkel" Type="Normal" LimbType="Standard" Offset="0x16A48"/>
         <Texture Name="gUnknownCircle3Tex" OutName="unknown_circle_3" Format="i4" Width="16" Height="16" Offset="0x16A50"/>
         <Texture Name="gUnknownCircle4Tex" OutName="unknown_circle_4" Format="i8" Width="16" Height="16" Offset="0x16AD0"/>
         <Texture Name="gHilite4Tex" OutName="hilite_4" Format="rgba16" Width="32" Height="32" Offset="0x16BD0"/>
         <Texture Name="gEffUnknown4Tex" OutName="eff_unknown_4" Format="i8" Width="32" Height="64" Offset="0x173D0"/>
         <Texture Name="gEffUnknown5Tex" OutName="eff_unknown_5" Format="i8" Width="32" Height="64" Offset="0x17BD0"/>
+        <Array Name="gEffFireCircleVtx" Count="14" Offset="0x183D0">
+            <Vtx/>
+        </Array>
         <DList Name="gEffFireCircleDL" Offset="0x184B0"/>
         <Animation Name="gFishOutOfWaterAnim" Offset="0x185FC"/>
+        <Array Name="gameplay_keep_Vtx_018610" Count="4" Offset="0x18610">
+            <Vtx/>
+        </Array>
+        <Array Name="gameplay_keep_Vtx_018650" Count="16" Offset="0x18650">
+            <Vtx/>
+        </Array>
+        <Array Name="gameplay_keep_Vtx_018750" Count="22" Offset="0x18750">
+            <Vtx/>
+        </Array>
+        <DList Name="gameplay_keep_0188B0_DL" Offset="0x188B0"/>
+        <DList Name="gameplay_keep_018950_DL" Offset="0x18950"/>
+        <DList Name="gameplay_keep_018A68_DL" Offset="0x18A68"/>
         <Texture Name="gFishTailTex" OutName="fish_tail" Format="rgba16" Width="16" Height="16" Offset="0x18B80"/>
         <Texture Name="gFishBodyTex" OutName="fish_body" Format="rgba16" Width="32" Height="8" Offset="0x18D80"/>
+        <Limb Name="gameplay_keep_018F80_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_018F80" Offset="0x18F80"/>
+        <Limb Name="gameplay_keep_018F8C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_018F8C" Offset="0x18F8C"/>
+        <Limb Name="gameplay_keep_018F98_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_018F98" Offset="0x18F98"/>
+        <Limb Name="gameplay_keep_018FA4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_018FA4" Offset="0x18FA4"/>
+        <Limb Name="gameplay_keep_018FB0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_018FB0" Offset="0x18FB0"/>
+        <Limb Name="gameplay_keep_018FBC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_018FBC" Offset="0x18FBC"/>
         <Skeleton Name="gFishSkel" Type="Flex" LimbType="Standard" Offset="0x18FE0"/>
         <Animation Name="gFishInWaterAnim" Offset="0x1909C"/>
         <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x190B0"/>
@@ -707,6 +855,9 @@
             <Vtx/>
         </Array>
         <DList Name="gEffBubbleDL" Offset="0x1A160"/>
+        <Array Name="gEffBubbleVtx" Count="4" Offset="0x1A1D8">
+            <Vtx/>
+        </Array>
 
         <Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x1A220"/>
         <Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x1A620"/>
@@ -717,6 +868,9 @@
         <Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x1BA20"/>
         <Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x1BE20"/>
         <DList Name="gEffFireFootprintDL" Offset="0x1C220"/>
+        <Array Name="gEffFireFootprintVtx" Count="4" Offset="0x1C280">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffUnusedBubbles1Tex" OutName="eff_unused_bubbles_1" Format="ia8" Width="32" Height="32" Offset="0x1C2C0"/>
         <Texture Name="gEffUnusedBubbles2Tex" OutName="eff_unused_bubbles_2" Format="ia8" Width="32" Height="32" Offset="0x1C6C0"/>
         <Texture Name="gEffUnusedBubbles3Tex" OutName="eff_unused_bubbles_3" Format="ia8" Width="32" Height="32" Offset="0x1CAC0"/>
@@ -726,6 +880,9 @@
         <Texture Name="gEffUnusedBubbles7Tex" OutName="eff_unused_bubbles_7" Format="ia8" Width="32" Height="32" Offset="0x1DAC0"/>
         <Texture Name="gEffUnusedBubbles8Tex" OutName="eff_unused_bubbles_8" Format="ia8" Width="32" Height="32" Offset="0x1DEC0"/>
         <DList Name="gEffUnusedBubblesDL" Offset="0x1E2C0"/>
+        <Array Name="gEffUnusedBubblesVtx" Count="4" Offset="0x1E330">
+            <Vtx/>
+        </Array>
         <Texture Name="gLensOfTruthMaskTex" OutName="lens_of_truth_mask" Format="i8" Width="64" Height="64" Offset="0x1E370"/>
         <Texture Name="gEffHitMark1Tex" OutName="eff_hit_mark_1" Format="i4" Width="32" Height="24" Offset="0x1F370"/>
         <Texture Name="gEffHitMark2Tex" OutName="eff_hit_mark_2" Format="i4" Width="32" Height="24" Offset="0x1F4F0"/>
@@ -752,6 +909,9 @@
         <Texture Name="gEffHitMark23Tex" OutName="eff_hit_mark_23" Format="i4" Width="32" Height="24" Offset="0x21470"/>
         <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x215F0"/>
         <DList Name="gEffHitMarkDL" Offset="0x21770"/>
+        <Array Name="gEffHitMarkVtx" Count="4" Offset="0x217C8">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21810"/>
         <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i4" Width="64" Height="64" Offset="0x22010"/>
         <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22810"/>
@@ -764,9 +924,18 @@
         <Texture Name="gEffMagmaBubble7Tex" OutName="eff_magma_bubbles_7" Format="ia8" Width="16" Height="24" Offset="0x24110"/>
         <Texture Name="gEffMagmaBubble8Tex" OutName="eff_magma_bubbles_8" Format="ia8" Width="16" Height="24" Offset="0x24290"/>
         <DList Name="gEffMagmaBubbleDL" Offset="0x24410"/>
+        <Array Name="gEffMagmaBubbleVtx" Count="4" Offset="0x24470">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffWaterRippleTex" OutName="eff_ss_g_ripple" Format="i8" Width="64" Height="64" Offset="0x244B0"/>
         <DList Name="gEffWaterRippleDL" Offset="0x254B0"/>
+        <Array Name="gEffWaterRippleVtx" Count="4" Offset="0x25510">
+            <Vtx/>
+        </Array>
         <DList Name="gEffSparkDL" Offset="0x25550"/>
+        <Array Name="gEffSparkVtx" Count="4" Offset="0x255B0">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffWaterSplash1Tex" OutName="eff_water_splash_1" Format="i8" Width="32" Height="40" Offset="0x255F0"/>
         <Texture Name="gEffWaterSplash2Tex" OutName="eff_water_splash_2" Format="i8" Width="32" Height="40" Offset="0x25AF0"/>
         <Texture Name="gEffWaterSplash3Tex" OutName="eff_water_splash_3" Format="i8" Width="32" Height="40" Offset="0x25FF0"/>
@@ -776,6 +945,9 @@
         <Texture Name="gEffWaterSplash7Tex" OutName="eff_water_splash_7" Format="i8" Width="32" Height="40" Offset="0x273F0"/>
         <Texture Name="gEffWaterSplash8Tex" OutName="eff_water_splash_8" Format="i8" Width="32" Height="40" Offset="0x278F0"/>
         <DList Name="gEffWaterSplashDL" Offset="0x27DF0"/>
+        <Array Name="gEffWaterSplashVtx" Count="4" Offset="0x27E50">
+            <Vtx/>
+        </Array>
         <Texture Name="gUnknownEffStone1Tex" OutName="unknown_eff_stone_1" Format="ia8" Width="32" Height="32" Offset="0x27E90"/>
         <Texture Name="gUnknownEffStone2Tex" OutName="unknown_eff_stone_2" Format="ia8" Width="32" Height="32" Offset="0x28290"/>
         <Texture Name="gUnknownEffStone3Tex" OutName="unknown_eff_stone_3" Format="ia8" Width="32" Height="32" Offset="0x28690"/>
@@ -785,6 +957,9 @@
         <Texture Name="gUnknownEffStone7Tex" OutName="unknown_eff_stone_7" Format="ia8" Width="32" Height="32" Offset="0x29690"/>
         <Texture Name="gUnknownEffStone8Tex" OutName="unknown_eff_stone_8" Format="ia8" Width="32" Height="32" Offset="0x29A90"/>
         <DList Name="gUnknownEffStoneDL" Offset="0x29E90"/>
+        <Array Name="gUnknownEffStoneVtx" Count="4" Offset="0x29EF0">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffLightning1Tex" OutName="eff_lightning_1" Format="i8" Width="16" Height="96" Offset="0x29F30"/>
         <Texture Name="gEffLightning2Tex" OutName="eff_lightning_2" Format="i8" Width="16" Height="96" Offset="0x2A530"/>
         <Texture Name="gEffLightning3Tex" OutName="eff_lightning_3" Format="i8" Width="16" Height="96" Offset="0x2AB30"/>
@@ -794,6 +969,9 @@
         <Texture Name="gEffLightning7Tex" OutName="eff_lightning_7" Format="i8" Width="16" Height="96" Offset="0x2C330"/>
         <Texture Name="gEffLightning8Tex" OutName="eff_lightning_8" Format="i8" Width="16" Height="96" Offset="0x2C930"/>
         <DList Name="gEffLightningDL" Offset="0x2CF30"/>
+        <Array Name="gEffLightningVtx" Count="4" Offset="0x2CF98">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffEnemyDeathFlame1Tex" OutName="eff_enemy_death_flame_1" Format="i8" Width="32" Height="64" Offset="0x2CFE0"/>
         <Texture Name="gEffEnemyDeathFlame2Tex" OutName="eff_enemy_death_flame_2" Format="i8" Width="32" Height="64" Offset="0x2D7E0"/>
         <Texture Name="gEffEnemyDeathFlame3Tex" OutName="eff_enemy_death_flame_3" Format="i8" Width="32" Height="64" Offset="0x2DFE0"/>
@@ -805,46 +983,111 @@
         <Texture Name="gEffEnemyDeathFlame9Tex" OutName="eff_enemy_death_flame_9" Format="i8" Width="32" Height="64" Offset="0x30FE0"/>
         <Texture Name="gEffEnemyDeathFlame10Tex" OutName="eff_enemy_death_flame_10" Format="i8" Width="32" Height="64" Offset="0x317E0"/>
         <DList Name="gEffEnemyDeathFlameDL" Offset="0x31FE0"/>
+        <Array Name="gEffEnemyDeathFlameVtx" Count="4" Offset="0x32048">
+            <Vtx/>
+        </Array>
         <Texture Name="gEffUnknown9Tex" OutName="eff_unknown_9" Format="i8" Width="32" Height="32" Offset="0x32090"/>
         <Texture Name="gEffUnknown10Tex" OutName="eff_unknown_10" Format="i8" Width="32" Height="32" Offset="0x32490"/>
         <Texture Name="gEffUnknown11Tex" OutName="eff_unknown_11" Format="i8" Width="32" Height="32" Offset="0x32890"/>
         <Texture Name="gEffUnknown12Tex" OutName="eff_unknown_12" Format="i8" Width="32" Height="32" Offset="0x32C90"/>
         <Texture Name="gUnknownWoodBoardTex" OutName="unknown_wood_board" Format="i8" Width="32" Height="32" Offset="0x33090"/>
+        <Array Name="gEffIceFragmentVtx" Count="41" Offset="0x33490">
+            <Vtx/>
+        </Array>
         <DList Name="gEffIceFragment1DL" Offset="0x33720"/>
         <DList Name="gEffIceFragment2DL" Offset="0x33818"/>
+        <Array Name="gEffIceFragment3Vtx" Count="93" Offset="0x33910">
+            <Vtx/>
+        </Array>
         <DList Name="gEffIceFragment3DL" Offset="0x33EE0"/>
         <Animation Name="gBugCrawlAnim" Offset="0x341FC"/>
         <DList Name="gBugLimb1DL" Offset="0x34210"/>
         <DList Name="gBugLimb1WrapperDL" Offset="0x342B0"/>
         <DList Name="gBugLimb1WrapperWrapperDL" Offset="0x342C0"/>
+        <Array Name="gBugLimb1Vtx" Count="3" Offset="0x342D0">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb2DL" Offset="0x34300"/>
         <DList Name="gBugLimb2WrapperDL" Offset="0x343A0"/>
         <DList Name="gBugLimb2WrapperWrapperDL" Offset="0x343B0"/>
+        <Array Name="gBugLimb2Vtx" Count="3" Offset="0x343C0">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb3DL" Offset="0x343F0"/>
         <DList Name="gBugLimb3WrapperDL" Offset="0x34490"/>
         <DList Name="gBugLimb3WrapperWrapperDL" Offset="0x344A0"/>
+        <Array Name="gBugLimb3Vtx" Count="3" Offset="0x344B0">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb4DL" Offset="0x344E0"/>
         <DList Name="gBugLimb4WrapperDL" Offset="0x34580"/>
         <DList Name="gBugLimb4WrapperWrapperDL" Offset="0x34590"/>
+        <Array Name="gBugLimb4Vtx" Count="3" Offset="0x345A0">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb5DL" Offset="0x345D0"/>
         <DList Name="gBugLimb5WrapperDL" Offset="0x34670"/>
         <DList Name="gBugLimb5WrapperWrapperDL" Offset="0x34680"/>
+        <Array Name="gBugLimb5Vtx" Count="3" Offset="0x34690">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb6DL" Offset="0x346C0"/>
         <DList Name="gBugLimb6WrapperDL" Offset="0x34760"/>
         <DList Name="gBugLimb6WrapperWrapperDL" Offset="0x34770"/>
+        <Array Name="gBugLimb6Vtx" Count="3" Offset="0x34780">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb7DL" Offset="0x347B0"/>
         <DList Name="gBugLimb7WrapperDL" Offset="0x34850"/>
         <DList Name="gBugLimb7WrapperWrapperDL" Offset="0x34860"/>
+        <Array Name="gBugLimb7Vtx" Count="3" Offset="0x34870">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb8DL" Offset="0x348A0"/>
         <DList Name="gBugLimb8WrapperDL" Offset="0x34940"/>
         <DList Name="gBugLimb8WrapperWrapperDL" Offset="0x34950"/>
+        <Array Name="gBugLimb8Vtx" Count="3" Offset="0x34960">
+            <Vtx/>
+        </Array>
         <DList Name="gBugLimb9DL" Offset="0x34990"/>
         <DList Name="gBugLimb9WrapperDL" Offset="0x34A40"/>
         <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34A50"/>
+        <Array Name="gBugLimb9Vtx" Count="12" Offset="0x34A60">
+            <Vtx/>
+        </Array>
         <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34B20"/>
         <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="8" Height="16" Offset="0x35320"/>
+        <Limb Name="gameplay_keep_035420_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035420" Offset="0x35420"/>
+        <Limb Name="gameplay_keep_03542C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03542C" Offset="0x3542C"/>
+        <Limb Name="gameplay_keep_035438_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035438" Offset="0x35438"/>
+        <Limb Name="gameplay_keep_035444_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035444" Offset="0x35444"/>
+        <Limb Name="gameplay_keep_035450_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035450" Offset="0x35450"/>
+        <Limb Name="gameplay_keep_03545C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03545C" Offset="0x3545C"/>
+        <Limb Name="gameplay_keep_035468_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035468" Offset="0x35468"/>
+        <Limb Name="gameplay_keep_035474_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035474" Offset="0x35474"/>
+        <Limb Name="gameplay_keep_035480_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035480" Offset="0x35480"/>
+        <Limb Name="gameplay_keep_03548C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03548C" Offset="0x3548C"/>
+        <Limb Name="gameplay_keep_035498_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035498" Offset="0x35498"/>
+        <Limb Name="gameplay_keep_0354A4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354A4" Offset="0x354A4"/>
+        <Limb Name="gameplay_keep_0354B0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354B0" Offset="0x354B0"/>
+        <Limb Name="gameplay_keep_0354BC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354BC" Offset="0x354BC"/>
+        <Limb Name="gameplay_keep_0354C8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354C8" Offset="0x354C8"/>
+        <Limb Name="gameplay_keep_0354D4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354D4" Offset="0x354D4"/>
+        <Limb Name="gameplay_keep_0354E0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354E0" Offset="0x354E0"/>
+        <Limb Name="gameplay_keep_0354EC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354EC" Offset="0x354EC"/>
+        <Limb Name="gameplay_keep_0354F8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354F8" Offset="0x354F8"/>
+        <Limb Name="gameplay_keep_035504_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035504" Offset="0x35504"/>
+        <Limb Name="gameplay_keep_035510_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035510" Offset="0x35510"/>
+        <Limb Name="gameplay_keep_03551C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03551C" Offset="0x3551C"/>
+        <Limb Name="gameplay_keep_035528_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035528" Offset="0x35528"/>
         <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35590"/>
+        <Array Name="gCuttableShrubStalkVtx" Count="4" Offset="0x355A0">
+            <Vtx/>
+        </Array>
         <DList Name="gCuttableShrubStalkDL" Offset="0x355E0"/>
+        <Array Name="gCuttableShrubTipVtx" Count="3" Offset="0x35670">
+            <Vtx/>
+        </Array>
         <DList Name="gCuttableShrubTipDL" Offset="0x356A0"/>
         <Texture Name="gCuttableShrubLeafTFragmentTex" OutName="cuttable_shrub_leaf_fragment" Format="rgba16" Width="32" Height="32" Offset="0x35730"/>
         <Texture Name="gCuttableShrubTex" OutName="cuttanble_shrub" Format="rgba16" Width="32" Height="32" Offset="0x35F30"/>
@@ -852,36 +1095,87 @@
         <Texture Name="gLensFlareRingTex" OutName="lens_flare_ring" Format="i4" Width="64" Height="64" Offset="0x36F30"/>
         <DList Name="gLensFlareCircleDL" Offset="0x37730"/>
         <DList Name="gLensFlareRingDL" Offset="0x37798"/>
+        <Array Name="gLensFlareVtx" Count="4" Offset="0x37800">
+            <Vtx/>
+        </Array>
+        <Array Name="gEffSparklesVtx" Count="4" Offset="0x37840">
+            <Vtx/>
+        </Array>
         <DList Name="gEffSparklesDL" Offset="0x37880"/>
         <Texture Name="gEffSparklesTex" OutName="eff_sparkles" Format="i4" Width="16" Height="16" Offset="0x378E0"/>
         <Texture Name="gEffUnknown13Tex" OutName="eff_unknown_tex_13" Format="i8" Width="16" Height="32" Offset="0x37960"/>
         <Texture Name="gEffUnknown14Tex" OutName="eff_unknown_tex_14" Format="i8" Width="16" Height="32" Offset="0x37B60"/>
+        <Array Name="gHoverBootsCircleVtx" Count="13" Offset="0x37D60">
+            <Vtx/>
+        </Array>
         <DList Name="gHoverBootsCircleDL" Offset="0x37E30"/>
         <Texture Name="gMoonTex" OutName="moon" Format="ia8" Width="64" Height="64" Offset="0x37F00"/>
         <DList Name="gMoonDL" Offset="0x38F00"/>
+        <Array Name="gMoonVtx" Count="4" Offset="0x38F70">
+            <Vtx/>
+        </Array>
         <Texture Name="gUnknownCircle6Tex" OutName="unknown_circle_6" Format="i8" Width="32" Height="32" Offset="0x38FB0"/>
         <Collision Name="gLargerCubeCol" Offset="0x394B0"/> <!-- unused in game -->
+        <Array Name="gLiftableRockVtx" Count="24" Offset="0x394E0">
+            <Vtx/>
+        </Array>
         <DList Name="gLiftableRockDL" Offset="0x39660"/>
 
         <!-- unused in game -->
+        <Array Name="gUnusedRockRectangularPrism1Vtx" Count="24" Offset="0x39710">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedRockRectangularPrism1DL" Offset="0x39890"/>
         <Collision Name="gWideTallBlockCol" Offset="0x39A48"/>
+        <Array Name="gFlatBlockVtx" Count="24" Offset="0x39A80">
+            <Vtx/>
+        </Array>
         <DList Name="gFlatBlockDL" Offset="0x39C00"/>
         <Collision Name="gTallBlockCol" Offset="0x39DC0"/>
+        <Array Name="gUnusedRockRectangularPrism3Vtx" Count="24" Offset="0x39DF0">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedRockRectangularPrism3DL" Offset="0x39F70"/>
         <Collision Name="gSmallerFlatBlockCol" Offset="0x3A120"/>
+        <Array Name="gFlatRotBlockVtx" Count="24" Offset="0x3A150">
+            <Vtx/>
+        </Array>
         <DList Name="gFlatRotBlockDL" Offset="0x3A2D0"/>
         <Collision Name="gLargerFlatBlockCol" Offset="0x3A480"/>
+        <Array Name="gSmallCubeVtx" Count="24" Offset="0x3A4B0">
+            <Vtx/>
+        </Array>
         <DList Name="gSmallCubeDL" Offset="0x3A630"/>
         <Collision Name="gSmallerCubeCol" Offset="0x3A7F0"/>
+        <Array Name="gTreeStumpVtx" Count="25" Offset="0x3A820">
+            <Vtx/>
+        </Array>
         <DList Name="gTreeStumpDL" Offset="0x3A9B0"/>
+        <Array Name="gGrassBladesVtx" Count="12" Offset="0x3AAC0">
+            <Vtx/>
+        </Array>
         <DList Name="gGrassBladesDL" Offset="0x3AB80"/>
 
         <Texture Name="gHeartShapeTex" OutName="heart_shape" Format="i8" Width="16" Height="16" Offset="0x3AC30"/>
+        <Array Name="gHeartPieceInteriorVtx" Count="48" Offset="0x3AD30">
+            <Vtx/>
+        </Array>
         <DList Name="gHeartPieceInteriorDL" Offset="0x3B030"/>
+        <Array Name="gHeartPieceExteriorVtx" Count="80" Offset="0x3B1E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHeartContainerInteriorVtx" Count="76" Offset="0x3B6E0">
+            <Vtx/>
+        </Array>
         <DList Name="gHeartPieceExteriorDL" Offset="0x3BBA0"/>
         <DList Name="gHeartContainerInteriorDL" Offset="0x3BCD8"/>
+        <Array Name="gSignRectangularVtx" Count="39" Offset="0x3BDE0">
+            <Vtx/>
+        </Array>
         <DList Name="gSignRectangularDL" Offset="0x3C050"/>
+        <Array Name="gSignDirectionalVtx" Count="45" Offset="0x3C2E0">
+            <Vtx/>
+        </Array>
         <DList Name="gSignDirectionalDL" Offset="0x3C5B0"/>
         <Texture Name="gDropArrows2Tex" OutName="drop_arrows_2" Format="rgba16" Width="32" Height="32" Offset="0x3C870"/>
         <Texture Name="gDropArrows1Tex" OutName="drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x3D070"/>
@@ -889,6 +1183,9 @@
         <Texture Name="gDropBombTex" OutName="drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x3E070"/>
         <Texture Name="gDropRecoveryHeartTex" OutName="drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x3E870"/>
         <DList Name="gItemDropDL" Offset="0x3F070"/>
+        <Array Name="gItemDropVtx" Count="4" Offset="0x3F0F8">
+            <Vtx/>
+        </Array>
         <Texture Name="gDropKeySmallTex" OutName="drop_key_small" Format="rgba16" Width="32" Height="32" Offset="0x3F140"/>
         <Texture Name="gDropMagicSmallTex" OutName="drop_magic_small" Format="rgba16" Width="32" Height="32" Offset="0x3F940"/>
         <Texture Name="gDropDekuNutTex" OutName="drop_deku_nut" Format="rgba16" Width="32" Height="32" Offset="0x40140"/>
@@ -901,6 +1198,9 @@
         <Texture Name="gRupeeOrangeTex" OutName="rupee_orange" Format="rgba16" Width="4" Height="4" Offset="0x421A0"/>
         <Texture Name="gRupeePinkTex" OutName="rupee_pink" Format="rgba16" Width="4" Height="4" Offset="0x421C0"/>
         <Texture Name="gRupeeSilverTex" OutName="rupee_silver" Format="rgba16" Width="4" Height="4" Offset="0x421E0"/>
+        <Array Name="gRupeeVtx" Count="36" Offset="0x42200">
+            <Vtx/>
+        </Array>
         <DList Name="gRupeeDL" Offset="0x42440"/>
         <Texture Name="gRupeeLightRedTex" OutName="rupee_light_red" Format="rgba16" Width="4" Height="4" Offset="0x42510"/>
         <Texture Name="gUnknownStone1Tex" OutName="unknown_stone_1" Format="rgba16" Width="32" Height="32" Offset="0x42530"/>
@@ -914,15 +1214,33 @@
         <Texture Name="gSignRectangularFrontTex" OutName="sign_rectangular_front" Format="rgba16" Width="32" Height="16" Offset="0x46930"/>
         <Texture Name="gSignPostWoodTex" OutName="sign_post_wood" Format="rgba16" Width="64" Height="8" Offset="0x46D30"/>
         <Texture Name="gSignLetteringTex" OutName="sign_lettering" Format="rgba16" Width="64" Height="32" Offset="0x47130"/>
+        <Array Name="gRaindropVtx" Count="3" Offset="0x48130">
+            <Vtx/>
+        </Array>
         <DList Name="gRaindropDL" Offset="0x48160"/>
         <DList Name="gFootShadowDL" Offset="0x48180"/>
+        <Array Name="gFootShadowVtx" Count="3" Offset="0x481E0">
+            <Vtx/>
+        </Array>
         <Texture Name="gFootShadowTex" OutName="footprint_shadow" Format="ia16" Width="32" Height="64" Offset="0x48210"/>
         <DList Name="gCircleShadowDL" Offset="0x49210"/>
+        <Array Name="gCircleShadowVtx" Count="3" Offset="0x49260">
+            <Vtx/>
+        </Array>
         <Texture Name="gCircleShadowTex" OutName="circular_shadow" Format="ia16" Width="32" Height="32" Offset="0x49290"/>
+        <Array Name="gHorseShadowVtx" Count="4" Offset="0x49A90">
+            <Vtx/>
+        </Array>
         <DList Name="gHorseShadowDL" Offset="0x49AD0"/>
         <Texture Name="gHorseShadowTex" OutName="horse_shadow" Format="i8" Width="16" Height="64" Offset="0x49B20"/>
+        <Array Name="gDungeonDoorVtx" Count="12" Offset="0x49F20">
+            <Vtx/>
+        </Array>
         <DList Name="gDungeonDoorDL" Offset="0x49FE0"/>
         <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4A090"/>
+        <Array Name="gDoorMetalBarsVtx" Count="4" Offset="0x4B090">
+            <Vtx/>
+        </Array>
         <DList Name="gDoorMetalBarsDL" Offset="0x4B0D0"/>
         <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x4B160"/>
         <Texture Name="gSun1Tex" OutName="sun_1" Format="i4" Width="64" Height="31" Offset="0x4C160"/>
@@ -934,15 +1252,36 @@
         <DList Name="gKokiriDustMoteMaterialDL" Offset="0x4D160"/>
         <DList Name="gKokiriDustMoteModelDL" Offset="0x4D1A8"/>
         <DList Name="gSunDL" Offset="0x4D1C0"/>
+        <Array Name="gSunVtx" Count="12" Offset="0x4D348">
+            <Vtx/>
+        </Array>
+        <Array Name="gKokiriDustMoteModelVtx" Count="4" Offset="0x4D408">
+            <Vtx/>
+        </Array>
         <DList Name="gLockOnReticleTriangleDL" Offset="0x4D450"/>
+        <Array Name="gLockOnReticleTriangleVtx" Count="3" Offset="0x4D468">
+            <Vtx/>
+        </Array>
+        <Array Name="gEffFireVtx" Count="4" Offset="0x4D4A0">
+            <Vtx/>
+        </Array>
         <DList Name="gEffFire1DL" Offset="0x4D4E0"/>
         <DList Name="gEffFire2DL" Offset="0x4D5A0"/>
         <Texture Name="gDecorativeFlameMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x4D660"/>
         <Texture Name="gDecorativeFlameTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x4DE60"/>
+        <Array Name="gUnusedUnknownShape1Vtx" Count="197" Offset="0x4E660">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedUnknownShape1DL" Offset="0x4F2B0"/>
         <DList Name="gUnusedUnknownShape1RefDL" Offset="0x4F630"/>
+        <Array Name="gUnusedUnknownShape2Vtx" Count="202" Offset="0x4F640">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedUnknownShape2DL" Offset="0x502E0"/>
         <DList Name="gUnusedUnknownShape2RefDL" Offset="0x50600"/>
+        <Array Name="gUnusedUnknownShape3Vtx" Count="199" Offset="0x50610">
+            <Vtx/>
+        </Array>
         <DList Name="gUnusedUnknownShape3DL" Offset="0x51280"/>
         <DList Name="gUnusedUnknownShape3RefDL" Offset="0x51598"/>
         <Texture Name="gUnusedUpsideDownZeldaTex" OutName="upside_down_zelda" Format="i8" Width="64" Height="32" Offset="0x515B0"/>
diff --git a/assets/xml/objects/object_ahg.xml b/assets/xml/objects/object_ahg.xml
index 8147abb75f..19b8876390 100644
--- a/assets/xml/objects/object_ahg.xml
+++ b/assets/xml/objects/object_ahg.xml
@@ -35,6 +35,53 @@
         <Texture Name="gHylianMan1PantsTex" OutName="pants" Format="ci8" Width="32" Height="16" Offset="0x9FC" TlutOffset="0xFC"/>
         <Texture Name="gHylianMan1PantsBeltTex" OutName="pants_belt" Format="ci8" Width="16" Height="16" Offset="0xBFC" TlutOffset="0xFC"/>
 
+        <!-- Vertices -->
+        <Array Name="gHylianMan1BeardedHeadVtx" Count="126" Offset="0xD00">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1LeftHandVtx" Count="47" Offset="0x14E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1LeftForearmVtx" Count="24" Offset="0x17D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1LeftUpperArmVtx" Count="25" Offset="0x1950">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1RightHandVtx" Count="47" Offset="0x1AE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1RightForearmVtx" Count="24" Offset="0x1DD0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1RightUpperArmVtx" Count="25" Offset="0x1F50">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1TorsoVtx" Count="61" Offset="0x20E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1RightFootVtx" Count="34" Offset="0x24B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1RightShinVtx" Count="24" Offset="0x26D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1RightThighVtx" Count="26" Offset="0x2850">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1LeftFootVtx" Count="34" Offset="0x29F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1LeftShinVtx" Count="24" Offset="0x2C10">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1LeftThighVtx" Count="26" Offset="0x2D90">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1PelvisVtx" Count="28" Offset="0x2F30">
+            <Vtx/>
+        </Array>
+
         <!-- DLs -->
         <DList Name="gHylianMan1BeardedHeadDL" Offset="0x30F0"/>
         <DList Name="gHylianMan1RightHandDL" Offset="0x3500"/>
@@ -59,7 +106,13 @@
         <Texture Name="gHylianMan1ShavedBowlEyeTex" OutName="shaved_bowl_cut_eye" Format="ci8" Width="16" Height="16" Offset="0x4B88" TlutOffset="0x47C8"/>
         <Texture Name="gHylianMan1BowlCutHairTex" OutName="bowl_cut_hair" Format="ci8" Width="8" Height="16" Offset="0x4C88" TlutOffset="0x47C8"/>
 
-        <!-- Alternate Heads DLs -->
+        <!-- Alternate Heads -->
+        <Array Name="gHylianMan1ShavedHeadVtx" Count="62" Offset="0x4D08">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan1BowlCutHeadVtx" Count="66" Offset="0x50E8">
+            <Vtx/>
+        </Array>
         <DList Name="gHylianMan1ShavedHeadDL" Offset="0x5508"/>
         <DList Name="gHylianMan1BowlCutHeadDL" Offset="0x5728"/>
     </File>
diff --git a/assets/xml/objects/object_am.xml b/assets/xml/objects/object_am.xml
index 2467baf6ab..c787a7b391 100644
--- a/assets/xml/objects/object_am.xml
+++ b/assets/xml/objects/object_am.xml
@@ -6,5 +6,22 @@
         <Animation Name="gArmosDamagedAnim" Offset="0x5B3C"/>
         <Collision Name="gArmosCol" Offset="0x118"/>
         <DList Name="gArmosUnusedDL" Offset="0x7A8"/>
+
+        <!-- Vertices -->
+        <Array Name="object_am_Vtx_000350" Count="40" Offset="0x350">
+            <Vtx/>
+        </Array>
+        <Array Name="gArmosUnusedVtx" Count="12" Offset="0x6E8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_am_Vtx_000838" Count="233" Offset="0x838">
+            <Vtx/>
+        </Array>
+        <Array Name="object_am_Vtx_001EA8" Count="61" Offset="0x1EA8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_am_Vtx_002440" Count="17" Offset="0x2440">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ane.xml b/assets/xml/objects/object_ane.xml
index 1e29b351e0..d1c245308c 100644
--- a/assets/xml/objects/object_ane.xml
+++ b/assets/xml/objects/object_ane.xml
@@ -55,5 +55,52 @@
         <Texture Name="gCuccoLadyEyeOpenTex" OutName="cucco_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x8C8"/>
         <Texture Name="gCuccoLadyEyeHalfTex" OutName="cucco_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x10C8"/>
         <Texture Name="gCuccoLadyEyeClosedTex" OutName="cucco_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18C8"/>
+
+        <!-- Vertices -->
+        <Array Name="gCuccoLadyHeadVtx" Count="234" Offset="0x2788">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ane_Vtx_003628" Count="41" Offset="0x3628">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ane_Vtx_0038B8" Count="24" Offset="0x38B8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ane_Vtx_003A38" Count="29" Offset="0x3A38">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ane_Vtx_003C08" Count="41" Offset="0x3C08">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ane_Vtx_003E98" Count="24" Offset="0x3E98">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ane_Vtx_004018" Count="29" Offset="0x4018">
+            <Vtx/>
+        </Array>
+        <Array Name="gCuccoLadyTorsoVtx" Count="107" Offset="0x41E8">
+            <Vtx/>
+        </Array>
+        <Array Name="gCuccoLadyShoe2Vtx" Count="53" Offset="0x4898">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ane_Vtx_004BE8" Count="8" Offset="0x4BE8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ane_Vtx_004C68" Count="3" Offset="0x4C68">
+            <Vtx/>
+        </Array>
+        <Array Name="gCuccoLadyShoe1Vtx" Count="53" Offset="0x4C98">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ane_Vtx_004FE8" Count="8" Offset="0x4FE8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ane_Vtx_005068" Count="3" Offset="0x5068">
+            <Vtx/>
+        </Array>
+        <Array Name="gCuccoLadyDressVtx" Count="68" Offset="0x5098">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ani.xml b/assets/xml/objects/object_ani.xml
index d83aa7656a..f0b09bba59 100644
--- a/assets/xml/objects/object_ani.xml
+++ b/assets/xml/objects/object_ani.xml
@@ -64,5 +64,51 @@
         <Animation Name="gRoofManGettingUpAfterKnockbackAnim" Offset="0x70F0"/>
         <Animation Name="gRoofManIdleAnim" Offset="0x76EC"/>
 
+        <!-- Vertices -->
+        <Array Name="gRoofManHeadVtx" Count="124" Offset="0x2518">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManLeftHandVtx" Count="32" Offset="0x2FA8">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManLeftForearmVtx" Count="26" Offset="0x31A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManLeftUpperArmVtx" Count="26" Offset="0x3348">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManRightHandVtx" Count="32" Offset="0x34E8">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManRightForearmVtx" Count="26" Offset="0x36E8">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManRightUpperArmVtx" Count="26" Offset="0x3888">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManTorsoVtx" Count="80" Offset="0x3A28">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManLeftFootVtx" Count="16" Offset="0x3F28">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManLeftLegVtx" Count="41" Offset="0x4028">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManLeftThighVtx" Count="23" Offset="0x42B8">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManRightFootVtx" Count="16" Offset="0x4428">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManRightLegVtx" Count="45" Offset="0x4528">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManRightThighVtx" Count="23" Offset="0x47F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gRoofManWaistVtx" Count="16" Offset="0x4968">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_anubice.xml b/assets/xml/objects/object_anubice.xml
index 2140187e4e..7c3148d742 100644
--- a/assets/xml/objects/object_anubice.xml
+++ b/assets/xml/objects/object_anubice.xml
@@ -16,5 +16,40 @@
         <!-- I think those might be for taking damage or something -->
         <Animation Name="gAnubiceAnim_000A48" Offset="0xA48"/>
         <Animation Name="gAnubiceAnim_000BAC" Offset="0xBAC"/>
+
+        <!-- Vertices -->
+        <Array Name="object_anubice_Vtx_001B10" Count="62" Offset="0x1B10">
+            <Vtx/>
+        </Array>
+        <Array Name="object_anubice_Vtx_001EF0" Count="20" Offset="0x1EF0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_anubice_Vtx_002030" Count="20" Offset="0x2030">
+            <Vtx/>
+        </Array>
+        <Array Name="object_anubice_Vtx_002170" Count="20" Offset="0x2170">
+            <Vtx/>
+        </Array>
+        <Array Name="object_anubice_Vtx_0022B0" Count="17" Offset="0x22B0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_anubice_Vtx_0023C0" Count="5" Offset="0x23C0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_anubice_Vtx_002410" Count="16" Offset="0x2410">
+            <Vtx/>
+        </Array>
+        <Array Name="object_anubice_Vtx_002510" Count="115" Offset="0x2510">
+            <Vtx/>
+        </Array>
+        <Array Name="gAnubiceEyesVtx" Count="10" Offset="0x2C40">
+            <Vtx/>
+        </Array>
+        <Array Name="gAnubiceFireAttackVtx" Count="4" Offset="0x3590">
+            <Vtx/>
+        </Array>
+        <Array Name="gAnubiceUnusedParticleModelVtx" Count="4" Offset="0x35D0">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_aob.xml b/assets/xml/objects/object_aob.xml
index 74838f6af3..b3ef98f914 100644
--- a/assets/xml/objects/object_aob.xml
+++ b/assets/xml/objects/object_aob.xml
@@ -54,5 +54,52 @@
         <Texture Name="gHylianWoman1EyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x05C8"/>
         <Texture Name="gHylianWoman1EyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0DC8"/>
         <Texture Name="gHylianWoman1EyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x15C8"/>
+
+        <!-- Vertices -->
+        <Array Name="gHylianWoman1HeadVtx" Count="174" Offset="0x1F48">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1LeftHandVtx" Count="45" Offset="0x2A28">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1LeftForearmVtx" Count="24" Offset="0x2CF8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1LeftUpperArmVtx" Count="25" Offset="0x2E78">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1RightHandVtx" Count="45" Offset="0x3008">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1RightForearmVtx" Count="24" Offset="0x32D8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1RightUpperArmVtx" Count="25" Offset="0x3458">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1TorsoVtx" Count="68" Offset="0x35E8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1LeftFootVtx" Count="3" Offset="0x3A28">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1LeftShinVtx" Count="3" Offset="0x3A58">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1LeftThighVtx" Count="3" Offset="0x3A88">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1RightFootVtx" Count="3" Offset="0x3AB8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1RightShinVtx" Count="3" Offset="0x3AE8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1RightThighVtx" Count="3" Offset="0x3B18">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman1PelvisVtx" Count="20" Offset="0x3B48">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bba.xml b/assets/xml/objects/object_bba.xml
index f988d8fbe4..a0cc6812f7 100644
--- a/assets/xml/objects/object_bba.xml
+++ b/assets/xml/objects/object_bba.xml
@@ -30,6 +30,53 @@
         <Texture Name="gHylianOldWomanShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0xE08" TlutOffset="0x108"/>
         <Texture Name="gHylianOldWomanSkirtTex" OutName="skirt" Format="ci8" Width="16" Height="16" Offset="0xF08" TlutOffset="0x108"/>
 
+        <!-- Vertices -->
+        <Array Name="gHylianOldWomanHeadVtx" Count="160" Offset="0x1008">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanLeftHandVtx" Count="23" Offset="0x1A08">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanLeftForearmVtx" Count="19" Offset="0x1B78">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanLeftUpperArmVtx" Count="24" Offset="0x1CA8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanRightHandVtx" Count="23" Offset="0x1E28">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanRightForearmVtx" Count="19" Offset="0x1F98">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanRightUpperArmVtx" Count="24" Offset="0x20C8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanTorsoVtx" Count="70" Offset="0x2248">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanRightFootVtx" Count="3" Offset="0x26A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanRightShinVtx" Count="3" Offset="0x26D8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanRightThighVtx" Count="3" Offset="0x2708">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanLeftFootVtx" Count="3" Offset="0x2738">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanLeftShinVtx" Count="3" Offset="0x2768">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanLeftThighVtx" Count="3" Offset="0x2798">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldWomanPelvisVtx" Count="24" Offset="0x27C8">
+            <Vtx/>
+        </Array>
+
         <!-- DLs -->
         <DList Name="gHylianOldWomanHeadDL" Offset="0x2948"/>
         <DList Name="gHylianOldWomanRightHandDL" Offset="0x3298"/>
diff --git a/assets/xml/objects/object_bdan_objects.xml b/assets/xml/objects/object_bdan_objects.xml
index dcd56d3856..36f6541f03 100644
--- a/assets/xml/objects/object_bdan_objects.xml
+++ b/assets/xml/objects/object_bdan_objects.xml
@@ -57,5 +57,52 @@
         <Collision Name="gJabuLoweringPlatformCol" Offset="0x5580"/>
         <Collision Name="gJabuFloorSwitchCol" Offset="0x5CF8"/>
         <Collision Name="gJabuBigOctoPlatformCol" Offset="0x8CE0"/>
+
+        <!-- Vertices -->
+        <Array Name="gJabuDoorSection1Vtx" Count="5" Offset="0x540">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuDoorSection2Vtx" Count="5" Offset="0xBA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuDoorSection3Vtx" Count="5" Offset="0x1200">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuDoorSection4Vtx" Count="5" Offset="0x1860">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuDoorSection5Vtx" Count="5" Offset="0x1EC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuDoorSection6Vtx" Count="5" Offset="0x2520">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuDoorSection7Vtx" Count="5" Offset="0x2B80">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuDoorSection8Vtx" Count="5" Offset="0x31E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuWaterVtx" Count="5" Offset="0x3898">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuElevatorPlatformVtx" Count="67" Offset="0x47B8">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuFallingPlatformVtx" Count="24" Offset="0x5080">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuBlueFloorSwitchVtx" Count="71" Offset="0x55B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuYellowFloorSwitchVtx" Count="71" Offset="0x5D30">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuWebDoorVtx" Count="16" Offset="0x6360">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuObjectsLargeRotatingSpikePlatformVtx" Count="173" Offset="0x7B48">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bdoor.xml b/assets/xml/objects/object_bdoor.xml
index e15f0f6294..6addd6e4f5 100644
--- a/assets/xml/objects/object_bdoor.xml
+++ b/assets/xml/objects/object_bdoor.xml
@@ -4,9 +4,18 @@
         <!-- One of the Boss Door Textures -->
         <Texture Name="gBossDoorGanonsCastleTex" OutName="boss_door_ganons_castle" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
 
-        <!-- Boss Door, Lock, and Chain DisplayLists -->
+        <!-- Boss Door, Lock, and Chain -->
+        <Array Name="gBossDoorVtx" Count="12" Offset="0x1000">
+            <Vtx/>
+        </Array>
         <DList Name="gBossDoorDL" Offset="0x10C0"/> <!-- Original name is "bossdoor_model" -->
+        <Array Name="gBossDoorLockVtx" Count="40" Offset="0x1180">
+            <Vtx/>
+        </Array>
         <DList Name="gBossDoorLockDL" Offset="0x1400"/> <!-- Original name is "doorkagiboss_model" -->
+        <Array Name="gBossDoorChainVtx" Count="4" Offset="0x14F0">
+            <Vtx/>
+        </Array>
         <DList Name="gBossDoorChainDL" Offset="0x1530"/> <!-- Original name is "doorkusariboss_model" -->
 
         <!-- The rest of the Boss Door Textures -->
diff --git a/assets/xml/objects/object_bg.xml b/assets/xml/objects/object_bg.xml
index 791226b71d..50d18c7187 100644
--- a/assets/xml/objects/object_bg.xml
+++ b/assets/xml/objects/object_bg.xml
@@ -45,6 +45,36 @@
         <Texture Name="gChuGirlEyeHalfTex" OutName="chu_girl_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4910"/>
         <Texture Name="gChuGirlEyeClosedTex" OutName="chu_girl_eye_closed" Format="rgba16" Width="32" Height="32"  Offset="0x5110"/>
 
-
+        <!-- Vertices -->
+        <Array Name="gChuGirlHeadVtx" Count="221" Offset="0x720">
+            <Vtx/>
+        </Array>
+        <Array Name="gChuGirlNeckVtx" Count="31" Offset="0x14F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gChuGirlLeftHandVtx" Count="38" Offset="0x16E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gChuGirlLeftForearmVtx" Count="29" Offset="0x1940">
+            <Vtx/>
+        </Array>
+        <Array Name="gChuGirlLeftUpperArmVtx" Count="53" Offset="0x1B10">
+            <Vtx/>
+        </Array>
+        <Array Name="gChuGirlRightHandVtx" Count="36" Offset="0x1E60">
+            <Vtx/>
+        </Array>
+        <Array Name="gChuGirlRightForearmVtx" Count="29" Offset="0x20A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gChuGirlRightUpperArmVtx" Count="49" Offset="0x2270">
+            <Vtx/>
+        </Array>
+        <Array Name="gChuGirlTorsoVtx" Count="137" Offset="0x2580">
+            <Vtx/>
+        </Array>
+        <Array Name="gChuGirlWaistVtx" Count="13" Offset="0x2E10">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bird.xml b/assets/xml/objects/object_bird.xml
index c0b5cac3e4..2c184e87fc 100644
--- a/assets/xml/objects/object_bird.xml
+++ b/assets/xml/objects/object_bird.xml
@@ -4,14 +4,23 @@
         <DList Name="gBirdLeftWingDL" Offset="0x80"/>
         <DList Name="gBirdLeftWingWrapper1DL" Offset="0x120"/>
         <DList Name="gBirdLeftWingWrapper2DL" Offset="0x130"/>
+        <Array Name="gBirdLeftWingVtx" Count="4" Offset="0x140">
+            <Vtx/>
+        </Array>
 
         <DList Name="gBirdRightWingDL" Offset="0x180"/>
         <DList Name="gBirdRightWingWrapper1DL" Offset="0x220"/>
         <DList Name="gBirdRightWingWrapper2DL" Offset="0x230"/>
+        <Array Name="gBirdRightWingVtx" Count="4" Offset="0x240">
+            <Vtx/>
+        </Array>
 
         <DList Name="gBirdBodyDL" Offset="0x280"/>
         <DList Name="gBirdBodyWrapper1DL" Offset="0x3D0"/>
         <DList Name="gBirdBodyWrapper2DL" Offset="0x3E0"/>
+        <Array Name="gBirdBodyVtx" Count="17" Offset="0x3F0">
+            <Vtx/>
+        </Array>
 
         <Texture Name="gBirdFaceTex" OutName="face" Format="rgba16" Width="32" Height="32" Offset="0x500"/>
         <Texture Name="gBirdTailTex" OutName="tail" Format="rgba16" Width="16" Height="32" Offset="0xD00"/>
diff --git a/assets/xml/objects/object_bji.xml b/assets/xml/objects/object_bji.xml
index 8dd89dd875..b658cfe7f8 100644
--- a/assets/xml/objects/object_bji.xml
+++ b/assets/xml/objects/object_bji.xml
@@ -33,6 +33,53 @@
         <Texture Name="gHylianOldManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xDFC" TlutOffset="0xFC"/>
         <Texture Name="gHylianOldManClothesSideTex" OutName="clothes_side" Format="i8" Width="8" Height="8" Offset="0x11FC"/>
 
+        <!-- Vertices -->
+        <Array Name="gHylianOldManLeftFootVtx" Count="3" Offset="0x1240">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManLeftShinVtx" Count="3" Offset="0x1270">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManLeftThighVtx" Count="3" Offset="0x12A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManRightFootVtx" Count="3" Offset="0x12D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManRightShinVtx" Count="3" Offset="0x1300">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManRightThighVtx" Count="3" Offset="0x1330">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManHeadVtx" Count="112" Offset="0x1360">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManLeftHandVtx" Count="3" Offset="0x1A60">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManLeftForearmVtx" Count="19" Offset="0x1A90">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManLeftUpperArmVtx" Count="24" Offset="0x1BC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManRightHandVtx" Count="3" Offset="0x1D40">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManRightForearmVtx" Count="19" Offset="0x1D70">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManRightUpperArmVtx" Count="24" Offset="0x1EA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManTorsoVtx" Count="57" Offset="0x2020">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianOldManPelvisVtx" Count="27" Offset="0x23B0">
+            <Vtx/>
+        </Array>
+
         <!-- DLs -->
         <DList Name="gHylianOldManHeadDL" Offset="0x2560"/>
         <DList Name="gHylianOldManRightHandDL" Offset="0x2B88"/>
@@ -56,6 +103,9 @@
         <Texture Name="gHylianOldManBaldEyeTex" OutName="bald_eye" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
 
         <!-- Bald Head DL -->
+        <Array Name="gHylianOldManBaldHeadVtx" Count="78" Offset="0x3A88">
+            <Vtx/>
+        </Array>
         <DList Name="gHylianOldManBaldHeadDL" Offset="0x3F68"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bl.xml b/assets/xml/objects/object_bl.xml
index 1c2ef4ec63..6614aad836 100644
--- a/assets/xml/objects/object_bl.xml
+++ b/assets/xml/objects/object_bl.xml
@@ -5,6 +5,17 @@
         <Animation Name="gBiriClimbAnim" Offset="0x64"/>
         <Animation Name="gBiriDefaultAnim" Offset="0xA4"/><!-- Used in various states, not just as an idle -->
 
+        <!-- Vertices -->
+        <Array Name="gBiriTentaclesVtx" Count="4" Offset="0xC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBiriInnerHoodVtx" Count="14" Offset="0x100">
+            <Vtx/>
+        </Array>
+        <Array Name="gBiriOuterHoodVtx" Count="29" Offset="0x1E0">
+            <Vtx/>
+        </Array>
+
         <!-- Biri DLists -->
         <DList Name="gBiriTentaclesDL" Offset="0x3B0"/>
         <DList Name="gBiriInnerHoodDL" Offset="0x448"/>
diff --git a/assets/xml/objects/object_blkobj.xml b/assets/xml/objects/object_blkobj.xml
index 9527292838..c8f3012bf4 100644
--- a/assets/xml/objects/object_blkobj.xml
+++ b/assets/xml/objects/object_blkobj.xml
@@ -3,13 +3,23 @@
         <!-- Illusion Room Collision -->
         <Collision Name="gIllusionRoomCol" Offset="0x7564"/>
 
+        <!-- Illusion Room Vertices -->
+        <Array Name="gIllusionRoomNormalVtx" Count="334" Offset="0x0">
+            <Vtx/>
+        </Array>
+        <Array Name="gIllusionRoomIllusionVtx" Count="842" Offset="0x1F30">
+            <Vtx/>
+        </Array>
+
         <!-- Illusion Room DLists -->
         <DList Name="gIllusionRoomNormalDL" Offset="0x14E0"/>
         <DList Name="gIllusionRoomIllusionDL" Offset="0x53D0"/>
 
         <!-- Unused Content -->
 
-        <!-- Illusion room DLists -->
+        <Array Name="gIllusionRoomTreeVtx" Count="146" Offset="0x7590">
+            <Vtx/>
+        </Array>
         <DList Name="gIllusionRoomTreeDL" Offset="0x7EB0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bob.xml b/assets/xml/objects/object_bob.xml
index ad59e56ea3..f3d0d55944 100644
--- a/assets/xml/objects/object_bob.xml
+++ b/assets/xml/objects/object_bob.xml
@@ -32,6 +32,53 @@
         <Texture Name="gHylianWoman2CollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x21C8" TlutOffset="0x108"/>
         <Texture Name="gHylianWoman2DressTex" OutName="dress" Format="ci8" Width="16" Height="16" Offset="0x2208" TlutOffset="0x108"/>
 
+        <!-- Vertices -->
+        <Array Name="gHylianWoman2HeadVtx" Count="125" Offset="0x2308">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2LeftHandVtx" Count="40" Offset="0x2AD8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2LeftForearmVtx" Count="21" Offset="0x2D58">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2LeftUpperArmVtx" Count="23" Offset="0x2EA8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2RightHandVtx" Count="40" Offset="0x3018">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2RightForearmVtx" Count="21" Offset="0x3298">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2RightUpperArmVtx" Count="23" Offset="0x33E8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2TorsoVtx" Count="66" Offset="0x3558">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2LeftFootVtx" Count="3" Offset="0x3978">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2LeftShinVtx" Count="3" Offset="0x39A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2LeftThighVtx" Count="3" Offset="0x39D8">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2RightFootVtx" Count="3" Offset="0x3A08">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2RightShinVtx" Count="3" Offset="0x3A38">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2RightThighVtx" Count="3" Offset="0x3A68">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman2PelvisVtx" Count="14" Offset="0x3A98">
+            <Vtx/>
+        </Array>
+
         <!-- DLs -->
         <DList Name="gHylianWoman2HeadDL" Offset="0x3B78"/>
         <DList Name="gHylianWoman2RightHandDL" Offset="0x3F68"/>
diff --git a/assets/xml/objects/object_boj.xml b/assets/xml/objects/object_boj.xml
index d43332de00..e25054fe23 100644
--- a/assets/xml/objects/object_boj.xml
+++ b/assets/xml/objects/object_boj.xml
@@ -34,6 +34,53 @@
         <Texture Name="gHylianMan2BeltShoeTex" OutName="belt_shoe" Format="ci8" Width="8" Height="8" Offset="0xA3C" TlutOffset="0xFC"/>
         <Texture Name="gHylianMan2PantsTex" OutName="pants" Format="i8" Width="8" Height="8" Offset="0xA7C"/>
 
+        <!-- Vertices -->
+        <Array Name="gHylianMan2MustachedHeadVtx" Count="83" Offset="0xAC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2LeftHandVtx" Count="28" Offset="0xFF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2LeftForearmVtx" Count="24" Offset="0x11B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2LeftUpperArmVtx" Count="26" Offset="0x1330">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2RightHandVtx" Count="28" Offset="0x14D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2RightForearmVtx" Count="24" Offset="0x1690">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2RightUpperArmVtx" Count="26" Offset="0x1810">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2TorsoVtx" Count="42" Offset="0x19B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2LeftFootVtx" Count="18" Offset="0x1C50">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2LeftShinVtx" Count="27" Offset="0x1D70">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2LeftThighVtx" Count="23" Offset="0x1F20">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2RightFootVtx" Count="18" Offset="0x2090">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2RightShinVtx" Count="27" Offset="0x21B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2RightThighVtx" Count="23" Offset="0x2360">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2PelvisVtx" Count="34" Offset="0x24D0">
+            <Vtx/>
+        </Array>
+
         <!-- DLs -->
         <DList Name="gHylianMan2MustachedHeadDL" Offset="0x26F0"/>
         <DList Name="gHylianMan2RightHandDL" Offset="0x2AC8"/>
@@ -62,6 +109,21 @@
         <Texture Name="gHylianMan2AltMustachedBeardedEyeTex" OutName="alt_mustached_bearded_eye" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3B98"/>
 
         <!-- Alternate Head DLs -->
+        <Array Name="gHylianMan2BaldHeadVtx" Count="52" Offset="0x4350">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2LongHairHeadVtx" Count="46" Offset="0x4690">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2AltMustachedHeadVtx" Count="71" Offset="0x4970">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2BeardedHeadVtx" Count="71" Offset="0x4DE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianMan2BagVtx" Count="9" Offset="0x5250">
+            <Vtx/>
+        </Array>
         <DList Name="gHylianMan2BaldHeadDL" Offset="0x52E0"/>
         <DList Name="gHylianMan2LongHairHeadDL" Offset="0x5528"/>
         <DList Name="gHylianMan2AltMustachedHeadDL" Offset="0x5738"/>
diff --git a/assets/xml/objects/object_bowl.xml b/assets/xml/objects/object_bowl.xml
index ffe6d43db7..d84a9598cd 100644
--- a/assets/xml/objects/object_bowl.xml
+++ b/assets/xml/objects/object_bowl.xml
@@ -14,5 +14,16 @@
         <Collision Name="gBowlingFirstAndFinalRoundCol" Offset="0xCB8"/>
         <Collision Name="gBowlingSecondRoundCol" Offset="0x1B00"/>
         <Collision Name="gBowlingDefaultCol" Offset="0x1C40"/>
+
+        <!-- Vertices -->
+        <Array Name="gBowlingRound1WallVtx" Count="97" Offset="0x0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBowlingRound2WallVtx" Count="106" Offset="0xCF0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_bowl_Vtx_001B30" Count="5" Offset="0x1B30">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_box.xml b/assets/xml/objects/object_box.xml
index 7ab9d9e7f4..8387130c94 100644
--- a/assets/xml/objects/object_box.xml
+++ b/assets/xml/objects/object_box.xml
@@ -9,19 +9,47 @@
         <Animation Name="gTreasureChestAnim_00043C" Offset="0x43C"/>
         <Blob Name="object_box_zeroes_Blob_00044C" Size="0x64" Offset="0x044C"/>
 
+        <Array Name="gTreasureChestChestFrontVtx" Count="36" Offset="0x4B0">
+            <Vtx/>
+        </Array>
         <DList Name="gTreasureChestChestFrontDL" Offset="0x6F0"/>
         <Texture Name="gTreasureChestFrontTex" OutName="chest_front" Format="rgba16" Width="32" Height="64" Offset="0x1798"/>
 
+        <Array Name="gTreasureChestBossKeyChestFrontVtx" Count="36" Offset="0x8A8">
+            <Vtx/>
+        </Array>
         <DList Name="gTreasureChestBossKeyChestFrontDL" Offset="0xAE8"/>
         <Texture Name="gTreasureChestBossKeyFrontTex" OutName="boss_key_front_tex" Format="rgba16" Width="32" Height="64" Offset="0x3798"/>
 
+        <Array Name="gTreasureChestChestSideAndLidVtx" Count="66" Offset="0xCA0">
+            <Vtx/>
+        </Array>
         <DList Name="gTreasureChestChestSideAndLidDL" Offset="0x10C0"/>
         <Texture Name="gTreasureChestSideAndTopTex" OutName="side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2798"/>
 
+        <Array Name="gTreasureChestBossKeyChestSideAndTopVtx" Count="66" Offset="0x1258">
+            <Vtx/>
+        </Array>
         <DList Name="gTreasureChestBossKeyChestSideAndTopDL" Offset="0x1678"/>
         <Texture Name="gTreasureChestBossKeySideAndTopTex" OutName="boss_key_side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2F98"/>
 
         <Skeleton Name="gTreasureChestSkel" Type="Flex" LimbType="Standard" Offset="0x47D8"/>
         <Collision Name="gTreasureChestCol" Offset="0x5FC8"/>
+
+        <Array Name="object_box_Vtx_005780" Count="21" Offset="0x5780">
+            <Vtx/>
+        </Array>
+        <Array Name="object_box_Vtx_0058D0" Count="4" Offset="0x58D0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_box_Vtx_005910" Count="4" Offset="0x5910">
+            <Vtx/>
+        </Array>
+        <Array Name="object_box_Vtx_005950" Count="4" Offset="0x5950">
+            <Vtx/>
+        </Array>
+        <Array Name="object_box_Vtx_005990" Count="4" Offset="0x5990">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bw.xml b/assets/xml/objects/object_bw.xml
index c2b76fd91e..8ee83090c7 100644
--- a/assets/xml/objects/object_bw.xml
+++ b/assets/xml/objects/object_bw.xml
@@ -3,11 +3,26 @@
         <!-- Torch Slug Animation -->
         <Animation Name="gTorchSlugEyestalkWaveAnim" Offset="0x228"/> <!-- Original name is "bw_aruku" ("to walk"). Used for when the Torch Slug moves around. -->
 
-        <!-- Torch Slug Limb DisplayLists -->
+        <!-- Torch Slug Limb Vertices and DisplayLists -->
+        <Array Name="gTorchSlugLeftLowerEyestalkVtx" Count="8" Offset="0x240">
+            <Vtx/>
+        </Array>
         <DList Name="gTorchSlugLeftLowerEyestalkDL" Offset="0x2C0"/>
+        <Array Name="gTorchSlugLeftUpperEyestalkVtx" Count="9" Offset="0x358">
+            <Vtx/>
+        </Array>
         <DList Name="gTorchSlugLeftUpperEyestalkDL" Offset="0x3E8"/>
+        <Array Name="gTorchSlugRightLowerEyestalkVtx" Count="8" Offset="0x4D8">
+            <Vtx/>
+        </Array>
         <DList Name="gTorchSlugRightLowerEyestalkDL" Offset="0x558"/>
+        <Array Name="gTorchSlugRightUpperEyestalkVtx" Count="9" Offset="0x5F0">
+            <Vtx/>
+        </Array>
         <DList Name="gTorchSlugRightUpperEyestalkDL" Offset="0x680"/>
+        <Array Name="gTorchSlugBodyVtx" Count="142" Offset="0x770">
+            <Vtx/>
+        </Array>
         <DList Name="gTorchSlugBodyDL" Offset="0x1050"/>
 
         <!-- Torch Slug Textures -->
diff --git a/assets/xml/objects/object_cne.xml b/assets/xml/objects/object_cne.xml
index ecf151d641..c35805885e 100644
--- a/assets/xml/objects/object_cne.xml
+++ b/assets/xml/objects/object_cne.xml
@@ -30,6 +30,53 @@
         <Texture Name="gHylianYoungWomanDressTex" OutName="dress" Format="i8" Width="8" Height="8" Offset="0x47C"/>
         <Texture Name="gHylianYoungWomanCollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
 
+        <!-- Vertices -->
+        <Array Name="gHylianYoungWomanLeftFootVtx" Count="3" Offset="0x500">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanLeftShinVtx" Count="3" Offset="0x530">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanLeftThighVtx" Count="3" Offset="0x560">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanRightFootVtx" Count="3" Offset="0x590">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanRightShinVtx" Count="3" Offset="0x5C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanRightThighVtx" Count="3" Offset="0x5F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanBrownHairHeadVtx" Count="69" Offset="0x620">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanLeftHandVtx" Count="6" Offset="0xA70">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanLeftForearmVtx" Count="17" Offset="0xAD0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanLeftUpperArmVtx" Count="11" Offset="0xBE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanRightHandVtx" Count="6" Offset="0xC90">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanRightForearmVtx" Count="17" Offset="0xCF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanRightUpperArmVtx" Count="11" Offset="0xE00">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanTorsoVtx" Count="56" Offset="0xEB0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianYoungWomanPelvisVtx" Count="13" Offset="0x1230">
+            <Vtx/>
+        </Array>
+
         <!-- DLs -->
         <DList Name="gHylianYoungWomanBrownHairHeadDL" Offset="0x1300"/>
         <DList Name="gHylianYoungWomanRightHandDL" Offset="0x1608"/>
@@ -52,6 +99,9 @@
         <Texture Name="gHylianYoungWomanOrangeHairSkinTex" OutName="orange_hair_skin" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>
 
         <!-- Orange Hair DL -->
+        <Array Name="gHylianYoungWomanOrangeHairHeadVtx" Count="49" Offset="0x2550">
+            <Vtx/>
+        </Array>
         <DList Name="gHylianYoungWomanOrangeHairHeadDL" Offset="0x2860"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_cob.xml b/assets/xml/objects/object_cob.xml
index b5047b4993..8135707021 100644
--- a/assets/xml/objects/object_cob.xml
+++ b/assets/xml/objects/object_cob.xml
@@ -8,6 +8,53 @@
         <Texture Name="gHylianWoman3DressSleevesTex" OutName="dress_sleeves" Format="ci8" Width="8" Height="8" Offset="0x300" TlutOffset="0x0"/>
         <Texture Name="gHylianWoman3ShirtTex" OutName="shirt" Format="ci8" Width="8" Height="16" Offset="0x340" TlutOffset="0x0"/>
 
+        <!-- Vertices -->
+        <Array Name="gHylianWoman3HeadVtx" Count="61" Offset="0x3C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3LeftHandVtx" Count="13" Offset="0x790">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3LeftForearmVtx" Count="20" Offset="0x860">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3LeftUpperArmVtx" Count="21" Offset="0x9A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3RightHandVtx" Count="13" Offset="0xAF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3RightForearmVtx" Count="20" Offset="0xBC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3RightUpperArmVtx" Count="21" Offset="0xD00">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3TorsoVtx" Count="46" Offset="0xE50">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3LeftFootVtx" Count="3" Offset="0x1130">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3LeftShinVtx" Count="3" Offset="0x1160">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3LeftThighVtx" Count="3" Offset="0x1190">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3RightFootVtx" Count="3" Offset="0x11C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3RightShinVtx" Count="3" Offset="0x11F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3RightThighVtx" Count="3" Offset="0x1220">
+            <Vtx/>
+        </Array>
+        <Array Name="gHylianWoman3PelvisVtx" Count="11" Offset="0x1250">
+            <Vtx/>
+        </Array>
+
         <!-- DLs -->
         <DList Name="gHylianWoman3HeadDL" Offset="0x1300"/>
         <DList Name="gHylianWoman3RightHandDL" Offset="0x1678"/>
diff --git a/assets/xml/objects/object_cow.xml b/assets/xml/objects/object_cow.xml
index 3cdad5ef93..d825f089c5 100644
--- a/assets/xml/objects/object_cow.xml
+++ b/assets/xml/objects/object_cow.xml
@@ -51,5 +51,37 @@
         <Texture Name="gCowEarTex" OutName="cow_ear" Format="ci8" Width="8" Height="16" Offset="0x3CC0" TlutOffset="0x2880"/>
         <Texture Name="gCowEyelidTex" OutName="cow_eyelid" Format="rgba16" Width="16" Height="16" Offset="0x3D40"/>
         <Texture Name="gCowTailTex" OutName="cow_tail" Format="ci8" Width="8" Height="16" Offset="0x3F40" TlutOffset="0x2880"/>
+
+        <!-- Vertices -->
+        <Array Name="gCowJawVtx" Count="21" Offset="0x1E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gCowNoseRingVtx" Count="17" Offset="0x330">
+            <Vtx/>
+        </Array>
+        <Array Name="gCowNoseVtx" Count="36" Offset="0x440">
+            <Vtx/>
+        </Array>
+        <Array Name="gCowHeadVtx" Count="129" Offset="0x680">
+            <Vtx/>
+        </Array>
+        <Array Name="gCowTorsoVtx" Count="191" Offset="0xE90">
+            <Vtx/>
+        </Array>
+        <Array Name="gCowTailEndVtx" Count="15" Offset="0x4360">
+            <Vtx/>
+        </Array>
+        <Array Name="gCowTailLowerVtx" Count="12" Offset="0x4450">
+            <Vtx/>
+        </Array>
+        <Array Name="gCowTailMiddleVtx" Count="12" Offset="0x4510">
+            <Vtx/>
+        </Array>
+        <Array Name="gCowTailUpperVtx" Count="12" Offset="0x45D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gCowTailConnectionVtx" Count="6" Offset="0x4690">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_crow.xml b/assets/xml/objects/object_crow.xml
index 5304246a00..ee166346b3 100644
--- a/assets/xml/objects/object_crow.xml
+++ b/assets/xml/objects/object_crow.xml
@@ -7,5 +7,28 @@
         <Texture Name="gGuayTailTex" OutName="tail" Format="rgba16" Width="16" Height="16" Offset="0xE40"/>
 
         <Skeleton Name="gGuaySkel" Type="Flex" LimbType="Standard" Offset="0x10C0"/>
+
+        <!-- Vertices -->
+        <Array Name="object_crow_Vtx_000100" Count="8" Offset="0x100">
+            <Vtx/>
+        </Array>
+        <Array Name="object_crow_Vtx_000180" Count="5" Offset="0x180">
+            <Vtx/>
+        </Array>
+        <Array Name="object_crow_Vtx_0001D0" Count="8" Offset="0x1D0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_crow_Vtx_000250" Count="5" Offset="0x250">
+            <Vtx/>
+        </Array>
+        <Array Name="object_crow_Vtx_0002A0" Count="25" Offset="0x2A0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_crow_Vtx_000430" Count="3" Offset="0x430">
+            <Vtx/>
+        </Array>
+        <Array Name="object_crow_Vtx_000460" Count="3" Offset="0x460">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_cs.xml b/assets/xml/objects/object_cs.xml
index 83804ccaf4..9c2443ce5d 100644
--- a/assets/xml/objects/object_cs.xml
+++ b/assets/xml/objects/object_cs.xml
@@ -17,6 +17,52 @@
         <Limb Name="gGraveyardKidRightHandLimb" LimbType="Standard" Offset="0x84EC"/>
         <Limb Name="gGraveyardKidHeadLimb" LimbType="Standard" Offset="0x84F8"/>
 
+        <Array Name="gGraveyardKidHeadVtx" Count="119" Offset="0x3D70">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidLeftHandVtx" Count="43" Offset="0x44E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidLeftArmVtx" Count="23" Offset="0x4790">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidLeftUpperArmVtx" Count="28" Offset="0x4900">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidRightHandVtx" Count="61" Offset="0x4AC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidRightArmVtx" Count="23" Offset="0x4E90">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidRightUpperArmVtx" Count="28" Offset="0x5000">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidChestVtx" Count="124" Offset="0x51C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidRightFootVtx" Count="39" Offset="0x5980">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidRightShinVtx" Count="15" Offset="0x5BF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidRightThighVtx" Count="33" Offset="0x5CE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidLeftFootVtx" Count="39" Offset="0x5EF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidLeftShinVtx" Count="15" Offset="0x6160">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidLeftThighVtx" Count="33" Offset="0x6250">
+            <Vtx/>
+        </Array>
+        <Array Name="gGraveyardKidTorsoVtx" Count="21" Offset="0x6460">
+            <Vtx/>
+        </Array>
+
         <DList Name="gGraveyardKidTorsoDL" Offset="0x7910"/>
         <DList Name="gGraveyardKidLeftThighDL" Offset="0x7F00"/>
         <DList Name="gGraveyardKidLeftShinDL" Offset="0x8050"/>
diff --git a/assets/xml/objects/object_d_hsblock.xml b/assets/xml/objects/object_d_hsblock.xml
index 4bb50c2b4f..b9a62acdfb 100644
--- a/assets/xml/objects/object_d_hsblock.xml
+++ b/assets/xml/objects/object_d_hsblock.xml
@@ -6,5 +6,12 @@
         <DList Name="gHookshotTargetDL" Offset="0x470"/>
         <Texture Name="gHookshotTargetTex" OutName="hookshot_target" Format="i4" Width="64" Height="64" Offset="0x760"/>
         <Texture Name="gHookshotPostTex" OutName="hookshot_post" Format="i8" Width="32" Height="64" Offset="0xF60"/>
+
+        <Array Name="gHookshotPostVtx" Count="33" Offset="0x0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHookshotTargetVtx" Count="20" Offset="0x330">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ddan_objects.xml b/assets/xml/objects/object_ddan_objects.xml
index b7df6ed847..6eeb481eb3 100644
--- a/assets/xml/objects/object_ddan_objects.xml
+++ b/assets/xml/objects/object_ddan_objects.xml
@@ -28,5 +28,22 @@
         <Collision Name="gDodongoLowerJawCol" Offset="0x1DDC"/>
         <Collision Name="gDodongoRisingPlatformCol" Offset="0x3CE0"/>
         <Collision Name="gDodongoFallingStairsCol" Offset="0x4F30"/>
+
+        <!-- Vertices -->
+        <Array Name="gDodongoDoorVtx" Count="12" Offset="0x0">
+            <Vtx/>
+        </Array>
+        <Array Name="gDodongoBarsVtx" Count="8" Offset="0x170">
+            <Vtx/>
+        </Array>
+        <Array Name="gDodongoLowerJawVtx" Count="116" Offset="0xC10">
+            <Vtx/>
+        </Array>
+        <Array Name="gDodongoRisingPlatformVtx" Count="58" Offset="0x3418">
+            <Vtx/>
+        </Array>
+        <Array Name="gDodongoFallingStairsVtx" Count="89" Offset="0x4318">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dekubaba.xml b/assets/xml/objects/object_dekubaba.xml
index 7202a833fc..fa587f3403 100644
--- a/assets/xml/objects/object_dekubaba.xml
+++ b/assets/xml/objects/object_dekubaba.xml
@@ -4,12 +4,30 @@
         <Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/>
         <Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/>
 
-        <!-- Deku Baba body DLists (not all are limb DLists) -->
+        <!-- Deku Baba body Vertices and DLists (not all are limb DLists) -->
+        <Array Name="gDekuBabaLowerJawVtx" Count="43" Offset="0x2D0">
+            <Vtx/>
+        </Array>
         <DList Name="gDekuBabaLowerJawDL" Offset="0x580"/>
+        <Array Name="gDekuBabaUpperJawVtx" Count="76" Offset="0x6A8">
+            <Vtx/>
+        </Array>
         <DList Name="gDekuBabaUpperJawDL" Offset="0xB68"/>
+        <Array Name="gDekuBabaBaseLeavesVtx" Count="63" Offset="0xD00">
+            <Vtx/>
+        </Array>
         <DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/>
+        <Array Name="gDekuBabaStemTopVtx" Count="16" Offset="0x1230">
+            <Vtx/>
+        </Array>
         <DList Name="gDekuBabaStemTopDL" Offset="0x1330"/>
+        <Array Name="gDekuBabaStemMiddleVtx" Count="36" Offset="0x13E8">
+            <Vtx/>
+        </Array>
         <DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/>
+        <Array Name="gDekuBabaStemBaseVtx" Count="16" Offset="0x1728">
+            <Vtx/>
+        </Array>
         <DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/>
 
         <!-- Deku Baba body textures -->
@@ -32,6 +50,9 @@
         <Skeleton Name="gDekuBabaSkel" Type="Normal" LimbType="Standard" Offset="0x2A40"/>
 
         <!-- Deku Baba stick drop -->
+        <Array Name="gDekuBabaStickDropVtx" Count="98" Offset="0x2A50">
+            <Vtx/>
+        </Array>
         <DList Name="gDekuBabaStickDropDL" Offset="0x3070"/>
         <Texture Name="gDekuBabaStickDropTex" OutName="deku_baba_stick_drop" Format="rgba16" Width="32" Height="32" Offset="0x31C0"/>
     </File>
diff --git a/assets/xml/objects/object_dekunuts.xml b/assets/xml/objects/object_dekunuts.xml
index 4a4508ee0b..8f1303fadb 100644
--- a/assets/xml/objects/object_dekunuts.xml
+++ b/assets/xml/objects/object_dekunuts.xml
@@ -28,5 +28,40 @@
         <!-- Deku Nut -->
         <DList Name="gDekuNutsDekuNutDL" Offset="0x2028"/>
         <Texture Name="gDekuNutsDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+
+        <!-- Vertices -->
+        <Array Name="object_dekunuts_Vtx_001040" Count="24" Offset="0x1040">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dekunuts_Vtx_0011C0" Count="7" Offset="0x11C0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dekunuts_Vtx_001230" Count="5" Offset="0x1230">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dekunuts_Vtx_001280" Count="6" Offset="0x1280">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dekunuts_Vtx_0012E0" Count="15" Offset="0x12E0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dekunuts_Vtx_0013D0" Count="5" Offset="0x13D0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dekunuts_Vtx_001420" Count="7" Offset="0x1420">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dekunuts_Vtx_001490" Count="43" Offset="0x1490">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dekunuts_Vtx_001740" Count="24" Offset="0x1740">
+            <Vtx/>
+        </Array>
+        <Array Name="gDekuNutsDekuNutVtx" Count="3" Offset="0x1FF8">
+            <Vtx/>
+        </Array>
+        <Array Name="gDekuNutsFlowerVtx" Count="30" Offset="0x20B8">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_demo_kekkai.xml b/assets/xml/objects/object_demo_kekkai.xml
index 8b7b739c64..256a9fdebc 100644
--- a/assets/xml/objects/object_demo_kekkai.xml
+++ b/assets/xml/objects/object_demo_kekkai.xml
@@ -2,41 +2,86 @@
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_demo_kekkai" Segment="6">
         <!-- Demo_Kekkai -->
+        <Array Name="gTowerBarrierVtx" Count="46" Offset="0x4650">
+            <Vtx/>
+        </Array>
         <DList Name="gTowerBarrierDL" Offset="0x4930"/>
+        <Array Name="gTrialBarrierFloorVtx" Count="4" Offset="0x4EC0">
+            <Vtx/>
+        </Array>
         <DList Name="gTrialBarrierFloorDL" Offset="0x4F00"/>
         <Array Name="gTrialBarrierEnergyVtx" Count="102" Offset="0x4FD0">
             <Vtx/>
         </Array>
         <DList Name="gTrialBarrierEnergyDL" Offset="0x5A30"/>
+        <Array Name="gTrialBarrierOrbVtx" Count="64" Offset="0x5630">
+            <Vtx/>
+        </Array>
         <DList Name="gTrialBarrierOrbDL" Offset="0x5CB0"/>
 
         <!-- Bg_Gnd_Darkmeiro -->
+        <Array Name="gShadowTrialPathVtx" Count="48" Offset="0x85B0">
+            <Vtx/>
+        </Array>
         <DList Name="gShadowTrialPathDL" Offset="0x88B0"/>
+        <Array Name="gClearBlockVtx" Count="24" Offset="0xBD40">
+            <Vtx/>
+        </Array>
         <DList Name="gClearBlockDL" Offset="0xBEC0"/>
         <Collision Name="gClearBlockCol" Offset="0xC080"/>
 
         <!-- Bg_Gnd_Firemeiro -->
+        <Array Name="gFireTrialPlatformVtx" Count="150" Offset="0xD8B0">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTrialPlatformDL" Offset="0xE210"/>
         <Collision Name="gFireTrialPlatformCol" Offset="0xECD8"/>
 
         <!-- Bg_Gnd_Iceblock -->
+        <Array Name="gWaterTrialIceBlockVtx" Count="24" Offset="0x42A0">
+            <Vtx/>
+        </Array>
         <DList Name="gWaterTrialIceBlockDL" Offset="0x4420"/>
         <Collision Name="gWaterTrialIceBlockCol" Offset="0x4618"/>
 
         <!-- Bg_Gnd_Nisekabe -->
+        <Array Name="gLightTrialFakeWallVtx" Count="6" Offset="0x91D0">
+            <Vtx/>
+        </Array>
         <DList Name="gLightTrialFakeWallDL" Offset="0x9230"/>
+        <Array Name="gGanonsCastleUnusedFakeWallVtx" Count="12" Offset="0xA2D0">
+            <Vtx/>
+        </Array>
         <DList Name="gGanonsCastleUnusedFakeWallDL" Offset="0xA390"/>
+        <Array Name="gGanonsCastleScrubsFakeWallVtx" Count="6" Offset="0xB440">
+            <Vtx/>
+        </Array>
         <DList Name="gGanonsCastleScrubsFakeWallDL" Offset="0xB4A0"/>
 
         <!-- Bg_Gnd_Soulmeiro -->
+        <Array Name="gSpiritTrialWebVtx" Count="44" Offset="0x7940">
+            <Vtx/>
+        </Array>
         <DList Name="gSpiritTrialWebDL" Offset="0x7C00"/>
+        <Array Name="gSpiritTrialLightSourceVtx" Count="26" Offset="0x2180">
+            <Vtx/>
+        </Array>
         <DList Name="gSpiritTrialLightSourceDL" Offset="0x2320"/>
+        <Array Name="gSpiritTrialLightFloorVtx" Count="21" Offset="0x3450">
+            <Vtx/>
+        </Array>
         <DList Name="gSpiritTrialLightFloorDL" Offset="0x35A0"/>
 
         <!-- Object_Kankyo -->
+        <Array Name="gDemoKekkaiVtx_005E30" Count="28" Offset="0x5E30">
+            <Vtx/>
+        </Array>
         <DList Name="gDemoKekkaiDL_005FF0" Offset="0x5FF0"/>
 
         <!-- Door_Shutter -->
+        <Array Name="gGanonsCastleDoorVtx" Count="13" Offset="0x2000">
+            <Vtx/>
+        </Array>
         <DList Name="gGanonsCastleDoorDL" Offset="0x20D0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dnk.xml b/assets/xml/objects/object_dnk.xml
index 1efec46aad..00b5da9157 100644
--- a/assets/xml/objects/object_dnk.xml
+++ b/assets/xml/objects/object_dnk.xml
@@ -22,6 +22,44 @@
         <!-- Forest Stage scrub Deku Nut (used by Nutsball) -->
         <DList Name="gDntStageNutDL" Offset="0x1890"/>
 
+        <!-- Vertices -->
+        <Array Name="object_dnk_Vtx_000B80" Count="6" Offset="0xB80">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dnk_Vtx_000BE0" Count="10" Offset="0xBE0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dnk_Vtx_000C80" Count="15" Offset="0xC80">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dnk_Vtx_000D70" Count="28" Offset="0xD70">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dnk_Vtx_000F30" Count="6" Offset="0xF30">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dnk_Vtx_000F90" Count="6" Offset="0xF90">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dnk_Vtx_000FF0" Count="4" Offset="0xFF0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dnk_Vtx_001030" Count="4" Offset="0x1030">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dnk_Vtx_001070" Count="7" Offset="0x1070">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dnk_Vtx_0010E0" Count="7" Offset="0x10E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gDntStageNutVtx" Count="3" Offset="0x1860">
+            <Vtx/>
+        </Array>
+        <Array Name="gDntStageFlowerVtx" Count="30" Offset="0x1920">
+            <Vtx/>
+        </Array>
+
         <!-- Unused Content -->
 
         <!-- Forest Stage scrub animation -->
diff --git a/assets/xml/objects/object_dns.xml b/assets/xml/objects/object_dns.xml
index e66a639874..5989afbc5f 100644
--- a/assets/xml/objects/object_dns.xml
+++ b/assets/xml/objects/object_dns.xml
@@ -23,6 +23,50 @@
         <!-- Forest Stage leader deku nut (used by NutsBall) -->
         <DList Name="gDntJijiNutDL" Offset="0x2410"/>
 
+        <!-- Vertices -->
+        <Array Name="object_dns_Vtx_0012C0" Count="6" Offset="0x12C0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dns_Vtx_001320" Count="7" Offset="0x1320">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dns_Vtx_001390" Count="7" Offset="0x1390">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dns_Vtx_001400" Count="10" Offset="0x1400">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dns_Vtx_0014A0" Count="15" Offset="0x14A0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dns_Vtx_001590" Count="29" Offset="0x1590">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dns_Vtx_001760" Count="4" Offset="0x1760">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dns_Vtx_0017A0" Count="4" Offset="0x17A0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dns_Vtx_0017E0" Count="4" Offset="0x17E0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dns_Vtx_001820" Count="4" Offset="0x1820">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dns_Vtx_001860" Count="6" Offset="0x1860">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dns_Vtx_0018C0" Count="4" Offset="0x18C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gDntJijiFlowerVtx" Count="30" Offset="0x2130">
+            <Vtx/>
+        </Array>
+        <Array Name="gDntJijiNutVtx" Count="3" Offset="0x23E0">
+            <Vtx/>
+        </Array>
+
         <!-- Unused Content -->
 
         <!-- Forest Stage leader unused animations -->
@@ -30,6 +74,5 @@
         <Animation Name="gDntJijiDanceAnim" Offset="0x82C"/>
         <Animation Name="gDntJijiUnkAnim" Offset="0xF98"/> <!-- This animation seems corrupted-->
         <Animation Name="gDntJijiWaitAnim" Offset="0x364C"/>
-
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dodongo.xml b/assets/xml/objects/object_dodongo.xml
index 779e20e9dc..e7b00e7d31 100644
--- a/assets/xml/objects/object_dodongo.xml
+++ b/assets/xml/objects/object_dodongo.xml
@@ -37,5 +37,46 @@
 
         <!-- Fire Effect -->
         <DList Name="gDodongoFireDL" Offset="0x98A0"/>
+
+        <!-- Vertices -->
+        <Array Name="object_dodongo_Vtx_004C30" Count="30" Offset="0x4C30">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dodongo_Vtx_004E10" Count="29" Offset="0x4E10">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dodongo_Vtx_004FE0" Count="19" Offset="0x4FE0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dodongo_Vtx_005110" Count="57" Offset="0x5110">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dodongo_Vtx_0054A0" Count="27" Offset="0x54A0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dodongo_Vtx_005650" Count="19" Offset="0x5650">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dodongo_Vtx_005780" Count="12" Offset="0x5780">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dodongo_Vtx_005840" Count="68" Offset="0x5840">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dodongo_Vtx_005C80" Count="78" Offset="0x5C80">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dodongo_Vtx_006160" Count="19" Offset="0x6160">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dodongo_Vtx_006290" Count="29" Offset="0x6290">
+            <Vtx/>
+        </Array>
+        <Array Name="object_dodongo_Vtx_006460" Count="30" Offset="0x6460">
+            <Vtx/>
+        </Array>
+        <Array Name="gDodongoFireVtx" Count="4" Offset="0x9900">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_door_gerudo.xml b/assets/xml/objects/object_door_gerudo.xml
index 2f17262041..6f9ec37e45 100644
--- a/assets/xml/objects/object_door_gerudo.xml
+++ b/assets/xml/objects/object_door_gerudo.xml
@@ -1,6 +1,9 @@
 <Root>
     <File Name="object_door_gerudo" Segment="6">
         <Texture Name="gGerudoCellDoorTex" OutName="cell_door" Format="rgba16" Width="16" Height="64" Offset="0x1A0"/>
+        <Array Name="gGerudoCellDoorVtx" Count="4" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="gGerudoCellDoorDL" Offset="0x40"/>
         <Collision Name="gGerudoCellDoorCol" Offset="0x170"/>
     </File>
diff --git a/assets/xml/objects/object_door_killer.xml b/assets/xml/objects/object_door_killer.xml
index 7f8d8f186c..8ef83cd9fa 100644
--- a/assets/xml/objects/object_door_killer.xml
+++ b/assets/xml/objects/object_door_killer.xml
@@ -48,6 +48,14 @@
             <Vtx/>
         </Array>
         <DList Name="object_door_killer_DL_001A58" Offset="0x1A58"/>
+        <Limb Name="object_door_killer_001B28_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B28" Offset="0x1B28"/>
+        <Limb Name="object_door_killer_001B38_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B38" Offset="0x1B38"/>
+        <Limb Name="object_door_killer_001B48_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B48" Offset="0x1B48"/>
+        <Limb Name="object_door_killer_001B58_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B58" Offset="0x1B58"/>
+        <Limb Name="object_door_killer_001B68_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B68" Offset="0x1B68"/>
+        <Limb Name="object_door_killer_001B78_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B78" Offset="0x1B78"/>
+        <Limb Name="object_door_killer_001B88_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B88" Offset="0x1B88"/>
+        <Limb Name="object_door_killer_001B98_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B98" Offset="0x1B98"/>
         <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="LOD" Offset="0x1BC8"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ds.xml b/assets/xml/objects/object_ds.xml
index b2fb1a5c26..2dea3f869b 100644
--- a/assets/xml/objects/object_ds.xml
+++ b/assets/xml/objects/object_ds.xml
@@ -34,5 +34,19 @@
 
         <!-- Potion Shop Lady Animations-->
         <Animation Name="gPotionShopLadyAnim" Offset="0x39C"/>
+
+        <!-- Vertices -->
+        <Array Name="gPotionShopLadyHeadVtx" Count="315" Offset="0x3B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gPotionShopLadyArmVtx" Count="141" Offset="0x1760">
+            <Vtx/>
+        </Array>
+        <Array Name="gPotionShopLadyTorsoVtx" Count="40" Offset="0x2030">
+            <Vtx/>
+        </Array>
+        <Array Name="gPotionShopLadyCatVtx" Count="121" Offset="0x22B0">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dy_obj.xml b/assets/xml/objects/object_dy_obj.xml
index 4c6eb5871d..63a200b102 100644
--- a/assets/xml/objects/object_dy_obj.xml
+++ b/assets/xml/objects/object_dy_obj.xml
@@ -117,5 +117,96 @@
             <Vtx/>
         </Array>
 
+        <!-- Vertices -->
+        <Array Name="gGreatFairyParticleModelVtx" Count="4" Offset="0x5820">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyBetaVtx" Count="778" Offset="0xA0B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyFlowerVtx" Count="6" Offset="0xD150">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyLeftFootVtx" Count="28" Offset="0xDD00">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyLeftLegVtx" Count="33" Offset="0xDEC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyLeftThighVtx" Count="75" Offset="0xE0D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyLeftHairTipVtx" Count="7" Offset="0xE580">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyLeftHairUpperPartVtx" Count="31" Offset="0xE5F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyLeftHairMiddlePartVtx" Count="13" Offset="0xE7E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyLeftHairLowerPartVtx" Count="43" Offset="0xE8B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyRightHairTipVtx" Count="7" Offset="0xEB60">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyRightHairUpperPartVtx" Count="13" Offset="0xEBD0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyRightHairMiddlePartVtx" Count="27" Offset="0xECA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyRightHairLowerPartVtx" Count="19" Offset="0xEE50">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyMiddleHairTipVtx" Count="9" Offset="0xEF80">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyMiddleHairUpperPartVtx" Count="17" Offset="0xF010">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyMiddleHairMiddlePartVtx" Count="17" Offset="0xF120">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyMiddleHairLowerPartVtx" Count="41" Offset="0xF230">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyHeadVtx" Count="221" Offset="0xF4C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyLeftHandVtx" Count="120" Offset="0x10290">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyLeftForearmVtx" Count="47" Offset="0x10A10">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyLeftUpperArmVtx" Count="25" Offset="0x10D00">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyRightHandVtx" Count="120" Offset="0x10E90">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyRightForearmVtx" Count="47" Offset="0x11610">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyRightUpperArmVtx" Count="25" Offset="0x11900">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyTorsoVtx" Count="275" Offset="0x11A90">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyRightFootVtx" Count="28" Offset="0x12BC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyRightLegVtx" Count="33" Offset="0x12D80">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyRightThighVtx" Count="60" Offset="0x12F90">
+            <Vtx/>
+        </Array>
+        <Array Name="gGreatFairyWaistVtx" Count="56" Offset="0x13350">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_efc_doughnut.xml b/assets/xml/objects/object_efc_doughnut.xml
index 7f12c56f53..e141c4ab4d 100644
--- a/assets/xml/objects/object_efc_doughnut.xml
+++ b/assets/xml/objects/object_efc_doughnut.xml
@@ -2,7 +2,13 @@
     <File Name="object_efc_doughnut" Segment="6">
         <Texture Name="gDeathMountainCloudFireTex" OutName="cloud_fire" Format="ia8" Width="16" Height="32" Offset="0x0"/>
         <Texture Name="gDeathMountainCloudNormalTex" OutName="cloud_normal" Format="ia16" Width="32" Height="32" Offset="0x780"/>
+        <Array Name="gDeathMountainCloudCircleFieryVtx" Count="70" Offset="0x200">
+            <Vtx/>
+        </Array>
         <DList Name="gDeathMountainCloudCircleFieryDL" Offset="0x660"/>
+        <Array Name="gDeathMountainCloudCircleNormalVtx" Count="4" Offset="0xF80">
+            <Vtx/>
+        </Array>
         <DList Name="gDeathMountainCloudCircleNormalDL" Offset="0xFC0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ei.xml b/assets/xml/objects/object_ei.xml
index cabad17ff8..c2f191deaf 100644
--- a/assets/xml/objects/object_ei.xml
+++ b/assets/xml/objects/object_ei.xml
@@ -52,5 +52,40 @@
         <Animation Name="gStingerBackflipAnim" Offset="0x704"/>
         <Animation Name="gStingerHitAnim" Offset="0xFC0"/>
         <Animation Name="gStingerIdleAnim" Offset="0x12AC"/>
+
+        <!-- Vertices -->
+        <Array Name="gStingerLeftWingBaseVtx" Count="24" Offset="0x1700">
+            <Vtx/>
+        </Array>
+        <Array Name="gStingerLeftWingEndVtx" Count="30" Offset="0x1880">
+            <Vtx/>
+        </Array>
+        <Array Name="gStingerRightWingBaseVtx" Count="24" Offset="0x1A60">
+            <Vtx/>
+        </Array>
+        <Array Name="gStingerRightWingEndVtx" Count="30" Offset="0x1BE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStingerBodyVtx" Count="25" Offset="0x1DC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStingerTailRootVtx" Count="28" Offset="0x1F50">
+            <Vtx/>
+        </Array>
+        <Array Name="gStingerTailUpperVtx" Count="10" Offset="0x2110">
+            <Vtx/>
+        </Array>
+        <Array Name="gStingerTailLowerVtx" Count="5" Offset="0x21B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStingerHeadVtx" Count="23" Offset="0x2200">
+            <Vtx/>
+        </Array>
+        <Array Name="gStingerFinUpperVtx" Count="9" Offset="0x2370">
+            <Vtx/>
+        </Array>
+        <Array Name="gStingerFinLowerVtx" Count="7" Offset="0x2400">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_fd2.xml b/assets/xml/objects/object_fd2.xml
index 8d2b3dcdb6..e6c4d6cce8 100644
--- a/assets/xml/objects/object_fd2.xml
+++ b/assets/xml/objects/object_fd2.xml
@@ -38,5 +38,118 @@
         <Array Name="gHoleVolvagiaVtx_00D000" Count="150" Offset="0xD000">
             <Vtx/>
         </Array>
+
+        <!-- Vertices -->
+        <Array Name="object_fd2_Vtx_000000" Count="67" Offset="0x0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_000430" Count="23" Offset="0x430">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_0005A0" Count="32" Offset="0x5A0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_0007A0" Count="20" Offset="0x7A0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_0008E0" Count="20" Offset="0x8E0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_000A20" Count="12" Offset="0xA20">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_000AE0" Count="8" Offset="0xAE0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_000B60" Count="5" Offset="0xB60">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_000BB0" Count="8" Offset="0xBB0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_000C30" Count="8" Offset="0xC30">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_000CB0" Count="8" Offset="0xCB0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_000D30" Count="9" Offset="0xD30">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_000DC0" Count="8" Offset="0xDC0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_000E40" Count="5" Offset="0xE40">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_000E90" Count="8" Offset="0xE90">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_000F10" Count="8" Offset="0xF10">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_000F90" Count="8" Offset="0xF90">
+            <Vtx/>
+        </Array>
+        <Array Name="gHoleVolvagiaManeModelVtx" Count="4" Offset="0x4B08">
+            <Vtx/>
+        </Array>
+        <Array Name="gHoleVolvagiaBrokenFaceVtx" Count="21" Offset="0x4CE8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00CDC0" Count="36" Offset="0xCDC0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00D960" Count="66" Offset="0xD960">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00E720" Count="25" Offset="0xE720">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00E8B0" Count="25" Offset="0xE8B0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00EA40" Count="25" Offset="0xEA40">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00EBD0" Count="26" Offset="0xEBD0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00ED70" Count="25" Offset="0xED70">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00EF00" Count="25" Offset="0xEF00">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00F090" Count="25" Offset="0xF090">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00F220" Count="20" Offset="0xF220">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00F360" Count="25" Offset="0xF360">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00F4F0" Count="26" Offset="0xF4F0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00F690" Count="20" Offset="0xF690">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00F7D0" Count="21" Offset="0xF7D0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00F920" Count="25" Offset="0xF920">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00FAB0" Count="26" Offset="0xFAB0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00FC50" Count="25" Offset="0xFC50">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fd2_Vtx_00FDE0" Count="25" Offset="0xFDE0">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_firefly.xml b/assets/xml/objects/object_firefly.xml
index 8c26a43418..e7de1cfc44 100644
--- a/assets/xml/objects/object_firefly.xml
+++ b/assets/xml/objects/object_firefly.xml
@@ -17,5 +17,39 @@
         <Texture Name="gFireKeeseEarTex" OutName="fire_ear" Format="rgba16" Width="16" Height="8" Offset="0x310"/>
         <Texture Name="gFireKeeseTalonTex" OutName="fire_talon" Format="rgba16" Width="8" Height="16" Offset="0x410"/>
         <Texture Name="gFireKeeseWingTex" OutName="fire_wing" Format="rgba16" Width="4" Height="16" Offset="0x510"/>
+
+        <Array Name="object_firefly_Vtx_000890" Count="26" Offset="0x890">
+            <Vtx/>
+        </Array>
+        <Array Name="object_firefly_Vtx_000A30" Count="17" Offset="0xA30">
+            <Vtx/>
+        </Array>
+        <Array Name="object_firefly_Vtx_000B40" Count="3" Offset="0xB40">
+            <Vtx/>
+        </Array>
+        <Array Name="object_firefly_Vtx_000B70" Count="4" Offset="0xB70">
+            <Vtx/>
+        </Array>
+        <Array Name="object_firefly_Vtx_000BB0" Count="3" Offset="0xBB0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_firefly_Vtx_000BE0" Count="3" Offset="0xBE0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_firefly_Vtx_000C10" Count="3" Offset="0xC10">
+            <Vtx/>
+        </Array>
+        <Array Name="object_firefly_Vtx_000C40" Count="3" Offset="0xC40">
+            <Vtx/>
+        </Array>
+        <Array Name="object_firefly_Vtx_000C70" Count="3" Offset="0xC70">
+            <Vtx/>
+        </Array>
+        <Array Name="object_firefly_Vtx_000CA0" Count="3" Offset="0xCA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gKeeseEyesVtx" Count="6" Offset="0xCD0">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_fish.xml b/assets/xml/objects/object_fish.xml
index 2ce27bac3a..c640a6bcd1 100644
--- a/assets/xml/objects/object_fish.xml
+++ b/assets/xml/objects/object_fish.xml
@@ -2,6 +2,42 @@
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_fish" Segment="6">
         <Animation Name="gFishingFishAnim" Offset="0x7C"/>
+        <Array Name="object_fish_Vtx_000090" Count="5" Offset="0x90">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_0000E0" Count="11" Offset="0xE0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_000190" Count="34" Offset="0x190">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_0003B0" Count="3" Offset="0x3B0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_0003E0" Count="3" Offset="0x3E0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_000410" Count="26" Offset="0x410">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_0005B0" Count="3" Offset="0x5B0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_0005E0" Count="3" Offset="0x5E0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_000610" Count="30" Offset="0x610">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_0007F0" Count="15" Offset="0x7F0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_0008E0" Count="3" Offset="0x8E0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_000910" Count="3" Offset="0x910">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingFishDL_000940" Offset="0x940"/>
         <DList Name="gFishingFishDL_0009E8" Offset="0x9E8"/>
         <DList Name="gFishingFishDL_000B00" Offset="0xB00"/>
@@ -40,30 +76,81 @@
 
         <Texture Name="gFishingOldLureHookTex" OutName="fishing_old_lure_hook" Format="rgba16" Width="8" Height="16" Offset="0x29D0"/>
         <Texture Name="gFishingOldLureFloatTex" OutName="fishing_old_lure_float" Format="rgba16" Width="8" Height="8" Offset="0x2AD0"/>
+        <Array Name="gFishingOldLureVtx" Count="8" Offset="0x2B50">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingOldLureDL" Offset="0x2BD0"/>
 
         <Texture Name="gFishingStreamSplashTile1Tex" OutName="fishing_stream_splash_tile_1" Format="i4" Width="32" Height="64" Offset="0x2CE0"/>
         <Texture Name="gFishingStreamSplashTile2Tex" OutName="fishing_stream_splash_tile_2" Format="i4" Width="16" Height="16" Offset="0x30E0"/>
+        <Array Name="gFishingStreamSplashVtx" Count="13" Offset="0x3160">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingStreamSplashDL" Offset="0x3230"/>
 
         <Texture Name="gFishingBubbleTex" OutName="fishing_bubble" Format="ia8" Width="16" Height="16" Offset="0x3320"/>
+        <Array Name="gFishingBubbleModelVtx" Count="4" Offset="0x3420">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingBubbleMaterialDL" Offset="0x3460"/>
         <DList Name="gFishingBubbleModelDL" Offset="0x34C0"/>
 
         <Texture Name="gFishingDustSplashTex" OutName="fishing_dust_splash" Format="i8" Width="16" Height="16" Offset="0x34E0"/>
+        <Array Name="gFishingDustSplashModelVtx" Count="3" Offset="0x35E0">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingDustSplashMaterialDL" Offset="0x3610"/>
         <DList Name="gFishingDustSplashModelDL" Offset="0x3680"/>
 
+        <Array Name="gFishingLineModelVtx" Count="4" Offset="0x36A0">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingUnusedMaterialDL" Offset="0x36E0"/>
         <DList Name="gFishingLineModelDL" Offset="0x3710"/>
 
+        <Array Name="gFishingRainDropModelVtx" Count="3" Offset="0x3730">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingRainDropModelDL" Offset="0x3760"/>
 
         <Texture Name="gFishingRainSplashTex" OutName="fishing_rain_splash" Format="rgba16" Width="16" Height="16" Offset="0x3778"/>
+        <Array Name="gFishingRainSplashModelVtx" Count="3" Offset="0x3978">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8"/>
         <DList Name="gFishingRainSplashModelDL" Offset="0x3A18"/>
 
         <Animation Name="gFishingOwnerAnim" Offset="0x453C"/>
+        <Array Name="object_fish_Vtx_004550" Count="159" Offset="0x4550">
+            <Vtx/>
+        </Array>
+        <Array Name="gFishingOwnerHatVtx" Count="40" Offset="0x4F40">
+            <Vtx/>
+        </Array>
+        <Array Name="gFishingOwnerHairVtx" Count="107" Offset="0x51C0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_005870" Count="79" Offset="0x5870">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_005D60" Count="24" Offset="0x5D60">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_005EE0" Count="40" Offset="0x5EE0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_006160" Count="79" Offset="0x6160">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_006650" Count="24" Offset="0x6650">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_0067D0" Count="40" Offset="0x67D0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_006A50" Count="81" Offset="0x6A50">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingOwnerDL_006F60" Offset="0x6F60"/>
         <DList Name="gFishingOwnerHairDL" Offset="0x7350"/>
         <DList Name="gFishingOwnerHatDL" Offset="0x74C8"/>
@@ -88,6 +175,9 @@
         <DList Name="gFishingRippleModelDL" Offset="0x8678"/>
 
         <Texture Name="gFishingWaterDustTex" OutName="fishing_water_dust" Format="i4" Width="32" Height="32" Offset="0x8690"/>
+        <Array Name="gFishingWaterDustModelVtx" Count="3" Offset="0x8890">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0"/>
         <DList Name="gFishingWaterDustModelDL" Offset="0x8970"/>
 
@@ -108,17 +198,59 @@
         <Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810" TlutOffset="0x8990"/>
 
         <Texture Name="gFishingSinkingLureSegmentTex" OutName="fishing_sinking_lure_segment" Format="ia8" Width="64" Height="64" Offset="0xA910"/>
+        <Array Name="gFishingSinkingLureSegmentModelVtx" Count="4" Offset="0xB910">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950"/>
         <DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0"/>
 
         <Texture Name="gFishingGroupFishTex" OutName="fishing_group_fish" Format="rgba16" Width="64" Height="16" Offset="0xB9E0"/>
+        <Array Name="gFishingGroupFishModelVtx" Count="4" Offset="0xC1E0">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingGroupFishMaterialDL" Offset="0xC220"/>
         <DList Name="gFishingGroupFishModelDL" Offset="0xC298"/>
 
+        <Array Name="gFishingUnusedRockVtx" Count="58" Offset="0xC2B0">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingUnusedRockDL" Offset="0xC650"/>
         <Texture Name="gFishingUnusedRockTex" OutName="fishing_unused_rock" Format="rgba16" Width="32" Height="32" Offset="0xC780"/>
 
         <Animation Name="gFishingLoachAnim" Offset="0xCFE0"/>
+        <Array Name="object_fish_Vtx_00CFF0" Count="47" Offset="0xCFF0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_00D2E0" Count="5" Offset="0xD2E0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_00D330" Count="63" Offset="0xD330">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_00D720" Count="3" Offset="0xD720">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_00D750" Count="57" Offset="0xD750">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_00DAE0" Count="36" Offset="0xDAE0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_00DD20" Count="3" Offset="0xDD20">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_00DD50" Count="3" Offset="0xDD50">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_00DD80" Count="3" Offset="0xDD80">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_00DDB0" Count="13" Offset="0xDDB0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_fish_Vtx_00DE80" Count="5" Offset="0xDE80">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingLoachDL_00DED0" Offset="0xDED0"/>
         <DList Name="gFishingLoachDL_00DFA8" Offset="0xDFA8"/>
         <DList Name="gFishingLoachDL_00E048" Offset="0xE048"/>
@@ -152,29 +284,56 @@
         <Texture Name="gFishingRodSegmentStripTex" OutName="fishing_rod_segment_strip" Format="rgba16" Width="16" Height="8" Offset="0x11070"/>
         <Texture Name="gFishingRodSegmentBlackTex" OutName="fishing_rod_segment_black" Format="rgba16" Width="16" Height="8" Offset="0x11170"/>
         <Texture Name="gFishingRodSegmentWhiteTex" OutName="fishing_rod_segment_white" Format="rgba16" Width="16" Height="8" Offset="0x11270"/>
+        <Array Name="gFishingRodSegmentVtx" Count="6" Offset="0x11370">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingRodMaterialDL" Offset="0x113D0"/>
         <DList Name="gFishingRodSegmentDL" Offset="0x11410"/>
 
         <Texture Name="gFishingLureHookTex" OutName="fishing_lure_hook" Format="rgba16" Width="32" Height="32" Offset="0x11440"/>
         <Texture Name="gFishingLureFloatTex" OutName="fishing_lure_float" Format="rgba16" Width="32" Height="16" Offset="0x11C40"/>
+        <Array Name="gFishingLureHookVtx" Count="4" Offset="0x12040">
+            <Vtx/>
+        </Array>
+        <Array Name="gFishingLureFloatVtx" Count="14" Offset="0x12080">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingLureHookDL" Offset="0x12160"/>
         <DList Name="gFishingLureFloatDL" Offset="0x121F0"/>
 
         <Texture Name="gFishingLilyPadTex" OutName="fishing_lily_pad" Format="rgba16" Width="32" Height="32" Offset="0x122E0"/>
         <Texture Name="gFishingRockTex" OutName="fishing_rock" Format="rgba16" Width="32" Height="32" Offset="0x12AE0"/>
+        <Array Name="gFishingLilyPadModelVtx" Count="5" Offset="0x132E0">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingLilyPadMaterialDL" Offset="0x13330"/>
         <DList Name="gFishingLilyPadModelDL" Offset="0x133B0"/>
+        <Array Name="gFishingRockModelVtx" Count="28" Offset="0x133D0">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingRockMaterialDL" Offset="0x13590"/>
         <DList Name="gFishingRockModelDL" Offset="0x13610"/>
         <Texture Name="gFishingWoodPostTex" OutName="fishing_wood_post" Format="rgba16" Width="32" Height="32" Offset="0x13660"/>
+        <Array Name="gFishingWoodPostModelVtx" Count="15" Offset="0x13E60">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50"/>
         <DList Name="gFishingWoodPostModelDL" Offset="0x13FD0"/>
+        <Array Name="gFishingReedModelVtx" Count="3" Offset="0x14000">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingReedMaterialDL" Offset="0x14030"/>
         <DList Name="gFishingReedModelDL" Offset="0x140B0"/>
 
         <Texture Name="gFishingAquariumBottomTex" OutName="fishing_aquarium_bottom" Format="rgba16" Width="16" Height="16" Offset="0x140D0"/>
         <Texture Name="gFishingAquariumWaterTex" OutName="fishing_aquarium_water" Format="rgba16" Width="32" Height="32" Offset="0x142D0"/>
         <Texture Name="gFishingAquariumGlassTex" OutName="fishing_aquarium_glass" Format="i8" Width="32" Height="32" Offset="0x14AD0"/>
+        <Array Name="gFishingAquariumBottomVtx" Count="8" Offset="0x14ED0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFishingAquariumContainerVtx" Count="72" Offset="0x14F50">
+            <Vtx/>
+        </Array>
         <DList Name="gFishingAquariumBottomDL" Offset="0x153D0"/>
         <DList Name="gFishingAquariumContainerDL" Offset="0x15470"/>
     </File>
diff --git a/assets/xml/objects/object_fu.xml b/assets/xml/objects/object_fu.xml
index 3947e438c0..673472c973 100644
--- a/assets/xml/objects/object_fu.xml
+++ b/assets/xml/objects/object_fu.xml
@@ -51,5 +51,51 @@
         <Limb Name="gWindmillManRightHandAndCrankLimb" LimbType="Standard" Offset="0x6C30"/>
         <Limb Name="gWindmillManHeadLimb" LimbType="Standard" Offset="0x6C3C"/>
         <Limb Name="gWindmillManHornLimb" LimbType="Standard" Offset="0x6C48"/>
+
+        <Array Name="gWindmillManBlueTriangleVtx" Count="3" Offset="0xB20">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManLeftArmAndMusicBoxVtx" Count="59" Offset="0xB50">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManRightHandAndCrankVtx" Count="58" Offset="0xF00">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManRightArmVtx" Count="24" Offset="0x12A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManRightShoulderVtx" Count="24" Offset="0x1420">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManHornVtx" Count="48" Offset="0x15A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManHeadVtx" Count="133" Offset="0x18A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManChestAndMusicBoxPipeVtx" Count="112" Offset="0x20F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManLeftFootVtx" Count="14" Offset="0x27F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManLeftLegVtx" Count="28" Offset="0x28D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManLeftThighVtx" Count="23" Offset="0x2A90">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManRightFootVtx" Count="14" Offset="0x2C00">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManRightLegVtx" Count="28" Offset="0x2CE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManRightThighVtx" Count="23" Offset="0x2EA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gWindmillManTorsoVtx" Count="18" Offset="0x3010">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_fw.xml b/assets/xml/objects/object_fw.xml
index 51462a3166..d18ac114a1 100644
--- a/assets/xml/objects/object_fw.xml
+++ b/assets/xml/objects/object_fw.xml
@@ -101,5 +101,100 @@
         <Animation Name="gFlareDancerCoreInitRunCycleAnim" Offset="0x6CF8"/>
         <Animation Name="gFlareDancerCoreRunCycleAnim" Offset="0x7CD0"/>
         <Animation Name="gFlareDancerCoreEndRunCycleAnim" Offset="0x7DC8"/>
+
+        <!-- Vertices -->
+        <Array Name="gFlareDancerRightStiltVtx" Count="12" Offset="0x2AF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerLowerRightLegVtx" Count="9" Offset="0x2BB0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerUpperRightLegVtx" Count="12" Offset="0x2C40">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerLeftStiltVtx" Count="12" Offset="0x2D00">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerLowerLeftLegVtx" Count="12" Offset="0x2DC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerUpperLeftLegVtx" Count="12" Offset="0x2E80">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerDressVtx" Count="30" Offset="0x2F40">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerFuseVtx" Count="23" Offset="0x3120">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerRightSwordVtx" Count="40" Offset="0x3290">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerRightForearmVtx" Count="16" Offset="0x3510">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerRightUpperArmVtx" Count="16" Offset="0x3610">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerLeftSwordVtx" Count="40" Offset="0x3710">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerLeftForearmVtx" Count="13" Offset="0x3990">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerLeftUpperArmVtx" Count="16" Offset="0x3A60">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerHeadVtx" Count="16" Offset="0x3B60">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerTorsoVtx" Count="20" Offset="0x3C60">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerLowerFireHairVtx" Count="10" Offset="0x3DA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerMiddleFireHair3Vtx" Count="6" Offset="0x3E40">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerMiddleFireHair2Vtx" Count="6" Offset="0x3EA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerMiddleFireHair1Vtx" Count="6" Offset="0x3F00">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerUpperFireHairVtx" Count="6" Offset="0x3F60">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerCoreFuseVtx" Count="23" Offset="0x6D10">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerCoreBodyVtx" Count="20" Offset="0x6E80">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerCoreRightFootVtx" Count="12" Offset="0x6FC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerCoreLowerRightLegVtx" Count="12" Offset="0x7080">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerCoreUpperRightLegVtx" Count="8" Offset="0x7140">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerCoreLeftFootVtx" Count="17" Offset="0x71C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerCoreLowerLeftLegVtx" Count="12" Offset="0x72D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerCoreUpperLeftLegVtx" Count="8" Offset="0x7390">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerSquareParticleVtx" Count="4" Offset="0x7988">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlareDancerTriangleParticleVtx" Count="3" Offset="0x79C8">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_fz.xml b/assets/xml/objects/object_fz.xml
index bbed88b106..bd01a38707 100644
--- a/assets/xml/objects/object_fz.xml
+++ b/assets/xml/objects/object_fz.xml
@@ -9,5 +9,24 @@
         <DList Name="gFreezardIceTriangleDL" Offset="0x3260"/>
         <DList Name="gFreezardIceRockDL" Offset="0x33F0"/>
         <Texture Name="gFreezardSteamTex" OutName="steam" Format="i4" Width="32" Height="32" Offset="0x2E70"/>
+
+        <Array Name="gFreezardIntactVtx" Count="275" Offset="0x0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFreezardTopRightHornChippedVtx" Count="219" Offset="0x13F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFreezardHeadChippedVtx" Count="139" Offset="0x23F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFreezardSteamVtx" Count="3" Offset="0x3070">
+            <Vtx/>
+        </Array>
+        <Array Name="gFreezardIceTriangleVtx" Count="14" Offset="0x3180">
+            <Vtx/>
+        </Array>
+        <Array Name="gFreezardIceRockVtx" Count="14" Offset="0x3310">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ganon.xml b/assets/xml/objects/object_ganon.xml
index 412acb66e0..4eb7dabcdb 100644
--- a/assets/xml/objects/object_ganon.xml
+++ b/assets/xml/objects/object_ganon.xml
@@ -1,6 +1,71 @@
 <Root>
     <!-- Assets for Ganondorf -->
     <File Name="object_ganon" Segment="6">
+        <!-- Ganondorf Limb Vertices -->
+        <Array Name="gGanondorfJawVtx" Count="43" Offset="0x0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfMouthVtx" Count="40" Offset="0x2B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightUpperLipVtx" Count="19" Offset="0x530">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftUpperLipVtx" Count="19" Offset="0x660">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLowerHairEndVtx" Count="41" Offset="0x790">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfUpperHairEndVtx" Count="49" Offset="0xA20">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfHeadVtx" Count="196" Offset="0xD30">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftForearmVtx" Count="26" Offset="0x1970">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftUpperArmVtx" Count="71" Offset="0x1B10">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftShoulderVtx" Count="35" Offset="0x1F80">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightForearmVtx" Count="26" Offset="0x21B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightUpperArmVtx" Count="71" Offset="0x2350">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightShoulderVtx" Count="35" Offset="0x27C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfTorsoVtx" Count="118" Offset="0x29F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftFootVtx" Count="40" Offset="0x3150">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftShinVtx" Count="53" Offset="0x33D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftThighVtx" Count="59" Offset="0x3720">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightFootVtx" Count="40" Offset="0x3AD0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightShinVtx" Count="53" Offset="0x3D50">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightThighVtx" Count="59" Offset="0x40A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfPelvisVtx" Count="87" Offset="0x4450">
+            <Vtx/>
+        </Array>
+
         <!-- Ganondorf Limb DisplayLists -->
         <DList Name="gGanondorfPelvisDL" Offset="0x49C0"/>
         <DList Name="gGanondorfRightShinDL" Offset="0x4C08"/>
@@ -58,6 +123,22 @@
         <Texture Name="gGanondorfCrazedEyeTex" OutName="ganondorf_crazed_eye" Format="rgba16" Width="32" Height="16" Offset="0xA4E0"/>
         <Texture Name="gGanondorfEmptyEyeTex" OutName="ganondorf_empty_eye" Format="rgba16" Width="32" Height="16" Offset="0xA8E0"/>
 
+        <Array Name="gGanondorfEyesVtx" Count="10" Offset="0xACE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfJewelVtx" Count="20" Offset="0xAD80">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftHandVtx" Count="55" Offset="0xAEC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightHandClosedVtx" Count="55" Offset="0xB230">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightHandOpenVtx" Count="143" Offset="0xB5A0">
+            <Vtx/>
+        </Array>
+
         <!-- DisplayList for Ganondorf's eyes -->
         <DList Name="gGanondorfEyesDL" Offset="0xBE90"/>
 
diff --git a/assets/xml/objects/object_ganon2.xml b/assets/xml/objects/object_ganon2.xml
index cebdf819b5..7391787e9c 100644
--- a/assets/xml/objects/object_ganon2.xml
+++ b/assets/xml/objects/object_ganon2.xml
@@ -13,6 +13,113 @@
         <Animation Name="gGanonGuardSidestepAnim" Offset="0xF1D0"/> <!-- Unused. Original name is "gn2_Ksidewalk" -->
         <Animation Name="gGanonGuardIdleAnim" Offset="0xFFE4"/> <!-- Original name is "gn2_Kwait" -->
 
+        <!-- Ganon Limb Vertices -->
+        <Array Name="gGanonRightHair3Vtx" Count="19" Offset="0x10000">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightHair2Vtx" Count="17" Offset="0x10130">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightHair1Vtx" Count="5" Offset="0x10240">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftHair3Vtx" Count="19" Offset="0x10290">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftHair2Vtx" Count="17" Offset="0x103C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftHair1Vtx" Count="5" Offset="0x104D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonMiddleHair3Vtx" Count="30" Offset="0x10520">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonMiddleHair2Vtx" Count="25" Offset="0x10700">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonMiddleHair1Vtx" Count="11" Offset="0x10890">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonJawVtx" Count="60" Offset="0x10940">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonMouthVtx" Count="62" Offset="0x10D00">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonSnoutVtx" Count="15" Offset="0x110E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonHeadVtx" Count="204" Offset="0x111D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonNeckVtx" Count="32" Offset="0x11E90">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightWristVtx" Count="16" Offset="0x12090">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightForearmVtx" Count="45" Offset="0x12190">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightUpperArmVtx" Count="71" Offset="0x12460">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightShoulderVtx" Count="35" Offset="0x128D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftWristVtx" Count="16" Offset="0x12B00">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftForearmVtx" Count="45" Offset="0x12C00">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftUpperArmVtx" Count="71" Offset="0x12ED0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftShoulderVtx" Count="35" Offset="0x13340">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonTorsoVtx" Count="130" Offset="0x13570">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftFootVtx" Count="55" Offset="0x13D90">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftShinVtx" Count="70" Offset="0x14100">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftThighVtx" Count="79" Offset="0x14560">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightFootVtx" Count="55" Offset="0x14A50">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightShinVtx" Count="69" Offset="0x14DC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightThighVtx" Count="79" Offset="0x15210">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonTail1Vtx" Count="18" Offset="0x15700">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonTail2Vtx" Count="18" Offset="0x15820">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonTail3Vtx" Count="24" Offset="0x15940">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonTail4Vtx" Count="36" Offset="0x15AC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonTail5Vtx" Count="32" Offset="0x15D00">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonPelvisVtx" Count="79" Offset="0x15F00">
+            <Vtx/>
+        </Array>
+
         <!-- Ganon Limb DisplayLists -->
         <DList Name="gGanonPelvisDL" Offset="0x163F0"/>
         <DList Name="gGanonTail1DL" Offset="0x16630"/>
@@ -92,6 +199,38 @@
         <Texture Name="gGanonEyeHalfTex" OutName="ganon_eye_half" Format="ci4" Width="16" Height="16" Offset="0x1E988" TlutOffset="0x1D780"/>
         <Texture Name="gGanonEyeClosedTex" OutName="ganon_eye_closed" Format="ci4" Width="16" Height="16" Offset="0x1EA08" TlutOffset="0x1D780"/>
 
+        <!-- Ganon Limb Vertices -->
+        <Array Name="gGanonEyesVtx" Count="10" Offset="0x1EA88">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonJewelVtx" Count="10" Offset="0x1EB28">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightHornVtx" Count="58" Offset="0x1EBC8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftHornVtx" Count="56" Offset="0x1EF68">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightHandVtx" Count="79" Offset="0x1F2E8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftHandVtx" Count="79" Offset="0x1F7D8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightSwordVtx" Count="100" Offset="0x1FCC8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftSwordVtx" Count="97" Offset="0x20308">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonOuterTeethVtx" Count="22" Offset="0x20918">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonInnerTeethVtx" Count="10" Offset="0x20A78">
+            <Vtx/>
+        </Array>
+
         <!-- Ganon Limb DisplayLists -->
         <DList Name="gGanonEyesDL" Offset="0x20B18"/>
         <DList Name="gGanonJewelDL" Offset="0x20BE0"/>
diff --git a/assets/xml/objects/object_ganon2_pal.xml b/assets/xml/objects/object_ganon2_pal.xml
index 93f3a05e5e..bed3b0aa9b 100644
--- a/assets/xml/objects/object_ganon2_pal.xml
+++ b/assets/xml/objects/object_ganon2_pal.xml
@@ -13,6 +13,113 @@
         <Animation Name="gGanonGuardSidestepAnim" Offset="0xF1D0"/> <!-- Unused. Original name is "gn2_Ksidewalk" -->
         <Animation Name="gGanonGuardIdleAnim" Offset="0xFFE4"/> <!-- Original name is "gn2_Kwait" -->
 
+        <!-- Ganon Limb Vertices -->
+        <Array Name="gGanonRightHair3Vtx" Count="19" Offset="0x10000">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightHair2Vtx" Count="17" Offset="0x10130">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightHair1Vtx" Count="5" Offset="0x10240">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftHair3Vtx" Count="19" Offset="0x10290">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftHair2Vtx" Count="17" Offset="0x103C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftHair1Vtx" Count="5" Offset="0x104D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonMiddleHair3Vtx" Count="30" Offset="0x10520">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonMiddleHair2Vtx" Count="25" Offset="0x10700">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonMiddleHair1Vtx" Count="11" Offset="0x10890">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonJawVtx" Count="60" Offset="0x10940">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonMouthVtx" Count="62" Offset="0x10D00">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonSnoutVtx" Count="15" Offset="0x110E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonHeadVtx" Count="204" Offset="0x111D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonNeckVtx" Count="32" Offset="0x11E90">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightWristVtx" Count="16" Offset="0x12090">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightForearmVtx" Count="45" Offset="0x12190">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightUpperArmVtx" Count="71" Offset="0x12460">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightShoulderVtx" Count="35" Offset="0x128D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftWristVtx" Count="16" Offset="0x12B00">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftForearmVtx" Count="45" Offset="0x12C00">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftUpperArmVtx" Count="71" Offset="0x12ED0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftShoulderVtx" Count="35" Offset="0x13340">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonTorsoVtx" Count="130" Offset="0x13570">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftFootVtx" Count="55" Offset="0x13D90">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftShinVtx" Count="70" Offset="0x14100">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftThighVtx" Count="79" Offset="0x14560">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightFootVtx" Count="55" Offset="0x14A50">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightShinVtx" Count="69" Offset="0x14DC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightThighVtx" Count="79" Offset="0x15210">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonTail1Vtx" Count="18" Offset="0x15700">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonTail2Vtx" Count="18" Offset="0x15820">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonTail3Vtx" Count="24" Offset="0x15940">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonTail4Vtx" Count="36" Offset="0x15AC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonTail5Vtx" Count="32" Offset="0x15D00">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonPelvisVtx" Count="79" Offset="0x15F00">
+            <Vtx/>
+        </Array>
+
         <!-- Ganon Limb DisplayLists -->
         <DList Name="gGanonPelvisDL" Offset="0x163F0"/>
         <DList Name="gGanonTail1DL" Offset="0x16630"/>
@@ -92,6 +199,38 @@
         <Texture Name="gGanonEyeHalfTex" OutName="ganon_eye_half" Format="ci4" Width="16" Height="16" Offset="0x1E988" TlutOffset="0x1D780"/>
         <Texture Name="gGanonEyeClosedTex" OutName="ganon_eye_closed" Format="ci4" Width="16" Height="16" Offset="0x1EA08" TlutOffset="0x1D780"/>
 
+        <!-- Ganon Limb Vertices -->
+        <Array Name="gGanonEyesVtx" Count="10" Offset="0x1EA88">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonJewelVtx" Count="10" Offset="0x1EB28">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightHornVtx" Count="58" Offset="0x1EBC8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftHornVtx" Count="56" Offset="0x1EF68">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightHandVtx" Count="79" Offset="0x1F2E8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftHandVtx" Count="79" Offset="0x1F7D8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonRightSwordVtx" Count="100" Offset="0x1FCC8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonLeftSwordVtx" Count="97" Offset="0x20308">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonOuterTeethVtx" Count="22" Offset="0x20918">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanonInnerTeethVtx" Count="10" Offset="0x20A78">
+            <Vtx/>
+        </Array>
+
         <!-- Ganon Limb DisplayLists -->
         <DList Name="gGanonEyesDL" Offset="0x20B18"/>
         <DList Name="gGanonJewelDL" Offset="0x20BE0"/>
diff --git a/assets/xml/objects/object_ganon_pal.xml b/assets/xml/objects/object_ganon_pal.xml
index c5dd938235..17317d878e 100644
--- a/assets/xml/objects/object_ganon_pal.xml
+++ b/assets/xml/objects/object_ganon_pal.xml
@@ -1,6 +1,71 @@
 <Root>
     <!-- Assets for Ganondorf -->
     <File Name="object_ganon" Segment="6">
+        <!-- Ganondorf Limb Vertices -->
+        <Array Name="gGanondorfJawVtx" Count="43" Offset="0x0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfMouthVtx" Count="40" Offset="0x2B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightUpperLipVtx" Count="19" Offset="0x530">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftUpperLipVtx" Count="19" Offset="0x660">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLowerHairEndVtx" Count="41" Offset="0x790">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfUpperHairEndVtx" Count="49" Offset="0xA20">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfHeadVtx" Count="196" Offset="0xD30">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftForearmVtx" Count="26" Offset="0x1970">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftUpperArmVtx" Count="71" Offset="0x1B10">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftShoulderVtx" Count="35" Offset="0x1F80">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightForearmVtx" Count="26" Offset="0x21B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightUpperArmVtx" Count="71" Offset="0x2350">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightShoulderVtx" Count="35" Offset="0x27C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfTorsoVtx" Count="118" Offset="0x29F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftFootVtx" Count="40" Offset="0x3150">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftShinVtx" Count="53" Offset="0x33D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftThighVtx" Count="59" Offset="0x3720">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightFootVtx" Count="40" Offset="0x3AD0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightShinVtx" Count="53" Offset="0x3D50">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightThighVtx" Count="59" Offset="0x40A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfPelvisVtx" Count="87" Offset="0x4450">
+            <Vtx/>
+        </Array>
+
         <!-- Ganondorf Limb DisplayLists -->
         <DList Name="gGanondorfPelvisDL" Offset="0x49C0"/>
         <DList Name="gGanondorfRightShinDL" Offset="0x4C08"/>
@@ -58,6 +123,22 @@
         <Texture Name="gGanondorfCrazedEyeTex" OutName="ganondorf_crazed_eye" Format="rgba16" Width="32" Height="16" Offset="0xA4E0"/>
         <Texture Name="gGanondorfEmptyEyeTex" OutName="ganondorf_empty_eye" Format="rgba16" Width="32" Height="16" Offset="0xA8E0"/>
 
+        <Array Name="gGanondorfEyesVtx" Count="10" Offset="0xACE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfJewelVtx" Count="20" Offset="0xAD80">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfLeftHandVtx" Count="55" Offset="0xAEC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightHandClosedVtx" Count="55" Offset="0xB230">
+            <Vtx/>
+        </Array>
+        <Array Name="gGanondorfRightHandOpenVtx" Count="143" Offset="0xB5A0">
+            <Vtx/>
+        </Array>
+
         <!-- DisplayList for Ganondorf's eyes -->
         <DList Name="gGanondorfEyesDL" Offset="0xBE90"/>
 
diff --git a/assets/xml/objects/object_ge1.xml b/assets/xml/objects/object_ge1.xml
index c3c3e0db39..d116d2098f 100644
--- a/assets/xml/objects/object_ge1.xml
+++ b/assets/xml/objects/object_ge1.xml
@@ -74,5 +74,61 @@
         <Animation Name="gGerudoWhiteIdleAnim" Offset="0x0228"/>
         <Animation Name="gGerudoWhiteClapAnim" Offset="0xA048"/>
         <Animation Name="gGerudoWhiteDismissiveAnim" Offset="0xA498"/>
+
+        <!-- Vertices -->
+        <Array Name="gGerudoWhiteHeadVtx" Count="123" Offset="0x2B08">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteLeftHandVtx" Count="55" Offset="0x32B8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteLeftForearmVtx" Count="24" Offset="0x3628">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteLeftUpperArmVtx" Count="24" Offset="0x37A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteRightHandVtx" Count="55" Offset="0x3928">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteRightForearmVtx" Count="24" Offset="0x3C98">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteRightUpperArmVtx" Count="24" Offset="0x3E18">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteTorsoVtx" Count="118" Offset="0x3F98">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteLeftFootVtx" Count="49" Offset="0x46F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteLeftShinVtx" Count="32" Offset="0x4A08">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteLeftThighVtx" Count="28" Offset="0x4C08">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteRightFootVtx" Count="49" Offset="0x4DC8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteRightShinVtx" Count="32" Offset="0x50D8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteRightThighVtx" Count="28" Offset="0x52D8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteWaistVtx" Count="23" Offset="0x5498">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteHairstyleBobVtx" Count="161" Offset="0x7588">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteHairstyleStraightFringeVtx" Count="125" Offset="0x7F98">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoWhiteHairstyleSpikyVtx" Count="163" Offset="0x8768">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_geldb.xml b/assets/xml/objects/object_geldb.xml
index a1dbd18f40..4d23d80e8c 100644
--- a/assets/xml/objects/object_geldb.xml
+++ b/assets/xml/objects/object_geldb.xml
@@ -24,5 +24,64 @@
         <!-- These hints are currently needed for ZAPD to extract the textures properly. -->
         <Texture Name="sGerudoRedTexHint1" Format="rgba16" Width="18" Height="14" Offset="0x5D30"/>
         <Texture Name="sGerudoRedTexHint2" Format="ci8" Width="8" Height="8" Offset="0x5F28" TlutOffset="0x5D30"/>
+
+        <!-- Vertices -->
+        <Array Name="object_geldb_Vtx_002C00" Count="30" Offset="0x2C00">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_002DE0" Count="25" Offset="0x2DE0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_002F70" Count="30" Offset="0x2F70">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_003150" Count="25" Offset="0x3150">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_0032E0" Count="101" Offset="0x32E0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_003930" Count="65" Offset="0x3930">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_003D40" Count="31" Offset="0x3D40">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_003F30" Count="61" Offset="0x3F30">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_004300" Count="31" Offset="0x4300">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_0044F0" Count="63" Offset="0x44F0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_007128" Count="43" Offset="0x7128">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_0073D8" Count="43" Offset="0x73D8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_007688" Count="34" Offset="0x7688">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_0078A8" Count="35" Offset="0x78A8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_007AD8" Count="34" Offset="0x7AD8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_007CF8" Count="35" Offset="0x7CF8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_007F28" Count="12" Offset="0x7F28">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_007FE8" Count="14" Offset="0x7FE8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_geldb_Vtx_0080C8" Count="232" Offset="0x80C8">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_gi_boots_2.xml b/assets/xml/objects/object_gi_boots_2.xml
index 026e9a482a..ae5d148421 100644
--- a/assets/xml/objects/object_gi_boots_2.xml
+++ b/assets/xml/objects/object_gi_boots_2.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_boots_2" Segment="6">
+        <Texture Name="object_gi_boots_2_000000_Tex" Format="ia8" Width="16" Height="16" Offset="0x0"/>
         <Array Name="gGiIronBootsVtx" Count="287" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_butterfly.xml b/assets/xml/objects/object_gi_butterfly.xml
index 23487544e4..65eed5b0e8 100644
--- a/assets/xml/objects/object_gi_butterfly.xml
+++ b/assets/xml/objects/object_gi_butterfly.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_butterfly" Segment="6">
+        <Texture Name="object_gi_butterfly_000000_Tex" Format="ia4" Width="24" Height="48" Offset="0x0"/>
         <Array Name="gGiButterflyContainerVtx" Count="65" Offset="0x240">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_clothes.xml b/assets/xml/objects/object_gi_clothes.xml
index 32550cfc8d..be9853eb8f 100644
--- a/assets/xml/objects/object_gi_clothes.xml
+++ b/assets/xml/objects/object_gi_clothes.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="object_gi_clothes" Segment="6">
+        <Texture Name="object_gi_clothes_000000_Tex" Format="i4" Width="64" Height="64" Offset="0x0"/>
         <Array Name="gGiTunicCollarVtx" Count="16" Offset="0x800">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_dekupouch.xml b/assets/xml/objects/object_gi_dekupouch.xml
index f51d885c01..d717edb8ba 100644
--- a/assets/xml/objects/object_gi_dekupouch.xml
+++ b/assets/xml/objects/object_gi_dekupouch.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_dekupouch" Segment="6">
+        <Texture Name="object_gi_dekupouch_000000_Tex" Format="i4" Width="32" Height="16" Offset="0x0"/>
+        <Texture Name="object_gi_dekupouch_000100_Tex" Format="i4" Width="32" Height="32" Offset="0x100"/>
         <Array Name="gGiBulletBagVtx" Count="111" Offset="0x300">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_fire.xml b/assets/xml/objects/object_gi_fire.xml
index ddeafaaf48..0211f60187 100644
--- a/assets/xml/objects/object_gi_fire.xml
+++ b/assets/xml/objects/object_gi_fire.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_fire" Segment="6">
+        <Texture Name="object_gi_fire_000000_Tex" Format="i8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_fire_000200_Tex" Format="i8" Width="16" Height="32" Offset="0x200"/>
         <Array Name="gGiBlueFireChamberstickVtx" Count="130" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_frog.xml b/assets/xml/objects/object_gi_frog.xml
index 503f08c416..53384429b4 100644
--- a/assets/xml/objects/object_gi_frog.xml
+++ b/assets/xml/objects/object_gi_frog.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_frog" Segment="6">
+        <Texture Name="object_gi_frog_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiFrogVtx" Count="139" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_gerudo.xml b/assets/xml/objects/object_gi_gerudo.xml
index ac80cdd2f7..34986a295e 100644
--- a/assets/xml/objects/object_gi_gerudo.xml
+++ b/assets/xml/objects/object_gi_gerudo.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_gerudo" Segment="6">
+        <Texture Name="object_gi_gerudo_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiGerudoCardVtx" Count="182" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_gerudomask.xml b/assets/xml/objects/object_gi_gerudomask.xml
index 3b42e2ee29..94576b0406 100644
--- a/assets/xml/objects/object_gi_gerudomask.xml
+++ b/assets/xml/objects/object_gi_gerudomask.xml
@@ -1,5 +1,11 @@
 <Root>
     <File Name="object_gi_gerudomask" Segment="6">
+        <Texture Name="object_gi_gerudomask_000000_Tex" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Blob Name="object_gi_gerudomask_000200_Blob" Size="0x8" Offset="0x200"/>
+        <Texture Name="object_gi_gerudomask_000208_Tex" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="object_gi_gerudomask_000248_Tex" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0"/>
+        <Texture Name="object_gi_gerudomask_000348_Tex" Format="ci8" Width="16" Height="16" Offset="0x348" TlutOffset="0x0"/>
+        <Texture Name="object_gi_gerudomask_000448_Tex" Format="ci8" Width="32" Height="32" Offset="0x448" TlutOffset="0x0"/>
         <Array Name="gGiGerudoMaskVtx" Count="138" Offset="0x848">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ghost.xml b/assets/xml/objects/object_gi_ghost.xml
index 30a0edf1eb..5dbf39480f 100644
--- a/assets/xml/objects/object_gi_ghost.xml
+++ b/assets/xml/objects/object_gi_ghost.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ghost" Segment="6">
+        <Texture Name="object_gi_ghost_000000_Tex" Format="i8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_ghost_000200_Tex" Format="i8" Width="16" Height="32" Offset="0x200"/>
         <Array Name="gGiGhostContainerLidVtx" Count="56" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_gloves.xml b/assets/xml/objects/object_gi_gloves.xml
index 09976d11ef..85ad6ddeff 100644
--- a/assets/xml/objects/object_gi_gloves.xml
+++ b/assets/xml/objects/object_gi_gloves.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_gloves" Segment="6">
+        <Texture Name="object_gi_gloves_000000_Tex" Format="i8" Width="64" Height="32" Offset="0x0"/>
         <Array Name="gGiGauntletsVtx" Count="152" Offset="0x800">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_golonmask.xml b/assets/xml/objects/object_gi_golonmask.xml
index ac8d86669c..68dbddb365 100644
--- a/assets/xml/objects/object_gi_golonmask.xml
+++ b/assets/xml/objects/object_gi_golonmask.xml
@@ -1,5 +1,11 @@
 <Root>
     <File Name="object_gi_golonmask" Segment="6">
+        <Texture Name="object_gi_golonmask_000000_Tex" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Blob Name="object_gi_golonmask_000200_Blob" Size="0x8" Offset="0x200"/>
+        <Texture Name="object_gi_golonmask_000208_Tex" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="object_gi_golonmask_000248_Tex" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0"/>
+        <Texture Name="object_gi_golonmask_000348_Tex" Format="ci8" Width="32" Height="32" Offset="0x348" TlutOffset="0x0"/>
+        <Texture Name="object_gi_golonmask_000748_Tex" Format="ci8" Width="64" Height="32" Offset="0x748" TlutOffset="0x0"/>
         <Array Name="gGiGoronMaskVtx" Count="91" Offset="0xF48">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_hoverboots.xml b/assets/xml/objects/object_gi_hoverboots.xml
index 5b3bf0c80f..fed584e742 100644
--- a/assets/xml/objects/object_gi_hoverboots.xml
+++ b/assets/xml/objects/object_gi_hoverboots.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_hoverboots" Segment="6">
+        <Texture Name="object_gi_hoverboots_000000_Tex" Format="ia4" Width="48" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_hoverboots_000300_Tex" Format="i4" Width="16" Height="32" Offset="0x300"/>
         <Array Name="gGiHoverBootsVtx" Count="325" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ki_tan_mask.xml b/assets/xml/objects/object_gi_ki_tan_mask.xml
index ad6763bb9c..b888acfe73 100644
--- a/assets/xml/objects/object_gi_ki_tan_mask.xml
+++ b/assets/xml/objects/object_gi_ki_tan_mask.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ki_tan_mask" Segment="6">
+        <Texture Name="object_gi_ki_tan_mask_000000_Tex" Format="ia8" Width="8" Height="32" Offset="0x0"/>
         <Array Name="gGiKeatonMaskVtx" Count="148" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_letter.xml b/assets/xml/objects/object_gi_letter.xml
index d6acdf820d..098b8cca79 100644
--- a/assets/xml/objects/object_gi_letter.xml
+++ b/assets/xml/objects/object_gi_letter.xml
@@ -1,5 +1,7 @@
 <Root>
     <File Name="object_gi_letter" Segment="6">
+        <Texture Name="object_gi_letter_000000_Tex" Format="i8" Width="48" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_letter_000600_Tex" Format="ia8" Width="48" Height="32" Offset="0x600"/>
         <Array Name="gGiLetterVtx" Count="8" Offset="0xC00">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_liquid.xml b/assets/xml/objects/object_gi_liquid.xml
index 27ef25b0b0..133d8ce902 100644
--- a/assets/xml/objects/object_gi_liquid.xml
+++ b/assets/xml/objects/object_gi_liquid.xml
@@ -1,6 +1,9 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_liquid" Segment="6">
+        <Texture Name="object_gi_liquid_000000_Tex" Format="ia8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_liquid_000200_Tex" Format="ia8" Width="16" Height="32" Offset="0x200"/>
+        <Texture Name="object_gi_liquid_000400_Tex" Format="ia8" Width="16" Height="32" Offset="0x400"/>
         <Array Name="gGiPotionPotVtx" Count="176" Offset="0x600">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_milk.xml b/assets/xml/objects/object_gi_milk.xml
index a1904f7f1d..cc72cec9d1 100644
--- a/assets/xml/objects/object_gi_milk.xml
+++ b/assets/xml/objects/object_gi_milk.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_milk" Segment="6">
+        <Texture Name="object_gi_milk_000000_Tex" Format="i8" Width="72" Height="24" Offset="0x0"/>
         <Array Name="gGiMilkBottleContentsVtx" Count="63" Offset="0x6C0">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_niwatori.xml b/assets/xml/objects/object_gi_niwatori.xml
index 9bea0dbbaf..edf67f88d8 100644
--- a/assets/xml/objects/object_gi_niwatori.xml
+++ b/assets/xml/objects/object_gi_niwatori.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_niwatori" Segment="6">
+        <Texture Name="object_gi_niwatori_000000_Tex" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_gi_niwatori_000800_Tex" Format="ia8" Width="32" Height="32" Offset="0x800"/>
         <Array Name="gGiChickenVtx" Count="153" Offset="0xC00">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_nuts.xml b/assets/xml/objects/object_gi_nuts.xml
index 590c78d7dd..d4a2f0e9cd 100644
--- a/assets/xml/objects/object_gi_nuts.xml
+++ b/assets/xml/objects/object_gi_nuts.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_nuts" Segment="6">
+        <Texture Name="object_gi_nuts_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiNutVtx" Count="169" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ocarina.xml b/assets/xml/objects/object_gi_ocarina.xml
index 4e85cc04e1..dafcb92424 100644
--- a/assets/xml/objects/object_gi_ocarina.xml
+++ b/assets/xml/objects/object_gi_ocarina.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ocarina" Segment="6">
+        <Texture Name="object_gi_ocarina_000000_Tex" Format="i8" Width="16" Height="16" Offset="0x0"/>
         <Array Name="gGiOcarinaTimeVtx" Count="100" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ocarina_0.xml b/assets/xml/objects/object_gi_ocarina_0.xml
index 7ec13c466e..e43bb3a87c 100644
--- a/assets/xml/objects/object_gi_ocarina_0.xml
+++ b/assets/xml/objects/object_gi_ocarina_0.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ocarina_0" Segment="6">
+        <Texture Name="object_gi_ocarina_0_000000_Tex" Format="i8" Width="16" Height="16" Offset="0x0"/>
         <Array Name="gGiOcarinaFairyVtx" Count="105" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_prescription.xml b/assets/xml/objects/object_gi_prescription.xml
index 619252fafb..1b4e54ec5d 100644
--- a/assets/xml/objects/object_gi_prescription.xml
+++ b/assets/xml/objects/object_gi_prescription.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_prescription" Segment="6">
+        <Texture Name="object_gi_prescription_000000_Tex" Format="ia8" Width="32" Height="48" Offset="0x0"/>
         <Array Name="gGiPrescriptionVtx" Count="30" Offset="0x600">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_purse.xml b/assets/xml/objects/object_gi_purse.xml
index c896b47de0..70ec500508 100644
--- a/assets/xml/objects/object_gi_purse.xml
+++ b/assets/xml/objects/object_gi_purse.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="object_gi_purse" Segment="6">
+        <Texture Name="object_gi_purse_000000_Tex" Format="i8" Width="64" Height="64" Offset="0x0"/>
         <Array Name="gGiWalletVtx" Count="32" Offset="0x1000">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_rabit_mask.xml b/assets/xml/objects/object_gi_rabit_mask.xml
index 64e82b888c..65b6cdd4bc 100644
--- a/assets/xml/objects/object_gi_rabit_mask.xml
+++ b/assets/xml/objects/object_gi_rabit_mask.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_rabit_mask" Segment="6">
+        <Texture Name="object_gi_rabit_mask_000000_Tex" Format="ia8" Width="16" Height="16" Offset="0x0"/>
         <Array Name="gGiBunnyHoodVtx" Count="166" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_shield_1.xml b/assets/xml/objects/object_gi_shield_1.xml
index 5fa12c7cc2..c7a5c7cb42 100644
--- a/assets/xml/objects/object_gi_shield_1.xml
+++ b/assets/xml/objects/object_gi_shield_1.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_shield_1" Segment="6">
+        <Texture Name="object_gi_shield_1_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiDekuShieldVtx" Count="101" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_shield_3.xml b/assets/xml/objects/object_gi_shield_3.xml
index 2ff34c2f23..3550bd0d89 100644
--- a/assets/xml/objects/object_gi_shield_3.xml
+++ b/assets/xml/objects/object_gi_shield_3.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_shield_3" Segment="6">
+        <Texture Name="object_gi_shield_3_000000_Tex" Format="i4" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_shield_3_000400_Tex" Format="i4" Width="64" Height="64" Offset="0x400"/>
         <Array Name="gGiMirrorShieldVtx" Count="49" Offset="0xC00">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_soldout.xml b/assets/xml/objects/object_gi_soldout.xml
index 517750ee9a..ba45784761 100644
--- a/assets/xml/objects/object_gi_soldout.xml
+++ b/assets/xml/objects/object_gi_soldout.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="object_gi_soldout" Segment="6">
+        <Texture Name="object_gi_soldout_000000_Tex" Format="ia8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiSoldOutVtx" Count="4" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_soul.xml b/assets/xml/objects/object_gi_soul.xml
index 1487b57042..519226270d 100644
--- a/assets/xml/objects/object_gi_soul.xml
+++ b/assets/xml/objects/object_gi_soul.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_soul" Segment="6">
+        <Texture Name="object_gi_soul_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiFairyContainerBaseCapVtx" Count="69" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ticketstone.xml b/assets/xml/objects/object_gi_ticketstone.xml
index cebc99a759..ce756e3abc 100644
--- a/assets/xml/objects/object_gi_ticketstone.xml
+++ b/assets/xml/objects/object_gi_ticketstone.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ticketstone" Segment="6">
+        <Texture Name="object_gi_ticketstone_000000_Tex" Format="i4" Width="48" Height="24" Offset="0x0"/>
+        <Texture Name="object_gi_ticketstone_000240_Tex" Format="i8" Width="32" Height="24" Offset="0x240"/>
         <Array Name="gGiClaimCheckVtx" Count="138" Offset="0x540">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_truth_mask.xml b/assets/xml/objects/object_gi_truth_mask.xml
index fbeab76d3e..32c550560c 100644
--- a/assets/xml/objects/object_gi_truth_mask.xml
+++ b/assets/xml/objects/object_gi_truth_mask.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_truth_mask" Segment="6">
+        <Texture Name="object_gi_truth_mask_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_truth_mask_000400_Tex" Format="i8" Width="32" Height="32" Offset="0x400"/>
         <Array Name="gGiMaskOfTruthVtx" Count="158" Offset="0x800">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_zoramask.xml b/assets/xml/objects/object_gi_zoramask.xml
index 06bca27371..0788f67f0d 100644
--- a/assets/xml/objects/object_gi_zoramask.xml
+++ b/assets/xml/objects/object_gi_zoramask.xml
@@ -1,5 +1,11 @@
 <Root>
     <File Name="object_gi_zoramask" Segment="6">
+        <Texture Name="object_gi_zoramask_000000_Tex" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Blob Name="object_gi_zoramask_000200_Blob" Size="0x8" Offset="0x200"/>
+        <Texture Name="object_gi_zoramask_000208_Tex" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="object_gi_zoramask_000248_Tex" Format="ci8" Width="32" Height="32" Offset="0x248" TlutOffset="0x0"/>
+        <Texture Name="object_gi_zoramask_000648_Tex" Format="ci8" Width="32" Height="32" Offset="0x648" TlutOffset="0x0"/>
+        <Texture Name="object_gi_zoramask_000A48_Tex" Format="ci8" Width="32" Height="32" Offset="0xA48" TlutOffset="0x0"/>
         <Array Name="gGiZoraMaskVtx" Count="85" Offset="0xE48">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gj.xml b/assets/xml/objects/object_gj.xml
index 50d6337b4a..bb67f1262d 100644
--- a/assets/xml/objects/object_gj.xml
+++ b/assets/xml/objects/object_gj.xml
@@ -1,29 +1,53 @@
 <Root>
     <File Name="object_gj" Segment="6">
         <!-- This is the decorative rubble around the fight arena -->
+        <Array Name="gGanonsCastleRubbleAroundArenaVtx" Count="220" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="gGanonsCastleRubbleAroundArenaDL" Offset="0xDC0"/>
         <Collision Name="gGanonsCastleRubbleAroundArenaCol" Offset="0x1B70"/>
 
         <!-- Those four are used as the pile of rubble from where Ganondorf rises to transform into Ganon -->
+        <Array Name="gGanonsCastleRubble4Vtx" Count="24" Offset="0x2480">
+            <Vtx/>
+        </Array>
         <DList Name="gGanonsCastleRubble4DL" Offset="0x2600"/>
         <Collision Name="gGanonsCastleRubble4Col" Offset="0x2850"/>
 
+        <Array Name="gGanonsCastleRubble5Vtx" Count="28" Offset="0x2880">
+            <Vtx/>
+        </Array>
         <DList Name="gGanonsCastleRubble5DL" Offset="0x2A40"/>
         <Collision Name="gGanonsCastleRubble5Col" Offset="0x2D28"/>
 
+        <Array Name="gGanonsCastleRubble6Vtx" Count="18" Offset="0x2D60">
+            <Vtx/>
+        </Array>
         <DList Name="gGanonsCastleRubble6DL" Offset="0x2E80"/>
         <Collision Name="gGanonsCastleRubble6Col" Offset="0x2FE4"/>
 
+        <Array Name="gGanonsCastleRubble7Vtx" Count="24" Offset="0x3010">
+            <Vtx/>
+        </Array>
         <DList Name="gGanonsCastleRubble7DL" Offset="0x3190"/>
         <Collision Name="gGanonsCastleRubble7Col" Offset="0x33E0"/>
 
         <!-- This three rubbles are the ones that Ganon can destroy during the fight -->
+        <Array Name="gGanonsCastleRubble2Vtx" Count="24" Offset="0x1BA0">
+            <Vtx/>
+        </Array>
         <DList Name="gGanonsCastleRubble2DL" Offset="0x1D20"/>
         <Collision Name="gGanonsCastleRubble2Col" Offset="0x1F70"/>
 
+        <Array Name="gGanonsCastleRubble3Vtx" Count="28" Offset="0x1FA0">
+            <Vtx/>
+        </Array>
         <DList Name="gGanonsCastleRubble3DL" Offset="0x2160"/>
         <Collision Name="gGanonsCastleRubble3Col" Offset="0x2448"/>
 
+        <Array Name="gGanonsCastleRubbleTallVtx" Count="48" Offset="0x3410">
+            <Vtx/>
+        </Array>
         <DList Name="gGanonsCastleRubbleTallDL" Offset="0x3710"/>
         <Collision Name="gGanonsCastleRubbleTallCol" Offset="0x3AF0"/>
 
diff --git a/assets/xml/objects/object_gjyo_objects.xml b/assets/xml/objects/object_gjyo_objects.xml
index ea4f8444fb..44f3ba791b 100644
--- a/assets/xml/objects/object_gjyo_objects.xml
+++ b/assets/xml/objects/object_gjyo_objects.xml
@@ -1,6 +1,9 @@
 <Root>
     <File Name="object_gjyo_objects" Segment="6">
         <Texture Name="gRainbowBridgeTex" OutName="rainbow_bridge" Format="rgba16" Width="32" Height="32" Offset="0xDF0"/>
+        <Array Name="gRainbowBridgeVtx" Count="96" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="gRainbowBridgeDL" Offset="0x600"/>
         <Collision Name="gRainbowBridgeCol" Offset="0xDB8"/>
     </File>
diff --git a/assets/xml/objects/object_gla.xml b/assets/xml/objects/object_gla.xml
index dbbfcb58ff..7e7f934f62 100644
--- a/assets/xml/objects/object_gla.xml
+++ b/assets/xml/objects/object_gla.xml
@@ -81,5 +81,60 @@
         <Animation Name="gGerudoPurpleLookingAboutAnim" Offset="0x98AC"/>
         <Animation Name="gGerudoPurpleWalkingAnim" Offset="0x9ED4"/>
 
+        <!-- Vertices -->
+        <Array Name="gGerudoPurpleRightForearmVtx" Count="30" Offset="0x1B50">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleRightUpperArmVtx" Count="25" Offset="0x1D30">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleLeftForearmVtx" Count="30" Offset="0x1EC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleLeftUpperArmVtx" Count="25" Offset="0x20A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleTorsoVtx" Count="97" Offset="0x2230">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleLeftShinVtx" Count="53" Offset="0x2840">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleLeftThighVtx" Count="32" Offset="0x2B90">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleRightShinVtx" Count="53" Offset="0x2D90">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleRightThighVtx" Count="32" Offset="0x30E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleWaistVtx" Count="38" Offset="0x32E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleLeftFootVtx" Count="43" Offset="0x5FF8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleRightFootVtx" Count="43" Offset="0x62A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleLeftHandVtx" Count="34" Offset="0x6558">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleRightHandVtx" Count="34" Offset="0x6778">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleGlaiveVtx" Count="25" Offset="0x6998">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleVeilVtx" Count="12" Offset="0x6B28">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurplePonytailVtx" Count="14" Offset="0x6BE8">
+            <Vtx/>
+        </Array>
+        <Array Name="gGerudoPurpleHeadVtx" Count="203" Offset="0x6CC8">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_gnd.xml b/assets/xml/objects/object_gnd.xml
index d073b8b973..e8b6937a8d 100644
--- a/assets/xml/objects/object_gnd.xml
+++ b/assets/xml/objects/object_gnd.xml
@@ -82,5 +82,60 @@
         <DList Name="gPhantomGanonBarsDL" Offset="0x12AB0"/>
         <Collision Name="gPhantomGanonBarsCol" Offset="0x12FD0"/>
 
+        <!-- Vertices -->
+        <Array Name="gPhantomGanonFaceVtx" Count="209" Offset="0x41B0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_005548" Count="188" Offset="0x5548">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_006108" Count="35" Offset="0x6108">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_006338" Count="11" Offset="0x6338">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_0063E8" Count="30" Offset="0x63E8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_0065C8" Count="147" Offset="0x65C8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_006EF8" Count="61" Offset="0x6EF8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_0072C8" Count="47" Offset="0x72C8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_0075B8" Count="15" Offset="0x75B8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_0076A8" Count="17" Offset="0x76A8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_0077B8" Count="20" Offset="0x77B8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_0078F8" Count="30" Offset="0x78F8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_007AD8" Count="11" Offset="0x7AD8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_007B88" Count="35" Offset="0x7B88">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_007DB8" Count="15" Offset="0x7DB8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_007EA8" Count="20" Offset="0x7EA8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_gnd_Vtx_007FE8" Count="17" Offset="0x7FE8">
+            <Vtx/>
+        </Array>
+        <Array Name="gPhantomGanonBarsVtx" Count="12" Offset="0x129F0">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_gndd.xml b/assets/xml/objects/object_gndd.xml
index 8bf5d770c4..103e9412da 100644
--- a/assets/xml/objects/object_gndd.xml
+++ b/assets/xml/objects/object_gndd.xml
@@ -17,12 +17,78 @@
         <Animation Name="gYoungGanondorfLaughLoopAnim" Offset="0x48B0"/> <!-- Original name is "gnd_demo_ukabi_warai_wait" -->
         <Animation Name="gYoungGanondorfWalkAnim" Offset="0x50A8"/> <!-- Original name is "gnd_walk" -->
 
-        <!-- Young Ganondorf Limb DisplayLists -->
+        <!-- Young Ganondorf Limb Vertices and DisplayLists -->
+        <Array Name="gYoungGanondorfChinVtx" Count="43" Offset="0x50C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfJawVtx" Count="30" Offset="0x5370">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfHeadVtx" Count="161" Offset="0x5550">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfRightUpperLipVtx" Count="19" Offset="0x5F60">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfLeftUpperLipVtx" Count="19" Offset="0x6090">
+            <Vtx/>
+        </Array>
         <DList Name="gYoungGanondorfHeadDL" Offset="0x61C0"/>
         <DList Name="gYoungGanondorfRightUpperLipDL" Offset="0x69F8"/>
         <DList Name="gYoungGanondorfChinDL" Offset="0x6B78"/>
         <DList Name="gYoungGanondorfJawDL" Offset="0x6D90"/>
         <DList Name="gYoungGanondorfLeftUpperLipDL" Offset="0x6FC8"/>
+        <Array Name="gYoungGanondorfPelvisVtx" Count="110" Offset="0x70F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfTorsoVtx" Count="180" Offset="0x77D8">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfJewelVtx" Count="7" Offset="0x8318">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfKnifeVtx" Count="48" Offset="0x8388">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfLeftUpperArmVtx" Count="42" Offset="0x8688">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfRightUpperArmVtx" Count="42" Offset="0x8928">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfLeftForearmVtx" Count="44" Offset="0x8BC8">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfRightForearmVtx" Count="44" Offset="0x8E88">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfLeftHandVtx" Count="53" Offset="0x9148">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfRightHandVtx" Count="53" Offset="0x9498">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfLeftFootVtx" Count="44" Offset="0x97E8">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfRightFootVtx" Count="44" Offset="0x9AA8">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfLeftThighVtx" Count="27" Offset="0x9D68">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfLeftShinVtx" Count="41" Offset="0x9F18">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfRightThighVtx" Count="27" Offset="0xA1A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfRightShinVtx" Count="41" Offset="0xA358">
+            <Vtx/>
+        </Array>
+        <Array Name="gYoungGanondorfTeethVtx" Count="12" Offset="0xA5E8">
+            <Vtx/>
+        </Array>
         <DList Name="gYoungGanondorfPelvisDL" Offset="0xA6A8"/>
         <DList Name="gYoungGanondorfTorsoDL" Offset="0xAB10"/>
         <DList Name="gYoungGanondorfJewelDL" Offset="0xB410"/>
@@ -40,6 +106,9 @@
         <DList Name="gYoungGanondorfRightThighDL" Offset="0xD278"/>
         <DList Name="gYoungGanondorfRightShinDL" Offset="0xD470"/>
         <DList Name="gYoungGanondorfTeethDL" Offset="0xD668"/>
+        <Array Name="gYoungGanondorfOpenLeftHandVtx" Count="170" Offset="0xD708">
+            <Vtx/>
+        </Array>
         <DList Name="gYoungGanondorfOpenLeftHandDL" Offset="0xE1A8"/>
 
         <!-- Young Ganondorf Textures -->
diff --git a/assets/xml/objects/object_gol.xml b/assets/xml/objects/object_gol.xml
index 7e04508cb6..0f096f58e8 100644
--- a/assets/xml/objects/object_gol.xml
+++ b/assets/xml/objects/object_gol.xml
@@ -55,5 +55,37 @@
         <Limb Name="gObjectGolRightFootLimb" LimbType="Standard" Offset="0x3AC0"/>
         <Limb Name="gObjectGolRightShinLimb" LimbType="Standard" Offset="0x3ACC"/>
         <Limb Name="gObjectGolRightThighLimb" LimbType="Standard" Offset="0x3AD8"/>
+
+        <!-- Vertices -->
+        <Array Name="gObjectGolLeftFootVtx" Count="10" Offset="0x1560">
+            <Vtx/>
+        </Array>
+        <Array Name="gObjectGolLeftThighVtx" Count="26" Offset="0x16C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gObjectGolLeftShinVtx" Count="10" Offset="0x1958">
+            <Vtx/>
+        </Array>
+        <Array Name="gObjectGolRightFootVtx" Count="10" Offset="0x1A88">
+            <Vtx/>
+        </Array>
+        <Array Name="gObjectGolRightThighVtx" Count="25" Offset="0x1BE8">
+            <Vtx/>
+        </Array>
+        <Array Name="gObjectGolRightShinVtx" Count="10" Offset="0x1E70">
+            <Vtx/>
+        </Array>
+        <Array Name="gObjectGolBodyVtx" Count="84" Offset="0x1FA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gObjectGolEggVtx" Count="59" Offset="0x26C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gObjectGolEyeIrisVtx" Count="3" Offset="0x2BE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gObjectGolAntennaVtx" Count="34" Offset="0x2C98">
+            <Vtx/>
+        </Array>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_goroiwa.xml b/assets/xml/objects/object_goroiwa.xml
index 5d406e9578..c454e78b53 100644
--- a/assets/xml/objects/object_goroiwa.xml
+++ b/assets/xml/objects/object_goroiwa.xml
@@ -1,6 +1,9 @@
 <Root>
     <File Name="object_goroiwa" Segment="6">
         <Texture Name="gRollingRockTex" OutName="rolling_rock" Format="rgba16" Width="32" Height="64" Offset="0x8A0"/>
+        <Array Name="gRollingRockVtx" Count="107" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="gRollingRockDL" Offset="0x6B0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_gt.xml b/assets/xml/objects/object_gt.xml
index dd48318d1d..83ab9d9f75 100644
--- a/assets/xml/objects/object_gt.xml
+++ b/assets/xml/objects/object_gt.xml
@@ -21,13 +21,34 @@
         <Texture Name="gTowerCollapseCsTex_123F0" OutName="tex_123F0" Format="rgba16" Width="16" Height="16" Offset="0x123F0"/>
         <Texture Name="gTowerCollapseCsTex_125F0" OutName="tex_125F0" Format="i8" Width="64" Height="64" Offset="0x125F0"/>
 
-        <!-- Tower Collapse DisplayLists -->
+        <!-- Tower Collapse Vertices and DisplayLists -->
+        <Array Name="gTowerCollapseCsExteriorStructureVtx" Count="622" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="gTowerCollapseCsExteriorStructureDL" Offset="0x2910"/>
+        <Array Name="gTowerCollapseCsFlameSmokeVtx" Count="35" Offset="0x26E0">
+            <Vtx/>
+        </Array>
         <DList Name="gTowerCollapseCsFlameSmokeDL" Offset="0x41A0"/>
+        <Array Name="gTowerCollapseCsCollapsedStructureInnerVtx" Count="209" Offset="0x4280">
+            <Vtx/>
+        </Array>
         <DList Name="gTowerCollapseCsCollapsedStructureInnerDL" Offset="0x4F90"/>
+        <Array Name="gTowerCollapseCsCollapsedStructureOuterVtx" Count="404" Offset="0x5CF0">
+            <Vtx/>
+        </Array>
         <DList Name="gTowerCollapseCsCollapsedStructureOuterDL" Offset="0x7630"/>
+        <Array Name="gTowerCollapseCsStandalonePillarVtx" Count="64" Offset="0x9210">
+            <Vtx/>
+        </Array>
         <DList Name="gTowerCollapseCsStandalonePillarDL" Offset="0x9610"/>
+        <Array Name="gTowerCollapseCsWalkwayVtx" Count="12" Offset="0x98B0">
+            <Vtx/>
+        </Array>
         <DList Name="gTowerCollapseCsWalkwayDL" Offset="0x9970"/>
+        <Array Name="gTowerCollapseCsAlternativeWalkwayVtx" Count="12" Offset="0x9AC0">
+            <Vtx/>
+        </Array>
         <DList Name="gTowerCollapseCsAlternativeWalkwayDL" Offset="0x9B80"/>
 
         <!-- Tower Collapse Collision -->
diff --git a/assets/xml/objects/object_haka.xml b/assets/xml/objects/object_haka.xml
index f6b263c375..ca6557cc8c 100644
--- a/assets/xml/objects/object_haka.xml
+++ b/assets/xml/objects/object_haka.xml
@@ -3,7 +3,13 @@
         <Texture Name="gGravestoneGrassTex" OutName="grass" Format="rgba16" Width="16" Height="32" Offset="0x460"/>
         <Texture Name="gGravestoneEarthTex" OutName="earth" Format="ia8" Width="32" Height="32" Offset="0x860"/>
         <Texture Name="gGravestoneTombTex" OutName="tomb" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <Array Name="gGravestoneStoneVtx" Count="23" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="gGravestoneStoneDL" Offset="0x1B0"/>
+        <Array Name="gGravestoneEarthVtx" Count="4" Offset="0x170">
+            <Vtx/>
+        </Array>
         <DList Name="gGravestoneEarthDL" Offset="0x2A8"/>
         <Collision Name="gGravestoneCol" Offset="0x428"/>
     </File>
diff --git a/assets/xml/objects/object_haka_door.xml b/assets/xml/objects/object_haka_door.xml
index 1376d03569..ec8ca6a90a 100644
--- a/assets/xml/objects/object_haka_door.xml
+++ b/assets/xml/objects/object_haka_door.xml
@@ -1,12 +1,27 @@
 <Root>
     <File Name="object_haka_door" Segment="6">
         <Texture Name="object_haka_door_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <Array Name="gShadowDoorLeftVtx" Count="17" Offset="0x1000">
+            <Vtx/>
+        </Array>
+        <Array Name="gShadowDoorRightVtx" Count="17" Offset="0x1110">
+            <Vtx/>
+        </Array>
+        <Array Name="object_haka_door_Vtx_001220" Count="15" Offset="0x1220">
+            <Vtx/>
+        </Array>
         <DList Name="object_haka_door_DL_001310" Offset="0x1310"/>
         <DList Name="gShadowDoorLeftDL" Offset="0x13B8"/>
         <DList Name="gShadowDoorRightDL" Offset="0x1420"/>
         <Texture Name="object_haka_door_Tex_001490" OutName="tex_00001490" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <Array Name="object_haka_door_Vtx_002490" Count="25" Offset="0x2490">
+            <Vtx/>
+        </Array>
         <DList Name="object_haka_door_DL_002620" Offset="0x2620"/>
         <Texture Name="object_haka_door_Tex_002700" OutName="tex_00002700" Format="rgba16" Width="32" Height="64" Offset="0x2700"/>
+        <Array Name="object_haka_door_Vtx_003700" Count="25" Offset="0x3700">
+            <Vtx/>
+        </Array>
         <DList Name="object_haka_door_DL_003890" Offset="0x3890"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_hakach_objects.xml b/assets/xml/objects/object_hakach_objects.xml
index b978e77a31..a3eb7795ba 100644
--- a/assets/xml/objects/object_hakach_objects.xml
+++ b/assets/xml/objects/object_hakach_objects.xml
@@ -1,13 +1,40 @@
 <Root>
     <File Name="object_hakach_objects" Segment="6">
+        <Array Name="gBotwHoleTrap1Vtx" Count="27" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="gBotwHoleTrap1DL" Offset="0x01B0"/>
+        <Array Name="gBotwHoleTrap2Vtx" Count="19" Offset="0x2C0">
+            <Vtx/>
+        </Array>
         <DList Name="gBotwHoleTrap2DL" Offset="0x03F0"/>
+        <Array Name="gBotwCoffinLidVtx" Count="23" Offset="0x540">
+            <Vtx/>
+        </Array>
         <DList Name="gBotwCoffinLidDL" Offset="0x06B0"/>
+        <Array Name="gBotwBombSpotVtx" Count="23" Offset="0x8A0">
+            <Vtx/>
+        </Array>
         <DList Name="gBotwBombSpotDL" Offset="0x0A10"/>
+        <Array Name="gBotwFakeWallsAndFloorsVtx" Count="60" Offset="0xC60">
+            <Vtx/>
+        </Array>
         <DList Name="gBotwFakeWallsAndFloorsDL" Offset="0x1060"/>
+        <Array Name="gBotwBloodSplatterVtx" Count="4" Offset="0x1020">
+            <Vtx/>
+        </Array>
         <DList Name="gBotwBloodSplatterDL" Offset="0x1250"/>
+        <Array Name="gBotwThreeFakeFloorsVtx" Count="12" Offset="0x1860">
+            <Vtx/>
+        </Array>
         <DList Name="gBotwThreeFakeFloorsDL" Offset="0x1920"/>
+        <Array Name="gBotwWaterRingVtx" Count="54" Offset="0x1AF0">
+            <Vtx/>
+        </Array>
         <DList Name="gBotwWaterRingDL" Offset="0x1E50"/>
+        <Array Name="gBotwWaterFallVtx" Count="6" Offset="0x1FB0">
+            <Vtx/>
+        </Array>
         <DList Name="gBotwWaterFallDL" Offset="0x2010"/>
 
         <Collision Name="gBotwCoffinLidCol" Offset="0x0870"/>
diff --git a/assets/xml/objects/object_hata.xml b/assets/xml/objects/object_hata.xml
index b0324c3be3..1679dce18a 100644
--- a/assets/xml/objects/object_hata.xml
+++ b/assets/xml/objects/object_hata.xml
@@ -31,6 +31,35 @@
         <Limb Name="gFlagpoleFlag2HoistMidLimb" LimbType="Standard" Offset="0x2F68"/>
         <Limb Name="gFlagpoleFlag2HoistEndLimb" LimbType="Standard" Offset="0x2F74"/>
 
+        <!-- Flagpole Vertices -->
+        <Array Name="gFlagpolePoleVtx" Count="39" Offset="0x2460">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlagpoleFlag1HoistEndVtx" Count="4" Offset="0x2810">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlagpoleFlag1HoistMidVtx" Count="4" Offset="0x28E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlagpoleFlag1FlyMidVtx" Count="4" Offset="0x29B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlagpoleFlag1FlyEndVtx" Count="4" Offset="0x2A80">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlagpoleFlag2HoistEndVtx" Count="4" Offset="0x2B50">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlagpoleFlag2HoistMidVtx" Count="4" Offset="0x2C20">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlagpoleFlag2FlyMidVtx" Count="4" Offset="0x2CF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gFlagpoleFlag2FlyEndVtx" Count="4" Offset="0x2DC0">
+            <Vtx/>
+        </Array>
+
         <!-- Flagpole DLists -->
         <DList Name="gFlagpolePoleDL" Offset="0x26D0"/>
         <DList Name="gFlagpoleFlag1FlyEndDL" Offset="0x2AC0"/>
diff --git a/assets/xml/objects/object_heavy_object.xml b/assets/xml/objects/object_heavy_object.xml
index ecc7953211..ad09fcffce 100644
--- a/assets/xml/objects/object_heavy_object.xml
+++ b/assets/xml/objects/object_heavy_object.xml
@@ -1,8 +1,17 @@
 <Root>
     <File Name="object_heavy_object" Segment="6">
         <Texture Name="gHeavyBlockTex" OutName="block" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <Array Name="gHeavyBlockEntirePillarVtx" Count="60" Offset="0x1000">
+            <Vtx/>
+        </Array>
         <DList Name="gHeavyBlockEntirePillarDL" Offset="0x13C0"/>
+        <Array Name="gHeavyBlockBigPieceVtx" Count="29" Offset="0x16D0">
+            <Vtx/>
+        </Array>
         <DList Name="gHeavyBlockBigPieceDL" Offset="0x18A0"/>
+        <Array Name="gHeavyBlockSmallPieceVtx" Count="11" Offset="0x1980">
+            <Vtx/>
+        </Array>
         <DList Name="gHeavyBlockSmallPieceDL" Offset="0x1A30"/>
         <Collision Name="gHeavyBlockCol" Offset="0x169C"/>
     </File>
diff --git a/assets/xml/objects/object_hidan_objects.xml b/assets/xml/objects/object_hidan_objects.xml
index fe0405d9dd..857cd80ed6 100644
--- a/assets/xml/objects/object_hidan_objects.xml
+++ b/assets/xml/objects/object_hidan_objects.xml
@@ -1,38 +1,83 @@
 <Root>
     <File Name="object_hidan_objects" Segment="6">
+        <Array Name="gFireTempleHammerableTotemBodyVtx" Count="36" Offset="0x92C0">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleHammerableTotemBodyDL" Offset="0xBBF0"/>
+        <Array Name="gFireTempleHammerableTotemHeadVtx" Count="36" Offset="0x9500">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleHammerableTotemHeadDL" Offset="0xBDF0"/>
         <Collision Name="gFireTempleHammerableTotemCol" Offset="0xDA10"/>
 
+        <Array Name="gFireTempleHookshotElevatorVtx" Count="50" Offset="0x8D50">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleHookshotElevatorDL" Offset="0xB630"/>
         <Collision Name="gFireTempleHookshotElevatorCol" Offset="0xE1E8"/>
 
+        <Array Name="gFireTempleBigFireWallVtx" Count="4" Offset="0xDAE0">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleBigFireWallDL" Offset="0xDB20"/>
 
+        <Array Name="gFireTempleStoneStep1Vtx" Count="21" Offset="0x7C20">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleStoneStep1DL" Offset="0xA668"/>
         <Collision Name="gFireTempleStoneStep1Col" Offset="0xDE44"/>
+        <Array Name="gFireTempleStoneStep2Vtx" Count="10" Offset="0x7B80">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleStoneStep2DL" Offset="0xA548"/>
         <Collision Name="gFireTempleStoneStep2Col" Offset="0xDD1C"/>
 
+        <Array Name="gFireTempleMetalFenceWithSlantVtx" Count="9" Offset="0x9E90">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleMetalFenceWithSlantDL" Offset="0xC798"/>
         <Collision Name="gFireTempleMetalFenceWithSlantCol" Offset="0xE2CC"/>
+        <Array Name="gFireTempleMetalFenceVtx" Count="4" Offset="0x9740">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleMetalFenceDL" Offset="0xBFA8"/>
         <Collision Name="gFireTempleMetalFenceCol" Offset="0xE380"/>
+        <Array Name="gFireTempleMetalFence2Vtx" Count="5" Offset="0x9270">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleMetalFence2DL" Offset="0xBB58"/>
         <Collision Name="gFireTempleMetalFence2Col" Offset="0xE430"/>
 
+        <Array Name="gFireTempleCrackedStoneFloorVtx" Count="28" Offset="0x90B0">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleCrackedStoneFloorDL" Offset="0xB9C0"/>
         <Collision Name="gFireTempleCrackedStoneFloorCol" Offset="0xD800"/>
+        <Array Name="gFireTempleBombableWallVtx" Count="6" Offset="0x9780">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleBombableWallDL" Offset="0xC038"/>
         <Collision Name="gFireTempleBombableWallCol" Offset="0xD878"/>
+        <Array Name="gFireTempleLargeBombableWallVtx" Count="4" Offset="0x9070">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleLargeBombableWallDL" Offset="0xB900"/>
         <Collision Name="gFireTempleLargeBombableWallCol" Offset="0xD8F8"/>
 
+        <Array Name="gFireTempleStoneBlock1Vtx" Count="21" Offset="0x97E0">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleStoneBlock1DL" Offset="0xC100"/>
         <Collision Name="gFireTempleStoneBlock1Col" Offset="0xCB80"/>
+        <Array Name="gFireTempleStoneBlock2Vtx" Count="26" Offset="0x9930">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleStoneBlock2DL" Offset="0xC1F0"/>
         <Collision Name="gFireTempleStoneBlock2Col" Offset="0xDF78"/>
 
+        <Array Name="gFireTempleBigVerticalFlameVtx" Count="4" Offset="0xC9D0">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleBigVerticalFlameDL" Offset="0xCA10"/>
 
         <Texture Name="gFireTempleBigVerticalFlame0Tex" OutName="big_vertical_flame_0" Format="ia8" Width="8" Height="240" Offset="0x12120"/>
@@ -44,7 +89,13 @@
         <Texture Name="gFireTempleBigVerticalFlame6Tex" OutName="big_vertical_flame_6" Format="ia8" Width="8" Height="240" Offset="0x14E20"/>
         <Texture Name="gFireTempleBigVerticalFlame7Tex" OutName="big_vertical_flame_7" Format="ia8" Width="8" Height="240" Offset="0x155A0"/>
 
+        <Array Name="gFireTempleFireballVtx" Count="4" Offset="0xDBF0">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleFireballDL" Offset="0xDC30"/>
+        <Array Name="gFireTempleFireballUpperHalfVtx" Count="4" Offset="0xDA40">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleFireballUpperHalfDL" Offset="0xDA80"/>
 
         <Texture Name="gFireTempleFireball0Tex" OutName="fireball_0" Format="ia8" Width="32" Height="32" Offset="0x15D20"/>
@@ -56,32 +107,71 @@
         <Texture Name="gFireTempleFireball6Tex" OutName="fireball_6" Format="ia8" Width="32" Height="32" Offset="0x17520"/>
         <Texture Name="gFireTempleFireball7Tex" OutName="fireball_7" Format="ia8" Width="32" Height="32" Offset="0x17920"/>
 
+        <Array Name="gFireTempleSpinningFlamethrowerVtx" Count="93" Offset="0x82B0">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleSpinningFlamethrowerDL" Offset="0xAD00"/>
         <Collision Name="gFireTempleSpinningFlamethrowerCol" Offset="0xD5C0"/>
 
+        <Array Name="gFireTempleStationaryFlamethrowerShortVtx" Count="77" Offset="0x8880">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleStationaryFlamethrowerShortDL" Offset="0xB0F8"/>
         <Collision Name="gFireTempleStationaryFlamethrowerShortCol" Offset="0xCC90"/>
 
+        <Array Name="gFireTempleStationaryFlamethrowerTallVtx" Count="34" Offset="0x8090">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleStationaryFlamethrowerTallDL" Offset="0xABC8"/>
         <Collision Name="gFireTempleStationaryFlamethrowerTallCol" Offset="0xCDA0"/>
 
+        <Array Name="gFireTempleStonePlatform1Vtx" Count="21" Offset="0x9AD0">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleStonePlatform1DL" Offset="0xC338"/>
         <Collision Name="gFireTempleStonePlatform1Col" Offset="0x120E8"/>
+        <Array Name="gFireTempleStonePlatform2Vtx" Count="39" Offset="0x9C20">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleStonePlatform2DL" Offset="0xC470"/>
         <Collision Name="gFireTempleStonePlatform2Col" Offset="0xFAE8"/>
 
+        <Array Name="gFireTempleFlareDancerPlatformVtx" Count="50" Offset="0x7D70">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleFlareDancerPlatformDL" Offset="0xA7E0"/>
         <Collision Name="gFireTempleFlareDancerPlatformCol" Offset="0xE568"/>
 
+        <Array Name="gFireTempleTallestPillarAboveRoomBeforeBossVtx" Count="84" Offset="0x7640">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleTallestPillarAboveRoomBeforeBossDL" Offset="0xA240"/>
         <Collision Name="gFireTempleTallestPillarAboveRoomBeforeBossCol" Offset="0xD054"/>
+        <Array Name="gFireTemplePillarInsertedInGroundVtx" Count="50" Offset="0x9F20">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTemplePillarInsertedInGroundDL" Offset="0xC838"/>
         <Collision Name="gFireTemplePillarInsertedInGroundCol" Offset="0xD188"/>
 
+        <Array Name="gFireTempleBombableDoorFrameVtx" Count="15" Offset="0xF7A0">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleBombableDoorFrameDL" Offset="0xF890"/>
+        <Array Name="gFireTempleDoorWithHandleRightVtx" Count="16" Offset="0xF5A0">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleDoorWithHandleRightDL" Offset="0xF938"/>
+        <Array Name="gFireTempleDoorWithHandleLeftVtx" Count="16" Offset="0xF6A0">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleDoorWithHandleLeftDL" Offset="0xF998"/>
+        <Array Name="gFireTempleDoorFrontVtx" Count="25" Offset="0x10B20">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleDoorFrontDL" Offset="0x10CB0"/>
+        <Array Name="gFireTempleDoorBackVtx" Count="25" Offset="0x11D90">
+            <Vtx/>
+        </Array>
         <DList Name="gFireTempleDoorBackDL" Offset="0x11F20"/>
 
         <Texture Name="gFireTempleDoorKillerTex" OutName="fire_temple_door_killer" Format="rgba16" Width="32" Height="64" Offset="0xE5A0"/>
diff --git a/assets/xml/objects/object_human.xml b/assets/xml/objects/object_human.xml
index 05795cb332..fcf015b312 100644
--- a/assets/xml/objects/object_human.xml
+++ b/assets/xml/objects/object_human.xml
@@ -76,75 +76,120 @@
         <DList Name="gHumanArmLeftWrapperWrapperDL" Offset="0xB050"/>
 
         <!-- Left forearm -->
+        <Array Name="gHumanArmLeftVtx" Count="20" Offset="0xB068">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanForearmLeftDL" Offset="0xB1A8"/>
         <DList Name="gHumanForearmLeftWrapperDL" Offset="0xB288"/>
         <DList Name="gHumanForearmLeftWrapperWrapperDL" Offset="0xB298"/>
 
         <!-- Left foot -->
+        <Array Name="gHumanForearmLeftVtx" Count="16" Offset="0xB2B0">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanFootLeftDL" Offset="0xB3B0"/>
         <DList Name="gHumanFootLeftWrapperDL" Offset="0xB488"/>
         <DList Name="gHumanFootLeftWrapperWrapperDL" Offset="0xB498"/>
 
         <!-- Left hand -->
+        <Array Name="gHumanFootLeftVtx" Count="22" Offset="0xB4B0">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanHandLeftDL" Offset="0xB610"/>
         <DList Name="gHumanHandLeftWrapperDL" Offset="0xB750"/>
         <DList Name="gHumanHandLeftWrapperWrapperDL" Offset="0xB760"/>
 
         <!-- Left leg -->
+        <Array Name="gHumanHandLeftVtx" Count="26" Offset="0xB778">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanLegLeftDL" Offset="0xB918"/>
         <DList Name="gHumanLegLeftWrapperDL" Offset="0xB9E0"/>
         <DList Name="gHumanLegLeftWrapperWrapperDL" Offset="0xB9F0"/>
 
         <!-- Right arm -->
+        <Array Name="gHumanLegLeftVtx" Count="15" Offset="0xBA08">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanArmRightDL" Offset="0xBAF8"/>
         <DList Name="gHumanArmRightWrapperDL" Offset="0xBBF8"/>
         <DList Name="gHumanArmRightWrapperWrapperDL" Offset="0xBC08"/>
 
         <!-- Right forearm -->
+        <Array Name="gHumanArmRightVtx" Count="18" Offset="0xBC20">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanForearmRightDL" Offset="0xBD40"/>
         <DList Name="gHumanForearmRightWrapperDL" Offset="0xBE20"/>
         <DList Name="gHumanForearmRightWrapperWrapperDL" Offset="0xBE30"/>
 
         <!-- Right foot -->
+        <Array Name="gHumanForearmRightVtx" Count="15" Offset="0xBE48">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanFootRightDL" Offset="0xBF38"/>
         <DList Name="gHumanFootRightWrapperDL" Offset="0xC010"/>
         <DList Name="gHumanFootRightWrapperWrapperDL" Offset="0xC020"/>
 
         <!-- Right hand -->
+        <Array Name="gHumanFootRightVtx" Count="20" Offset="0xC038">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanHandRightDL" Offset="0xC178"/>
         <DList Name="gHumanHandRightWrapperDL" Offset="0xC2B8"/>
         <DList Name="gHumanHandRightWrapperWrapperDL" Offset="0xC2C8"/>
 
         <!-- Right leg -->
+        <Array Name="gHumanHandRightVtx" Count="23" Offset="0xC2E0">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanLegRightDL" Offset="0xC450"/>
         <DList Name="gHumanLegRightWrapperDL" Offset="0xC518"/>
         <DList Name="gHumanLegRightWrapperWrapperDL" Offset="0xC528"/>
 
         <!-- Torso -->
+        <Array Name="gHumanLegRightVtx" Count="14" Offset="0xC540">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanTorsoDL" Offset="0xC620"/>
         <DList Name="gHumanTorsoWrapperDL" Offset="0xC8B0"/>
         <DList Name="gHumanTorsoWrapperWrapperDL" Offset="0xC8C0"/>
 
         <!-- Hair -->
+        <Array Name="gHumanTorsoVtx" Count="66" Offset="0xC8D8">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanHairDL" Offset="0xCCF8"/>
         <DList Name="gHumanHairWrapperDL" Offset="0xCDC8"/>
         <DList Name="gHumanHairWrapperWrapperDL" Offset="0xCDD8"/>
 
         <!-- Head -->
+        <Array Name="gHumanHairVtx" Count="14" Offset="0xCDF0">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanHeadDL" Offset="0xCED0"/>
         <DList Name="gHumanHeadWrapperDL" Offset="0xD500"/>
         <DList Name="gHumanHeadWrapperWrapperDL" Offset="0xD510"/>
 
         <!-- Waist -->
+        <Array Name="gHumanHeadVtx" Count="185" Offset="0xD528">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanWaistDL" Offset="0xE0B8"/>
         <DList Name="gHumanWaistWrapperDL" Offset="0xE218"/>
         <DList Name="gHumanWaistWrapperWrapperDL" Offset="0xE228"/>
 
         <!-- Lower half of the dress -->
+        <Array Name="gHumanWaistVtx" Count="22" Offset="0xE240">
+            <Vtx/>
+        </Array>
         <DList Name="gHumanDressLowerDL" Offset="0xE3A0"/>
         <DList Name="gHumanDressLowerWrapperDL" Offset="0xE480"/>
         <DList Name="gHumanDressLowerWrapperWrapperDL" Offset="0xE490"/>
 
+        <Array Name="gHumanDressLowerVtx" Count="16" Offset="0xE4A8">
+            <Vtx/>
+        </Array>
         <Texture Name="gHumanEarTex" OutName="ear" Format="rgba16" Width="16" Height="32" Offset="0xE5A8"/>
 
         <Texture Name="gHumanDressOrnamentsTex" OutName="dress_ornaments" Format="rgba16" Width="32" Height="32" Offset="0xE9A8"/>
diff --git a/assets/xml/objects/object_ice_objects.xml b/assets/xml/objects/object_ice_objects.xml
index d21164bc15..0c4abb6964 100644
--- a/assets/xml/objects/object_ice_objects.xml
+++ b/assets/xml/objects/object_ice_objects.xml
@@ -1,15 +1,39 @@
 <Root>
     <File Name="object_ice_objects" Segment="6">
+        <Array Name="object_ice_objects_Vtx_000000" Count="25" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="object_ice_objects_DL_000190" Offset="0x190"/>
         <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/>
+        <Array Name="gRedIceBlockVtx" Count="45" Offset="0x420">
+            <Vtx/>
+        </Array>
         <DList Name="gRedIceBlockDL" Offset="0x6F0"/>
+        <Array Name="gRedIcePlatformVtx" Count="172" Offset="0x7E0">
+            <Vtx/>
+        </Array>
         <DList Name="gRedIcePlatformDL" Offset="0x12A0"/>
         <Collision Name="gRedIcePlatformCol" Offset="0x1C1C"/>
+        <Array Name="object_ice_objects_Vtx_001C50" Count="12" Offset="0x1C50">
+            <Vtx/>
+        </Array>
         <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/>
+        <Array Name="object_ice_objects_Vtx_001DC0" Count="67" Offset="0x1DC0">
+            <Vtx/>
+        </Array>
         <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/>
+        <Array Name="object_ice_objects_Vtx_002300" Count="13" Offset="0x2300">
+            <Vtx/>
+        </Array>
         <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/>
         <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/>
+        <Array Name="gRedIceWallVtx" Count="8" Offset="0x25C0">
+            <Vtx/>
+        </Array>
         <DList Name="gRedIceWallDL" Offset="0x2640"/>
+        <Array Name="object_ice_objects_Vtx_0026E0" Count="6" Offset="0x26E0">
+            <Vtx/>
+        </Array>
         <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/>
         <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/>
         <Collision Name="gRedIceWallCol" Offset="0x2920"/>
diff --git a/assets/xml/objects/object_im.xml b/assets/xml/objects/object_im.xml
index a628a113a4..ee8848cab4 100644
--- a/assets/xml/objects/object_im.xml
+++ b/assets/xml/objects/object_im.xml
@@ -19,6 +19,38 @@
         <Texture Name="gImpaSwordHandleTex" OutName="sword_handle" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
         <Texture Name="gImpaPantsAndSkinTex" OutName="pants_and_skin" Format="rgba16" Width="16" Height="32" Offset="0x2980"/>
         <Texture Name="gImpaBlackTex" OutName="black_square" Format="ci8" Width="8" Height="8" Offset="0x2D80" TlutOffset="0x1880"/> <!-- Used on the bottom of the leg -->
+
+        <Array Name="gImpaLeftArmVtx" Count="32" Offset="0x2DC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaLeftShoulderVtx" Count="42" Offset="0x2FC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaRightArmVtx" Count="32" Offset="0x3260">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaRightShoulderVtx" Count="42" Offset="0x3460">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaChestVtx" Count="194" Offset="0x3700">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaLeftLegVtx" Count="37" Offset="0x4320">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaLeftThighVtx" Count="45" Offset="0x4570">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaRightLegVtx" Count="37" Offset="0x4840">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaRightThighVtx" Count="45" Offset="0x4A90">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaTorsoVtx" Count="46" Offset="0x4D60">
+            <Vtx/>
+        </Array>
+
         <DList Name="gImpaChestDL" Offset="0x5040"/>
         <DList Name="gImpaRightShoulderDL" Offset="0x5D60"/>
         <DList Name="gImpaRightArmDL" Offset="0x6048"/>
@@ -36,6 +68,9 @@
         <Texture Name="gImpaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x8150" TlutOffset="0x6F40"/>
 
         <Texture Name="gImpaEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x7610" TlutOffset="0x7140"/> <!-- Also used in gImpaHandPointingDL DList -->
+        <Array Name="gImpaHeadUnmaskedVtx" Count="306" Offset="0x8550">
+            <Vtx/>
+        </Array>
         <DList Name="gImpaHeadUnmaskedDL" Offset="0xBDC0"/>
         <Texture Name="gImpaHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x7710" TlutOffset="0x7140"/>
 
@@ -46,6 +81,26 @@
         <Texture Name="object_im_Tex_007B10" OutName="tex_00007B10" Format="ci8" Width="8" Height="8" Offset="0x7B10" TlutOffset="0x7140"/>
         <Texture Name="object_im_Tex_007B50" OutName="tex_00007B50" Format="ci8" Width="16" Height="16" Offset="0x7B50" TlutOffset="0x7140"/>
         <Texture Name="gImpaFingers2Tex" OutName="fingers_2" Format="ci8" Width="16" Height="16" Offset="0x7C50" TlutOffset="0x7140"/> <!-- Used in the gImpaHandPointingDL DList -->
+
+        <Array Name="gImpaHeadMaskedVtx" Count="258" Offset="0x9870">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaLeftFootVtx" Count="33" Offset="0xA890">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaLeftHandVtx" Count="70" Offset="0xAAA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaRightFootVtx" Count="33" Offset="0xAF00">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaRightHandVtx" Count="70" Offset="0xB110">
+            <Vtx/>
+        </Array>
+        <Array Name="gImpaHandPointingVtx" Count="133" Offset="0xB570">
+            <Vtx/>
+        </Array>
+
         <DList Name="gImpaHeadMaskedDL" Offset="0xD0D8"/>
         <DList Name="gImpaLeftFootDL" Offset="0xDDB8"/>
         <DList Name="gImpaLeftHandDL" Offset="0xE0F0"/>
diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml
index 155b9c9ad1..102fc82c0d 100644
--- a/assets/xml/objects/object_in.xml
+++ b/assets/xml/objects/object_in.xml
@@ -37,6 +37,67 @@
         <Texture Name="gIngoEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4BD0" TlutOffset="0x3210"/>
         <Texture Name="gIngoEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x4390" TlutOffset="0x3210"/>
 
+        <Array Name="gIngoChildEraHeadVtx" Count="152" Offset="0x4FD0">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraRightEyebrowVtx" Count="7" Offset="0x5950">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraLeftEyebrowVtx" Count="7" Offset="0x59C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraMustacheVtx" Count="10" Offset="0x5A30">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraLeftFootVtx" Count="42" Offset="0x5AD0">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraRightFootVtx" Count="42" Offset="0x5D70">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraBasketVtx" Count="61" Offset="0x6010">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraPitchForkVtx" Count="53" Offset="0x63E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraLeftHandVtx" Count="70" Offset="0x7F98">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraLeftArmVtx" Count="33" Offset="0x83F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraLeftShoulderVtx" Count="30" Offset="0x8608">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraRightHandVtx" Count="70" Offset="0x87E8">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraRightArmVtx" Count="33" Offset="0x8C48">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraRightShoulderVtx" Count="30" Offset="0x8E58">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraChestVtx" Count="78" Offset="0x9038">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraLeftLegVtx" Count="36" Offset="0x9518">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraLeftThighVtx" Count="39" Offset="0x9758">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraRightLegVtx" Count="36" Offset="0x99C8">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraRightThighVtx" Count="39" Offset="0x9C08">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoChildEraTorsoVtx" Count="38" Offset="0x9E78">
+            <Vtx/>
+        </Array>
+
         <DList Name="gIngoChildEraHeadDL" Offset="0x6730"/>
         <DList Name="gIngoChildEraRightEyebrowDL" Offset="0x7398"/>
         <DList Name="gIngoChildEraLeftEyebrowDL" Offset="0x74C0"/>
@@ -81,6 +142,61 @@
         <Texture Name="gIngoAdultEraShoesTex" OutName="adult_era_shoes" Format="ci8" Width="8" Height="8" Offset="0xEA98" TlutOffset="0xC298"/>
         <Texture Name="gIngoAdultEraPantsTex" OutName="adult_era_pants" Format="ci8" Width="8" Height="8" Offset="0xEAD8" TlutOffset="0xC298"/>
 
+        <Array Name="gIngoAdultEraRightEyebrowVtx" Count="7" Offset="0xEB18">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraLeftEyebrowVtx" Count="7" Offset="0xEB88">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraMustacheVtx" Count="10" Offset="0xEBF8">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraHeadVtx" Count="137" Offset="0xEC98">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraLeftHandVtx" Count="70" Offset="0xF528">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraLeftArmVtx" Count="27" Offset="0xF988">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraLeftShoulderVtx" Count="27" Offset="0xFB38">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraRightHandVtx" Count="70" Offset="0xFCE8">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraRightArmVtx" Count="27" Offset="0x10148">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraRightShoulderVtx" Count="27" Offset="0x102F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraChestVtx" Count="99" Offset="0x104A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraLeftFootVtx" Count="29" Offset="0x10AD8">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraLeftLegVtx" Count="27" Offset="0x10CA8">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraLeftThighVtx" Count="29" Offset="0x10E58">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraRightFootVtx" Count="29" Offset="0x11028">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraRightLegVtx" Count="27" Offset="0x111F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraRightThighVtx" Count="29" Offset="0x113A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gIngoAdultEraTorsoVtx" Count="30" Offset="0x11578">
+            <Vtx/>
+        </Array>
+
         <DList Name="gIngoAdultEraChestDL" Offset="0x11758"/>
         <DList Name="gIngoAdultEraHeadDL" Offset="0x11AD8"/>
         <DList Name="gIngoAdultEraMustacheDL" Offset="0x12120"/>
diff --git a/assets/xml/objects/object_jj.xml b/assets/xml/objects/object_jj.xml
index 96ff7dc02a..dcbdd4ff8f 100644
--- a/assets/xml/objects/object_jj.xml
+++ b/assets/xml/objects/object_jj.xml
@@ -12,6 +12,41 @@
         <!-- Jabu Jabu skeleton -->
         <Skeleton Name="gJabuJabuSkel" Type="Flex" LimbType="Standard" Offset="0xB9A8"/>
 
+        <!-- Jabu Jabu limb Vertices -->
+        <Array Name="gJabuJabuLeftFrillVtx" Count="4" Offset="0x1F60">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuJabuRightFrillVtx" Count="4" Offset="0x1FA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuJabuHeadVtx" Count="365" Offset="0x1FE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuJabuLeftLowerFlipperVtx" Count="8" Offset="0x36B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuJabuLeftMidFlipperVtx" Count="16" Offset="0x3730">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuJabuLeftUpperFlipperVtx" Count="16" Offset="0x3830">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuJabuRightLowerFlipperVtx" Count="8" Offset="0x3930">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuJabuRightMidFlipperVtx" Count="12" Offset="0x39B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuJabuRightUpperFlipperVtx" Count="16" Offset="0x3A70">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuJabuFlukeVtx" Count="14" Offset="0x3B70">
+            <Vtx/>
+        </Array>
+        <Array Name="gJabuJabuBodyVtx" Count="133" Offset="0x3C50">
+            <Vtx/>
+        </Array>
+
         <!-- Jabu Jabu limb displaylists -->
         <DList Name="gJabuJabuBodyDL" Offset="0x5690"/>
         <DList Name="gJabuJabuLeftUpperFlipperDL" Offset="0x55B0"/>
diff --git a/assets/xml/objects/object_js.xml b/assets/xml/objects/object_js.xml
index ff7bd3efa1..bc89bf42fc 100644
--- a/assets/xml/objects/object_js.xml
+++ b/assets/xml/objects/object_js.xml
@@ -17,6 +17,41 @@
         <Limb Name="gCarpetMerchantRightHandLimb" LimbType="Standard" Offset="0x5E58"/>
         <Limb Name="gCarpetMerchantHeadLimb" LimbType="Standard" Offset="0x5E64"/>
 
+        <!-- Carpet merchant Limb Vertices -->
+        <Array Name="gCarpetMerchantBlanketAndLowerBodyVtx" Count="318" Offset="0x470">
+            <Vtx/>
+        </Array>
+        <Array Name="gCarpetMerchantHeadVtx" Count="101" Offset="0x1850">
+            <Vtx/>
+        </Array>
+        <Array Name="gCarpetMerchantLeftHandVtx" Count="34" Offset="0x1EA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gCarpetMerchantForearmLeftVtx" Count="24" Offset="0x20C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gCarpetMerchantUpperArmLeftVtx" Count="24" Offset="0x2240">
+            <Vtx/>
+        </Array>
+        <Array Name="gCarpetMerchantRightHandVtx" Count="34" Offset="0x23C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gCarpetMerchantForearmRightVtx" Count="24" Offset="0x25E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gCarpetMerchantUpperArmRightVtx" Count="24" Offset="0x2760">
+            <Vtx/>
+        </Array>
+        <Array Name="gCarpetMerchantTorsoVtx" Count="56" Offset="0x28E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gCarpetMerchantUpperHairVtx" Count="77" Offset="0x2C60">
+            <Vtx/>
+        </Array>
+        <Array Name="gCarpetMerchantLowerHairVtx" Count="49" Offset="0x3130">
+            <Vtx/>
+        </Array>
+
         <!-- Carpet Merchant Limb DisplayLists -->
         <DList Name="gCarpetMerchantBlanketAndLowerBodyDL" Offset="0x3440"/>
         <DList Name="gCarpetMerchantLowerHairDL" Offset="0x3B98"/>
diff --git a/assets/xml/objects/object_jya_iron.xml b/assets/xml/objects/object_jya_iron.xml
index c6f6773c6a..3cd24c715e 100644
--- a/assets/xml/objects/object_jya_iron.xml
+++ b/assets/xml/objects/object_jya_iron.xml
@@ -1,10 +1,25 @@
 <Root>
     <File Name="object_jya_iron" Segment="6">
+        <Array Name="gPillarVtx" Count="36" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="gPillarDL" Offset="0x0240"/>
+        <Array Name="object_jya_iron_Vtx_000360" Count="42" Offset="0x360">
+            <Vtx/>
+        </Array>
         <DList Name="gObjectJyaIronDL_000600" Offset="0x0600"/>
+        <Array Name="object_jya_iron_Vtx_000700" Count="24" Offset="0x700">
+            <Vtx/>
+        </Array>
         <DList Name="gObjectJyaIronDL_000880" Offset="0x0880"/>
+        <Array Name="object_jya_iron_Vtx_000940" Count="26" Offset="0x940">
+            <Vtx/>
+        </Array>
         <DList Name="gObjectJyaIronDL_000AE0" Offset="0x0AE0"/>
         <Collision Name="gPillarCol" Offset="0x0D48"/>
+        <Array Name="gThroneVtx" Count="45" Offset="0xD80">
+            <Vtx/>
+        </Array>
         <DList Name="gThroneDL" Offset="0x1050"/>
         <Collision Name="gThroneCol" Offset="0x1430"/>
         <Texture Name="gPillarSideTex" OutName="pillar_side" Format="rgba16" Width="16" Height="128" Offset="0x1460"/>
diff --git a/assets/xml/objects/object_kibako2.xml b/assets/xml/objects/object_kibako2.xml
index a701b294de..10d3149c69 100644
--- a/assets/xml/objects/object_kibako2.xml
+++ b/assets/xml/objects/object_kibako2.xml
@@ -1,5 +1,13 @@
 <Root>
     <File Name="object_kibako2" Segment="6">
+        <!-- Vertices -->
+        <Array Name="gLargeCrateVtx" Count="20" Offset="0x820">
+            <Vtx/>
+        </Array>
+        <Array Name="gLargeCrateFragmentVtx" Count="4" Offset="0xFC0">
+            <Vtx/>
+        </Array>
+
         <!-- DisplayLists -->
         <DList Name="gLargeCrateDL" Offset="0x960"/>
         <DList Name="gLargeCrateFragmentDL" Offset="0x1000"/>
diff --git a/assets/xml/objects/object_kingdodongo.xml b/assets/xml/objects/object_kingdodongo.xml
index 3ada2822c9..ff8b2014dd 100644
--- a/assets/xml/objects/object_kingdodongo.xml
+++ b/assets/xml/objects/object_kingdodongo.xml
@@ -10,6 +10,9 @@
         <Animation Name="object_kingdodongo_Anim_006924" Offset="0x6924"/>
         <Animation Name="object_kingdodongo_Anim_008EEC" Offset="0x8EEC"/>
         <Animation Name="object_kingdodongo_Anim_009D10" Offset="0x9D10"/>
+        <Array Name="object_kingdodongo_009D20_Vtx" Count="3" Offset="0x9D20">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_009D50" Offset="0x9D50"/>
         <DList Name="object_kingdodongo_DL_009DD0" Offset="0x9DD0"/>
         <Texture Name="object_kingdodongo_Tex_009DE8" OutName="tex_00009DE8" Format="i8" Width="16" Height="16" Offset="0x9DE8"/>
@@ -17,25 +20,85 @@
         <Animation Name="object_kingdodongo_Anim_00DF38" Offset="0xDF38"/>
         <Animation Name="object_kingdodongo_Anim_00E848" Offset="0xE848"/>
         <Animation Name="object_kingdodongo_Anim_00F0D8" Offset="0xF0D8"/>
+        <Array Name="object_kingdodongo_00F0F0_Vtx" Count="34" Offset="0xF0F0">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_00F310" Offset="0xF310"/>
+        <Array Name="object_kingdodongo_00F470_Vtx" Count="37" Offset="0xF470">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_00F6C0" Offset="0xF6C0"/>
+        <Array Name="object_kingdodongo_00F840_Vtx" Count="40" Offset="0xF840">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_00FAC0" Offset="0xFAC0"/>
+        <Array Name="object_kingdodongo_00FBE8_Vtx" Count="56" Offset="0xFBE8">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_00FF68" Offset="0xFF68"/>
+        <Array Name="object_kingdodongo_010120_Vtx" Count="39" Offset="0x10120">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_010390" Offset="0x10390"/>
+        <Array Name="object_kingdodongo_010508_Vtx" Count="55" Offset="0x10508">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_010878" Offset="0x10878"/>
+        <Array Name="object_kingdodongo_0109C0_Vtx" Count="34" Offset="0x109C0">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_010BE0" Offset="0x10BE0"/>
+        <Array Name="object_kingdodongo_010D40_Vtx" Count="37" Offset="0x10D40">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_010F90" Offset="0x10F90"/>
+        <Array Name="object_kingdodongo_011110_Vtx" Count="40" Offset="0x11110">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_011390" Offset="0x11390"/>
+        <Array Name="object_kingdodongo_0114B8_Vtx" Count="56" Offset="0x114B8">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_011838" Offset="0x11838"/>
+        <Array Name="object_kingdodongo_0119F0_Vtx" Count="39" Offset="0x119F0">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_011C60" Offset="0x11C60"/>
+        <Array Name="object_kingdodongo_011DD8_Vtx" Count="55" Offset="0x11DD8">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_012148" Offset="0x12148"/>
+        <Array Name="object_kingdodongo_012290_Vtx" Count="84" Offset="0x12290">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_0127D0" Offset="0x127D0"/>
+        <Array Name="object_kingdodongo_012A28_Vtx" Count="80" Offset="0x12A28">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_012F28" Offset="0x12F28"/>
+        <Array Name="object_kingdodongo_013160_Vtx" Count="101" Offset="0x13160">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_0137B0" Offset="0x137B0"/>
+        <Array Name="object_kingdodongo_013A10_Vtx" Count="33" Offset="0x13A10">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_013C20" Offset="0x13C20"/>
+        <Array Name="object_kingdodongo_013D78_Vtx" Count="24" Offset="0x13D78">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_013EF8" Offset="0x13EF8"/>
+        <Array Name="object_kingdodongo_014040_Vtx" Count="12" Offset="0x14040">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_014100" Offset="0x14100"/>
+        <Array Name="object_kingdodongo_0141E0_Vtx" Count="133" Offset="0x141E0">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_014A30" Offset="0x14A30"/>
+        <Array Name="object_kingdodongo_014D50_Vtx" Count="142" Offset="0x14D50">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_015630" Offset="0x15630"/>
         <Texture Name="object_kingdodongo_Tex_015890" OutName="tex_00015890" Format="rgba16" Width="8" Height="16" Offset="0x15890"/>
         <Texture Name="object_kingdodongo_Tex_015990" OutName="tex_00015990" Format="rgba16" Width="16" Height="32" Offset="0x15990"/>
@@ -102,6 +165,9 @@
         <Animation Name="object_kingdodongo_Anim_01D218" Offset="0x1BE18"/>
         <Animation Name="object_kingdodongo_Anim_01D934" Offset="0x1C534"/>
         <DList Name="object_kingdodongo_DL_01D950" Offset="0x1C550"/>
+        <Array Name="object_kingdodongo_01C5B0_Vtx" Count="4" Offset="0x1C5B0">
+            <Vtx/>
+        </Array>
         <Texture Name="object_kingdodongo_Tex_01D9F0" OutName="tex_0001D9F0" Format="ia8" Width="64" Height="64" Offset="0x1C5F0"/>
         <Texture Name="object_kingdodongo_Tex_01E9F0" OutName="tex_0001E9F0" Format="ia8" Width="64" Height="64" Offset="0x1D5F0"/>
         <Texture Name="object_kingdodongo_Tex_01F9F0" OutName="tex_0001F9F0" Format="ia8" Width="64" Height="64" Offset="0x1E5F0"/>
@@ -111,8 +177,17 @@
         <Texture Name="object_kingdodongo_Tex_0239F0" OutName="tex_000239F0" Format="ia8" Width="64" Height="64" Offset="0x225F0"/>
         <Texture Name="object_kingdodongo_Tex_0249F0" OutName="tex_000249F0" Format="ia8" Width="64" Height="64" Offset="0x235F0"/>
         <DList Name="object_kingdodongo_DL_0259F0" Offset="0x245F0"/>
+        <Array Name="object_kingdodongo_024650_Vtx" Count="4" Offset="0x24650">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_025A90" Offset="0x24690"/>
+        <Array Name="object_kingdodongo_0246F0_Vtx" Count="4" Offset="0x246F0">
+            <Vtx/>
+        </Array>
         <Collision Name="object_kingdodongo_Col_025B64" Offset="0x24764"/>
+        <Array Name="object_kingdodongo_024790_Vtx" Count="4" Offset="0x24790">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_025BD0" Offset="0x247D0"/>
         <Texture Name="object_kingdodongo_Tex_025C58" OutName="tex_00025C58" Format="rgba16" Width="32" Height="32" Offset="0x24858"/>
         <Collision Name="object_kingdodongo_Col_0264A8" Offset="0x250A8"/>
diff --git a/assets/xml/objects/object_km1.xml b/assets/xml/objects/object_km1.xml
index 4d17119251..2db9a8d119 100644
--- a/assets/xml/objects/object_km1.xml
+++ b/assets/xml/objects/object_km1.xml
@@ -34,6 +34,9 @@
         <Texture Name="gKm1Ear2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0x83C"/>
         <Texture Name="gKm1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x93C" TlutOffset="0x83C"/>
         <Texture Name="gKm1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x97C" TlutOffset="0x83C"/>
+        <Array Name="gKm1Vtx" Count="209" Offset="0xB80">
+            <Vtx/>
+        </Array>
         <DList Name="gKm1DL" Offset="0x1890"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ma1.xml b/assets/xml/objects/object_ma1.xml
index 11509ad6aa..257958a2ea 100644
--- a/assets/xml/objects/object_ma1.xml
+++ b/assets/xml/objects/object_ma1.xml
@@ -46,6 +46,58 @@
         <Texture Name="gMalonChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2318" TlutOffset="0x15B0"/>
         <Texture Name="gMalonChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2718" TlutOffset="0x15B0"/>
 
+        <Array Name="gMalonChildHeadVtx" Count="227" Offset="0x3318">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildDressLowerVtx" Count="52" Offset="0x4B18">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildDressMiddleVtx" Count="35" Offset="0x4E58">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildLeftHandVtx" Count="40" Offset="0x5088">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildLeftArmVtx" Count="24" Offset="0x5308">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildLeftShoulderVtx" Count="40" Offset="0x5488">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildRightHandVtx" Count="40" Offset="0x5708">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildRightArmVtx" Count="24" Offset="0x5988">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildRightShoulderVtx" Count="40" Offset="0x5B08">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildChestVtx" Count="120" Offset="0x5D88">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildRightFoorVtx" Count="29" Offset="0x6508">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildRightShinVtx" Count="17" Offset="0x66D8">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildRightThighVtx" Count="3" Offset="0x67E8">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildLeftFootVtx" Count="29" Offset="0x6818">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildLeftShinVtx" Count="17" Offset="0x69E8">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildLeftThighVtx" Count="3" Offset="0x6AF8">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonChildDressUpperVtx" Count="20" Offset="0x6B28">
+            <Vtx/>
+        </Array>
+
         <DList Name="gMalonChildHeadDL" Offset="0x4148"/>
         <DList Name="gMalonChildDressLowerDL" Offset="0x6C68"/>
         <DList Name="gMalonChildDressMiddleDL" Offset="0x6DD8"/>
diff --git a/assets/xml/objects/object_ma2.xml b/assets/xml/objects/object_ma2.xml
index 0b6eabff70..9b450aa94a 100644
--- a/assets/xml/objects/object_ma2.xml
+++ b/assets/xml/objects/object_ma2.xml
@@ -29,6 +29,58 @@
         <Texture Name="gMalonAdultMouthSadTex" OutName="mouth_sad" Format="ci8" Width="32" Height="16" Offset="0x3570" TlutOffset="0x1F70"/>
         <Texture Name="gMalonAdultMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="16" Offset="0x3770" TlutOffset="0x1F70"/>
 
+        <Array Name="gMalonAdultHeadVtx" Count="234" Offset="0x3970">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultBasketVtx" Count="61" Offset="0x4810">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultLeftHandVtx" Count="40" Offset="0x55F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultLeftArmVtx" Count="24" Offset="0x5878">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultLeftShoulderVtx" Count="40" Offset="0x59F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultRightHandVtx" Count="40" Offset="0x5C78">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultRightArmVtx" Count="24" Offset="0x5EF8">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultRightShoulderVtx" Count="40" Offset="0x6078">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultChestAndNeckVtx" Count="91" Offset="0x62F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultDressVtx" Count="44" Offset="0x68A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultLeftFootVtx" Count="31" Offset="0x6B68">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultLeftLegVtx" Count="19" Offset="0x6D58">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultLeftThighVtx" Count="3" Offset="0x6E88">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultRightFootVtx" Count="31" Offset="0x6EB8">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultRightLegVtx" Count="19" Offset="0x70A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultRightThighVtx" Count="3" Offset="0x71D8">
+            <Vtx/>
+        </Array>
+        <Array Name="gMalonAdultTorsoVtx" Count="54" Offset="0x7208">
+            <Vtx/>
+        </Array>
+
         <DList Name="gMalonAdultHeadDL" Offset="0x4BE0"/>
         <DList Name="gMalonAdultBasketDL" Offset="0x5420"/>
         <DList Name="gMalonAdultChestAndNeckDL" Offset="0x7568"/>
diff --git a/assets/xml/objects/object_mamenoki.xml b/assets/xml/objects/object_mamenoki.xml
index 819d890225..f17ff1fc8a 100644
--- a/assets/xml/objects/object_mamenoki.xml
+++ b/assets/xml/objects/object_mamenoki.xml
@@ -1,8 +1,20 @@
 <Root>
     <File Name="object_mamenoki" Segment="6">
+        <Array Name="gMagicBeanSeedlingVtx" Count="9" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="gMagicBeanSeedlingDL" Offset="0x90"/>
+        <Array Name="gMagicBeanStemVtx" Count="8" Offset="0x130">
+            <Vtx/>
+        </Array>
         <DList Name="gMagicBeanStemDL" Offset="0x1B0"/>
+        <Array Name="gMagicBeanPlatformVtx" Count="26" Offset="0x250">
+            <Vtx/>
+        </Array>
         <DList Name="gMagicBeanPlatformDL" Offset="0x3F0"/>
+        <Array Name="gMagicBeanSoftSoilVtx" Count="4" Offset="0x610">
+            <Vtx/>
+        </Array>
         <DList Name="gMagicBeanSoftSoilDL" Offset="0x650"/>
         <Texture Name="gMagicBeanSoftSoilTex" OutName="soft_soil" Format="rgba16" Width="32" Height="32" Offset="0x6E0"/>
         <Texture Name="gMagicBeanSeedlingTex" OutName="seedling" Format="rgba16" Width="16" Height="32" Offset="0xEE0"/>
diff --git a/assets/xml/objects/object_masterkokirihead.xml b/assets/xml/objects/object_masterkokirihead.xml
index 1e489323c2..1a35b675cf 100644
--- a/assets/xml/objects/object_masterkokirihead.xml
+++ b/assets/xml/objects/object_masterkokirihead.xml
@@ -1,5 +1,8 @@
 <Root>
     <File Name="object_masterkokirihead" Segment="6">
+        <Array Name="gKokiriShopkeeperHeadVtx" Count="103" Offset="0x21B0">
+            <Vtx/>
+        </Array>
         <DList Name="gKokiriShopkeeperHeadDL" Offset="0x2820"/>
         <Texture Name="gKokiriShopkeeperTLUT" OutName="tlut" Format="rgba16" Width="248" Height="1" Offset="0x0"/>
         <Texture Name="gKokiriShopkeeperEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1F0"/>
diff --git a/assets/xml/objects/object_md.xml b/assets/xml/objects/object_md.xml
index 45527ca1b9..ac10cb64eb 100644
--- a/assets/xml/objects/object_md.xml
+++ b/assets/xml/objects/object_md.xml
@@ -21,6 +21,53 @@
         <Limb Name="gMidoRightHandLimb" LimbType="Standard" Offset="0x7F60"/>
         <Limb Name="gMidoHeadLimb" LimbType="Standard" Offset="0x7F6C"/>
 
+        <!-- Mido Limb Vertices -->
+        <Array Name="gMidoLeftHandVtx" Count="48" Offset="0x15E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoLeftForearmVtx" Count="24" Offset="0x18E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoLeftUpperArmVtx" Count="24" Offset="0x1A60">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoRightHandVtx" Count="48" Offset="0x1BE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoRightForearmVtx" Count="24" Offset="0x1EE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoRightUpperArmVtx" Count="24" Offset="0x2060">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoTorsoVtx" Count="70" Offset="0x21E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoLeftFootVtx" Count="30" Offset="0x2640">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoLeftLegVtx" Count="22" Offset="0x2820">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoLeftThighVtx" Count="33" Offset="0x2980">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoRightFootVtx" Count="30" Offset="0x2B90">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoRightLegVtx" Count="22" Offset="0x2D70">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoRightThighVtx" Count="33" Offset="0x2ED0">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoWaistVtx" Count="31" Offset="0x30E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gMidoHeadVtx" Count="229" Offset="0x6530">
+            <Vtx/>
+        </Array>
+
         <!-- Mido Limb DisplayLists -->
         <DList Name="gMidoWaistDL" Offset="0x4218"/>
         <DList Name="gMidoLeftThighDL" Offset="0x47D0"/>
diff --git a/assets/xml/objects/object_menkuri_objects.xml b/assets/xml/objects/object_menkuri_objects.xml
index 4c2b51df5b..864ef25b85 100644
--- a/assets/xml/objects/object_menkuri_objects.xml
+++ b/assets/xml/objects/object_menkuri_objects.xml
@@ -8,10 +8,25 @@
         <Texture Name="gGTGTex_6310" OutName="gtg_6310" Format="rgba16" Width="32" Height="32" Offset="0x6310"/>
         <Texture Name="gGTGStatueEyeTex" OutName="gtg_statue_eye" Format="i4" Width="64" Height="128" Offset="0x6B10"/>
         <Texture Name="gGTGRotatingRingPlatformOuterCircleTex" OutName="gtg_rotating_ring_platform_outer_circle" Format="i4" Width="128" Height="64" Offset="0x7B10"/>
+        <Array Name="gGTGDoorVtx" Count="13" Offset="0x1000">
+            <Vtx/>
+        </Array>
         <DList Name="gGTGDoorDL" Offset="0x10D0"/>
+        <Array Name="gGTGFakeWallVtx" Count="16" Offset="0x2180">
+            <Vtx/>
+        </Array>
         <DList Name="gGTGFakeWallDL" Offset="0x2280"/>
+        <Array Name="gGTGFakeCeilingVtx" Count="8" Offset="0x2B40">
+            <Vtx/>
+        </Array>
         <DList Name="gGTGFakeCeilingDL" Offset="0x2BC0"/>
+        <Array Name="gGTGEyeStatueEyeVtx" Count="12" Offset="0x2C60">
+            <Vtx/>
+        </Array>
         <DList Name="gGTGEyeStatueEyeDL" Offset="0x2D20"/>
+        <Array Name="gGTGRotatingRingPlatformVtx" Count="176" Offset="0x2DD0">
+            <Vtx/>
+        </Array>
         <DList Name="gGTGRotatingRingPlatformDL" Offset="0x38D0"/>
         <Collision Name="gGTGRotatingRingPlatformCol" Offset="0x42D8"/>
     </File>
diff --git a/assets/xml/objects/object_mir_ray.xml b/assets/xml/objects/object_mir_ray.xml
index 2acc9391ab..0d1972c3c6 100644
--- a/assets/xml/objects/object_mir_ray.xml
+++ b/assets/xml/objects/object_mir_ray.xml
@@ -1,6 +1,14 @@
 <Root>
     <File Name="object_mir_ray" Segment="6">
 
+        <!-- Shield beam vertices -->
+        <Array Name="gShieldBeamImageVtx" Count="11" Offset="0x0">
+            <Vtx/>
+        </Array>
+        <Array Name="gShieldBeamGlowVtx" Count="12" Offset="0xB90">
+            <Vtx/>
+        </Array>
+
         <!-- Shield beam displaylists -->
         <DList Name="gShieldBeamImageDL" Offset="0xB0"/>
         <DList Name="gShieldBeamGlowDL" Offset="0xC50"/>
diff --git a/assets/xml/objects/object_mori_objects.xml b/assets/xml/objects/object_mori_objects.xml
index 1844cf6f69..85ffe02181 100644
--- a/assets/xml/objects/object_mori_objects.xml
+++ b/assets/xml/objects/object_mori_objects.xml
@@ -6,20 +6,47 @@
         <Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_tlut" Format="rgba16" Width="112" Height="1" Offset="0x3810"/>
         <Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Format="ci8" Width="32" Height="32" Offset="0x38F0" TlutOffset="0x3810"/>
         <Collision Name="gMoriBigstCol" Offset="0x221C"/>
+        <Array Name="gMoriBigstVtx" Count="50" Offset="0x1B30">
+            <Vtx/>
+        </Array>
         <DList Name="gMoriBigstDL" Offset="0x1E50"/>
         <Collision Name="gMoriElevatorCol" Offset="0x35F8"/>
+        <Array Name="gMoriElevatorVtx" Count="136" Offset="0x2250">
+            <Vtx/>
+        </Array>
         <DList Name="gMoriElevatorDL" Offset="0x2AD0"/>
         <Collision Name="gMoriHashigoCol" Offset="0x37D8"/>
+        <Array Name="gMoriHashigoLadderVtx" Count="8" Offset="0x3630">
+            <Vtx/>
+        </Array>
         <DList Name="gMoriHashigoLadderDL" Offset="0x36B0"/>
+        <Array Name="gMoriHashigoClaspVtx" Count="168" Offset="0x3CF0">
+            <Vtx/>
+        </Array>
         <DList Name="gMoriHashigoClaspDL" Offset="0x4770"/>
         <Collision Name="gMoriHashira1Col" Offset="0x1AF8"/>
         <Collision Name="gMoriHashira2Col" Offset="0x89E0"/>
+        <Array Name="gMoriHashiraPlatformsVtx" Count="226" Offset="0x4E0">
+            <Vtx/>
+        </Array>
         <DList Name="gMoriHashiraPlatformsDL" Offset="0x1300"/>
+        <Array Name="gMoriHashiraGateVtx" Count="6" Offset="0x87E0">
+            <Vtx/>
+        </Array>
         <DList Name="gMoriHashiraGateDL" Offset="0x8840"/>
+        <Array Name="gMoriIdomizuWaterVtx" Count="4" Offset="0x4990">
+            <Vtx/>
+        </Array>
         <DList Name="gMoriIdomizuWaterDL" Offset="0x49D0"/>
         <Collision Name="gMoriKaitenkabeCol" Offset="0x63B8"/>
+        <Array Name="gMoriKaitenkabeVtx" Count="195" Offset="0x4A80">
+            <Vtx/>
+        </Array>
         <DList Name="gMoriKaitenkabeDL" Offset="0x56B0"/>
         <Collision Name="gMoriRakkatenjoCol" Offset="0x87AC"/>
+        <Array Name="gMoriRakkatenjoVtx" Count="298" Offset="0x63F0">
+            <Vtx/>
+        </Array>
         <DList Name="gMoriRakkatenjoDL" Offset="0x7690"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ms.xml b/assets/xml/objects/object_ms.xml
index 66923df8ae..3fbab475e4 100644
--- a/assets/xml/objects/object_ms.xml
+++ b/assets/xml/objects/object_ms.xml
@@ -13,6 +13,29 @@
         <Limb Name="gBeanSalesmanBodyLimb" LimbType="Standard" Offset="0x3D88"/>
         <Limb Name="gBeanSalesmanBeanbagLimb" LimbType="Standard" Offset="0x3D94"/>
 
+        <!-- Bean Salesman Limb Vertices -->
+        <Array Name="gBeanSalesmanLeftHandVtx" Count="43" Offset="0x600">
+            <Vtx/>
+        </Array>
+        <Array Name="gBeanSalesmanLeftForearmVtx" Count="26" Offset="0x8B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBeanSalesmanLeftUpperArmVtx" Count="32" Offset="0xA50">
+            <Vtx/>
+        </Array>
+        <Array Name="gBeanSalesmanMouthVtx" Count="22" Offset="0xC50">
+            <Vtx/>
+        </Array>
+        <Array Name="gBeanSalesmanHeadVtx" Count="114" Offset="0xDB0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBeanSalesmanBodyVtx" Count="188" Offset="0x14D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBeanSalesmanBeanbagVtx" Count="21" Offset="0x2090">
+            <Vtx/>
+        </Array>
+
         <!-- Bean Salesman Limb DisplayLists -->
         <DList Name="gBeanSalesmanLeftUpperArmDL" Offset="0x2E58"/>
         <DList Name="gBeanSalesmanLeftForearmDL" Offset="0x2F90"/>
diff --git a/assets/xml/objects/object_nb.xml b/assets/xml/objects/object_nb.xml
index 74de9e2859..b720a53020 100644
--- a/assets/xml/objects/object_nb.xml
+++ b/assets/xml/objects/object_nb.xml
@@ -24,6 +24,59 @@
         <Limb Name="gNabooruPonytailLimb" LimbType="Standard" Offset="0x18168"/>
         <Limb Name="gNabooruWaistLimb" LimbType="Standard" Offset="0x18174"/>
 
+        <!-- Nabooru Limb Vertices -->
+        <Array Name="gNabooruHeadMouthClosedVtx" Count="297" Offset="0xDD68">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruPonytailVtx" Count="49" Offset="0xF1E8">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruLeftHandVtx" Count="64" Offset="0xF4F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruRightHandVtx" Count="64" Offset="0xF8F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruRightFootVtx" Count="32" Offset="0xFCF8">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruLeftFootVtx" Count="32" Offset="0xFEF8">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruHeadMouthOpenVtx" Count="315" Offset="0x100F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruRightForearmVtx" Count="32" Offset="0x142F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruRightUpperArmVtx" Count="28" Offset="0x144F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruLeftForearmVtx" Count="32" Offset="0x146B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruLeftUpperArmVtx" Count="44" Offset="0x148B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruTorsoVtx" Count="129" Offset="0x14B70">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruRightShinVtx" Count="74" Offset="0x15380">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruRightThighVtx" Count="34" Offset="0x15820">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruLeftShinVtx" Count="74" Offset="0x15A40">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruLeftThighVtx" Count="33" Offset="0x15EE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gNabooruWaistVtx" Count="58" Offset="0x160F0">
+            <Vtx/>
+        </Array>
+
         <!-- Nabooru Limb DisplayLists -->
         <DList Name="gNabooruHeadMouthOpenDL" Offset="0x13158"/>
         <DList Name="gNabooruLeftThighDL" Offset="0x17B40"/>
diff --git a/assets/xml/objects/object_niw.xml b/assets/xml/objects/object_niw.xml
index 4eafec9566..c68f90b88c 100644
--- a/assets/xml/objects/object_niw.xml
+++ b/assets/xml/objects/object_niw.xml
@@ -20,6 +20,29 @@
         <Limb Name="gCuccoNeckLimb" LimbType="Standard" Offset="0x24DC"/>
         <Limb Name="gCuccoHeadLimb" LimbType="Standard" Offset="0x24E8"/>
 
+        <!-- Cucco Limb Vertices -->
+        <Array Name="gCuccoHeadVtx" Count="62" Offset="0x100">
+            <Vtx/>
+        </Array>
+        <Array Name="gCuccoNeckVtx" Count="15" Offset="0x4E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gCuccoRightWingVtx" Count="8" Offset="0x5D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gCuccoLeftWingVtx" Count="8" Offset="0x650">
+            <Vtx/>
+        </Array>
+        <Array Name="gCuccoLeftFootVtx" Count="3" Offset="0x6D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gCuccoRightFootVtx" Count="3" Offset="0x700">
+            <Vtx/>
+        </Array>
+        <Array Name="gCuccoTailAndUndersideVtx" Count="41" Offset="0x730">
+            <Vtx/>
+        </Array>
+
         <!-- Cucco Limb DisplayLists -->
         <DList Name="gCuccoTailAndUndersideDL" Offset="0x0DF0"/>
         <DList Name="gCuccoLeftFootDL" Offset="0x11E0"/>
@@ -29,8 +52,11 @@
         <DList Name="gCuccoNeckDL" Offset="0x09C0"/>
         <DList Name="gCuccoHeadDL" Offset="0x0A98"/>
 
-        <!-- Other Cucco DisplayLists -->
+        <!-- Other Cucco Vertices and DisplayLists -->
         <DList Name="gCuccoEffectFeatherMaterialDL" Offset="0x23B0"/>
+        <Array Name="gCuccoEffectFeatherModelVtx" Count="3" Offset="0x2380">
+            <Vtx/>
+        </Array>
         <DList Name="gCuccoEffectFeatherModelDL" Offset="0x2428"/>
 
         <!-- Cucco DisplayList Textures -->
diff --git a/assets/xml/objects/object_nwc.xml b/assets/xml/objects/object_nwc.xml
index abe2be092b..b6cad1801a 100644
--- a/assets/xml/objects/object_nwc.xml
+++ b/assets/xml/objects/object_nwc.xml
@@ -5,12 +5,24 @@
         <Texture Name="gCuccoChickEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x8E0"/>
         <Texture Name="gCuccoChickBeakTex" OutName="beak" Format="rgba16" Width="4" Height="4" Offset="0xAE0"/>
         <DList Name="gCuccoChickSetupBodyDL" Offset="0x840"/>
+        <Array Name="gCuccoChickBodyVtx" Count="4" Offset="0x800">
+            <Vtx/>
+        </Array>
         <DList Name="gCuccoChickBodyDL" Offset="0x8B0"/>
         <DList Name="gCuccoChickSetupEyeDL" Offset="0xBF0"/>
+        <Array Name="gCuccoChickEyesVtx" Count="6" Offset="0xB90">
+            <Vtx/>
+        </Array>
         <DList Name="gCuccoChickEyesDL" Offset="0xC68"/>
         <DList Name="gCuccoChickSetupBeakDL" Offset="0xC88"/>
+        <Array Name="gCuccoChickBeakVtx" Count="9" Offset="0xB00">
+            <Vtx/>
+        </Array>
         <DList Name="gCuccoChickBeakDL" Offset="0xCE0"/>
         <DList Name="gCuccoChickSetupShadowDL" Offset="0xD10"/>
+        <Array Name="gCuccoChickShadowVtx" Count="3" Offset="0xD68">
+            <Vtx/>
+        </Array>
         <DList Name="gCuccoChickShadowDL" Offset="0xD50"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_oE4s.xml b/assets/xml/objects/object_oE4s.xml
index 1f1b33dcfa..8aefb0bb2c 100644
--- a/assets/xml/objects/object_oE4s.xml
+++ b/assets/xml/objects/object_oE4s.xml
@@ -19,6 +19,8 @@
         <Limb Name="object_oE4s_Limb_000144" LimbType="Standard" Offset="0x144"/>
         <Skeleton Name="object_oE4s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
         <Texture Name="object_oE4s_TLUT_0001A8" OutName="tlut_000001A8" Format="rgba16" Width="124" Height="1" Offset="0x1A8"/><!--Blob Name="object_oE4s_Blob_0003A8" Size="0xF8" Offset="0x3A8" /-->
+        <Texture Name="object_oE4s_0002A0_Tex" Format="ci8" Width="16" Height="16" Offset="0x2A0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_0003A0_Tex" Format="ci8" Width="16" Height="16" Offset="0x3A0" TlutOffset="0x1A8"/>
         <Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0" TlutOffset="0x1A8"/>
         <Texture Name="object_oE4s_Tex_0004E0" OutName="tex_000004E0" Format="rgba16" Width="16" Height="32" Offset="0x4E0"/>
         <Texture Name="object_oE4s_Tex_0008E0" OutName="tex_000008E0" Format="rgba16" Width="8" Height="16" Offset="0x8E0"/>
diff --git a/assets/xml/objects/object_os.xml b/assets/xml/objects/object_os.xml
index d98b3a0f52..48c69ae276 100644
--- a/assets/xml/objects/object_os.xml
+++ b/assets/xml/objects/object_os.xml
@@ -3,6 +3,32 @@
         <!-- Happy Mask Salesman Animation -->
         <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x2E4"/>
 
+        <!-- Happy Mask Salesman Vertices -->
+        <Array Name="gHappyMaskSalesmanHeadVtx" Count="154" Offset="0x300">
+            <Vtx/>
+        </Array>
+        <Array Name="gHappyMaskSalesmanLeftHandVtx" Count="53" Offset="0xCA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHappyMaskSalesmanLeftForearmVtx" Count="24" Offset="0xFF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHappyMaskSalesmanLeftUpperArmVtx" Count="24" Offset="0x1170">
+            <Vtx/>
+        </Array>
+        <Array Name="gHappyMaskSalesmanRightHandVtx" Count="54" Offset="0x12F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHappyMaskSalesmanRightForearmVtx" Count="24" Offset="0x1650">
+            <Vtx/>
+        </Array>
+        <Array Name="gHappyMaskSalesmanRightUpperArmVtx" Count="24" Offset="0x17D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gHappyMaskSalesmanTorsoVtx" Count="67" Offset="0x1950">
+            <Vtx/>
+        </Array>
+
         <!-- Happy Mask Salesman DLists -->
         <DList Name="gHappyMaskSalesmanTorsoDL" Offset="0x1D80"/>
         <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x20A8"/>
diff --git a/assets/xml/objects/object_ossan.xml b/assets/xml/objects/object_ossan.xml
index c0d80ad0b0..4eb3e74131 100644
--- a/assets/xml/objects/object_ossan.xml
+++ b/assets/xml/objects/object_ossan.xml
@@ -25,19 +25,45 @@
         <Array Name="object_ossan_Vtx_0024E0" Count="149" Offset="0x24E0">
             <Vtx/>
         </Array>
+        <DList Name="object_ossan_002E30_DL" Offset="0x2E30"/>
+        <DList Name="object_ossan_003130_DL" Offset="0x3130"/>
+        <DList Name="object_ossan_003318_DL" Offset="0x3318"/>
+        <DList Name="object_ossan_003708_DL" Offset="0x3708"/>
+        <DList Name="object_ossan_003B30_DL" Offset="0x3B30"/>
+        <DList Name="object_ossan_003D18_DL" Offset="0x3D18"/>
+        <DList Name="object_ossan_004108_DL" Offset="0x4108"/>
         <Texture Name="gOssanEyesTLUT" OutName="ossan_eyes_tlut" Format="rgba16" Width="63" Height="4" Offset="0x4530"/>
         <Texture Name="gOssanTLUT" OutName="ossan_tlut" Format="rgba16" Width="168" Height="1" Offset="0x4728"/>
         <Texture Name="gOssanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x4878" TlutOffset="0x4530"/>
         <Texture Name="gOssanBeardTex" OutName="beard" Format="ci8" Width="32" Height="32" Offset="0x4C78" TlutOffset="0x4728"/>
+        <Texture Name="object_ossan_005078_Tex" Format="ci8" Width="16" Height="16" Offset="0x5078" TlutOffset="0x4728"/>
+        <Texture Name="object_ossan_005178_Tex" Format="ci8" Width="16" Height="16" Offset="0x5178" TlutOffset="0x4728"/>
+        <Texture Name="object_ossan_005278_Tex" Format="ci8" Width="8" Height="8" Offset="0x5278" TlutOffset="0x4728"/>
         <Texture Name="gOssanEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x52B8" TlutOffset="0x4530"/>
         <Texture Name="gOssanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x56B8" TlutOffset="0x4530"/>
+        <Texture Name="object_ossan_005AB8_Tex" Format="ci8" Width="8" Height="8" Offset="0x5AB8" TlutOffset="0x4728"/>
         <Array Name="object_ossan_Vtx_005AF8" Count="169" Offset="0x5AF8">
             <Vtx/>
         </Array>
         <Array Name="object_ossan_Vtx_006588" Count="234" Offset="0x6588">
             <Vtx/>
         </Array>
+        <DList Name="object_ossan_007428_DL" Offset="0x7428"/>
         <DList Name="gObjectOssanEnSyatekiManDL_007E28" Offset="0x7E28"/>
+        <Texture Name="object_ossan_008A38_Tex" Format="rgba16" Width="8" Height="8" Offset="0x8A38"/>
+        <Texture Name="object_ossan_008AB8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x8AB8"/>
+        <Texture Name="object_ossan_008CB8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x8CB8"/>
+        <Texture Name="object_ossan_008EB8_Tex" Format="rgba16" Width="32" Height="32" Offset="0x8EB8"/>
+        <Texture Name="object_ossan_0096B8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x96B8"/>
+        <Texture Name="object_ossan_0098B8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x98B8"/>
+        <Limb Name="object_ossan_009AB8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009AB8" Offset="0x9AB8"/>
+        <Limb Name="object_ossan_009AC4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009AC4" Offset="0x9AC4"/>
+        <Limb Name="object_ossan_009AD0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009AD0" Offset="0x9AD0"/>
+        <Limb Name="object_ossan_009ADC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009ADC" Offset="0x9ADC"/>
+        <Limb Name="object_ossan_009AE8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009AE8" Offset="0x9AE8"/>
+        <Limb Name="object_ossan_009AF4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009AF4" Offset="0x9AF4"/>
+        <Limb Name="object_ossan_009B00_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009B00" Offset="0x9B00"/>
+        <Limb Name="object_ossan_009B0C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009B0C" Offset="0x9B0C"/>
         <Skeleton Name="gObjectOssanSkel" Type="Flex" LimbType="Standard" Offset="0x9B38"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_peehat.xml b/assets/xml/objects/object_peehat.xml
index 42ee66cdef..8abf77add3 100644
--- a/assets/xml/objects/object_peehat.xml
+++ b/assets/xml/objects/object_peehat.xml
@@ -28,6 +28,32 @@
         <Limb Name="gPeehatWing6Limb" LimbType="Standard" Offset="0x1C0C"/>
         <Limb Name="gPeehatTopLimb" LimbType="Standard" Offset="0x1C18"/>
 
+        <!-- Peehat Limb Vertices -->
+        <Array Name="gPeehatWing1Vtx" Count="3" Offset="0x9E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gPeehatWing2Vtx" Count="3" Offset="0xA10">
+            <Vtx/>
+        </Array>
+        <Array Name="gPeehatWing3Vtx" Count="3" Offset="0xA40">
+            <Vtx/>
+        </Array>
+        <Array Name="gPeehatWing4Vtx" Count="3" Offset="0xA70">
+            <Vtx/>
+        </Array>
+        <Array Name="gPeehatWing5Vtx" Count="3" Offset="0xAA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gPeehatWing6Vtx" Count="3" Offset="0xAD0">
+            <Vtx/>
+        </Array>
+        <Array Name="gPeehatTopVtx" Count="27" Offset="0xB00">
+            <Vtx/>
+        </Array>
+        <Array Name="gPeehatBodyVtx" Count="34" Offset="0xCB0">
+            <Vtx/>
+        </Array>
+
         <!-- Peehat Limb DisplayLists -->
         <DList Name="gPeehatBodyDL" Offset="0x12F0"/>
         <DList Name="gPeehatWing1DL" Offset="0x0ED0"/>
diff --git a/assets/xml/objects/object_po_composer.xml b/assets/xml/objects/object_po_composer.xml
index 17c04fd18b..cb08b64b06 100644
--- a/assets/xml/objects/object_po_composer.xml
+++ b/assets/xml/objects/object_po_composer.xml
@@ -7,11 +7,59 @@
         <Animation Name="gPoeComposerFloatAnim" Offset="0x09DC"/>
         <Animation Name="gPoeComposerAppearAnim" Offset="0x0FE4"/>
         <Animation Name="gPoeComposerDisappearAnim" Offset="0x1440"/>
+        <Array Name="gPoeComposerSoulVtx" Count="4" Offset="0x1C50">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeComposerSoulDL" Offset="0x1C90"/>
+        <Array Name="object_po_composer_Vtx_001D50" Count="21" Offset="0x1D50">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_composer_Vtx_001EA0" Count="41" Offset="0x1EA0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_composer_Vtx_002130" Count="6" Offset="0x2130">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_composer_Vtx_002190" Count="8" Offset="0x2190">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_composer_Vtx_002210" Count="47" Offset="0x2210">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_composer_Vtx_002500" Count="16" Offset="0x2500">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_composer_Vtx_002600" Count="8" Offset="0x2600">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_composer_Vtx_002680" Count="47" Offset="0x2680">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_composer_Vtx_003500" Count="69" Offset="0x3500">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_composer_Vtx_003950" Count="9" Offset="0x3950">
+            <Vtx/>
+        </Array>
+        <Array Name="gPoeComposerLanternBottomVtx" Count="7" Offset="0x39E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gPoeComposerLanternTopVtx" Count="10" Offset="0x3A50">
+            <Vtx/>
+        </Array>
+        <Array Name="gPoeComposerLanternVtx" Count="13" Offset="0x3AF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gPoeComposerFlatHeadVtx" Count="84" Offset="0x3BC0">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeComposerLanternBottomDL" Offset="0x4498"/>
         <DList Name="gPoeComposerLanternTopDL" Offset="0x4530"/>
         <DList Name="gPoeComposerLanternDL" Offset="0x45A0"/>
         <DList Name="gPoeComposerFlatHeadDL" Offset="0x4638"/>
+        <Array Name="gPoeComposerBurnVtx" Count="127" Offset="0x4A30">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeComposerBurnDL" Offset="0x5220"/>
         <Skeleton Name="gPoeComposerSkel" Type="Flex" LimbType="Standard" Offset="0x6F90"/>
     </File>
diff --git a/assets/xml/objects/object_po_field.xml b/assets/xml/objects/object_po_field.xml
index 43e1066e3b..2caf708162 100644
--- a/assets/xml/objects/object_po_field.xml
+++ b/assets/xml/objects/object_po_field.xml
@@ -9,13 +9,86 @@
         <Animation Name="gPoeFieldDisappearAnim" Offset="0x1360"/>
         <Texture Name="gBigPoeSoulTex" OutName="big_poe_soul" Format="i8" Width="32" Height="64" Offset="0x1370"/>
         <Texture Name="gPoeFieldSoulTex" OutName="poe_field_soul" Format="i8" Width="32" Height="64" Offset="0x1B70"/>
+        <Array Name="gPoeFieldSoulVtx" Count="4" Offset="0x2370">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeFieldSoulDL" Offset="0x23B0"/>
+        <Texture Name="object_po_field_002470_Tex" Format="rgba16" Width="16" Height="16" Offset="0x2470"/>
+        <Texture Name="object_po_field_002670_Tex" Format="rgba16" Width="16" Height="16" Offset="0x2670"/>
+        <Texture Name="object_po_field_002870_Tex" Format="rgba16" Width="32" Height="32" Offset="0x2870"/>
+        <Texture Name="object_po_field_003070_Tex" Format="rgba16" Width="16" Height="16" Offset="0x3070"/>
+        <Texture Name="object_po_field_003270_Tex" Format="rgba16" Width="8" Height="8" Offset="0x3270"/>
+        <Texture Name="object_po_field_0032F0_Tex" Format="rgba16" Width="16" Height="8" Offset="0x32F0"/>
+        <Texture Name="object_po_field_0033F0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x33F0"/>
+        <Texture Name="object_po_field_0035F0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x35F0"/>
+        <Texture Name="object_po_field_0037F0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x37F0"/>
+        <Array Name="gPoeFieldLanternVtx" Count="17" Offset="0x39F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gPoeFieldLanternTopVtx" Count="10" Offset="0x3B00">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_field_Vtx_003BA0" Count="6" Offset="0x3BA0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_field_Vtx_003C00" Count="26" Offset="0x3C00">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_field_Vtx_003DA0" Count="27" Offset="0x3DA0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_field_Vtx_003F50" Count="8" Offset="0x3F50">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_field_Vtx_003FD0" Count="9" Offset="0x3FD0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_field_Vtx_004060" Count="11" Offset="0x4060">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_field_Vtx_004110" Count="8" Offset="0x4110">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_field_Vtx_004190" Count="55" Offset="0x4190">
+            <Vtx/>
+        </Array>
+        <Array Name="gBigPoeCloakVtx" Count="74" Offset="0x4500">
+            <Vtx/>
+        </Array>
+        <Array Name="gBigPoeFaceVtx" Count="21" Offset="0x49A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBigPoeBodyVtx" Count="11" Offset="0x4AF0">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeFieldLanternDL" Offset="0x4BA0"/>
         <DList Name="gPoeFieldLanternTopDL" Offset="0x4CC0"/>
+        <DList Name="object_po_field_004D48_DL" Offset="0x4D48"/>
+        <DList Name="object_po_field_004DF8_DL" Offset="0x4DF8"/>
+        <DList Name="object_po_field_004F60_DL" Offset="0x4F60"/>
+        <DList Name="object_po_field_005058_DL" Offset="0x5058"/>
+        <DList Name="object_po_field_0050F8_DL" Offset="0x50F8"/>
+        <DList Name="object_po_field_0051A0_DL" Offset="0x51A0"/>
+        <DList Name="object_po_field_005288_DL" Offset="0x5288"/>
+        <DList Name="object_po_field_005328_DL" Offset="0x5328"/>
         <DList Name="gBigPoeCloakDL" Offset="0x5620"/>
         <DList Name="gBigPoeFaceDL" Offset="0x5900"/>
         <DList Name="gBigPoeBodyDL" Offset="0x59F0"/>
+        <Texture Name="object_po_field_005AB0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5AB0"/>
+        <Texture Name="object_po_field_005CB0_Tex" Format="rgba16" Width="8" Height="8" Offset="0x5CB0"/>
+        <Array Name="gPoeFieldBurnVtx" Count="154" Offset="0x5D30">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeFieldBurnDL" Offset="0x66D0"/>
+        <Limb Name="object_po_field_0069A0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069A0" Offset="0x69A0"/>
+        <Limb Name="object_po_field_0069AC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069AC" Offset="0x69AC"/>
+        <Limb Name="object_po_field_0069B8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069B8" Offset="0x69B8"/>
+        <Limb Name="object_po_field_0069C4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069C4" Offset="0x69C4"/>
+        <Limb Name="object_po_field_0069D0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069D0" Offset="0x69D0"/>
+        <Limb Name="object_po_field_0069DC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069DC" Offset="0x69DC"/>
+        <Limb Name="object_po_field_0069E8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069E8" Offset="0x69E8"/>
+        <Limb Name="object_po_field_0069F4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069F4" Offset="0x69F4"/>
+        <Limb Name="object_po_field_006A00_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_006A00" Offset="0x6A00"/>
         <Skeleton Name="gPoeFieldSkel" Type="Normal" LimbType="Standard" Offset="0x6A30"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_po_sisters.xml b/assets/xml/objects/object_po_sisters.xml
index 7752843444..f82b24286a 100644
--- a/assets/xml/objects/object_po_sisters.xml
+++ b/assets/xml/objects/object_po_sisters.xml
@@ -7,22 +7,116 @@
         <Animation Name="gPoeSistersFloatAnim" Offset="0x0D40"/>
         <Animation Name="gPoeSistersAppearDisappearAnim" Offset="0x119C"/>
         <Animation Name="gPoeSistersSwayAnim" Offset="0x14CC"/>
+        <Array Name="gPoeSistersMegFaceVtx" Count="29" Offset="0x14E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gPoeSistersMegBodyVtx" Count="96" Offset="0x16B0">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeSistersMegFaceDL" Offset="0x1CB0"/>
         <DList Name="gPoeSistersMegBodyDL" Offset="0x1DE0"/>
+        <Array Name="object_po_sisters_Vtx_0020A8" Count="19" Offset="0x20A8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_sisters_Vtx_0021D8" Count="6" Offset="0x21D8">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_sisters_Vtx_002238" Count="6" Offset="0x2238">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_sisters_Vtx_002298" Count="6" Offset="0x2298">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_sisters_Vtx_0022F8" Count="6" Offset="0x22F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gPoSistersTorchVtx" Count="11" Offset="0x2358">
+            <Vtx/>
+        </Array>
+        <Array Name="object_po_sisters_Vtx_002408" Count="10" Offset="0x2408">
+            <Vtx/>
+        </Array>
+        <DList Name="object_po_sisters_0024A8_DL" Offset="0x24A8"/>
+        <DList Name="object_po_sisters_002570_DL" Offset="0x2570"/>
+        <DList Name="object_po_sisters_0025E8_DL" Offset="0x25E8"/>
+        <DList Name="object_po_sisters_002680_DL" Offset="0x2680"/>
+        <DList Name="object_po_sisters_002718_DL" Offset="0x2718"/>
         <DList Name="gPoSistersTorchDL" Offset="0x27B0"/>
+        <DList Name="object_po_sisters_002870_DL" Offset="0x2870"/>
+        <Array Name="gPoeSistersJoelleFaceVtx" Count="19" Offset="0x2908">
+            <Vtx/>
+        </Array>
+        <Array Name="gPoeSistersJoelleBodyVtx" Count="72" Offset="0x2A38">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeSistersJoelleFaceDL" Offset="0x2EB8"/>
         <DList Name="gPoeSistersJoelleBodyDL" Offset="0x2F88"/>
+        <Array Name="gPoeSistersBethBodyVtx" Count="52" Offset="0x3208">
+            <Vtx/>
+        </Array>
+        <Array Name="gPoeSistersBethFaceVtx" Count="14" Offset="0x3548">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeSistersBethBodyDL" Offset="0x3628"/>
         <DList Name="gPoeSistersBethFaceDL" Offset="0x3880"/>
+        <Array Name="gPoeSistersAmyBodyVtx" Count="49" Offset="0x3948">
+            <Vtx/>
+        </Array>
+        <Array Name="gPoSistersAmyFaceVtx" Count="23" Offset="0x3C58">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeSistersAmyBodyDL" Offset="0x3DC8"/>
         <DList Name="gPoSistersAmyFaceDL" Offset="0x4020"/>
+        <Array Name="gPoSistersBurnVtx" Count="95" Offset="0x40F0">
+            <Vtx/>
+        </Array>
         <DList Name="gPoSistersBurnDL" Offset="0x46E0"/>
+        <Texture Name="object_po_sisters_0048D8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x48D8"/>
+        <Texture Name="object_po_sisters_004AD8_Tex" Format="rgba16" Width="32" Height="32" Offset="0x4AD8"/>
+        <Texture Name="object_po_sisters_0052D8_Tex" Format="rgba16" Width="32" Height="16" Offset="0x52D8"/>
+        <Texture Name="object_po_sisters_0056D8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x56D8"/>
+        <Texture Name="object_po_sisters_0058D8_Tex" Format="rgba16" Width="4" Height="4" Offset="0x58D8"/>
+        <Texture Name="object_po_sisters_0058F8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x58F8"/>
+        <Texture Name="object_po_sisters_005AF8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5AF8"/>
+        <Texture Name="object_po_sisters_005CF8_Tex" Format="rgba16" Width="8" Height="8" Offset="0x5CF8"/>
+        <Texture Name="object_po_sisters_005D78_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5D78"/>
+        <Texture Name="object_po_sisters_005F78_Tex" Format="rgba16" Width="16" Height="8" Offset="0x5F78"/>
+        <Texture Name="object_po_sisters_006078_Tex" Format="rgba16" Width="16" Height="16" Offset="0x6078"/>
+        <Texture Name="object_po_sisters_006278_Tex" Format="rgba16" Width="8" Height="8" Offset="0x6278"/>
+        <Texture Name="object_po_sisters_0062F8_Tex" Format="rgba16" Width="4" Height="4" Offset="0x62F8"/>
+        <Texture Name="object_po_sisters_006318_Tex" Format="rgba16" Width="16" Height="16" Offset="0x6318"/>
+        <Limb Name="object_po_sisters_006518_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006518" Offset="0x6518"/>
+        <Limb Name="object_po_sisters_006524_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006524" Offset="0x6524"/>
+        <Limb Name="object_po_sisters_006530_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006530" Offset="0x6530"/>
+        <Limb Name="object_po_sisters_00653C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_00653C" Offset="0x653C"/>
+        <Limb Name="object_po_sisters_006548_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006548" Offset="0x6548"/>
+        <Limb Name="object_po_sisters_006554_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006554" Offset="0x6554"/>
+        <Limb Name="object_po_sisters_006560_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006560" Offset="0x6560"/>
+        <Limb Name="object_po_sisters_00656C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_00656C" Offset="0x656C"/>
+        <Limb Name="object_po_sisters_006578_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006578" Offset="0x6578"/>
+        <Limb Name="object_po_sisters_006584_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006584" Offset="0x6584"/>
+        <Limb Name="object_po_sisters_006590_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006590" Offset="0x6590"/>
         <Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" Offset="0x65C8"/>
+        <Array Name="gPoSistersJoellePaintingVtx" Count="38" Offset="0x65D0">
+            <Vtx/>
+        </Array>
         <DList Name="gPoSistersJoellePaintingDL" Offset="0x6830"/>
+        <Array Name="gPoSistersBethPaintingVtx" Count="38" Offset="0x6B00">
+            <Vtx/>
+        </Array>
         <DList Name="gPoSistersBethPaintingDL" Offset="0x6D60"/>
+        <Array Name="gPoSistersAmyPaintingVtx" Count="32" Offset="0x7030">
+            <Vtx/>
+        </Array>
         <DList Name="gPoSistersAmyPaintingDL" Offset="0x7230"/>
+        <Array Name="gPoSistersAmyBlockVtx" Count="24" Offset="0x7420">
+            <Vtx/>
+        </Array>
         <DList Name="gPoSistersAmyBlockDL" Offset="0x75A0"/>
         <Collision Name="gPoSistersAmyBlockCol" Offset="0x7860"/>
+        <Array Name="gPoSistersAmyBethBlockVtx" Count="21" Offset="0x7890">
+            <Vtx/>
+        </Array>
         <DList Name="gPoSistersAmyBethBlockDL" Offset="0x79E0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_poh.xml b/assets/xml/objects/object_poh.xml
index 33517945e8..30cd1c4a62 100644
--- a/assets/xml/objects/object_poh.xml
+++ b/assets/xml/objects/object_poh.xml
@@ -7,9 +7,81 @@
         <Animation Name="gPoeFloatAnim" Offset="0x0A60"/>
         <Animation Name="gPoeAppearAnim" Offset="0x11C4"/>
         <Animation Name="gPoeDisappearAnim" Offset="0x15B0"/>
+        <Array Name="object_poh_Vtx_0015C0" Count="6" Offset="0x15C0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_poh_001620_DL" Offset="0x1620"/>
+        <Array Name="object_poh_Vtx_0016B8" Count="30" Offset="0x16B8">
+            <Vtx/>
+        </Array>
+        <DList Name="object_poh_001898_DL" Offset="0x1898"/>
+        <Array Name="object_poh_Vtx_001A18" Count="6" Offset="0x1A18">
+            <Vtx/>
+        </Array>
+        <DList Name="object_poh_001A78_DL" Offset="0x1A78"/>
+        <Array Name="object_poh_Vtx_001B10" Count="6" Offset="0x1B10">
+            <Vtx/>
+        </Array>
+        <DList Name="object_poh_001B70_DL" Offset="0x1B70"/>
+        <Array Name="object_poh_Vtx_001C08" Count="6" Offset="0x1C08">
+            <Vtx/>
+        </Array>
+        <DList Name="object_poh_001C68_DL" Offset="0x1C68"/>
+        <Array Name="object_poh_Vtx_001CE0" Count="45" Offset="0x1CE0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_poh_001FB0_DL" Offset="0x1FB0"/>
+        <Array Name="gPoeBurnVtx" Count="75" Offset="0x2158">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeBurnDL" Offset="0x2608"/>
+        <Array Name="object_poh_Vtx_0027C0" Count="21" Offset="0x27C0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_poh_002910_DL" Offset="0x2910"/>
+        <Array Name="gPoeLanternVtx" Count="53" Offset="0x29D8">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeLanternDL" Offset="0x2D28"/>
+        <Array Name="object_poh_Vtx_002EB8" Count="10" Offset="0x2EB8">
+            <Vtx/>
+        </Array>
+        <DList Name="object_poh_002F58_DL" Offset="0x2F58"/>
+        <Texture Name="object_poh_003010_Tex" Format="i8" Width="32" Height="64" Offset="0x3010"/>
+        <Array Name="gPoeSoulVtx" Count="4" Offset="0x3810">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeSoulDL" Offset="0x3850"/>
+        <Texture Name="object_poh_003910_Tex" Format="rgba16" Width="32" Height="16" Offset="0x3910"/>
+        <Texture Name="object_poh_003D10_Tex" Format="rgba16" Width="32" Height="32" Offset="0x3D10"/>
+        <Texture Name="object_poh_004510_Tex" Format="rgba16" Width="16" Height="16" Offset="0x4510"/>
+        <Texture Name="object_poh_004710_Tex" Format="rgba16" Width="8" Height="8" Offset="0x4710"/>
+        <Texture Name="object_poh_004790_Tex" Format="rgba16" Width="16" Height="16" Offset="0x4790"/>
+        <Texture Name="object_poh_004990_Tex" Format="rgba16" Width="8" Height="8" Offset="0x4990"/>
+        <Texture Name="object_poh_004A10_Tex" Format="rgba16" Width="8" Height="16" Offset="0x4A10"/>
+        <Texture Name="object_poh_004B10_Tex" Format="rgba16" Width="16" Height="16" Offset="0x4B10"/>
+        <Texture Name="object_poh_004D10_Tex" Format="rgba16" Width="16" Height="16" Offset="0x4D10"/>
+        <Texture Name="object_poh_004F10_Tex" Format="rgba16" Width="8" Height="8" Offset="0x4F10"/>
+        <Limb Name="object_poh_004F90_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004F90" Offset="0x4F90"/>
+        <Limb Name="object_poh_004F9C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004F9C" Offset="0x4F9C"/>
+        <Limb Name="object_poh_004FA8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FA8" Offset="0x4FA8"/>
+        <Limb Name="object_poh_004FB4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FB4" Offset="0x4FB4"/>
+        <Limb Name="object_poh_004FC0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FC0" Offset="0x4FC0"/>
+        <Limb Name="object_poh_004FCC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FCC" Offset="0x4FCC"/>
+        <Limb Name="object_poh_004FD8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FD8" Offset="0x4FD8"/>
+        <Limb Name="object_poh_004FE4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FE4" Offset="0x4FE4"/>
+        <Limb Name="object_poh_004FF0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FF0" Offset="0x4FF0"/>
+        <Limb Name="object_poh_004FFC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FFC" Offset="0x4FFC"/>
+        <Limb Name="object_poh_005008_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005008" Offset="0x5008"/>
+        <Limb Name="object_poh_005014_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005014" Offset="0x5014"/>
+        <Limb Name="object_poh_005020_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005020" Offset="0x5020"/>
+        <Limb Name="object_poh_00502C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_00502C" Offset="0x502C"/>
+        <Limb Name="object_poh_005038_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005038" Offset="0x5038"/>
+        <Limb Name="object_poh_005044_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005044" Offset="0x5044"/>
+        <Limb Name="object_poh_005050_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005050" Offset="0x5050"/>
+        <Limb Name="object_poh_00505C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_00505C" Offset="0x505C"/>
+        <Limb Name="object_poh_005068_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005068" Offset="0x5068"/>
+        <Limb Name="object_poh_005074_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005074" Offset="0x5074"/>
         <Skeleton Name="gPoeSkel" Type="Normal" LimbType="Standard" Offset="0x50D0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ps.xml b/assets/xml/objects/object_ps.xml
index 98f548db1b..4b49513afa 100644
--- a/assets/xml/objects/object_ps.xml
+++ b/assets/xml/objects/object_ps.xml
@@ -2,6 +2,27 @@
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_ps" Segment="6">
         <Animation Name="gPoeSellerIdleAnim" Offset="0x049C"/>
+        <Texture Name="object_ps_0004B0_Tex" Format="rgba16" Width="132" Height="1" Offset="0x4B0"/>
+        <Texture Name="object_ps_0005B8_Tex" Format="rgba16" Width="32" Height="64" Offset="0x5B8"/>
+        <Texture Name="object_ps_0015B8_Tex" Format="ci8" Width="8" Height="8" Offset="0x15B8" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_0015F8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x15F8"/>
+        <Texture Name="object_ps_0017F8_Tex" Format="ci8" Width="8" Height="8" Offset="0x17F8" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_001838_Tex" Format="ci8" Width="32" Height="32" Offset="0x1838" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_001C38_Tex" Format="ci8" Width="16" Height="16" Offset="0x1C38" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_001D38_Tex" Format="i8" Width="8" Height="8" Offset="0x1D38"/>
+        <Texture Name="object_ps_001D78_Tex" Format="ci8" Width="16" Height="16" Offset="0x1D78" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_001E78_Tex" Format="ci8" Width="16" Height="16" Offset="0x1E78" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_001F78_Tex" Format="rgba16" Width="16" Height="16" Offset="0x1F78"/>
+        <Texture Name="object_ps_002178_Tex" Format="rgba16" Width="16" Height="16" Offset="0x2178"/>
+        <Texture Name="object_ps_002378_Tex" Format="i4" Width="32" Height="32" Offset="0x2378"/>
+        <Texture Name="object_ps_002578_Tex" Format="ci8" Width="32" Height="32" Offset="0x2578" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_002978_Tex" Format="rgba16" Width="8" Height="16" Offset="0x2978"/>
+        <Array Name="object_ps_Vtx_002A78" Count="476" Offset="0x2A78">
+            <Vtx/>
+        </Array>
+        <DList Name="object_ps_004838_DL" Offset="0x4838"/>
+        <Texture Name="object_ps_005880_Tex" Format="rgba16" Width="184" Height="1" Offset="0x5880"/>
+        <Blob Name="object_ps_0059F0_Blob" Size="0x90" Offset="0x59F0"/>
         <Texture Name="gPoeSellerMetalFrameTex" OutName="poe_seller_metal_frame" Format="rgba16" Width="8" Height="8" Offset="0x5A80"/>
         <Texture Name="gPoeSellerMattressTex" OutName="poe_seller_mattress" Format="rgba16" Width="8" Height="8" Offset="0x5B00"/>
         <Texture Name="gPoeSellerClothTex" OutName="poe_seller_cloth" Format="rgba16" Width="32" Height="32" Offset="0x5B80"/>
@@ -9,10 +30,67 @@
         <Texture Name="gPoeSellerBottleLabelTex" OutName="poe_seller_bottle_label" Format="rgba16" Width="16" Height="16" Offset="0x6580"/>
         <Texture Name="gPoeSellerWoodenPanelTex" OutName="poe_seller_wooden_panel" Format="rgba16" Width="32" Height="32" Offset="0x6780"/>
         <Texture Name="gPoeSellerLanternTex" OutName="poe_seller_lantern" Format="rgba16" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="object_ps_007180_Tex" Format="ci8" Width="8" Height="8" Offset="0x7180" TlutOffset="0x5880"/>
+        <Texture Name="object_ps_0071C0_Tex" Format="ci8" Width="32" Height="32" Offset="0x71C0" TlutOffset="0x5880"/>
+        <Texture Name="object_ps_0075C0_Tex" Format="ci8" Width="8" Height="8" Offset="0x75C0" TlutOffset="0x5880"/>
+        <Texture Name="object_ps_007600_Tex" Format="ci8" Width="8" Height="8" Offset="0x7600" TlutOffset="0x5880"/>
+        <Texture Name="object_ps_007640_Tex" Format="ci8" Width="32" Height="32" Offset="0x7640" TlutOffset="0x5880"/>
+        <Texture Name="object_ps_007A40_Tex" Format="rgba16" Width="16" Height="16" Offset="0x7A40"/>
+        <Texture Name="object_ps_007C40_Tex" Format="ci8" Width="32" Height="32" Offset="0x7C40" TlutOffset="0x5880"/>
+        <Array Name="object_ps_Vtx_008040" Count="55" Offset="0x8040">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ps_Vtx_0083B0" Count="8" Offset="0x83B0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ps_Vtx_008430" Count="24" Offset="0x8430">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ps_Vtx_0085B0" Count="103" Offset="0x85B0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ps_Vtx_008C20" Count="30" Offset="0x8C20">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ps_Vtx_008E00" Count="14" Offset="0x8E00">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ps_Vtx_008EE0" Count="30" Offset="0x8EE0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ps_Vtx_0090C0" Count="14" Offset="0x90C0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_ps_Vtx_0091A0" Count="82" Offset="0x91A0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_ps_0096C0_DL" Offset="0x96C0"/>
+        <DList Name="object_ps_009AE8_DL" Offset="0x9AE8"/>
+        <DList Name="object_ps_009FC8_DL" Offset="0x9FC8"/>
+        <DList Name="object_ps_00A0F8_DL" Offset="0xA0F8"/>
+        <DList Name="object_ps_00A1D8_DL" Offset="0xA1D8"/>
+        <DList Name="object_ps_00A400_DL" Offset="0xA400"/>
+        <DList Name="object_ps_00A510_DL" Offset="0xA510"/>
+        <DList Name="object_ps_00A638_DL" Offset="0xA638"/>
+        <DList Name="object_ps_00A748_DL" Offset="0xA748"/>
         <Texture Name="gPoeSellerAngrySoulTex" OutName="poe_seller_angry_soul" Format="i8" Width="32" Height="64" Offset="0xA870"/>
         <Texture Name="gPoeSellerHappySoulTex" OutName="poe_seller_happy_soul" Format="i8" Width="32" Height="64" Offset="0xB070"/>
         <Texture Name="gPoeSellerSadSoulTex" OutName="poe_seller_sad_soul" Format="i8" Width="32" Height="64" Offset="0xB870"/>
+        <Array Name="gPoeSellerCagedSoulVtx" Count="4" Offset="0xC070">
+            <Vtx/>
+        </Array>
         <DList Name="gPoeSellerCagedSoulDL" Offset="0xC0B0"/>
+        <Limb Name="object_ps_00C170_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C170" Offset="0xC170"/>
+        <Limb Name="object_ps_00C17C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C17C" Offset="0xC17C"/>
+        <Limb Name="object_ps_00C188_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C188" Offset="0xC188"/>
+        <Limb Name="object_ps_00C194_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C194" Offset="0xC194"/>
+        <Limb Name="object_ps_00C1A0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1A0" Offset="0xC1A0"/>
+        <Limb Name="object_ps_00C1AC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1AC" Offset="0xC1AC"/>
+        <Limb Name="object_ps_00C1B8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1B8" Offset="0xC1B8"/>
+        <Limb Name="object_ps_00C1C4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1C4" Offset="0xC1C4"/>
+        <Limb Name="object_ps_00C1D0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1D0" Offset="0xC1D0"/>
+        <Limb Name="object_ps_00C1DC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1DC" Offset="0xC1DC"/>
+        <Limb Name="object_ps_00C1E8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1E8" Offset="0xC1E8"/>
         <Skeleton Name="gPoeSellerSkel" Type="Flex" LimbType="Standard" Offset="0xC220"/>
         <Collision Name="gPoeSellerCol" Offset="0xC2D0"/>
         <Animation Name="gPoeSellerSwingStickAnim" Offset="0xC8EC"/>
diff --git a/assets/xml/objects/object_rd.xml b/assets/xml/objects/object_rd.xml
index 22c7d33738..a0243a7359 100644
--- a/assets/xml/objects/object_rd.xml
+++ b/assets/xml/objects/object_rd.xml
@@ -5,6 +5,53 @@
         <Texture Name="gGibdoWrappingTex" OutName="gibdo_wrapping" Format="rgba16" Width="64" Height="32" Offset="0x0"/>
         <Texture Name="gGibdoEyeTex" OutName="gibdo_eye" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
 
+        <!-- Gibdo Limb Vertices -->
+        <Array Name="gGibdoLeftHandVtx" Count="21" Offset="0x1400">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoLeftForearmVtx" Count="22" Offset="0x1550">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoLeftUpperArmVtx" Count="28" Offset="0x16B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoRightHandVtx" Count="21" Offset="0x1870">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoRightForearmVtx" Count="22" Offset="0x19C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoRightUpperArmVtx" Count="28" Offset="0x1B20">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoHeadVtx" Count="30" Offset="0x1CE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoTorsoVtx" Count="48" Offset="0x1EC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoLeftFootVtx" Count="22" Offset="0x21C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoLeftShinVtx" Count="22" Offset="0x2320">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoLeftThighVtx" Count="30" Offset="0x2480">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoRightFootVtx" Count="32" Offset="0x2660">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoRightShinVtx" Count="21" Offset="0x2860">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoRightThighVtx" Count="25" Offset="0x29B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gGibdoPelvisVtx" Count="18" Offset="0x2B40">
+            <Vtx/>
+        </Array>
+
         <!-- Gibdo Limb DisplayLists -->
         <DList Name="gGibdoPelvisDL" Offset="0x2C60"/>
         <DList Name="gGibdoHeadDL" Offset="0x2D40"/>
@@ -72,6 +119,53 @@
         <Texture Name="gRedeadFaceTex" OutName="redead_face" Format="rgba16" Width="32" Height="64" Offset="0xB3E0"/>
         <Texture Name="gRedeadHipsTex" OutName="redead_hips" Format="rgba16" Width="32" Height="16" Offset="0xC3E0"/>
 
+        <!-- Redead Limb Vertices -->
+        <Array Name="gRedeadTorsoVtx" Count="37" Offset="0xC7E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadLeftHandVtx" Count="12" Offset="0xCA30">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadLeftForearmVtx" Count="9" Offset="0xCAF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadLeftUpperArmVtx" Count="14" Offset="0xCB80">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadRightHandVtx" Count="12" Offset="0xCC60">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadRightForearmVtx" Count="12" Offset="0xCD20">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadRightUpperArmVtx" Count="14" Offset="0xCDE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadHeadVtx" Count="21" Offset="0xCEC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadLeftFootVtx" Count="12" Offset="0xD010">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadLeftShinVtx" Count="12" Offset="0xD0D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadLeftThighVtx" Count="16" Offset="0xD190">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadRightFootVtx" Count="17" Offset="0xD290">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadRightShinVtx" Count="12" Offset="0xD3A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadRightThighVtx" Count="16" Offset="0xD460">
+            <Vtx/>
+        </Array>
+        <Array Name="gRedeadPelvisVtx" Count="20" Offset="0xD560">
+            <Vtx/>
+        </Array>
+
         <!-- Redead Limb DisplayLists -->
         <DList Name="gRedeadPelvisDL" Offset="0xD6A0"/>
         <DList Name="gRedeadTorsoDL" Offset="0xD7C8"/>
diff --git a/assets/xml/objects/object_reeba.xml b/assets/xml/objects/object_reeba.xml
index 474e4edc59..4fc31fb594 100644
--- a/assets/xml/objects/object_reeba.xml
+++ b/assets/xml/objects/object_reeba.xml
@@ -40,6 +40,23 @@
         <Texture Name="object_reeba_Tex_000CD8" OutName="tex_00000CD8" Format="rgba16" Width="8" Height="16" Offset="0xCD8"/>
         <Texture Name="object_reeba_Tex_000DD8" OutName="tex_00000DD8" Format="rgba16" Width="32" Height="32" Offset="0xDD8"/>
         <Texture Name="object_reeba_Tex_0015D8" OutName="tex_000015D8" Format="rgba16" Width="32" Height="32" Offset="0x15D8"/>
+        <Limb Name="object_reeba_001DD8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001DD8" Offset="0x1DD8"/>
+        <Limb Name="object_reeba_001DE4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001DE4" Offset="0x1DE4"/>
+        <Limb Name="object_reeba_001DF0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001DF0" Offset="0x1DF0"/>
+        <Limb Name="object_reeba_001DFC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001DFC" Offset="0x1DFC"/>
+        <Limb Name="object_reeba_001E08_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E08" Offset="0x1E08"/>
+        <Limb Name="object_reeba_001E14_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E14" Offset="0x1E14"/>
+        <Limb Name="object_reeba_001E20_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E20" Offset="0x1E20"/>
+        <Limb Name="object_reeba_001E2C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E2C" Offset="0x1E2C"/>
+        <Limb Name="object_reeba_001E38_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E38" Offset="0x1E38"/>
+        <Limb Name="object_reeba_001E44_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E44" Offset="0x1E44"/>
+        <Limb Name="object_reeba_001E50_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E50" Offset="0x1E50"/>
+        <Limb Name="object_reeba_001E5C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E5C" Offset="0x1E5C"/>
+        <Limb Name="object_reeba_001E68_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E68" Offset="0x1E68"/>
+        <Limb Name="object_reeba_001E74_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E74" Offset="0x1E74"/>
+        <Limb Name="object_reeba_001E80_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E80" Offset="0x1E80"/>
+        <Limb Name="object_reeba_001E8C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E8C" Offset="0x1E8C"/>
+        <Limb Name="object_reeba_001E98_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E98" Offset="0x1E98"/>
         <Skeleton Name="object_reeba_Skel_001EE8" Type="Normal" LimbType="Standard" Offset="0x1EE8"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_relay_objects.xml b/assets/xml/objects/object_relay_objects.xml
index 47b92fcd2d..16f47413e8 100644
--- a/assets/xml/objects/object_relay_objects.xml
+++ b/assets/xml/objects/object_relay_objects.xml
@@ -1,7 +1,13 @@
 <Root>
     <File Name="object_relay_objects" Segment="6">
-        <!-- DisplayLists -->
+        <!-- Vertices and DisplayLists -->
+        <Array Name="gDampeRaceDoorVtx" Count="26" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="gDampeRaceDoorDL" Offset="0x1A0"/>
+        <Array Name="gWindmillRotatingPlatformVtx" Count="170" Offset="0x1010">
+            <Vtx/>
+        </Array>
         <DList Name="gWindmillRotatingPlatformDL" Offset="0x1AB0"/>
 
         <!-- Palettes -->
diff --git a/assets/xml/objects/object_rl.xml b/assets/xml/objects/object_rl.xml
index e9a26ef2fb..5be8b03fe4 100644
--- a/assets/xml/objects/object_rl.xml
+++ b/assets/xml/objects/object_rl.xml
@@ -36,6 +36,8 @@
         <DList Name="object_rl_DL_002F20" Offset="0x2F20"/>
         <DList Name="object_rl_DL_003058" Offset="0x3058"/>
         <Texture Name="object_rl_TLUT_0032A0" OutName="tlut_000032A0" Format="rgba16" Width="160" Height="1" Offset="0x32A0"/>
+        <Texture Name="object_rl_0033E0_Tex" Format="ci8" Width="8" Height="8" Offset="0x33E0" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_003420_Tex" Format="ci8" Width="16" Height="16" Offset="0x3420" TlutOffset="0x32A0"/>
         <Texture Name="object_rl_Tex_003520" OutName="tex_00003520" Format="ci8" Width="16" Height="16" Offset="0x3520" TlutOffset="0x32A0"/>
         <Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620" TlutOffset="0x32A0"/>
         <Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820" TlutOffset="0x32A0"/>
diff --git a/assets/xml/objects/object_ru1.xml b/assets/xml/objects/object_ru1.xml
index 482949c903..0a2842a266 100644
--- a/assets/xml/objects/object_ru1.xml
+++ b/assets/xml/objects/object_ru1.xml
@@ -18,11 +18,57 @@
         <Animation Name="gRutoChildWalkAnim" Offset="0x78E4"/>
         <Animation Name="gRutoChildTransitionFromSwimOnBackAnim" Offset="0x8100"/>
         <Animation Name="gRutoChildTransitionToSwimOnBackAnim" Offset="0x8AA8"/>
-        <Animation Name="gRutoChildAnim_009060" Offset="0x9060"/>
+        <Animation Name="gRutoChildResurfaceAnim" Offset="0x9060"/>
         <Animation Name="gRutoChildWait2Anim" Offset="0x97B8"/>
         <Animation Name="gRutoChildSwimOnBackAnim" Offset="0x12E94"/>
         <Animation Name="gRutoChildTreadWaterAnim" Offset="0x13A64"/>
 
+        <Array Name="gRutoChildLeftFootVtx" Count="26" Offset="0x97D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildLeftShinVtx" Count="59" Offset="0x9970">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildLeftThighVtx" Count="52" Offset="0x9D20">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildRightFootVtx" Count="26" Offset="0xA060">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildRightShinVtx" Count="59" Offset="0xA200">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildRightThighVtx" Count="52" Offset="0xA5B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildChestVtx" Count="104" Offset="0xA8F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildRightHandVtx" Count="56" Offset="0xAF70">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildRightFinVtx" Count="39" Offset="0xB2F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildRightUpperArmVtx" Count="34" Offset="0xB560">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildLeftHandVtx" Count="56" Offset="0xB780">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildLeftFinVtx" Count="39" Offset="0xBB00">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildLeftUpperArmVtx" Count="34" Offset="0xBD70">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildTorsoVtx" Count="17" Offset="0xBF90">
+            <Vtx/>
+        </Array>
+        <Array Name="gRutoChildHeadVtx" Count="188" Offset="0x10E38">
+            <Vtx/>
+        </Array>
+
         <DList Name="gRutoChildTorsoDL" Offset="0xC0A0"/>
         <DList Name="gRutoChildLeftThighDL" Offset="0xC188"/>
         <DList Name="gRutoChildLeftShinDL" Offset="0xC3D8"/>
diff --git a/assets/xml/objects/object_ru2.xml b/assets/xml/objects/object_ru2.xml
index d6cea22915..cd47562236 100644
--- a/assets/xml/objects/object_ru2.xml
+++ b/assets/xml/objects/object_ru2.xml
@@ -27,6 +27,71 @@
         <Limb Name="gAdultRutoHeadLimb" LimbType="Standard" Offset="0xC690"/>
         <Limb Name="gAdultRutoWaistLimb" LimbType="Standard" Offset="0xC69C"/>
 
+        <!-- Adult Ruto Limb Vertices -->
+        <Array Name="gAdultRutoHeadVtx" Count="173" Offset="0x33E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoLeftHandVtx" Count="55" Offset="0x5EC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoLeftForearmVtx" Count="23" Offset="0x6230">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoLeftLowerWingVtx" Count="8" Offset="0x63A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoLeftUpperWingVtx" Count="6" Offset="0x6420">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoLeftUpperArmVtx" Count="30" Offset="0x6480">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoRightHandVtx" Count="55" Offset="0x6660">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoRightForearmVtx" Count="23" Offset="0x69D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoRightLowerWingVtx" Count="8" Offset="0x6B40">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoRightUpperWingVtx" Count="6" Offset="0x6BC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoRightUpperArmVtx" Count="30" Offset="0x6C20">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoTorsoVtx" Count="128" Offset="0x6E00">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoLeftFootVtx" Count="26" Offset="0x7600">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoLeftLegVtx" Count="52" Offset="0x77A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoLeftTailVtx" Count="15" Offset="0x7AE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoLeftThighVtx" Count="37" Offset="0x7BD0">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoRightFootVtx" Count="26" Offset="0x7E20">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoRightLegVtx" Count="52" Offset="0x7FC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoRightTailVtx" Count="15" Offset="0x8300">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoRightThighVtx" Count="37" Offset="0x83F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gAdultRutoWaistVtx" Count="43" Offset="0x8640">
+            <Vtx/>
+        </Array>
+
         <!-- Adult Ruto Limb DisplayLists -->
         <DList Name="gAdultRutoLeftThighDL" Offset="0xB8E0"/>
         <DList Name="gAdultRutoLeftLegDL" Offset="0xBE38"/>
diff --git a/assets/xml/objects/object_sa.xml b/assets/xml/objects/object_sa.xml
index e87cd793dd..1d666c9b26 100644
--- a/assets/xml/objects/object_sa.xml
+++ b/assets/xml/objects/object_sa.xml
@@ -49,6 +49,55 @@
         <Animation Name="gSariaExtendRightArmAnim" Offset="0x14850"/>
         <Animation Name="gSariaHandsOnFaceAnim" Offset="0x15220"/>
 
+        <Array Name="gSariaHeadVtx" Count="310" Offset="0x5248">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaLeftHandVtx" Count="29" Offset="0x65A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaRightHandVtx" Count="29" Offset="0x6778">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaRightHandAndOcarinaVtx" Count="43" Offset="0x6948">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaLeftFootVtx" Count="29" Offset="0x7DB8">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaLeftShinVtx" Count="34" Offset="0x7F88">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaLeftThighVtx" Count="35" Offset="0x81A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaRightFootVtx" Count="29" Offset="0x83D8">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaRightShinVtx" Count="34" Offset="0x85A8">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaRightThighVtx" Count="35" Offset="0x87C8">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaWaistVtx" Count="40" Offset="0x89F8">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaLeftArmVtx" Count="36" Offset="0x8C78">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaLeftShoulderVtx" Count="34" Offset="0x8EB8">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaRightArmVtx" Count="36" Offset="0x90D8">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaRightShoulderVtx" Count="38" Offset="0x9318">
+            <Vtx/>
+        </Array>
+        <Array Name="gSariaChestVtx" Count="58" Offset="0x9578">
+            <Vtx/>
+        </Array>
+
         <DList Name="gSariaHeadDL" Offset="0x6BF8"/>
         <DList Name="gSariaLeftHandDL" Offset="0x7900"/>
         <DList Name="gSariaRightHandDL" Offset="0x7A40"/>
diff --git a/assets/xml/objects/object_sd.xml b/assets/xml/objects/object_sd.xml
index 0228b48690..068ace8e0d 100644
--- a/assets/xml/objects/object_sd.xml
+++ b/assets/xml/objects/object_sd.xml
@@ -25,6 +25,55 @@
         <Animation Name="gEnHeishiDyingGuardDieAnim" Offset="0xC374"/>
         <Animation Name="gEnHeishiDyingGuardAnim_00C444" Offset="0xC444"/>
 
+        <Array Name="gHeishiKingGuardVtx" Count="489" Offset="0xD80">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiHeadVtx" Count="147" Offset="0x6CC0">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiTorsoArmorVtx" Count="136" Offset="0x75F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiTorsoVtx" Count="39" Offset="0x7E70">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiRightFootVtx" Count="30" Offset="0x80E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiLeg1Vtx" Count="28" Offset="0x82C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiUpperLeg1Vtx" Count="36" Offset="0x8480">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiSpearVtx" Count="94" Offset="0x86C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiLowerRightArmVtx" Count="32" Offset="0x8CA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiUpperArmVtx" Count="43" Offset="0x8EA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiLeftFootVtx" Count="30" Offset="0x9150">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiLeftShinVtx" Count="28" Offset="0x9330">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiLeftThighVtx" Count="36" Offset="0x94F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiHandVtx" Count="64" Offset="0x9730">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiLeftArmVtx" Count="32" Offset="0x9B30">
+            <Vtx/>
+        </Array>
+        <Array Name="gEnHeishiUpperLeftArmVtx" Count="48" Offset="0x9D30">
+            <Vtx/>
+        </Array>
+
         <DList Name="gHeishiKingGuardDL" Offset="0x2C10"/>
         <DList Name="gEnHeishiHeadDL" Offset="0xA030"/>
         <DList Name="gEnHeishiTorsoArmorDL" Offset="0xA440"/>
diff --git a/assets/xml/objects/object_shopnuts.xml b/assets/xml/objects/object_shopnuts.xml
index 105ce88247..3cbe6b698f 100644
--- a/assets/xml/objects/object_shopnuts.xml
+++ b/assets/xml/objects/object_shopnuts.xml
@@ -22,6 +22,62 @@
         <Limb Name="gBusinessScrubEyesLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_EYES" Offset="0x414C"/>
         <Limb Name="gBusinessScrubBodyLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_BODY" Offset="0x4158"/>
 
+        <!-- Business Scrub Limb Vertices -->
+        <Array Name="gBusinessScrubLeftHandVtx" Count="22" Offset="0x13B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubLeftForearmVtx" Count="12" Offset="0x1510">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubLeftUpperArmVtx" Count="6" Offset="0x15D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubRightHandVtx" Count="22" Offset="0x1630">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubRightForearmVtx" Count="12" Offset="0x1790">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubRightUpperArmVtx" Count="6" Offset="0x1850">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubLeftFootVtx" Count="18" Offset="0x18B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubLeftShinVtx" Count="12" Offset="0x19D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubLeftThighVtx" Count="6" Offset="0x1A90">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubRightFootVtx" Count="18" Offset="0x1AF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubRightShinVtx" Count="12" Offset="0x1C10">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubRightThighVtx" Count="6" Offset="0x1CD0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubBodyVtx" Count="41" Offset="0x32F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubEyesVtx" Count="6" Offset="0x3580">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubNoseVtx" Count="17" Offset="0x35E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubRootLeafVtx" Count="22" Offset="0x36F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubTopLeafVtx" Count="14" Offset="0x3850">
+            <Vtx/>
+        </Array>
+        <Array Name="gBusinessScrubDekuNutVtx" Count="3" Offset="0x3FD8">
+            <Vtx/>
+        </Array>
+
         <!-- Business Scrub Limb DisplayLists -->
         <DList Name="gBusinessScrubRootLeafDL" Offset="0x3C80"/>
         <DList Name="gBusinessScrubLeftThighDL" Offset="0x2640"/>
diff --git a/assets/xml/objects/object_sk2.xml b/assets/xml/objects/object_sk2.xml
index f2e7ef6d89..a08353c520 100644
--- a/assets/xml/objects/object_sk2.xml
+++ b/assets/xml/objects/object_sk2.xml
@@ -1,5 +1,79 @@
 <Root>
     <File Name="object_sk2" Segment="6">
+        <!-- Stalfos Vertices -->
+        <Array Name="gStalfosSkullVtx" Count="114" Offset="0x3180">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosUpperCoreVtx" Count="8" Offset="0x38A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosRightUpperArmVtx" Count="17" Offset="0x3920">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosLowerCoreVtx" Count="8" Offset="0x3A30">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosRightThighVtx" Count="8" Offset="0x3AB0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosRightHandVtx" Count="16" Offset="0x3B30">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosChestVtx" Count="23" Offset="0x3C30">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosJawVtx" Count="31" Offset="0x3DA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosUpperNeckVtx" Count="6" Offset="0x3F90">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosLowerNeckVtx" Count="7" Offset="0x3FF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosShieldVtx" Count="32" Offset="0x4060">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosWaistVtx" Count="23" Offset="0x4260">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosRightLowerLegVtx" Count="25" Offset="0x43D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosRightForearmVtx" Count="20" Offset="0x4560">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosRightFootVtx" Count="17" Offset="0x46A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosRightShoulderArmorVtx" Count="19" Offset="0x47B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosLeftUpperArmVtx" Count="17" Offset="0x48E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosLeftShoulderArmorVtx" Count="19" Offset="0x49F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosLeftFootVtx" Count="17" Offset="0x4B20">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosLeftForearmVtx" Count="20" Offset="0x4C30">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosLeftLowerLegVtx" Count="25" Offset="0x4D70">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosLeftThighVtx" Count="8" Offset="0x4F00">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosLeftHandVtx" Count="16" Offset="0x4F80">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalfosSwordVtx" Count="53" Offset="0x5080">
+            <Vtx/>
+        </Array>
+
         <!-- Stalfos DLists -->
         <DList Name="gStalfosSkullDL" Offset="0x53D0"/>
         <DList Name="gStalfosUpperCoreDL" Offset="0x5720"/>
diff --git a/assets/xml/objects/object_skb.xml b/assets/xml/objects/object_skb.xml
index 1220ddf6d9..219e14b3c7 100644
--- a/assets/xml/objects/object_skb.xml
+++ b/assets/xml/objects/object_skb.xml
@@ -24,6 +24,59 @@
         <Limb Name="gStalchildLeftHandLimb" LimbType="Standard" Offset="0x4194"/>
         <Limb Name="gStalchildSpineLimb" LimbType="Standard" Offset="0x41A0"/>
 
+        <!-- Stalchild Vertices -->
+        <Array Name="gStalchildHeadVtx" Count="81" Offset="0x21A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildJawVtx" Count="16" Offset="0x26B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildRibCageVtx" Count="18" Offset="0x27B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildSpineVtx" Count="4" Offset="0x28D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildWaistVtx" Count="22" Offset="0x2910">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildLeftHumerusVtx" Count="15" Offset="0x2A70">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildLeftForearmVtx" Count="9" Offset="0x2B60">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildLeftHandVtx" Count="20" Offset="0x2BF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildRightHumerusVtx" Count="15" Offset="0x2D30">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildRightForearmVtx" Count="9" Offset="0x2E20">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildRightHandVtx" Count="20" Offset="0x2EB0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildLeftFemurVtx" Count="4" Offset="0x2FF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildLeftShinVtx" Count="9" Offset="0x3030">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildLeftFootVtx" Count="5" Offset="0x30C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildRightFemurVtx" Count="4" Offset="0x3110">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildRightShinVtx" Count="9" Offset="0x3150">
+            <Vtx/>
+        </Array>
+        <Array Name="gStalchildRightFootVtx" Count="5" Offset="0x31E0">
+            <Vtx/>
+        </Array>
+
         <!-- Stalchild DisplayLists -->
         <DList Name="gStalchildHeadDL" Offset="0x3230"/>
         <DList Name="gStalchildJawDL" Offset="0x3598"/>
diff --git a/assets/xml/objects/object_skj.xml b/assets/xml/objects/object_skj.xml
index 958301d2e8..866a38c73b 100644
--- a/assets/xml/objects/object_skj.xml
+++ b/assets/xml/objects/object_skj.xml
@@ -23,6 +23,65 @@
         <Limb Name="gSkullKidRightArmLimb" LimbType="Standard" Offset="0x5EEC"/>
         <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" Offset="0x5F40"/>
 
+        <!-- Limb Vertices -->
+        <Array Name="gSkullKidNeedleVtx" Count="6" Offset="0xE50">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidSkullMaskVtx" Count="44" Offset="0x1208">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidLeftLowerLegVtx" Count="26" Offset="0x1760">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidLeftUpperLegVtx" Count="18" Offset="0x1900">
+            <Vtx/>
+        </Array>
+        <Array Name="object_skj_Vtx_001A20" Count="30" Offset="0x1A20">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidRightLowerLegVtx" Count="26" Offset="0x1C00">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidRightUpperLegVtx" Count="18" Offset="0x1DA0">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidLeftFootVtx" Count="30" Offset="0x1EC0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_skj_Vtx_0020A0" Count="10" Offset="0x20A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gSKullKidHeadAndFaceVtx" Count="29" Offset="0x2140">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidNeckVtx" Count="84" Offset="0x2310">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidChestAndClothesVtx" Count="23" Offset="0x2850">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidLeftArmVtx" Count="34" Offset="0x29C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidLeftShoulderVtx" Count="26" Offset="0x2BE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidUpperHatVtx" Count="28" Offset="0x2D80">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidRightArmVtx" Count="18" Offset="0x2F40">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidRightShoulderVtx" Count="26" Offset="0x3060">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidLeftHandAndFluteVtx" Count="27" Offset="0x3200">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkullKidRightFootVtx" Count="47" Offset="0x33B0">
+            <Vtx/>
+        </Array>
+
         <!--Limb DLists-->
         <DList Name="gSkullKidLeftUpperLegDL" Offset="0x3B90"/>
         <DList Name="gSkullKidLeftLowerLegDL" Offset="0x3C88"/>
diff --git a/assets/xml/objects/object_spot00_break.xml b/assets/xml/objects/object_spot00_break.xml
index bee1361fab..c23e47f4fa 100644
--- a/assets/xml/objects/object_spot00_break.xml
+++ b/assets/xml/objects/object_spot00_break.xml
@@ -1,11 +1,17 @@
 <Root>
     <File Name="object_spot00_break" Segment="6">
+        <Array Name="gBrokenDrawbridgeVtx" Count="68" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="gBrokenDrawbridgeDL" Offset="0x440"/>
         <Texture Name="gBrokenDrawbridgeBoltTex" OutName="broken_drawbridge_bolt" Format="rgba16" Width="32" Height="32" Offset="0xB20"/>
         <Texture Name="gBrokenDrawbridgeDirtTex" OutName="broken_drawbridge_dirt" Format="rgba16" Width="16" Height="16" Offset="0x1320"/>
         <Texture Name="gBrokenDrawbridgeChainTex" OutName="broken_drawbridge_chain" Format="rgba16" Width="8" Height="16" Offset="0x1520"/>
         <Collision Name="gBrokenDrawbridgeCol" Offset="0x908"/>
 
+        <Array Name="gBarbedWireFenceVtx" Count="4" Offset="0x940">
+            <Vtx/>
+        </Array>
         <DList Name="gBarbedWireFenceDL" Offset="0x980"/>
         <Texture Name="gBarbedWireFenceTex" OutName="barbed_wire_fence" Format="rgba16" Width="32" Height="32" Offset="0x1620"/>
         <Collision Name="gBarbedWireFenceCol" Offset="0xAF0"/>
diff --git a/assets/xml/objects/object_spot00_objects.xml b/assets/xml/objects/object_spot00_objects.xml
index 10fb13aeac..0bd365a839 100644
--- a/assets/xml/objects/object_spot00_objects.xml
+++ b/assets/xml/objects/object_spot00_objects.xml
@@ -1,12 +1,18 @@
 <Root>
     <File Name="object_spot00_objects" Segment="6">
         <!-- Hyrule Field Castle Drawbridge -->
+        <Array Name="gHyruleFieldCastleDrawbridgeVtx" Count="24" Offset="0x2B0">
+            <Vtx/>
+        </Array>
         <DList Name="gHyruleFieldCastleDrawbridgeDL" Offset="0x0430"/>
         <Texture Name="gHyruleFieldCastleDrawbridgeWoodTex" OutName="drawbridge_wood" Format="rgba16" Width="32" Height="64" Offset="0x0610"/>
         <Texture Name="gHyruleFieldCastleDrawbridgeBoltDL" OutName="drawbridge_bolt" Format="rgba16" Width="16" Height="16" Offset="0x1A10"/>
         <Collision Name="gHyruleFieldCastleDrawbridgeCol" Offset="0x05E0"/>
 
         <!-- Hyrule Field Castle Drawbridge Chains -->
+        <Array Name="gHyruleFieldCastleDrawbridgeChainsVtx" Count="12" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="gHyruleFieldCastleDrawbridgeChainsDL" Offset="0x00C0"/>
         <Texture Name="gHyruleFieldCastleDrawbridgeChainsTex" OutName="drawbridge_chains" Format="rgba16" Width="16" Height="32" Offset="0x1610"/>
         <Collision Name="gHyruleFieldCastleDrawbridgeChainsCol" Offset="0x0280"/>
diff --git a/assets/xml/objects/object_spot01_matoya.xml b/assets/xml/objects/object_spot01_matoya.xml
index d44b944e0e..a06d296a11 100644
--- a/assets/xml/objects/object_spot01_matoya.xml
+++ b/assets/xml/objects/object_spot01_matoya.xml
@@ -1,7 +1,13 @@
 <Root>
     <File Name="object_spot01_matoya" Segment="6">
         <!-- Kakariko Shooting Gallery -->
+        <Array Name="gKakarikoShootingGalleryVtx" Count="50" Offset="0x1208">
+            <Vtx/>
+        </Array>
         <DList Name="gKakarikoShootingGalleryDL" Offset="0x1528"/>
+        <Array Name="gKakarikoShootingGallerySignVtx" Count="4" Offset="0x2740">
+            <Vtx/>
+        </Array>
         <DList Name="gKakarikoShootingGallerySignDL" Offset="0x2780"/>
         <Texture Name="gKakarikoShootingGalleryRoofEdgeTex" OutName="shooting_gallery_roof_edge" Format="ci8" Width="32" Height="32" Offset="0x208" TlutOffset="0x0"/>
         <Texture Name="gKakarikoShootingGalleryRoofTex" OutName="shooting_gallery_roof" Format="ci8" Width="16" Height="32" Offset="0x608" TlutOffset="0x0"/>
@@ -11,14 +17,23 @@
         <Collision Name="gKakarikoShootingGalleryCol" Offset="0x1A38"/>
 
         <!-- Kakariko Potion Shop -->
+        <Array Name="gKakarikoPotionShopSignVtx" Count="4" Offset="0x1E70">
+            <Vtx/>
+        </Array>
         <DList Name="gKakarikoPotionShopSignDL" Offset="0x1EB0"/>
         <Texture Name="gKakarikoPotionShopSignTex" OutName="potion_shop_sign" Format="rgba16" Width="32" Height="16" Offset="0x1A70"/>
 
         <!-- Kakariko Bazaar -->
+        <Array Name="gKakarikoBazaarSignVtx" Count="4" Offset="0x3038">
+            <Vtx/>
+        </Array>
         <DList Name="gKakarikoBazaarSignDL" Offset="0x3078"/>
         <Texture Name="gKakarikoBazaarSignTex" OutName="bazaar_sign" Format="ci4" Width="64" Height="64" Offset="0x2838" TlutOffset="0x2810"/>
 
         <!-- BOTW Stone -->
+        <Array Name="gKakarikoBOTWStoneVtx" Count="30" Offset="0x3940">
+            <Vtx/>
+        </Array>
         <DList Name="gKakarikoBOTWStoneDL" Offset="0x3B20"/>
         <Texture Name="gKakarikoBOTWStoneTex" OutName="botw_stone" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
         <Collision Name="gKakarikoBOTWStoneCol" Offset="0x3C64"/>
diff --git a/assets/xml/objects/object_spot04_objects.xml b/assets/xml/objects/object_spot04_objects.xml
index 66293d7523..ec0a712152 100644
--- a/assets/xml/objects/object_spot04_objects.xml
+++ b/assets/xml/objects/object_spot04_objects.xml
@@ -4,6 +4,9 @@
         <Texture Name="gDekuTreeMouthTex_0400" OutName="tex_0400" Format="rgba16" Width="32" Height="16" Offset="0x0400"/>
         <Texture Name="gDekuTreeUnusedMouthTex_0EC0" OutName="tex_0EC0" Format="rgba16" Width="32" Height="16" Offset="0x0EC0"/>
         <Texture Name="gDekuTreeUnusedMouthTex_12C0" OutName="tex_12C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <Array Name="gDekuTreeMouthVtx" Count="29" Offset="0x800">
+            <Vtx/>
+        </Array>
         <DList Name="gDekuTreeMouthDL" Offset="0x09D0"/>
         <Collision Name="gDekuTreeMouthCol" Offset="0x0E94"/>
     </File>
diff --git a/assets/xml/objects/object_st.xml b/assets/xml/objects/object_st.xml
index e374b4cb4a..d561363649 100644
--- a/assets/xml/objects/object_st.xml
+++ b/assets/xml/objects/object_st.xml
@@ -9,6 +9,36 @@
         <Texture Name="object_st_Tex_000560" OutName="tex_00000560" Format="rgba16" Width="16" Height="16" Offset="0x560"/>
         <Texture Name="object_st_Tex_000760" OutName="tex_00000760" Format="rgba16" Width="8" Height="8" Offset="0x760"/>
         <Texture Name="object_st_Tex_0007E0" OutName="tex_000007E0" Format="rgba16" Width="8" Height="8" Offset="0x7E0"/>
+        <Array Name="object_st_Vtx_000860" Count="48" Offset="0x860">
+            <Vtx/>
+        </Array>
+        <Array Name="object_st_Vtx_000B60" Count="146" Offset="0xB60">
+            <Vtx/>
+        </Array>
+        <Array Name="object_st_Vtx_001480" Count="12" Offset="0x1480">
+            <Vtx/>
+        </Array>
+        <Array Name="object_st_Vtx_001540" Count="12" Offset="0x1540">
+            <Vtx/>
+        </Array>
+        <Array Name="object_st_Vtx_001600" Count="10" Offset="0x1600">
+            <Vtx/>
+        </Array>
+        <Array Name="object_st_Vtx_0016A0" Count="12" Offset="0x16A0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_st_Vtx_001760" Count="12" Offset="0x1760">
+            <Vtx/>
+        </Array>
+        <Array Name="object_st_Vtx_001820" Count="12" Offset="0x1820">
+            <Vtx/>
+        </Array>
+        <Array Name="object_st_Vtx_0018E0" Count="10" Offset="0x18E0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_st_Vtx_001980" Count="12" Offset="0x1980">
+            <Vtx/>
+        </Array>
         <DList Name="object_st_DL_001A40" Offset="0x1A40"/>
         <DList Name="object_st_DL_001C30" Offset="0x1C30"/>
         <DList Name="object_st_DL_001FD0" Offset="0x1FD0"/>
@@ -36,6 +66,12 @@
         <DList Name="object_st_DL_0048B8" Offset="0x48B8"/>
         <DList Name="object_st_DL_004950" Offset="0x4950"/>
         <DList Name="object_st_DL_0049E8" Offset="0x49E8"/>
+        <Array Name="gSkulltulaTokenVtx" Count="25" Offset="0x4A80">
+            <Vtx/>
+        </Array>
+        <Array Name="gSkulltulaTokenFlameVtx" Count="26" Offset="0x4C10">
+            <Vtx/>
+        </Array>
         <DList Name="gSkulltulaTokenDL" Offset="0x4DB0"/>
         <DList Name="gSkulltulaTokenFlameDL" Offset="0x4EB8"/>
         <Limb Name="object_st_Limb_0050C8" LimbType="Standard" Offset="0x50C8"/>
diff --git a/assets/xml/objects/object_ta.xml b/assets/xml/objects/object_ta.xml
index 4f339fc951..bac3ed4370 100644
--- a/assets/xml/objects/object_ta.xml
+++ b/assets/xml/objects/object_ta.xml
@@ -25,6 +25,53 @@
         <Animation Name="gTalonSleepAnim" Offset="0xCD50"/>
         <Animation Name="gTalonRunTransitionAnim" Offset="0xCF28"/>
         <Animation Name="gTalonWakeUpAnim" Offset="0xE3D8"/>
+
+        <Array Name="gTalonLeftHandVtx" Count="74" Offset="0x1CB0">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonLeftArmVtx" Count="33" Offset="0x2150">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonLeftShoulderVtx" Count="30" Offset="0x2360">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonRightHandVtx" Count="74" Offset="0x2540">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonRightArmVtx" Count="33" Offset="0x29E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonRightShoulderVtx" Count="30" Offset="0x2BF0">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonChestVtx" Count="93" Offset="0x2DD0">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonLeftLegVtx" Count="39" Offset="0x33A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonLeftThighVtx" Count="38" Offset="0x3610">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonRightLegVtx" Count="39" Offset="0x3870">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonRightThighVtx" Count="38" Offset="0x3AE0">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonTorsoVtx" Count="35" Offset="0x3D40">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonHeadVtx" Count="225" Offset="0x8380">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonRightFootVtx" Count="42" Offset="0x9190">
+            <Vtx/>
+        </Array>
+        <Array Name="gTalonLeftFootVtx" Count="42" Offset="0x9430">
+            <Vtx/>
+        </Array>
+
         <DList Name="gTalonTorsoDL" Offset="0x3F70"/>
         <DList Name="gTalonChestDL" Offset="0x4288"/>
         <DList Name="gTalonRightShoulderDL" Offset="0x4918"/>
diff --git a/assets/xml/objects/object_tk.xml b/assets/xml/objects/object_tk.xml
index 5c9d0a0a6f..d257294d8c 100644
--- a/assets/xml/objects/object_tk.xml
+++ b/assets/xml/objects/object_tk.xml
@@ -5,16 +5,130 @@
         <Animation Name="gDampeRestAnim" Offset="0x2F84"/>
         <Animation Name="gDampeFloatAnim" Offset="0x3768"/>
         <Texture Name="gDampeUnkTLUT" Format="rgba16" Width="102" Height="2" Offset="0x3780"/>
+        <Blob Name="object_tk_003918_Blob" Size="0x68" Offset="0x3918"/>
+        <Texture Name="object_tk_003980_Tex" Format="ci8" Width="8" Height="8" Offset="0x3980" TlutOffset="0x3780"/>
+        <Texture Name="object_tk_0039C0_Tex" Format="ci8" Width="8" Height="8" Offset="0x39C0" TlutOffset="0x3780"/>
+        <Texture Name="object_tk_003A00_Tex" Format="ci8" Width="8" Height="8" Offset="0x3A00" TlutOffset="0x3780"/>
+        <Texture Name="object_tk_003A40_Tex" Format="ci8" Width="16" Height="16" Offset="0x3A40" TlutOffset="0x3780"/>
         <Texture Name="gDampeEyeOpenTex" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3B40"/>
         <Texture Name="gDampeEyeHalfTex" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32" Offset="0x4340"/>
         <Texture Name="gDampeEyeClosedTex" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4B40"/>
+        <Texture Name="object_tk_005340_Tex" Format="ci8" Width="16" Height="16" Offset="0x5340" TlutOffset="0x3780"/>
+        <Texture Name="object_tk_005440_Tex" Format="ci8" Width="16" Height="16" Offset="0x5440" TlutOffset="0x3780"/>
         <Texture Name="gDampeUnused1Tex" OutName="dampe_unused_1" Format="ci8" Width="16" Height="16" Offset="0x5540" TlutOffset="0x3780"/>
         <Texture Name="gDampeUnused2Tex" OutName="dampe_unused_2" Format="ci8" Width="8" Height="16" Offset="0x5640" TlutOffset="0x3780"/>
+        <Texture Name="object_tk_0056C0_Tex" Format="ci8" Width="16" Height="16" Offset="0x56C0" TlutOffset="0x3780"/>
+        <Array Name="object_tk_Vtx_0057C0" Count="38" Offset="0x57C0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_005A20" Count="129" Offset="0x5A20">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_006230" Count="28" Offset="0x6230">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_0063F0" Count="57" Offset="0x63F0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_006780" Count="24" Offset="0x6780">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_006900" Count="27" Offset="0x6900">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_006AB0" Count="57" Offset="0x6AB0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_006E40" Count="24" Offset="0x6E40">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_006FC0" Count="27" Offset="0x6FC0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_007170" Count="87" Offset="0x7170">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_0076E0" Count="6" Offset="0x76E0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_007740" Count="33" Offset="0x7740">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_007950" Count="6" Offset="0x7950">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_0079B0" Count="33" Offset="0x79B0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_007BC0" Count="70" Offset="0x7BC0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_tk_008020_DL" Offset="0x8020"/>
+        <DList Name="object_tk_008160_DL" Offset="0x8160"/>
+        <DList Name="object_tk_0082F0_DL" Offset="0x82F0"/>
+        <DList Name="object_tk_008410_DL" Offset="0x8410"/>
+        <DList Name="object_tk_008958_DL" Offset="0x8958"/>
+        <DList Name="object_tk_008CA0_DL" Offset="0x8CA0"/>
+        <DList Name="object_tk_008DD0_DL" Offset="0x8DD0"/>
+        <DList Name="object_tk_008F00_DL" Offset="0x8F00"/>
+        <DList Name="object_tk_009110_DL" Offset="0x9110"/>
+        <DList Name="object_tk_009240_DL" Offset="0x9240"/>
+        <DList Name="object_tk_009370_DL" Offset="0x9370"/>
+        <DList Name="object_tk_009580_DL" Offset="0x9580"/>
+        <DList Name="object_tk_009738_DL" Offset="0x9738"/>
+        <DList Name="object_tk_009818_DL" Offset="0x9818"/>
+        <DList Name="object_tk_0099D0_DL" Offset="0x99D0"/>
+        <Texture Name="object_tk_009AB0_Tex" Format="rgba16" Width="40" Height="1" Offset="0x9AB0"/>
+        <Texture Name="object_tk_009B00_Tex" Format="ci8" Width="16" Height="16" Offset="0x9B00" TlutOffset="0x9AB0"/>
+        <Texture Name="object_tk_009C00_Tex" Format="ci8" Width="8" Height="16" Offset="0x9C00" TlutOffset="0x9AB0"/>
+        <Texture Name="object_tk_009C80_Tex" Format="i8" Width="8" Height="8" Offset="0x9C80"/>
+        <Texture Name="object_tk_009CC0_Tex" Format="rgba16" Width="8" Height="8" Offset="0x9CC0"/>
+        <Texture Name="object_tk_009D40_Tex" Format="i4" Width="16" Height="32" Offset="0x9D40"/>
+        <Array Name="object_tk_Vtx_009E40" Count="43" Offset="0x9E40">
+            <Vtx/>
+        </Array>
+        <Array Name="object_tk_Vtx_00A0F0" Count="43" Offset="0xA0F0">
+            <Vtx/>
+        </Array>
+        <Array Name="gDampeShovelVtx" Count="103" Offset="0xA3A0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_tk_00AA10_DL" Offset="0xAA10"/>
+        <DList Name="object_tk_00AB78_DL" Offset="0xAB78"/>
         <DList Name="gDampeShovelDL" Offset="0xACE0"/>
+        <Texture Name="object_tk_00B088_Tex" Format="rgba16" Width="16" Height="16" Offset="0xB088"/>
+        <Texture Name="object_tk_00B288_Tex" Format="rgba16" Width="16" Height="16" Offset="0xB288"/>
+        <Texture Name="object_tk_00B488_Tex" Format="rgba16" Width="16" Height="16" Offset="0xB488"/>
+        <Array Name="gDampeLanternVtx" Count="27" Offset="0xB688">
+            <Vtx/>
+        </Array>
         <DList Name="gDampeLanternDL" Offset="0xB838"/>
+        <Array Name="gDampeHaloVtx" Count="30" Offset="0xB9C0">
+            <Vtx/>
+        </Array>
         <DList Name="gDampeHaloDL" Offset="0xBBA0"/>
         <DList Name="gDampeEff1DL" Offset="0xBC90"/>
         <DList Name="gDampeEff2DL" Offset="0xBCA0"/>
+        <Array Name="gDampeEff2Vtx" Count="4" Offset="0xBCF0">
+            <Vtx/>
+        </Array>
+        <Limb Name="object_tk_00BD30_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD30" Offset="0xBD30"/>
+        <Limb Name="object_tk_00BD3C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD3C" Offset="0xBD3C"/>
+        <Limb Name="object_tk_00BD48_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD48" Offset="0xBD48"/>
+        <Limb Name="object_tk_00BD54_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD54" Offset="0xBD54"/>
+        <Limb Name="object_tk_00BD60_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD60" Offset="0xBD60"/>
+        <Limb Name="object_tk_00BD6C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD6C" Offset="0xBD6C"/>
+        <Limb Name="object_tk_00BD78_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD78" Offset="0xBD78"/>
+        <Limb Name="object_tk_00BD84_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD84" Offset="0xBD84"/>
+        <Limb Name="object_tk_00BD90_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD90" Offset="0xBD90"/>
+        <Limb Name="object_tk_00BD9C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD9C" Offset="0xBD9C"/>
+        <Limb Name="object_tk_00BDA8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDA8" Offset="0xBDA8"/>
+        <Limb Name="object_tk_00BDB4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDB4" Offset="0xBDB4"/>
+        <Limb Name="object_tk_00BDC0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDC0" Offset="0xBDC0"/>
+        <Limb Name="object_tk_00BDCC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDCC" Offset="0xBDCC"/>
+        <Limb Name="object_tk_00BDD8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDD8" Offset="0xBDD8"/>
+        <Limb Name="object_tk_00BDE4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDE4" Offset="0xBDE4"/>
+        <Limb Name="object_tk_00BDF0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDF0" Offset="0xBDF0"/>
         <Skeleton Name="gDampeSkel" Type="Flex" LimbType="Standard" Offset="0xBE40"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_tp.xml b/assets/xml/objects/object_tp.xml
index 8ea908825e..5809bac6d1 100644
--- a/assets/xml/objects/object_tp.xml
+++ b/assets/xml/objects/object_tp.xml
@@ -1,8 +1,17 @@
 <Root>
     <File Name="object_tp" Segment="6">
 
-        <!-- Tailpasaran displaylists -->
+        <!-- Tailpasaran vertices and displaylists -->
         <DList Name="gTailpasaranTailSegmentDL" Offset="0x0000"/>
+        <Array Name="gTailpasaranTailSegmentVtx" Count="4" Offset="0x70">
+            <Vtx/>
+        </Array>
+        <Array Name="gTailpasaranHeadClawVtx" Count="70" Offset="0xB0">
+            <Vtx/>
+        </Array>
+        <Array Name="gTailpasaranHeadMouthpartsVtx" Count="24" Offset="0x510">
+            <Vtx/>
+        </Array>
         <DList Name="gTailpasaranHeadClawDL" Offset="0x0690"/>
         <DList Name="gTailpasaranHeadMouthpartsDL" Offset="0x0840"/>
         <DList Name="gTailpasaranHeadDL" Offset="0x08D0"/>
diff --git a/assets/xml/objects/object_vali.xml b/assets/xml/objects/object_vali.xml
index 2bab5efaa6..e2c8f88159 100644
--- a/assets/xml/objects/object_vali.xml
+++ b/assets/xml/objects/object_vali.xml
@@ -7,6 +7,47 @@
         <Animation Name="gBariUnusedAnim_000D9C" Offset="0xD9C"/><!-- Arms down, moving back and forth a little -->
         <Animation Name="gBariLurkingAnim" Offset="0x14AC"/><!-- Flap arms medium and slow -->
 
+        <!-- Bari Vertices -->
+        <Array Name="gBariInnerHoodVtx" Count="53" Offset="0x14C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBariNucleusVtx" Count="4" Offset="0x1810">
+            <Vtx/>
+        </Array>
+        <Array Name="gBariOuterHoodVtx" Count="46" Offset="0x1850">
+            <Vtx/>
+        </Array>
+        <Array Name="gBariRightMandibleVtx" Count="18" Offset="0x1B30">
+            <Vtx/>
+        </Array>
+        <Array Name="gBariLeftMandibleVtx" Count="18" Offset="0x1C50">
+            <Vtx/>
+        </Array>
+        <Array Name="gBariRightClawTipVtx" Count="12" Offset="0x1D70">
+            <Vtx/>
+        </Array>
+        <Array Name="gBariRightClawBodyVtx" Count="18" Offset="0x1E30">
+            <Vtx/>
+        </Array>
+        <Array Name="gBariRightForearmVtx" Count="19" Offset="0x1F50">
+            <Vtx/>
+        </Array>
+        <Array Name="gBariRightUpperArmVtx" Count="20" Offset="0x2080">
+            <Vtx/>
+        </Array>
+        <Array Name="gBariLeftClawTipVtx" Count="12" Offset="0x21C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBariLeftClawBodyVtx" Count="18" Offset="0x2280">
+            <Vtx/>
+        </Array>
+        <Array Name="gBariLeftForearmVtx" Count="19" Offset="0x23A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gBariLeftUpperArmVtx" Count="20" Offset="0x24D0">
+            <Vtx/>
+        </Array>
+
         <!-- Bari DLists -->
         <DList Name="gBariInnerHoodDL" Offset="0x2610"/>
         <DList Name="gBariNucleusDL" Offset="0x2740"/>
diff --git a/assets/xml/objects/object_vm.xml b/assets/xml/objects/object_vm.xml
index c5b949b36e..f9a3163d72 100644
--- a/assets/xml/objects/object_vm.xml
+++ b/assets/xml/objects/object_vm.xml
@@ -15,6 +15,20 @@
         <Limb Name="gBeamosEyeLimb" LimbType="Standard" Offset="0x3F20"/>
         <Limb Name="gBeamosBodyLimb" LimbType="Standard" Offset="0x3F2C"/>
 
+        <!-- Beamos Limb Vertices -->
+        <Array Name="gBeamosBodyVtx" Count="352" Offset="0x80">
+            <Vtx/>
+        </Array>
+        <Array Name="gBeamosTopEyelidVtx" Count="44" Offset="0x1680">
+            <Vtx/>
+        </Array>
+        <Array Name="gBeamosBottomEyelidVtx" Count="44" Offset="0x1940">
+            <Vtx/>
+        </Array>
+        <Array Name="gBeamosEyeVtx" Count="24" Offset="0x1C00">
+            <Vtx/>
+        </Array>
+
         <!-- Beamos Limb DisplayLists -->
         <DList Name="gBeamosTopEyelidDL" Offset="0x22B0"/>
         <DList Name="gBeamosBottomEyelidDL" Offset="0x2460"/>
@@ -35,7 +49,10 @@
         <!-- Beamos Animations -->
         <Animation Name="gBeamosAnim" Offset="0x68"/>
 
-        <!-- Beamos Laser DisplayList -->
+        <!-- Beamos Laser Vertices and DisplayList -->
+        <Array Name="gBeamosLaserVtx" Count="8" Offset="0x1D80">
+            <Vtx/>
+        </Array>
         <DList Name="gBeamosLaserDL" Offset="0x2728"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_warp1.xml b/assets/xml/objects/object_warp1.xml
index 1497d7a108..cc684029b3 100644
--- a/assets/xml/objects/object_warp1.xml
+++ b/assets/xml/objects/object_warp1.xml
@@ -1,10 +1,34 @@
 <Root>
     <File Name="object_warp1" Segment="6">
         <!-- Portal -->
+        <Array Name="gWarpPortalVtx" Count="26" Offset="0x0">
+            <Vtx/>
+        </Array>
         <DList Name="gWarpPortalDL" Offset="0x01A0"/>
         <Texture Name="gWarpPortalTex" OutName="warp_portal_tex" Format="i8" Width="64" Height="64" Offset="0x02C0"/>
         <!-- Crystal -->
         <Animation Name="gWarpCrystalAnim" Offset="0x1374"/>
+        <Array Name="object_warp1_Vtx_001390" Count="42" Offset="0x1390">
+            <Vtx/>
+        </Array>
+        <Array Name="object_warp1_Vtx_001630" Count="3" Offset="0x1630">
+            <Vtx/>
+        </Array>
+        <Array Name="object_warp1_Vtx_001660" Count="3" Offset="0x1660">
+            <Vtx/>
+        </Array>
+        <Array Name="object_warp1_Vtx_001690" Count="3" Offset="0x1690">
+            <Vtx/>
+        </Array>
+        <Array Name="object_warp1_Vtx_0016C0" Count="3" Offset="0x16C0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_warp1_Vtx_0016F0" Count="3" Offset="0x16F0">
+            <Vtx/>
+        </Array>
+        <Array Name="object_warp1_Vtx_001720" Count="3" Offset="0x1720">
+            <Vtx/>
+        </Array>
         <DList Name="gWarp1DL_001750" Offset="0x1750"/>
         <DList Name="gWarp1DL_001828" Offset="0x1828"/>
         <DList Name="gWarp1DL_0018B0" Offset="0x18B0"/>
diff --git a/assets/xml/objects/object_zl1.xml b/assets/xml/objects/object_zl1.xml
index 1b83550605..c409c6033d 100644
--- a/assets/xml/objects/object_zl1.xml
+++ b/assets/xml/objects/object_zl1.xml
@@ -22,6 +22,57 @@
         <Limb Name="gChildZelda1RightHandLimb" LimbType="Standard" Offset="0xF57C"/>
         <Limb Name="gChildZelda1HeadLimb" LimbType="Standard" Offset="0xF588"/>
 
+
+        <!-- Child Zelda 1 Limb Vertices -->
+        <Array Name="gChildZelda1Dress3Vtx" Count="33" Offset="0x23D0">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1Dress2Vtx" Count="38" Offset="0x25E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1Dress1Vtx" Count="36" Offset="0x2840">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1WaistVtx" Count="85" Offset="0x2A80">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1LeftHandVtx" Count="45" Offset="0x2FD0">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1LeftForearmVtx" Count="36" Offset="0x32A0">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1LeftUpperArmVtx" Count="62" Offset="0x34E0">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1RightHandVtx" Count="45" Offset="0x38C0">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1RightForearmVtx" Count="36" Offset="0x3B90">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1RightUpperArmVtx" Count="62" Offset="0x3DD0">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1TorsoVtx" Count="154" Offset="0x41B0">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1HeadVtx" Count="226" Offset="0xAF48">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1LeftFootVtx" Count="53" Offset="0xC698">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1RightFootVtx" Count="53" Offset="0xC9E8">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1RightLegVtx" Count="3" Offset="0xCD38">
+            <Vtx/>
+        </Array>
+        <Array Name="gChildZelda1LeftLegVtx" Count="3" Offset="0xCD68">
+            <Vtx/>
+        </Array>
+
         <!-- Child Zelda 1 Limb DisplayLists -->
         <DList Name="gChildZelda1WaistDL" Offset="0x6008"/>
         <DList Name="gChildZelda1LeftLegDL" Offset="0xEE00"/>
@@ -72,8 +123,14 @@
         <Texture Name="gChildZelda1HeaddressTex_A8C8" OutName="headdress_A8C8" Format="ci8" Width="8" Height="16" Offset="0xA8C8" TlutOffset="0x70C8"/>
         <Texture Name="gChildZelda1HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0xA948" TlutOffset="0x70C8"/>
 
-        <!-- Other DisplayLists -->
+        <!-- Other Vertices and DisplayLists -->
+        <Array Name="gChildZelda1AlternateDressVtx" Count="147" Offset="0xBD68">
+            <Vtx/>
+        </Array>
         <DList Name="gChildZelda1AlternateDressDL" Offset="0xDEC8"/>
+        <Array Name="gChildZelda1OcarinaVtx" Count="21" Offset="0xF258">
+            <Vtx/>
+        </Array>
         <DList Name="gChildZelda1OcarinaDL" Offset="0xF3A8"/>
 
         <!-- Palettes -->
diff --git a/assets/xml/objects/object_zo.xml b/assets/xml/objects/object_zo.xml
index 8872cc4c9f..849b01bb45 100644
--- a/assets/xml/objects/object_zo.xml
+++ b/assets/xml/objects/object_zo.xml
@@ -4,53 +4,110 @@
         <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" Offset="0xBFA8"/>
 
         <Limb Name="gZoraPelvisLimb" LimbType="Standard" Offset="0xBE78"/>
+        <Array Name="gZoraPelvisVtx" Count="31" Offset="0x8E50">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraPelvisDL" Offset="0x9040"/>
 
         <!-- Left leg -->
         <Limb Name="gZoraLeftThighsLimb" LimbType="Standard" Offset="0xBE84"/>
+        <Array Name="gZoraLeftThighsVtx" Count="44" Offset="0x83D0">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraLeftThighsDL" Offset="0xB5F8"/>
         <Limb Name="gZoraLeftShinLimb" LimbType="Standard" Offset="0xBE90"/>
+        <Array Name="gZoraLeftShinVtx" Count="41" Offset="0x8140">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraLeftShinDL" Offset="0xB8D8"/>
         <Limb Name="gZoraLeftFootLimb" LimbType="Standard" Offset="0xBE9C"/>
+        <Array Name="gZoraLeftFootVtx" Count="39" Offset="0x7ED0">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraLeftFootDL" Offset="0xBBB0"/>
 
         <!-- Right leg -->
         <Limb Name="gZoraRightThighsLimb" LimbType="Standard" Offset="0xBEA8"/>
+        <Array Name="gZoraRightThighsVtx" Count="44" Offset="0x8B90">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraRightThighsDL" Offset="0xAD78"/>
         <Limb Name="gZoraRightShinLimb" LimbType="Standard" Offset="0xBEB4"/>
+        <Array Name="gZoraRightShinVtx" Count="41" Offset="0x8900">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraRightShinDL" Offset="0xB058"/>
         <Limb Name="gZoraRightFootLimb" LimbType="Standard" Offset="0xBEC0"/>
+        <Array Name="gZoraRightFootVtx" Count="39" Offset="0x8690">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraRightFootDL" Offset="0xB330"/>
 
         <Limb Name="gZoraTorsoLimb" LimbType="Standard" Offset="0xBECC"/>
+        <Array Name="gZoraTorsoVtx" Count="106" Offset="0x7830">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraTorsoDL" Offset="0x91E8"/>
 
         <!-- Left arm -->
         <Limb Name="gZoraLeftArmLimb" LimbType="Standard" Offset="0xBED8"/>
+        <Array Name="gZoraLeftArmVtx" Count="38" Offset="0x6ED0">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraLeftArmDL" Offset="0xA630"/>
         <Limb Name="gZoraLeftForearmLimb" LimbType="Standard" Offset="0xBEE4"/>
+        <Array Name="gZoraLeftForearmVtx" Count="33" Offset="0x6CC0">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraLeftForearmDL" Offset="0xA890"/>
         <Limb Name="gZoraLeftHandLimb" LimbType="Standard" Offset="0xBEF0"/>
+        <Array Name="gZoraLeftHandVtx" Count="41" Offset="0x6A30">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraLeftHandDL" Offset="0xAB70"/>
 
         <!-- Right arm -->
         <Limb Name="gZoraRightArmLimb" LimbType="Standard" Offset="0xBEFC"/>
+        <Array Name="gZoraRightArmVtx" Count="38" Offset="0x75D0">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraRightArmDL" Offset="0x9EE8"/>
         <Limb Name="gZoraRightForearmLimb" LimbType="Standard" Offset="0xBF08"/>
+        <Array Name="gZoraRightForearmVtx" Count="33" Offset="0x73C0">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraRightForearmDL" Offset="0xA148"/>
         <Limb Name="gZoraRightHandLimb" LimbType="Standard" Offset="0xBF14"/>
+        <Array Name="gZoraRightHandVtx" Count="41" Offset="0x7130">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraRightHandDL" Offset="0xA428"/>
 
         <!-- Head and head tail -->
         <Limb Name="gZoraHeadLimb" LimbType="Standard" Offset="0xBF20"/>
+        <Array Name="gZoraHeadVtx" Count="75" Offset="0x6580">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraHeadDL" Offset="0x9560"/>
         <Limb Name="gZoraHeadTail1Limb" LimbType="Standard" Offset="0xBF2C"/>
+        <Array Name="gZoraHeadTail1Vtx" Count="24" Offset="0x6400">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraHeadTail1DL" Offset="0x97D8"/>
         <Limb Name="gZoraHeadTail2Limb" LimbType="Standard" Offset="0xBF38"/>
+        <Array Name="gZoraHeadTail2Vtx" Count="22" Offset="0x62A0">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraHeadTail2DL" Offset="0x9978"/>
         <Limb Name="gZoraHeadTail3Limb" LimbType="Standard" Offset="0xBF44"/>
+        <Array Name="gZoraHeadTail3Vtx" Count="22" Offset="0x6140">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraHeadTail3DL" Offset="0x9B10"/>
         <Limb Name="gZoraHeadTailFinLimb" LimbType="Standard" Offset="0xBF50"/>
+        <Array Name="gZoraHeadTailFinVtx" Count="28" Offset="0x5F80">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraHeadTailFinDL" Offset="0x9CA8"/>
 
         <Animation Name="gZoraIdleAnim" Offset="0x2FE8"/>
@@ -77,10 +134,16 @@
 
         <Texture Name="gZoraBubblesTex" OutName="bubbles" Format="ia8" Width="16" Height="16" Offset="0x21B0"/>
         <DList Name="gZoraBubblesMaterialDL" Offset="0x22F0"/>
+        <Array Name="gZoraBubblesModelVtx" Count="4" Offset="0x22B0">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraBubblesModelDL" Offset="0x2350"/>
 
         <Texture Name="gZoraSplashesTex" OutName="splashes" Format="i8" Width="16" Height="16" Offset="0x2370"/>
         <DList Name="gZoraSplashesMaterialDL" Offset="0x24A0"/>
+        <Array Name="gZoraSplashesModelVtx" Count="3" Offset="0x2470">
+            <Vtx/>
+        </Array>
         <DList Name="gZoraSplashesModelDL" Offset="0x2510"/>
 
         <DList Name="gZoraRipplesMaterialDL" Offset="0xBFC0"/>
diff --git a/assets/xml/textures/place_title_cards.xml b/assets/xml/textures/place_title_cards.xml
index c9023bc4ee..b9392f7bca 100644
--- a/assets/xml/textures/place_title_cards.xml
+++ b/assets/xml/textures/place_title_cards.xml
@@ -184,8 +184,8 @@
         <Texture Name="gFishingPondTitleCardENGTex" OutName="fishing_pond_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
     </File>
     <File Name="g_pn_47">
-        <Texture Name="gBombchuBowlingAlleyCardENGTex" OutName="bombchu_bowling_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
-        <Texture Name="gBombchuBowlingAlleyCardGERTex" OutName="bombchu_bowling_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+        <Texture Name="gBombchuBowlingAlleyCardJPNTex" OutName="bombchu_bowling_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuBowlingAlleyCardENGTex" OutName="bombchu_bowling_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
     </File>
     <File Name="g_pn_48">
         <Texture Name="gStableTitleCardJPNTex" OutName="stable_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
diff --git a/include/z64actor.h b/include/actor.h
similarity index 99%
rename from include/z64actor.h
rename to include/actor.h
index 30869fde47..985f32abb3 100644
--- a/include/z64actor.h
+++ b/include/actor.h
@@ -1,11 +1,11 @@
-#ifndef Z64ACTOR_H
-#define Z64ACTOR_H
+#ifndef ACTOR_H
+#define ACTOR_H
 
 #include "color.h"
-#include "z64actor_profile.h"
-#include "z64animation.h"
-#include "z64math.h"
-#include "z64collision_check.h"
+#include "actor_profile.h"
+#include "animation.h"
+#include "z_math.h"
+#include "collision_check.h"
 
 #define ACTOR_NUMBER_MAX 200
 
@@ -452,6 +452,9 @@ typedef enum AttentionRangeType {
     /* 10 */ ATTENTION_RANGE_MAX
 } AttentionRangeType;
 
+#define PLACE_NAME_TEX_WIDTH 144
+#define PLACE_NAME_TEX_HEIGHT 24
+
 typedef struct TitleCardContext {
     /* 0x00 */ void* texture;
     /* 0x04 */ s16 x;
diff --git a/include/z64actor_profile.h b/include/actor_profile.h
similarity index 96%
rename from include/z64actor_profile.h
rename to include/actor_profile.h
index 82ec9f957b..d02ce03cf2 100644
--- a/include/z64actor_profile.h
+++ b/include/actor_profile.h
@@ -1,5 +1,5 @@
-#ifndef Z64ACTOR_PROFILE_H
-#define Z64ACTOR_PROFILE_H
+#ifndef ACTOR_PROFILE_H
+#define ACTOR_PROFILE_H
 
 #include "ultra64.h"
 
diff --git a/include/z64animation.h b/include/animation.h
similarity index 99%
rename from include/z64animation.h
rename to include/animation.h
index a085da5ddd..fdf14843b9 100644
--- a/include/z64animation.h
+++ b/include/animation.h
@@ -1,10 +1,10 @@
-#ifndef Z64_ANIMATION_H
-#define Z64_ANIMATION_H
+#ifndef ANIMATION_H
+#define ANIMATION_H
 
 #include "avoid_ub.h"
 #include "ultra64.h"
-#include "z64dma.h"
-#include "z64math.h"
+#include "dma.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;
diff --git a/include/z64animation_legacy.h b/include/animation_legacy.h
similarity index 92%
rename from include/z64animation_legacy.h
rename to include/animation_legacy.h
index 066a8faa33..5b5c0399ff 100644
--- a/include/z64animation_legacy.h
+++ b/include/animation_legacy.h
@@ -1,8 +1,8 @@
-#ifndef Z64_ANIMATION_LEGACY_H
-#define Z64_ANIMATION_LEGACY_H
+#ifndef ANIMATION_LEGACY_H
+#define ANIMATION_LEGACY_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct LegacyLimb {
     /* 0x000 */ Gfx* dList;
diff --git a/include/z64audio.h b/include/audio.h
similarity index 99%
rename from include/z64audio.h
rename to include/audio.h
index 308c220d7a..2dbf107501 100644
--- a/include/z64audio.h
+++ b/include/audio.h
@@ -1,9 +1,9 @@
-#ifndef Z64_AUDIO_H
-#define Z64_AUDIO_H
+#ifndef AUDIO_H
+#define AUDIO_H
 
 #include "ultra64.h"
 #include "sequence.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GfxPrint;
 
diff --git a/include/audio/soundfont_file.h b/include/audio/soundfont_file.h
index 9456429774..3de4595090 100644
--- a/include/audio/soundfont_file.h
+++ b/include/audio/soundfont_file.h
@@ -4,7 +4,7 @@
 #include "stdbool.h"
 #include "alignment.h"
 #include "attributes.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // Envelope definitions
 
diff --git a/include/audiomgr.h b/include/audiomgr.h
index b518c976a5..66a9050266 100644
--- a/include/audiomgr.h
+++ b/include/audiomgr.h
@@ -2,7 +2,7 @@
 #define AUDIOMGR_H
 
 #include "sched.h"
-#include "z64audio.h"
+#include "audio.h"
 
 typedef enum AudioMgrDebugLevel {
     /* 0 */ AUDIOMGR_DEBUG_LEVEL_NONE,
diff --git a/include/z64bgcheck.h b/include/bgcheck.h
similarity index 99%
rename from include/z64bgcheck.h
rename to include/bgcheck.h
index eb7e9155d0..13b8570582 100644
--- a/include/z64bgcheck.h
+++ b/include/bgcheck.h
@@ -1,8 +1,8 @@
-#ifndef Z64BGCHECK_H
-#define Z64BGCHECK_H
+#ifndef BGCHECK_H
+#define BGCHECK_H
 
 #include "ultra64/ultratypes.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;
diff --git a/include/z64camera.h b/include/camera.h
similarity index 99%
rename from include/z64camera.h
rename to include/camera.h
index 2fcbffdf5a..9d4783de06 100644
--- a/include/z64camera.h
+++ b/include/camera.h
@@ -1,9 +1,9 @@
-#ifndef Z64CAMERA_H
-#define Z64CAMERA_H
+#ifndef CAMERA_H
+#define CAMERA_H
 
 #include "ultra64.h"
-#include "z64cutscene.h"
-#include "z64math.h"
+#include "cutscene.h"
+#include "z_math.h"
 
 struct CollisionContext;
 struct View;
diff --git a/include/z64collision_check.h b/include/collision_check.h
similarity index 99%
rename from include/z64collision_check.h
rename to include/collision_check.h
index 2c27563766..ddcafb24e9 100644
--- a/include/z64collision_check.h
+++ b/include/collision_check.h
@@ -1,8 +1,8 @@
-#ifndef Z64COLLISION_CHECK_H
-#define Z64COLLISION_CHECK_H
+#ifndef COLLISION_CHECK_H
+#define COLLISION_CHECK_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 #define COLLISION_CHECK_AT_MAX 50
 #define COLLISION_CHECK_AC_MAX 60
@@ -391,7 +391,7 @@ typedef struct CollisionCheckContext {
 #define OCLINE_NONE 0 // Did not have an OcLine collision
 #define OCLINE_HIT (1 << 0) // Had an OcLine collision
 
-#define DMG_ENTRY(damage, effect) ((damage) | ((effect) << 4))
+#define DMG_ENTRY(damage, reaction) ((damage) | ((reaction) << 4))
 
 #define DMG_DEKU_NUT     (1 << 0)
 #define DMG_DEKU_STICK   (1 << 1)
@@ -464,7 +464,7 @@ typedef struct CollisionCheckInfo {
     /* 0x16 */ u8 mass; // Used to compute displacement for OC collisions
     /* 0x17 */ u8 health; // Note: some actors may use their own health variable instead of this one
     /* 0x18 */ u8 damage; // Amount to decrement health by
-    /* 0x19 */ u8 damageEffect; // Stores what effect should occur when hit by a weapon
+    /* 0x19 */ u8 damageReaction; // Stores what reaction should occur after being hit
     /* 0x1A */ u8 atHitEffect; // Stores what effect should occur when AT connects with an AC
     /* 0x1B */ u8 acHitEffect; // Stores what effect should occur when AC is touched by an AT
 } CollisionCheckInfo; // size = 0x1C
diff --git a/include/console_logo_state.h b/include/console_logo_state.h
index 09b7d66546..da9509b72d 100644
--- a/include/console_logo_state.h
+++ b/include/console_logo_state.h
@@ -2,9 +2,9 @@
 #define CONSOLE_LOGO_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
-#include "z64sram.h"
-#include "z64view.h"
+#include "game.h"
+#include "sram.h"
+#include "view.h"
 
 typedef struct ConsoleLogoState {
     /* 0x0000 */ GameState state;
diff --git a/include/z64curve.h b/include/curve.h
similarity index 98%
rename from include/z64curve.h
rename to include/curve.h
index 3ca0eac132..8779b04b47 100644
--- a/include/z64curve.h
+++ b/include/curve.h
@@ -1,5 +1,5 @@
-#ifndef Z64_CURVE_H
-#define Z64_CURVE_H
+#ifndef CURVE_H
+#define CURVE_H
 
 #include "ultra64.h"
 
diff --git a/include/z64cutscene.h b/include/cutscene.h
similarity index 99%
rename from include/z64cutscene.h
rename to include/cutscene.h
index f8aed368d4..e3bf4a1c84 100644
--- a/include/z64cutscene.h
+++ b/include/cutscene.h
@@ -1,8 +1,8 @@
-#ifndef Z64CUTSCENE_H
-#define Z64CUTSCENE_H
+#ifndef CUTSCENE_H
+#define CUTSCENE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 
diff --git a/include/z64cutscene_commands.h b/include/cutscene_commands.h
similarity index 99%
rename from include/z64cutscene_commands.h
rename to include/cutscene_commands.h
index f0c8146cd1..14ec25c496 100644
--- a/include/z64cutscene_commands.h
+++ b/include/cutscene_commands.h
@@ -1,8 +1,8 @@
-#ifndef Z64CUTSCENE_COMMANDS_H
-#define Z64CUTSCENE_COMMANDS_H
+#ifndef CUTSCENE_COMMANDS_H
+#define CUTSCENE_COMMANDS_H
 
 #include "command_macros_base.h"
-#include "z64cutscene.h"
+#include "cutscene.h"
 
 /**
  * Cutscene scripts are arrays of `CutsceneData` words, including bit-packed integers and floats.
diff --git a/include/z64cutscene_flags.h b/include/cutscene_flags.h
similarity index 83%
rename from include/z64cutscene_flags.h
rename to include/cutscene_flags.h
index 5a3c7c2a7a..a6e34762af 100644
--- a/include/z64cutscene_flags.h
+++ b/include/cutscene_flags.h
@@ -1,5 +1,5 @@
-#ifndef Z64CUTSCENE_FLAGS_H
-#define Z64CUTSCENE_FLAGS_H
+#ifndef CUTSCENE_FLAGS_H
+#define CUTSCENE_FLAGS_H
 
 #include "ultra64.h"
 
diff --git a/include/z64cutscene_spline.h b/include/cutscene_spline.h
similarity index 78%
rename from include/z64cutscene_spline.h
rename to include/cutscene_spline.h
index 3a73949453..00a815a614 100644
--- a/include/z64cutscene_spline.h
+++ b/include/cutscene_spline.h
@@ -1,8 +1,8 @@
-#ifndef Z64CUTSCENE_SPLINE_H
-#define Z64CUTSCENE_SPLINE_H
+#ifndef CUTSCENE_SPLINE_H
+#define CUTSCENE_SPLINE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 union CutsceneCameraPoint;
 
diff --git a/include/db_camera.h b/include/db_camera.h
index 81d8515d0b..fd11f56fdb 100644
--- a/include/db_camera.h
+++ b/include/db_camera.h
@@ -2,8 +2,8 @@
 #define DB_CAMERA_H
 
 #include "ultra64.h"
-#include "z64cutscene.h"
-#include "z64math.h"
+#include "cutscene.h"
+#include "z_math.h"
 
 struct Camera;
 
diff --git a/include/z64debug.h b/include/debug.h
similarity index 90%
rename from include/z64debug.h
rename to include/debug.h
index 0e2c7334ee..9c12f82429 100644
--- a/include/z64debug.h
+++ b/include/debug.h
@@ -1,5 +1,5 @@
-#ifndef Z64DEBUG_H
-#define Z64DEBUG_H
+#ifndef DEBUG_H
+#define DEBUG_H
 
 #include "ultra64.h"
 
diff --git a/include/z64debug_display.h b/include/debug_display.h
similarity index 90%
rename from include/z64debug_display.h
rename to include/debug_display.h
index 9cb1198067..0623224fef 100644
--- a/include/z64debug_display.h
+++ b/include/debug_display.h
@@ -1,8 +1,8 @@
-#ifndef Z64_DEBUG_DISPLAY_H
-#define Z64_DEBUG_DISPLAY_H
+#ifndef DEBUG_DISPLAY_H
+#define DEBUG_DISPLAY_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "color.h"
 
 struct GraphicsContext;
diff --git a/include/z64dma.h b/include/dma.h
similarity index 98%
rename from include/z64dma.h
rename to include/dma.h
index 10968517bc..83a79619c8 100755
--- a/include/z64dma.h
+++ b/include/dma.h
@@ -1,5 +1,5 @@
-#ifndef Z64_DMA_H
-#define Z64_DMA_H
+#ifndef DMA_H
+#define DMA_H
 
 #include "ultra64.h"
 #include "alignment.h"
diff --git a/include/z64draw.h b/include/draw.h
similarity index 73%
rename from include/z64draw.h
rename to include/draw.h
index 95c5aa2340..66658817e2 100644
--- a/include/z64draw.h
+++ b/include/draw.h
@@ -1,5 +1,5 @@
-#ifndef Z64_DRAW_H
-#define Z64_DRAW_H
+#ifndef DRAW_H
+#define DRAW_H
 
 #include "ultra64.h"
 
diff --git a/include/z64effect.h b/include/effect.h
similarity index 99%
rename from include/z64effect.h
rename to include/effect.h
index 0c07cc5124..060b6cd090 100644
--- a/include/z64effect.h
+++ b/include/effect.h
@@ -1,10 +1,10 @@
-#ifndef Z64EFFECT_H
-#define Z64EFFECT_H
+#ifndef EFFECT_H
+#define EFFECT_H
 
 #include "color.h"
 #include "romfile.h"
-#include "z64light.h"
-#include "z64math.h"
+#include "light.h"
+#include "z_math.h"
 
 struct Actor;
 struct GraphicsContext;
diff --git a/include/z64environment.h b/include/environment.h
similarity index 99%
rename from include/z64environment.h
rename to include/environment.h
index 4c4bc770cd..6c23dfb336 100644
--- a/include/z64environment.h
+++ b/include/environment.h
@@ -1,9 +1,9 @@
-#ifndef _Z64ENVIRONMENT_H_
-#define _Z64ENVIRONMENT_H_
+#ifndef ENVIRONMENT_H_
+#define ENVIRONMENT_H_
 
-#include "z64math.h"
-#include "z64light.h"
-#include "z64dma.h"
+#include "z_math.h"
+#include "light.h"
+#include "dma.h"
 
 struct GameOverContext;
 struct MessageContext;
diff --git a/include/z64face_reaction.h b/include/face_reaction.h
similarity index 98%
rename from include/z64face_reaction.h
rename to include/face_reaction.h
index 274340ebcb..7dc89f864e 100644
--- a/include/z64face_reaction.h
+++ b/include/face_reaction.h
@@ -1,5 +1,5 @@
-#ifndef Z64FACE_REACTION_H
-#define Z64FACE_REACTION_H
+#ifndef FACE_REACTION_H
+#define FACE_REACTION_H
 
 #include "ultra64.h"
 
diff --git a/include/file_select_state.h b/include/file_select_state.h
index 0a831caa0f..6dc7cfadcb 100644
--- a/include/file_select_state.h
+++ b/include/file_select_state.h
@@ -2,12 +2,12 @@
 #define FILE_SELECT_STATE_H
 
 #include "ultra64.h"
-#include "z64environment.h"
-#include "z64game.h"
-#include "z64message.h"
-#include "z64skybox.h"
-#include "z64sram.h"
-#include "z64view.h"
+#include "environment.h"
+#include "game.h"
+#include "message.h"
+#include "skybox.h"
+#include "sram.h"
+#include "view.h"
 
 typedef struct FileSelectState {
     /* 0x00000 */ GameState state;
diff --git a/include/z64font.h b/include/font.h
similarity index 97%
rename from include/z64font.h
rename to include/font.h
index 72f97fddd6..b379d32e16 100644
--- a/include/z64font.h
+++ b/include/font.h
@@ -1,5 +1,5 @@
-#ifndef Z64FONT_H
-#define Z64FONT_H
+#ifndef FONT_H
+#define FONT_H
 
 #include "ultra64.h"
 
diff --git a/include/z64frame_advance.h b/include/frame_advance.h
similarity index 87%
rename from include/z64frame_advance.h
rename to include/frame_advance.h
index edefb0b47d..0736b09d56 100644
--- a/include/z64frame_advance.h
+++ b/include/frame_advance.h
@@ -1,5 +1,5 @@
-#ifndef Z64FRAME_ADVANCE_H
-#define Z64FRAME_ADVANCE_H
+#ifndef FRAME_ADVANCE_H
+#define FRAME_ADVANCE_H
 
 #include "ultra64.h"
 
diff --git a/include/z64game.h b/include/game.h
similarity index 98%
rename from include/z64game.h
rename to include/game.h
index aaf70be321..d15a3fcdc0 100644
--- a/include/z64game.h
+++ b/include/game.h
@@ -1,5 +1,5 @@
-#ifndef Z64GAME_H
-#define Z64GAME_H
+#ifndef GAME_H
+#define GAME_H
 // This file is named "game" after game.c for now, this may change later with the system name
 
 #include "ultra64/ultratypes.h"
diff --git a/include/z64game_over.h b/include/game_over.h
similarity index 95%
rename from include/z64game_over.h
rename to include/game_over.h
index 03697c1f50..e91ad0413a 100644
--- a/include/z64game_over.h
+++ b/include/game_over.h
@@ -1,5 +1,5 @@
-#ifndef Z64GAME_OVER_H
-#define Z64GAME_OVER_H
+#ifndef GAME_OVER_H
+#define GAME_OVER_H
 
 #include "ultra64.h"
 
diff --git a/include/z64horse.h b/include/horse.h
similarity index 85%
rename from include/z64horse.h
rename to include/horse.h
index d58de4b6d4..e3e5502a81 100644
--- a/include/z64horse.h
+++ b/include/horse.h
@@ -1,8 +1,8 @@
-#ifndef Z64HORSE_H
-#define Z64HORSE_H
+#ifndef HORSE_H
+#define HORSE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;
diff --git a/include/z64interface.h b/include/interface.h
similarity index 99%
rename from include/z64interface.h
rename to include/interface.h
index bfa3bffeb3..84834b3df6 100644
--- a/include/z64interface.h
+++ b/include/interface.h
@@ -1,9 +1,9 @@
-#ifndef Z64INTERFACE_H
-#define Z64INTERFACE_H
+#ifndef INTERFACE_H
+#define INTERFACE_H
 
 #include "ultra64.h"
-#include "z64dma.h"
-#include "z64view.h"
+#include "dma.h"
+#include "view.h"
 
 struct PlayState;
 
diff --git a/include/z64inventory.h b/include/inventory.h
similarity index 90%
rename from include/z64inventory.h
rename to include/inventory.h
index 8c1a5a90d8..3ad5c1bbbd 100644
--- a/include/z64inventory.h
+++ b/include/inventory.h
@@ -1,8 +1,8 @@
-#ifndef Z64INVENTORY_H
-#define Z64INVENTORY_H
+#ifndef INVENTORY_H
+#define INVENTORY_H
 
 #include "ultra64.h"
-#include "z64item.h"
+#include "item.h"
 
 struct PlayState;
 
diff --git a/include/z64item.h b/include/item.h
similarity index 99%
rename from include/z64item.h
rename to include/item.h
index 60344f326c..f5d4a530af 100644
--- a/include/z64item.h
+++ b/include/item.h
@@ -1,5 +1,5 @@
-#ifndef Z64ITEM_H
-#define Z64ITEM_H
+#ifndef ITEM_H
+#define ITEM_H
 
 // Note that z_kaleido_scope.c assumes that the dimensions and texture format here also matches the dimensions and
 // texture format for MAP_NAME_TEX1_*
diff --git a/include/z64lifemeter.h b/include/lifemeter.h
similarity index 86%
rename from include/z64lifemeter.h
rename to include/lifemeter.h
index 29b2656b88..d88ae6902d 100644
--- a/include/z64lifemeter.h
+++ b/include/lifemeter.h
@@ -1,5 +1,5 @@
-#ifndef Z64LIFEMETER_H
-#define Z64LIFEMETER_H
+#ifndef LIFEMETER_H
+#define LIFEMETER_H
 
 #include "ultra64/ultratypes.h"
 
diff --git a/include/z64light.h b/include/light.h
similarity index 98%
rename from include/z64light.h
rename to include/light.h
index ff6f732e12..fa4a306b64 100644
--- a/include/z64light.h
+++ b/include/light.h
@@ -1,9 +1,9 @@
-#ifndef Z64LIGHT_H
-#define Z64LIGHT_H
+#ifndef LIGHT_H
+#define LIGHT_H
 
 #include "ultra64.h"
 #include "ultra64/gbi.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GraphicsContext;
 struct PlayState;
diff --git a/include/z64map_mark.h b/include/map_mark.h
similarity index 95%
rename from include/z64map_mark.h
rename to include/map_mark.h
index b566491118..2f22ee0f5b 100644
--- a/include/z64map_mark.h
+++ b/include/map_mark.h
@@ -1,5 +1,5 @@
-#ifndef Z64MAP_MARK_H
-#define Z64MAP_MARK_H
+#ifndef MAP_MARK_H
+#define MAP_MARK_H
 
 #include "ultra64.h"
 
diff --git a/include/map_select_state.h b/include/map_select_state.h
index d2a6b43d19..01e57dd1d0 100644
--- a/include/map_select_state.h
+++ b/include/map_select_state.h
@@ -2,8 +2,8 @@
 #define MAP_SELECT_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
-#include "z64view.h"
+#include "game.h"
+#include "view.h"
 
 struct MapSelectState;
 
diff --git a/include/z64message.h b/include/message.h
similarity index 99%
rename from include/z64message.h
rename to include/message.h
index 3dfa196d97..3948f2dd09 100644
--- a/include/z64message.h
+++ b/include/message.h
@@ -1,9 +1,9 @@
-#ifndef Z64MESSAGE_H
-#define Z64MESSAGE_H
+#ifndef MESSAGE_H
+#define MESSAGE_H
 
-#include "z64view.h"
+#include "view.h"
 #include "versions.h"
-#include "z64font.h"
+#include "font.h"
 
 struct OcarinaStaff;
 struct Actor;
diff --git a/include/message_data_fmt.h b/include/message_data_fmt.h
index ac798d9346..375ac281e6 100644
--- a/include/message_data_fmt.h
+++ b/include/message_data_fmt.h
@@ -1,8 +1,8 @@
 #ifndef MESSAGE_DATA_FMT_H
 #define MESSAGE_DATA_FMT_H
 
-#include "z64save.h" // For highscores
-#include "z64item.h" // For item ids
+#include "save.h" // For highscores
+#include "item.h" // For item ids
 #include "sfx.h" // For sfx ids
 
 /*
diff --git a/include/n64dd.h b/include/n64dd.h
index 6a353c3172..f7a3f649ca 100644
--- a/include/n64dd.h
+++ b/include/n64dd.h
@@ -3,9 +3,9 @@
 
 #include "ultra64.h"
 #include "ultra64/leo.h"
-#include "z64pause.h"
-#include "z64scene.h"
-#include "z64map_mark.h"
+#include "pause.h"
+#include "scene.h"
+#include "map_mark.h"
 #include "versions.h"
 
 struct Font;
diff --git a/include/z64object.h b/include/object.h
similarity index 96%
rename from include/z64object.h
rename to include/object.h
index 016eda00d7..e40e671120 100644
--- a/include/z64object.h
+++ b/include/object.h
@@ -1,8 +1,8 @@
-#ifndef Z64OBJECT_H
-#define Z64OBJECT_H
+#ifndef OBJECT_H
+#define OBJECT_H
 
 #include "ultra64.h"
-#include "z64dma.h"
+#include "dma.h"
 
 struct PlayState;
 
diff --git a/include/z64ocarina.h b/include/ocarina.h
similarity index 99%
rename from include/z64ocarina.h
rename to include/ocarina.h
index d00ef01f2b..b3d502836a 100644
--- a/include/z64ocarina.h
+++ b/include/ocarina.h
@@ -1,5 +1,5 @@
-#ifndef Z64OCARINA_H
-#define Z64OCARINA_H
+#ifndef OCARINA_H
+#define OCARINA_H
 
 #include "ultra64.h"
 
diff --git a/include/z64olib.h b/include/olib.h
similarity index 88%
rename from include/z64olib.h
rename to include/olib.h
index 1b704b0e69..88b918987d 100644
--- a/include/z64olib.h
+++ b/include/olib.h
@@ -1,7 +1,7 @@
-#ifndef Z64OLIB_H
-#define Z64OLIB_H
+#ifndef OLIB_H
+#define OLIB_H
 
-#include "z64math.h"
+#include "z_math.h"
 
 f32 OLib_Vec3fDist(Vec3f* a, Vec3f* b);
 f32 OLib_Vec3fDistXZ(Vec3f* a, Vec3f* b);
diff --git a/include/z64path.h b/include/path.h
similarity index 88%
rename from include/z64path.h
rename to include/path.h
index 0f9243974a..56918762d7 100644
--- a/include/z64path.h
+++ b/include/path.h
@@ -1,8 +1,8 @@
-#ifndef Z64PATH_H
-#define Z64PATH_H
+#ifndef PATH_H
+#define PATH_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;
diff --git a/include/z64pause.h b/include/pause.h
similarity index 99%
rename from include/z64pause.h
rename to include/pause.h
index 24f53a93d8..f8a54fc5dd 100644
--- a/include/z64pause.h
+++ b/include/pause.h
@@ -1,9 +1,9 @@
-#ifndef Z64PAUSE_H
-#define Z64PAUSE_H
+#ifndef PAUSE_H
+#define PAUSE_H
 
-#include "z64animation.h"
-#include "z64message.h"
-#include "z64view.h"
+#include "animation.h"
+#include "message.h"
+#include "view.h"
 
 struct OcarinaStaff;
 struct PlayState;
diff --git a/include/z64play.h b/include/play_state.h
similarity index 93%
rename from include/z64play.h
rename to include/play_state.h
index 4853ac8f47..fa5e4839f3 100644
--- a/include/z64play.h
+++ b/include/play_state.h
@@ -1,30 +1,30 @@
-#ifndef Z64PLAY_H
-#define Z64PLAY_H
+#ifndef PLAY_STATE_H
+#define PLAY_STATE_H
 
 #include "ultra64.h"
 
 #include "prerender.h"
 #include "transition_tile.h"
-#include "z64actor.h"
-#include "z64bgcheck.h"
-#include "z64camera.h"
-#include "z64cutscene.h"
-#include "z64environment.h"
-#include "z64frame_advance.h"
-#include "z64game.h"
-#include "z64game_over.h"
-#include "z64interface.h"
-#include "z64light.h"
-#include "z64message.h"
-#include "z64object.h"
-#include "z64pause.h"
-#include "z64room.h"
-#include "z64scene.h"
-#include "z64sfx_source.h"
-#include "z64skybox.h"
-#include "z64sram.h"
-#include "z64transition.h"
-#include "z64view.h"
+#include "actor.h"
+#include "bgcheck.h"
+#include "camera.h"
+#include "cutscene.h"
+#include "environment.h"
+#include "frame_advance.h"
+#include "game.h"
+#include "game_over.h"
+#include "interface.h"
+#include "light.h"
+#include "message.h"
+#include "object.h"
+#include "pause.h"
+#include "room.h"
+#include "scene.h"
+#include "sfx_source.h"
+#include "skybox.h"
+#include "sram.h"
+#include "transition.h"
+#include "view.h"
 
 union Color_RGBA8_u32;
 struct Path;
diff --git a/include/z64player.h b/include/player.h
similarity index 99%
rename from include/z64player.h
rename to include/player.h
index fdc8fa1354..74a129a254 100644
--- a/include/z64player.h
+++ b/include/player.h
@@ -1,7 +1,7 @@
-#ifndef Z64PLAYER_H
-#define Z64PLAYER_H
+#ifndef PLAYER_H
+#define PLAYER_H
 
-#include "z64actor.h"
+#include "actor.h"
 #include "alignment.h"
 #include "face_change.h"
 
diff --git a/include/prenmi_state.h b/include/prenmi_state.h
index 3710425ca9..950eb94dea 100644
--- a/include/prenmi_state.h
+++ b/include/prenmi_state.h
@@ -2,7 +2,7 @@
 #define PRENMI_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
+#include "game.h"
 
 typedef struct PreNMIState {
     /* 0x00 */ GameState state;
diff --git a/include/quake.h b/include/quake.h
index 0d97a5bf45..c6259c7675 100644
--- a/include/quake.h
+++ b/include/quake.h
@@ -1,8 +1,8 @@
 #ifndef QUAKE_H
 #define QUAKE_H
 
-#include "z64camera.h"
-#include "z64math.h"
+#include "camera.h"
+#include "z_math.h"
 
 typedef struct ShakeInfo {
     /* 0x00 */ Vec3f atOffset;
diff --git a/include/z64quest_hint.h b/include/quest_hint.h
similarity index 76%
rename from include/z64quest_hint.h
rename to include/quest_hint.h
index b592a07c34..71d909b3f3 100644
--- a/include/z64quest_hint.h
+++ b/include/quest_hint.h
@@ -1,5 +1,5 @@
-#ifndef Z64QUEST_HINT_H
-#define Z64QUEST_HINT_H
+#ifndef QUEST_HINT_H
+#define QUEST_HINT_H
 
 #include "ultra64.h"
 
diff --git a/include/z64quest_hint_commands.h b/include/quest_hint_commands.h
similarity index 98%
rename from include/z64quest_hint_commands.h
rename to include/quest_hint_commands.h
index 8b99510160..8ce19aa7dd 100644
--- a/include/z64quest_hint_commands.h
+++ b/include/quest_hint_commands.h
@@ -1,5 +1,5 @@
-#ifndef Z64QUEST_HINT_COMMANDS_H
-#define Z64QUEST_HINT_COMMANDS_H
+#ifndef QUEST_HINT_COMMANDS_H
+#define QUEST_HINT_COMMANDS_H
 
 #include "ultra64.h"
 
diff --git a/include/z64room.h b/include/room.h
similarity index 98%
rename from include/z64room.h
rename to include/room.h
index 72c6f0982b..836b94b31e 100644
--- a/include/z64room.h
+++ b/include/room.h
@@ -1,9 +1,9 @@
-#ifndef Z64ROOM_H
-#define Z64ROOM_H
+#ifndef ROOM_H
+#define ROOM_H
 
 #include "ultra64.h"
-#include "z64dma.h"
-#include "z64math.h"
+#include "dma.h"
+#include "z_math.h"
 
 struct Input;
 struct PlayState;
diff --git a/include/sample_state.h b/include/sample_state.h
index b568a83f95..adf9e2a466 100644
--- a/include/sample_state.h
+++ b/include/sample_state.h
@@ -2,8 +2,8 @@
 #define SAMPLE_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
-#include "z64view.h"
+#include "game.h"
+#include "view.h"
 
 typedef struct SampleState {
     /* 0x0000 */ GameState state;
diff --git a/include/z64save.h b/include/save.h
similarity index 99%
rename from include/z64save.h
rename to include/save.h
index 71b1414052..a4e99546fb 100644
--- a/include/z64save.h
+++ b/include/save.h
@@ -1,10 +1,10 @@
-#ifndef Z64SAVE_H
-#define Z64SAVE_H
+#ifndef SAVE_H
+#define SAVE_H
 
 #include "ultra64.h"
 #include "versions.h"
-#include "z64inventory.h"
-#include "z64math.h"
+#include "inventory.h"
+#include "z_math.h"
 
 typedef enum ZTargetSetting {
     /* 0 */ Z_TARGET_SETTING_SWITCH,
diff --git a/include/z64scene.h b/include/scene.h
similarity index 99%
rename from include/z64scene.h
rename to include/scene.h
index 09b342c047..8e5b1a100c 100644
--- a/include/z64scene.h
+++ b/include/scene.h
@@ -1,13 +1,13 @@
-#ifndef Z64SCENE_H
-#define Z64SCENE_H
+#ifndef SCENE_H
+#define SCENE_H
 
 #include "avoid_ub.h"
 #include "ultra64.h"
-#include "z64bgcheck.h"
-#include "z64environment.h"
-#include "z64light.h"
-#include "z64math.h"
-#include "z64path.h"
+#include "bgcheck.h"
+#include "environment.h"
+#include "light.h"
+#include "z_math.h"
+#include "path.h"
 
 #include "command_macros_base.h"
 
diff --git a/include/setup_state.h b/include/setup_state.h
index 863b71401e..2ec4c1000b 100644
--- a/include/setup_state.h
+++ b/include/setup_state.h
@@ -1,7 +1,7 @@
 #ifndef SETUP_STATE_H
 #define SETUP_STATE_H
 
-#include "z64game.h"
+#include "game.h"
 
 typedef struct SetupState {
     /* 0x00 */ GameState state;
diff --git a/include/sfx.h b/include/sfx.h
index f7d86d87ac..91f24c1c84 100644
--- a/include/sfx.h
+++ b/include/sfx.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "versions.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "assert.h"
 
 #define MAX_CHANNELS_PER_BANK 3
diff --git a/include/z64sfx_source.h b/include/sfx_source.h
similarity index 86%
rename from include/z64sfx_source.h
rename to include/sfx_source.h
index 0034bc90aa..62011872ef 100644
--- a/include/z64sfx_source.h
+++ b/include/sfx_source.h
@@ -1,8 +1,8 @@
-#ifndef Z64SFX_SOURCE_H
-#define Z64SFX_SOURCE_H
+#ifndef SFX_SOURCE_H
+#define SFX_SOURCE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 
diff --git a/include/z64skin.h b/include/skin.h
similarity index 98%
rename from include/z64skin.h
rename to include/skin.h
index 641a980925..8843e5a230 100644
--- a/include/z64skin.h
+++ b/include/skin.h
@@ -1,7 +1,7 @@
-#ifndef Z64_SKIN_H
-#define Z64_SKIN_H
+#ifndef SKIN_H
+#define SKIN_H
 
-#include "z64animation.h"
+#include "animation.h"
 
 struct Actor;
 struct GraphicsContext;
diff --git a/include/z64skin_matrix.h b/include/skin_matrix.h
similarity index 94%
rename from include/z64skin_matrix.h
rename to include/skin_matrix.h
index 647790abff..a2ba0255fb 100644
--- a/include/z64skin_matrix.h
+++ b/include/skin_matrix.h
@@ -1,8 +1,8 @@
-#ifndef Z64SKIN_MATRIX_H
-#define Z64SKIN_MATRIX_H
+#ifndef SKIN_MATRIX_H
+#define SKIN_MATRIX_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GraphicsContext;
 
diff --git a/include/z64skybox.h b/include/skybox.h
similarity index 97%
rename from include/z64skybox.h
rename to include/skybox.h
index 60b3bbb7d3..1e1b3f12c1 100644
--- a/include/z64skybox.h
+++ b/include/skybox.h
@@ -1,11 +1,11 @@
-#ifndef Z64_SKYBOX_H
-#define Z64_SKYBOX_H
+#ifndef SKYBOX_H
+#define SKYBOX_H
 
 #include "ultra64/ultratypes.h"
 #include "ultra64/gbi.h"
 
 #include "romfile.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GameState;
 struct GraphicsContext;
diff --git a/include/z64sram.h b/include/sram.h
similarity index 97%
rename from include/z64sram.h
rename to include/sram.h
index f1d05b7775..f683be8a03 100644
--- a/include/z64sram.h
+++ b/include/sram.h
@@ -1,5 +1,5 @@
-#ifndef Z64SRAM_H
-#define Z64SRAM_H
+#ifndef SRAM_H
+#define SRAM_H
 
 #include "ultra64/ultratypes.h"
 
diff --git a/include/z64ss_sram.h b/include/ss_sram.h
similarity index 89%
rename from include/z64ss_sram.h
rename to include/ss_sram.h
index 4168446263..7a87c90fd5 100644
--- a/include/z64ss_sram.h
+++ b/include/ss_sram.h
@@ -1,5 +1,5 @@
-#ifndef Z64SS_SRAM_H
-#define Z64SS_SRAM_H
+#ifndef SS_SRAM_H
+#define SS_SRAM_H
 
 #include "stddef.h"
 #include "ultra64/ultratypes.h"
diff --git a/include/sys_math3d.h b/include/sys_math3d.h
index deeb093f4e..11f699c17f 100644
--- a/include/sys_math3d.h
+++ b/include/sys_math3d.h
@@ -2,7 +2,7 @@
 #define SYS_MATH3D_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 
diff --git a/include/sys_matrix.h b/include/sys_matrix.h
index 2708af81ee..3af75a18de 100644
--- a/include/sys_matrix.h
+++ b/include/sys_matrix.h
@@ -1,7 +1,7 @@
 #ifndef SYS_MATRIX_H
 #define SYS_MATRIX_H
 
-#include "z64math.h"
+#include "z_math.h"
 
 struct GraphicsContext;
 struct GameState;
diff --git a/include/z64thread.h b/include/thread.h
similarity index 95%
rename from include/z64thread.h
rename to include/thread.h
index c4ab827b42..c3e52a407a 100644
--- a/include/z64thread.h
+++ b/include/thread.h
@@ -1,5 +1,5 @@
-#ifndef Z64THREAD_H
-#define Z64THREAD_H
+#ifndef THREAD_H
+#define THREAD_H
 
 #include "ultra64.h"
 
diff --git a/include/title_setup_state.h b/include/title_setup_state.h
index 30219872a8..3d6a52445f 100644
--- a/include/title_setup_state.h
+++ b/include/title_setup_state.h
@@ -1,8 +1,8 @@
 #ifndef TITLE_SETUP_STATE_H
 #define TITLE_SETUP_STATE_H
 
-#include "z64game.h"
-#include "z64view.h"
+#include "game.h"
+#include "view.h"
 
 typedef struct TitleSetupState {
     /* 0x0000 */ GameState state;
diff --git a/include/z64transition.h b/include/transition.h
similarity index 97%
rename from include/z64transition.h
rename to include/transition.h
index f867aed09a..ae7d329514 100644
--- a/include/z64transition.h
+++ b/include/transition.h
@@ -1,5 +1,5 @@
-#ifndef Z64TRANSITION_H
-#define Z64TRANSITION_H
+#ifndef TRANSITION_H
+#define TRANSITION_H
 
 #include "ultra64/ultratypes.h"
 #include "ultra64/gbi.h"
@@ -7,7 +7,7 @@
 #include "transition_fade.h"
 #include "transition_triforce.h"
 #include "transition_wipe.h"
-#include "z64transition_instances.h"
+#include "transition_instances.h"
 
 #define TRANS_TRIGGER_OFF 0 // transition is not active
 #define TRANS_TRIGGER_START 20 // start transition (exiting an area)
diff --git a/include/z64transition_instances.h b/include/transition_instances.h
similarity index 74%
rename from include/z64transition_instances.h
rename to include/transition_instances.h
index cc35add03c..08e4672712 100644
--- a/include/z64transition_instances.h
+++ b/include/transition_instances.h
@@ -1,5 +1,5 @@
-#ifndef Z64TRANSITION_INSTANCES_H
-#define Z64TRANSITION_INSTANCES_H
+#ifndef TRANSITION_INSTANCES_H
+#define TRANSITION_INSTANCES_H
 
 typedef enum TransitionInstanceType {
     /* 1 */ TRANS_INSTANCE_TYPE_FILL_OUT = 1,
diff --git a/include/translation.h b/include/translation.h
index 6583326701..51fb34f841 100644
--- a/include/translation.h
+++ b/include/translation.h
@@ -1,6 +1,8 @@
 #ifndef TRANSLATION_H
 #define TRANSLATION_H
 
+#include "libu64/debug.h"
+
 /**
  * The "T" macro holds translations in English for original debug strings written in Japanese.
  * The translated strings are only direct translations. Certain names or terms may not reflect
@@ -13,4 +15,6 @@
  */
 #define T(jp, en) jp
 
+#define LOG_STRING_T(stringJP, stringEN, file, line) LOG(#stringJP, stringJP, "%s", file, line)
+
 #endif
diff --git a/include/z64view.h b/include/view.h
similarity index 98%
rename from include/z64view.h
rename to include/view.h
index 83bdf0fe84..b2dadd3db4 100644
--- a/include/z64view.h
+++ b/include/view.h
@@ -1,9 +1,9 @@
-#ifndef Z64VIEW_H
-#define Z64VIEW_H
+#ifndef VIEW_H
+#define VIEW_H
 
 #include "avoid_ub.h"
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GraphicsContext;
 
diff --git a/include/z64vis.h b/include/vis.h
similarity index 98%
rename from include/z64vis.h
rename to include/vis.h
index 86e286c325..52b1f0a690 100644
--- a/include/z64vis.h
+++ b/include/vis.h
@@ -1,5 +1,5 @@
-#ifndef Z64_VIS_H
-#define Z64_VIS_H
+#ifndef VIS_H
+#define VIS_H
 
 #include "ultra64.h"
 #include "color.h"
diff --git a/include/z_actor_dlftbls.h b/include/z_actor_dlftbls.h
index e9e2dc7d93..cabfc91916 100644
--- a/include/z_actor_dlftbls.h
+++ b/include/z_actor_dlftbls.h
@@ -2,7 +2,7 @@
 #define Z_ACTOR_DLFTBLS_H
 
 #include "romfile.h"
-#include "z64actor_profile.h"
+#include "actor_profile.h"
 
 /**
  * @see ACTOROVL_ALLOC_ABSOLUTE
diff --git a/include/z_en_a_obj.h b/include/z_en_a_obj.h
index bd65f88f13..7db18aaf92 100644
--- a/include/z_en_a_obj.h
+++ b/include/z_en_a_obj.h
@@ -2,7 +2,7 @@
 #define Z_EN_A_OBJ_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 // Only A_OBJ_SIGNPOST_OBLONG and A_OBJ_SIGNPOST_ARROW are used in room files.
 typedef enum AObjType {
diff --git a/include/z_en_item00.h b/include/z_en_item00.h
index 483f666f5f..4eb1ae735b 100644
--- a/include/z_en_item00.h
+++ b/include/z_en_item00.h
@@ -2,7 +2,7 @@
 #define Z_EN_ITEM00_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum Item00Type {
     /* 0x00 */ ITEM00_RUPEE_GREEN,
diff --git a/include/z_lib.h b/include/z_lib.h
index 24fa806914..c2e36e7cc3 100644
--- a/include/z_lib.h
+++ b/include/z_lib.h
@@ -3,7 +3,7 @@
 
 #include "stddef.h"
 #include "libu64/pad.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "color.h"
 
 void Lib_MemSet(u8* dest, size_t len, u8 val);
diff --git a/include/z64math.h b/include/z_math.h
similarity index 97%
rename from include/z64math.h
rename to include/z_math.h
index 187d95b250..ebe364d886 100644
--- a/include/z64math.h
+++ b/include/z_math.h
@@ -1,5 +1,7 @@
-#ifndef Z64MATH_H
-#define Z64MATH_H
+#ifndef Z_MATH_H
+#define Z_MATH_H
+
+// This file has a z_ prefix to indicate that it is the game-side math header, not libc
 
 #include "math.h"
 #include "ultra64.h"
diff --git a/src/audio/game/data.c b/src/audio/game/data.c
index 6c5528f347..213c53dbbf 100644
--- a/src/audio/game/data.c
+++ b/src/audio/game/data.c
@@ -1,7 +1,7 @@
 #include "array_count.h"
 #include "sfx.h"
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // sSfxRequests ring buffer endpoints. read index <= write index, wrapping around mod 256.
 u8 gSfxRequestWriteIndex = 0;
diff --git a/src/audio/game/general.c b/src/audio/game/general.c
index f04f203a1f..0e1ca6df5c 100644
--- a/src/audio/game/general.c
+++ b/src/audio/game/general.c
@@ -10,8 +10,8 @@
 #include "sfx.h"
 #include "ultra64.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64ocarina.h"
+#include "audio.h"
+#include "ocarina.h"
 
 #define ABS_ALT(x) ((x) < 0 ? -(x) : (x))
 
diff --git a/src/audio/game/sequence.c b/src/audio/game/sequence.c
index a311e4e73d..ec9a36e299 100644
--- a/src/audio/game/sequence.c
+++ b/src/audio/game/sequence.c
@@ -23,7 +23,7 @@
 #include "sfx.h"
 #include "ultra64.h"
 #include "ultra64/abi.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // Direct audio command (skips the queueing system)
 #define SEQCMD_SET_SEQPLAYER_VOLUME_NOW(seqPlayerIndex, duration, volume)                       \
diff --git a/src/audio/game/session_config.c b/src/audio/game/session_config.c
index c21a79c725..6530901ef0 100644
--- a/src/audio/game/session_config.c
+++ b/src/audio/game/session_config.c
@@ -1,4 +1,4 @@
-#include "z64audio.h"
+#include "audio.h"
 
 AudioContext gAudioCtx;
 AudioCustomUpdateFunction gAudioCustomUpdateFunction;
diff --git a/src/audio/game/session_init.c b/src/audio/game/session_init.c
index b8bc1924c2..ebac33b4a8 100644
--- a/src/audio/game/session_init.c
+++ b/src/audio/game/session_init.c
@@ -1,7 +1,7 @@
 #include "alignment.h"
 #include "array_count.h"
 #include "buffers.h"
-#include "z64audio.h"
+#include "audio.h"
 
 #include "assets/audio/sequence_sizes.h"
 #include "assets/audio/soundfont_sizes.h"
diff --git a/src/audio/game/sfx.c b/src/audio/game/sfx.c
index 65309942a6..aef0a8eb58 100644
--- a/src/audio/game/sfx.c
+++ b/src/audio/game/sfx.c
@@ -4,7 +4,7 @@
 #include "sfx.h"
 #include "terminal.h"
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 typedef struct SfxRequest {
     /* 0x00 */ u16 sfxId;
diff --git a/src/audio/internal/data.c b/src/audio/internal/data.c
index f2f1b2c94e..d95b05fc9a 100644
--- a/src/audio/internal/data.c
+++ b/src/audio/internal/data.c
@@ -1,6 +1,6 @@
 #include "alignment.h"
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // clang-format off
 ALIGNED(16) s16 gSawtoothWaveSample[] = {
diff --git a/src/audio/internal/effects.c b/src/audio/internal/effects.c
index 7e3d01d3a7..162b72ce6b 100644
--- a/src/audio/internal/effects.c
+++ b/src/audio/internal/effects.c
@@ -1,6 +1,6 @@
 #include "ultra64.h"
 #include "attributes.h"
-#include "z64audio.h"
+#include "audio.h"
 
 void Audio_SequenceChannelProcessSound(SequenceChannel* channel, s32 recalculateVolume, s32 applyBend) {
     f32 channelVolume;
diff --git a/src/audio/internal/heap.c b/src/audio/internal/heap.c
index e78787027b..36674ded24 100644
--- a/src/audio/internal/heap.c
+++ b/src/audio/internal/heap.c
@@ -1,7 +1,7 @@
 #include "alignment.h"
 #include "ultra64.h"
 #include "versions.h"
-#include "z64audio.h"
+#include "audio.h"
 
 void AudioHeap_InitSampleCaches(u32 persistentSampleCacheSize, u32 temporarySampleCacheSize);
 SampleCacheEntry* AudioHeap_AllocTemporarySampleCacheEntry(u32 size);
diff --git a/src/audio/internal/load.c b/src/audio/internal/load.c
index 91c25fabf7..9989d14075 100644
--- a/src/audio/internal/load.c
+++ b/src/audio/internal/load.c
@@ -9,7 +9,7 @@
 #include "segment_symbols.h"
 #include "ultra64.h"
 #include "versions.h"
-#include "z64audio.h"
+#include "audio.h"
 
 #define MK_ASYNC_MSG(retData, tableType, id, loadStatus) \
     (((retData) << 24) | ((tableType) << 16) | ((id) << 8) | (loadStatus))
diff --git a/src/audio/internal/os.c b/src/audio/internal/os.c
index 4bbb0d2fdb..384588959a 100644
--- a/src/audio/internal/os.c
+++ b/src/audio/internal/os.c
@@ -3,7 +3,7 @@
  */
 
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 void Audio_InvalDCache(void* buf, s32 size) {
     OSIntMask prevMask = osSetIntMask(OS_IM_NONE);
diff --git a/src/audio/internal/playback.c b/src/audio/internal/playback.c
index 327e271d06..0329f0ec16 100644
--- a/src/audio/internal/playback.c
+++ b/src/audio/internal/playback.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) {
     f32 volLeft;
diff --git a/src/audio/internal/seqplayer.c b/src/audio/internal/seqplayer.c
index 1d6fb7c0a6..083acf8899 100644
--- a/src/audio/internal/seqplayer.c
+++ b/src/audio/internal/seqplayer.c
@@ -19,7 +19,7 @@
 #include "assert.h"
 #include "attributes.h"
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 static_assert(MML_VERSION == MML_VERSION_OOT, "This file implements the OoT version of the MML");
 
diff --git a/src/audio/internal/synthesis.c b/src/audio/internal/synthesis.c
index c7c3eefb04..e01fbcc96c 100644
--- a/src/audio/internal/synthesis.c
+++ b/src/audio/internal/synthesis.c
@@ -1,6 +1,6 @@
 #include "alignment.h"
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // DMEM Addresses for the RSP
 #define DMEM_TEMP 0x3C0
diff --git a/src/audio/internal/thread.c b/src/audio/internal/thread.c
index 2e2d0630e1..d021c4386b 100644
--- a/src/audio/internal/thread.c
+++ b/src/audio/internal/thread.c
@@ -6,7 +6,7 @@
 #include "audiothread_cmd.h"
 #include "ultra64.h"
 #include "versions.h"
-#include "z64audio.h"
+#include "audio.h"
 
 #define SAMPLES_TO_OVERPRODUCE 0x10
 #define EXTRA_BUFFERED_AI_SAMPLES_TARGET 0x80
diff --git a/src/audio/tables/samplebank_table.c b/src/audio/tables/samplebank_table.c
index d26d9d5bcb..1e0983d772 100644
--- a/src/audio/tables/samplebank_table.c
+++ b/src/audio/tables/samplebank_table.c
@@ -1,5 +1,5 @@
 #include "attributes.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // Symbol definition
 
diff --git a/src/audio/tables/sequence_table.c b/src/audio/tables/sequence_table.c
index 8235cd674b..c7ab5c0555 100644
--- a/src/audio/tables/sequence_table.c
+++ b/src/audio/tables/sequence_table.c
@@ -1,5 +1,5 @@
 #include "attributes.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "versions.h"
 
 // Symbol definition
diff --git a/src/audio/tables/soundfont_table.c b/src/audio/tables/soundfont_table.c
index 779be397ba..046f049bb1 100644
--- a/src/audio/tables/soundfont_table.c
+++ b/src/audio/tables/soundfont_table.c
@@ -1,5 +1,5 @@
 #include "attributes.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // Symbol definition
 
diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c
index 2f948b9d6a..cfe011ac33 100644
--- a/src/boot/boot_main.c
+++ b/src/boot/boot_main.c
@@ -10,7 +10,7 @@
 #include "cic6105.h"
 #endif
 #include "z_locale.h"
-#include "z64thread.h"
+#include "thread.h"
 
 #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:128"
 
diff --git a/src/boot/idle.c b/src/boot/idle.c
index 743219d94c..648ce48cf7 100644
--- a/src/boot/idle.c
+++ b/src/boot/idle.c
@@ -11,8 +11,8 @@
 #include "translation.h"
 #include "versions.h"
 #include "vi_mode.h"
-#include "z64thread.h"
-#include "z64dma.h"
+#include "thread.h"
+#include "dma.h"
 
 #pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
                                "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
diff --git a/src/boot/inflate.c b/src/boot/inflate.c
index d9fc7c3f8d..188c3f235a 100644
--- a/src/boot/inflate.c
+++ b/src/boot/inflate.c
@@ -102,7 +102,7 @@
 #include "stdint.h"
 #include "alignment.h"
 #include "attributes.h"
-#include "z64dma.h"
+#include "dma.h"
 
 typedef u8 uch;
 typedef u16 ush;
diff --git a/src/boot/yaz0.c b/src/boot/yaz0.c
index eb3ce23317..601d5145eb 100644
--- a/src/boot/yaz0.c
+++ b/src/boot/yaz0.c
@@ -2,7 +2,7 @@
 
 #include "alignment.h"
 #include "ultra64.h"
-#include "z64dma.h"
+#include "dma.h"
 
 #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:128" \
                                "pal-1.1:128"
diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index 7678168549..226465a3f6 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -42,8 +42,8 @@
 #if !PLATFORM_IQUE
 #include "yaz0.h"
 #endif
-#include "z64dma.h"
-#include "z64thread.h"
+#include "dma.h"
+#include "thread.h"
 
 #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:82" \
                                "pal-1.0:80 pal-1.1:80"
@@ -519,7 +519,7 @@ void DmaMgr_ThreadEntry(void* arg) {
         }
 
         if (0) {
-            PRINTF(T("ＤＭＡ登録受付", "DMA registration acceptance") " dmap=%08x\n", req);
+            PRINTF(T("ＤＭＡ登録受付 dmap=%08x\n", "DMA registration acceptance dmap=%08x\n"), req);
         }
 
         // Process the DMA request
diff --git a/src/code/audio_thread_manager.c b/src/code/audio_thread_manager.c
index 57f530a4b8..01b0072d9b 100644
--- a/src/code/audio_thread_manager.c
+++ b/src/code/audio_thread_manager.c
@@ -11,7 +11,7 @@
 #include "regs.h"
 #include "speed_meter.h"
 #include "translation.h"
-#include "z64dma.h"
+#include "dma.h"
 
 void AudioMgr_NotifyTaskDone(AudioMgr* audioMgr) {
     AudioTask* task = audioMgr->rspTask;
diff --git a/src/code/code_n64dd_800AD410.c b/src/code/code_n64dd_800AD410.c
index 979a95afbb..1509b7223b 100644
--- a/src/code/code_n64dd_800AD410.c
+++ b/src/code/code_n64dd_800AD410.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64dma.h"
+#include "dma.h"
 #include "segment_symbols.h"
 #include "n64dd.h"
 
diff --git a/src/code/code_n64dd_800AD4C0.c b/src/code/code_n64dd_800AD4C0.c
index 4c4e0db0e3..4b2d17e72c 100644
--- a/src/code/code_n64dd_800AD4C0.c
+++ b/src/code/code_n64dd_800AD4C0.c
@@ -2,9 +2,9 @@
 #include "n64dd.h"
 #include "regs.h"
 #include "segmented_address.h"
-#include "z64actor.h"
-#include "z64cutscene.h"
-#include "z64save.h"
+#include "actor.h"
+#include "cutscene.h"
+#include "save.h"
 
 n64ddStruct_800FEE70_pointers D_800FEE70 = {
     func_801C7C1C,
diff --git a/src/code/db_camera.c b/src/code/db_camera.c
index a275cae523..34599c9a1c 100644
--- a/src/code/db_camera.c
+++ b/src/code/db_camera.c
@@ -10,14 +10,14 @@
 #include "regs.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64camera.h"
-#include "z64cutscene.h"
-#include "z64cutscene_spline.h"
-#include "z64debug.h"
-#include "z64debug_display.h"
-#include "z64olib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "camera.h"
+#include "cutscene.h"
+#include "cutscene_spline.h"
+#include "debug.h"
+#include "debug_display.h"
+#include "olib.h"
+#include "play_state.h"
+#include "save.h"
 
 #define DEBUG_CAM_CONTROLLER_PORT 2
 
diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c
index ad7c786f34..772a9a8876 100644
--- a/src/code/debug_malloc.c
+++ b/src/code/debug_malloc.c
@@ -34,7 +34,7 @@ void DebugArena_CheckPointer(void* ptr, u32 size, const char* name, const char*
 void* DebugArena_Malloc(u32 size) {
     void* ptr = __osMalloc(&sDebugArena, size);
 
-    DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc", "確保"); // "Secure"
+    DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc", T("確保", "Secure"));
     return ptr;
 }
 
@@ -42,7 +42,7 @@ void* DebugArena_Malloc(u32 size) {
 void* DebugArena_MallocDebug(u32 size, const char* file, int line) {
     void* ptr = __osMallocDebug(&sDebugArena, size, file, line);
 
-    DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_DEBUG", "確保"); // "Secure"
+    DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_DEBUG", T("確保", "Secure"));
     return ptr;
 }
 #endif
@@ -50,7 +50,7 @@ void* DebugArena_MallocDebug(u32 size, const char* file, int line) {
 void* DebugArena_MallocR(u32 size) {
     void* ptr = __osMallocR(&sDebugArena, size);
 
-    DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_r", "確保"); // "Secure"
+    DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_r", T("確保", "Secure"));
     return ptr;
 }
 
@@ -58,21 +58,21 @@ void* DebugArena_MallocR(u32 size) {
 void* DebugArena_MallocRDebug(u32 size, const char* file, int line) {
     void* ptr = __osMallocRDebug(&sDebugArena, size, file, line);
 
-    DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_r_DEBUG", "確保"); // "Secure"
+    DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_r_DEBUG", T("確保", "Secure"));
     return ptr;
 }
 #endif
 
 void* DebugArena_Realloc(void* ptr, u32 newSize) {
     ptr = __osRealloc(&sDebugArena, ptr, newSize);
-    DEBUG_ARENA_CHECK_POINTER(ptr, newSize, "debug_realloc", "再確保"); // "Re-securing"
+    DEBUG_ARENA_CHECK_POINTER(ptr, newSize, "debug_realloc", T("再確保", "Re-secure"));
     return ptr;
 }
 
 #if DEBUG_FEATURES
 void* DebugArena_ReallocDebug(void* ptr, u32 newSize, const char* file, int line) {
     ptr = __osReallocDebug(&sDebugArena, ptr, newSize, file, line);
-    DEBUG_ARENA_CHECK_POINTER(ptr, newSize, "debug_realloc_DEBUG", "再確保"); // "Re-securing"
+    DEBUG_ARENA_CHECK_POINTER(ptr, newSize, "debug_realloc_DEBUG", T("再確保", "Re-secure"));
     return ptr;
 }
 #endif
@@ -96,7 +96,7 @@ void* DebugArena_Calloc(u32 num, u32 size) {
         bzero(ret, n);
     }
 
-    DEBUG_ARENA_CHECK_POINTER(ret, n, "debug_calloc", "確保");
+    DEBUG_ARENA_CHECK_POINTER(ret, n, "debug_calloc", T("確保", "Secure"));
     return ret;
 }
 
diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c
index b2bb9d13d4..e7afa4ec81 100644
--- a/src/code/fault_gc.c
+++ b/src/code/fault_gc.c
@@ -56,7 +56,7 @@
 #include "stackcheck.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64thread.h"
+#include "thread.h"
 
 void Fault_Init(void);
 void Fault_SetOsSyncPrintfEnabled(u32 enabled);
diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c
index 75fc704b91..2d31b0f323 100644
--- a/src/code/fault_n64.c
+++ b/src/code/fault_n64.c
@@ -10,7 +10,7 @@
 #include "stack.h"
 #include "stackcheck.h"
 #include "terminal.h"
-#include "z64thread.h"
+#include "thread.h"
 #include "translation.h"
 
 #pragma increment_block_number "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:144 pal-1.1:144"
diff --git a/src/code/flg_set.c b/src/code/flg_set.c
index efc044074a..f102d702c8 100644
--- a/src/code/flg_set.c
+++ b/src/code/flg_set.c
@@ -5,8 +5,8 @@
 #include "gfx.h"
 #include "gfxalloc.h"
 #include "controller.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 typedef struct FlagSetEntry {
     /* 0x00 */ u16* value;
diff --git a/src/code/game.c b/src/code/game.c
index 5b80355cbb..1f4ff8cdbf 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -26,11 +26,11 @@
 #include "versions.h"
 #include "vi_mode.h"
 #include "zelda_arena.h"
-#include "z64debug.h"
-#include "z64dma.h"
-#include "z64game.h"
-#include "z64play.h"
-#include "z64vis.h"
+#include "debug.h"
+#include "dma.h"
+#include "game.h"
+#include "play_state.h"
+#include "vis.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128"
 
diff --git a/src/code/graph.c b/src/code/graph.c
index 86543cc50d..56fc7af60c 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -26,9 +26,9 @@
 #include "versions.h"
 #include "vi_mode.h"
 #include "z_game_dlftbls.h"
-#include "z64audio.h"
-#include "z64save.h"
-#include "z64play.h"
+#include "audio.h"
+#include "save.h"
+#include "play_state.h"
 
 #define GFXPOOL_HEAD_MAGIC 0x1234
 #define GFXPOOL_TAIL_MAGIC 0x5678
@@ -331,10 +331,10 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
 #if DEBUG_FEATURES
     OPEN_DISPS(gfxCtx, "../graph.c", 966);
 
-    gDPNoOpString(WORK_DISP++, "WORK_DISP 開始", 0);
-    gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 開始", 0);
-    gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 開始", 0);
-    gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 開始", 0);
+    gDPNoOpString(WORK_DISP++, T("WORK_DISP 開始", "WORK_DISP start"), 0);
+    gDPNoOpString(POLY_OPA_DISP++, T("POLY_OPA_DISP 開始", "POLY_OPA_DISP start"), 0);
+    gDPNoOpString(POLY_XLU_DISP++, T("POLY_XLU_DISP 開始", "POLY_XLU_DISP start"), 0);
+    gDPNoOpString(OVERLAY_DISP++, T("OVERLAY_DISP 開始", "OVERLAY_DISP start"), 0);
 
     CLOSE_DISPS(gfxCtx, "../graph.c", 975);
 #endif
@@ -345,10 +345,10 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
 #if DEBUG_FEATURES
     OPEN_DISPS(gfxCtx, "../graph.c", 987);
 
-    gDPNoOpString(WORK_DISP++, "WORK_DISP 終了", 0);
-    gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 終了", 0);
-    gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 終了", 0);
-    gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 終了", 0);
+    gDPNoOpString(WORK_DISP++, T("WORK_DISP 終了", "WORK_DISP end"), 0);
+    gDPNoOpString(POLY_OPA_DISP++, T("POLY_OPA_DISP 終了", "POLY_OPA_DISP end"), 0);
+    gDPNoOpString(POLY_XLU_DISP++, T("POLY_XLU_DISP 終了", "POLY_XLU_DISP end"), 0);
+    gDPNoOpString(OVERLAY_DISP++, T("OVERLAY_DISP 終了", "OVERLAY_DISP end"), 0);
 
     CLOSE_DISPS(gfxCtx, "../graph.c", 996);
 #endif
diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c
index ced883f7a0..bb9fc7841e 100644
--- a/src/code/irqmgr.c
+++ b/src/code/irqmgr.c
@@ -40,7 +40,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64thread.h"
+#include "thread.h"
 
 vu32 gIrqMgrResetStatus = IRQ_RESET_STATUS_IDLE;
 volatile OSTime sIrqMgrResetTime = 0;
diff --git a/src/code/main.c b/src/code/main.c
index 902e624aa6..e137cff750 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -40,8 +40,8 @@ extern struct IrqMgr gIrqMgr;
 #include "cic6105.h"
 #include "n64dd.h"
 #endif
-#include "z64debug.h"
-#include "z64thread.h"
+#include "debug.h"
+#include "thread.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "ique-cn:0 ntsc-1.0:51 ntsc-1.1:51 ntsc-1.2:51 pal-1.0:49 pal-1.1:49"
diff --git a/src/code/object_table.c b/src/code/object_table.c
index 9ed6a1f44d..3bb45a0073 100644
--- a/src/code/object_table.c
+++ b/src/code/object_table.c
@@ -2,7 +2,7 @@
 #include "segment_symbols.h"
 #include "romfile.h"
 #include "ultra64.h"
-#include "z64object.h"
+#include "object.h"
 
 s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD };
 
diff --git a/src/code/sched.c b/src/code/sched.c
index c573bf97f6..fe1d14a0c2 100644
--- a/src/code/sched.c
+++ b/src/code/sched.c
@@ -52,7 +52,7 @@
 #include "translation.h"
 #include "versions.h"
 #include "vi_mode.h"
-#include "z64thread.h"
+#include "thread.h"
 
 #define RSP_DONE_MSG 667
 #define RDP_DONE_MSG 668
diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c
index bb3624fa86..0216275f17 100644
--- a/src/code/speed_meter.c
+++ b/src/code/speed_meter.c
@@ -9,8 +9,8 @@
 #include "speed_meter.h"
 #include "terminal.h"
 #include "zelda_arena.h"
-#include "z64game.h"
-#include "z64view.h"
+#include "game.h"
+#include "view.h"
 
 /**
  * How much time the audio update on the audio thread (`AudioThread_Update`) took in total, between scheduling the last
diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c
index 1ce651e9c9..5f41973ffe 100644
--- a/src/code/sys_math3d.c
+++ b/src/code/sys_math3d.c
@@ -5,9 +5,9 @@
 #include "translation.h"
 #include "ultra64.h"
 #include "z_lib.h"
-#include "z64math.h"
+#include "z_math.h"
 
-#pragma increment_block_number "gc-eu:77 gc-eu-mq:77 gc-jp:77 gc-jp-ce:77 gc-jp-mq:77 gc-us:77 gc-us-mq:77 ique-cn:67" \
+#pragma increment_block_number "gc-eu:76 gc-eu-mq:76 gc-jp:76 gc-jp-ce:76 gc-jp-mq:76 gc-us:76 gc-us-mq:76 ique-cn:66" \
                                "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"
 
 s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB,
diff --git a/src/code/sys_math3d_draw.c b/src/code/sys_math3d_draw.c
index 7781a79e2e..2b8776ec68 100644
--- a/src/code/sys_math3d_draw.c
+++ b/src/code/sys_math3d_draw.c
@@ -1,5 +1,5 @@
 #include "sys_math3d.h"
-#include "z64play.h"
+#include "play_state.h"
 
 void Math3D_DrawSphere(PlayState* play, Sphere16* sph) {
 }
diff --git a/src/code/sys_math_atan.c b/src/code/sys_math_atan.c
index 0c99eaced4..2e344d3910 100644
--- a/src/code/sys_math_atan.c
+++ b/src/code/sys_math_atan.c
@@ -1,6 +1,6 @@
 #include "array_count.h"
 #include "sys_math.h"
-#include "z64math.h"
+#include "z_math.h"
 
 static u16 sAtan2Tbl[] = {
     0x0000, 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084,
diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c
index 2ca4882601..b773d20e47 100644
--- a/src/code/sys_matrix.c
+++ b/src/code/sys_matrix.c
@@ -7,8 +7,8 @@
 #include "sys_matrix.h"
 #include "ultra64.h"
 #include "z_lib.h"
-#include "z64game.h"
-#include "z64skin_matrix.h"
+#include "game.h"
+#include "skin_matrix.h"
 
 // clang-format off
 Mtx gIdentityMtx = gdSPDefMtx(
diff --git a/src/code/title_setup.c b/src/code/title_setup.c
index 0272022474..c4020bbd14 100644
--- a/src/code/title_setup.c
+++ b/src/code/title_setup.c
@@ -2,7 +2,7 @@
 #include "setup_state.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64save.h"
+#include "save.h"
 
 void Setup_InitImpl(SetupState* this) {
     PRINTF(T("ゼルダ共通データ初期化\n", "Zelda common data initialization\n"));
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 83105d23ec..5a0fe9b1c3 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -19,14 +19,14 @@
 #include "z_actor_dlftbls.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
-#include "z64actor.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64light.h"
-#include "z64horse.h"
-#include "z64play.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "actor.h"
+#include "audio.h"
+#include "effect.h"
+#include "light.h"
+#include "horse.h"
+#include "play_state.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 #include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h"
 #include "overlays/actors/ovl_En_Part/z_en_part.h"
@@ -2688,7 +2688,7 @@ void Actor_DrawLensActors(PlayState* play, s32 numInvisibleActors, Actor** invis
 
     OPEN_DISPS(gfxCtx, "../z_actor.c", 6197);
 
-    gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ START", 0); // "Magic lens START"
+    gDPNoOpString(POLY_OPA_DISP++, T("魔法のメガネ START", "Magic lens START"), 0);
 
     gDPPipeSync(POLY_XLU_DISP++);
 
@@ -2728,23 +2728,25 @@ void Actor_DrawLensActors(PlayState* play, s32 numInvisibleActors, Actor** invis
     // The z-buffer will be updated where the mask is not fully transparent.
     Actor_DrawLensOverlay(gfxCtx);
 
-    // "Magic lens invisible Actor display START"
-    gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示 START", numInvisibleActors);
+    gDPNoOpString(POLY_OPA_DISP++,
+                  T("魔法のメガネ 見えないＡcｔｏｒ表示 START", "Magic lens invisible Actor display START"),
+                  numInvisibleActors);
 
     invisibleActor = &invisibleActors[0];
     for (i = 0; i < numInvisibleActors; i++) {
-        // "Magic lens invisible Actor display"
-        gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示", i);
+        gDPNoOpString(POLY_OPA_DISP++, T("魔法のメガネ 見えないＡcｔｏｒ表示", "Magic lens invisible Actor display"),
+                      i);
         Actor_Draw(play, *(invisibleActor++));
     }
 
-    // "Magic lens invisible Actor display END"
-    gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示 END", numInvisibleActors);
+    gDPNoOpString(POLY_OPA_DISP++,
+                  T("魔法のメガネ 見えないＡcｔｏｒ表示 END", "Magic lens invisible Actor display END"),
+                  numInvisibleActors);
 
     if (play->roomCtx.curRoom.lensMode != LENS_MODE_SHOW_ACTORS) {
         // Draw the lens overlay to the color frame buffer
 
-        gDPNoOpString(POLY_OPA_DISP++, "青い眼鏡(外側)", 0); // "Blue spectacles (exterior)"
+        gDPNoOpString(POLY_OPA_DISP++, T("青い眼鏡(外側)", "Blue glasses (outside)"), 0);
 
         gDPPipeSync(POLY_XLU_DISP++);
 
@@ -2757,10 +2759,10 @@ void Actor_DrawLensActors(PlayState* play, s32 numInvisibleActors, Actor** invis
 
         Actor_DrawLensOverlay(gfxCtx);
 
-        gDPNoOpString(POLY_OPA_DISP++, "青い眼鏡(外側)", 1); // "Blue spectacles (exterior)"
+        gDPNoOpString(POLY_OPA_DISP++, T("青い眼鏡(外側)", "Blue glasses (outside)"), 1);
     }
 
-    gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ END", 0); // "Magic lens END"
+    gDPNoOpString(POLY_OPA_DISP++, T("魔法のメガネ END", "Magic lens END"), 0);
 
     CLOSE_DISPS(gfxCtx, "../z_actor.c", 6284);
 }
diff --git a/src/code/z_bg_collect.c b/src/code/z_bg_collect.c
index 68966b74fc..01114d835a 100644
--- a/src/code/z_bg_collect.c
+++ b/src/code/z_bg_collect.c
@@ -2,10 +2,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64bgcheck.h"
-#include "z64player.h"
-#include "z64skin_matrix.h"
+#include "actor.h"
+#include "bgcheck.h"
+#include "player.h"
+#include "skin_matrix.h"
 
 /**
  * Update the `carriedActor`'s position based on the dynapoly actor identified by `bgId`.
diff --git a/src/code/z_bg_item.c b/src/code/z_bg_item.c
index 43c32eb558..33cb0fbe82 100644
--- a/src/code/z_bg_item.c
+++ b/src/code/z_bg_item.c
@@ -1,7 +1,7 @@
 #include "z_lib.h"
-#include "z64actor.h"
-#include "z64bgcheck.h"
-#include "z64play.h"
+#include "actor.h"
+#include "bgcheck.h"
+#include "play_state.h"
 
 /**
  * @param transformFlags How other actors standing on the dynapoly actor's collision move when the dynapoly actor moves.
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index 65ff40ee46..9e71fa6287 100644
--- a/src/code/z_bgcheck.c
+++ b/src/code/z_bgcheck.c
@@ -9,10 +9,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64bgcheck.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64skin_matrix.h"
+#include "bgcheck.h"
+#include "play_state.h"
+#include "player.h"
+#include "skin_matrix.h"
 
 #pragma increment_block_number "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144"
 
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index cf5ed30730..36c3f0b15f 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -17,13 +17,13 @@
 #include "ultra64.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
-#include "z64audio.h"
-#include "z64cutscene_spline.h"
-#include "z64debug.h"
-#include "z64olib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "cutscene_spline.h"
+#include "debug.h"
+#include "olib.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
@@ -3661,7 +3661,7 @@ s32 Camera_KeepOn3(Camera* camera) {
 }
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ique-cn:128 ntsc-1.0:83 ntsc-1.1:83 ntsc-1.2:83 pal-1.0:83 pal-1.1:83"
+                               "ique-cn:128 ntsc-1.0:82 ntsc-1.1:82 ntsc-1.2:82 pal-1.0:82 pal-1.1:82"
 
 s32 Camera_KeepOn4(Camera* camera) {
     static Vec3f D_8015BD50;
diff --git a/src/code/z_cheap_proc.inc.c b/src/code/z_cheap_proc.inc.c
index e922c0832c..2daaa97601 100644
--- a/src/code/z_cheap_proc.inc.c
+++ b/src/code/z_cheap_proc.inc.c
@@ -1,7 +1,7 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64play.h"
+#include "play_state.h"
 
 void Gfx_DrawDListOpa(PlayState* play, Gfx* dlist) {
     OPEN_DISPS(play->state.gfxCtx, "../z_cheap_proc.c", 214);
diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c
index 5c2a210bcc..5b305764e6 100644
--- a/src/code/z_collision_btltbls.c
+++ b/src/code/z_collision_btltbls.c
@@ -1,7 +1,7 @@
 #include "array_count.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64collision_check.h"
+#include "collision_check.h"
 
 static DamageTable sDamageTablePresets[] = {
     { {
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index dcf07766e6..158948a2eb 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -7,11 +7,11 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64collision_check.h"
-#include "z64effect.h"
-#include "z64frame_advance.h"
+#include "collision_check.h"
+#include "effect.h"
+#include "frame_advance.h"
 #include "zelda_arena.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h"
 #include "z_lib.h"
@@ -3027,7 +3027,7 @@ void CollisionCheck_InitInfo(CollisionCheckInfo* info) {
  */
 void CollisionCheck_ResetDamage(CollisionCheckInfo* info) {
     info->damage = 0;
-    info->damageEffect = 0;
+    info->damageReaction = 0;
     info->atHitEffect = 0;
     info->acHitEffect = 0;
     info->displacement.x = info->displacement.y = info->displacement.z = 0.0f;
@@ -3108,7 +3108,7 @@ void CollisionCheck_ApplyDamage(PlayState* play, CollisionCheckContext* colChkCt
         }
 
         damage = tbl->table[i] & 0xF;
-        col->actor->colChkInfo.damageEffect = tbl->table[i] >> 4 & 0xF;
+        col->actor->colChkInfo.damageReaction = tbl->table[i] >> 4 & 0xF;
     }
     if (!(col->acFlags & AC_HARD)) {
         col->actor->colChkInfo.damage += damage;
diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c
index 18bfafbc3a..1dfd4d2419 100644
--- a/src/code/z_common_data.c
+++ b/src/code/z_common_data.c
@@ -3,9 +3,9 @@
 #include "sequence.h"
 #include "versions.h"
 #include "z_locale.h"
-#include "z64environment.h"
-#include "z64save.h"
-#include "z64transition.h"
+#include "environment.h"
+#include "save.h"
+#include "transition.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
diff --git a/src/code/z_construct.c b/src/code/z_construct.c
index b4abbda6b7..9a9e50a855 100644
--- a/src/code/z_construct.c
+++ b/src/code/z_construct.c
@@ -4,11 +4,11 @@
 #include "segment_symbols.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64lifemeter.h"
-#include "z64interface.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "lifemeter.h"
+#include "interface.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "save.h"
 
 void Interface_Destroy(PlayState* play) {
     Map_Destroy(play);
diff --git a/src/code/z_cutscene_spline.c b/src/code/z_cutscene_spline.c
index 137f9f544c..6ff03fdf91 100644
--- a/src/code/z_cutscene_spline.c
+++ b/src/code/z_cutscene_spline.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
-#include "z64math.h"
-#include "z64camera.h"
-#include "z64cutscene_spline.h"
+#include "z_math.h"
+#include "camera.h"
+#include "cutscene_spline.h"
 
 // The code in this file is very similar to a spline system used in Super Mario 64 for cutscene camera movement
 
diff --git a/src/code/z_debug.c b/src/code/z_debug.c
index af3c945b76..1f190748f1 100644
--- a/src/code/z_debug.c
+++ b/src/code/z_debug.c
@@ -9,7 +9,7 @@
 #include "regs.h"
 #include "rumble.h"
 #include "ultra64.h"
-#include "z64debug.h"
+#include "debug.h"
 
 #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0"
 
diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c
index 9d15663a67..1481e22fe7 100644
--- a/src/code/z_debug_display.c
+++ b/src/code/z_debug_display.c
@@ -1,8 +1,8 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64play.h"
-#include "z64debug_display.h"
+#include "play_state.h"
+#include "debug_display.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index d5135b99d1..5adc6ca48a 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -21,14 +21,14 @@
 #include "sfx.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64camera.h"
-#include "z64cutscene.h"
-#include "z64cutscene_flags.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "camera.h"
+#include "cutscene.h"
+#include "cutscene_flags.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/scenes/indoors/tokinoma/tokinoma_scene.h"
 
@@ -388,7 +388,8 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) {
 
         case CS_MISC_SHOW_TITLE_CARD:
             if (isFirstFrame) {
-                TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, player->giObjectSegment, 160, 120, 144, 24, 20);
+                TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, player->giObjectSegment, 160, 120,
+                                        PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 20);
             }
             break;
 
diff --git a/src/code/z_draw.c b/src/code/z_draw.c
index 4cb14f017a..f2c600f6a2 100644
--- a/src/code/z_draw.c
+++ b/src/code/z_draw.c
@@ -1,8 +1,8 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64draw.h"
-#include "z64play.h"
+#include "draw.h"
+#include "play_state.h"
 
 #include "assets/objects/object_gi_key/object_gi_key.h"
 #include "assets/objects/object_gi_jewel/object_gi_jewel.h"
diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c
index 6e2023b67d..a5df803229 100644
--- a/src/code/z_eff_blure.c
+++ b/src/code/z_eff_blure.c
@@ -6,8 +6,8 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c
index 865bd8ec93..051731fd87 100644
--- a/src/code/z_eff_shield_particle.c
+++ b/src/code/z_eff_shield_particle.c
@@ -5,10 +5,10 @@
 #include "printf.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64effect.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "light.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c
index 57ce3d9ba1..ae6a84c47d 100644
--- a/src/code/z_eff_spark.c
+++ b/src/code/z_eff_spark.c
@@ -5,9 +5,9 @@
 #include "printf.h"
 #include "sys_matrix.h"
 #include "translation.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c
index c752738725..b29cb0a32f 100644
--- a/src/code/z_eff_ss_dead.c
+++ b/src/code/z_eff_ss_dead.c
@@ -1,6 +1,6 @@
 #include "gfx.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 void func_80026230(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) {
     f32 cos;
diff --git a/src/code/z_effect.c b/src/code/z_effect.c
index c0a39cc4bd..a725cd3172 100644
--- a/src/code/z_effect.c
+++ b/src/code/z_effect.c
@@ -1,9 +1,9 @@
 #include "gfx.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64effect.h"
-#include "z64frame_advance.h"
-#include "z64play.h"
+#include "effect.h"
+#include "frame_advance.h"
+#include "play_state.h"
 
 EffectContext sEffectContext;
 
diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c
index 061b6d70da..363367a85c 100644
--- a/src/code/z_effect_soft_sprite.c
+++ b/src/code/z_effect_soft_sprite.c
@@ -5,9 +5,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "zelda_arena.h"
-#include "z64frame_advance.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "frame_advance.h"
+#include "effect.h"
+#include "play_state.h"
 
 EffectSsInfo sEffectSsInfo = { 0 }; // "EffectSS2Info"
 
diff --git a/src/code/z_effect_soft_sprite_dlftbls.c b/src/code/z_effect_soft_sprite_dlftbls.c
index 7c9e228f63..7a5f7e4e49 100644
--- a/src/code/z_effect_soft_sprite_dlftbls.c
+++ b/src/code/z_effect_soft_sprite_dlftbls.c
@@ -1,5 +1,5 @@
 #include "segment_symbols.h"
-#include "z64effect.h"
+#include "effect.h"
 
 // Linker symbol declarations (used in the table below)
 #define DEFINE_EFFECT_SS(name, _1) DECLARE_OVERLAY_SEGMENT(name)
diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c
index 1654ab3d0d..fea0102140 100644
--- a/src/code/z_effect_soft_sprite_old_init.c
+++ b/src/code/z_effect_soft_sprite_old_init.c
@@ -7,10 +7,10 @@
 #include "segmented_address.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "skin_matrix.h"
 
 #include "overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h"
 #include "overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h"
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c
index bb93099363..9eef37ef6c 100644
--- a/src/code/z_elf_message.c
+++ b/src/code/z_elf_message.c
@@ -1,10 +1,10 @@
-#include "libu64/debug.h"
 #include "rand.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64quest_hint.h"
-#include "z64quest_hint_commands.h"
-#include "z64save.h"
+#include "translation.h"
+#include "play_state.h"
+#include "player.h"
+#include "quest_hint.h"
+#include "quest_hint_commands.h"
+#include "save.h"
 
 QuestHintCmd sChildSariaQuestHints[] = {
     QUEST_HINT_STRENGTH_UPG(SKIP, 0, false, 3),
@@ -73,7 +73,7 @@ u32 QuestHint_CheckCondition(QuestHintCmd* hintCmd) {
             }
     }
 
-    LOG_STRING("企画外 条件", "../z_elf_message.c", 156); // "Unplanned conditions"
+    LOG_STRING_T("企画外 条件", "Unplanned conditions", "../z_elf_message.c", 156);
     ASSERT(0, "0", "../z_elf_message.c", 157);
 
     return false;
@@ -170,7 +170,7 @@ u16 QuestHint_GetTextIdFromScript(QuestHintCmd* hintCmd) {
                 return hintCmd->byte2 | 0x100;
 
             default:
-                LOG_STRING("企画外 条件", "../z_elf_message.c", 281); // "Unplanned conditions"
+                LOG_STRING_T("企画外 条件", "Unplanned conditions", "../z_elf_message.c", 281);
                 ASSERT(0, "0", "../z_elf_message.c", 282);
         }
 
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c
index 9b2bf7c0b7..12d31b4f0a 100644
--- a/src/code/z_en_a_keep.c
+++ b/src/code/z_en_a_keep.c
@@ -4,7 +4,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_d_hsblock/object_d_hsblock.h"
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index f0c627b250..43668baebb 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -12,12 +12,12 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64draw.h"
-#include "z64effect.h"
-#include "z64item.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "draw.h"
+#include "effect.h"
+#include "item.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_env_flags.c b/src/code/z_env_flags.c
index 164ff1dde4..858061d4f5 100644
--- a/src/code/z_env_flags.c
+++ b/src/code/z_env_flags.c
@@ -1,7 +1,7 @@
 #include "array_count.h"
 #include "ultra64.h"
-#include "z64cutscene_flags.h"
-#include "z64play.h"
+#include "cutscene_flags.h"
+#include "play_state.h"
 
 void CutsceneFlags_UnsetAll(PlayState* play) {
     u8 i;
diff --git a/src/code/z_face_reaction.c b/src/code/z_face_reaction.c
index ea6313a762..470c454b7d 100644
--- a/src/code/z_face_reaction.c
+++ b/src/code/z_face_reaction.c
@@ -1,6 +1,6 @@
 #include "ultra64.h"
-#include "z64face_reaction.h"
-#include "z64player.h"
+#include "face_reaction.h"
+#include "player.h"
 
 u16 sMaskReactionSetTextIds[MASK_REACTION_SET_MAX][PLAYER_MASK_MAX] = {
     // MASK_REACTION_SET_CARPENTER_BOSS
diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c
index 2621f1c129..b37c4aeb39 100644
--- a/src/code/z_fbdemo.c
+++ b/src/code/z_fbdemo.c
@@ -16,8 +16,8 @@
 #include "libu64/debug.h"
 #include "gfx.h"
 #include "printf.h"
-#include "z64math.h"
-#include "z64transition_instances.h"
+#include "z_math.h"
+#include "transition_instances.h"
 
 // color framebuffer
 extern u16 D_0F000000[];
diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c
index d8aa81df06..0a7dabdd6b 100644
--- a/src/code/z_fbdemo_circle.c
+++ b/src/code/z_fbdemo_circle.c
@@ -3,7 +3,7 @@
 #include "color.h"
 #include "gfx.h"
 #include "sfx.h"
-#include "z64transition.h"
+#include "transition.h"
 
 typedef enum TransitionCircleDirection {
     /* 0 */ TRANS_CIRCLE_DIR_IN,
diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c
index 1be97d5f51..4798a225a8 100644
--- a/src/code/z_fbdemo_fade.c
+++ b/src/code/z_fbdemo_fade.c
@@ -6,8 +6,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64save.h"
-#include "z64transition_instances.h"
+#include "save.h"
+#include "transition_instances.h"
 
 typedef enum TransitionFadeDirection {
     /* 0 */ TRANS_FADE_DIR_IN,
diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c
index 6624a4373c..b1a5b2e679 100644
--- a/src/code/z_fbdemo_triforce.c
+++ b/src/code/z_fbdemo_triforce.c
@@ -1,8 +1,8 @@
 #include "transition_triforce.h"
 
 #include "printf.h"
-#include "z64math.h"
-#include "z64transition_instances.h"
+#include "z_math.h"
+#include "transition_instances.h"
 
 #include "assets/code/fbdemo_triforce/code.c"
 
diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c
index 25b45e7e2c..6a5dd62e5c 100644
--- a/src/code/z_fbdemo_wipe1.c
+++ b/src/code/z_fbdemo_wipe1.c
@@ -1,8 +1,8 @@
 #include "transition_wipe.h"
 
 #include "gfx.h"
-#include "z64save.h"
-#include "z64transition_instances.h"
+#include "save.h"
+#include "transition_instances.h"
 
 typedef enum TransitionWipeDirection {
     /* 0 */ TRANS_WIPE_DIR_IN,
diff --git a/src/code/z_fcurve_data.c b/src/code/z_fcurve_data.c
index a1950a568b..774f4137f7 100644
--- a/src/code/z_fcurve_data.c
+++ b/src/code/z_fcurve_data.c
@@ -2,7 +2,7 @@
  * File: z_fcurve_data.c
  * Description: Interpolation functions for use with Curve SkelAnime
  */
-#include "z64curve.h"
+#include "curve.h"
 
 #define FCURVE_INTERP_CUBIC 0  // Interpolate using a Hermite cubic spline
 #define FCURVE_INTERP_NONE 1   // Return the value at the left endpoint instead of interpolating
diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c
index e5d1f1fbb3..da1325ee17 100644
--- a/src/code/z_fcurve_data_skelanime.c
+++ b/src/code/z_fcurve_data_skelanime.c
@@ -32,9 +32,9 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "zelda_arena.h"
-#include "z64actor.h"
-#include "z64curve.h"
-#include "z64play.h"
+#include "actor.h"
+#include "curve.h"
+#include "play_state.h"
 
 void SkelCurve_Clear(SkelCurve* skelCurve) {
     skelCurve->limbCount = 0;
diff --git a/src/code/z_frame_advance.c b/src/code/z_frame_advance.c
index 6ca410a759..05d839539a 100644
--- a/src/code/z_frame_advance.c
+++ b/src/code/z_frame_advance.c
@@ -1,4 +1,4 @@
-#include "z64frame_advance.h"
+#include "frame_advance.h"
 
 #include "stdbool.h"
 
diff --git a/src/code/z_game_dlftbls.c b/src/code/z_game_dlftbls.c
index 57efe90dfc..84fca6ba63 100644
--- a/src/code/z_game_dlftbls.c
+++ b/src/code/z_game_dlftbls.c
@@ -5,7 +5,7 @@
 #include "setup_state.h"
 #include "title_setup_state.h"
 #include "z_game_dlftbls.h"
-#include "z64play.h"
+#include "play_state.h"
 
 // Linker symbol declarations (used in the table below)
 #define DEFINE_GAMESTATE(typeName, enumName, name) DECLARE_OVERLAY_SEGMENT(name)
diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c
index f73616116d..12d94eaa3a 100644
--- a/src/code/z_game_over.c
+++ b/src/code/z_game_over.c
@@ -4,9 +4,9 @@
 #include "rumble.h"
 #include "sequence.h"
 #include "versions.h"
-#include "z64game_over.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "game_over.h"
+#include "play_state.h"
+#include "save.h"
 
 void GameOver_Init(PlayState* play) {
     play->gameOverCtx.state = GAMEOVER_INACTIVE;
diff --git a/src/code/z_horse.c b/src/code/z_horse.c
index d61af32e7e..ab556c3d13 100644
--- a/src/code/z_horse.c
+++ b/src/code/z_horse.c
@@ -4,10 +4,10 @@
 #include "printf.h"
 #include "regs.h"
 #include "translation.h"
-#include "z64horse.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "horse.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 
 /**
diff --git a/src/code/z_inventory.c b/src/code/z_inventory.c
index c31d4d926f..8ae2bcbf20 100644
--- a/src/code/z_inventory.c
+++ b/src/code/z_inventory.c
@@ -1,9 +1,9 @@
 #include "ultra64.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/textures/icon_item_static/icon_item_static.h"
 #include "assets/textures/icon_item_24_static/icon_item_24_static.h"
diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c
index d9bca732e5..63bc6e0fdc 100644
--- a/src/code/z_kaleido_manager.c
+++ b/src/code/z_kaleido_manager.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #define KALEIDO_OVERLAY(name, nameString) \
     { NULL, ROM_FILE(ovl_##name), _ovl_##name##SegmentStart, _ovl_##name##SegmentEnd, 0, nameString, }
diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c
index 1e225eb670..73d3b20dbf 100644
--- a/src/code/z_kaleido_scope_call.c
+++ b/src/code/z_kaleido_scope_call.c
@@ -8,7 +8,7 @@
 #include "regs.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64play.h"
+#include "play_state.h"
 
 void (*sKaleidoScopeUpdateFunc)(PlayState* play);
 void (*sKaleidoScopeDrawFunc)(PlayState* play);
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c
index 9d84212828..31d5ddea34 100644
--- a/src/code/z_kaleido_setup.c
+++ b/src/code/z_kaleido_setup.c
@@ -5,9 +5,9 @@
 #endif
 #include "printf.h"
 #include "regs.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "audio.h"
+#include "play_state.h"
+#include "save.h"
 
 /*
  * The following three arrays are effectively unused.
diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c
index 89f5bbd3b7..280bfa3df8 100644
--- a/src/code/z_kanfont.c
+++ b/src/code/z_kanfont.c
@@ -4,9 +4,9 @@
 #include "segment_symbols.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64dma.h"
-#include "z64font.h"
-#include "z64message.h"
+#include "dma.h"
+#include "font.h"
+#include "message.h"
 
 /**
  * Loads a texture from kanji for the requested `character` into the character texture buffer
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index c78fc5de87..bdb35093b2 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -24,13 +24,13 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64cutscene.h"
-#include "z64frame_advance.h"
-#include "z64environment.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "cutscene.h"
+#include "frame_advance.h"
+#include "environment.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
@@ -238,7 +238,7 @@ s16 sLightningFlashAlpha;
 s16 sSunDepthTestX;
 s16 sSunDepthTestY;
 
-#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:192 pal-1.1:192"
 
 LightNode* sNGameOverLightNode;
diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c
index cab9737ff7..8ebefa7e62 100644
--- a/src/code/z_lifemeter.c
+++ b/src/code/z_lifemeter.c
@@ -3,10 +3,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64lifemeter.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "lifemeter.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 
diff --git a/src/code/z_lights.c b/src/code/z_lights.c
index d0b003f77c..4059faacaa 100644
--- a/src/code/z_lights.c
+++ b/src/code/z_lights.c
@@ -3,8 +3,8 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64light.h"
-#include "z64play.h"
+#include "light.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_map_data.c b/src/code/z_map_data.c
index 502eb43c3c..f2c204c07f 100644
--- a/src/code/z_map_data.c
+++ b/src/code/z_map_data.c
@@ -1,5 +1,5 @@
 #include "map.h"
-#include "z64save.h"
+#include "save.h"
 
 static s16 sFloorTexIndexOffset[10][8] = {
     { 0, 0, 0, 0, 2, 4, 6, 8 }, { 0, 0, 0, 0, 0, 0, 0, 2 },
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c
index e46c70bd10..ba6cb77f0a 100644
--- a/src/code/z_map_exp.c
+++ b/src/code/z_map_exp.c
@@ -12,10 +12,10 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64map_mark.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "map_mark.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/textures/parameter_static/parameter_static.h"
diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c
index 402d942d66..5abc554de4 100644
--- a/src/code/z_map_mark.c
+++ b/src/code/z_map_mark.c
@@ -10,9 +10,9 @@
 #include "segment_symbols.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64map_mark.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "map_mark.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 1d6fee156b..1fc06d7407 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -18,11 +18,11 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 
diff --git a/src/code/z_olib.c b/src/code/z_olib.c
index 66c767f68b..1ee420025b 100644
--- a/src/code/z_olib.c
+++ b/src/code/z_olib.c
@@ -1,6 +1,6 @@
-#include "z64math.h"
+#include "z_math.h"
 #include "libc64/math64.h"
-#include "z64olib.h"
+#include "olib.h"
 #include "z_lib.h"
 
 /**
diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c
index 94c3bc9e11..12dc2d2568 100644
--- a/src/code/z_onepointdemo.c
+++ b/src/code/z_onepointdemo.c
@@ -9,10 +9,10 @@
 #include "terminal.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64olib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "olib.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 #include "overlays/actors/ovl_En_Sw/z_en_sw.h"
 
 static s16 sDisableAttention = false;
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 6ae3959c86..7c97802888 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -17,13 +17,13 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64lifemeter.h"
-#include "z64horse.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "lifemeter.h"
+#include "horse.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 #include "assets/textures/do_action_static/do_action_static.h"
diff --git a/src/code/z_path.c b/src/code/z_path.c
index 29b51a8f17..f025f04499 100644
--- a/src/code/z_path.c
+++ b/src/code/z_path.c
@@ -1,9 +1,9 @@
 #include "ultra64.h"
 #include "libc64/math64.h"
 #include "segmented_address.h"
-#include "z64actor.h"
-#include "z64path.h"
-#include "z64play.h"
+#include "actor.h"
+#include "path.h"
+#include "play_state.h"
 
 Path* Path_GetByIndex(PlayState* play, s16 index, s16 max) {
     Path* path;
diff --git a/src/code/z_play.c b/src/code/z_play.c
index d4d28422c3..590680da25 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -36,16 +36,16 @@
 #include "versions.h"
 #include "z_actor_dlftbls.h"
 #include "zelda_arena.h"
-#include "z64audio.h"
-#include "z64cutscene_flags.h"
-#include "z64debug_display.h"
-#include "z64effect.h"
-#include "z64frame_advance.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
-#include "z64vis.h"
+#include "audio.h"
+#include "cutscene_flags.h"
+#include "debug_display.h"
+#include "effect.h"
+#include "frame_advance.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
+#include "vis.h"
 
 #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:224" \
                                "ntsc-1.0:240 ntsc-1.1:240 ntsc-1.2:240 pal-1.0:240 pal-1.1:240"
@@ -895,8 +895,8 @@ void Play_Update(PlayState* this) {
                         this->envCtx.sandstormState = SANDSTORM_DISSIPATE;
                         this->envCtx.sandstormPrimA = 255;
                         this->envCtx.sandstormEnvA = 255;
-                        // "It's here!!!!!!!!!"
-                        LOG_STRING("来た!!!!!!!!!!!!!!!!!!!!!", "../z_play.c", 3471);
+                        LOG_STRING_T("来た!!!!!!!!!!!!!!!!!!!!!", "It's here!!!!!!!!!!!!!!!!!!!!!", "../z_play.c",
+                                     3471);
                         this->transitionMode = TRANS_MODE_SANDSTORM_END;
                     } else {
                         this->transitionMode = TRANS_MODE_SANDSTORM_INIT;
diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c
index eb52aff798..5838188ab6 100644
--- a/src/code/z_player_call.c
+++ b/src/code/z_player_call.c
@@ -1,8 +1,8 @@
 #include "kaleido_manager.h"
-#include "z64actor.h"
-#include "z64actor_profile.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "actor.h"
+#include "actor_profile.h"
+#include "play_state.h"
+#include "player.h"
 
 #define FLAGS                                                                                 \
     (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 3ce2143c5b..7358db96d5 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -6,12 +6,12 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64draw.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "draw.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_link_boy/object_link_boy.h"
diff --git a/src/code/z_quake.c b/src/code/z_quake.c
index d3ba17810d..18ebfbcc38 100644
--- a/src/code/z_quake.c
+++ b/src/code/z_quake.c
@@ -4,8 +4,8 @@
 #include "quake.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64olib.h"
-#include "z64play.h"
+#include "olib.h"
+#include "play_state.h"
 
 typedef struct QuakeRequest {
     /* 0x00 */ s16 index;
diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c
index 6228b51cf1..135ffa8876 100644
--- a/src/code/z_rcp.c
+++ b/src/code/z_rcp.c
@@ -5,7 +5,7 @@
 #include "letterbox.h"
 #include "main.h"
 #include "regs.h"
-#include "z64play.h"
+#include "play_state.h"
 
 Gfx sSetupDL[SETUPDL_MAX][6] = {
     {
diff --git a/src/code/z_room.c b/src/code/z_room.c
index 7bc9e4801d..5549922b6a 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -19,12 +19,12 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64room.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
+#include "room.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 Vec3f D_801270A0 = { 0.0f, 0.0f, 0.0f };
 
diff --git a/src/code/z_rumble.c b/src/code/z_rumble.c
index fc811cfccb..fcc39adee8 100644
--- a/src/code/z_rumble.c
+++ b/src/code/z_rumble.c
@@ -13,7 +13,7 @@
  */
 #include "rumble.h"
 #include "padmgr.h"
-#include "z64math.h"
+#include "z_math.h"
 
 static s32 sUnused[4];
 RumbleMgr sRumbleMgr;
diff --git a/src/code/z_sample.c b/src/code/z_sample.c
index 63e0836bbc..dc7c4836b0 100644
--- a/src/code/z_sample.c
+++ b/src/code/z_sample.c
@@ -4,8 +4,8 @@
 #include "regs.h"
 #include "sample_state.h"
 #include "segment_symbols.h"
-#include "z64dma.h"
-#include "z64play.h"
+#include "dma.h"
+#include "play_state.h"
 
 void Sample_HandleStateChange(SampleState* this) {
     if (CHECK_BTN_ALL(this->state.input[0].press.button, BTN_START)) {
diff --git a/src/code/z_scene.c b/src/code/z_scene.c
index feef5ffc62..65503d0ccb 100644
--- a/src/code/z_scene.c
+++ b/src/code/z_scene.c
@@ -11,10 +11,10 @@
 #include "versions.h"
 #include "z_actor_dlftbls.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
-#include "z64scene.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
+#include "scene.h"
 
 SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX];
 RomFile sNaviQuestHintFiles[];
diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c
index 5e096a262e..97741c50b6 100644
--- a/src/code/z_scene_table.c
+++ b/src/code/z_scene_table.c
@@ -11,10 +11,10 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64frame_advance.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "frame_advance.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/scenes/indoors/miharigoya/miharigoya_scene.h"
 #include "assets/scenes/indoors/souko/souko_scene.h"
diff --git a/src/code/z_sfx_source.c b/src/code/z_sfx_source.c
index 785afcde35..2aaadeb365 100644
--- a/src/code/z_sfx_source.c
+++ b/src/code/z_sfx_source.c
@@ -1,9 +1,9 @@
-#include "z64sfx_source.h"
+#include "sfx_source.h"
 
 #include "array_count.h"
 #include "sfx.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 void SfxSource_InitAll(PlayState* play) {
     SfxSource* sources = &play->sfxSources[0];
diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index 4e4fd97e9a..10e0df1a44 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -10,9 +10,9 @@
 #include "translation.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
-#include "z64animation.h"
-#include "z64animation_legacy.h"
-#include "z64play.h"
+#include "animation.h"
+#include "animation_legacy.h"
+#include "play_state.h"
 
 #define ANIM_INTERP 1
 
diff --git a/src/code/z_skin.c b/src/code/z_skin.c
index 7861acb897..e5ddf71f46 100644
--- a/src/code/z_skin.c
+++ b/src/code/z_skin.c
@@ -1,10 +1,10 @@
 #include "gfx.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64math.h"
-#include "z64play.h"
-#include "z64skin.h"
-#include "z64skin_matrix.h"
+#include "z_math.h"
+#include "play_state.h"
+#include "skin.h"
+#include "skin_matrix.h"
 
 MtxF gSkinLimbMatrices[60]; // holds matrices for each limb of the skeleton currently being drawn
 
diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c
index 196ce9aae4..c6ddc1a793 100644
--- a/src/code/z_skin_awb.c
+++ b/src/code/z_skin_awb.c
@@ -1,10 +1,10 @@
 #include "array_count.h"
 #include "segmented_address.h"
 #include "zelda_arena.h"
-#include "z64actor.h"
-#include "z64play.h"
-#include "z64skin.h"
-#include "z64skin_matrix.h"
+#include "actor.h"
+#include "play_state.h"
+#include "skin.h"
+#include "skin_matrix.h"
 
 #include "overlays/actors/ovl_En_fHG/z_en_fhg.h"
 
diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c
index 36d7a02791..1dbb9a26b0 100644
--- a/src/code/z_skin_matrix.c
+++ b/src/code/z_skin_matrix.c
@@ -1,4 +1,4 @@
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 #include "gfx.h"
 #include "printf.h"
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index 2eef6db036..17bfb5baa4 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -1,4 +1,4 @@
-#include "z64sram.h"
+#include "sram.h"
 
 #include "array_count.h"
 #include "file_select_state.h"
@@ -8,14 +8,14 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64game.h"
-#include "z64interface.h"
-#include "z64message.h"
-#include "z64ocarina.h"
-#include "z64save.h"
-#include "z64scene.h"
-#include "z64ss_sram.h"
+#include "audio.h"
+#include "game.h"
+#include "interface.h"
+#include "message.h"
+#include "ocarina.h"
+#include "save.h"
+#include "scene.h"
+#include "ss_sram.h"
 
 #define SLOT_SIZE (sizeof(SaveContext) + 0x28)
 #define CHECKSUM_SIZE (sizeof(Save) / 2)
diff --git a/src/code/z_ss_sram.c b/src/code/z_ss_sram.c
index 94e97639aa..de13b321d2 100644
--- a/src/code/z_ss_sram.c
+++ b/src/code/z_ss_sram.c
@@ -1,6 +1,6 @@
 #include "ultra64.h"
 #include "printf.h"
-#include "z64ss_sram.h"
+#include "ss_sram.h"
 
 typedef struct SsSramContext {
     /* 0x00 */ OSPiHandle piHandle;
diff --git a/src/code/z_view.c b/src/code/z_view.c
index 6fe82aaeb3..4c37194cfd 100644
--- a/src/code/z_view.c
+++ b/src/code/z_view.c
@@ -1,4 +1,4 @@
-#include "z64view.h"
+#include "view.h"
 
 #include "libc64/malloc.h"
 #include "libu64/debug.h"
diff --git a/src/code/z_viscvg.c b/src/code/z_viscvg.c
index 51fc6f8e5d..1616b661c0 100644
--- a/src/code/z_viscvg.c
+++ b/src/code/z_viscvg.c
@@ -21,7 +21,7 @@
  */
 
 #include "gfx.h"
-#include "z64vis.h"
+#include "vis.h"
 
 /**
  * Draws only coverage: does not retain any of the original pixel RGB, primColor is used as background color.
diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c
index 517f2ada60..632d00a6e7 100644
--- a/src/code/z_vismono.c
+++ b/src/code/z_vismono.c
@@ -13,7 +13,7 @@
 #include "attributes.h"
 #include "gfx.h"
 #include "gfxalloc.h"
-#include "z64vis.h"
+#include "vis.h"
 
 // Height of the fragments the color frame buffer (CFB) is split into.
 // It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into
diff --git a/src/code/z_viszbuf.c b/src/code/z_viszbuf.c
index 431d7f6d9a..aa72289742 100644
--- a/src/code/z_viszbuf.c
+++ b/src/code/z_viszbuf.c
@@ -33,7 +33,7 @@
  */
 
 #include "gfx.h"
-#include "z64vis.h"
+#include "vis.h"
 
 // Height of the fragments the z-buffer is split into.
 // It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into TMEM.
diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c
index 2fa2122acf..3387db500f 100644
--- a/src/code/z_vr_box.c
+++ b/src/code/z_vr_box.c
@@ -1,14 +1,14 @@
-#include "z64skybox.h"
+#include "skybox.h"
 
 #include "array_count.h"
 #include "printf.h"
 #include "segment_symbols.h"
 #include "terminal.h"
 #include "ultra64.h"
-#include "z64environment.h"
-#include "z64game.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "environment.h"
+#include "game.h"
+#include "play_state.h"
+#include "save.h"
 
 typedef struct SkyboxFaceParams {
     /* 0x000 */ s32 xStart;
diff --git a/src/code/z_vr_box_draw.c b/src/code/z_vr_box_draw.c
index aa7fa1dae0..46c38291f6 100644
--- a/src/code/z_vr_box_draw.c
+++ b/src/code/z_vr_box_draw.c
@@ -1,7 +1,7 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64skybox.h"
+#include "skybox.h"
 
 Mtx* sSkyboxDrawMatrix;
 
diff --git a/src/dmadata/dmadata.c b/src/dmadata/dmadata.c
index 93ea2b4d33..eff05f171b 100644
--- a/src/dmadata/dmadata.c
+++ b/src/dmadata/dmadata.c
@@ -1,4 +1,4 @@
-#include "z64dma.h"
+#include "dma.h"
 
 // Linker symbol declarations (used in the table below)
 #define DEFINE_DMA_ENTRY(name, _1)        \
diff --git a/src/elf_message/elf_message_field.c b/src/elf_message/elf_message_field.c
index 8c672ad50b..5488c7d3e5 100644
--- a/src/elf_message/elf_message_field.c
+++ b/src/elf_message/elf_message_field.c
@@ -1,5 +1,5 @@
-#include "z64quest_hint_commands.h"
-#include "z64save.h"
+#include "quest_hint_commands.h"
+#include "save.h"
 
 QuestHintCmd gOverworldNaviQuestHints[] = {
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_05, false, 0x40),
diff --git a/src/elf_message/elf_message_ydan.c b/src/elf_message/elf_message_ydan.c
index cde6410b22..4ba3559021 100644
--- a/src/elf_message/elf_message_ydan.c
+++ b/src/elf_message/elf_message_ydan.c
@@ -1,4 +1,4 @@
-#include "z64quest_hint_commands.h"
+#include "quest_hint_commands.h"
 
 QuestHintCmd gDungeonNaviQuestHints[] = {
     QUEST_HINT_END(0x5F),
diff --git a/src/libc64/malloc.c b/src/libc64/malloc.c
index 8b9c9b6705..6dc183dc14 100644
--- a/src/libc64/malloc.c
+++ b/src/libc64/malloc.c
@@ -41,7 +41,7 @@ void* SystemArena_Malloc(u32 size) {
     ptr = __osMalloc(&gSystemArena, size);
     RESTORE_INTERRUPTS();
 
-    SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc", "確保"); // "Secure"
+    SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc", T("確保", "Secure"));
     return ptr;
 }
 
@@ -54,7 +54,7 @@ void* SystemArena_MallocDebug(u32 size, const char* file, int line) {
     ptr = __osMallocDebug(&gSystemArena, size, file, line);
     RESTORE_INTERRUPTS();
 
-    SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_DEBUG", "確保"); // "Secure"
+    SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_DEBUG", T("確保", "Secure"));
     return ptr;
 }
 #endif
@@ -67,7 +67,7 @@ void* SystemArena_MallocR(u32 size) {
     ptr = __osMallocR(&gSystemArena, size);
     RESTORE_INTERRUPTS();
 
-    SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_r", "確保"); // "Secure"
+    SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_r", T("確保", "Secure"));
     return ptr;
 }
 
@@ -80,7 +80,7 @@ void* SystemArena_MallocRDebug(u32 size, const char* file, int line) {
     ptr = __osMallocRDebug(&gSystemArena, size, file, line);
     RESTORE_INTERRUPTS();
 
-    SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_r_DEBUG", "確保"); // "Secure"
+    SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_r_DEBUG", T("確保", "Secure"));
     return ptr;
 }
 #endif
@@ -92,7 +92,7 @@ void* SystemArena_Realloc(void* ptr, u32 newSize) {
     ptr = __osRealloc(&gSystemArena, ptr, newSize);
     RESTORE_INTERRUPTS();
 
-    SYSTEM_ARENA_CHECK_POINTER(ptr, newSize, "realloc", "再確保"); // "Re-securing"
+    SYSTEM_ARENA_CHECK_POINTER(ptr, newSize, "realloc", T("再確保", "Re-secure"));
     return ptr;
 }
 
@@ -104,7 +104,7 @@ void* SystemArena_ReallocDebug(void* ptr, u32 newSize, const char* file, int lin
     ptr = __osReallocDebug(&gSystemArena, ptr, newSize, file, line);
     RESTORE_INTERRUPTS();
 
-    SYSTEM_ARENA_CHECK_POINTER(ptr, newSize, "realloc_DEBUG", "再確保"); // "Re-securing"
+    SYSTEM_ARENA_CHECK_POINTER(ptr, newSize, "realloc_DEBUG", T("再確保", "Re-secure"));
     return ptr;
 }
 #endif
@@ -140,7 +140,7 @@ void* SystemArena_Calloc(u32 num, u32 size) {
         bzero(ret, n);
     }
 
-    SYSTEM_ARENA_CHECK_POINTER(ret, n, "calloc", "確保");
+    SYSTEM_ARENA_CHECK_POINTER(ret, n, "calloc", T("確保", "Secure"));
     return ret;
 }
 
diff --git a/src/libc64/math64.c b/src/libc64/math64.c
index b51eb333ed..964dc3c8a4 100644
--- a/src/libc64/math64.c
+++ b/src/libc64/math64.c
@@ -1,5 +1,5 @@
 #include "libc64/math64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 #if !PLATFORM_N64
 s32 gUseAtanContFrac;
diff --git a/src/libc64/qrand.c b/src/libc64/qrand.c
index 69bfa11d72..dafddc864f 100644
--- a/src/libc64/qrand.c
+++ b/src/libc64/qrand.c
@@ -42,7 +42,7 @@
  * @note Original name: qrand.c
  */
 #include "libc64/qrand.h"
-#include "z64math.h"
+#include "z_math.h"
 
 #define RAND_MULTIPLIER 1664525
 #define RAND_INCREMENT 1013904223
diff --git a/src/libu64/load_gc.c b/src/libu64/load_gc.c
index 340780a130..e99c83d1df 100644
--- a/src/libu64/load_gc.c
+++ b/src/libu64/load_gc.c
@@ -2,7 +2,7 @@
 #include "ultra64.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64dma.h"
+#include "dma.h"
 
 size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd, void* allocatedRamAddr) {
     s32 pad[3];
diff --git a/src/libu64/loadfragment2_n64.c b/src/libu64/loadfragment2_n64.c
index be0e5295d9..72ecabaf37 100644
--- a/src/libu64/loadfragment2_n64.c
+++ b/src/libu64/loadfragment2_n64.c
@@ -9,7 +9,7 @@
 #include "libc64/malloc.h"
 #include "libu64/overlay.h"
 #include "translation.h"
-#include "z64dma.h"
+#include "dma.h"
 
 s32 gOverlayLogSeverity = 2;
 
diff --git a/src/libultra/gu/cosf.c b/src/libultra/gu/cosf.c
index f217eec13a..4d4f13fbe8 100644
--- a/src/libultra/gu/cosf.c
+++ b/src/libultra/gu/cosf.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64math.h" // TODO: libultra should not have access to game-side headers
+#include "z_math.h" // TODO: libultra should not have access to game-side headers
 
 static const du P[] = {
     { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 },
diff --git a/src/libultra/gu/lookat.c b/src/libultra/gu/lookat.c
index 8d1df6bbe1..c30a259bf1 100644
--- a/src/libultra/gu/lookat.c
+++ b/src/libultra/gu/lookat.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64math.h" // TODO: libultra should not have access to game-side headers
+#include "z_math.h" // TODO: libultra should not have access to game-side headers
 
 void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp) {
     f32 length;
diff --git a/src/libultra/gu/normalize.c b/src/libultra/gu/normalize.c
index 8b20110c8c..b954069f96 100644
--- a/src/libultra/gu/normalize.c
+++ b/src/libultra/gu/normalize.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64math.h" // TODO: libultra should not have access to game-side headers
+#include "z_math.h" // TODO: libultra should not have access to game-side headers
 
 void guNormalize(f32* x, f32* y, f32* z) {
     f32 m = 1 / sqrtf(SQ(*x) + SQ(*y) + SQ(*z));
diff --git a/src/libultra/gu/sinf.c b/src/libultra/gu/sinf.c
index 23013731c4..64f850efbd 100644
--- a/src/libultra/gu/sinf.c
+++ b/src/libultra/gu/sinf.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64math.h" // TODO: libultra should not have access to game-side headers
+#include "z_math.h" // TODO: libultra should not have access to game-side headers
 
 static const du P[] = {
     { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 },
diff --git a/src/n64dd/z_n64dd.c b/src/n64dd/z_n64dd.c
index 4b750514df..ea1b73249e 100644
--- a/src/n64dd/z_n64dd.c
+++ b/src/n64dd/z_n64dd.c
@@ -13,8 +13,8 @@
 #include "stackcheck.h"
 #include "sys_freeze.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64thread.h"
+#include "audio.h"
+#include "thread.h"
 
 #pragma increment_block_number "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"
 
diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
index 9ca642d4e9..62594850af 100644
--- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
+++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
@@ -7,8 +7,8 @@
 #include "sfx.h"
 #include "sys_math.h"
 #include "sys_matrix.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 #include "z_lib.h"
 
 #include "assets/objects/object_link_boy/object_link_boy.h"
diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h
index ad50194506..d06019f040 100644
--- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h
+++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h
@@ -2,8 +2,8 @@
 #define Z_ARMS_HOOK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64player.h"
+#include "actor.h"
+#include "player.h"
 
 struct ArmsHook;
 
diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
index a92c226117..664e00223b 100644
--- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
+++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
@@ -7,14 +7,15 @@
 #include "z_arrow_fire.h"
 #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
 
-#include "libu64/debug.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
 #include "sfx.h"
 #include "sys_matrix.h"
+#include "tex_len.h"
+#include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
@@ -27,7 +28,29 @@ void ArrowFire_Charge(ArrowFire* this, PlayState* play);
 void ArrowFire_Fly(ArrowFire* this, PlayState* play);
 void ArrowFire_Hit(ArrowFire* this, PlayState* play);
 
-#include "assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c"
+#define s1Tex_WIDTH 32
+#define s1Tex_HEIGHT 64
+static u64 s1Tex[TEX_LEN(u64, s1Tex_WIDTH, s1Tex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_Arrow_Fire/s1Tex.i8.inc.c"
+};
+
+#define s2Tex_WIDTH 32
+#define s2Tex_HEIGHT 64
+static u64 s2Tex[TEX_LEN(u64, s2Tex_WIDTH, s2Tex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_Arrow_Fire/s2Tex.i8.inc.c"
+};
+
+static Vtx sVtx[] = {
+#include "assets/overlays/ovl_Arrow_Fire/sVtx.inc.c"
+};
+
+static Gfx sMaterialDL[22] = {
+#include "assets/overlays/ovl_Arrow_Fire/sMaterialDL.inc.c"
+};
+
+static Gfx sModelDL[24] = {
+#include "assets/overlays/ovl_Arrow_Fire/sModelDL.inc.c"
+};
 
 ActorProfile Arrow_Fire_Profile = {
     /**/ ACTOR_ARROW_FIRE,
@@ -64,7 +87,7 @@ void ArrowFire_Init(Actor* thisx, PlayState* play) {
 
 void ArrowFire_Destroy(Actor* thisx, PlayState* play) {
     Magic_Reset(play);
-    LOG_STRING("消滅", "../z_arrow_fire.c", 421); // "Disappearance"
+    LOG_STRING_T("消滅", "Disappearance", "../z_arrow_fire.c", 421);
 }
 
 void ArrowFire_Charge(ArrowFire* this, PlayState* play) {
diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h
index a04b496a11..395946c6f6 100644
--- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h
+++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h
@@ -2,7 +2,7 @@
 #define Z_ARROW_FIRE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ArrowFire;
 
diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
index 953e0a333c..b8a064f9b9 100644
--- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
+++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
@@ -7,14 +7,15 @@
 #include "z_arrow_ice.h"
 #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
 
-#include "libu64/debug.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
 #include "sfx.h"
 #include "sys_matrix.h"
+#include "tex_len.h"
+#include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
@@ -27,7 +28,29 @@ void ArrowIce_Charge(ArrowIce* this, PlayState* play);
 void ArrowIce_Fly(ArrowIce* this, PlayState* play);
 void ArrowIce_Hit(ArrowIce* this, PlayState* play);
 
-#include "assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c"
+#define s1Tex_WIDTH 32
+#define s1Tex_HEIGHT 64
+static u64 s1Tex[TEX_LEN(u64, s1Tex_WIDTH, s1Tex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_Arrow_Ice/s1Tex.i8.inc.c"
+};
+
+#define s2Tex_WIDTH 32
+#define s2Tex_HEIGHT 64
+static u64 s2Tex[TEX_LEN(u64, s2Tex_WIDTH, s2Tex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_Arrow_Ice/s2Tex.i8.inc.c"
+};
+
+static Vtx sVtx[] = {
+#include "assets/overlays/ovl_Arrow_Ice/sVtx.inc.c"
+};
+
+static Gfx sMaterialDL[22] = {
+#include "assets/overlays/ovl_Arrow_Ice/sMaterialDL.inc.c"
+};
+
+static Gfx sModelDL[24] = {
+#include "assets/overlays/ovl_Arrow_Ice/sModelDL.inc.c"
+};
 
 ActorProfile Arrow_Ice_Profile = {
     /**/ ACTOR_ARROW_ICE,
@@ -64,7 +87,7 @@ void ArrowIce_Init(Actor* thisx, PlayState* play) {
 
 void ArrowIce_Destroy(Actor* thisx, PlayState* play) {
     Magic_Reset(play);
-    LOG_STRING("消滅", "../z_arrow_ice.c", 415); // "Disappearance"
+    LOG_STRING_T("消滅", "Disappearance", "../z_arrow_ice.c", 415);
 }
 
 void ArrowIce_Charge(ArrowIce* this, PlayState* play) {
diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
index 7494aefa9d..f0094550c6 100644
--- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
+++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
@@ -2,7 +2,7 @@
 #define Z_ARROW_ICE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ArrowIce;
 
diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
index 100b8c20c1..51e3fdb42b 100644
--- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
+++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
@@ -7,14 +7,15 @@
 #include "z_arrow_light.h"
 #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
 
-#include "libu64/debug.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
 #include "sfx.h"
 #include "sys_matrix.h"
+#include "tex_len.h"
+#include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
@@ -27,7 +28,29 @@ void ArrowLight_Charge(ArrowLight* this, PlayState* play);
 void ArrowLight_Fly(ArrowLight* this, PlayState* play);
 void ArrowLight_Hit(ArrowLight* this, PlayState* play);
 
-#include "assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.c"
+#define s1Tex_WIDTH 32
+#define s1Tex_HEIGHT 64
+static u64 s1Tex[TEX_LEN(u64, s1Tex_WIDTH, s1Tex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_Arrow_Light/s1Tex.i8.inc.c"
+};
+
+#define s2Tex_WIDTH 32
+#define s2Tex_HEIGHT 64
+static u64 s2Tex[TEX_LEN(u64, s2Tex_WIDTH, s2Tex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_Arrow_Light/s2Tex.i8.inc.c"
+};
+
+static Vtx sVtx[] = {
+#include "assets/overlays/ovl_Arrow_Light/sVtx.inc.c"
+};
+
+static Gfx sMaterialDL[22] = {
+#include "assets/overlays/ovl_Arrow_Light/sMaterialDL.inc.c"
+};
+
+static Gfx sModelDL[24] = {
+#include "assets/overlays/ovl_Arrow_Light/sModelDL.inc.c"
+};
 
 ActorProfile Arrow_Light_Profile = {
     /**/ ACTOR_ARROW_LIGHT,
@@ -64,7 +87,7 @@ void ArrowLight_Init(Actor* thisx, PlayState* play) {
 
 void ArrowLight_Destroy(Actor* thisx, PlayState* play) {
     Magic_Reset(play);
-    LOG_STRING("消滅", "../z_arrow_light.c", 403); // "Disappearance"
+    LOG_STRING_T("消滅", "Disappearance", "../z_arrow_light.c", 403);
 }
 
 void ArrowLight_Charge(ArrowLight* this, PlayState* play) {
diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h
index ee4b678961..516469d5cb 100644
--- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h
+++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h
@@ -2,7 +2,7 @@
 #define Z_ARROW_LIGHT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ArrowLight;
 
diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
index f8529bb775..047ad13ba0 100644
--- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
+++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
@@ -15,10 +15,10 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_bdan_objects/object_bdan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h
index e8729bb983..72f2b7103c 100644
--- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h
+++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h
@@ -2,7 +2,7 @@
 #define Z_BG_BDAN_OBJECTS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgBdanObjects;
 
diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
index 0dcb302eaa..280730bcda 100644
--- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
+++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
@@ -14,8 +14,8 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_bdan_objects/object_bdan_objects.h"
 
@@ -113,8 +113,8 @@ void BgBdanSwitch_InitDynaPoly(BgBdanSwitch* this, PlayState* play, CollisionHea
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_bdan_switch.c", 325, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
@@ -209,12 +209,13 @@ void BgBdanSwitch_Init(Actor* thisx, PlayState* play) {
             }
             break;
         default:
-            PRINTF(T("不正な", "Invalid") " ARG_DATA(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params,
-                   "../z_bg_bdan_switch.c", 454);
+            PRINTF(T("不正な ARG_DATA(arg_data 0x%04x)(%s %d)\n", "Invalid ARG_DATA(arg_data 0x%04x)(%s %d)\n"),
+                   this->dyna.actor.params, "../z_bg_bdan_switch.c", 454);
             Actor_Kill(&this->dyna.actor);
             return;
     }
-    PRINTF(T("(巨大魚ダンジョン 専用スイッチ)", "(Giant Fish Dungeon Special Switch)") "(arg_data 0x%04x)\n",
+    PRINTF(T("(巨大魚ダンジョン 専用スイッチ)(arg_data 0x%04x)\n",
+             "(Giant Fish Dungeon Special Switch)(arg_data 0x%04x)\n"),
            this->dyna.actor.params);
 }
 
diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h
index f86ef79e3e..8020a212b9 100644
--- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h
+++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h
@@ -2,7 +2,7 @@
 #define Z_BG_BDAN_SWITCH_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum BgBdanSwitchType {
     /* 0x00 */ BLUE,
diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c
index bee0e2484c..e773a20c4c 100644
--- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c
+++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c
@@ -11,7 +11,7 @@
 #include "regs.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_bowl/object_bowl.h"
 
@@ -49,7 +49,7 @@ void BgBomGuard_Init(Actor* thisx, PlayState* play) {
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader);
 
     PRINTF("\n\n");
-    PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ " T("透明ガード出現", "Transparent guard appears") " ☆☆☆☆☆ \n" VT_RST);
+    PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 透明ガード出現 ☆☆☆☆☆ \n", " ☆☆☆☆☆ Transparent guard appears ☆☆☆☆☆ \n") VT_RST);
 
     thisx->scale.x = 1.0f;
     thisx->scale.y = 1.0f;
diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h
index 47e167de8a..707027f443 100644
--- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h
+++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h
@@ -2,7 +2,7 @@
 #define Z_BG_BOM_GUARD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgBomGuard;
 
diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c
index 6db143bdf8..15a2ffb841 100644
--- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c
+++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c
@@ -11,7 +11,7 @@
 #include "sfx.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 
@@ -156,7 +156,8 @@ void BgBombwall_Init(Actor* thisx, PlayState* play) {
         func_8086ED50(this, play);
     }
 
-    PRINTF("(field keep " T("汎用爆弾壁", "general purpose bomb wall") ")(arg_data 0x%04x)(angY %d)\n",
+    PRINTF(T("(field keep 汎用爆弾壁)(arg_data 0x%04x)(angY %d)\n",
+             "(field keep general purpose bomb wall)(arg_data 0x%04x)(angY %d)\n"),
            this->dyna.actor.params, this->dyna.actor.shape.rot.y);
 }
 
diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h
index 8cd1bb879f..f2714e062a 100644
--- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h
+++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h
@@ -2,7 +2,7 @@
 #define Z_BG_BOMBWALL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgBombwall;
 
diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c
index e0c0e1c4fd..57a5b0b9e6 100644
--- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c
+++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c
@@ -18,8 +18,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_bowl/object_bowl.h"
 
@@ -74,9 +74,9 @@ void BgBowlWall_Init(Actor* thisx, PlayState* play) {
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
     this->initPos = this->dyna.actor.world.pos;
     PRINTF("\n\n");
-    PRINTF(
-        VT_FGCOL(GREEN) " ☆☆☆☆☆ " T("ボーリングおじゃま壁発生", "Bowling obstacle wall appears") " ☆☆☆☆☆ %d\n" VT_RST,
-        this->dyna.actor.params);
+    PRINTF(VT_FGCOL(GREEN)
+               T(" ☆☆☆☆☆ ボーリングおじゃま壁発生 ☆☆☆☆☆ %d\n", " ☆☆☆☆☆ Bowling obstacle wall spawns ☆☆☆☆☆ %d\n") VT_RST,
+           this->dyna.actor.params);
     this->actionFunc = BgBowlWall_SpawnBullseyes;
     this->dyna.actor.scale.x = this->dyna.actor.scale.y = this->dyna.actor.scale.z = 1.0f;
 }
diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h
index ac743fe7f1..c108447575 100644
--- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h
+++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h
@@ -2,7 +2,7 @@
 #define Z_BG_BOWL_WALL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h"
 
 struct BgBowlWall;
diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
index f36d251f45..c12522fe52 100644
--- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
+++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
@@ -15,9 +15,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/scenes/dungeons/ddan/ddan_scene.h"
 #include "assets/objects/object_bwall/object_bwall.h"
diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
index 02ab43a5fc..eff2fbeec2 100644
--- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
+++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
@@ -2,7 +2,7 @@
 #define Z_BG_BREAKWALL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgBreakwall;
 
diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c
index fb910b56fd..71f37f61a5 100644
--- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c
+++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c
@@ -11,7 +11,7 @@
 #include "rand.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_ddan_objects/object_ddan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h
index 48e695b47d..a8073e1498 100644
--- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h
+++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h
@@ -2,7 +2,7 @@
 #define Z_BG_DDAN_JD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgDdanJd;
 
diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c
index 9a8669e535..81012e657a 100644
--- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c
+++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c
@@ -14,7 +14,7 @@
 #include "rumble.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_ddan_objects/object_ddan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h
index fca0119052..46b4105b81 100644
--- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h
+++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h
@@ -2,7 +2,7 @@
 #define Z_BG_DDAN_KD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgDdanKd;
 
diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
index 55dd43407b..f2e50dcb61 100644
--- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
+++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
@@ -18,9 +18,9 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_ddan_objects/object_ddan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h
index 9f361a3ccb..9c16d9eb1f 100644
--- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h
+++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h
@@ -2,7 +2,7 @@
 #define Z_BG_DODOAGO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum BgDodoagoEye {
     /* 0 */ BGDODOAGO_EYE_LEFT,
diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
index 006deb893e..44dc02ca0d 100644
--- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
@@ -21,10 +21,10 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_dy_obj/object_dy_obj.h"
 #include "assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h"
@@ -104,7 +104,8 @@ void BgDyYoseizo_Init(Actor* thisx, PlayState* play2) {
     this->actor.focus.pos = this->actor.world.pos;
 
     if (play->sceneId == SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) {
-        PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ " T("大妖精の泉", "Great Fairy Fountain") " ☆☆☆☆☆ %d\n" VT_RST, play->spawn);
+        PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 大妖精の泉 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Great Fairy Fountain ☆☆☆☆☆ %d\n") VT_RST,
+               play->spawn);
         SkelAnime_InitFlex(play, &this->skelAnime, &gGreatFairySkel, &gGreatFairySittingTransitionAnim,
                            this->jointTable, this->morphTable, 28);
 #if OOT_VERSION < NTSC_1_1
@@ -114,7 +115,8 @@ void BgDyYoseizo_Init(Actor* thisx, PlayState* play2) {
         }
 #endif
     } else {
-        PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ " T("石妖精の泉", "Stone Fairy Fountain") " ☆☆☆☆☆ %d\n" VT_RST, play->spawn);
+        PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 石妖精の泉 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Stone Fairy Fountain ☆☆☆☆☆ %d\n") VT_RST,
+               play->spawn);
         SkelAnime_InitFlex(play, &this->skelAnime, &gGreatFairySkel, &gGreatFairyLayingDownTransitionAnim,
                            this->jointTable, this->morphTable, 28);
 #if OOT_VERSION < NTSC_1_1
@@ -251,7 +253,7 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, PlayState* play) {
 #endif
 
     Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1);
-    PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ " T("もうど", "Mode") " ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode);
+    PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Mode ☆☆☆☆☆ %d\n") VT_RST, play->msgCtx.ocarinaMode);
     givingReward = false;
 
     if (play->sceneId != SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) {
@@ -276,22 +278,23 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, PlayState* play) {
         switch (this->fountainType) {
             case FAIRY_UPGRADE_MAGIC:
                 if (!gSaveContext.save.info.playerData.isMagicAcquired || BREG(2)) {
-                    PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ " T("回転切り速度ＵＰ", "Turning speed UP") " ☆☆☆☆☆ \n" VT_RST);
+                    PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 回転切り速度ＵＰ ☆☆☆☆☆ \n", " ☆☆☆☆☆ Turning speed UP ☆☆☆☆☆ \n")
+                               VT_RST);
                     this->givingSpell = true;
                     givingReward = true;
                 }
                 break;
             case FAIRY_UPGRADE_DOUBLE_MAGIC:
                 if (!gSaveContext.save.info.playerData.isDoubleMagicAcquired) {
-                    PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ " T("魔法ゲージメーター倍増",
-                                                        "Magic Gauge Meter Doubled") " ☆☆☆☆☆ \n" VT_RST);
+                    PRINTF(VT_FGCOL(YELLOW) T(" ☆☆☆☆☆ 魔法ゲージメーター倍増 ☆☆☆☆☆ \n",
+                                              " ☆☆☆☆☆ Magic Gauge Meter Doubled ☆☆☆☆☆ \n") VT_RST);
                     this->givingSpell = true;
                     givingReward = true;
                 }
                 break;
             case FAIRY_UPGRADE_DOUBLE_DEFENSE:
                 if (!gSaveContext.save.info.playerData.isDoubleDefenseAcquired) {
-                    PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ " T("ダメージ半減", "Damage halved") " ☆☆☆☆☆ \n" VT_RST);
+                    PRINTF(VT_FGCOL(MAGENTA) T(" ☆☆☆☆☆ ダメージ半減 ☆☆☆☆☆ \n", " ☆☆☆☆☆ Damage halved ☆☆☆☆☆ \n") VT_RST);
                     this->givingSpell = true;
                     givingReward = true;
                 }
diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
index f799bf9278..0b07024b17 100644
--- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
+++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
@@ -2,7 +2,7 @@
 #define Z_BG_DY_YOSEIZO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h"
 #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
index 1df0e5b730..b43241f1bd 100644
--- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
+++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
@@ -16,10 +16,11 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "tex_len.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
@@ -76,7 +77,75 @@ static Vec3f sSideCenters[] = {
 
 static f32 sSideAngles[] = { M_PI / 2, -M_PI / 2, 0.0f, M_PI };
 
-#include "assets/overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.c"
+#define sPlatformTex_WIDTH 32
+#define sPlatformTex_HEIGHT 32
+static u64 sPlatformTex[TEX_LEN(u64, sPlatformTex_WIDTH, sPlatformTex_HEIGHT, 16)] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformTex.rgba16.inc.c"
+};
+
+static u8 sZeros[8] = { 0 };
+
+static Vtx sPlatformTopVtx[4] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformTopVtx.inc.c"
+};
+
+static Gfx sPlatformMaterialDL[17] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformMaterialDL.inc.c"
+};
+
+static Gfx sPlatformTopDL[3] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformTopDL.inc.c"
+};
+
+static Vtx sPlatformBottomVtx[4] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformBottomVtx.inc.c"
+};
+
+static Gfx sPlatformBottomDL[3] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformBottomDL.inc.c"
+};
+
+static Vtx sPlatformSideVtx[4] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformSideVtx.inc.c"
+};
+
+static Gfx sPlatformSideDL[3] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformSideDL.inc.c"
+};
+
+#define sFlashTex_WIDTH 32
+#define sFlashTex_HEIGHT 64
+static u64 sFlashTex[TEX_LEN(u64, sFlashTex_WIDTH, sFlashTex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sFlashTex.i8.inc.c"
+};
+
+static Vtx sFlashVtx[8] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sFlashVtx.inc.c"
+};
+
+static Gfx sFlashDL[22] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sFlashDL.inc.c"
+};
+
+static BgCamInfo sBgCamList[1] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sBgCamList.inc.c"
+};
+
+static SurfaceType sSurfaceTypes[2] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sSurfaceTypes.inc.c"
+};
+
+static CollisionPoly sPolyList[10] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPolyList.inc.c"
+};
+
+static Vec3s sVtxList[8] = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sVtxList.inc.c"
+};
+
+static CollisionHeader sCol = {
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sCol.inc.c"
+};
 
 void BgGanonOtyuka_Init(Actor* thisx, PlayState* play2) {
     BgGanonOtyuka* this = (BgGanonOtyuka*)thisx;
diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h
index 9d0c4bcfaf..14744529e6 100644
--- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h
+++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h
@@ -2,7 +2,7 @@
 #define Z_BG_GANON_OTYUKA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #define OTYUKA_SIDE_EAST (1 << 0)
 #define OTYUKA_SIDE_WEST (1 << 1)
diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c
index c263ed5e3a..8e7ad4c3d6 100644
--- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c
+++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c
@@ -14,8 +14,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h"
 
@@ -62,7 +62,7 @@ void BgGateShutter_Init(Actor* thisx, PlayState* play) {
     thisx->scale.y = 1.0f;
     thisx->scale.z = 1.0f;
     PRINTF("\n\n");
-    PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ " T("柵でたなぁ", "There's a fence") " ☆☆☆☆☆ \n" VT_RST);
+    PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 柵でたなぁ ☆☆☆☆☆ \n", " ☆☆☆☆☆ There's a fence ☆☆☆☆☆ \n") VT_RST);
     this->actionFunc = func_8087828C;
 }
 
diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h
index 6f9f53a546..1b89840088 100644
--- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h
+++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h
@@ -2,7 +2,7 @@
 #define Z_BG_GATE_SHUTTER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGateShutter;
 
diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
index 6c0f01b322..3cf1b45e31 100644
--- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
+++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
@@ -11,9 +11,9 @@
 #include "ichain.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_gjyo_objects/object_gjyo_objects.h"
 #include "assets/scenes/overworld/ganon_tou/ganon_tou_scene.h"
diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h
index 312dcdee72..3cec2c7a6b 100644
--- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h
+++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h
@@ -2,7 +2,7 @@
 #define Z_BG_GJYO_BRIDGE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGjyoBridge;
 
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
index b05734104c..d3f3ccae8b 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
+++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
@@ -9,7 +9,7 @@
 #include "gfx.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h
index 3124be292e..9ff0f6294f 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h
@@ -2,7 +2,7 @@
 #define Z_BG_GND_DARKMEIRO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGndDarkmeiro;
 
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c
index c49697f627..441870154f 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c
+++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c
@@ -11,8 +11,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h
index bebb77303f..a6092c9364 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h
@@ -2,7 +2,7 @@
 #define Z_BG_GND_FIREMEIRO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGndFiremeiro;
 
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c
index 8b026839f7..2e587cde55 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c
+++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c
@@ -12,9 +12,9 @@
 #include "rand.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h
index 86e3aa4f62..23b4ff6af5 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h
@@ -2,7 +2,7 @@
 #define Z_BG_GND_ICEBLOCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGndIceblock;
 
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c
index 98824a94e0..3a6aa26abb 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c
+++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c
@@ -6,7 +6,7 @@
 
 #include "z_bg_gnd_nisekabe.h"
 
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h
index 291a0e4ea1..5145c02b6b 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h
@@ -2,7 +2,7 @@
 #define Z_BG_GND_NISEKABE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGndNisekabe;
 
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c
index 889d4f9551..acb2bd4f80 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c
+++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c
@@ -14,8 +14,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h
index d2e039c8ad..110c53d9bf 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h
@@ -2,7 +2,7 @@
 #define Z_BG_GND_SOULMEIRO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGndSoulmeiro;
 
diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c
index f20af0b9f8..b487e1280d 100644
--- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c
+++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c
@@ -12,9 +12,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_haka/object_haka.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h
index b95f5c0f8e..1bad32c14b 100644
--- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h
+++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h
@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHaka;
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
index a209637949..cdda12ba15 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
@@ -14,8 +14,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h
index 6c926d4354..cc718d095d 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h
@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_GATE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaGate;
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c
index 63ef8e5153..4e6d67df94 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c
@@ -14,9 +14,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_hakach_objects/object_hakach_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h
index e1ce3a0946..3d691f3fad 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h
@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_HUTA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaHuta;
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c
index a09195d6fe..a0c3e37a58 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c
@@ -7,7 +7,7 @@
 #include "z_bg_haka_megane.h"
 
 #include "ichain.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_hakach_objects/object_hakach_objects.h"
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h
index bb7711c7b5..a50a74a27f 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h
@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_MEGANE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaMegane;
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c
index 7b06abe5ab..061cdaf5d5 100644
--- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c
+++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c
@@ -10,7 +10,7 @@
 #include "one_point_cutscene.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h
index 4a11b26b7d..47342beb78 100644
--- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h
+++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h
@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_MEGANEBG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaMeganeBG;
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c
index d72cb56d0b..cf90fc6a68 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c
@@ -9,9 +9,9 @@
 #include "ichain.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 #include "assets/objects/object_ice_objects/object_ice_objects.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h
index a5019eb84f..4d94f0ac1e 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h
@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_SGAMI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaSgami;
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c
index 126dcc7ee1..667f1f309b 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c
@@ -15,8 +15,8 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h
index e6ede3d2b3..28337fb437 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h
@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_SHIP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaShip;
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
index e9ec138a8e..250f4ce32a 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
@@ -11,10 +11,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h
index cfcceaa3e2..a75c877ed3 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h
@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_TRAP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum HakaTrapType {
     /* 0x00 */ HAKA_TRAP_GUILLOTINE_SLOW,
diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
index df7c95b0e9..d4b20752d5 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
@@ -14,8 +14,8 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h
index a0caba8c23..ad9fd87703 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h
@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_TUBO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaTubo;
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c
index 581af06120..8143404e10 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c
@@ -12,7 +12,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_hakach_objects/object_hakach_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h
index a34a043590..9cf3685710 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h
@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_WATER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaWater;
 
diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c
index 8064cae2d4..5be3889889 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c
@@ -12,8 +12,8 @@
 #include "rand.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_hakach_objects/object_hakach_objects.h"
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h
index 2c8f9a4834..1d4c4798d6 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h
@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_ZOU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaZou;
 
diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
index 90aeee4b87..88b063ae2c 100644
--- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
+++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
@@ -22,9 +22,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_heavy_object/object_heavy_object.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h
index a93f5cc3a0..765a05a968 100644
--- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h
+++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h
@@ -2,7 +2,7 @@
 #define Z_BG_HEAVY_BLOCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHeavyBlock;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
index 0f0f99da70..7abcc1f912 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
@@ -15,8 +15,8 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
@@ -87,8 +87,8 @@ void BgHidanCurtain_Init(Actor* thisx, PlayState* play) {
     Actor_SetFocus(&this->actor, 20.0f);
     this->type = PARAMS_GET_U(thisx->params, 12, 4);
     if (this->type > 6) {
-        PRINTF(T("Error : object のタイプが設定されていない",
-                 "Error : object type is not set") "(%s %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n",
+                 "Error : object type is not set (%s %d)(arg_data 0x%04x)\n"),
                "../z_bg_hidan_curtain.c", 352, this->actor.params);
         Actor_Kill(&this->actor);
         return;
@@ -100,8 +100,8 @@ void BgHidanCurtain_Init(Actor* thisx, PlayState* play) {
     thisx->params &= 0x3F;
 
     if (DEBUG_FEATURES && ((this->actor.params < 0) || (this->actor.params > 0x3F))) {
-        PRINTF(T("Warning : object のセーブビットが設定されていない",
-                 "Warning : object save bit is not set") "(%s %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : object のセーブビットが設定されていない(%s %d)(arg_data 0x%04x)\n",
+                 "Warning : object save bit is not set (%s %d)(arg_data 0x%04x)\n"),
                "../z_bg_hidan_curtain.c", 373, this->actor.params);
     }
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h
index 14502cba68..89f43762d3 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_CURTAIN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanCurtain;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
index 885967c2bb..412b2a5426 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
@@ -11,9 +11,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h
index 83cabfaab4..50165babbe 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_DALM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanDalm;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
index 9394d4017b..9ca446025c 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
@@ -12,8 +12,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h
index 35e643279e..a407018592 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_FIREWALL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanFirewall;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c
index 2616f14ace..b8d10809f8 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c
@@ -9,7 +9,7 @@
 #include "ichain.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h
index e21de9fca2..1f810b1c04 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_FSLIFT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanFslift;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
index 47849aa850..0a01e35dcd 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
@@ -15,9 +15,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h
index ce1f016125..495c9abc3d 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_FWBIG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanFwbig;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
index d20bccdb71..3f2e87ed3f 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
@@ -20,7 +20,7 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h
index faf1db7577..2a643b568d 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_HAMSTEP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanHamstep;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c
index a4fd5fab33..64159da59a 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c
@@ -10,7 +10,7 @@
 #include "rumble.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h
index 955ddd5dfc..8f00335b03 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_HROCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanHrock;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c
index 8148f8ca0d..3559b572fb 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c
@@ -15,7 +15,7 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h
index 112b8dc09a..cb051c3bd0 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_KOUSI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanKousi;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
index 7663c13aa0..4f1be80a62 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
@@ -16,8 +16,8 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
@@ -131,10 +131,9 @@ void BgHidanKowarerukabe_Init(Actor* thisx, PlayState* play) {
 
     if (PARAMS_GET_U(this->dyna.actor.params, 0, 8) < CRACKED_STONE_FLOOR ||
         PARAMS_GET_U(this->dyna.actor.params, 0, 8) > LARGE_BOMBABLE_WALL) {
-        PRINTF(
-            T("Error : 炎の神殿 壊れる壁 の arg_data が判別出来ない",
-              "Error : arg_data for the Fire Temple breakable wall cannot be determined") "(%s %d)(arg_data 0x%04x)\n",
-            "../z_bg_hidan_kowarerukabe.c", 254, this->dyna.actor.params);
+        PRINTF(T("Error : 炎の神殿 壊れる壁 の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n",
+                 "Error : arg_data for the Fire Temple breakable wall cannot be determined (%s %d)(arg_data 0x%04x)\n"),
+               "../z_bg_hidan_kowarerukabe.c", 254, this->dyna.actor.params);
         Actor_Kill(&this->dyna.actor);
         return;
     }
@@ -148,8 +147,9 @@ void BgHidanKowarerukabe_Init(Actor* thisx, PlayState* play) {
     Actor_SetScale(&this->dyna.actor, 0.1f);
     BgHidanKowarerukabe_InitColliderSphere(this, play);
     BgHidanKowarerukabe_OffsetActorYPos(this);
-    PRINTF(T("(hidan 爆弾で壊れる 壁 床)", "(hidan bomb destroys walls and floors)") "(arg_data 0x%04x)\n",
-           this->dyna.actor.params);
+    PRINTF(
+        T("(hidan 爆弾で壊れる 壁 床)(arg_data 0x%04x)\n", "(hidan bomb destroys walls and floors)(arg_data 0x%04x)\n"),
+        this->dyna.actor.params);
 }
 
 void BgHidanKowarerukabe_Destroy(Actor* thisx, PlayState* play) {
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h
index 7257a210f1..3f1b848d7b 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_KOWARERUKABE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanKowarerukabe;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
index bf5bc52317..872ed0608c 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
@@ -14,9 +14,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64skin_matrix.h"
+#include "play_state.h"
+#include "player.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h
index aa8d6ca874..d2651e157f 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_ROCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanRock;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
index 8a7e68700c..df5936d41e 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
@@ -14,7 +14,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h
index 82725e4fc1..7810d0f411 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_RSEKIZOU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanRsekizou;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
index 452c88f5f4..bb7cf7edf5 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
@@ -14,8 +14,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h
index c898f9d934..ebf8d5738a 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_SEKIZOU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanSekizou;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c
index f166f9f4d8..a44cfa3491 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c
@@ -15,8 +15,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h
index dd64b556b0..14d461898e 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_SIMA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanSima;
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c
index d21b1e8212..a540872b96 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c
@@ -8,7 +8,7 @@
 
 #include "ichain.h"
 #include "sfx.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h
index 2ce3fbfd4e..6b169810c8 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h
@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_SYOKU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanSyoku;
 
diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c
index 6bfd39e4e5..7398d9e8e0 100644
--- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c
+++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c
@@ -11,9 +11,9 @@
 #include "rand.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_ice_objects/object_ice_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h
index 364b087852..95ff43009f 100644
--- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h
+++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h
@@ -2,7 +2,7 @@
 #define Z_BG_ICE_OBJECTS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgIceObjects;
 
diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
index 102e2e3ba5..0c6578ec26 100644
--- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
+++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
@@ -15,8 +15,8 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_ice_objects/object_ice_objects.h"
 
@@ -137,8 +137,8 @@ void BgIceShelter_InitDynaPoly(BgIceShelter* this, PlayState* play, CollisionHea
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_ice_shelter.c", 362, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h
index 30286a64d1..401fb7096f 100644
--- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h
+++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h
@@ -2,7 +2,7 @@
 #define Z_BG_ICE_SHELTER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgIceShelter;
 
diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c
index 20176f2758..8933b3c7a1 100644
--- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c
+++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c
@@ -10,7 +10,7 @@
 #include "one_point_cutscene.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_ice_objects/object_ice_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h
index aad63d435b..5d246aab9e 100644
--- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h
+++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h
@@ -2,7 +2,7 @@
 #define Z_BG_ICE_SHUTTER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgIceShutter;
 
diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c
index 8fb200aca5..8f619e0ed2 100644
--- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c
+++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c
@@ -11,8 +11,8 @@
 #include "rand.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_ice_objects/object_ice_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h
index 46a78eb738..c8779247cb 100644
--- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h
+++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h
@@ -2,7 +2,7 @@
 #define Z_BG_ICE_TURARA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgIceTurara;
 
diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
index e46139117c..61ea3e0e4c 100644
--- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
+++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
@@ -10,8 +10,8 @@
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_ingate/object_ingate.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
index c9f46446ab..32eedc24b6 100644
--- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
+++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
@@ -2,7 +2,7 @@
 #define Z_BG_INGATE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgInGate;
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
index 58cd7278ad..6ff102aa41 100644
--- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
+++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
@@ -11,8 +11,8 @@
 #include "sfx.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
@@ -87,8 +87,8 @@ void BgJya1flift_InitDynapoly(BgJya1flift* this, PlayState* play, CollisionHeade
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_jya_1flift.c", 179, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
@@ -104,7 +104,8 @@ void BgJya1flift_InitCollision(Actor* thisx, PlayState* play) {
 
 void BgJya1flift_Init(Actor* thisx, PlayState* play) {
     BgJya1flift* this = (BgJya1flift*)thisx;
-    PRINTF(T("(１Ｆリフト)", "1F lift") "(flag %d)(room %d)\n", sIsSpawned, play->roomCtx.curRoom.num);
+    PRINTF(T("(１Ｆリフト)(flag %d)(room %d)\n", "(1F lift)(flag %d)(room %d)\n"), sIsSpawned,
+           play->roomCtx.curRoom.num);
     this->hasInitialized = false;
     if (sIsSpawned) {
         Actor_Kill(thisx);
diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h
index 8d772757bf..b909470829 100644
--- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h
+++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_1FLIFT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgJya1flift;
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c
index ee9487d2ef..046da7d10f 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c
@@ -11,7 +11,7 @@
 #include "sfx.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
@@ -62,8 +62,8 @@ void BgJyaAmishutter_InitDynaPoly(BgJyaAmishutter* this, PlayState* play, Collis
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_jya_amishutter.c", 129, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h
index 1dad4c1543..439bc41ae1 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_AMISHUTTER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgJyaAmishutter;
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
index f2955f3050..feb7cba7b7 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
@@ -12,7 +12,7 @@
 #include "printf.h"
 #include "sys_matrix.h"
 #include "translation.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
@@ -85,8 +85,8 @@ void BgJyaBigmirror_HandleCobra(Actor* thisx, PlayState* play) {
 
 #if DEBUG_FEATURES
                 if (curCobraInfo->cobra->dyna.actor.update == NULL) {
-                    PRINTF("Error : " T("コブラ削除された", "Cobra deleted") " (%s %d)\n", "../z_bg_jya_bigmirror.c",
-                           203);
+                    PRINTF(T("Error : コブラ削除された (%s %d)\n", "Error : Cobra deleted (%s %d)\n"),
+                           "../z_bg_jya_bigmirror.c", 203);
                 }
 #endif
             } else {
@@ -96,7 +96,7 @@ void BgJyaBigmirror_HandleCobra(Actor* thisx, PlayState* play) {
                 this->actor.child = NULL;
 
                 if (curCobraInfo->cobra == NULL) {
-                    PRINTF("Error : " T("コブラ発生失敗", "Cobra generation failed") " (%s %d)\n",
+                    PRINTF(T("Error : コブラ発生失敗 (%s %d)\n", "Error : Cobra failed to spawn (%s %d)\n"),
                            "../z_bg_jya_bigmirror.c", 221);
                 }
             }
@@ -164,7 +164,7 @@ void BgJyaBigmirror_HandleMirRay(Actor* thisx, PlayState* play) {
 
 #if DEBUG_FEATURES
                     if (this->lightBeams[i] == NULL) {
-                        PRINTF("Error : " T("Mir Ray 発生失敗", "Mir Ray generation failed") " (%s %d)\n",
+                        PRINTF(T("Error : Mir Ray 発生失敗 (%s %d)\n", "Error : Mir Ray failed to spawn (%s %d)\n"),
                                "../z_bg_jya_bigmirror.c", 310);
                     }
 #endif
@@ -196,7 +196,7 @@ void BgJyaBigmirror_Init(Actor* thisx, PlayState* play) {
     this->spawned = true;
     this->mirRayObjectSlot = -1;
 
-    PRINTF("(jya " T("大鏡", "Big mirror") ")(arg_data 0x%04x)\n", this->actor.params);
+    PRINTF(T("(jya 大鏡)(arg_data 0x%04x)\n", "(jya Big mirror)(arg_data 0x%04x)\n"), this->actor.params);
 }
 
 void BgJyaBigmirror_Destroy(Actor* thisx, PlayState* play) {
diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h
index 56b6d8db07..15bc7f83e4 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_BIGMIRROR_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #define BIGMIR_PUZZLE_COBRA1_SOLVED (1 << 0)
 #define BIGMIR_PUZZLE_COBRA2_SOLVED (1 << 1)
diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c
index 946db1b05c..261bb07fb5 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c
@@ -11,9 +11,9 @@
 #include "ichain.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h
index 641141945a..53c72f03fc 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_BLOCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgJyaBlock;
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
index 73108e43d0..e19f90863a 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
@@ -11,8 +11,8 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 #define FLAGS ACTOR_FLAG_ATTENTION_ENABLED
@@ -195,7 +195,8 @@ void BgJyaBombchuiwa_SpawnLightRay(BgJyaBombchuiwa* this, PlayState* play) {
     BgJyaBombchuiwa_SetDrawFlags(this, 4);
     if (Actor_Spawn(&play->actorCtx, play, ACTOR_MIR_RAY, this->actor.world.pos.x, this->actor.world.pos.y,
                     this->actor.world.pos.z, 0, 0, 0, 0) == NULL) {
-        PRINTF(T("Ｅｒｒｏｒ : Mir_Ray 発生失敗", "Error : Mir_Ray failed to occur") "(%s %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Ｅｒｒｏｒ : Mir_Ray 発生失敗(%s %d)(arg_data 0x%04x)\n",
+                 "Error : Mir_Ray failed to spawn (%s %d)(arg_data 0x%04x)\n"),
                "../z_bg_jya_bombchuiwa.c", 410, this->actor.params);
     }
 }
diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h
index ad9b9c33db..04d81c1e7f 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_BOMBCHUIWA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgJyaBombchuiwa;
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
index 5a01066a3c..87a1aa3a78 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
@@ -13,8 +13,8 @@
 #include "sfx.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
@@ -83,8 +83,8 @@ void BgJyaBombiwa_SetupDynaPoly(BgJyaBombiwa* this, PlayState* play, CollisionHe
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_jya_bombiwa.c", 174, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
@@ -102,8 +102,8 @@ void BgJyaBombiwa_Init(Actor* thisx, PlayState* play) {
 
     if (PARAMS_GET_U(this->dyna.actor.params, 0, 6) != 0x29) {
         PRINTF_COLOR_WARNING();
-        PRINTF(T("Ｗａｒｎｉｎｇ : Switch Number が変更された",
-                 "Warning : Switch Number has been changed") "(%s %d)(SW %d)\n",
+        PRINTF(T("Ｗａｒｎｉｎｇ : Switch Number が変更された(%s %d)(SW %d)\n",
+                 "Warning : Switch Number has been changed (%s %d)(SW %d)\n"),
                "../z_bg_jya_bombiwa.c", 218, PARAMS_GET_U(this->dyna.actor.params, 0, 6));
         PRINTF_RST();
     }
@@ -114,7 +114,8 @@ void BgJyaBombiwa_Init(Actor* thisx, PlayState* play) {
     } else {
         Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
 
-        PRINTF(T("(jya 爆弾で破壊岩)", "(jya bomb destroys rocks)") "(arg_data 0x%04x)\n", this->dyna.actor.params);
+        PRINTF(T("(jya 爆弾で破壊岩)(arg_data 0x%04x)\n", "(jya bomb destroys rocks)(arg_data 0x%04x)\n"),
+               this->dyna.actor.params);
     }
 }
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h
index 9f06d9a1d6..8888d372d6 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_BOMBIWA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgJyaBombiwa;
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
index 0a087d91d9..81fe1e598f 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
@@ -11,8 +11,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
@@ -28,7 +28,13 @@ void func_80896950(BgJyaCobra* this, PlayState* play);
 void func_808969F8(BgJyaCobra* this, PlayState* play);
 void func_80896ABC(BgJyaCobra* this, PlayState* play);
 
-#include "assets/overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.c"
+static Vtx sShadowVtx[] = {
+#include "assets/overlays/ovl_Bg_Jya_Cobra/sShadowVtx.inc.c"
+};
+
+static Gfx sShadowDL[7] = {
+#include "assets/overlays/ovl_Bg_Jya_Cobra/sShadowDL.inc.c"
+};
 
 ActorProfile Bg_Jya_Cobra_Profile = {
     /**/ ACTOR_BG_JYA_COBRA,
@@ -139,8 +145,8 @@ void BgJyaCobra_InitDynapoly(BgJyaCobra* this, PlayState* play, CollisionHeader*
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_jya_cobra.c", 247, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
@@ -153,7 +159,7 @@ void BgJyaCobra_SpawnRay(BgJyaCobra* this, PlayState* play) {
 #if DEBUG_FEATURES
     if (this->dyna.actor.child == NULL) {
         PRINTF_COLOR_RED();
-        PRINTF(T("Ｅｒｒｏｒ : Mir Ray 発生失敗", "Error : Mir Ray failed to occur") " (%s %d)\n",
+        PRINTF(T("Ｅｒｒｏｒ : Mir Ray 発生失敗 (%s %d)\n", "Error : Mir Ray failed to occur (%s %d)\n"),
                "../z_bg_jya_cobra.c", 270);
         PRINTF_RST();
     }
@@ -439,8 +445,9 @@ void BgJyaCobra_Init(Actor* thisx, PlayState* play) {
         BgJyaCobra_UpdateShadowFromTop(this);
     }
 
-    PRINTF("(jya " T("コブラ", "cobra") ")(arg_data 0x%04x)(act %x)(txt %x)(txt16 %x)\n", this->dyna.actor.params, this,
-           &this->shadowTextureBuffer, COBRA_SHADOW_TEX_PTR(this));
+    PRINTF(T("(jya コブラ)(arg_data 0x%04x)(act %x)(txt %x)(txt16 %x)\n",
+             "(jya cobra)(arg_data 0x%04x)(act %x)(txt %x)(txt16 %x)\n"),
+           this->dyna.actor.params, this, &this->shadowTextureBuffer, COBRA_SHADOW_TEX_PTR(this));
 }
 
 void BgJyaCobra_Destroy(Actor* thisx, PlayState* play) {
diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h
index 32266e2ac4..9f2a9d9f36 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_COBRA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgJyaCobra;
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c
index 6d6b13efb8..fb25354ccd 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c
@@ -10,8 +10,8 @@
 #include "ichain.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_goroiwa/object_goroiwa.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h
index 35f4c971c9..3b24569f51 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_GOROIWA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgJyaGoroiwa;
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c
index b9350da300..dd514e850b 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c
@@ -12,8 +12,8 @@
 #include "ichain.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_jya_iron/object_jya_iron.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h
index 2da7d3673f..ba4af700bf 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_HAHENIRON_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgJyaHaheniron;
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c
index 93ca5a2360..cf13895832 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c
@@ -14,8 +14,8 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_jya_iron/object_jya_iron.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h
index 9768aec2a5..3857918e31 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_IRONOBJ_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgJyaIronobj;
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c
index 354c17b94b..652ec8e8e6 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c
@@ -13,7 +13,7 @@
 #include "sfx.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
@@ -61,8 +61,8 @@ void BgJyaKanaami_InitDynaPoly(BgJyaKanaami* this, PlayState* play, CollisionHea
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_jya_kanaami.c", 145, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
@@ -78,7 +78,7 @@ void BgJyaKanaami_Init(Actor* thisx, PlayState* play) {
     } else {
         func_80899880(this);
     }
-    PRINTF("(jya " T("金網", "wire mesh") ")(arg_data 0x%04x)\n", this->dyna.actor.params);
+    PRINTF(T("(jya 金網)(arg_data 0x%04x)\n", "(jya wire mesh)(arg_data 0x%04x)\n"), this->dyna.actor.params);
 }
 
 void BgJyaKanaami_Destroy(Actor* thisx, PlayState* play) {
diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h
index a125e8ef53..892a7354d1 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_KANAAMI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgJyaKanaami;
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
index dd8b162bd7..83e58b79b8 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
@@ -12,7 +12,7 @@
 #include "sfx.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h
index ea9abac2bf..85db1a0969 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_LIFT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgJyaLift;
 typedef void (*BgJyaLiftActionFunc)(struct BgJyaLift*, struct PlayState*);
diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
index a72f245e22..da22420786 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
@@ -17,8 +17,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h
index e297ebb63a..013fac982d 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_MEGAMI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgJyaMegami;
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c
index e9cfd701a2..148d6c0098 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c
@@ -13,8 +13,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
@@ -81,8 +81,8 @@ void BgJyaZurerukabe_InitDynaPoly(BgJyaZurerukabe* this, PlayState* play, Collis
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_jya_zurerukabe.c", 194, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
@@ -137,14 +137,15 @@ void BgJyaZurerukabe_Init(Actor* thisx, PlayState* play) {
 
     if (i == ARRAY_COUNT(D_8089B9F0)) {
         PRINTF_COLOR_ERROR();
-        PRINTF(T("home pos が変更されたみたい", "It seems that the home pos has changed") "(%s %d)(arg_data 0x%04x)\n",
+        PRINTF(T("home pos が変更されたみたい(%s %d)(arg_data 0x%04x)\n",
+                 "It seems that the home pos has changed (%s %d)(arg_data 0x%04x)\n"),
                "../z_bg_jya_zurerukabe.c", 299, this->dyna.actor.params);
         PRINTF_RST();
     }
 
     this->unk_16E = D_8089B9F8[this->unk_168];
     func_8089B7B4(this);
-    PRINTF("(jya " T("ずれる壁", "sliding wall") ")(arg_data 0x%04x)\n", this->dyna.actor.params);
+    PRINTF(T("(jya ずれる壁)(arg_data 0x%04x)\n", "(jya sliding wall)(arg_data 0x%04x)\n"), this->dyna.actor.params);
 }
 
 void BgJyaZurerukabe_Destroy(Actor* thisx, PlayState* play) {
diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h
index d9d920f57b..ebbcf35c7e 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h
@@ -2,7 +2,7 @@
 #define Z_BG_JYA_ZURERUKABE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgJyaZurerukabe;
 
diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
index 9a53c837ff..b130738664 100644
--- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
+++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
@@ -12,7 +12,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h
index 69f1e32eab..212623d2ac 100644
--- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h
+++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h
@@ -2,7 +2,7 @@
 #define Z_BG_MENKURI_EYE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMenkuriEye;
 
diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c
index ee3f35a1db..1b17110214 100644
--- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c
+++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c
@@ -8,7 +8,7 @@
 
 #include "ichain.h"
 #include "sfx.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h
index 5bcdbf8ec4..cd1f5a7457 100644
--- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h
+++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h
@@ -2,7 +2,7 @@
 #define Z_BG_MENKURI_KAITEN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMenkuriKaiten;
 
diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c
index ff13454557..43a922bd33 100644
--- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c
+++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c
@@ -6,7 +6,7 @@
 
 #include "z_bg_menkuri_nisekabe.h"
 
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h
index 54cce56eff..7f462a5e44 100644
--- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h
+++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h
@@ -2,7 +2,7 @@
 #define Z_BG_MENKURI_NISEKABE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMenkuriNisekabe;
 
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
index 672a54b440..bb21a6cb6f 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
+++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
@@ -17,7 +17,7 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
@@ -211,8 +211,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
                 Collider_InitTris(play, &this->collider);
                 if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitFloor,
                                       this->colliderElements)) {
-                    PRINTF(T("Error : コリジョンデータセット失敗",
-                             "Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n",
+                    PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n",
+                             "Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"),
                            "../z_bg_mizu_bwall.c", 484, this->dyna.actor.params);
                     Actor_Kill(&this->dyna.actor);
                 } else {
@@ -252,8 +252,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
                 Collider_InitTris(play, &this->collider);
                 if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitRutoWall,
                                       this->colliderElements)) {
-                    PRINTF(T("Error : コリジョンデータセット失敗",
-                             "Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n",
+                    PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n",
+                             "Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"),
                            "../z_bg_mizu_bwall.c", 558, this->dyna.actor.params);
                     Actor_Kill(&this->dyna.actor);
                 } else {
@@ -293,8 +293,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
                 Collider_InitTris(play, &this->collider);
                 if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitUnusedWall,
                                       this->colliderElements)) {
-                    PRINTF(T("Error : コリジョンデータセット失敗",
-                             "Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n",
+                    PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n",
+                             "Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"),
                            "../z_bg_mizu_bwall.c", 638, this->dyna.actor.params);
                     Actor_Kill(&this->dyna.actor);
                 } else {
@@ -336,8 +336,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
                 Collider_InitTris(play, &this->collider);
                 if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitStingerWall,
                                       this->colliderElements)) {
-                    PRINTF(T("Error : コリジョンデータセット失敗",
-                             "Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n",
+                    PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n",
+                             "Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"),
                            "../z_bg_mizu_bwall.c", 724, this->dyna.actor.params);
                     Actor_Kill(&this->dyna.actor);
                 } else {
@@ -379,8 +379,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
                 Collider_InitTris(play, &this->collider);
                 if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitStingerWall,
                                       this->colliderElements)) {
-                    PRINTF(T("Error : コリジョンデータセット失敗",
-                             "Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n",
+                    PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n",
+                             "Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"),
                            "../z_bg_mizu_bwall.c", 798, this->dyna.actor.params);
                     Actor_Kill(&this->dyna.actor);
                 } else {
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h
index aacbf321a5..f56773d9ae 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h
+++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h
@@ -2,7 +2,7 @@
 #define Z_BG_MIZU_BWALL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMizuBwall;
 
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c
index ae1dd32bc6..98de021dab 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c
+++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c
@@ -14,7 +14,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h
index 75a50e864e..0b527e59c4 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h
+++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h
@@ -2,7 +2,7 @@
 #define Z_BG_MIZU_MOVEBG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum BgMizuMovebgType {
     /* 0 */ MIZUMOVEBG_TYPE_FLOATING_PLATFORM_OUTSIDE_CENTER_PILLAR,
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c
index ed8fae2784..c8c325298c 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c
+++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c
@@ -8,7 +8,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h
index bcba73f531..a3f172393a 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h
+++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h
@@ -2,7 +2,7 @@
 #define Z_BG_MIZU_SHUTTER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #define BGMIZUSHUTTER_GET_SIZE(thisx)   PARAMS_GET_U((u16)(thisx)->params, 12, 4)
 #define BGMIZUSHUTTER_GET_TIMER(thisx)  PARAMS_GET_U((u16)(thisx)->params,  6, 6)
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c
index 3072207ece..03d4ac5628 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c
+++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c
@@ -8,8 +8,8 @@
 
 #include "ichain.h"
 #include "sfx.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h
index f8fe16ccd7..f415d0d4d9 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h
+++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h
@@ -2,7 +2,7 @@
 #define Z_BG_MIZU_UZU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMizuUzu;
 
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c
index 2b5be14285..4b08d9479f 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c
+++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c
@@ -17,7 +17,7 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
@@ -122,7 +122,7 @@ void BgMizuWater_Init(Actor* thisx, PlayState* play) {
     switch (this->type) {
         case 0:
             if (bREG(15) == 0) {
-                PRINTF(T("<コンストラクト>", "<construct>") "%x %x %x\n",
+                PRINTF(T("<コンストラクト>%x %x %x\n", "<construct>%x %x %x\n"),
                        Flags_GetSwitch(play, WATER_TEMPLE_WATER_F1_FLAG),
                        Flags_GetSwitch(play, WATER_TEMPLE_WATER_F2_FLAG),
                        Flags_GetSwitch(play, WATER_TEMPLE_WATER_F3_FLAG));
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h
index 26eb33d0d8..6f0122ae69 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h
+++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h
@@ -2,7 +2,7 @@
 #define Z_BG_MIZU_WATER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMizuWater;
 
diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
index bf00812fc6..cd9fc555c7 100644
--- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
+++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
@@ -11,7 +11,7 @@
 #include "ichain.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_mjin/object_mjin.h"
 #include "assets/objects/object_mjin_wind/object_mjin_wind.h"
diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h
index 1ed19aa2a4..63601a13ff 100644
--- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h
+++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h
@@ -2,7 +2,7 @@
 #define Z_BG_MJIN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMjin;
 
diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
index c0b7314bcb..baf9156bb7 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
@@ -15,8 +15,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_mori_objects/object_mori_objects.h"
 
@@ -74,8 +74,8 @@ void BgMoriBigst_InitDynapoly(BgMoriBigst* this, PlayState* play, CollisionHeade
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_mori_bigst.c", 190, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
@@ -85,8 +85,8 @@ void BgMoriBigst_Init(Actor* thisx, PlayState* play) {
     s32 pad;
     BgMoriBigst* this = (BgMoriBigst*)thisx;
 
-    PRINTF(T("mori (bigST.鍵型天井)",
-             "mori (bigST. key-shaped ceiling)") "(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n",
+    PRINTF(T("mori (bigST.鍵型天井)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n",
+             "mori (bigST. key-shaped ceiling)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n"),
            this->dyna.actor.params, Flags_GetSwitch(play, PARAMS_GET_U(this->dyna.actor.params, 8, 6)),
            Flags_GetTempClear(play, this->dyna.actor.room), Flags_GetClear(play, this->dyna.actor.room),
            GET_PLAYER(play)->actor.world.pos.y);
@@ -151,7 +151,7 @@ void BgMoriBigst_SetupStalfosFight(BgMoriBigst* this, PlayState* play) {
         this->dyna.actor.child = NULL;
         this->dyna.actor.home.rot.z++;
     } else {
-        PRINTF(T("Warning : 第２スタルフォス発生失敗\n", "Warning : Second Stalfos failed to generate\n"));
+        PRINTF(T("Warning : 第２スタルフォス発生失敗\n", "Warning : Second Stalfos failed to spawn\n"));
     }
     Flags_SetClear(play, this->dyna.actor.room);
 }
@@ -212,7 +212,7 @@ void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, PlayState* play) {
         this->dyna.actor.child = NULL;
         this->dyna.actor.home.rot.z++;
     } else {
-        PRINTF(T("Warning : 第３-1スタルフォス発生失敗\n", "Warning : 3-1 Stalfos generation failure\n"));
+        PRINTF(T("Warning : 第３-1スタルフォス発生失敗\n", "Warning : 3-1 Stalfos failed to spawn\n"));
     }
     stalfos2 = Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_TEST, 170.0f, 827.0f, -3260.0f, 0,
                                   0, 0, 5);
@@ -220,7 +220,7 @@ void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, PlayState* play) {
         this->dyna.actor.child = NULL;
         this->dyna.actor.home.rot.z++;
     } else {
-        PRINTF(T("Warning : 第３-2スタルフォス発生失敗\n", "Warning : 3-2 Stalfos generation failure\n"));
+        PRINTF(T("Warning : 第３-2スタルフォス発生失敗\n", "Warning : 3-2 Stalfos failed to spawn\n"));
     }
     Flags_SetClear(play, this->dyna.actor.room);
 }
diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h
index f37499b2f7..772ee02e31 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h
@@ -2,7 +2,7 @@
 #define Z_BG_MORI_BIGST_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMoriBigst;
 
diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
index 028606443f..8532ce180b 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
@@ -8,9 +8,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "translation.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_mori_objects/object_mori_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h
index 42e45d56fc..14932fe534 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h
@@ -2,7 +2,7 @@
 #define Z_BG_MORI_ELEVATOR_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMoriElevator;
 
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
index 6bd947c3a0..ad41dfc212 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
@@ -14,7 +14,7 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_mori_objects/object_mori_objects.h"
 
@@ -102,8 +102,8 @@ void BgMoriHashigo_InitDynapoly(BgMoriHashigo* this, PlayState* play, CollisionH
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_mori_hashigo.c", 164, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
@@ -140,7 +140,8 @@ s32 BgMoriHashigo_SpawnLadder(BgMoriHashigo* this, PlayState* play) {
     if (ladder != NULL) {
         return true;
     } else {
-        PRINTF("Error : " T("梯子の発生失敗", "Ladder spawn failure") "(%s %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Error : 梯子の発生失敗(%s %d)(arg_data 0x%04x)\n",
+                 "Error : Ladder failed to spawn (%s %d)(arg_data 0x%04x)\n"),
                "../z_bg_mori_hashigo.c", 220, this->dyna.actor.params);
         return false;
     }
@@ -181,12 +182,13 @@ void BgMoriHashigo_Init(Actor* thisx, PlayState* play) {
     }
     this->moriTexObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_MORI_TEX);
     if (this->moriTexObjectSlot < 0) {
-        PRINTF("Error : " T("バンク危険！", "Bank danger!") "(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params,
-               "../z_bg_mori_hashigo.c", 312);
+        PRINTF(T("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", "Error : Bank danger! (arg_data 0x%04x)(%s %d)\n"),
+               this->dyna.actor.params, "../z_bg_mori_hashigo.c", 312);
         Actor_Kill(&this->dyna.actor);
     } else {
         BgMoriHashigo_SetupWaitForMoriTex(this);
-        PRINTF(T("(森の神殿 梯子とその留め金)", "(Forest Temple Ladder and its clasp)") "(arg_data 0x%04x)\n",
+        PRINTF(T("(森の神殿 梯子とその留め金)(arg_data 0x%04x)\n",
+                 "(Forest Temple Ladder and its clasp)(arg_data 0x%04x)\n"),
                this->dyna.actor.params);
     }
 }
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h
index e14aec45e1..99fd9f035e 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h
@@ -2,7 +2,7 @@
 #define Z_BG_MORI_HASHIGO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMoriHashigo;
 
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c
index 21b561a770..fa25e2df8d 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c
@@ -15,7 +15,7 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_mori_objects/object_mori_objects.h"
 
@@ -72,8 +72,8 @@ void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, PlayState* play, Collisio
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_mori_hashira4.c", 155, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
@@ -95,8 +95,8 @@ void BgMoriHashira4_Init(Actor* thisx, PlayState* play) {
     this->moriTexObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_MORI_TEX);
     if (this->moriTexObjectSlot < 0) {
         Actor_Kill(&this->dyna.actor);
-        PRINTF("Error : " T("バンク危険！", "Bank danger!") "(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params,
-               "../z_bg_mori_hashira4.c", 196);
+        PRINTF(T("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", "Error : Bank danger! (arg_data 0x%04x)(%s %d)\n"),
+               this->dyna.actor.params, "../z_bg_mori_hashira4.c", 196);
         return;
     }
     if ((this->dyna.actor.params != 0) && Flags_GetSwitch(play, this->switchFlag)) {
@@ -105,7 +105,8 @@ void BgMoriHashira4_Init(Actor* thisx, PlayState* play) {
     }
     Actor_SetFocus(&this->dyna.actor, 50.0f);
     BgMoriHashira4_SetupWaitForMoriTex(this);
-    PRINTF(T("(森の神殿 ４本柱)", "Forest Temple 4 Pillars") "(arg_data 0x%04x)\n", this->dyna.actor.params);
+    PRINTF(T("(森の神殿 ４本柱)(arg_data 0x%04x)\n", "(Forest Temple 4 Pillars)(arg_data 0x%04x)\n"),
+           this->dyna.actor.params);
     sUnkTimer = 0;
 }
 
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h
index e4ab5a2d85..627126d379 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h
@@ -2,7 +2,7 @@
 #define Z_BG_MORI_HASHIRA4_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMoriHashira4;
 
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
index 92fc3c57a8..e06abd1114 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
@@ -14,9 +14,9 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64curve.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "curve.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_box/object_box.h"
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h
index b9a29df504..2761ab4f6b 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h
@@ -2,7 +2,7 @@
 #define Z_BG_MORI_HINERI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMoriHineri;
 
diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
index eaeb6afc3e..2cd35ab1ee 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
@@ -14,7 +14,7 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_mori_objects/object_mori_objects.h"
 
@@ -80,15 +80,16 @@ void BgMoriIdomizu_Init(Actor* thisx, PlayState* play) {
     this->moriTexObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_MORI_TEX);
     if (this->moriTexObjectSlot < 0) {
         Actor_Kill(&this->actor);
-        PRINTF("Error : " T("バンク危険！", "Bank danger!") "(arg_data 0x%04x)(%s %d)\n", this->actor.params,
-               "../z_bg_mori_idomizu.c", 202);
+        PRINTF(T("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", "Error : Bank danger! (arg_data 0x%04x)(%s %d)\n"),
+               this->actor.params, "../z_bg_mori_idomizu.c", 202);
         return;
     }
     BgMoriIdomizu_SetupWaitForMoriTex(this);
     sIsSpawned = true;
     this->isLoaded = true;
     this->actor.room = -1;
-    PRINTF(T("(森の神殿 井戸水)", "(Forest Temple well water)") "(arg_data 0x%04x)\n", this->actor.params);
+    PRINTF(T("(森の神殿 井戸水)(arg_data 0x%04x)\n", "(Forest Temple well water)(arg_data 0x%04x)\n"),
+           this->actor.params);
 }
 
 void BgMoriIdomizu_Destroy(Actor* thisx, PlayState* play) {
diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h
index 4348622425..3f8c327a59 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h
@@ -2,7 +2,7 @@
 #define Z_BG_MORI_IDOMIZU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMoriIdomizu;
 
diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
index c47a01879f..3f41bf1e79 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
@@ -14,8 +14,8 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_mori_objects/object_mori_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h
index 91c0d65a80..6e7272cee1 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h
@@ -2,7 +2,7 @@
 #define Z_BG_MORI_KAITENKABE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMoriKaitenkabe;
 
diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
index dccddcf49a..8693802846 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
@@ -17,8 +17,8 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_mori_objects/object_mori_objects.h"
 
@@ -68,7 +68,7 @@ void BgMoriRakkatenjo_Init(Actor* thisx, PlayState* play) {
     DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS);
 
 #if DEBUG_FEATURES
-    PRINTF(T("森の神殿 obj. 落下天井", "Forest Temple obj. Falling Ceiling") " (home posY %f)\n",
+    PRINTF(T("森の神殿 obj. 落下天井 (home posY %f)\n", "Forest Temple obj. Falling Ceiling (home posY %f)\n"),
            this->dyna.actor.home.pos.y);
     if ((fabsf(1991.0f - this->dyna.actor.home.pos.x) > 0.001f) ||
         (fabsf(683.0f - this->dyna.actor.home.pos.y) > 0.001f) ||
diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h
index 657baefc53..07feeefd74 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h
@@ -2,7 +2,7 @@
 #define Z_BG_MORI_RAKKATENJO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgMoriRakkatenjo;
 
diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
index 2622c43204..30f2044980 100644
--- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
+++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
@@ -15,10 +15,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_po_sisters/object_po_sisters.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h
index 78fe7fc966..4f299fa3c8 100644
--- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h
+++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h
@@ -2,7 +2,7 @@
 #define Z_BG_PO_EVENT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgPoEvent;
 
diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
index e5b8edea9d..cf9c454583 100644
--- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
+++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
@@ -12,8 +12,8 @@
 #include "ichain.h"
 #include "sfx.h"
 #include "sys_matrix.h"
-#include "z64light.h"
-#include "z64play.h"
+#include "light.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_syokudai/object_syokudai.h"
diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h
index a6186dcbe7..3c50d66794 100644
--- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h
+++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h
@@ -2,8 +2,8 @@
 #define Z_BG_PO_SYOKUDAI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct BgPoSyokudai;
 
diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
index 3392a15f60..49f017a0f9 100644
--- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
+++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
@@ -11,7 +11,7 @@
 #include "ichain.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_pu_box/object_pu_box.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h
index 38cd6857d9..267e141a5c 100644
--- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h
+++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h
@@ -2,7 +2,7 @@
 #define Z_BG_PUSHBOX_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgPushbox;
 
diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
index 37591ae020..52f858a343 100644
--- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
+++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
@@ -10,11 +10,11 @@
 #include "rumble.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64cutscene_flags.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "cutscene_flags.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_relay_objects/object_relay_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h
index 25db5cc5f6..caa91b1567 100644
--- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h
+++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h
@@ -2,7 +2,7 @@
 #define Z_BG_RELAY_OBJECTS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgRelayObjects;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c
index 4a3a760d92..248043de43 100644
--- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c
+++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c
@@ -7,8 +7,8 @@
 #include "z_bg_spot00_break.h"
 
 #include "ichain.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_spot00_break/object_spot00_break.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h
index 17e45aa918..0597a30085 100644
--- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h
+++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT00_BREAK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 
 struct BgSpot00Break;
diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
index c305635b83..8b6ab5ac96 100644
--- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
+++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
@@ -13,11 +13,11 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64cutscene_flags.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "cutscene_flags.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_spot00_objects/object_spot00_objects.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h
index 7780bea692..93b43331fa 100644
--- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h
+++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h
@@ -2,8 +2,8 @@
 #define Z_BG_SPOT00_HANEBASI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct BgSpot00Hanebasi;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
index 413e0a49e0..36a2c78c32 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
+++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
@@ -12,9 +12,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "audio.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_spot01_objects/object_spot01_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h
index e232c6a907..434f5f11ba 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h
+++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT01_FUSYA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot01Fusya;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
index e43acd7a1d..4f65271474 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
+++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
@@ -16,9 +16,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_spot01_objects/object_spot01_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h
index 8d177d3317..c6632d7f37 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h
+++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT01_IDOHASHIRA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot01Idohashira;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c
index 5329d2e0f6..ebeffcc2fb 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c
+++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c
@@ -12,8 +12,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_spot01_objects/object_spot01_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h
index 3d4ff68a6f..20b4a5ef73 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h
+++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT01_IDOMIZU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot01Idomizu;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c
index 6dbdd910d5..b68a23208f 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c
+++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c
@@ -10,8 +10,8 @@
 #include "gfx_setupdl.h"
 #include "ichain.h"
 #include "sys_matrix.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h
index 44981abc07..6e187712ca 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h
+++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT01_IDOSOKO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot01Idosoko;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
index af7dec9c5d..3f50e2e866 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
+++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
@@ -10,8 +10,8 @@
 #include "printf.h"
 #include "segmented_address.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h"
 #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h
index 7ffc3094fe..39fdf213a8 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h
+++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT01_OBJECTS2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot01Objects2;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
index 795df90151..ffe4ee021a 100644
--- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
+++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
@@ -14,10 +14,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_spot02_objects/object_spot02_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h
index 42d4e45b08..32ed8bca35 100644
--- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h
+++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT02_OBJECTS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot02Objects;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c
index 501a677359..e77823866c 100644
--- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c
+++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c
@@ -12,8 +12,8 @@
 #include "one_point_cutscene.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64audio.h"
-#include "z64play.h"
+#include "audio.h"
+#include "play_state.h"
 
 #include "assets/objects/object_spot03_object/object_spot03_object.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h
index 45ad4de4f2..3fd0960883 100644
--- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h
+++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT03_TAKI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum BgSpot03TakiState {
     WATERFALL_CLOSED,
diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c
index edb253568d..1303fad735 100644
--- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c
+++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c
@@ -10,8 +10,8 @@
 #include "one_point_cutscene.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_spot05_objects/object_spot05_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h
index 1aae818797..bc5602264d 100644
--- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h
+++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT05_SOKO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot05Soko;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
index 7c6c943aa7..c3c94063c5 100644
--- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
+++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
@@ -15,9 +15,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_spot06_objects/object_spot06_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h
index cbdc1054f8..c0c555f771 100644
--- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h
+++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT06_OBJECTS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot06Objects;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c
index afb9d02972..bc054e20b9 100644
--- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c
+++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c
@@ -11,8 +11,8 @@
 #include "ichain.h"
 #include "sys_matrix.h"
 #include "versions.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_spot07_object/object_spot07_object.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h
index 30872233ad..1e2a79737a 100644
--- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h
+++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT07_TAKI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot07Taki;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c
index aa8d28b960..ce59f55d04 100644
--- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c
+++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c
@@ -12,8 +12,8 @@
 #include "ichain.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "assets/objects/object_spot08_obj/object_spot08_obj.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h
index a0436ea9ea..2f423b5645 100644
--- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h
+++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT08_BAKUDANKABE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot08Bakudankabe;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c
index 17d9385b00..ee7036a491 100644
--- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c
+++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c
@@ -14,9 +14,9 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_spot08_obj/object_spot08_obj.h"
 
@@ -63,8 +63,8 @@ void BgSpot08Iceblock_InitDynaPoly(BgSpot08Iceblock* this, PlayState* play, Coll
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_spot08_iceblock.c", 0xD9, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
@@ -77,9 +77,9 @@ void BgSpot08Iceblock_CheckParams(BgSpot08Iceblock* this) {
             this->dyna.actor.params = 0x10;
             break;
         default:
-            PRINTF(
-                T("Error : arg_data 設定ミスです。", "Error : arg_data setting error. ") "(%s %d)(arg_data 0x%04x)\n",
-                "../z_bg_spot08_iceblock.c", 0xF6, this->dyna.actor.params);
+            PRINTF(T("Error : arg_data 設定ミスです。(%s %d)(arg_data 0x%04x)\n",
+                     "Error : arg_data setting error. (%s %d)(arg_data 0x%04x)\n"),
+                   "../z_bg_spot08_iceblock.c", 0xF6, this->dyna.actor.params);
             this->dyna.actor.params = 0x10;
             break;
         case 1:
@@ -300,7 +300,7 @@ void BgSpot08Iceblock_Init(Actor* thisx, PlayState* play) {
     BgSpot08Iceblock* this = (BgSpot08Iceblock*)thisx;
     CollisionHeader* colHeader;
 
-    PRINTF("(spot08 " T("流氷", "ice floe") ")(arg_data 0x%04x)\n", this->dyna.actor.params);
+    PRINTF(T("(spot08 流氷)(arg_data 0x%04x)\n", "(spot08 ice floe)(arg_data 0x%04x)\n"), this->dyna.actor.params);
     BgSpot08Iceblock_CheckParams(this);
 
     switch (PARAMS_GET_NOSHIFT(this->dyna.actor.params, 9, 1)) {
diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h
index 1a3f920c3e..45c5976f37 100644
--- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h
+++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT08_ICEBLOCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot08Iceblock;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
index 57b76c4147..8fa33c1d22 100644
--- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
+++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
@@ -13,8 +13,8 @@
 #include "printf.h"
 #include "sys_matrix.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_spot09_obj/object_spot09_obj.h"
 
@@ -148,12 +148,13 @@ s32 func_808B1D44(BgSpot09Obj* this, PlayState* play) {
 void BgSpot09Obj_Init(Actor* thisx, PlayState* play) {
     BgSpot09Obj* this = (BgSpot09Obj*)thisx;
 
-    PRINTF("Spot09 Object [arg_data : 0x%04x](" T("大工救出フラグ", "Carpenter Rescue Flag") " 0x%x)\n",
+    PRINTF(T("Spot09 Object [arg_data : 0x%04x](大工救出フラグ 0x%x)\n",
+             "Spot09 Object [arg_data : 0x%04x](Carpenter Rescue Flag 0x%x)\n"),
            this->dyna.actor.params, GET_EVENTCHKINF_CARPENTERS_RESCUED_FLAGS());
     this->dyna.actor.params &= 0xFF;
     if ((this->dyna.actor.params < 0) || (this->dyna.actor.params >= 5)) {
-        PRINTF(T("Error : Spot 09 object の arg_data が判別出来ない",
-                 "Error : Spot 09 object arg_data cannot be determined") "(%s %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n",
+                 "Error : Spot 09 object arg_data cannot be determined (%s %d)(arg_data 0x%04x)\n"),
                "../z_bg_spot09_obj.c", 322, this->dyna.actor.params);
     }
 
diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h
index 491d7380c2..c0a60964f7 100644
--- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h
+++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT09_OBJ_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot09Obj;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c
index f86d76a2fc..427d9d4a6c 100644
--- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c
+++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c
@@ -12,8 +12,8 @@
 #include "sfx.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_spot11_obj/object_spot11_obj.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
@@ -130,7 +130,7 @@ void BgSpot11Bakudankabe_Init(Actor* thisx, PlayState* play) {
     CollisionHeader_GetVirtual(&gDesertColossusBombableWallCol, &colHeader);
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
     Actor_SetScale(&this->dyna.actor, 1.0f);
-    PRINTF("(spot11 " T("爆弾壁", "Bomb Wall") ")(arg_data 0x%04x)\n", this->dyna.actor.params);
+    PRINTF(T("(spot11 爆弾壁)(arg_data 0x%04x)\n", "(spot11 Bomb Wall)(arg_data 0x%04x)\n"), this->dyna.actor.params);
 }
 
 void BgSpot11Bakudankabe_Destroy(Actor* thisx, PlayState* play) {
diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h
index 5dedab77d5..a4a4910f33 100644
--- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h
+++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT11_BAKUDANKABE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot11Bakudankabe;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c
index 574c2533d0..d4a2be3391 100644
--- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c
+++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c
@@ -17,10 +17,10 @@
 #include "sys_math3d.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64cutscene_flags.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "cutscene_flags.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_spot11_obj/object_spot11_obj.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h
index 0f0ed97e6e..c869405f51 100644
--- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h
+++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT11_OASIS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot11Oasis;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c
index c4fc3fcdc4..f6eae41733 100644
--- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c
+++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c
@@ -13,7 +13,7 @@
 #include "sfx.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_spot12_obj/object_spot12_obj.h"
 
@@ -64,8 +64,8 @@ void BgSpot12Gate_InitDynaPoly(BgSpot12Gate* this, PlayState* play, CollisionHea
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_spot12_gate.c", 145, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h
index bb9ef25cf5..5c8e101db3 100644
--- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h
+++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT12_GATE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot12Gate;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
index f9a5253cea..71674bc12b 100644
--- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
+++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
@@ -12,7 +12,7 @@
 #include "sfx.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_spot12_obj/object_spot12_obj.h"
 
@@ -61,8 +61,8 @@ void func_808B3420(BgSpot12Saku* this, PlayState* play, CollisionHeader* collisi
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_spot12_saku.c", 140, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h
index 7ed7751ede..6c37ec6d97 100644
--- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h
+++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT12_SAKU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot12Saku;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
index eb89d5f06a..650cc50723 100644
--- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
+++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
@@ -13,9 +13,9 @@
 #include "sys_math3d.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_spot15_obj/object_spot15_obj.h"
 
@@ -79,8 +79,8 @@ void func_808B3960(BgSpot15Rrbox* this, PlayState* play, CollisionHeader* collis
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_bg_spot15_rrbox.c", 171, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
@@ -146,7 +146,8 @@ void BgSpot15Rrbox_Init(Actor* thisx, PlayState* play) {
     } else {
         func_808B4084(this, play);
     }
-    PRINTF("(spot15 " T("ロンロン木箱", "Lon Lon Wooden Box") ")(arg_data 0x%04x)\n", this->dyna.actor.params);
+    PRINTF(T("(spot15 ロンロン木箱)(arg_data 0x%04x)\n", "(spot15 Lon Lon Wooden Box)(arg_data 0x%04x)\n"),
+           this->dyna.actor.params);
 }
 
 void BgSpot15Rrbox_Destroy(Actor* thisx, PlayState* play) {
@@ -333,7 +334,8 @@ void func_808B43D0(BgSpot15Rrbox* this, PlayState* play) {
     Actor_MoveXZGravity(actor);
 
     if (actor->world.pos.y <= BGCHECK_Y_MIN + 10.0f) {
-        PRINTF("Warning : " T("ロンロン木箱落ちすぎた", "Lon Lon Wooden Box fell too far") "(%s %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n",
+                 "Warning : Lon Lon Wooden Box fell too far (%s %d)(arg_data 0x%04x)\n"),
                "../z_bg_spot15_rrbox.c", 599, actor->params);
 
         Actor_Kill(actor);
diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h
index d0534e1e73..a55d5c82cc 100644
--- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h
+++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT15_RRBOX_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot15Rrbox;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c
index c053a6c2d1..a95f92eba9 100644
--- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c
+++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c
@@ -10,8 +10,8 @@
 #include "gfx_setupdl.h"
 #include "sfx.h"
 #include "sys_matrix.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_spot15_obj/object_spot15_obj.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h
index 35fcbee90e..6111804318 100644
--- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h
+++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT15_SAKU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot15Saku;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
index 759d2184e3..d3b44d8aeb 100644
--- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
+++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
@@ -15,10 +15,10 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_spot16_obj/object_spot16_obj.h"
 #include "assets/objects/object_bombiwa/object_bombiwa.h"
@@ -240,8 +240,8 @@ s32 func_808B4E58(BgSpot16Bombstone* this, PlayState* play) {
     this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_BOMBIWA);
 
     if (this->requiredObjectSlot < 0) {
-        PRINTF("Error : " T("バンク危険！", "Bank danger! ") "(arg_data 0x%04x)(%s %d)\n", actor->params,
-               "../z_bg_spot16_bombstone.c", 589);
+        PRINTF(T("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", "Error : Bank danger! (arg_data 0x%04x)(%s %d)\n"),
+               actor->params, "../z_bg_spot16_bombstone.c", 589);
         return false;
     }
 
@@ -273,7 +273,8 @@ void BgSpot16Bombstone_Init(Actor* thisx, PlayState* play) {
 
 #if DEBUG_FEATURES
         default:
-            PRINTF(T("Error : arg_data おかしいな", "Error : arg_data is strange") "(%s %d)(arg_data 0x%04x)\n",
+            PRINTF(T("Error : arg_data おかしいな(%s %d)(arg_data 0x%04x)\n",
+                     "Error : arg_data is strange (%s %d)(arg_data 0x%04x)\n"),
                    "../z_bg_spot16_bombstone.c", 668, this->actor.params);
             shouldLive = false;
             break;
@@ -284,8 +285,9 @@ void BgSpot16Bombstone_Init(Actor* thisx, PlayState* play) {
         Actor_Kill(&this->actor);
         return;
     }
-    PRINTF("Spot16 obj " T("爆弾石", "Bomb Stone") " (scaleX %f)(arg_data 0x%04x)\n", this->actor.scale.x,
-           this->actor.params);
+    PRINTF(
+        T("Spot16 obj 爆弾石 (scaleX %f)(arg_data 0x%04x)\n", "Spot16 obj Bomb Stone (scaleX %f)(arg_data 0x%04x)\n"),
+        this->actor.scale.x, this->actor.params);
 }
 
 void BgSpot16Bombstone_Destroy(Actor* thisx, PlayState* play) {
@@ -408,7 +410,8 @@ void func_808B56BC(BgSpot16Bombstone* this, PlayState* play) {
                 player->actor.world.pos.x += sinValue * this->sinRotation;
                 player->actor.world.pos.z += sinValue * this->cosRotation;
             } else {
-                PRINTF(T("Error 補正出来ない", "Error Can't correct") "(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n",
+                PRINTF(T("Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n",
+                         "Error Can't correct (%s %d)(arg_data 0x%04x)(hosei_angY %x)\n"),
                        "../z_bg_spot16_bombstone.c", 935, this->actor.params, adjustedYawDiff);
             }
         }
diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h
index 577bd3863b..74cf8db05f 100644
--- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h
+++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT16_BOMBSTONE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot16Bombstone;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c
index 3ea3dd67ad..dbeb445596 100644
--- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c
+++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c
@@ -13,8 +13,8 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_efc_doughnut/object_efc_doughnut.h"
 
@@ -85,7 +85,8 @@ void BgSpot16Doughnut_Init(Actor* thisx, PlayState* play) {
         } else {
             this->fireFlag |= 1;
         }
-        PRINTF(T("(ｓｐｏｔ１６ ドーナツ雲)", "(spot16 Donut Cloud)") "(arg_data 0x%04x)\n", this->actor.params);
+        PRINTF(T("(ｓｐｏｔ１６ ドーナツ雲)(arg_data 0x%04x)\n", "(spot16 Donut Cloud)(arg_data 0x%04x)\n"),
+               this->actor.params);
     }
 }
 
diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h
index 3b7008ef2d..c453dd1cd0 100644
--- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h
+++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT16_DOUGHNUT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot16Doughnut;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c
index 03f7b4514b..7c5546156c 100644
--- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c
+++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c
@@ -14,8 +14,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_spot17_obj/object_spot17_obj.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h
index fd88416ddf..618682b608 100644
--- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h
+++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT17_BAKUDANKABE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot17Bakudankabe;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c
index b03edd8aae..7d580c9b46 100644
--- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c
+++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c
@@ -12,7 +12,7 @@
 #include "printf.h"
 #include "sys_matrix.h"
 #include "translation.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_spot17_obj/object_spot17_obj.h"
 
@@ -44,7 +44,8 @@ void BgSpot17Funen_Init(Actor* thisx, PlayState* play) {
     BgSpot17Funen* this = (BgSpot17Funen*)thisx;
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
-    PRINTF("spot17 obj. " T("噴煙", "volcanic smoke") " (arg_data 0x%04x)\n", this->actor.params);
+    PRINTF(T("spot17 obj. 噴煙 (arg_data 0x%04x)\n", "spot17 obj. volcanic smoke (arg_data 0x%04x)\n"),
+           this->actor.params);
 }
 
 void BgSpot17Funen_Destroy(Actor* thisx, PlayState* play) {
diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h
index 737719ea28..086d55c449 100644
--- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h
+++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT17_FUNEN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot17Funen;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
index 66d8e2d509..5e4c7896f7 100644
--- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
+++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
@@ -11,9 +11,9 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_spot18_obj/object_spot18_obj.h"
 
@@ -171,7 +171,7 @@ void BgSpot18Basket_Init(Actor* thisx, PlayState* play) {
 
     if (this->dyna.actor.child == NULL) {
         PRINTF_COLOR_RED();
-        PRINTF(T("Ｅｒｒｏｒ : 変化壷蓋発生失敗", "Error : Failed to generate the change pot cover") "(%s %d)\n",
+        PRINTF(T("Ｅｒｒｏｒ : 変化壷蓋発生失敗(%s %d)\n", "Error : Failed to spawn the change pot cover (%s %d)\n"),
                "../z_bg_spot18_basket.c", 351);
         PRINTF_RST();
         Actor_Kill(&this->dyna.actor);
diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h
index 460a56fb12..6b4c85bceb 100644
--- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h
+++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT18_BASKET_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot18Basket;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c
index 21bc50671c..9a30eb90df 100644
--- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c
+++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c
@@ -8,7 +8,7 @@
 
 #include "ichain.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_spot18_obj/object_spot18_obj.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h
index ff0c2cf8ac..a24b60f093 100644
--- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h
+++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT18_FUTA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot18Futa;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c
index d44a14de50..e5ebde92cf 100644
--- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c
+++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c
@@ -14,9 +14,9 @@
 #include "sys_math3d.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_spot18_obj/object_spot18_obj.h"
 
@@ -108,7 +108,8 @@ s32 func_808B8910(BgSpot18Obj* this, PlayState* play) {
     } else if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
         age = 0;
     } else {
-        PRINTF(T("Error : リンク年齢不詳", "Error : Link age unknown") " (%s %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Error : リンク年齢不詳 (%s %d)(arg_data 0x%04x)\n",
+                 "Error : Link age unknown (%s %d)(arg_data 0x%04x)\n"),
                "../z_bg_spot18_obj.c", 182, this->dyna.actor.params);
         return 0;
     }
@@ -121,12 +122,13 @@ s32 func_808B8910(BgSpot18Obj* this, PlayState* play) {
             }
             return D_808B90F0[PARAMS_GET_U(this->dyna.actor.params, 0, 4)][age];
         case 2:
-            PRINTF(T("Error : Obj出現判定が設定されていない",
-                     "Error : Obj appearance detection is not set") "(%s %d)(arg_data 0x%04x)\n",
+            PRINTF(T("Error : Obj出現判定が設定されていない(%s %d)(arg_data 0x%04x)\n",
+                     "Error : Obj appearance detection is not set (%s %d)(arg_data 0x%04x)\n"),
                    "../z_bg_spot18_obj.c", 202, this->dyna.actor.params);
             return 0;
         default:
-            PRINTF(T("Error : Obj出現判定失敗", "Error : Obj appearance check failed") "(%s %d)(arg_data 0x%04x)\n",
+            PRINTF(T("Error : Obj出現判定失敗(%s %d)(arg_data 0x%04x)\n",
+                     "Error : Obj appearance check failed (%s %d)(arg_data 0x%04x)\n"),
                    "../z_bg_spot18_obj.c", 210, this->dyna.actor.params);
     }
     return 0;
diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h
index bfa758afd7..c523ae383e 100644
--- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h
+++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT18_OBJ_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot18Obj;
 
diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c
index a92e53a4f2..b6eacf13f4 100644
--- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c
+++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c
@@ -10,8 +10,8 @@
 #include "one_point_cutscene.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_spot18_obj/object_spot18_obj.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h
index 737d30bdbb..d95dc8fbbc 100644
--- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h
+++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h
@@ -2,7 +2,7 @@
 #define Z_BG_SPOT18_SHUTTER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSpot18Shutter;
 
diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c
index 1ddffb6c98..f2dfdc363f 100644
--- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c
+++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c
@@ -13,8 +13,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_sst/object_sst.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h
index eb4abfa662..7ef76380f5 100644
--- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h
+++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h
@@ -2,7 +2,7 @@
 #define Z_BG_SST_FLOOR_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgSstFloor;
 
diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c
index 47550f22bd..f11e24ef52 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c
+++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c
@@ -10,8 +10,8 @@
 #include "gfx_setupdl.h"
 #include "ichain.h"
 #include "sys_matrix.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_toki_objects/object_toki_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h
index 3c49b61cca..62f668f842 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h
+++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h
@@ -2,7 +2,7 @@
 #define Z_BG_TOKI_HIKARI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgTokiHikari;
 
diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
index a3a3856969..144388d38e 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
+++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
@@ -13,10 +13,10 @@
 #include "sequence.h"
 #include "sfx.h"
 #include "sys_matrix.h"
-#include "z64cutscene_flags.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "cutscene_flags.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_toki_objects/object_toki_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h
index 5fdb9e0692..6ecaa26884 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h
+++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h
@@ -2,7 +2,7 @@
 #define Z_BG_TOKI_SWD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgTokiSwd;
 
diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c
index 123a797a73..efc039ced4 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c
+++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c
@@ -1,5 +1,5 @@
-#include "z64cutscene_commands.h"
-#include "z64player.h"
+#include "cutscene_commands.h"
+#include "player.h"
 
 // clang-format off
 CutsceneData gPullMasterSwordCs[] = {
diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c
index 3e27901701..4de0284695 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c
+++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c
@@ -1,5 +1,5 @@
-#include "z64cutscene_commands.h"
-#include "z64player.h"
+#include "cutscene_commands.h"
+#include "player.h"
 
 // clang-format off
 CutsceneData gPlaceMasterSwordCs[] = {
diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c
index 3e5ccb4ea6..9d40cf7b01 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c
+++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c
@@ -1,5 +1,5 @@
-#include "z64cutscene_commands.h"
-#include "z64player.h"
+#include "cutscene_commands.h"
+#include "player.h"
 
 // clang-format off
 CutsceneData gRevealMasterSwordCs[] = {
diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
index 5a544c3015..5ac35592bd 100644
--- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
+++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
@@ -14,10 +14,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "versions.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_spot04_objects/object_spot04_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h
index 7fea6f8e77..78f7d633c3 100644
--- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h
+++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h
@@ -2,7 +2,7 @@
 #define Z_BG_TREEMOUTH_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgTreemouth;
 
diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c
index c254318d42..fda53b3d9c 100644
--- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c
+++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c
@@ -1,6 +1,6 @@
 #include "sequence.h"
-#include "z64cutscene_commands.h"
-#include "z64player.h"
+#include "cutscene_commands.h"
+#include "player.h"
 
 // clang-format off
 CutsceneData gDekuTreeMeetingCs[] = {
diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c
index 63a73aaf4e..ce538ce9b4 100644
--- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c
+++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c
@@ -8,8 +8,8 @@
 
 #include "ichain.h"
 #include "regs.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_umajump/object_umajump.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h
index 067b5195c8..620350f4c4 100644
--- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h
+++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h
@@ -2,7 +2,7 @@
 #define Z_BG_UMAJUMP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgUmaJump;
 
diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c
index 679519f1be..a3ef2197eb 100644
--- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c
+++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c
@@ -15,8 +15,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_fd/object_fd.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h
index 1dcee1b596..9371f91521 100644
--- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h
+++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h
@@ -2,7 +2,7 @@
 #define Z_BG_VB_SIMA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgVbSima;
 
diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c
index f759a98148..1d563eda76 100644
--- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c
+++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c
@@ -13,7 +13,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_ydan_objects/object_ydan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h
index a308c6ebc0..6f938f887b 100644
--- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h
+++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h
@@ -2,7 +2,7 @@
 #define Z_BG_YDAN_HASI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgYdanHasi;
 
diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c
index e338635846..8d683a9422 100644
--- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c
+++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c
@@ -10,7 +10,7 @@
 #include "one_point_cutscene.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_ydan_objects/object_ydan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h
index 450c550b3a..6fb6724364 100644
--- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h
+++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h
@@ -2,7 +2,7 @@
 #define Z_BG_YDAN_MARUTA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgYdanMaruta;
 
diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c
index d6b7fcf476..9e6fca4b52 100644
--- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c
+++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c
@@ -16,9 +16,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_ydan_objects/object_ydan_objects.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h
index 467ec18383..300fb42cfc 100644
--- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h
+++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h
@@ -2,7 +2,7 @@
 #define Z_BG_YDAN_SP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgYdanSp;
 
diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c
index 7a12637b9d..f607fb4150 100644
--- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c
+++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c
@@ -15,7 +15,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_zg/object_zg.h"
 
diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h
index c7f1add3a5..7791107db3 100644
--- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h
+++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h
@@ -2,7 +2,7 @@
 #define Z_BG_ZG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgZg;
 
diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
index bfc700c6dc..56db81767b 100644
--- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
+++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
@@ -15,11 +15,12 @@
 #include "sequence.h"
 #include "sfx.h"
 #include "sys_matrix.h"
+#include "tex_len.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_kingdodongo/object_kingdodongo.h"
 #include "assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h"
@@ -69,7 +70,18 @@ ActorProfile Boss_Dodongo_Profile = {
 };
 
 #include "z_boss_dodongo_data.inc.c"
-#include "assets/overlays/ovl_Boss_Dodongo/ovl_Boss_Dodongo.c"
+
+#define sLavaFloorLavaTex_WIDTH 64
+#define sLavaFloorLavaTex_HEIGHT 64
+static u64 sLavaFloorLavaTex[TEX_LEN(u64, sLavaFloorLavaTex_WIDTH, sLavaFloorLavaTex_HEIGHT, 16)] = {
+#include "assets/overlays/ovl_Boss_Dodongo/sLavaFloorLavaTex.rgba16.inc.c"
+};
+
+#define sLavaFloorRockTex_WIDTH 32
+#define sLavaFloorRockTex_HEIGHT 64
+static u64 sLavaFloorRockTex[TEX_LEN(u64, sLavaFloorRockTex_WIDTH, sLavaFloorRockTex_HEIGHT, 16)] = {
+#include "assets/overlays/ovl_Boss_Dodongo/sLavaFloorRockTex.rgba16.inc.c"
+};
 
 static InitChainEntry sInitChain[] = {
     ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_5, ICHAIN_CONTINUE),
diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h
index 191487f13f..3dbd41cd5e 100644
--- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h
+++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h
@@ -2,7 +2,7 @@
 #define Z_BOSS_DODONGO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BossDodongo;
 
diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c
index 3d0061bb35..ce2d694b11 100644
--- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c
+++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c
@@ -1,4 +1,4 @@
-#include "z64collision_check.h"
+#include "collision_check.h"
 
 static u8 D_808C7000[] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1,
diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
index 3b80c5804c..5643da5d98 100644
--- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
+++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
@@ -25,10 +25,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_fd/object_fd.h"
diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h
index 1ec72040c9..99bd75c6d6 100644
--- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h
+++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h
@@ -2,7 +2,7 @@
 #define Z_BOSS_FD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BossFd;
 
diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c
index 1012117e52..edd02bd7d9 100644
--- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c
+++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c
@@ -1,4 +1,4 @@
-#include "z64collision_check.h"
+#include "collision_check.h"
 
 static ColliderJntSphElementInit sJntSphElementsInit[19] = {
     {
diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
index 856f9e34ea..efc154e97f 100644
--- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
+++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
@@ -23,8 +23,8 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_fd2/object_fd2.h"
 
diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h
index d9fbde0ada..2c9fbf6b81 100644
--- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h
+++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h
@@ -2,7 +2,7 @@
 #define Z_BOSS_FD2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BossFd2;
 
diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c
index 3a432692fe..2323528180 100644
--- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c
+++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c
@@ -1,4 +1,4 @@
-#include "z64collision_check.h"
+#include "collision_check.h"
 
 static ColliderJntSphElementInit sJntSphElementsInit[9] = {
     {
diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
index 139d684deb..c9e41de7d7 100644
--- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
+++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
@@ -21,10 +21,10 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h"
 #include "assets/objects/object_ganon/object_ganon.h"
diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
index eb7fc2e2bf..4864087bc6 100644
--- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
+++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
@@ -2,7 +2,7 @@
 #define Z_BOSS_GANON_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BossGanon;
 
diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
index 6575106be0..c04012ba6e 100644
--- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
+++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
@@ -19,10 +19,10 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ganon/object_ganon.h"
 #include "assets/objects/object_ganon2/object_ganon2.h"
diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h
index c72fbd1e25..0258746798 100644
--- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h
+++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h
@@ -2,7 +2,7 @@
 #define Z_BOSS_GANON2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BossGanon2;
 
diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
index 848707f002..09f84081de 100644
--- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
+++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
@@ -26,10 +26,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_gnd/object_gnd.h"
 
diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h
index 1fed43e428..df76f54750 100644
--- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h
+++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h
@@ -2,8 +2,8 @@
 #define Z_BOSS_GANONDROF_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct BossGanondrof;
 
diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
index bfd115b535..0d83b2b4a3 100644
--- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
+++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
@@ -25,11 +25,11 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64environment.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "environment.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_goma/object_goma.h"
 
diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h
index 4e4c8ea955..7d8a3c9387 100644
--- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h
+++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h
@@ -2,7 +2,7 @@
 #define Z_BOSS_GOMA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BossGoma;
 
diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
index c12ca1e950..4a1b0acbba 100644
--- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
+++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
@@ -28,12 +28,12 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_mo/object_mo.h"
diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h
index 88867ceeda..54e95a74e7 100644
--- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h
+++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h
@@ -2,7 +2,7 @@
 #define Z_BOSS_MO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BossMo;
 
diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c
index 1148cf1a99..8063245fa3 100644
--- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c
+++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c
@@ -1,4 +1,4 @@
-#include "z64collision_check.h"
+#include "collision_check.h"
 
 static ColliderJntSphElementInit sJntSphElementsInit[19] = {
     {
diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
index 89ba5fab34..fd18b10ece 100644
--- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
+++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
@@ -23,11 +23,11 @@
 #include "versions.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/object_sst/object_sst.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
@@ -2552,7 +2552,7 @@ void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) {
         s32 bothHands = true;
 
         this->colliderJntSph.base.acFlags &= ~AC_HIT;
-        if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) {
+        if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) {
             this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT);
             this->colliderJntSph.base.acFlags &= ~AC_ON;
             this->colliderJntSph.base.ocFlags1 &= ~OC1_NO_PUSH;
@@ -2563,7 +2563,7 @@ void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) {
             }
 
             this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
-            if (this->actor.colChkInfo.damageEffect == 3) {
+            if (this->actor.colChkInfo.damageReaction == 3) {
                 BossSst_HandSetupFrozen(this);
             } else {
                 BossSst_HandSetupReel(this);
@@ -2583,7 +2583,7 @@ void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) {
 void BossSst_HeadCollisionCheck(BossSst* this, PlayState* play) {
     if (this->colliderCylinder.base.acFlags & AC_HIT) {
         this->colliderCylinder.base.acFlags &= ~AC_HIT;
-        if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) {
+        if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) {
             if (this->actionFunc == BossSst_HeadVulnerable) {
                 if (Actor_ApplyDamage(&this->actor) == 0) {
                     Enemy_StartFinishingBlow(play, &this->actor);
diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h
index caf4891ccb..1cd1f7663b 100644
--- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h
+++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h
@@ -2,7 +2,7 @@
 #define Z_BOSS_SST_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BossSst;
 
diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c
index 0016ff93d5..cb0e5012c1 100644
--- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c
+++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c
@@ -1,4 +1,4 @@
-#include "z64collision_check.h"
+#include "collision_check.h"
 
 static ColliderJntSphElementInit sJntSphElementsInitHand[11] = {
     {
diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
index 85309e6e6b..79eb682a76 100644
--- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
+++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
@@ -18,10 +18,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_tw/object_tw.h"
diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h
index df62aeff37..17ce1ae4ca 100644
--- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h
+++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h
@@ -2,7 +2,7 @@
 #define Z_BOSS_TW_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BossTw;
 
diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
index aec25c7cf2..7cbbff4c3e 100644
--- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
+++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
@@ -21,10 +21,10 @@
 #include "sys_math.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_bv/object_bv.h"
@@ -1402,7 +1402,7 @@ void BossVa_BodyPhase4(BossVa* this, PlayState* play) {
         if (this->timer >= 0) {
             if (this->invincibilityTimer == 0) {
                 this->invincibilityTimer = 8;
-                if (this->actor.colChkInfo.damageEffect != 1) {
+                if (this->actor.colChkInfo.damageReaction != 1) {
                     this->actor.world.rot.y = this->actor.yawTowardsPlayer;
                     Actor_PlaySfx(&this->actor, NA_SE_EN_BALINADE_DAMAGE);
                     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 12);
diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.h b/src/overlays/actors/ovl_Boss_Va/z_boss_va.h
index 628831ad2f..60a35dd61c 100644
--- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.h
+++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.h
@@ -2,7 +2,7 @@
 #define Z_BOSS_VA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BossVa;
 
diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
index 1673a99601..076c395093 100644
--- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
+++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
@@ -17,11 +17,11 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "audio.h"
+#include "effect.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_demo_6k/object_demo_6k.h"
diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h
index 5849ccc236..3e88fb50ed 100644
--- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h
+++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h
@@ -2,8 +2,8 @@
 #define Z_DEMO_6K_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct Demo6K;
 
diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
index d3d275de9e..4bd2cf54e3 100644
--- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
+++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
@@ -12,10 +12,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_du/object_du.h"
 
diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h
index ede2756e05..fbd557a6f7 100644
--- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h
+++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h
@@ -2,7 +2,7 @@
 #define Z_DEMO_DU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DemoDu;
 
diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c
index ad83a24185..1f8e223ba1 100644
--- a/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c
+++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c
@@ -1,6 +1,6 @@
 #include "sequence.h"
-#include "z64cutscene_commands.h"
-#include "z64player.h"
+#include "cutscene_commands.h"
+#include "player.h"
 
 // clang-format off
 static CutsceneData gFireMedallionCs[] = {
diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
index c2c86d8a04..817234eea7 100644
--- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
+++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
@@ -14,8 +14,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_zo/object_zo.h"
 #include "assets/objects/object_ec/object_ec.h"
diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h
index 494338b27d..b850b071ac 100644
--- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h
+++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h
@@ -2,7 +2,7 @@
 #define Z_DEMO_EC_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DemoEc;
 
diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
index 9eac9a59f6..b0594e2e53 100644
--- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
@@ -16,13 +16,13 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64curve.h"
-#include "z64draw.h"
-#include "z64cutscene_flags.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "audio.h"
+#include "curve.h"
+#include "draw.h"
+#include "cutscene_flags.h"
+#include "effect.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_efc_crystal_light/object_efc_crystal_light.h"
diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
index 12b22a1ad5..05747ff8dd 100644
--- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
+++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
@@ -2,8 +2,8 @@
 #define Z_DEMO_EFFECT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64curve.h"
+#include "actor.h"
+#include "curve.h"
 
 struct DemoEffect;
 
diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
index 8720d49df2..e4a944a0a2 100644
--- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
+++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
@@ -14,8 +14,8 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64skin.h"
+#include "play_state.h"
+#include "skin.h"
 
 #include "assets/objects/object_fhg/object_fhg.h"
 
diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h
index 2eadc4af69..e34a059d50 100644
--- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h
+++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h
@@ -2,7 +2,7 @@
 #define Z_DEMO_EXT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DemoExt;
 
diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
index 5446d622fb..fe2fd1a13d 100644
--- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
+++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
@@ -15,7 +15,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_geff/object_geff.h"
 
diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h
index 03c6110fae..a70c72f593 100644
--- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h
+++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h
@@ -2,7 +2,7 @@
 #define Z_DEMO_GEFF_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DemoGeff;
 
diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
index 3445287f34..03d2fdbf89 100644
--- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
+++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
@@ -20,11 +20,11 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64draw.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "draw.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_gj/object_gj.h"
 
diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h
index 313788893f..a26987eb34 100644
--- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h
+++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h
@@ -2,7 +2,7 @@
 #define Z_DEMO_GJ_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #include "overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h"
 
diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c
index 4ea8f4b685..2266a7c61e 100644
--- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c
+++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c
@@ -15,8 +15,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/object_oF1d_map/object_oF1d_map.h"
 
diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.h b/src/overlays/actors/ovl_Demo_Go/z_demo_go.h
index 9abd5ed41c..9d68200c8d 100644
--- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.h
+++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.h
@@ -2,7 +2,7 @@
 #define Z_DEMO_GO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DemoGo;
 
diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
index 006a9267d3..444e683285 100644
--- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
+++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
@@ -14,11 +14,11 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64frame_advance.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "audio.h"
+#include "effect.h"
+#include "frame_advance.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_gt/object_gt.h"
 #include "assets/objects/object_geff/object_geff.h"
diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h
index 910c265939..0826a7bd81 100644
--- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h
+++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h
@@ -2,7 +2,7 @@
 #define Z_DEMO_GT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DemoGt;
 
diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
index a5dff0d4a3..ef3da8a40d 100644
--- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
+++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
@@ -8,8 +8,8 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_ik/object_ik.h"
 
diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h
index b4f2ca74ea..4571fff288 100644
--- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h
+++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h
@@ -2,7 +2,7 @@
 #define Z_DEMO_IK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DemoIk;
 
diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
index 508128f7be..81667318e8 100644
--- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
+++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
@@ -18,9 +18,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h"
 #include "assets/objects/object_im/object_im.h"
diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.h b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h
index 9477c21d8f..ac3e06250c 100644
--- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.h
+++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h
@@ -2,7 +2,7 @@
 #define Z_DEMO_IM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DemoIm;
 
diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c
index 7a9a0dde84..210fcdc5b7 100644
--- a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c
+++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c
@@ -1,5 +1,5 @@
 #include "sequence.h"
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 static CutsceneData gShadowMedallionCs[] = {
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
index 5518ce754e..60d023f6b8 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
@@ -10,13 +10,13 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64cutscene_commands.h"
-#include "z64cutscene_flags.h"
-#include "z64cutscene_spline.h"
-#include "z64olib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "cutscene_commands.h"
+#include "cutscene_flags.h"
+#include "cutscene_spline.h"
+#include "olib.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_efc_star_field/object_efc_star_field.h"
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
index 06501904ac..1899cc05ba 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
@@ -2,7 +2,7 @@
 #define Z_DEMO_KANKYO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DemoKankyo;
 
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c
index 4e17a4a53c..1a082a9cbc 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c
@@ -1,4 +1,4 @@
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 CutsceneData gAdultWarpInCS[] = {
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c
index 2a6e3f3e5d..439f78e05d 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c
@@ -1,5 +1,5 @@
 #include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 CutsceneData gAdultWarpOutCS[] = {
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c
index e742384ec2..d7d091cc55 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c
@@ -1,5 +1,5 @@
 #include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 CutsceneData gAdultWarpInToTCS[] = {
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c
index 53f2b5133a..731e9e286e 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c
@@ -1,5 +1,5 @@
 #include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 CutsceneData gAdultWarpOutToTCS[] = {
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c
index e1092b34dd..d9b6df92cb 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c
@@ -1,5 +1,5 @@
 #include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 CutsceneData gChildWarpInCS[] = {
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c
index 9e8a7c6bc6..69b239655c 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c
@@ -1,5 +1,5 @@
 #include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 CutsceneData gChildWarpOutCS[] = {
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c
index 3a718366c3..f4c06dbbc0 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c
@@ -1,5 +1,5 @@
 #include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 CutsceneData gChildWarpInToTCS[] = {
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c
index 84e12ec7a8..740639ab29 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c
@@ -1,5 +1,5 @@
 #include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 CutsceneData gChildWarpOutToTCS[] = {
diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
index 2a79aef458..3ba0504137 100644
--- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
+++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
@@ -6,7 +6,6 @@
 
 #include "z_demo_kekkai.h"
 
-#include "libu64/debug.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "rand.h"
@@ -14,11 +13,12 @@
 #include "sequence.h"
 #include "sfx.h"
 #include "sys_matrix.h"
+#include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 #include "assets/scenes/dungeons/ganontika/ganontika_scene.h"
@@ -267,8 +267,7 @@ void DemoKekkai_TrialBarrierIdle(Actor* thisx, PlayState* play) {
     CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider1.base);
     if (this->collider2.base.acFlags & AC_HIT) {
         Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
-        // "I got it"
-        LOG_STRING("当ったよ", "../z_demo_kekkai.c", 572);
+        LOG_STRING_T("当ったよ", "I got it", "../z_demo_kekkai.c", 572);
         this->actor.update = DemoKekkai_TrialBarrierDispel;
         this->timer = 0;
         play->csCtx.script = SEGMENTED_TO_VIRTUAL(sSageCutscenes[this->actor.params]);
diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h
index 182b1d587c..f800075019 100644
--- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h
+++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h
@@ -2,7 +2,7 @@
 #define Z_DEMO_KEKKAI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DemoKekkai;
 
diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
index 5831c44b06..fb44ec0376 100644
--- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
+++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
@@ -18,9 +18,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_sa/object_sa.h"
 
diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h
index 639d50a634..e9c0d5dc2e 100644
--- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h
+++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h
@@ -2,7 +2,7 @@
 #define Z_DEMO_SA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DemoSa;
 
diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c
index 67edd6cb9f..5440aabf98 100644
--- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c
+++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c
@@ -1,5 +1,5 @@
 #include "z_demo_sa.h"
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 static CutsceneData gForestMedallionCs[] = {
diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
index 549daf0db7..1c6ea8559b 100644
--- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
+++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
@@ -10,8 +10,8 @@
 #include "gfx_setupdl.h"
 #include "sequence.h"
 #include "sys_matrix.h"
-#include "z64audio.h"
-#include "z64play.h"
+#include "audio.h"
+#include "play_state.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h
index eb62a3983f..c8bdb04ded 100644
--- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h
+++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h
@@ -2,7 +2,7 @@
 #define Z_DEMO_SHD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DemoShd;
 
diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
index 992417b888..ece0958ad2 100644
--- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
+++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
@@ -6,9 +6,9 @@
 #include "printf.h"
 #include "sfx.h"
 #include "translation.h"
-#include "z64curve.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "curve.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_box/object_box.h"
 
diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h
index 47f6c35642..5b4947575b 100644
--- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h
+++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h
@@ -2,8 +2,8 @@
 #define Z_DEMO_TRE_LGT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64curve.h"
+#include "actor.h"
+#include "curve.h"
 
 struct DemoTreLgt;
 
diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
index 4034dafc91..80c94c19b1 100644
--- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
+++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
@@ -11,10 +11,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64cutscene_flags.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "cutscene_flags.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 
diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h
index 0092bd8f1a..2a8fa0eb38 100644
--- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h
+++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h
@@ -2,7 +2,7 @@
 #define Z_DOOR_ANA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DoorAna;
 
diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c
index 2f9f4e1183..5483a07db7 100644
--- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c
+++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c
@@ -12,9 +12,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_door_gerudo/object_door_gerudo.h"
 
diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h
index efd2959767..5e9a5e5f35 100644
--- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h
+++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h
@@ -2,7 +2,7 @@
 #define Z_DOOR_GERUDO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DoorGerudo;
 
diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
index 15d92cb18a..dc016d34b6 100644
--- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
+++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
@@ -13,9 +13,9 @@
 #include "segmented_address.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.h b/src/overlays/actors/ovl_Door_Killer/z_door_killer.h
index 32eaaeb014..e431e5337b 100644
--- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.h
+++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.h
@@ -2,7 +2,7 @@
 #define Z_DOOR_KILLER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 /*
  * Associated switch flag: (params >> 8) & 0x3F
diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
index 05eec20ffa..3d0b9603dd 100644
--- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
@@ -20,10 +20,10 @@
 #include "quake.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_gnd/object_gnd.h"
diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h
index 8ab1c8a4c7..ac2706acdf 100644
--- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h
+++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h
@@ -2,7 +2,7 @@
 #define Z_DOOR_SHUTTER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 /**
  * Actor Parameters
diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c
index ceef1f93f6..c4c9d2f25e 100644
--- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c
+++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c
@@ -7,8 +7,8 @@
 #include "z_door_toki.h"
 
 #include "ichain.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_toki_objects/object_toki_objects.h"
 
diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.h b/src/overlays/actors/ovl_Door_Toki/z_door_toki.h
index 8e276c56bd..fd0d8105b1 100644
--- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.h
+++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.h
@@ -2,7 +2,7 @@
 #define Z_DOOR_TOKI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct DoorToki;
 
diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
index 1ec17157c9..dd99eb63c0 100644
--- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
@@ -11,10 +11,10 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_warp1/object_warp1.h"
 
diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
index ff8a89d9b1..b7a07cf20c 100644
--- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
+++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
@@ -2,8 +2,8 @@
 #define Z_DOOR_WARP1_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct DoorWarp1;
 
diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c
index 677458f186..53790dd7f4 100644
--- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c
+++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c
@@ -7,9 +7,9 @@
 #include "sequence.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "audio.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_efc_erupc/object_efc_erupc.h"
 
diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h
index 888d9580ef..bf97f8e395 100644
--- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h
+++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h
@@ -2,7 +2,7 @@
 #define Z_EFC_ERUPC_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EfcErupc;
 
diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
index e8f9f26841..10875e547b 100644
--- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
+++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
@@ -14,8 +14,8 @@
 #include "segmented_address.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
index 153b6d4e2a..b107e82dd8 100644
--- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
+++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
@@ -2,7 +2,7 @@
 #define Z_EFF_DUST_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EffDust;
 
diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
index 1c74a38432..fd54803e25 100644
--- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
+++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
@@ -6,7 +6,6 @@
 
 #include "z_elf_msg.h"
 
-#include "libu64/debug.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@@ -15,8 +14,8 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 
@@ -64,14 +63,14 @@ void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc) {
 s32 ElfMsg_KillCheck(ElfMsg* this, PlayState* play) {
     if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) &&
         Flags_GetSwitch(play, this->actor.world.rot.y - 1)) {
-        LOG_STRING("共倒れ", "../z_elf_msg.c", 161); // "Mutual destruction"
+        LOG_STRING_T("共倒れ", "Mutual destruction", "../z_elf_msg.c", 161);
         if (PARAMS_GET_U(this->actor.params, 8, 6) != 0x3F) {
             Flags_SetSwitch(play, PARAMS_GET_U(this->actor.params, 8, 6));
         }
         Actor_Kill(&this->actor);
         return 1;
     } else if ((this->actor.world.rot.y == -1) && Flags_GetClear(play, this->actor.room)) {
-        LOG_STRING("共倒れ", "../z_elf_msg.c", 172); // "Mutual destruction"
+        LOG_STRING_T("共倒れ", "Mutual destruction", "../z_elf_msg.c", 172);
         if (PARAMS_GET_U(this->actor.params, 8, 6) != 0x3F) {
             Flags_SetSwitch(play, PARAMS_GET_U(this->actor.params, 8, 6));
         }
diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
index c95cbb527f..14412b5310 100644
--- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
+++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
@@ -2,7 +2,7 @@
 #define Z_ELF_MSG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ElfMsg;
 
diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
index f6beb6cc82..11a01bc4b8 100644
--- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
+++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
@@ -6,7 +6,6 @@
 
 #include "z_elf_msg2.h"
 
-#include "libu64/debug.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@@ -14,7 +13,8 @@
 #include "regs.h"
 #include "sys_matrix.h"
 #include "terminal.h"
-#include "z64play.h"
+#include "translation.h"
+#include "play_state.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
@@ -61,14 +61,14 @@ void ElfMsg2_SetupAction(ElfMsg2* this, ElfMsg2ActionFunc actionFunc) {
 s32 ElfMsg2_KillCheck(ElfMsg2* this, PlayState* play) {
     if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) &&
         Flags_GetSwitch(play, this->actor.world.rot.y - 1)) {
-        LOG_STRING("共倒れ", "../z_elf_msg2.c", 171); // "Mutual destruction"
+        LOG_STRING_T("共倒れ", "Mutual destruction", "../z_elf_msg2.c", 171);
         if (PARAMS_GET_U(this->actor.params, 8, 6) != 0x3F) {
             Flags_SetSwitch(play, PARAMS_GET_U(this->actor.params, 8, 6));
         }
         Actor_Kill(&this->actor);
         return 1;
     } else if ((this->actor.world.rot.y == -1) && Flags_GetClear(play, this->actor.room)) {
-        LOG_STRING("共倒れ２", "../z_elf_msg2.c", 182); // "Mutual destruction 2"
+        LOG_STRING_T("共倒れ２", "Mutual destruction 2", "../z_elf_msg2.c", 182);
         if (PARAMS_GET_U(this->actor.params, 8, 6) != 0x3F) {
             Flags_SetSwitch(play, PARAMS_GET_U(this->actor.params, 8, 6));
         }
@@ -77,7 +77,7 @@ s32 ElfMsg2_KillCheck(ElfMsg2* this, PlayState* play) {
     } else if (PARAMS_GET_U(this->actor.params, 8, 6) == 0x3F) {
         return 0;
     } else if (Flags_GetSwitch(play, PARAMS_GET_U(this->actor.params, 8, 6))) {
-        LOG_STRING("共倒れ", "../z_elf_msg2.c", 192); // "Mutual destruction"
+        LOG_STRING_T("共倒れ", "Mutual destruction", "../z_elf_msg2.c", 192);
         Actor_Kill(&this->actor);
         return 1;
     }
diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h
index 5a0a693415..70ae86801e 100644
--- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h
+++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h
@@ -2,7 +2,7 @@
 #define Z_ELF_MSG2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ElfMsg2;
 
diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c
index 3f7649ea7e..6b382ca364 100644
--- a/src/overlays/actors/ovl_En_Am/z_en_am.c
+++ b/src/overlays/actors/ovl_En_Am/z_en_am.c
@@ -16,9 +16,9 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_am/object_am.h"
 
@@ -127,48 +127,48 @@ static ColliderQuadInit sQuadInit = {
     { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
 };
 
-typedef enum ArmosDamageEffect {
-    /*  0 */ AM_DMGEFF_NONE, // used by anything that can't kill the armos
-    /*  1 */ AM_DMGEFF_NUT,
-    /*  6 */ AM_DMGEFF_STUN = 6, // doesn't include deku nuts
-    /* 13 */ AM_DMGEFF_ICE = 13,
-    /* 14 */ AM_DMGEFF_MAGIC_FIRE_LIGHT,
-    /* 15 */ AM_DMGEFF_KILL // any damage source that can kill the armos (and isn't a special case)
-} ArmosDamageEffect;
+typedef enum ArmosDamageReaction {
+    /*  0 */ AM_DMG_REACT_NONE, // used by anything that can't kill the armos
+    /*  1 */ AM_DMG_REACT_NUT,
+    /*  6 */ AM_DMG_REACT_STUN = 6, // doesn't include deku nuts
+    /* 13 */ AM_DMG_REACT_ICE = 13,
+    /* 14 */ AM_DMG_REACT_MAGIC_FIRE_LIGHT,
+    /* 15 */ AM_DMG_REACT_KILL // any damage source that can kill the armos (and isn't a special case)
+} ArmosDamageReaction;
 
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, AM_DMGEFF_NUT),
-    /* Deku stick    */ DMG_ENTRY(2, AM_DMGEFF_NONE),
-    /* Slingshot     */ DMG_ENTRY(1, AM_DMGEFF_NONE),
-    /* Explosive     */ DMG_ENTRY(2, AM_DMGEFF_KILL),
-    /* Boomerang     */ DMG_ENTRY(0, AM_DMGEFF_STUN),
-    /* Normal arrow  */ DMG_ENTRY(2, AM_DMGEFF_KILL),
-    /* Hammer swing  */ DMG_ENTRY(2, AM_DMGEFF_KILL),
-    /* Hookshot      */ DMG_ENTRY(0, AM_DMGEFF_STUN),
-    /* Kokiri sword  */ DMG_ENTRY(1, AM_DMGEFF_NONE),
-    /* Master sword  */ DMG_ENTRY(2, AM_DMGEFF_KILL),
-    /* Giant's Knife */ DMG_ENTRY(4, AM_DMGEFF_KILL),
-    /* Fire arrow    */ DMG_ENTRY(2, AM_DMGEFF_KILL),
-    /* Ice arrow     */ DMG_ENTRY(4, AM_DMGEFF_ICE),
-    /* Light arrow   */ DMG_ENTRY(2, AM_DMGEFF_KILL),
-    /* Unk arrow 1   */ DMG_ENTRY(2, AM_DMGEFF_NONE),
-    /* Unk arrow 2   */ DMG_ENTRY(2, AM_DMGEFF_NONE),
-    /* Unk arrow 3   */ DMG_ENTRY(2, AM_DMGEFF_NONE),
-    /* Fire magic    */ DMG_ENTRY(0, AM_DMGEFF_MAGIC_FIRE_LIGHT),
-    /* Ice magic     */ DMG_ENTRY(3, AM_DMGEFF_ICE),
-    /* Light magic   */ DMG_ENTRY(0, AM_DMGEFF_MAGIC_FIRE_LIGHT),
-    /* Shield        */ DMG_ENTRY(0, AM_DMGEFF_NONE),
-    /* Mirror Ray    */ DMG_ENTRY(0, AM_DMGEFF_NONE),
-    /* Kokiri spin   */ DMG_ENTRY(1, AM_DMGEFF_NONE),
-    /* Giant spin    */ DMG_ENTRY(4, AM_DMGEFF_KILL),
-    /* Master spin   */ DMG_ENTRY(2, AM_DMGEFF_KILL),
-    /* Kokiri jump   */ DMG_ENTRY(2, AM_DMGEFF_NONE),
-    /* Giant jump    */ DMG_ENTRY(8, AM_DMGEFF_KILL),
-    /* Master jump   */ DMG_ENTRY(4, AM_DMGEFF_KILL),
-    /* Unknown 1     */ DMG_ENTRY(0, AM_DMGEFF_NONE),
-    /* Unblockable   */ DMG_ENTRY(0, AM_DMGEFF_NONE),
-    /* Hammer jump   */ DMG_ENTRY(4, AM_DMGEFF_KILL),
-    /* Unknown 2     */ DMG_ENTRY(0, AM_DMGEFF_NONE),
+    /* Deku nut      */ DMG_ENTRY(0, AM_DMG_REACT_NUT),
+    /* Deku stick    */ DMG_ENTRY(2, AM_DMG_REACT_NONE),
+    /* Slingshot     */ DMG_ENTRY(1, AM_DMG_REACT_NONE),
+    /* Explosive     */ DMG_ENTRY(2, AM_DMG_REACT_KILL),
+    /* Boomerang     */ DMG_ENTRY(0, AM_DMG_REACT_STUN),
+    /* Normal arrow  */ DMG_ENTRY(2, AM_DMG_REACT_KILL),
+    /* Hammer swing  */ DMG_ENTRY(2, AM_DMG_REACT_KILL),
+    /* Hookshot      */ DMG_ENTRY(0, AM_DMG_REACT_STUN),
+    /* Kokiri sword  */ DMG_ENTRY(1, AM_DMG_REACT_NONE),
+    /* Master sword  */ DMG_ENTRY(2, AM_DMG_REACT_KILL),
+    /* Giant's Knife */ DMG_ENTRY(4, AM_DMG_REACT_KILL),
+    /* Fire arrow    */ DMG_ENTRY(2, AM_DMG_REACT_KILL),
+    /* Ice arrow     */ DMG_ENTRY(4, AM_DMG_REACT_ICE),
+    /* Light arrow   */ DMG_ENTRY(2, AM_DMG_REACT_KILL),
+    /* Unk arrow 1   */ DMG_ENTRY(2, AM_DMG_REACT_NONE),
+    /* Unk arrow 2   */ DMG_ENTRY(2, AM_DMG_REACT_NONE),
+    /* Unk arrow 3   */ DMG_ENTRY(2, AM_DMG_REACT_NONE),
+    /* Fire magic    */ DMG_ENTRY(0, AM_DMG_REACT_MAGIC_FIRE_LIGHT),
+    /* Ice magic     */ DMG_ENTRY(3, AM_DMG_REACT_ICE),
+    /* Light magic   */ DMG_ENTRY(0, AM_DMG_REACT_MAGIC_FIRE_LIGHT),
+    /* Shield        */ DMG_ENTRY(0, AM_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, AM_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(1, AM_DMG_REACT_NONE),
+    /* Giant spin    */ DMG_ENTRY(4, AM_DMG_REACT_KILL),
+    /* Master spin   */ DMG_ENTRY(2, AM_DMG_REACT_KILL),
+    /* Kokiri jump   */ DMG_ENTRY(2, AM_DMG_REACT_NONE),
+    /* Giant jump    */ DMG_ENTRY(8, AM_DMG_REACT_KILL),
+    /* Master jump   */ DMG_ENTRY(4, AM_DMG_REACT_KILL),
+    /* Unknown 1     */ DMG_ENTRY(0, AM_DMG_REACT_NONE),
+    /* Unblockable   */ DMG_ENTRY(0, AM_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(4, AM_DMG_REACT_KILL),
+    /* Unknown 2     */ DMG_ENTRY(0, AM_DMG_REACT_NONE),
 };
 
 static InitChainEntry sInitChain[] = {
@@ -735,7 +735,7 @@ void EnAm_SetupStunned(EnAm* this, PlayState* play) {
 
     Actor_SetColorFilter(&this->dyna.actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 100);
 
-    if (this->damageEffect == AM_DMGEFF_ICE) {
+    if (this->damageReaction == AM_DMG_REACT_ICE) {
         this->iceTimer = 48;
     }
 
@@ -810,27 +810,27 @@ void EnAm_UpdateDamage(EnAm* this, PlayState* play) {
         } else if ((this->hurtCollider.base.acFlags & AC_HIT) && (this->behavior >= AM_BEHAVIOR_5)) {
             this->hurtCollider.base.acFlags &= ~AC_HIT;
 
-            if (this->dyna.actor.colChkInfo.damageEffect != AM_DMGEFF_MAGIC_FIRE_LIGHT) {
+            if (this->dyna.actor.colChkInfo.damageReaction != AM_DMG_REACT_MAGIC_FIRE_LIGHT) {
                 this->unk_264 = 0;
-                this->damageEffect = this->dyna.actor.colChkInfo.damageEffect;
+                this->damageReaction = this->dyna.actor.colChkInfo.damageReaction;
                 Actor_SetDropFlag(&this->dyna.actor, &this->hurtCollider.elem, false);
 
-                if ((this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_NUT) ||
-                    (this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_STUN) ||
-                    (this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_ICE)) {
+                if ((this->dyna.actor.colChkInfo.damageReaction == AM_DMG_REACT_NUT) ||
+                    (this->dyna.actor.colChkInfo.damageReaction == AM_DMG_REACT_STUN) ||
+                    (this->dyna.actor.colChkInfo.damageReaction == AM_DMG_REACT_ICE)) {
                     if (this->behavior != AM_BEHAVIOR_STUNNED) {
                         EnAm_SetupStunned(this, play);
 
                         if (this->dyna.actor.colChkInfo.damage != 0) {
                             this->dyna.actor.colChkInfo.health = 0;
                         }
-                    } else if (this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_STUN) {
+                    } else if (this->dyna.actor.colChkInfo.damageReaction == AM_DMG_REACT_STUN) {
                         Vec3f sparkPos = this->dyna.actor.world.pos;
 
                         sparkPos.y += 50.0f;
                         CollisionCheck_SpawnShieldParticlesMetal(play, &sparkPos);
                     }
-                } else if ((this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_KILL) ||
+                } else if ((this->dyna.actor.colChkInfo.damageReaction == AM_DMG_REACT_KILL) ||
                            (this->behavior == AM_BEHAVIOR_STUNNED)) {
                     this->dyna.actor.colChkInfo.health = 0;
 
@@ -857,7 +857,7 @@ void EnAm_Update(Actor* thisx, PlayState* play) {
         EnAm_UpdateDamage(this, play);
     }
 
-    if (this->dyna.actor.colChkInfo.damageEffect != AM_DMGEFF_MAGIC_FIRE_LIGHT) {
+    if (this->dyna.actor.colChkInfo.damageReaction != AM_DMG_REACT_MAGIC_FIRE_LIGHT) {
         if (this->attackTimer != 0) {
             this->attackTimer--;
         }
diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.h b/src/overlays/actors/ovl_En_Am/z_en_am.h
index 2903a3b6ea..ce91429227 100644
--- a/src/overlays/actors/ovl_En_Am/z_en_am.h
+++ b/src/overlays/actors/ovl_En_Am/z_en_am.h
@@ -2,7 +2,7 @@
 #define Z_EN_AM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnAm;
 
@@ -23,7 +23,7 @@ typedef struct EnAm {
     /* 0x0262 */ s16 panicSpinRot; // used when panicking before death
     /* 0x0264 */ s16 unk_264;
     /* 0x0266 */ u8 textureBlend; // 0 = statue textures; 255 = enemy textures
-    /* 0x0267 */ u8 damageEffect;
+    /* 0x0267 */ u8 damageReaction;
     /* 0x0267 */ Vec3f shakeOrigin; // center point to shake around when waking up
     /* 0x0274 */ ColliderCylinder hurtCollider;
     /* 0x02C0 */ ColliderCylinder blockCollider;
diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c
index 8bfcc38fac..17d4eb62f2 100644
--- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c
+++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c
@@ -13,9 +13,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_ani/object_ani.h"
 
diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.h b/src/overlays/actors/ovl_En_Ani/z_en_ani.h
index 454a7bd8d2..024f4310d1 100644
--- a/src/overlays/actors/ovl_En_Ani/z_en_ani.h
+++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.h
@@ -2,7 +2,7 @@
 #define Z_EN_ANI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnAni;
 
diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
index a37aae8954..dd527d95bd 100644
--- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
+++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
@@ -20,9 +20,9 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_anubice/object_anubice.h"
 
@@ -73,45 +73,45 @@ static ColliderCylinderInit sCylinderInit = {
     { 29, 103, 0, { 0, 0, 0 } },
 };
 
-typedef enum AnubiceDamageEffect {
-    /* 0x0 */ ANUBICE_DMGEFF_NONE,
-    /* 0x2 */ ANUBICE_DMGEFF_FIRE = 2,
-    /* 0xF */ ANUBICE_DMGEFF_0xF = 0xF // Treated the same as ANUBICE_DMGEFF_NONE in code
-} AnubiceDamageEffect;
+typedef enum AnubiceDamageReaction {
+    /* 0x0 */ ANUBICE_DMG_REACT_NONE,
+    /* 0x2 */ ANUBICE_DMG_REACT_FIRE = 2,
+    /* 0xF */ ANUBICE_DMG_REACT_0xF = 0xF // Treated the same as ANUBICE_DMG_REACT_NONE in code
+} AnubiceDamageReaction;
 
 static DamageTable sDamageTable[] = {
-    /* Deku nut      */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE),
-    /* Deku stick    */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF),
-    /* Slingshot     */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF),
-    /* Explosive     */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF),
-    /* Boomerang     */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF),
-    /* Normal arrow  */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF),
-    /* Hammer swing  */ DMG_ENTRY(1, ANUBICE_DMGEFF_0xF),
-    /* Hookshot      */ DMG_ENTRY(2, ANUBICE_DMGEFF_0xF),
-    /* Kokiri sword  */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF),
-    /* Master sword  */ DMG_ENTRY(2, ANUBICE_DMGEFF_0xF),
-    /* Giant's Knife */ DMG_ENTRY(6, ANUBICE_DMGEFF_0xF),
-    /* Fire arrow    */ DMG_ENTRY(2, ANUBICE_DMGEFF_FIRE),
-    /* Ice arrow     */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF),
-    /* Light arrow   */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF),
-    /* Unk arrow 1   */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF),
-    /* Unk arrow 2   */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF),
-    /* Unk arrow 3   */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF),
-    /* Fire magic    */ DMG_ENTRY(3, ANUBICE_DMGEFF_FIRE),
-    /* Ice magic     */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE),
-    /* Light magic   */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE),
-    /* Shield        */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE),
-    /* Mirror Ray    */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE),
-    /* Kokiri spin   */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF),
-    /* Giant spin    */ DMG_ENTRY(6, ANUBICE_DMGEFF_0xF),
-    /* Master spin   */ DMG_ENTRY(2, ANUBICE_DMGEFF_0xF),
-    /* Kokiri jump   */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF),
-    /* Giant jump    */ DMG_ENTRY(12, ANUBICE_DMGEFF_0xF),
-    /* Master jump   */ DMG_ENTRY(4, ANUBICE_DMGEFF_0xF),
-    /* Unknown 1     */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE),
-    /* Unblockable   */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE),
-    /* Hammer jump   */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE),
-    /* Unknown 2     */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE),
+    /* Deku nut      */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE),
+    /* Deku stick    */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF),
+    /* Slingshot     */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF),
+    /* Explosive     */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF),
+    /* Boomerang     */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF),
+    /* Normal arrow  */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF),
+    /* Hammer swing  */ DMG_ENTRY(1, ANUBICE_DMG_REACT_0xF),
+    /* Hookshot      */ DMG_ENTRY(2, ANUBICE_DMG_REACT_0xF),
+    /* Kokiri sword  */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF),
+    /* Master sword  */ DMG_ENTRY(2, ANUBICE_DMG_REACT_0xF),
+    /* Giant's Knife */ DMG_ENTRY(6, ANUBICE_DMG_REACT_0xF),
+    /* Fire arrow    */ DMG_ENTRY(2, ANUBICE_DMG_REACT_FIRE),
+    /* Ice arrow     */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF),
+    /* Light arrow   */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF),
+    /* Unk arrow 1   */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF),
+    /* Unk arrow 2   */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF),
+    /* Unk arrow 3   */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF),
+    /* Fire magic    */ DMG_ENTRY(3, ANUBICE_DMG_REACT_FIRE),
+    /* Ice magic     */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE),
+    /* Light magic   */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE),
+    /* Shield        */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF),
+    /* Giant spin    */ DMG_ENTRY(6, ANUBICE_DMG_REACT_0xF),
+    /* Master spin   */ DMG_ENTRY(2, ANUBICE_DMG_REACT_0xF),
+    /* Kokiri jump   */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF),
+    /* Giant jump    */ DMG_ENTRY(12, ANUBICE_DMG_REACT_0xF),
+    /* Master jump   */ DMG_ENTRY(4, ANUBICE_DMG_REACT_0xF),
+    /* Unknown 1     */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE),
+    /* Unblockable   */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE),
+    /* Unknown 2     */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE),
 };
 
 void EnAnubice_Hover(EnAnubice* this, PlayState* play) {
@@ -148,7 +148,7 @@ void EnAnubice_Init(Actor* thisx, PlayState* play) {
                    ANUBICE_LIMB_MAX);
 
     PRINTF("\n\n");
-    PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ アヌビス発生 ☆☆☆☆☆ \n", "☆☆☆☆☆ Anubis occurrence ☆☆☆☆☆ \n") VT_RST);
+    PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ アヌビス発生 ☆☆☆☆☆ \n", "☆☆☆☆☆ Anubis spawn ☆☆☆☆☆ \n") VT_RST);
 
     this->actor.naviEnemyId = NAVI_ENEMY_ANUBIS;
 
@@ -399,7 +399,7 @@ void EnAnubice_Update(Actor* thisx, PlayState* play) {
 
         if (this->collider.base.acFlags & AC_HIT) {
             this->collider.base.acFlags &= ~AC_HIT;
-            if (this->actor.colChkInfo.damageEffect == ANUBICE_DMGEFF_FIRE) {
+            if (this->actor.colChkInfo.damageReaction == ANUBICE_DMG_REACT_FIRE) {
                 Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_PROP);
                 this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
                 Enemy_StartFinishingBlow(play, &this->actor);
diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h
index 51cd02d1ef..51b143fa1e 100644
--- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h
+++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h
@@ -2,7 +2,7 @@
 #define Z_EN_ANUBICE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnAnubice;
 
@@ -41,7 +41,7 @@ typedef struct EnAnubice {
     /* 0x025C */ s16 knockbackTimer;
     /* 0x025E */ s16 isMirroringPlayer;
     /* 0x0260 */ s16 isPlayerOutOfRange;
-    /* 0x0262 */ s16 isKnockedback; // Hit by an attack without ANUBICE_DMGEFF_FIRE
+    /* 0x0262 */ s16 isKnockedback; // Hit by an attack without ANUBICE_DMG_REACT_FIRE
     /* 0x0264 */ s16 hasSearchedForFlameCircles;
     /* 0x0268 */ f32 hoverVelocityTimer;
     /* 0x026C */ f32 animLastFrame;
diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
index 480940dc44..39cc72c383 100644
--- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
+++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
@@ -14,9 +14,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_anubice/object_anubice.h"
diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h
index 34072a43b5..9e916c090a 100644
--- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h
+++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h
@@ -2,7 +2,7 @@
 #define Z_EN_ANUBICE_FIRE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnAnubiceFire;
 
diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c
index 2e05395897..9d49a27234 100644
--- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c
+++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c
@@ -12,8 +12,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
-#include "z64play.h"
+#include "debug_display.h"
+#include "play_state.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
@@ -41,7 +41,7 @@ void EnAnubiceTag_Init(Actor* thisx, PlayState* play) {
     EnAnubiceTag* this = (EnAnubiceTag*)thisx;
 
     PRINTF("\n\n");
-    PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ アヌビス制御タグ発生 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Anubis control tag generated ☆☆☆☆☆ %d\n")
+    PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ アヌビス制御タグ発生 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Anubis control tag spawn ☆☆☆☆☆ %d\n")
                VT_RST,
            this->actor.params);
 
diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h
index 026d4d0199..afbc61970b 100644
--- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h
+++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h
@@ -2,7 +2,7 @@
 #define Z_EN_ANUBICE_TAG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnAnubiceTag;
 
diff --git a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c
index d4de5191ef..56b949ce7e 100644
--- a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c
+++ b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c
@@ -7,7 +7,7 @@
 #include "z_en_arow_trap.h"
 #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
 
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
diff --git a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h
index ba91505088..48252407a7 100644
--- a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h
+++ b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h
@@ -2,7 +2,7 @@
 #define Z_EN_AROW_TRAP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnArowTrap;
 
diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
index 3f0f7b66a5..c4a90bec05 100644
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
@@ -17,8 +17,8 @@
 #include "sys_math3d.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h
index ba974c2105..e5d80928cd 100644
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h
@@ -2,8 +2,8 @@
 #define Z_EN_ARROW_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64player.h"
+#include "actor.h"
+#include "player.h"
 
 struct EnArrow;
 
diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c
index 4a3a32663a..a7fd550149 100644
--- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c
+++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c
@@ -15,9 +15,9 @@
 #include "sfx.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_niw/object_niw.h"
 
diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h
index a4d361542d..d460a43d9f 100644
--- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h
+++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h
@@ -2,7 +2,7 @@
 #define Z_EN_ATTACK_NIW_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnAttackNiw;
 
diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c
index a149d3c63d..462e8a5f1d 100644
--- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c
+++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c
@@ -15,9 +15,9 @@
 #include "sys_math.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_bxa/object_bxa.h"
 
diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.h b/src/overlays/actors/ovl_En_Ba/z_en_ba.h
index dc3b8cb3f6..3cb9b3582d 100644
--- a/src/overlays/actors/ovl_En_Ba/z_en_ba.h
+++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.h
@@ -2,7 +2,7 @@
 #define Z_EN_BA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnBa;
 
diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c
index 18dad81519..0c055c9be9 100644
--- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c
+++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c
@@ -17,9 +17,9 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_Bb/object_Bb.h"
@@ -1169,7 +1169,7 @@ void EnBb_CollisionCheck(EnBb* this, PlayState* play) {
     }
     if (this->collider.base.acFlags & AC_HIT) {
         this->collider.base.acFlags &= ~AC_HIT;
-        this->dmgEffect = this->actor.colChkInfo.damageEffect;
+        this->dmgEffect = this->actor.colChkInfo.damageReaction;
         Actor_SetDropFlag(&this->actor, &this->collider.elements[0].base, false);
         switch (this->dmgEffect) {
             case 7:
@@ -1252,7 +1252,7 @@ void EnBb_Update(Actor* thisx, PlayState* play2) {
     if (this->actor.params <= ENBB_BLUE) {
         EnBb_CollisionCheck(this, play);
     }
-    if (this->actor.colChkInfo.damageEffect != 0xD) {
+    if (this->actor.colChkInfo.damageReaction != 0xD) {
         this->actionFunc(this, play);
         if ((this->actor.params <= ENBB_BLUE) && (this->actor.speed >= -6.0f) &&
             !(this->actor.flags & ACTOR_FLAG_ATTACHED_TO_ARROW)) {
diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.h b/src/overlays/actors/ovl_En_Bb/z_en_bb.h
index 0b7e85c461..8f5591dc78 100644
--- a/src/overlays/actors/ovl_En_Bb/z_en_bb.h
+++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.h
@@ -2,7 +2,7 @@
 #define Z_EN_BB_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnBb;
 
diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c
index 9c9d7bacfa..76462af1de 100644
--- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c
+++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c
@@ -15,9 +15,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_kingdodongo/object_kingdodongo.h"
 
diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h
index 876a790d71..9becdade1a 100644
--- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h
+++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h
@@ -2,8 +2,8 @@
 #define Z_EN_BDFIRE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct EnBdfire;
 
diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
index 4243bbdf79..1ab5979a3c 100644
--- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
+++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
@@ -12,10 +12,10 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_bigokuta/object_bigokuta.h"
 
@@ -767,12 +767,12 @@ void func_809BE798(EnBigokuta* this, PlayState* play) {
 void EnBigokuta_UpdateDamage(EnBigokuta* this, PlayState* play) {
     if (this->collider.base.acFlags & AC_HIT) {
         this->collider.base.acFlags &= ~AC_HIT;
-        if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) {
-            if (this->actor.colChkInfo.damageEffect == 1) {
+        if (this->actor.colChkInfo.damageReaction != 0 || this->actor.colChkInfo.damage != 0) {
+            if (this->actor.colChkInfo.damageReaction == 1) {
                 if (this->actionFunc != func_809BE058) {
                     func_809BD524(this);
                 }
-            } else if (this->actor.colChkInfo.damageEffect == 0xF) {
+            } else if (this->actor.colChkInfo.damageReaction == 0xF) {
                 func_809BD47C(this);
             } else if (!Actor_IsFacingPlayer(&this->actor, 0x4000)) {
                 if (Actor_ApplyDamage(&this->actor) == 0) { // Dead
diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
index c04da49c86..434cb521e7 100644
--- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
+++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
@@ -2,7 +2,7 @@
 #define Z_EN_BIGOKUTA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnBigokuta;
 
diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c
index 82f7b62796..0e7c532efb 100644
--- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c
+++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c
@@ -17,8 +17,8 @@
 #include "versions.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_bl/object_bl.h"
 
@@ -78,48 +78,48 @@ static ColliderCylinderInit sCylinderInit = {
 
 static CollisionCheckInfoInit2 sColChkInfoInit = { 1, 9, 28, -20, 30 };
 
-typedef enum BiriDamageEffect {
-    /* 0x0 */ BIRI_DMGEFF_NONE,
-    /* 0x1 */ BIRI_DMGEFF_DEKUNUT,
-    /* 0x2 */ BIRI_DMGEFF_FIRE,
-    /* 0x3 */ BIRI_DMGEFF_ICE,
-    /* 0xE */ BIRI_DMGEFF_SLINGSHOT = 0xE,
-    /* 0xF */ BIRI_DMGEFF_SWORD
-} BiriDamageEffect;
+typedef enum BiriDamageReaction {
+    /* 0x0 */ BIRI_DMG_REACT_NONE,
+    /* 0x1 */ BIRI_DMG_REACT_DEKUNUT,
+    /* 0x2 */ BIRI_DMG_REACT_FIRE,
+    /* 0x3 */ BIRI_DMG_REACT_ICE,
+    /* 0xE */ BIRI_DMG_REACT_SLINGSHOT = 0xE,
+    /* 0xF */ BIRI_DMG_REACT_SWORD
+} BiriDamageReaction;
 
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, BIRI_DMGEFF_DEKUNUT),
-    /* Deku stick    */ DMG_ENTRY(2, BIRI_DMGEFF_NONE),
-    /* Slingshot     */ DMG_ENTRY(0, BIRI_DMGEFF_SLINGSHOT),
-    /* Explosive     */ DMG_ENTRY(2, BIRI_DMGEFF_NONE),
-    /* Boomerang     */ DMG_ENTRY(1, BIRI_DMGEFF_NONE),
-    /* Normal arrow  */ DMG_ENTRY(2, BIRI_DMGEFF_NONE),
-    /* Hammer swing  */ DMG_ENTRY(2, BIRI_DMGEFF_NONE),
-    /* Hookshot      */ DMG_ENTRY(2, BIRI_DMGEFF_NONE),
-    /* Kokiri sword  */ DMG_ENTRY(1, BIRI_DMGEFF_SWORD),
-    /* Master sword  */ DMG_ENTRY(2, BIRI_DMGEFF_SWORD),
-    /* Giant's Knife */ DMG_ENTRY(4, BIRI_DMGEFF_SWORD),
-    /* Fire arrow    */ DMG_ENTRY(4, BIRI_DMGEFF_FIRE),
-    /* Ice arrow     */ DMG_ENTRY(4, BIRI_DMGEFF_ICE),
-    /* Light arrow   */ DMG_ENTRY(2, BIRI_DMGEFF_NONE),
-    /* Unk arrow 1   */ DMG_ENTRY(2, BIRI_DMGEFF_NONE),
-    /* Unk arrow 2   */ DMG_ENTRY(2, BIRI_DMGEFF_NONE),
-    /* Unk arrow 3   */ DMG_ENTRY(2, BIRI_DMGEFF_NONE),
-    /* Fire magic    */ DMG_ENTRY(4, BIRI_DMGEFF_FIRE),
-    /* Ice magic     */ DMG_ENTRY(4, BIRI_DMGEFF_ICE),
-    /* Light magic   */ DMG_ENTRY(0, BIRI_DMGEFF_NONE),
-    /* Shield        */ DMG_ENTRY(0, BIRI_DMGEFF_NONE),
-    /* Mirror Ray    */ DMG_ENTRY(0, BIRI_DMGEFF_NONE),
-    /* Kokiri spin   */ DMG_ENTRY(1, BIRI_DMGEFF_NONE),
-    /* Giant spin    */ DMG_ENTRY(4, BIRI_DMGEFF_NONE),
-    /* Master spin   */ DMG_ENTRY(2, BIRI_DMGEFF_NONE),
-    /* Kokiri jump   */ DMG_ENTRY(2, BIRI_DMGEFF_NONE),
-    /* Giant jump    */ DMG_ENTRY(8, BIRI_DMGEFF_NONE),
-    /* Master jump   */ DMG_ENTRY(4, BIRI_DMGEFF_NONE),
-    /* Unknown 1     */ DMG_ENTRY(0, BIRI_DMGEFF_NONE),
-    /* Unblockable   */ DMG_ENTRY(0, BIRI_DMGEFF_NONE),
-    /* Hammer jump   */ DMG_ENTRY(4, BIRI_DMGEFF_NONE),
-    /* Unknown 2     */ DMG_ENTRY(0, BIRI_DMGEFF_NONE),
+    /* Deku nut      */ DMG_ENTRY(0, BIRI_DMG_REACT_DEKUNUT),
+    /* Deku stick    */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
+    /* Slingshot     */ DMG_ENTRY(0, BIRI_DMG_REACT_SLINGSHOT),
+    /* Explosive     */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
+    /* Boomerang     */ DMG_ENTRY(1, BIRI_DMG_REACT_NONE),
+    /* Normal arrow  */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
+    /* Hammer swing  */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
+    /* Hookshot      */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
+    /* Kokiri sword  */ DMG_ENTRY(1, BIRI_DMG_REACT_SWORD),
+    /* Master sword  */ DMG_ENTRY(2, BIRI_DMG_REACT_SWORD),
+    /* Giant's Knife */ DMG_ENTRY(4, BIRI_DMG_REACT_SWORD),
+    /* Fire arrow    */ DMG_ENTRY(4, BIRI_DMG_REACT_FIRE),
+    /* Ice arrow     */ DMG_ENTRY(4, BIRI_DMG_REACT_ICE),
+    /* Light arrow   */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
+    /* Unk arrow 1   */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
+    /* Unk arrow 2   */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
+    /* Unk arrow 3   */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
+    /* Fire magic    */ DMG_ENTRY(4, BIRI_DMG_REACT_FIRE),
+    /* Ice magic     */ DMG_ENTRY(4, BIRI_DMG_REACT_ICE),
+    /* Light magic   */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE),
+    /* Shield        */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(1, BIRI_DMG_REACT_NONE),
+    /* Giant spin    */ DMG_ENTRY(4, BIRI_DMG_REACT_NONE),
+    /* Master spin   */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
+    /* Kokiri jump   */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
+    /* Giant jump    */ DMG_ENTRY(8, BIRI_DMG_REACT_NONE),
+    /* Master jump   */ DMG_ENTRY(4, BIRI_DMG_REACT_NONE),
+    /* Unknown 1     */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE),
+    /* Unblockable   */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(4, BIRI_DMG_REACT_NONE),
+    /* Unknown 2     */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE),
 };
 
 static InitChainEntry sInitChain[] = {
@@ -566,26 +566,26 @@ void EnBili_Frozen(EnBili* this, PlayState* play) {
 }
 
 void EnBili_UpdateDamage(EnBili* this, PlayState* play) {
-    u8 damageEffect;
+    u8 damageReaction;
 
     if ((this->actor.colChkInfo.health != 0) && (this->collider.base.acFlags & AC_HIT)) {
         this->collider.base.acFlags &= ~AC_HIT;
         Actor_SetDropFlag(&this->actor, &this->collider.elem, true);
 
-        if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) {
+        if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) {
             if (Actor_ApplyDamage(&this->actor) == 0) {
                 Actor_PlaySfx(&this->actor, NA_SE_EN_BIRI_DEAD);
                 Enemy_StartFinishingBlow(play, &this->actor);
                 this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
             }
 
-            damageEffect = this->actor.colChkInfo.damageEffect;
+            damageReaction = this->actor.colChkInfo.damageReaction;
 
-            if (damageEffect == BIRI_DMGEFF_DEKUNUT) {
+            if (damageReaction == BIRI_DMG_REACT_DEKUNUT) {
                 if (this->actionFunc != EnBili_Stunned) {
                     EnBili_SetupStunned(this);
                 }
-            } else if (damageEffect == BIRI_DMGEFF_SWORD) {
+            } else if (damageReaction == BIRI_DMG_REACT_SWORD) {
                 if (this->actionFunc != EnBili_Stunned) {
                     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 200, COLORFILTER_BUFFLAG_XLU, 10);
 
@@ -596,12 +596,12 @@ void EnBili_UpdateDamage(EnBili* this, PlayState* play) {
                 } else {
                     EnBili_SetupBurnt(this);
                 }
-            } else if (damageEffect == BIRI_DMGEFF_FIRE) {
+            } else if (damageReaction == BIRI_DMG_REACT_FIRE) {
                 EnBili_SetupBurnt(this);
                 this->timer = 2;
-            } else if (damageEffect == BIRI_DMGEFF_ICE) {
+            } else if (damageReaction == BIRI_DMG_REACT_ICE) {
                 EnBili_SetupFrozen(this, play);
-            } else if (damageEffect == BIRI_DMGEFF_SLINGSHOT) {
+            } else if (damageReaction == BIRI_DMG_REACT_SLINGSHOT) {
                 EnBili_SetupRecoil(this);
             } else {
                 EnBili_SetupBurnt(this);
diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.h b/src/overlays/actors/ovl_En_Bili/z_en_bili.h
index 3199639c9d..b0e58c4679 100644
--- a/src/overlays/actors/ovl_En_Bili/z_en_bili.h
+++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.h
@@ -2,7 +2,7 @@
 #define Z_EN_BILI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnBili;
 
diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.c b/src/overlays/actors/ovl_En_Bird/z_en_bird.c
index c93d682ee1..771ee7dd15 100644
--- a/src/overlays/actors/ovl_En_Bird/z_en_bird.c
+++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.c
@@ -8,7 +8,7 @@
 
 #include "ichain.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_bird/object_bird.h"
 
diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.h b/src/overlays/actors/ovl_En_Bird/z_en_bird.h
index beaf60a3d4..8c9a2eb774 100644
--- a/src/overlays/actors/ovl_En_Bird/z_en_bird.h
+++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.h
@@ -2,7 +2,7 @@
 #define Z_EN_BIRD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnBird;
 
diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c
index 1d8d606cf3..813f16ce12 100644
--- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c
+++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c
@@ -10,8 +10,8 @@
 #include "gfx_setupdl.h"
 #include "ichain.h"
 #include "sys_matrix.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_blkobj/object_blkobj.h"
 
diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h
index babddb4e5d..d8be8fb21f 100644
--- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h
+++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h
@@ -2,7 +2,7 @@
 #define Z_EN_BLKOBJ_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnBlkobj;
 
diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c
index 31acad8cec..bf1c9ee479 100644
--- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c
+++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c
@@ -14,9 +14,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.h b/src/overlays/actors/ovl_En_Bom/z_en_bom.h
index 88c8feef5c..1dfee46406 100644
--- a/src/overlays/actors/ovl_En_Bom/z_en_bom.h
+++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.h
@@ -2,7 +2,7 @@
 #define Z_EN_BOM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnBom;
 
diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
index 435b0d4838..2fff5313e5 100644
--- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
@@ -11,10 +11,10 @@
 #include "sfx.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_bg/object_bg.h"
 
diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h
index ffc4ae9efc..2b85ab84ac 100644
--- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h
+++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h
@@ -2,7 +2,7 @@
 #define Z_EN_BOM_BOWL_MAN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h"
 #include "overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h"
 
diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
index 74d7ef5292..43207a9992 100644
--- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
+++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
@@ -7,9 +7,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h
index 711518848f..a75f4a9f72 100644
--- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h
+++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h
@@ -2,7 +2,7 @@
 #define Z_EN_BOM_BOWL_PIT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h"
 
 struct EnBomBowlPit;
diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
index 7ce476d4ef..6e9dc91695 100644
--- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
+++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
@@ -11,9 +11,9 @@
 #include "sys_math3d.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h
index 38ca8d20c6..dad96a02ea 100644
--- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h
+++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h
@@ -2,7 +2,7 @@
 #define Z_EN_BOM_CHU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnBomChu;
 
diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
index ed1d7eed79..117343703e 100644
--- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
+++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
@@ -15,9 +15,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_bombf/object_bombf.h"
 
diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
index 840da79c19..e805ae0ac1 100644
--- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
+++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
@@ -2,7 +2,7 @@
 #define Z_EN_BOMBF_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnBombf;
 
diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c
index b9dcbacb76..d70422b1d0 100644
--- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c
+++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c
@@ -12,8 +12,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h
index 7a211880a4..f62edc7654 100644
--- a/src/overlays/actors/ovl_En_Boom/z_en_boom.h
+++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h
@@ -2,8 +2,8 @@
 #define Z_EN_BOOM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64player.h"
+#include "actor.h"
+#include "player.h"
 
 struct EnBoom;
 
diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c
index c4ef15919a..23c9321356 100644
--- a/src/overlays/actors/ovl_En_Box/z_en_box.c
+++ b/src/overlays/actors/ovl_En_Box/z_en_box.c
@@ -12,13 +12,13 @@
 #include "sys_math3d.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64curve.h"
-#include "z64effect.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "curve.h"
+#include "effect.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_box/object_box.h"
 
diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h
index 1604b0d1bc..7bea0c4787 100644
--- a/src/overlays/actors/ovl_En_Box/z_en_box.h
+++ b/src/overlays/actors/ovl_En_Box/z_en_box.h
@@ -2,7 +2,7 @@
 #define Z_EN_BOX_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #define ENBOX_TREASURE_FLAG_UNK_MIN 20
 #define ENBOX_TREASURE_FLAG_UNK_MAX 32
diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c
index 436f4740c5..1dc0ea5e6e 100644
--- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c
+++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c
@@ -11,8 +11,8 @@
 #include "gfx_setupdl.h"
 #include "sfx.h"
 #include "sys_matrix.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_brob/object_brob.h"
 
diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.h b/src/overlays/actors/ovl_En_Brob/z_en_brob.h
index 02516f4e9b..1d3b785508 100644
--- a/src/overlays/actors/ovl_En_Brob/z_en_brob.h
+++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.h
@@ -2,7 +2,7 @@
 #define Z_EN_BROB_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnBrob;
 
diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
index 79860d7f7f..30de9c5bbb 100644
--- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
+++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
@@ -8,8 +8,8 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_bubble/object_bubble.h"
 
diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h
index 9b183ae2bc..e90efefb29 100644
--- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h
+++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h
@@ -2,7 +2,7 @@
 #define Z_EN_BUBBLE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnBubble;
 
diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c
index 2ec5e260f8..58a5392306 100644
--- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c
+++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c
@@ -18,8 +18,8 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.h b/src/overlays/actors/ovl_En_Butte/z_en_butte.h
index 1a1764520c..1a18cb681b 100644
--- a/src/overlays/actors/ovl_En_Butte/z_en_butte.h
+++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.h
@@ -2,7 +2,7 @@
 #define Z_EN_BUTTE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnButte;
 
diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c
index 0aad9cccae..7f6b4ae99e 100644
--- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c
+++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c
@@ -19,9 +19,9 @@
 #include "versions.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_bw/object_bw.h"
@@ -617,7 +617,7 @@ void func_809D01CC(EnBw* this) {
     this->actor.speed = 0.0f;
     this->unk_25C = (Rand_ZeroOne() * 0.25f) + 1.0f;
     this->unk_260 = 0.0f;
-    if (this->damageEffect == 0xE) {
+    if (this->damageReaction == 0xE) {
         this->iceTimer = 0x50;
     }
     this->unk_222 = (this->actor.colorFilterParams & 0x4000) ? 25 : 80;
@@ -658,7 +658,7 @@ void func_809D0268(EnBw* this, PlayState* play) {
 
 void func_809D03CC(EnBw* this) {
     this->actor.speed = 0.0f;
-    if (this->damageEffect == 0xE) {
+    if (this->damageReaction == 0xE) {
         this->iceTimer = 32;
     }
     this->unk_23C = this->actor.colorFilterTimer;
@@ -706,12 +706,12 @@ void func_809D0584(EnBw* this, PlayState* play) {
     } else {
         if (this->collider2.base.acFlags & AC_HIT) {
             this->collider2.base.acFlags &= ~AC_HIT;
-            if ((this->actor.colChkInfo.damageEffect == 0) || (this->unk_220 == 6)) {
+            if ((this->actor.colChkInfo.damageReaction == 0) || (this->unk_220 == 6)) {
                 return;
             }
-            this->damageEffect = this->actor.colChkInfo.damageEffect;
+            this->damageReaction = this->actor.colChkInfo.damageReaction;
             Actor_SetDropFlag(&this->actor, &this->collider2.elem, false);
-            if ((this->damageEffect == 1) || (this->damageEffect == 0xE)) {
+            if ((this->damageReaction == 1) || (this->damageReaction == 0xE)) {
                 if (this->unk_23C == 0) {
                     Actor_ApplyDamage(&this->actor);
                     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80);
@@ -771,7 +771,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) {
     Color_RGBA8 sp44 = { 0, 0, 0, 220 };
 
     func_809D0584(this, play);
-    if (thisx->colChkInfo.damageEffect != 6) {
+    if (thisx->colChkInfo.damageReaction != 6) {
         this->actionFunc(this, play);
         if (this->unk_23C == 0) {
             this->unk_23A = (this->unk_23A + 4) & 0x7F;
diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.h b/src/overlays/actors/ovl_En_Bw/z_en_bw.h
index 7c0698d22c..fe9f8ef90a 100644
--- a/src/overlays/actors/ovl_En_Bw/z_en_bw.h
+++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.h
@@ -2,7 +2,7 @@
 #define Z_EN_BW_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnBw;
 typedef void (*EnBwActionFunc)(struct EnBw*, struct PlayState*);
@@ -35,7 +35,7 @@ typedef struct EnBw {
     /* 0x0228 */ EnBwActionFunc actionFunc;
     /* 0x022C */ Color_RGBA8 color1;
     /* 0x0230 */ u8 unk_230;
-    /* 0x0231 */ u8 damageEffect;
+    /* 0x0231 */ u8 damageReaction;
     /* 0x0232 */ u8 unk_232;
     /* 0x0234 */ s16 unk_234;
     /* 0x0236 */ s16 unk_236;
diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c
index 51896cbb7d..942cfdd6fb 100644
--- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c
+++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c
@@ -14,9 +14,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_bxa/object_bxa.h"
 
diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.h b/src/overlays/actors/ovl_En_Bx/z_en_bx.h
index 077def413d..be5872d959 100644
--- a/src/overlays/actors/ovl_En_Bx/z_en_bx.h
+++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.h
@@ -2,7 +2,7 @@
 #define Z_EN_BX_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnBx;
 
diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c
index a0b1e03921..c400d0e08d 100644
--- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c
+++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c
@@ -14,9 +14,9 @@
 #include "regs.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64debug_display.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "debug_display.h"
+#include "play_state.h"
+#include "save.h"
 
 #define FLAGS 0
 
@@ -122,7 +122,7 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) {
                 Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_ETCETERA, 20.0f, 20.0f, -2500.0f, 0, 0, 0,
                             ((sTreasureFlags[5] & 0x1F) << 8) + rewardParams);
                 PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 中央宝発生(ＧＲＥＡＴ) ☆☆☆☆☆ %x\n",
-                                          "☆☆☆☆☆ Central treasure occurrence (GREAT) ☆☆☆☆☆ %x\n") VT_RST,
+                                          "☆☆☆☆☆ Central treasure spawn (GREAT) ☆☆☆☆☆ %x\n") VT_RST,
                        rewardChestParams);
                 this->actionFunc = EnChanger_SetHeartPieceFlag;
                 return;
@@ -160,7 +160,7 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) {
 
     if (this->leftChest != NULL) {
         PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 左宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n",
-                                   "☆☆☆☆☆ Left treasure generation (what does it contain?) ☆☆☆☆☆ %x\n") VT_RST,
+                                   "☆☆☆☆☆ Left treasure spawn (what does it contain?) ☆☆☆☆☆ %x\n") VT_RST,
                leftChestParams);
         PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 部屋番号は？  %x\n", "☆☆☆☆☆ What is the room number?  %x\n") VT_RST,
                play->roomCtx.curRoom.num);
@@ -185,7 +185,7 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) {
 
     if (this->rightChest != NULL) {
         PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ 右宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n",
-                                "☆☆☆☆☆ Right treasure generation (what does it contain?) ☆☆☆☆☆ %x\n") VT_RST,
+                                "☆☆☆☆☆ Right treasure spawn (what does it contain?) ☆☆☆☆☆ %x\n") VT_RST,
                rightChestParams);
         PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ 部屋番号は？  %d\n", "☆☆☆☆☆ What is the room number?  %d\n") VT_RST,
                play->roomCtx.curRoom.num);
diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.h b/src/overlays/actors/ovl_En_Changer/z_en_changer.h
index 6807287787..45f8799a5f 100644
--- a/src/overlays/actors/ovl_En_Changer/z_en_changer.h
+++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.h
@@ -2,7 +2,7 @@
 #define Z_EN_CHANGER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnChanger;
 
diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
index 6bcbd62323..f3b7f3dc19 100644
--- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
+++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
@@ -10,8 +10,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #define FLAGS                                                                                 \
     (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
index 6978941868..bd9b0c2a1a 100644
--- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
+++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
@@ -2,7 +2,7 @@
 #define Z_EN_CLEAR_TAG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnClearTag;
 
diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c
index d459c93f6f..2c27b88f2c 100644
--- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c
+++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c
@@ -13,10 +13,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
 
diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.h b/src/overlays/actors/ovl_En_Cow/z_en_cow.h
index e5602967e1..0ffd8529dd 100644
--- a/src/overlays/actors/ovl_En_Cow/z_en_cow.h
+++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.h
@@ -2,7 +2,7 @@
 #define Z_EN_COW_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "assets/objects/object_cow/object_cow.h"
 
 #define COW_FLAG_PLAYER_NEARBY (1 << 1)
diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c
index 3ce86ff9d3..0182ad038f 100644
--- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c
+++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c
@@ -7,9 +7,9 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_crow/object_crow.h"
 
@@ -169,7 +169,7 @@ void EnCrow_SetupDamaged(EnCrow* this, PlayState* play) {
     this->actor.lockOnArrowOffset = 0.0f;
     Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_DEAD);
 
-    if (this->actor.colChkInfo.damageEffect == 3) { // Ice arrows
+    if (this->actor.colChkInfo.damageReaction == 3) { // Ice arrows
         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 40);
         for (i = 0; i < 8; i++) {
             iceParticlePos.x = ((i & 1 ? 7.0f : -7.0f) * scale) + this->actor.world.pos.x;
@@ -178,7 +178,7 @@ void EnCrow_SetupDamaged(EnCrow* this, PlayState* play) {
             EffectSsEnIce_SpawnFlyingVec3f(play, &this->actor, &iceParticlePos, 150, 150, 150, 250, 235, 245, 255,
                                            ((Rand_ZeroOne() * 0.15f) + 0.85f) * scale);
         }
-    } else if (this->actor.colChkInfo.damageEffect == 2) { // Fire arrows and Din's Fire
+    } else if (this->actor.colChkInfo.damageReaction == 2) { // Fire arrows and Din's Fire
         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 40);
 
         for (i = 0; i < 4; i++) {
@@ -426,8 +426,8 @@ void EnCrow_UpdateDamage(EnCrow* this, PlayState* play) {
     if (this->collider.base.acFlags & AC_HIT) {
         this->collider.base.acFlags &= ~AC_HIT;
         Actor_SetDropFlag(&this->actor, &this->collider.elements[0].base, true);
-        if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) {
-            if (this->actor.colChkInfo.damageEffect == 1) { // Deku Nuts
+        if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) {
+            if (this->actor.colChkInfo.damageReaction == 1) { // Deku Nuts
                 EnCrow_SetupTurnAway(this);
             } else {
                 Actor_ApplyDamage(&this->actor);
diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.h b/src/overlays/actors/ovl_En_Crow/z_en_crow.h
index fb13e7bca6..058bef6e90 100644
--- a/src/overlays/actors/ovl_En_Crow/z_en_crow.h
+++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.h
@@ -2,7 +2,7 @@
 #define Z_EN_CROW_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnCrow;
 
diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c
index 8b74a6063e..ce9f69f5cd 100644
--- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c
+++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c
@@ -8,10 +8,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_cs/object_cs.h"
 #include "assets/objects/object_link_child/object_link_child.h"
diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.h b/src/overlays/actors/ovl_En_Cs/z_en_cs.h
index 8e1d665f54..304a1e443f 100644
--- a/src/overlays/actors/ovl_En_Cs/z_en_cs.h
+++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.h
@@ -2,7 +2,7 @@
 #define Z_EN_CS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnCs;
 
diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
index 98a09bb25e..628e7de831 100644
--- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
+++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
@@ -10,10 +10,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_daiku/object_daiku.h"
 
diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h
index b191c1d79f..8b1e36786f 100644
--- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h
+++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h
@@ -2,7 +2,7 @@
 #define Z_EN_DAIKU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDaiku;
 
diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
index f469d5626f..7401a84e38 100644
--- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
+++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
@@ -15,10 +15,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_daiku/object_daiku.h"
 
diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h
index 1395b6e259..72ed1c7e3e 100644
--- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h
+++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h
@@ -2,7 +2,7 @@
 #define Z_EN_DAIKU_KAKARIKO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDaikuKakariko;
 
diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
index df9b566f87..d30784b4c1 100644
--- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
+++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
@@ -9,10 +9,10 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_dekubaba/object_dekubaba.h"
@@ -150,84 +150,84 @@ static ColliderJntSphInit sJntSphInit = {
 
 static CollisionCheckInfoInit sColChkInfoInit = { 2, 25, 25, MASS_IMMOVABLE };
 
-typedef enum DekuBabaDamageEffect {
-    /* 0x0 */ DEKUBABA_DMGEFF_NONE,
-    /* 0x1 */ DEKUBABA_DMGEFF_DEKUNUT,
-    /* 0x2 */ DEKUBABA_DMGEFF_FIRE,
-    /* 0xE */ DEKUBABA_DMGEFF_BOOMERANG = 14,
-    /* 0xF */ DEKUBABA_DMGEFF_SWORD
-} DekuBabaDamageEffect;
+typedef enum DekuBabaDamageReaction {
+    /* 0x0 */ DEKUBABA_DMG_REACT_NONE,
+    /* 0x1 */ DEKUBABA_DMG_REACT_DEKUNUT,
+    /* 0x2 */ DEKUBABA_DMG_REACT_FIRE,
+    /* 0xE */ DEKUBABA_DMG_REACT_BOOMERANG = 14,
+    /* 0xF */ DEKUBABA_DMG_REACT_SWORD
+} DekuBabaDamageReaction;
 
 static DamageTable sDekuBabaDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, DEKUBABA_DMGEFF_DEKUNUT),
-    /* Deku stick    */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Slingshot     */ DMG_ENTRY(1, DEKUBABA_DMGEFF_NONE),
-    /* Explosive     */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Boomerang     */ DMG_ENTRY(2, DEKUBABA_DMGEFF_BOOMERANG),
-    /* Normal arrow  */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Hammer swing  */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Hookshot      */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Kokiri sword  */ DMG_ENTRY(1, DEKUBABA_DMGEFF_SWORD),
-    /* Master sword  */ DMG_ENTRY(2, DEKUBABA_DMGEFF_SWORD),
-    /* Giant's Knife */ DMG_ENTRY(4, DEKUBABA_DMGEFF_SWORD),
-    /* Fire arrow    */ DMG_ENTRY(4, DEKUBABA_DMGEFF_FIRE),
-    /* Ice arrow     */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Light arrow   */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Unk arrow 1   */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Unk arrow 2   */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Unk arrow 3   */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Fire magic    */ DMG_ENTRY(4, DEKUBABA_DMGEFF_FIRE),
-    /* Ice magic     */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
-    /* Light magic   */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
-    /* Shield        */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
-    /* Mirror Ray    */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
-    /* Kokiri spin   */ DMG_ENTRY(1, DEKUBABA_DMGEFF_SWORD),
-    /* Giant spin    */ DMG_ENTRY(4, DEKUBABA_DMGEFF_SWORD),
-    /* Master spin   */ DMG_ENTRY(2, DEKUBABA_DMGEFF_SWORD),
-    /* Kokiri jump   */ DMG_ENTRY(2, DEKUBABA_DMGEFF_SWORD),
-    /* Giant jump    */ DMG_ENTRY(8, DEKUBABA_DMGEFF_SWORD),
-    /* Master jump   */ DMG_ENTRY(4, DEKUBABA_DMGEFF_SWORD),
-    /* Unknown 1     */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
-    /* Unblockable   */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
-    /* Hammer jump   */ DMG_ENTRY(4, DEKUBABA_DMGEFF_NONE),
-    /* Unknown 2     */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
+    /* Deku nut      */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_DEKUNUT),
+    /* Deku stick    */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Slingshot     */ DMG_ENTRY(1, DEKUBABA_DMG_REACT_NONE),
+    /* Explosive     */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Boomerang     */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_BOOMERANG),
+    /* Normal arrow  */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Hammer swing  */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Hookshot      */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Kokiri sword  */ DMG_ENTRY(1, DEKUBABA_DMG_REACT_SWORD),
+    /* Master sword  */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_SWORD),
+    /* Giant's Knife */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_SWORD),
+    /* Fire arrow    */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_FIRE),
+    /* Ice arrow     */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Light arrow   */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Unk arrow 1   */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Unk arrow 2   */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Unk arrow 3   */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Fire magic    */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_FIRE),
+    /* Ice magic     */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
+    /* Light magic   */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
+    /* Shield        */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(1, DEKUBABA_DMG_REACT_SWORD),
+    /* Giant spin    */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_SWORD),
+    /* Master spin   */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_SWORD),
+    /* Kokiri jump   */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_SWORD),
+    /* Giant jump    */ DMG_ENTRY(8, DEKUBABA_DMG_REACT_SWORD),
+    /* Master jump   */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_SWORD),
+    /* Unknown 1     */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
+    /* Unblockable   */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_NONE),
+    /* Unknown 2     */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
 };
 
 // The only difference is that for Big Deku Babas, Hookshot will act the same as Deku Nuts: i.e. it will stun, but
 // cannot kill.
 static DamageTable sBigDekuBabaDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, DEKUBABA_DMGEFF_DEKUNUT),
-    /* Deku stick    */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Slingshot     */ DMG_ENTRY(1, DEKUBABA_DMGEFF_NONE),
-    /* Explosive     */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Boomerang     */ DMG_ENTRY(2, DEKUBABA_DMGEFF_BOOMERANG),
-    /* Normal arrow  */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Hammer swing  */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Hookshot      */ DMG_ENTRY(0, DEKUBABA_DMGEFF_DEKUNUT),
-    /* Kokiri sword  */ DMG_ENTRY(1, DEKUBABA_DMGEFF_SWORD),
-    /* Master sword  */ DMG_ENTRY(2, DEKUBABA_DMGEFF_SWORD),
-    /* Giant's Knife */ DMG_ENTRY(4, DEKUBABA_DMGEFF_SWORD),
-    /* Fire arrow    */ DMG_ENTRY(4, DEKUBABA_DMGEFF_FIRE),
-    /* Ice arrow     */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Light arrow   */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Unk arrow 1   */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Unk arrow 2   */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Unk arrow 3   */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE),
-    /* Fire magic    */ DMG_ENTRY(4, DEKUBABA_DMGEFF_FIRE),
-    /* Ice magic     */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
-    /* Light magic   */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
-    /* Shield        */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
-    /* Mirror Ray    */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
-    /* Kokiri spin   */ DMG_ENTRY(1, DEKUBABA_DMGEFF_SWORD),
-    /* Giant spin    */ DMG_ENTRY(4, DEKUBABA_DMGEFF_SWORD),
-    /* Master spin   */ DMG_ENTRY(2, DEKUBABA_DMGEFF_SWORD),
-    /* Kokiri jump   */ DMG_ENTRY(2, DEKUBABA_DMGEFF_SWORD),
-    /* Giant jump    */ DMG_ENTRY(8, DEKUBABA_DMGEFF_SWORD),
-    /* Master jump   */ DMG_ENTRY(4, DEKUBABA_DMGEFF_SWORD),
-    /* Unknown 1     */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
-    /* Unblockable   */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
-    /* Hammer jump   */ DMG_ENTRY(4, DEKUBABA_DMGEFF_NONE),
-    /* Unknown 2     */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE),
+    /* Deku nut      */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_DEKUNUT),
+    /* Deku stick    */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Slingshot     */ DMG_ENTRY(1, DEKUBABA_DMG_REACT_NONE),
+    /* Explosive     */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Boomerang     */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_BOOMERANG),
+    /* Normal arrow  */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Hammer swing  */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Hookshot      */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_DEKUNUT),
+    /* Kokiri sword  */ DMG_ENTRY(1, DEKUBABA_DMG_REACT_SWORD),
+    /* Master sword  */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_SWORD),
+    /* Giant's Knife */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_SWORD),
+    /* Fire arrow    */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_FIRE),
+    /* Ice arrow     */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Light arrow   */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Unk arrow 1   */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Unk arrow 2   */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Unk arrow 3   */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE),
+    /* Fire magic    */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_FIRE),
+    /* Ice magic     */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
+    /* Light magic   */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
+    /* Shield        */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(1, DEKUBABA_DMG_REACT_SWORD),
+    /* Giant spin    */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_SWORD),
+    /* Master spin   */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_SWORD),
+    /* Kokiri jump   */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_SWORD),
+    /* Giant jump    */ DMG_ENTRY(8, DEKUBABA_DMG_REACT_SWORD),
+    /* Master jump   */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_SWORD),
+    /* Unknown 1     */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
+    /* Unblockable   */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_NONE),
+    /* Unknown 2     */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE),
 };
 
 static InitChainEntry sInitChain[] = {
@@ -257,7 +257,7 @@ void EnDekubaba_Init(Actor* thisx, PlayState* play) {
         // (Of course they reckoned without each age being able to use the other's items, so Stick and Master Sword
         // jumpslash can give the Stick drop as adult, and neither will as child.)
         if (!LINK_IS_ADULT) {
-            sBigDekuBabaDamageTable.table[0x1B] = DMG_ENTRY(4, DEKUBABA_DMGEFF_NONE); // DMG_JUMP_MASTER
+            sBigDekuBabaDamageTable.table[0x1B] = DMG_ENTRY(4, DEKUBABA_DMG_REACT_NONE); // DMG_JUMP_MASTER
         }
 
         CollisionCheck_SetInfo(&this->actor.colChkInfo, &sBigDekuBabaDamageTable, &sColChkInfoInit);
@@ -272,7 +272,7 @@ void EnDekubaba_Init(Actor* thisx, PlayState* play) {
         }
 
         if (!LINK_IS_ADULT) {
-            sDekuBabaDamageTable.table[0x1B] = DMG_ENTRY(4, DEKUBABA_DMGEFF_NONE); // DMG_JUMP_MASTER
+            sDekuBabaDamageTable.table[0x1B] = DMG_ENTRY(4, DEKUBABA_DMG_REACT_NONE); // DMG_JUMP_MASTER
         }
 
         CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDekuBabaDamageTable, &sColChkInfoInit);
@@ -1049,14 +1049,15 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) {
         Actor_SetDropFlagJntSph(&this->actor, &this->collider, true);
 
         if ((this->collider.base.colMaterial != COL_MATERIAL_HARD) &&
-            ((this->actor.colChkInfo.damageEffect != DEKUBABA_DMGEFF_NONE) || (this->actor.colChkInfo.damage != 0))) {
+            ((this->actor.colChkInfo.damageReaction != DEKUBABA_DMG_REACT_NONE) ||
+             (this->actor.colChkInfo.damage != 0))) {
 
             phi_s0 = this->actor.colChkInfo.health - this->actor.colChkInfo.damage;
 
             if (this->actionFunc != EnDekubaba_StunnedVertical) {
-                if ((this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_BOOMERANG) ||
-                    (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_DEKUNUT)) {
-                    if (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_BOOMERANG) {
+                if ((this->actor.colChkInfo.damageReaction == DEKUBABA_DMG_REACT_BOOMERANG) ||
+                    (this->actor.colChkInfo.damageReaction == DEKUBABA_DMG_REACT_DEKUNUT)) {
+                    if (this->actor.colChkInfo.damageReaction == DEKUBABA_DMG_REACT_BOOMERANG) {
                         phi_s0 = this->actor.colChkInfo.health;
                     }
 
@@ -1070,14 +1071,14 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) {
                 } else {
                     EnDekubaba_SetupHit(this, 0);
                 }
-            } else if ((this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_BOOMERANG) ||
-                       (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_SWORD)) {
+            } else if ((this->actor.colChkInfo.damageReaction == DEKUBABA_DMG_REACT_BOOMERANG) ||
+                       (this->actor.colChkInfo.damageReaction == DEKUBABA_DMG_REACT_SWORD)) {
                 if (phi_s0 > 0) {
                     EnDekubaba_SetupSway(this);
                 } else {
                     EnDekubaba_SetupPrunedSomersault(this);
                 }
-            } else if (this->actor.colChkInfo.damageEffect != DEKUBABA_DMGEFF_DEKUNUT) {
+            } else if (this->actor.colChkInfo.damageReaction != DEKUBABA_DMG_REACT_DEKUNUT) {
                 EnDekubaba_SetupHit(this, 0);
             } else {
                 return;
@@ -1085,7 +1086,7 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) {
 
             this->actor.colChkInfo.health = CLAMP_MIN(phi_s0, 0);
 
-            if (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_FIRE) {
+            if (this->actor.colChkInfo.damageReaction == DEKUBABA_DMG_REACT_FIRE) {
                 firePos = &this->actor.world.pos;
                 fireScale = (this->size * 70.0f);
 
diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h
index 46a8b8dbdf..f1cce28c07 100644
--- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h
+++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h
@@ -2,7 +2,7 @@
 #define Z_EN_DEKUBABA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDekubaba;
 
diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
index cf498eb726..dac88693bc 100644
--- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
+++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
@@ -12,8 +12,8 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_dekunuts/object_dekunuts.h"
 
@@ -456,9 +456,9 @@ void EnDekunuts_ColliderCheck(EnDekunuts* this, PlayState* play) {
         this->collider.base.acFlags &= ~AC_HIT;
         Actor_SetDropFlag(&this->actor, &this->collider.elem, true);
         if (this->actor.colChkInfo.mass == 50) {
-            if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) {
-                if (this->actor.colChkInfo.damageEffect != 1) {
-                    if (this->actor.colChkInfo.damageEffect == 2) {
+            if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) {
+                if (this->actor.colChkInfo.damageReaction != 1) {
+                    if (this->actor.colChkInfo.damageReaction == 2) {
                         EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos, 40, 50);
                     }
                     EnDekunuts_SetupBeDamaged(this);
diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h
index 76f23bdecf..a072dc2aa4 100644
--- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h
+++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h
@@ -2,7 +2,7 @@
 #define Z_EN_DEKUNUTS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDekunuts;
 
diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c
index 34acb2d982..7870669259 100644
--- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c
+++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c
@@ -18,11 +18,11 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_dh/object_dh.h"
 
@@ -507,7 +507,7 @@ void EnDh_CollisionCheck(EnDh* this, PlayState* play) {
 
     if ((this->colliderJntSph.base.acFlags & AC_HIT) && !this->retreat) {
         this->colliderJntSph.base.acFlags &= ~AC_HIT;
-        if ((this->actor.colChkInfo.damageEffect != 0) && (this->actor.colChkInfo.damageEffect != 6)) {
+        if ((this->actor.colChkInfo.damageReaction != 0) && (this->actor.colChkInfo.damageReaction != 6)) {
             this->colliderJntSph.base.atFlags = this->colliderJntSph.elements[0].base.atElemFlags =
                 AT_NONE; // also ATELEM_NONE
             this->colliderJntSph.elements[0].base.atDmgInfo.dmgFlags =
diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.h b/src/overlays/actors/ovl_En_Dh/z_en_dh.h
index 0feb3069b5..d923144a73 100644
--- a/src/overlays/actors/ovl_En_Dh/z_en_dh.h
+++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.h
@@ -2,7 +2,7 @@
 #define Z_EN_DH_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDh;
 
diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c
index 5754d8ae1e..559e4a7213 100644
--- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c
+++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c
@@ -16,9 +16,9 @@
 #include "versions.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_dh/object_dh.h"
 
@@ -409,7 +409,7 @@ void EnDha_UpdateHealth(EnDha* this, PlayState* play) {
     if (!((this->unk_1C0 >= 8) || !(this->collider.base.acFlags & AC_HIT))) {
         this->collider.base.acFlags &= ~AC_HIT;
 
-        if (this->actor.colChkInfo.damageEffect == 0 || this->actor.colChkInfo.damageEffect == 6) {
+        if (this->actor.colChkInfo.damageReaction == 0 || this->actor.colChkInfo.damageReaction == 6) {
             return;
         } else {
             Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 8);
diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.h b/src/overlays/actors/ovl_En_Dha/z_en_dha.h
index f7cbd78d7b..9c6f0f7d18 100644
--- a/src/overlays/actors/ovl_En_Dha/z_en_dha.h
+++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.h
@@ -2,7 +2,7 @@
 #define Z_EN_DHA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDha;
 
diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
index 8cb2f45151..bcb49b9250 100644
--- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
+++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
@@ -19,12 +19,12 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "effect.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_zo/object_zo.h"
 
@@ -101,13 +101,13 @@ void EnDivingGame_Init(Actor* thisx, PlayState* play) {
     SkelAnime_InitFlex(play, &this->skelAnime, &gZoraSkel, &gZoraIdleAnim, this->jointTable, this->morphTable, 20);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
-    PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 素もぐりＧＯ ☆☆☆☆☆ \n" VT_RST);
+    PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 素もぐりＧＯ ☆☆☆☆☆ \n", "☆☆☆☆☆ Diving GO ☆☆☆☆☆ \n") VT_RST);
     this->actor.room = -1;
     this->actor.scale.x = 0.01f;
     this->actor.scale.y = 0.012999999f;
     this->actor.scale.z = 0.0139999995f;
     if (D_809EF0B0) {
-        PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" VT_RST);
+        PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n", "☆☆☆☆☆ I'm already here -Hara ☆☆☆☆☆ \n") VT_RST);
         this->unk_31F = 1;
         Actor_Kill(&this->actor);
     } else {
diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h
index ccc211dc8b..f5e9c1cc77 100644
--- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h
+++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h
@@ -2,7 +2,7 @@
 #define Z_EN_DIVING_GAME_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDivingGame;
 
diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c
index 399f417aa1..8dd85d8c2e 100644
--- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c
+++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c
@@ -15,10 +15,10 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_shopnuts/object_shopnuts.h"
 
diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.h b/src/overlays/actors/ovl_En_Dns/z_en_dns.h
index 3a91a5362a..251cc4192b 100644
--- a/src/overlays/actors/ovl_En_Dns/z_en_dns.h
+++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.h
@@ -2,7 +2,7 @@
 #define Z_EN_DNS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "assets/objects/object_shopnuts/object_shopnuts.h"
 
 #define DNS_GET_TYPE(thisx) ((thisx)->params)
diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
index d851c96a08..24e881840f 100644
--- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
+++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
@@ -19,11 +19,11 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64debug_display.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "debug_display.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS 0
 
@@ -98,8 +98,9 @@ void EnDntDemo_Init(Actor* thisx, PlayState* play2) {
                                                           this->scrubPos[i].x, this->scrubPos[i].y, this->scrubPos[i].z,
                                                           0, 0, 0, i + ENDNTNOMAL_STAGE);
         if (this->scrubs[i] != NULL) {
-            // "zako zako" [small fries]
-            PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ザコザコ ☆☆☆☆☆ %x\n" VT_RST, this->scrubs[i]);
+            // [small fry]
+            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ ザコザコ ☆☆☆☆☆ %x\n", "☆☆☆☆☆ zako zako ☆☆☆☆☆ %x\n") VT_RST,
+                   this->scrubs[i]);
         }
     }
 
@@ -161,8 +162,8 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) {
             }
         }
         if (this->judgeTimer > 40) {
-            // "gera gera" [onomatopoeia for loud giggling]
-            PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ げらげら ☆☆☆☆☆ \n" VT_RST);
+            // [onomatopoeia for loud giggling]
+            PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ げらげら ☆☆☆☆☆ \n", "☆☆☆☆☆ gera gera ☆☆☆☆☆ \n") VT_RST);
             func_800F436C(&this->actor.projectedPos, NA_SE_EV_CROWD - SFX_FLAG, 2.0f);
         }
         if (this->judgeTimer < 120) {
diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h
index 29c302aed2..0fab1534e7 100644
--- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h
+++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h
@@ -2,7 +2,7 @@
 #define Z_EN_DNT_DEMO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDntDemo;
 
diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
index c89aa0d67f..dfaa49be28 100644
--- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
+++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
@@ -23,10 +23,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_dns/object_dns.h"
 
diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h
index 540a8951a3..6272f8d916 100644
--- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h
+++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h
@@ -2,7 +2,7 @@
 #define Z_EN_DNT_JIJI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDntJiji;
 
diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
index ab5a70d82f..353f42e63c 100644
--- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
+++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
@@ -24,10 +24,10 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_dnk/object_dnk.h"
 #include "assets/objects/object_hintnuts/object_hintnuts.h"
diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h
index 21f77798a0..8f8626a28a 100644
--- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h
+++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h
@@ -2,7 +2,7 @@
 #define Z_EN_DNT_NOMAL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDntNomal;
 
diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
index 1d967ed5fa..2f276b25f4 100644
--- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
+++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
@@ -14,9 +14,9 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_dodojr/object_dodojr.h"
 
@@ -360,14 +360,14 @@ s32 EnDodojr_CheckDamaged(EnDodojr* this, PlayState* play) {
             this->actor.shape.shadowDraw = ActorShadow_DrawCircle;
         }
 
-        if ((this->actor.colChkInfo.damageEffect == 0) && (this->actor.colChkInfo.damage != 0)) {
+        if ((this->actor.colChkInfo.damageReaction == 0) && (this->actor.colChkInfo.damage != 0)) {
             Enemy_StartFinishingBlow(play, &this->actor);
             this->freezeFrameTimer = 2;
             this->actionFunc = EnDodojr_WaitFreezeFrames;
             return true;
         }
 
-        if ((this->actor.colChkInfo.damageEffect == 1) && (this->actionFunc != EnDodojr_Stunned) &&
+        if ((this->actor.colChkInfo.damageReaction == 1) && (this->actionFunc != EnDodojr_Stunned) &&
             (this->actionFunc != EnDodojr_StunnedBounce)) {
             Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
             this->stunTimer = 120;
diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h
index 615304cb01..c90c5be548 100644
--- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h
+++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h
@@ -2,7 +2,7 @@
 #define Z_EN_DODOJR_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDodojr;
 
diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
index 5d013911eb..c7446c4f19 100644
--- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
+++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
@@ -12,9 +12,9 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_dodongo/object_dodongo.h"
 
@@ -415,7 +415,7 @@ void EnDodongo_SetupStunned(EnDodongo* this) {
     Animation_Change(&this->skelAnime, &gDodongoBreatheFireAnim, 0.0f, 25.0f, 0.0f, ANIMMODE_ONCE, -4.0f);
     this->actionState = DODONGO_STUNNED;
     this->actor.speed = 0.0f;
-    if (this->damageEffect == 0xF) {
+    if (this->damageReaction == 0xF) {
         this->iceTimer = 36;
     }
     Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
@@ -733,9 +733,9 @@ void EnDodongo_CollisionCheck(EnDodongo* this, PlayState* play) {
     } else if ((this->bodyCollider.base.acFlags & AC_HIT) && (this->actionState > DODONGO_DEATH)) {
         this->bodyCollider.base.acFlags &= ~AC_HIT;
         Actor_SetDropFlagJntSph(&this->actor, &this->bodyCollider, false);
-        if (this->actor.colChkInfo.damageEffect != 0xE) {
-            this->damageEffect = this->actor.colChkInfo.damageEffect;
-            if ((this->actor.colChkInfo.damageEffect == 1) || (this->actor.colChkInfo.damageEffect == 0xF)) {
+        if (this->actor.colChkInfo.damageReaction != 0xE) {
+            this->damageReaction = this->actor.colChkInfo.damageReaction;
+            if ((this->actor.colChkInfo.damageReaction == 1) || (this->actor.colChkInfo.damageReaction == 0xF)) {
                 if (this->actionState != DODONGO_STUNNED) {
                     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80);
                     Actor_ApplyDamage(&this->actor);
@@ -783,7 +783,7 @@ void EnDodongo_Update(Actor* thisx, PlayState* play) {
     EnDodongo* this = (EnDodongo*)thisx;
 
     EnDodongo_CollisionCheck(this, play);
-    if (this->actor.colChkInfo.damageEffect != 0xE) {
+    if (this->actor.colChkInfo.damageReaction != 0xE) {
         this->actionFunc(this, play);
         Actor_MoveXZGravity(&this->actor);
         Actor_UpdateBgCheckInfo(play, &this->actor, 75.0f, 60.0f, 70.0f,
diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
index 7785030d49..4196409607 100644
--- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
+++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
@@ -2,7 +2,7 @@
 #define Z_EN_DODONGO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDodongo;
 
@@ -30,7 +30,7 @@ typedef struct EnDodongo {
     /* 0x0358 */ Vec3f icePos[9];
     /* 0x03C4 */ Color_RGBA8 bombSmokePrimColor;
     /* 0x03C8 */ Color_RGBA8 bombSmokeEnvColor;
-    /* 0x03CC */ u8 damageEffect;
+    /* 0x03CC */ u8 damageReaction;
     /* 0x03D0 */ s32 blureIdx;
     /* 0x03D4 */ ColliderQuad colliderAT;
     /* 0x0454 */ ColliderTris colliderHard;
diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c
index 0255b01626..4f25c38d08 100644
--- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c
+++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c
@@ -10,8 +10,8 @@
 #include "gfx_setupdl.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_dog/object_dog.h"
 
diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.h b/src/overlays/actors/ovl_En_Dog/z_en_dog.h
index c3cdfd913b..7595d752ae 100644
--- a/src/overlays/actors/ovl_En_Dog/z_en_dog.h
+++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.h
@@ -2,7 +2,7 @@
 #define Z_EN_DOG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDog;
 
diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c
index 9f5bd8723e..b4bdd073f4 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.c
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.c
@@ -13,10 +13,10 @@
 #include "ichain.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.h b/src/overlays/actors/ovl_En_Door/z_en_door.h
index 4b4f95c466..60ed932eac 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.h
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.h
@@ -2,7 +2,7 @@
 #define Z_EN_DOOR_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 /**
  * Actor Parameters
diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c
index 3c879ee1ac..1568736109 100644
--- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c
+++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c
@@ -11,9 +11,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ds/object_ds.h"
 
diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.h b/src/overlays/actors/ovl_En_Ds/z_en_ds.h
index 9c7df969c6..40adaa8c47 100644
--- a/src/overlays/actors/ovl_En_Ds/z_en_ds.h
+++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.h
@@ -2,7 +2,7 @@
 #define Z_EN_DS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDs;
 
diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c
index 1f716b977d..a89c572a83 100644
--- a/src/overlays/actors/ovl_En_Du/z_en_du.c
+++ b/src/overlays/actors/ovl_En_Du/z_en_du.c
@@ -7,12 +7,12 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64face_reaction.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "face_reaction.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_du/object_du.h"
 #include "assets/scenes/overworld/spot18/spot18_scene.h"
diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.h b/src/overlays/actors/ovl_En_Du/z_en_du.h
index 9e3ecb8805..e832b32071 100644
--- a/src/overlays/actors/ovl_En_Du/z_en_du.h
+++ b/src/overlays/actors/ovl_En_Du/z_en_du.h
@@ -2,7 +2,7 @@
 #define Z_EN_DU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDu;
 
diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c
index 804e04ad84..a3ae11bf61 100644
--- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c
+++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c
@@ -15,7 +15,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_dy_obj/object_dy_obj.h"
 
diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h
index cf0fba2ea1..a093b62b31 100644
--- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h
+++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h
@@ -2,7 +2,7 @@
 #define Z_EN_DY_EXTRA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnDyExtra;
 
diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/src/overlays/actors/ovl_En_Eg/z_en_eg.c
index b4da54551d..87558e258d 100644
--- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c
+++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c
@@ -14,8 +14,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.h b/src/overlays/actors/ovl_En_Eg/z_en_eg.h
index c42994f61c..4636ad9149 100644
--- a/src/overlays/actors/ovl_En_Eg/z_en_eg.h
+++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.h
@@ -2,7 +2,7 @@
 #define Z_EN_EG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnEg;
 
diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c
index 9477eb0df1..f0a5b4466e 100644
--- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c
+++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c
@@ -7,9 +7,9 @@
 #include "sfx.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_ei/object_ei.h"
 
@@ -616,7 +616,7 @@ void EnEiyer_UpdateDamage(EnEiyer* this, PlayState* play) {
         this->collider.base.acFlags &= ~AC_HIT;
         Actor_SetDropFlag(&this->actor, &this->collider.elem, true);
 
-        if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) {
+        if (this->actor.colChkInfo.damageReaction != 0 || this->actor.colChkInfo.damage != 0) {
             if (Actor_ApplyDamage(&this->actor) == 0) {
                 Enemy_StartFinishingBlow(play, &this->actor);
                 Actor_PlaySfx(&this->actor, NA_SE_EN_EIER_DEAD);
@@ -630,7 +630,7 @@ void EnEiyer_UpdateDamage(EnEiyer* this, PlayState* play) {
                 } else {
                     EnEiyer_SetupDie(this);
                 }
-            } else if (this->actor.colChkInfo.damageEffect == 1) {
+            } else if (this->actor.colChkInfo.damageReaction == 1) {
                 if (this->actionFunc != EnEiyer_Stunned) {
                     EnEiyer_SetupStunned(this);
                 }
diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h
index 7626924496..b9e19f884f 100644
--- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h
+++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h
@@ -2,7 +2,7 @@
 #define Z_EN_EIYER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnEiyer;
 
diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
index 58cd30f3ff..b40e670140 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
@@ -19,13 +19,13 @@
 #include "sys_math.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64quest_hint.h"
-#include "z64save.h"
+#include "audio.h"
+#include "effect.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
+#include "quest_hint.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/src/overlays/actors/ovl_En_Elf/z_en_elf.h
index 60e9940d75..2c796cfbbc 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h
@@ -2,8 +2,8 @@
 #define Z_EN_ELF_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct EnElf;
 
diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
index 92374ad12a..d43571b7d6 100644
--- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
+++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
@@ -8,10 +8,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "debug_display.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED)
 
diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
index b9c8c1d882..73486e493b 100644
--- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
+++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
@@ -2,7 +2,7 @@
 #define Z_EN_ENCOUNT1_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #define SPAWNER_PARAMS(type, number, total) ((type << 0xB) | (number << 0x6) | total)
 
diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
index c3604dd321..b1f714e5df 100644
--- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
+++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
@@ -12,9 +12,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_efc_star_field/object_efc_star_field.h"
 
@@ -249,11 +249,11 @@ void EnEncount2_SpawnRocks(EnEncount2* this, PlayState* play) {
                 this->numSpawnedRocks++;
                 return;
             }
-            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't occur! ☆☆☆☆☆\n") VT_RST);
-            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't occur! ☆☆☆☆☆\n") VT_RST);
-            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't occur! ☆☆☆☆☆\n") VT_RST);
-            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't occur! ☆☆☆☆☆\n") VT_RST);
-            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n\n", "☆☆☆☆☆ Can't occur! ☆☆☆☆☆\n\n") VT_RST);
+            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't spawn! ☆☆☆☆☆\n") VT_RST);
+            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't spawn! ☆☆☆☆☆\n") VT_RST);
+            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't spawn! ☆☆☆☆☆\n") VT_RST);
+            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't spawn! ☆☆☆☆☆\n") VT_RST);
+            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n\n", "☆☆☆☆☆ Can't spawn! ☆☆☆☆☆\n\n") VT_RST);
         }
     }
 }
diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h
index c91c7a7512..20095e4cd3 100644
--- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h
+++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h
@@ -2,7 +2,7 @@
 #define Z_EN_ENCOUNT2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnEncount2;
 
diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
index e9c0d12dda..6c232529e7 100644
--- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
+++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
@@ -17,10 +17,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64draw.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "draw.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h
index eba20bc116..1783672579 100644
--- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h
+++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h
@@ -2,7 +2,7 @@
 #define Z_EN_EX_ITEM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnExItem;
 
diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
index 0777494e6a..c9dd249402 100644
--- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
+++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
@@ -13,9 +13,9 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h
index 7ba20450e8..1e3b6ece87 100644
--- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h
+++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h
@@ -2,7 +2,7 @@
 #define Z_EN_EX_RUPPY_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnExRuppy;
 
diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c
index 475c476bb5..8050aef560 100644
--- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c
+++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c
@@ -16,9 +16,9 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_fw/object_fw.h"
diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.h b/src/overlays/actors/ovl_En_Fd/z_en_fd.h
index 3fc40a54cf..81774fac66 100644
--- a/src/overlays/actors/ovl_En_Fd/z_en_fd.h
+++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.h
@@ -2,7 +2,7 @@
 #define Z_EN_FD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnFd;
 
diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
index b124094a2c..a26b54a64a 100644
--- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
+++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
@@ -6,8 +6,8 @@
 #include "rand.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h
index d027a07972..3100b31e72 100644
--- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h
+++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h
@@ -2,7 +2,7 @@
 #define Z_EN_FD_FIRE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnFdFire;
 
diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
index 3eeb70ecb2..793f6a5e82 100644
--- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
+++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
@@ -22,9 +22,9 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_fhg/object_fhg.h"
diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h
index 59136f7dfd..fbdb9d8c62 100644
--- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h
+++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h
@@ -2,8 +2,8 @@
 #define Z_EN_FHG_FIRE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct EnFhgFire;
 
diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
index 85a1fa0cee..f07d0ac868 100644
--- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
+++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
@@ -12,10 +12,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "debug_display.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_efc_star_field/object_efc_star_field.h"
 
@@ -270,7 +270,7 @@ void EnFireRock_SpawnMoreBrokenPieces(EnFireRock* this, PlayState* play) {
                 }
                 spawnedFireRock->scale = this->scale - 0.01f;
             } else {
-                PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n" VT_RST);
+                PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n", "☆☆☆☆☆ It's full ☆☆☆☆☆ \n") VT_RST);
             }
         }
         Actor_PlaySfx(&this->actor, NA_SE_EN_VALVAISA_ROCK);
@@ -291,7 +291,7 @@ void FireRock_WaitSpawnRocksFromCeiling(EnFireRock* this, PlayState* play) {
             if (spawnedFireRock != NULL) {
                 spawnedFireRock->timer = 10;
             } else {
-                PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n" VT_RST);
+                PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n", "☆☆☆☆☆ It's full ☆☆☆☆☆ \n") VT_RST);
             }
         }
         this->playerNearby = 1;
diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h
index 9b88eaa2c0..0bd9ab2e65 100644
--- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h
+++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h
@@ -2,7 +2,7 @@
 #define Z_EN_FIRE_ROCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h"
 
diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
index e674ee9bf5..e3df3a19f1 100644
--- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
+++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
@@ -17,9 +17,9 @@
 #include "versions.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_firefly/object_firefly.h"
 
@@ -637,21 +637,21 @@ void EnFirefly_Combust(EnFirefly* this, PlayState* play) {
 }
 
 void EnFirefly_UpdateDamage(EnFirefly* this, PlayState* play) {
-    u8 damageEffect;
+    u8 damageReaction;
 
     if (this->collider.base.acFlags & AC_HIT) {
         this->collider.base.acFlags &= ~AC_HIT;
         Actor_SetDropFlag(&this->actor, &this->collider.elements[0].base, true);
 
-        if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) {
+        if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) {
             if (Actor_ApplyDamage(&this->actor) == 0) {
                 Enemy_StartFinishingBlow(play, &this->actor);
                 this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
             }
 
-            damageEffect = this->actor.colChkInfo.damageEffect;
+            damageReaction = this->actor.colChkInfo.damageReaction;
 
-            if (damageEffect == 2) { // Din's Fire
+            if (damageReaction == 2) { // Din's Fire
                 if (this->actor.params == KEESE_ICE_FLY) {
                     this->actor.colChkInfo.health = 0;
                     Enemy_StartFinishingBlow(play, &this->actor);
@@ -663,18 +663,18 @@ void EnFirefly_UpdateDamage(EnFirefly* this, PlayState* play) {
                         EnFirefly_SetupFlyIdle(this);
                     }
                 }
-            } else if (damageEffect == 3) { // Ice Arrows or Ice Magic
+            } else if (damageReaction == 3) { // Ice Arrows or Ice Magic
                 if (this->actor.params == KEESE_ICE_FLY) {
                     EnFirefly_SetupFall(this);
                 } else {
                     EnFirefly_SetupFrozenFall(this, play);
                 }
-            } else if (damageEffect == 1) { // Deku Nuts
+            } else if (damageReaction == 1) { // Deku Nuts
                 if (this->actionFunc != EnFirefly_Stunned) {
                     EnFirefly_SetupStunned(this);
                 }
             } else { // Fire Arrows
-                if ((damageEffect == 0xF) && (this->actor.params == KEESE_ICE_FLY)) {
+                if ((damageReaction == 0xF) && (this->actor.params == KEESE_ICE_FLY)) {
                     EnFirefly_Combust(this, play);
                 }
                 EnFirefly_SetupFall(this);
diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h
index 7638036a82..d49e8b1943 100644
--- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h
+++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h
@@ -2,7 +2,7 @@
 #define Z_EN_FIREFLY_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnFirefly;
 
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
index f5964ebaea..ce2cb23937 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@@ -15,9 +15,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64item.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "item.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.h b/src/overlays/actors/ovl_En_Fish/z_en_fish.h
index d75de5b0a5..8019ff06cb 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.h
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.h
@@ -2,7 +2,7 @@
 #define Z_EN_FISH_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnFish;
 
diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
index 87747933d3..2c102649c3 100644
--- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
+++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
@@ -13,10 +13,10 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_wallmaster/object_wallmaster.h"
 
@@ -423,7 +423,7 @@ void EnFloormas_SetupRecover(EnFloormas* this) {
 void EnFloormas_SetupFreeze(EnFloormas* this) {
     Animation_Change(&this->skelAnime, &gWallmasterJumpAnim, 1.5f, 0, 20.0f, ANIMMODE_ONCE, -3.0f);
     this->actor.speed = 0.0f;
-    if (this->actor.colChkInfo.damageEffect == 4) {
+    if (this->actor.colChkInfo.damageReaction == 4) {
         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 255, COLORFILTER_BUFFLAG_OPA, 80);
     } else {
         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 80);
@@ -992,7 +992,7 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) {
     if (this->collider.base.acFlags & AC_HIT) {
         this->collider.base.acFlags &= ~AC_HIT;
         Actor_SetDropFlag(&this->actor, &this->collider.elem, true);
-        if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) {
+        if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) {
             if (this->collider.base.colMaterial != COL_MATERIAL_HARD) {
                 isSmall = false;
                 if (this->actor.scale.x < 0.01f) {
@@ -1000,7 +1000,7 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) {
                 }
                 if (isSmall && this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT) {
                     this->actor.colChkInfo.damage = 2;
-                    this->actor.colChkInfo.damageEffect = 0;
+                    this->actor.colChkInfo.damageReaction = 0;
                 }
                 if (Actor_ApplyDamage(&this->actor) == 0) {
                     if (isSmall) {
@@ -1014,12 +1014,12 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) {
                     Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_DAMAGE);
                 }
 
-                if ((this->actor.colChkInfo.damageEffect == 4) || (this->actor.colChkInfo.damageEffect == 1)) {
+                if ((this->actor.colChkInfo.damageReaction == 4) || (this->actor.colChkInfo.damageReaction == 1)) {
                     if (this->actionFunc != EnFloormas_Freeze) {
                         EnFloormas_SetupFreeze(this);
                     }
                 } else {
-                    if (this->actor.colChkInfo.damageEffect == 2) {
+                    if (this->actor.colChkInfo.damageReaction == 2) {
                         EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos, this->actor.scale.x * 4000.0f,
                                               this->actor.scale.x * 4000.0f);
                     }
diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
index 4aefd1ad97..7c96d195b6 100644
--- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
+++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
@@ -2,7 +2,7 @@
 #define Z_EN_FLOORMAS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef struct EnFloormas EnFloormas;
 
diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c
index 00d29dcc6f..17889ad568 100644
--- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c
+++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c
@@ -15,14 +15,14 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64debug_display.h"
-#include "z64effect.h"
-#include "z64light.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "debug_display.h"
+#include "effect.h"
+#include "light.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "assets/objects/object_fr/object_fr.h"
diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.h b/src/overlays/actors/ovl_En_Fr/z_en_fr.h
index 2bed02b4a0..541fa5ae12 100644
--- a/src/overlays/actors/ovl_En_Fr/z_en_fr.h
+++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.h
@@ -2,8 +2,8 @@
 #define Z_EN_FR_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct EnFr;
 
diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c
index 24818477d7..e8cfb6342f 100644
--- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c
+++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c
@@ -12,11 +12,11 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_fu/object_fu.h"
 #include "assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h"
diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.h b/src/overlays/actors/ovl_En_Fu/z_en_fu.h
index af90b2cf05..d2138f7613 100644
--- a/src/overlays/actors/ovl_En_Fu/z_en_fu.h
+++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.h
@@ -2,7 +2,7 @@
 #define Z_EN_FU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnFu;
 
diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c
index ba002aefbe..9d8b9e5aa3 100644
--- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c
+++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c
@@ -16,8 +16,8 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_fw/object_fw.h"
diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.h b/src/overlays/actors/ovl_En_Fw/z_en_fw.h
index b19f967111..6bc847f3c1 100644
--- a/src/overlays/actors/ovl_En_Fw/z_en_fw.h
+++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.h
@@ -2,7 +2,7 @@
 #define Z_EN_FW_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnFw;
 
diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c
index 6ded127aef..fc0c1363bb 100644
--- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c
+++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c
@@ -9,8 +9,8 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_fz/object_fz.h"
 
@@ -356,7 +356,7 @@ void EnFz_ApplyDamage(EnFz* this, PlayState* play) {
             this->collider1.base.acFlags &= ~AC_HIT;
         } else if (this->collider1.base.acFlags & AC_HIT) {
             this->collider1.base.acFlags &= ~AC_HIT;
-            switch (this->actor.colChkInfo.damageEffect) {
+            switch (this->actor.colChkInfo.damageReaction) {
                 case 0xF:
                     Actor_ApplyDamage(&this->actor);
                     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_XLU, 8);
diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.h b/src/overlays/actors/ovl_En_Fz/z_en_fz.h
index 277e039e2d..891ae41d94 100644
--- a/src/overlays/actors/ovl_En_Fz/z_en_fz.h
+++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.h
@@ -2,7 +2,7 @@
 #define Z_EN_FZ_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnFz;
 
diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
index 5a6ad4a323..bc8c75c255 100644
--- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
+++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
@@ -22,12 +22,12 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64debug_display.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "debug_display.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_tsubo/object_tsubo.h"
diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h
index c680fb1440..85f77284d5 100644
--- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h
+++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h
@@ -2,7 +2,7 @@
 #define Z_EN_G_SWITCH_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnGSwitch;
 
diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c
index d40a9a446d..c7f32b7bd7 100644
--- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c
+++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c
@@ -12,8 +12,9 @@
 #include "segmented_address.h"
 #include "sys_math.h"
 #include "sys_matrix.h"
+#include "tex_len.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h"
 
@@ -102,12 +103,39 @@ static u16 sVerticesMap[GANON_MANT_NUM_STRANDS * GANON_MANT_NUM_JOINTS] = {
     MAP_STRAND_TO_VTX(3),  MAP_STRAND_TO_VTX(2),  MAP_STRAND_TO_VTX(1), MAP_STRAND_TO_VTX(0),
 };
 
-#define MANT_TEX_WIDTH 32
-#define MANT_TEX_HEIGHT 64
-
 static u64 sForceAlignment = 0;
 
-#include "assets/overlays/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant.c"
+#define gMantTex_WIDTH 32
+#define gMantTex_HEIGHT 64
+static u64 gMantTex[TEX_LEN(u64, gMantTex_WIDTH, gMantTex_HEIGHT, 16)] = {
+#include "assets/overlays/ovl_En_Ganon_Mant/gMantTex.rgba16.inc.c"
+};
+
+#define gMantUnusedTex_WIDTH 32
+#define gMantUnusedTex_HEIGHT 32
+static u64 gMantUnusedTex[TEX_LEN(u64, gMantUnusedTex_WIDTH, gMantUnusedTex_HEIGHT, 16)] = {
+#include "assets/overlays/ovl_En_Ganon_Mant/gMantUnusedTex.rgba16.inc.c"
+};
+
+static Vtx gMant1Vtx[] = {
+#include "assets/overlays/ovl_En_Ganon_Mant/gMant1Vtx.inc.c"
+};
+
+static Gfx gMantMaterialDL[11] = {
+#include "assets/overlays/ovl_En_Ganon_Mant/gMantMaterialDL.inc.c"
+};
+
+static Gfx gMantUnusedMaterialDL[11] = {
+#include "assets/overlays/ovl_En_Ganon_Mant/gMantUnusedMaterialDL.inc.c"
+};
+
+static Gfx gMantDL[138] = {
+#include "assets/overlays/ovl_En_Ganon_Mant/gMantDL.inc.c"
+};
+
+static Vtx gMant2Vtx[] = {
+#include "assets/overlays/ovl_En_Ganon_Mant/gMant2Vtx.inc.c"
+};
 
 void EnGanonMant_Init(Actor* thisx, PlayState* play) {
     EnGanonMant* this = (EnGanonMant*)thisx;
@@ -127,8 +155,8 @@ void EnGanonMant_Tear(EnGanonMant* this) {
     s16 areaX;
     s16 areaY;
     s16 texIdx;
-    f32 tx = Rand_ZeroFloat(MANT_TEX_WIDTH);
-    f32 ty = Rand_ZeroFloat(MANT_TEX_HEIGHT);
+    f32 tx = Rand_ZeroFloat(gMantTex_WIDTH);
+    f32 ty = Rand_ZeroFloat(gMantTex_HEIGHT);
     f32 tearAngle = Rand_ZeroFloat(2 * M_PI);
     f32 tearDirX = sinf(tearAngle);
     f32 tearDirY = cosf(tearAngle);
@@ -137,11 +165,11 @@ void EnGanonMant_Tear(EnGanonMant* this) {
     s16* tearAreaSizes = shape->tearAreaSizes;
 
     for (i = 0; i < count; i++) {
-        if ((0 <= tx && tx < MANT_TEX_WIDTH) && (0 <= ty && ty < MANT_TEX_HEIGHT)) {
+        if ((0 <= tx && tx < gMantTex_WIDTH) && (0 <= ty && ty < gMantTex_HEIGHT)) {
             for (areaX = 0; areaX <= tearAreaSizes[i]; areaX++) {
                 for (areaY = 0; areaY <= tearAreaSizes[i]; areaY++) {
-                    texIdx = (s16)((s16)tx + ((s16)ty * MANT_TEX_WIDTH)) + ((s16)areaX + ((s16)areaY * MANT_TEX_WIDTH));
-                    if (texIdx >= MANT_TEX_WIDTH * MANT_TEX_HEIGHT) {
+                    texIdx = (s16)((s16)tx + ((s16)ty * gMantTex_WIDTH)) + ((s16)areaX + ((s16)areaY * gMantTex_WIDTH));
+                    if (texIdx >= gMantTex_WIDTH * gMantTex_HEIGHT) {
                         continue;
                     }
                     ((u16*)gMantTex)[texIdx] = 0;
diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h
index 61bf1826bc..84d6ecce90 100644
--- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h
+++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h
@@ -2,7 +2,7 @@
 #define Z_EN_GANON_MANT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnGanonMant;
 
diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
index a002ce5e1b..6237f84e06 100644
--- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
+++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
@@ -10,7 +10,7 @@
 #include "gfx_setupdl.h"
 #include "printf.h"
 #include "sys_matrix.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h"
 
diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h
index 8d20bee4d3..5e5f4a577c 100644
--- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h
+++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h
@@ -2,7 +2,7 @@
 #define Z_EN_GANON_ORGAN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnGanonOrgan;
 
diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c
index 9565ceba98..ccf8740470 100644
--- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c
+++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c
@@ -16,10 +16,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ps/object_ps.h"
 
diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.h b/src/overlays/actors/ovl_En_Gb/z_en_gb.h
index 24b7d30560..5f12f4b360 100644
--- a/src/overlays/actors/ovl_En_Gb/z_en_gb.h
+++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.h
@@ -2,8 +2,8 @@
 #define Z_EN_GB_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct EnGb;
 
diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
index 8b6d821346..6d08efd921 100644
--- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@@ -16,11 +16,11 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64horse.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "horse.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ge1/object_ge1.h"
 
diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
index 6aaaf2ab37..077f0f9cc0 100644
--- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
+++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
@@ -2,7 +2,7 @@
 #define Z_EN_GE1_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnGe1;
 
diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
index 704ca69543..c40402d602 100644
--- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
+++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
@@ -15,11 +15,11 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64horse.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "horse.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_gla/object_gla.h"
 
diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h
index b453531040..27094a5833 100644
--- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h
+++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h
@@ -2,7 +2,7 @@
 #define Z_EN_GE2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnGe2;
 
diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
index 5e0783bc30..ad77c01118 100644
--- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
+++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
@@ -13,9 +13,9 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64item.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "item.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_geldb/object_geldb.h"
 
diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h
index d767ba6d9a..62b9882055 100644
--- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h
+++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h
@@ -2,7 +2,7 @@
 #define Z_EN_GE3_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "overlays/actors/ovl_En_GeldB/z_en_geldb.h"
 
 struct EnGe3;
diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
index a0fea77783..11850ccdf5 100644
--- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
+++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
@@ -17,11 +17,11 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_geldb/object_geldb.h"
 
@@ -177,48 +177,48 @@ static ColliderQuadInit sSwordQuadInit = {
     { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
 };
 
-typedef enum EnGeldBDamageEffects {
-    /* 0x0 */ GELDB_DMG_NORMAL,
-    /* 0x1 */ GELDB_DMG_STUN,
-    /* 0x6 */ GELDB_DMG_UNK_6 = 0x6,
-    /* 0xD */ GELDB_DMG_UNK_D = 0xD,
-    /* 0xE */ GELDB_DMG_UNK_E,
-    /* 0xF */ GELDB_DMG_FREEZE
-} EnGeldBDamageEffects;
+typedef enum EnGeldBDamageReaction {
+    /* 0x0 */ GELDB_DMG_REACT_NORMAL,
+    /* 0x1 */ GELDB_DMG_REACT_STUN,
+    /* 0x6 */ GELDB_DMG_REACT_UNK_6 = 0x6,
+    /* 0xD */ GELDB_DMG_REACT_UNK_D = 0xD,
+    /* 0xE */ GELDB_DMG_REACT_UNK_E,
+    /* 0xF */ GELDB_DMG_REACT_FREEZE
+} EnGeldBDamageReaction;
 
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, GELDB_DMG_STUN),
-    /* Deku stick    */ DMG_ENTRY(2, GELDB_DMG_NORMAL),
-    /* Slingshot     */ DMG_ENTRY(1, GELDB_DMG_NORMAL),
-    /* Explosive     */ DMG_ENTRY(2, GELDB_DMG_NORMAL),
-    /* Boomerang     */ DMG_ENTRY(0, GELDB_DMG_STUN),
-    /* Normal arrow  */ DMG_ENTRY(2, GELDB_DMG_NORMAL),
-    /* Hammer swing  */ DMG_ENTRY(2, GELDB_DMG_NORMAL),
-    /* Hookshot      */ DMG_ENTRY(0, GELDB_DMG_STUN),
-    /* Kokiri sword  */ DMG_ENTRY(1, GELDB_DMG_NORMAL),
-    /* Master sword  */ DMG_ENTRY(2, GELDB_DMG_NORMAL),
-    /* Giant's Knife */ DMG_ENTRY(4, GELDB_DMG_NORMAL),
-    /* Fire arrow    */ DMG_ENTRY(2, GELDB_DMG_NORMAL),
-    /* Ice arrow     */ DMG_ENTRY(2, GELDB_DMG_FREEZE),
-    /* Light arrow   */ DMG_ENTRY(2, GELDB_DMG_NORMAL),
-    /* Unk arrow 1   */ DMG_ENTRY(2, GELDB_DMG_NORMAL),
-    /* Unk arrow 2   */ DMG_ENTRY(2, GELDB_DMG_NORMAL),
-    /* Unk arrow 3   */ DMG_ENTRY(2, GELDB_DMG_NORMAL),
-    /* Fire magic    */ DMG_ENTRY(4, GELDB_DMG_UNK_E),
-    /* Ice magic     */ DMG_ENTRY(0, GELDB_DMG_UNK_6),
-    /* Light magic   */ DMG_ENTRY(3, GELDB_DMG_UNK_D),
-    /* Shield        */ DMG_ENTRY(0, GELDB_DMG_NORMAL),
-    /* Mirror Ray    */ DMG_ENTRY(0, GELDB_DMG_NORMAL),
-    /* Kokiri spin   */ DMG_ENTRY(1, GELDB_DMG_NORMAL),
-    /* Giant spin    */ DMG_ENTRY(4, GELDB_DMG_NORMAL),
-    /* Master spin   */ DMG_ENTRY(2, GELDB_DMG_NORMAL),
-    /* Kokiri jump   */ DMG_ENTRY(2, GELDB_DMG_NORMAL),
-    /* Giant jump    */ DMG_ENTRY(8, GELDB_DMG_NORMAL),
-    /* Master jump   */ DMG_ENTRY(4, GELDB_DMG_NORMAL),
-    /* Unknown 1     */ DMG_ENTRY(4, GELDB_DMG_NORMAL),
-    /* Unblockable   */ DMG_ENTRY(0, GELDB_DMG_NORMAL),
-    /* Hammer jump   */ DMG_ENTRY(4, GELDB_DMG_NORMAL),
-    /* Unknown 2     */ DMG_ENTRY(0, GELDB_DMG_NORMAL),
+    /* Deku nut      */ DMG_ENTRY(0, GELDB_DMG_REACT_STUN),
+    /* Deku stick    */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL),
+    /* Slingshot     */ DMG_ENTRY(1, GELDB_DMG_REACT_NORMAL),
+    /* Explosive     */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL),
+    /* Boomerang     */ DMG_ENTRY(0, GELDB_DMG_REACT_STUN),
+    /* Normal arrow  */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL),
+    /* Hammer swing  */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL),
+    /* Hookshot      */ DMG_ENTRY(0, GELDB_DMG_REACT_STUN),
+    /* Kokiri sword  */ DMG_ENTRY(1, GELDB_DMG_REACT_NORMAL),
+    /* Master sword  */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL),
+    /* Giant's Knife */ DMG_ENTRY(4, GELDB_DMG_REACT_NORMAL),
+    /* Fire arrow    */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL),
+    /* Ice arrow     */ DMG_ENTRY(2, GELDB_DMG_REACT_FREEZE),
+    /* Light arrow   */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL),
+    /* Unk arrow 1   */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL),
+    /* Unk arrow 2   */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL),
+    /* Unk arrow 3   */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL),
+    /* Fire magic    */ DMG_ENTRY(4, GELDB_DMG_REACT_UNK_E),
+    /* Ice magic     */ DMG_ENTRY(0, GELDB_DMG_REACT_UNK_6),
+    /* Light magic   */ DMG_ENTRY(3, GELDB_DMG_REACT_UNK_D),
+    /* Shield        */ DMG_ENTRY(0, GELDB_DMG_REACT_NORMAL),
+    /* Mirror Ray    */ DMG_ENTRY(0, GELDB_DMG_REACT_NORMAL),
+    /* Kokiri spin   */ DMG_ENTRY(1, GELDB_DMG_REACT_NORMAL),
+    /* Giant spin    */ DMG_ENTRY(4, GELDB_DMG_REACT_NORMAL),
+    /* Master spin   */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL),
+    /* Kokiri jump   */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL),
+    /* Giant jump    */ DMG_ENTRY(8, GELDB_DMG_REACT_NORMAL),
+    /* Master jump   */ DMG_ENTRY(4, GELDB_DMG_REACT_NORMAL),
+    /* Unknown 1     */ DMG_ENTRY(4, GELDB_DMG_REACT_NORMAL),
+    /* Unblockable   */ DMG_ENTRY(0, GELDB_DMG_REACT_NORMAL),
+    /* Hammer jump   */ DMG_ENTRY(4, GELDB_DMG_REACT_NORMAL),
+    /* Unknown 2     */ DMG_ENTRY(0, GELDB_DMG_REACT_NORMAL),
 };
 
 static InitChainEntry sInitChain[] = {
@@ -1030,10 +1030,10 @@ void EnGeldB_SetupStunned(EnGeldB* this) {
     if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) {
         this->actor.speed = 0.0f;
     }
-    if ((this->damageEffect != GELDB_DMG_FREEZE) || (this->action == GELDB_SPIN_ATTACK)) {
+    if ((this->damageReaction != GELDB_DMG_REACT_FREEZE) || (this->action == GELDB_SPIN_ATTACK)) {
         Animation_PlayOnceSetSpeed(&this->skelAnime, &gGerudoRedDamageAnim, 0.0f);
     }
-    if (this->damageEffect == GELDB_DMG_FREEZE) {
+    if (this->damageReaction == GELDB_DMG_REACT_FREEZE) {
         this->iceTimer = 36;
     }
     Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
@@ -1390,12 +1390,12 @@ void EnGeldB_CollisionCheck(EnGeldB* this, PlayState* play) {
     } else if ((this->bodyCollider.base.acFlags & AC_HIT) && (this->action >= GELDB_READY) &&
                (this->spinAttackState < 2)) {
         this->bodyCollider.base.acFlags &= ~AC_HIT;
-        if (this->actor.colChkInfo.damageEffect != GELDB_DMG_UNK_6) {
-            this->damageEffect = this->actor.colChkInfo.damageEffect;
+        if (this->actor.colChkInfo.damageReaction != GELDB_DMG_REACT_UNK_6) {
+            this->damageReaction = this->actor.colChkInfo.damageReaction;
             Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, true);
             Audio_StopSfxByPosAndId(&this->actor.projectedPos, NA_SE_EN_GERUDOFT_BREATH);
-            if ((this->actor.colChkInfo.damageEffect == GELDB_DMG_STUN) ||
-                (this->actor.colChkInfo.damageEffect == GELDB_DMG_FREEZE)) {
+            if ((this->actor.colChkInfo.damageReaction == GELDB_DMG_REACT_STUN) ||
+                (this->actor.colChkInfo.damageReaction == GELDB_DMG_REACT_FREEZE)) {
                 if (this->action != GELDB_STUNNED) {
                     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80);
                     Actor_ApplyDamage(&this->actor);
@@ -1429,7 +1429,7 @@ void EnGeldB_Update(Actor* thisx, PlayState* play) {
     EnGeldB* this = (EnGeldB*)thisx;
 
     EnGeldB_CollisionCheck(this, play);
-    if (this->actor.colChkInfo.damageEffect != GELDB_DMG_UNK_6) {
+    if (this->actor.colChkInfo.damageReaction != GELDB_DMG_REACT_UNK_6) {
         Actor_MoveXZGravity(&this->actor);
         Actor_UpdateBgCheckInfo(play, &this->actor, 15.0f, 30.0f, 60.0f,
                                 UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h
index e1a7ff3ea0..a5ce4286b5 100644
--- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h
+++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h
@@ -2,7 +2,7 @@
 #define Z_EN_GELDB_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnGeldB;
 
@@ -48,7 +48,7 @@ typedef struct EnGeldB {
     /* 0x02F8 */ s16 unkTimer;
     /* 0x02FA */ s16 lookTimer;
     /* 0x02FC */ s16 iceTimer;
-    /* 0x02FE */ u8 damageEffect;
+    /* 0x02FE */ u8 damageReaction;
     /* 0x0300 */ s32 timer;
     /* 0x0304 */ f32 approachRate;
     /* 0x0308 */ char unk_308[4];
diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
index 61eaa9967e..4bfe862466 100644
--- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
+++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
@@ -12,9 +12,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64draw.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "draw.h"
+#include "play_state.h"
+#include "save.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
@@ -90,56 +90,56 @@ ActorProfile En_GirlA_Profile = {
 
 #if DEBUG_FEATURES
 static char* sShopItemDescriptions[] = {
-    "デクの実×5   ",  // "Deku nut x5"
-    "矢×30        ",  // "Arrow x30"
-    "矢×50        ",  // "Arrow x50"
-    "爆弾×5       ",  // "bomb"
-    "デクの実×10  ",  // "Deku nut x10"
-    "デクの棒      ", // "Deku stick"
-    "爆弾×10      ",  // "Bomb x10"
-    "さかな        ", // "Fish"
-    "赤クスリ      ", // "Red medicine"
-    "緑クスリ      ", // "Green medicine"
-    "青クスリ      ", // "Blue medicine"
-    "巨人のナイフ  ", // "Giant knife"
-    "ハイリアの盾  ", // "Hyria Shield"
-    "デクの盾      ", // "Deku Shield"
-    "ゴロンの服    ", // "Goron's clothes"
-    "ゾ─ラの服    ",  // "Zora's clothes"
-    "回復のハート  ", // "Heart of recovery"
-    "ロンロン牛乳  ", // "Ron Ron milk"
-    "鶏の卵        ", // "Chicken egg"
-    "インゴー牛乳  ", // "Ingo milk"
-    "インゴー卵    ", // "Ingo egg"
-    "もだえ石      ", // "Modae stone"
-    "大人の財布    ", // "Adult wallet"
-    "ハートの欠片  ", // "Heart fragment"
-    "ボムチュウ    ", // "Bombchu"
-    "ボムチュウ    ", // "Bombchu"
-    "ボムチュウ    ", // "Bombchu"
-    "ボムチュウ    ", // "Bombchu"
-    "ボムチュウ    ", // "Bombchu"
-    "デクのタネ    ", // "Deku seeds"
-    "キータンのお面", // "Ketan's mask"
-    "こわそなお面  ", // "Scary face"
-    "ドクロのお面  ", // "Skull mask"
-    "ウサギずきん  ", // "Rabbit hood"
-    "まことの仮面  ", // "True mask"
-    "ゾーラのお面  ", // "Zora's mask"
-    "ゴロンのお面  ", // "Goron's mask"
-    "ゲルドのお面  ", // "Gerd's mask"
+    T("デクの実×5   ", "Deku nuts x5  "),
+    T("矢×30        ", "Arrows x30    "),
+    T("矢×50        ", "Arrows x50    "),
+    T("爆弾×5       ", "Bombs x5      "),
+    T("デクの実×10  ", "Deku nuts x10 "),
+    T("デクの棒      ", "Deku stick    "),
+    T("爆弾×10      ", "Bombs x10     "),
+    T("さかな        ", "Fish          "),
+    T("赤クスリ      ", "Red medicine  "),
+    T("緑クスリ      ", "Green medicine"),
+    T("青クスリ      ", "Blue medicine "),
+    T("巨人のナイフ  ", "Giant's knife "),
+    T("ハイリアの盾  ", "Hylian shield "),
+    T("デクの盾      ", "Deku shield   "),
+    T("ゴロンの服    ", "Goron clothing"),
+    T("ゾ─ラの服    ", "Zora's clothes"),
+    T("回復のハート  ", "Heart of recovery"),
+    T("ロンロン牛乳  ", "Lon Lon milk  "),
+    T("鶏の卵        ", "Chicken egg   "),
+    T("インゴー牛乳  ", "Ingo milk     "),
+    T("インゴー卵    ", "Ingo egg      "),
+    T("もだえ石      ", "Writhing stone"),
+    T("大人の財布    ", "Adult wallet  "),
+    T("ハートの欠片  ", "Piece of heart"),
+    T("ボムチュウ    ", "Bombchu       "),
+    T("ボムチュウ    ", "Bombchu       "),
+    T("ボムチュウ    ", "Bombchu       "),
+    T("ボムチュウ    ", "Bombchu       "),
+    T("ボムチュウ    ", "Bombchu       "),
+    T("デクのタネ    ", "Deku seeds    "),
+    T("キータンのお面", "Keaton mask   "),
+    T("こわそなお面  ", "Scary mask    "),
+    T("ドクロのお面  ", "Skull mask    "),
+    T("ウサギずきん  ", "Rabbit hood   "),
+    T("まことの仮面  ", "True mask     "),
+    T("ゾーラのお面  ", "Zora's mask   "),
+    T("ゴロンのお面  ", "Goron mask    "),
+    T("ゲルドのお面  ", "Gerudo mask   "),
     "ＳＯＬＤＯＵＴ",
-    "炎            ", // "Flame"
-    "虫            ", // "Bugs"
-    "チョウチョ    ", // "Butterfly"
-    "ポウ          ", // "Poe"
-    "妖精の魂      ", // "Fairy soul"
-    "矢×10        ",  // "Arrow"
-    "爆弾×20      ",  // "Bomb x20"
-    "爆弾×30      ",  // "Bomb x30"
-    "爆弾×5       ",  // "Bomb x5"
-    "赤クスリ      ", // "Red medicine"
-    "赤クスリ      "  // "Red medicine"
+    T("炎            ", "Flame         "),
+    T("虫            ", "Insect        "),
+    T("チョウチョ    ", "Butterfly     "),
+    T("ポウ          ", "Poe           "),
+    T("妖精の魂      ", "Fairy soul    "),
+    T("矢×10        ", "Arrows x10    "),
+    T("爆弾×20      ", "Bombs x20     "),
+    T("爆弾×30      ", "Bombs x30     "),
+    T("爆弾×5       ", "Bombs x5      "),
+    T("赤クスリ      ", "Red medicine  "),
+    T("赤クスリ      ", "Red medicine  "),
 };
 #endif
 
diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
index 504837044e..21439399b5 100644
--- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
+++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
@@ -2,7 +2,7 @@
 #define Z_EN_GIRLA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnGirlA;
 
diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c
index 0c904a8808..3c0b766413 100644
--- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c
+++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c
@@ -16,9 +16,9 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_oF1d_map/object_oF1d_map.h"
 #include "assets/objects/object_gm/object_gm.h"
diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.h b/src/overlays/actors/ovl_En_Gm/z_en_gm.h
index d5234bde14..653bd72a59 100644
--- a/src/overlays/actors/ovl_En_Gm/z_en_gm.h
+++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.h
@@ -2,7 +2,7 @@
 #define Z_EN_GM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnGm;
 
diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c
index 4f7f47630f..aa911c2f19 100644
--- a/src/overlays/actors/ovl_En_Go/z_en_go.c
+++ b/src/overlays/actors/ovl_En_Go/z_en_go.c
@@ -11,9 +11,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_oF1d_map/object_oF1d_map.h"
diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.h b/src/overlays/actors/ovl_En_Go/z_en_go.h
index 691472aef6..d18cb6e99c 100644
--- a/src/overlays/actors/ovl_En_Go/z_en_go.h
+++ b/src/overlays/actors/ovl_En_Go/z_en_go.h
@@ -2,7 +2,7 @@
 #define Z_EN_GO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnGo;
 
diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c
index 61c3d5f6e1..d437df1c08 100644
--- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@@ -14,11 +14,11 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_oF1d_map/object_oF1d_map.h"
diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.h b/src/overlays/actors/ovl_En_Go2/z_en_go2.h
index 0c49a30363..2bec2f55d9 100644
--- a/src/overlays/actors/ovl_En_Go2/z_en_go2.h
+++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.h
@@ -2,7 +2,7 @@
 #define Z_EN_GO2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "overlays/actors/ovl_En_Go/z_en_go.h"
 
 struct EnGo2;
diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c
index 82175795bd..d13c4a85f8 100644
--- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c
+++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c
@@ -18,9 +18,9 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 #include "assets/objects/object_gol/object_gol.h"
diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.h b/src/overlays/actors/ovl_En_Goma/z_en_goma.h
index 6b2f7cf309..04a14e9a7e 100644
--- a/src/overlays/actors/ovl_En_Goma/z_en_goma.h
+++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.h
@@ -2,7 +2,7 @@
 #define Z_EN_GOMA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum GomaType {
     /* 0 */ ENGOMA_NORMAL,
diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
index dfd8130d8d..06e1dae817 100644
--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
@@ -19,9 +19,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_goroiwa/object_goroiwa.h"
diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
index 26a5810a2d..805e13ef00 100644
--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
+++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
@@ -2,7 +2,7 @@
 #define Z_EN_GOROIWA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnGoroiwa;
 
diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c
index 4e590217f0..77db13b027 100644
--- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c
+++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c
@@ -15,10 +15,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_gs/object_gs.h"
@@ -544,7 +544,7 @@ void EnGs_Update(Actor* thisx, PlayState* play2) {
             this->unk_19F = 0;
             this->collider.base.acFlags &= ~AC_HIT;
 
-            switch (this->actor.colChkInfo.damageEffect) {
+            switch (this->actor.colChkInfo.damageReaction) {
                 case 15:
                     this->unk_19E |= 1;
                     func_80A4F77C(this);
diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.h b/src/overlays/actors/ovl_En_Gs/z_en_gs.h
index d7abdc676f..45503245f8 100644
--- a/src/overlays/actors/ovl_En_Gs/z_en_gs.h
+++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.h
@@ -2,7 +2,7 @@
 #define Z_EN_GS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnGs;
 
diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c
index 91a896632d..9dd16fe237 100644
--- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c
+++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c
@@ -16,9 +16,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_os_anime/object_os_anime.h"
 #include "assets/objects/object_boj/object_boj.h"
diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.h b/src/overlays/actors/ovl_En_Guest/z_en_guest.h
index 92dbc72d5c..e7e2395437 100644
--- a/src/overlays/actors/ovl_En_Guest/z_en_guest.h
+++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.h
@@ -2,7 +2,7 @@
 #define Z_EN_GUEST_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnGuest;
 
diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c
index 27cd1341ce..2b4133c39f 100644
--- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c
+++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c
@@ -12,7 +12,7 @@
 #include "rand.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_hata/object_hata.h"
 
diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.h b/src/overlays/actors/ovl_En_Hata/z_en_hata.h
index 82f6ba1a8b..53d31bab58 100644
--- a/src/overlays/actors/ovl_En_Hata/z_en_hata.h
+++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.h
@@ -2,7 +2,7 @@
 #define Z_EN_HATA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 
 typedef enum EnHataLimb {
diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
index 4236fe05bd..e377c17ae5 100644
--- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
+++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
@@ -19,11 +19,11 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "debug_display.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_sd/object_sd.h"
 
@@ -100,7 +100,8 @@ void EnHeishi1_Init(Actor* thisx, PlayState* play2) {
 
     PRINTF(VT_FGCOL(GREEN) T(" 種類☆☆☆☆☆☆☆☆☆☆☆☆☆ %d\n", " type                   ☆☆☆☆☆☆☆☆☆☆☆☆☆ %d\n") VT_RST,
            this->type);
-    PRINTF(VT_FGCOL(YELLOW) " れえるでぇたぁ☆☆☆☆☆☆☆☆ %d\n" VT_RST, this->path);
+    PRINTF(VT_FGCOL(YELLOW) T(" れえるでぇたぁ☆☆☆☆☆☆☆☆ %d\n", " rail data                      ☆☆☆☆☆☆☆☆ %d\n") VT_RST,
+           this->path);
     PRINTF(VT_FGCOL(MAGENTA) " anime_frame_speed ☆☆☆☆☆☆ %f\n" VT_RST, this->animSpeed);
     PRINTF(VT_FGCOL(MAGENTA) T(" 補間フレーム☆☆☆☆☆☆☆☆☆ %f\n", " interpolation frame          ☆☆☆☆☆☆☆☆☆ %f\n") VT_RST,
            this->animMorphFrames);
@@ -207,11 +208,11 @@ void EnHeishi1_Walk(EnHeishi1* this, PlayState* play) {
         Math_ApproachF(&this->headAngle, this->headAngleTarget, this->headTurnSpeedScale, this->headTurnSpeedMax);
 
         if (DEBUG_FEATURES && (this->path == BREG(1)) && (BREG(0) != 0)) {
-            PRINTF(VT_FGCOL(RED) " 種類  %d\n" VT_RST, this->path);
-            PRINTF(VT_FGCOL(RED) " ぱす  %d\n" VT_RST, this->waypoint);
-            PRINTF(VT_FGCOL(RED) " 反転  %d\n" VT_RST, this->bodyTurnSpeed);
-            PRINTF(VT_FGCOL(RED) " 時間  %d\n" VT_RST, this->waypointTimer);
-            PRINTF(VT_FGCOL(RED) " 点座  %d\n" VT_RST, path->count);
+            PRINTF(VT_FGCOL(RED) T(" 種類  %d\n", " Type  %d\n") VT_RST, this->path);
+            PRINTF(VT_FGCOL(RED) T(" ぱす  %d\n", " Path  %d\n") VT_RST, this->waypoint);
+            PRINTF(VT_FGCOL(RED) T(" 反転  %d\n", " Turning around  %d\n") VT_RST, this->bodyTurnSpeed);
+            PRINTF(VT_FGCOL(RED) T(" 時間  %d\n", " Time  %d\n") VT_RST, this->waypointTimer);
+            PRINTF(VT_FGCOL(RED) T(" 点座  %d\n", " Tenza  %d\n") VT_RST, path->count);
             PRINTF("\n\n");
         }
 
@@ -325,10 +326,10 @@ void EnHeishi1_Wait(EnHeishi1* this, PlayState* play) {
                        this->headTurnSpeedMax + this->headTurnSpeedMax);
 
         if (DEBUG_FEATURES && (this->path == BREG(1)) && (BREG(0) != 0)) {
-            PRINTF(VT_FGCOL(GREEN) " 種類  %d\n" VT_RST, this->path);
-            PRINTF(VT_FGCOL(GREEN) " ぱす  %d\n" VT_RST, this->waypoint);
-            PRINTF(VT_FGCOL(GREEN) " 反転  %d\n" VT_RST, this->bodyTurnSpeed);
-            PRINTF(VT_FGCOL(GREEN) " 時間  %d\n" VT_RST, this->waypointTimer);
+            PRINTF(VT_FGCOL(GREEN) T(" 種類  %d\n", " Type  %d\n") VT_RST, this->path);
+            PRINTF(VT_FGCOL(GREEN) T(" ぱす  %d\n", " Path  %d\n") VT_RST, this->waypoint);
+            PRINTF(VT_FGCOL(GREEN) T(" 反転  %d\n", " Turning around  %d\n") VT_RST, this->bodyTurnSpeed);
+            PRINTF(VT_FGCOL(GREEN) T(" 時間  %d\n", " Time  %d\n") VT_RST, this->waypointTimer);
             PRINTF("\n\n");
         }
     }
diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h
index bc1837241e..739aeab546 100644
--- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h
+++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h
@@ -2,7 +2,7 @@
 #define Z_EN_HEISHI1_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnHeishi1;
 
diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
index f9d5999c88..3d6a7cb7dc 100644
--- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
+++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
@@ -18,10 +18,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_sd/object_sd.h"
 #include "assets/objects/object_link_child/object_link_child.h"
@@ -113,8 +113,8 @@ void EnHeishi2_Init(Actor* thisx, PlayState* play) {
 
         } else {
             PRINTF("\n\n");
-            // "No, I'm completely disappointed" (message for when shooting guard window in courtyard)
-            PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n" VT_RST);
+            PRINTF(VT_FGCOL(MAGENTA)
+                       T(" ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n", " ☆☆☆☆☆ Oh, no, I was just careless. ☆☆☆☆☆ \n") VT_RST);
 
             Actor_SetScale(&this->actor, 0.02f);
 
diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h
index 3753012bee..30305aeb8b 100644
--- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h
+++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h
@@ -2,7 +2,7 @@
 #define Z_EN_HEISHI2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 
 struct EnHeishi2;
diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c
index 8e03fe3e62..075c5f8cb0 100644
--- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c
+++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c
@@ -14,9 +14,9 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_sd/object_sd.h"
 
diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h
index 57eb11c61c..4ed1e47f89 100644
--- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h
+++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h
@@ -2,7 +2,7 @@
 #define Z_EN_HEISHI3_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnHeishi3;
 
diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
index b90c778114..ced83c19c4 100644
--- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
+++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
@@ -4,10 +4,11 @@
 #include "gfx_setupdl.h"
 #include "printf.h"
 #include "terminal.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "translation.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_sd/object_sd.h"
 
@@ -104,9 +105,15 @@ void EnHeishi4_Init(Actor* thisx, PlayState* play) {
     }
     this->unk_27C = PARAMS_GET_U(thisx->params, 8, 8);
     PRINTF("\n\n");
-    PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n" VT_RST, thisx->params);
-    PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 識別完了！\t    ☆☆☆☆☆ %d\n" VT_RST, this->type);
-    PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ メッセージ完了！   ☆☆☆☆☆ %x\n\n" VT_RST, PARAMS_GET_U(thisx->params, 8, 4));
+    PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n", " ☆☆☆☆☆ Soldier Set 2 Completed! ☆☆☆☆☆ %d\n")
+               VT_RST,
+           thisx->params);
+    PRINTF(VT_FGCOL(YELLOW) T(" ☆☆☆☆☆ 識別完了！\t    ☆☆☆☆☆ %d\n", " ☆☆☆☆☆ Identification Completed!\t ☆☆☆☆☆ %d\n")
+               VT_RST,
+           this->type);
+    PRINTF(VT_FGCOL(MAGENTA) T(" ☆☆☆☆☆ メッセージ完了！   ☆☆☆☆☆ %x\n\n", " ☆☆☆☆☆ Message completed!       ☆☆☆☆☆ %x\n\n")
+               VT_RST,
+           PARAMS_GET_U(thisx->params, 8, 4));
     PRINTF("\n\n");
 }
 
@@ -176,7 +183,7 @@ void func_80A56544(EnHeishi4* this, PlayState* play) {
 
     Animation_Change(&this->skelAnime, &gEnHeishiIdleAnim, 1.0f, 0.0f, (s16)frames, ANIMMODE_LOOP, -10.0f);
     if (LINK_AGE_IN_YEARS != YEARS_CHILD) {
-        PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ ぎゃぁ！オトナだー ☆☆☆☆☆ \n" VT_RST);
+        PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ ぎゃぁ！オトナだー ☆☆☆☆☆ \n", " ☆☆☆☆☆ Oh, no! I'm an adult! ☆☆☆☆☆ \n") VT_RST);
         Actor_Kill(&this->actor);
     } else {
         this->actionFunc = func_80A56614;
@@ -223,7 +230,8 @@ void func_80A5673C(EnHeishi4* this, PlayState* play) {
     f32 frames;
 
     if (GET_EVENTCHKINF(EVENTCHKINF_45)) {
-        PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ マスターソード祝入手！ ☆☆☆☆☆ \n" VT_RST);
+        PRINTF(VT_FGCOL(YELLOW) T(" ☆☆☆☆☆ マスターソード祝入手！ ☆☆☆☆☆ \n",
+                                  " ☆☆☆☆☆ Congratulations on obtaining the Master Sword! ☆☆☆☆☆ \n") VT_RST);
         Actor_Kill(&this->actor);
         return;
     }
@@ -236,11 +244,11 @@ void func_80A5673C(EnHeishi4* this, PlayState* play) {
             this->actor.textId = 0x7007;
             this->unk_282 = TEXT_STATE_EVENT;
             this->unk_284 = 1;
-            PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ デモ開始！ ☆☆☆☆☆ \n" VT_RST);
+            PRINTF(VT_FGCOL(YELLOW) T(" ☆☆☆☆☆ デモ開始！ ☆☆☆☆☆ \n", " ☆☆☆☆☆ Demo begins! ☆☆☆☆☆ \n") VT_RST);
         } else {
             this->actor.textId = 0x7008;
             this->unk_282 = TEXT_STATE_DONE;
-            PRINTF(VT_FGCOL(BLUE) " ☆☆☆☆☆ 返事なし ☆☆☆☆☆ \n" VT_RST);
+            PRINTF(VT_FGCOL(BLUE) T(" ☆☆☆☆☆ 返事なし ☆☆☆☆☆ \n", " ☆☆☆☆☆ No reply ☆☆☆☆☆ \n") VT_RST);
         }
         this->actionFunc = func_80A56874;
     } else {
diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h
index 9ab928fe3e..57a2b436dc 100644
--- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h
+++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h
@@ -2,7 +2,7 @@
 #define Z_EN_HEISHI4_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum Heishi4Type {
     /* 0x00 */ HEISHI4_AT_KAKARIKO_ENTRANCE,
diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c
index 454f83c2d0..72a6fb9d63 100644
--- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c
+++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c
@@ -10,7 +10,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_hintnuts/object_hintnuts.h"
 
diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h
index a24b387fe1..222c08bd29 100644
--- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h
+++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h
@@ -2,7 +2,7 @@
 #define Z_EN_HINTNUTS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnHintnuts;
 
diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c
index c3f8fa40ad..6f9a589458 100644
--- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c
+++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c
@@ -5,9 +5,9 @@
 #include "ichain.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
@@ -415,7 +415,13 @@ void EnHoll_Update(Actor* thisx, PlayState* play) {
     this->actionFunc(this, play);
 }
 
-#include "assets/overlays/ovl_En_Holl/ovl_En_Holl.c"
+static Vtx sPlaneVtx[] = {
+#include "assets/overlays/ovl_En_Holl/sPlaneVtx.inc.c"
+};
+
+static Gfx sPlaneDL[5] = {
+#include "assets/overlays/ovl_En_Holl/sPlaneDL.inc.c"
+};
 
 void EnHoll_Draw(Actor* thisx, PlayState* play) {
     EnHoll* this = (EnHoll*)thisx;
diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.h b/src/overlays/actors/ovl_En_Holl/z_en_holl.h
index 4a9409373a..f1c8f49ac7 100644
--- a/src/overlays/actors/ovl_En_Holl/z_en_holl.h
+++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.h
@@ -2,7 +2,7 @@
 #define Z_EN_HOLL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #define ENHOLL_GET_TYPE(thisx)          PARAMS_GET_U((thisx)->params, 6, 3)
 #define ENHOLL_GET_SWITCH_FLAG(thisx)   PARAMS_GET_U((thisx)->params, 0, 6)
diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
index 5f884f8997..2fa5d13382 100644
--- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
+++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
@@ -17,9 +17,9 @@
 #include "sys_math3d.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h
index debd2bfb7c..1b78e692fb 100644
--- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h
+++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h
@@ -2,7 +2,7 @@
 #define Z_EN_HONOTRAP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnHonotrap;
 
diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c
index dded516560..e3359b4181 100644
--- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c
+++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c
@@ -23,13 +23,13 @@
 #include "sys_math3d.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64horse.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "audio.h"
+#include "effect.h"
+#include "horse.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/object_horse/object_horse.h"
 #include "assets/objects/object_hni/object_hni.h"
diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h
index 0eed5c001c..db953948fe 100644
--- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h
+++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h
@@ -2,8 +2,8 @@
 #define Z_EN_HORSE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64skin.h"
+#include "actor.h"
+#include "skin.h"
 
 typedef enum EnHorseAction {
     /*  0 */ ENHORSE_ACT_FROZEN,
diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c
index dc23954d50..56f09ec2d8 100644
--- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c
+++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c
@@ -17,9 +17,9 @@
 #include "sys_math3d.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h
index 84ab117216..f3e8cd7d4a 100644
--- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h
+++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h
@@ -2,7 +2,7 @@
 #define Z_EN_HORSE_GAME_CHECK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnHorseGameCheckBase;
 
diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c
index e1991688a1..b5f402ba1d 100644
--- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c
+++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c
@@ -13,9 +13,9 @@
 #include "sfx.h"
 #include "sys_math3d.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64skin.h"
+#include "play_state.h"
+#include "player.h"
+#include "skin.h"
 
 #include "assets/objects/object_horse_ganon/object_horse_ganon.h"
 
diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h
index 473f6cecb4..41a659079b 100644
--- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h
+++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h
@@ -2,8 +2,8 @@
 #define Z_EN_HORSE_GANON_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64skin.h"
+#include "actor.h"
+#include "skin.h"
 
 struct EnHorseGanon;
 
diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
index 1610147130..7e1282d880 100644
--- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
+++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
@@ -16,12 +16,12 @@
 #include "sfx.h"
 #include "sys_math3d.h"
 #include "z_lib.h"
-#include "z64actor.h"
-#include "z64horse.h"
-#include "z64player.h"
-#include "z64play.h"
-#include "z64save.h"
-#include "z64skin.h"
+#include "actor.h"
+#include "horse.h"
+#include "player.h"
+#include "play_state.h"
+#include "save.h"
+#include "skin.h"
 
 #include "assets/objects/object_horse_link_child/object_horse_link_child.h"
 
diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h
index a4e9b512d7..54656fb547 100644
--- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h
+++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h
@@ -2,8 +2,8 @@
 #define Z_EN_HORSE_LINK_CHILD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64skin.h"
+#include "actor.h"
+#include "skin.h"
 
 struct EnHorseLinkChild;
 
diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
index 300711ff37..c3713febb6 100644
--- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
+++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
@@ -17,10 +17,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
-#include "z64skin.h"
-#include "z64skin_matrix.h"
+#include "play_state.h"
+#include "save.h"
+#include "skin.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_horse_normal/object_horse_normal.h"
diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h
index 01ddd44608..06f7237322 100644
--- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h
+++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h
@@ -2,8 +2,8 @@
 #define Z_EN_HORSE_NORMAL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64skin.h"
+#include "actor.h"
+#include "skin.h"
 
 struct EnHorseNormal;
 
diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c
index fb59c5b84a..2906e541cd 100644
--- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c
+++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c
@@ -14,8 +14,8 @@
 #include "sfx.h"
 #include "sys_math3d.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_horse_zelda/object_horse_zelda.h"
 
diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h
index 86b851c77b..353e09d6ec 100644
--- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h
+++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h
@@ -2,8 +2,8 @@
 #define Z_EN_HORSE_ZELDA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64skin.h"
+#include "actor.h"
+#include "skin.h"
 
 struct EnHorseZelda;
 
diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c
index 76281c549f..757eab0a77 100644
--- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c
+++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c
@@ -14,9 +14,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_hs/object_hs.h"
 
diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.h b/src/overlays/actors/ovl_En_Hs/z_en_hs.h
index f938b51518..cf2097c11a 100644
--- a/src/overlays/actors/ovl_En_Hs/z_en_hs.h
+++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.h
@@ -2,7 +2,7 @@
 #define Z_EN_HS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnHs;
 
diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c
index 71005a3afb..453ab7f659 100644
--- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c
+++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c
@@ -11,9 +11,10 @@
 #include "printf.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
+#include "face_reaction.h"
+#include "play_state.h"
 
 #include "assets/objects/object_hs/object_hs.h"
 
@@ -69,7 +70,7 @@ void EnHs2_Init(Actor* thisx, PlayState* play) {
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
     this->actor.colChkInfo.mass = MASS_IMMOVABLE;
     Actor_SetScale(&this->actor, 0.01f);
-    PRINTF(VT_FGCOL(CYAN) " ヒヨコの店(子人の時) \n" VT_RST);
+    PRINTF(VT_FGCOL(CYAN) T(" ヒヨコの店(子人の時) \n", " Chick's Shop (Children's Time) \n") VT_RST);
     this->actionFunc = func_80A6F1A4;
     this->unk_2A8 = 0;
     this->actor.attentionRangeType = ATTENTION_RANGE_6;
diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h
index dec1533f89..7732d7b7c2 100644
--- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h
+++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h
@@ -2,7 +2,7 @@
 #define Z_EN_HS2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnHs2;
 
diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c
index 8680d13aa6..bcc58becb1 100644
--- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c
+++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c
@@ -15,11 +15,11 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_aob/object_aob.h"
 #include "assets/objects/object_ahg/object_ahg.h"
diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.h b/src/overlays/actors/ovl_En_Hy/z_en_hy.h
index 50bdc90933..7a49efb396 100644
--- a/src/overlays/actors/ovl_En_Hy/z_en_hy.h
+++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.h
@@ -2,7 +2,7 @@
 #define Z_EN_HY_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #define ENHY_GET_TYPE(thisx) PARAMS_GET_S((thisx)->params, 0, 7)
 #define ENHY_GET_PATH_INDEX(thisx) PARAMS_GET_S((thisx)->params, 7, 4)
diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
index b165f34647..86e86a8065 100644
--- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
+++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
@@ -15,10 +15,10 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64item.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "item.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h
index ea975199aa..8cdef19fbd 100644
--- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h
+++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h
@@ -2,8 +2,8 @@
 #define Z_EN_ICE_HONO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct EnIceHono;
 
diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c
index 582455f17e..2dfee076b2 100644
--- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c
+++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c
@@ -21,12 +21,12 @@
 #include "versions.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 #include "assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h"
 #include "assets/objects/object_ik/object_ik.h"
@@ -52,13 +52,13 @@ typedef enum EnIkCsDrawMode {
     /* 0x02 */ IK_CS_DRAW_DEFEAT
 } EnIkCsDrawMode;
 
-typedef enum EnIkDamageEffect {
-    /* 0x0 */ EN_IK_DMGEFF_NONE,
-    /* 0x6 */ EN_IK_DMGEFF_ELEMENTAL_MAGIC = 0x6,
-    /* 0xD */ EN_IK_DMGEFF_SPARKS_NO_DMG = 0xD,
-    /* 0xE */ EN_IK_DMGEFF_PROJECTILE,
-    /* 0xF */ EN_IK_DMGEFF_DAMAGE
-} EnIkDamageEffect;
+typedef enum EnIkDamageReaction {
+    /* 0x0 */ EN_IK_DMG_REACT_NONE,
+    /* 0x6 */ EN_IK_DMG_REACT_ELEMENTAL_MAGIC = 0x6,
+    /* 0xD */ EN_IK_DMG_REACT_SPARKS_NO_DMG = 0xD,
+    /* 0xE */ EN_IK_DMG_REACT_PROJECTILE,
+    /* 0xF */ EN_IK_DMG_REACT_DAMAGE
+} EnIkDamageReaction;
 
 void EnIk_UpdateEnemy(Actor* thisx, PlayState* play);
 void EnIk_DrawEnemy(Actor* thisx, PlayState* play);
@@ -166,38 +166,38 @@ static ColliderQuadInit sQuadInit = {
 };
 
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, EN_IK_DMGEFF_SPARKS_NO_DMG),
-    /* Deku stick    */ DMG_ENTRY(2, EN_IK_DMGEFF_DAMAGE),
-    /* Slingshot     */ DMG_ENTRY(1, EN_IK_DMGEFF_PROJECTILE),
-    /* Explosive     */ DMG_ENTRY(2, EN_IK_DMGEFF_DAMAGE),
-    /* Boomerang     */ DMG_ENTRY(0, EN_IK_DMGEFF_SPARKS_NO_DMG),
-    /* Normal arrow  */ DMG_ENTRY(2, EN_IK_DMGEFF_PROJECTILE),
-    /* Hammer swing  */ DMG_ENTRY(2, EN_IK_DMGEFF_DAMAGE),
-    /* Hookshot      */ DMG_ENTRY(0, EN_IK_DMGEFF_SPARKS_NO_DMG),
-    /* Kokiri sword  */ DMG_ENTRY(1, EN_IK_DMGEFF_DAMAGE),
-    /* Master sword  */ DMG_ENTRY(2, EN_IK_DMGEFF_DAMAGE),
-    /* Giant's Knife */ DMG_ENTRY(4, EN_IK_DMGEFF_DAMAGE),
-    /* Fire arrow    */ DMG_ENTRY(2, EN_IK_DMGEFF_PROJECTILE),
-    /* Ice arrow     */ DMG_ENTRY(2, EN_IK_DMGEFF_PROJECTILE),
-    /* Light arrow   */ DMG_ENTRY(2, EN_IK_DMGEFF_PROJECTILE),
-    /* Unk arrow 1   */ DMG_ENTRY(2, EN_IK_DMGEFF_PROJECTILE),
-    /* Unk arrow 2   */ DMG_ENTRY(2, EN_IK_DMGEFF_PROJECTILE),
-    /* Unk arrow 3   */ DMG_ENTRY(15, EN_IK_DMGEFF_PROJECTILE),
-    /* Fire magic    */ DMG_ENTRY(0, EN_IK_DMGEFF_ELEMENTAL_MAGIC),
-    /* Ice magic     */ DMG_ENTRY(0, EN_IK_DMGEFF_ELEMENTAL_MAGIC),
-    /* Light magic   */ DMG_ENTRY(0, EN_IK_DMGEFF_ELEMENTAL_MAGIC),
-    /* Shield        */ DMG_ENTRY(0, EN_IK_DMGEFF_NONE),
-    /* Mirror Ray    */ DMG_ENTRY(0, EN_IK_DMGEFF_NONE),
-    /* Kokiri spin   */ DMG_ENTRY(1, EN_IK_DMGEFF_DAMAGE),
-    /* Giant spin    */ DMG_ENTRY(4, EN_IK_DMGEFF_DAMAGE),
-    /* Master spin   */ DMG_ENTRY(2, EN_IK_DMGEFF_DAMAGE),
-    /* Kokiri jump   */ DMG_ENTRY(2, EN_IK_DMGEFF_DAMAGE),
-    /* Giant jump    */ DMG_ENTRY(8, EN_IK_DMGEFF_DAMAGE),
-    /* Master jump   */ DMG_ENTRY(4, EN_IK_DMGEFF_DAMAGE),
-    /* Unknown 1     */ DMG_ENTRY(10, EN_IK_DMGEFF_DAMAGE),
-    /* Unblockable   */ DMG_ENTRY(0, EN_IK_DMGEFF_NONE),
-    /* Hammer jump   */ DMG_ENTRY(4, EN_IK_DMGEFF_DAMAGE),
-    /* Unknown 2     */ DMG_ENTRY(0, EN_IK_DMGEFF_NONE),
+    /* Deku nut      */ DMG_ENTRY(0, EN_IK_DMG_REACT_SPARKS_NO_DMG),
+    /* Deku stick    */ DMG_ENTRY(2, EN_IK_DMG_REACT_DAMAGE),
+    /* Slingshot     */ DMG_ENTRY(1, EN_IK_DMG_REACT_PROJECTILE),
+    /* Explosive     */ DMG_ENTRY(2, EN_IK_DMG_REACT_DAMAGE),
+    /* Boomerang     */ DMG_ENTRY(0, EN_IK_DMG_REACT_SPARKS_NO_DMG),
+    /* Normal arrow  */ DMG_ENTRY(2, EN_IK_DMG_REACT_PROJECTILE),
+    /* Hammer swing  */ DMG_ENTRY(2, EN_IK_DMG_REACT_DAMAGE),
+    /* Hookshot      */ DMG_ENTRY(0, EN_IK_DMG_REACT_SPARKS_NO_DMG),
+    /* Kokiri sword  */ DMG_ENTRY(1, EN_IK_DMG_REACT_DAMAGE),
+    /* Master sword  */ DMG_ENTRY(2, EN_IK_DMG_REACT_DAMAGE),
+    /* Giant's Knife */ DMG_ENTRY(4, EN_IK_DMG_REACT_DAMAGE),
+    /* Fire arrow    */ DMG_ENTRY(2, EN_IK_DMG_REACT_PROJECTILE),
+    /* Ice arrow     */ DMG_ENTRY(2, EN_IK_DMG_REACT_PROJECTILE),
+    /* Light arrow   */ DMG_ENTRY(2, EN_IK_DMG_REACT_PROJECTILE),
+    /* Unk arrow 1   */ DMG_ENTRY(2, EN_IK_DMG_REACT_PROJECTILE),
+    /* Unk arrow 2   */ DMG_ENTRY(2, EN_IK_DMG_REACT_PROJECTILE),
+    /* Unk arrow 3   */ DMG_ENTRY(15, EN_IK_DMG_REACT_PROJECTILE),
+    /* Fire magic    */ DMG_ENTRY(0, EN_IK_DMG_REACT_ELEMENTAL_MAGIC),
+    /* Ice magic     */ DMG_ENTRY(0, EN_IK_DMG_REACT_ELEMENTAL_MAGIC),
+    /* Light magic   */ DMG_ENTRY(0, EN_IK_DMG_REACT_ELEMENTAL_MAGIC),
+    /* Shield        */ DMG_ENTRY(0, EN_IK_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, EN_IK_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(1, EN_IK_DMG_REACT_DAMAGE),
+    /* Giant spin    */ DMG_ENTRY(4, EN_IK_DMG_REACT_DAMAGE),
+    /* Master spin   */ DMG_ENTRY(2, EN_IK_DMG_REACT_DAMAGE),
+    /* Kokiri jump   */ DMG_ENTRY(2, EN_IK_DMG_REACT_DAMAGE),
+    /* Giant jump    */ DMG_ENTRY(8, EN_IK_DMG_REACT_DAMAGE),
+    /* Master jump   */ DMG_ENTRY(4, EN_IK_DMG_REACT_DAMAGE),
+    /* Unknown 1     */ DMG_ENTRY(10, EN_IK_DMG_REACT_DAMAGE),
+    /* Unblockable   */ DMG_ENTRY(0, EN_IK_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(4, EN_IK_DMG_REACT_DAMAGE),
+    /* Unknown 2     */ DMG_ENTRY(0, EN_IK_DMG_REACT_NONE),
 };
 
 void EnIk_Destroy(Actor* thisx, PlayState* play) {
@@ -747,19 +747,19 @@ void EnIk_UpdateDamage(EnIk* this, PlayState* play) {
     } else if (this->bodyCollider.base.acFlags & AC_HIT) {
         s16 pad;
         u8 prevHealth;
-        s32 damageEffect;
+        s32 damageReaction;
         Vec3f sparksPos = this->actor.world.pos;
 
         sparksPos.y += 50.0f;
 
         Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, true);
 
-        this->damageEffect = this->actor.colChkInfo.damageEffect;
+        this->damageReaction = this->actor.colChkInfo.damageReaction;
         this->bodyCollider.base.acFlags &= ~AC_HIT;
 
-        if ((this->damageEffect == EN_IK_DMGEFF_NONE) || (this->damageEffect == EN_IK_DMGEFF_SPARKS_NO_DMG) ||
-            ((this->armorStatusFlag == 0) && (this->damageEffect == EN_IK_DMGEFF_PROJECTILE))) {
-            if (this->damageEffect != EN_IK_DMGEFF_NONE) {
+        if ((this->damageReaction == EN_IK_DMG_REACT_NONE) || (this->damageReaction == EN_IK_DMG_REACT_SPARKS_NO_DMG) ||
+            ((this->armorStatusFlag == 0) && (this->damageReaction == EN_IK_DMG_REACT_PROJECTILE))) {
+            if (this->damageReaction != EN_IK_DMG_REACT_NONE) {
                 // spawn sparks and don't damage
                 CollisionCheck_SpawnShieldParticlesMetal(play, &sparksPos);
             }
diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.h b/src/overlays/actors/ovl_En_Ik/z_en_ik.h
index 9b4c16d7b9..9ae2a9cee4 100644
--- a/src/overlays/actors/ovl_En_Ik/z_en_ik.h
+++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.h
@@ -2,7 +2,7 @@
 #define Z_EN_IK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnIk;
 
@@ -99,7 +99,7 @@ typedef struct EnIk {
     /* 0x02FA */ u8 drawArmorFlag;
     /* 0x02FB */ u8 armorStatusFlag;
     /* 0x02FC */ u8 isBreakingProp;
-    /* 0x02FD */ u8 damageEffect;
+    /* 0x02FD */ u8 damageReaction;
     /* 0x02FE */ s8 unk_2FE;
     /* 0x02FF */ s8 unk_2FF;
     /* 0x0300 */ s16 unk_300;
diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c
index 521b8dcbfa..3fb2a8f5e9 100644
--- a/src/overlays/actors/ovl_En_In/z_en_in.c
+++ b/src/overlays/actors/ovl_En_In/z_en_in.c
@@ -14,11 +14,11 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_in/object_in.h"
 
diff --git a/src/overlays/actors/ovl_En_In/z_en_in.h b/src/overlays/actors/ovl_En_In/z_en_in.h
index 00774d0ddb..78d8f89170 100644
--- a/src/overlays/actors/ovl_En_In/z_en_in.h
+++ b/src/overlays/actors/ovl_En_In/z_en_in.h
@@ -2,7 +2,7 @@
 #define Z_EN_IN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnIn;
 
diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
index 8695ba0a58..dd215680c9 100644
--- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c
+++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
@@ -17,10 +17,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.h b/src/overlays/actors/ovl_En_Insect/z_en_insect.h
index 7bf443a2ea..e5e938176a 100644
--- a/src/overlays/actors/ovl_En_Insect/z_en_insect.h
+++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.h
@@ -2,7 +2,7 @@
 #define Z_EN_INSECT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnInsect;
 
diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
index de24197b7d..aedb18900b 100644
--- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
+++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
@@ -23,9 +23,9 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64item.h"
-#include "z64play.h"
+#include "effect.h"
+#include "item.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h
index 731929a384..5139e851b7 100644
--- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h
+++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h
@@ -2,7 +2,7 @@
 #define Z_EN_ISHI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 // The switch flag value for this actor is constructed in a unique way.
 // There are two separate param values which get OR'd together to create one final switch flag index.
diff --git a/src/overlays/actors/ovl_En_It/z_en_it.c b/src/overlays/actors/ovl_En_It/z_en_it.c
index 975fe8411f..2faea7fb6e 100644
--- a/src/overlays/actors/ovl_En_It/z_en_it.c
+++ b/src/overlays/actors/ovl_En_It/z_en_it.c
@@ -6,7 +6,7 @@
 
 #include "z_en_it.h"
 
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS 0
 
diff --git a/src/overlays/actors/ovl_En_It/z_en_it.h b/src/overlays/actors/ovl_En_It/z_en_it.h
index 9f1f794e4f..6d1992ecd6 100644
--- a/src/overlays/actors/ovl_En_It/z_en_it.h
+++ b/src/overlays/actors/ovl_En_It/z_en_it.h
@@ -2,7 +2,7 @@
 #define Z_EN_IT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnIt;
 
diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c
index 3f6b3c587c..917c765c7e 100644
--- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c
+++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c
@@ -14,9 +14,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_jj/object_jj.h"
 
diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.h b/src/overlays/actors/ovl_En_Jj/z_en_jj.h
index 9ac2df8bb4..7b37ee0058 100644
--- a/src/overlays/actors/ovl_En_Jj/z_en_jj.h
+++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.h
@@ -2,7 +2,7 @@
 #define Z_EN_JJ_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnJj;
 
diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c
index 0cf56d63e6..35a67d6972 100644
--- a/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c
+++ b/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c
@@ -1,5 +1,5 @@
 #include "z_en_jj.h"
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 static CutsceneData gJabuInhalingCs[] = {
diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c
index f5aee34c6a..7e570bdd56 100644
--- a/src/overlays/actors/ovl_En_Js/z_en_js.c
+++ b/src/overlays/actors/ovl_En_Js/z_en_js.c
@@ -11,8 +11,8 @@
 #include "regs.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_js/object_js.h"
 
diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.h b/src/overlays/actors/ovl_En_Js/z_en_js.h
index e1e22f547d..8add36574b 100644
--- a/src/overlays/actors/ovl_En_Js/z_en_js.h
+++ b/src/overlays/actors/ovl_En_Js/z_en_js.h
@@ -2,7 +2,7 @@
 #define Z_EN_JS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnJs;
 
diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c
index fce6c4ef03..fc3ff48de1 100644
--- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c
+++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c
@@ -13,10 +13,11 @@
 #include "segmented_address.h"
 #include "sys_math.h"
 #include "sys_matrix.h"
+#include "tex_len.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
 
@@ -46,7 +47,59 @@ static Vec3s D_80A8EE10[0x90];
 
 static s32 sUnused[2] = { 0, 0 };
 
-#include "assets/overlays/ovl_En_Jsjutan/ovl_En_Jsjutan.c"
+#define sCarpetTex_WIDTH 32
+#define sCarpetTex_HEIGHT 64
+static u64 sCarpetTex[TEX_LEN(u64, sCarpetTex_WIDTH, sCarpetTex_HEIGHT, 16)] = {
+#include "assets/overlays/ovl_En_Jsjutan/sCarpetTex.rgba16.inc.c"
+};
+
+static Vtx gShadowOddVtx[] = {
+#include "assets/overlays/ovl_En_Jsjutan/gShadowOddVtx.inc.c"
+};
+
+static Vtx sShadowEvenVtx[] = {
+#include "assets/overlays/ovl_En_Jsjutan/sShadowEvenVtx.inc.c"
+};
+
+static Vtx sCarpetOddVtx[] = {
+#include "assets/overlays/ovl_En_Jsjutan/sCarpetOddVtx.inc.c"
+};
+
+static Gfx sCarpetMaterialDL[16] = {
+#include "assets/overlays/ovl_En_Jsjutan/sCarpetMaterialDL.inc.c"
+};
+
+static Gfx sShadowMaterialDL[14] = {
+#include "assets/overlays/ovl_En_Jsjutan/sShadowMaterialDL.inc.c"
+};
+
+static Gfx sModelDL[134] = {
+#include "assets/overlays/ovl_En_Jsjutan/sModelDL.inc.c"
+};
+
+static Vtx sCarpetEvenVtx[] = {
+#include "assets/overlays/ovl_En_Jsjutan/sCarpetEvenVtx.inc.c"
+};
+
+static BgCamInfo sBgCamList[] = {
+#include "assets/overlays/ovl_En_Jsjutan/sBgCamList.inc.c"
+};
+
+static SurfaceType sSurfaceTypes[] = {
+#include "assets/overlays/ovl_En_Jsjutan/sSurfaceTypes.inc.c"
+};
+
+static CollisionPoly sPolyList[] = {
+#include "assets/overlays/ovl_En_Jsjutan/sPolyList.inc.c"
+};
+
+static Vec3s sVtxList[] = {
+#include "assets/overlays/ovl_En_Jsjutan/sVtxList.inc.c"
+};
+
+static CollisionHeader sCol = {
+#include "assets/overlays/ovl_En_Jsjutan/sCol.inc.c"
+};
 
 void EnJsjutan_Init(Actor* thisx, PlayState* play) {
     EnJsjutan* this = (EnJsjutan*)thisx;
diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h
index b6c4b07591..18c3afc26c 100644
--- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h
+++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h
@@ -2,7 +2,7 @@
 #define Z_EN_JSJUTAN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnJsjutan;
 
diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
index b94806e585..71a3eae57f 100644
--- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
+++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
@@ -17,10 +17,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ka/object_ka.h"
 
diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h
index c2eff368ca..4e7df38313 100644
--- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h
+++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h
@@ -2,7 +2,7 @@
 #define Z_EN_KAKASI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnKakasi;
 
diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
index c8057cff92..e4b3dbf9e6 100644
--- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
+++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
@@ -14,11 +14,11 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "debug_display.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ka/object_ka.h"
 
@@ -146,7 +146,8 @@ void func_80A90264(EnKakasi2* this, PlayState* play) {
             Flags_SetSwitch(play, this->switchFlag);
         }
 
-        PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag);
+        PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ SAVE finished ☆☆☆☆☆ %d\n") VT_RST,
+               this->switchFlag);
         this->actionFunc = func_80A904D8;
     } else if ((this->actor.xzDistToPlayer < this->maxSpawnDistance.x) &&
                (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < this->maxSpawnDistance.y) &&
@@ -157,7 +158,8 @@ void func_80A90264(EnKakasi2* this, PlayState* play) {
             if (this->switchFlag >= 0) {
                 Flags_SetSwitch(play, this->switchFlag);
             }
-            PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag);
+            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ SAVE finished ☆☆☆☆☆ %d\n") VT_RST,
+                   this->switchFlag);
             play->msgCtx.ocarinaMode = OCARINA_MODE_04;
             this->actor.draw = func_80A90948;
             Collider_InitCylinder(play, &this->collider);
diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h
index c3398d7e7f..ae93150f04 100644
--- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h
+++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h
@@ -2,7 +2,7 @@
 #define Z_EN_KAKASI2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnKakasi2;
 
diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
index 254d4d8f4b..6752e92d1c 100644
--- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
+++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
@@ -17,10 +17,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ka/object_ka.h"
 
@@ -85,8 +85,7 @@ void EnKakasi3_Init(Actor* thisx, PlayState* play) {
     EnKakasi3* this = (EnKakasi3*)thisx;
 
     PRINTF("\n\n");
-    // "Obonur" -- Related to the name of the scarecrow (Bonooru)
-    PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ おーボヌール ☆☆☆☆☆ \n" VT_RST);
+    PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ おーボヌール ☆☆☆☆☆ \n", "☆☆☆☆☆ Bonooru ☆☆☆☆☆ \n") VT_RST);
     this->actor.attentionRangeType = ATTENTION_RANGE_6;
 
     Collider_InitCylinder(play, &this->collider);
diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h
index e09b98a9fb..d301d4c077 100644
--- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h
+++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h
@@ -2,7 +2,7 @@
 #define Z_EN_KAKASI3_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnKakasi3;
 
diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
index 844a7ee2a8..a7cc77a262 100644
--- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
+++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
@@ -19,11 +19,11 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_kanban/object_kanban.h"
@@ -824,7 +824,13 @@ static f32 sCutAngles[] = {
 
 static s32 sUnused[] = { 0, 0, 0 }; // Unused zero vector?
 
-#include "assets/overlays/ovl_En_Kanban/ovl_En_Kanban.c"
+static Vtx sShadowVtx[] = {
+#include "assets/overlays/ovl_En_Kanban/sShadowVtx.inc.c"
+};
+
+static Gfx sShadowDL[16] = {
+#include "assets/overlays/ovl_En_Kanban/sShadowDL.inc.c"
+};
 
 void EnKanban_Draw(Actor* thisx, PlayState* play) {
     EnKanban* this = (EnKanban*)thisx;
diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h
index 36efa211df..c8839c89bf 100644
--- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h
+++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h
@@ -2,7 +2,7 @@
 #define Z_EN_KANBAN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnKanban;
 
diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
index be3b0eacb5..3a128a5b12 100644
--- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
+++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
@@ -13,10 +13,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_dekubaba/object_dekubaba.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
index 97b04f1a7f..347cafa189 100644
--- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
+++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
@@ -2,7 +2,7 @@
 #define Z_EN_KAREBABA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnKarebaba;
 
diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c
index 348c3a0acc..1ad021f692 100644
--- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c
+++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c
@@ -16,10 +16,10 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_fa/object_fa.h"
 #include "assets/objects/object_os_anime/object_os_anime.h"
diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.h b/src/overlays/actors/ovl_En_Ko/z_en_ko.h
index d9531e57e6..1de4967f28 100644
--- a/src/overlays/actors/ovl_En_Ko/z_en_ko.h
+++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.h
@@ -2,7 +2,7 @@
 #define Z_EN_KO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnKo;
 
diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
index 771d9377d8..9a5a41119f 100644
--- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
+++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
@@ -18,8 +18,8 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h
index a375581cf9..85ed0d5407 100644
--- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h
+++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h
@@ -2,7 +2,7 @@
 #define Z_EN_KUSA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnKusa;
 
diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c
index 7caa735739..81aacf1335 100644
--- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c
+++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c
@@ -15,10 +15,10 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_kz/object_kz.h"
 
diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.h b/src/overlays/actors/ovl_En_Kz/z_en_kz.h
index 933fbe2617..f05b123712 100644
--- a/src/overlays/actors/ovl_En_Kz/z_en_kz.h
+++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.h
@@ -2,7 +2,7 @@
 #define Z_EN_KZ_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnKz;
 
diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c
index f0cc5dddc6..8d9640a2ad 100644
--- a/src/overlays/actors/ovl_En_Light/z_en_light.c
+++ b/src/overlays/actors/ovl_En_Light/z_en_light.c
@@ -12,9 +12,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "light.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.h b/src/overlays/actors/ovl_En_Light/z_en_light.h
index 035471f47d..94f7004036 100644
--- a/src/overlays/actors/ovl_En_Light/z_en_light.h
+++ b/src/overlays/actors/ovl_En_Light/z_en_light.h
@@ -2,8 +2,8 @@
 #define Z_EN_LIGHT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct EnLight;
 
diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c
index b4bd3af91b..097564b021 100644
--- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c
+++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c
@@ -9,7 +9,7 @@
 #include "regs.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_lightbox/object_lightbox.h"
 
diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h
index c09c77f850..232daedc8f 100644
--- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h
+++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h
@@ -2,7 +2,7 @@
 #define Z_EN_LIGHTBOX_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnLightbox;
 
diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c
index 2097bb9d26..eef5e1c0b9 100644
--- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c
+++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c
@@ -7,7 +7,7 @@
 #include "z_en_m_fire1.h"
 
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS 0
 
diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
index 59ebb44318..091c6e268a 100644
--- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
+++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
@@ -2,7 +2,7 @@
 #define Z_EN_M_FIRE1_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnMFire1;
 
diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
index ba34f9adcc..1a64d485d3 100644
--- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
+++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
@@ -6,11 +6,11 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
index 8c7cdd7a1f..7332cdcf21 100644
--- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
+++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
@@ -2,8 +2,8 @@
 #define Z_EN_M_THUNDER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct EnMThunder;
 
diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
index 9c1689a524..1709fb037c 100644
--- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
+++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
@@ -12,12 +12,12 @@
 #include "sequence.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64face_reaction.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "face_reaction.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ma1/object_ma1.h"
 
diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h
index 3664fc98a8..10cc508afd 100644
--- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h
+++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h
@@ -2,7 +2,7 @@
 #define Z_EN_MA1_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnMa1;
 
diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
index aed88bb92c..88098c93bf 100644
--- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
+++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
@@ -7,12 +7,12 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64face_reaction.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "face_reaction.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ma2/object_ma2.h"
 
diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h
index 81fddf7672..c312591b94 100644
--- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h
+++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h
@@ -2,7 +2,7 @@
 #define Z_EN_MA2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnMa2;
 
diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
index cdac009221..a685945a2a 100644
--- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
+++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
@@ -14,10 +14,10 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ma2/object_ma2.h"
 
diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h
index ecf637561e..a6bb2096f3 100644
--- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h
+++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h
@@ -2,7 +2,7 @@
 #define Z_EN_MA3_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnMa3;
 
diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c
index ef02aacdd3..4afa46439e 100644
--- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c
+++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c
@@ -20,12 +20,12 @@
 #include "sfx.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64cutscene_flags.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64save.h"
-#include "z64ss_sram.h"
+#include "audio.h"
+#include "cutscene_flags.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "save.h"
+#include "ss_sram.h"
 
 #include "assets/objects/object_mag/object_mag.h"
 
diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.h b/src/overlays/actors/ovl_En_Mag/z_en_mag.h
index ace8427278..07733d40ce 100644
--- a/src/overlays/actors/ovl_En_Mag/z_en_mag.h
+++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.h
@@ -2,8 +2,8 @@
 #define Z_EN_MAG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64message.h"
+#include "actor.h"
+#include "message.h"
 
 struct EnMag;
 
diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c
index a69a25f0d5..8c1413bc0f 100644
--- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c
+++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c
@@ -18,9 +18,9 @@
 #include "versions.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_mb/object_mb.h"
 
@@ -184,82 +184,82 @@ static ColliderQuadInit sAttackColliderQuadInit = {
     { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
 };
 
-typedef enum EnMbDamageEffect {
-    /* 0x0 */ ENMB_DMGEFF_IGNORE,
-    /* 0x1 */ ENMB_DMGEFF_STUN,
-    /* 0x5 */ ENMB_DMGEFF_FREEZE = 0x5,
-    /* 0x6 */ ENMB_DMGEFF_STUN_ICE,
-    /* 0xF */ ENMB_DMGEFF_DEFAULT = 0xF
-} EnMbDamageEffect;
+typedef enum EnMbDamageReaction {
+    /* 0x0 */ ENMB_DMG_REACT_IGNORE,
+    /* 0x1 */ ENMB_DMG_REACT_STUN,
+    /* 0x5 */ ENMB_DMG_REACT_FREEZE = 0x5,
+    /* 0x6 */ ENMB_DMG_REACT_STUN_ICE,
+    /* 0xF */ ENMB_DMG_REACT_DEFAULT = 0xF
+} EnMbDamageReaction;
 
 static DamageTable sSpearMoblinDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE),
-    /* Deku stick    */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Slingshot     */ DMG_ENTRY(1, ENMB_DMGEFF_DEFAULT),
-    /* Explosive     */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Boomerang     */ DMG_ENTRY(0, ENMB_DMGEFF_STUN),
-    /* Normal arrow  */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Hammer swing  */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Hookshot      */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Kokiri sword  */ DMG_ENTRY(1, ENMB_DMGEFF_DEFAULT),
-    /* Master sword  */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Giant's Knife */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT),
-    /* Fire arrow    */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Ice arrow     */ DMG_ENTRY(4, ENMB_DMGEFF_STUN_ICE),
-    /* Light arrow   */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Unk arrow 1   */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT),
-    /* Unk arrow 2   */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Unk arrow 3   */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Fire magic    */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE),
-    /* Ice magic     */ DMG_ENTRY(3, ENMB_DMGEFF_STUN_ICE),
-    /* Light magic   */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE),
-    /* Shield        */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE),
-    /* Mirror Ray    */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE),
-    /* Kokiri spin   */ DMG_ENTRY(1, ENMB_DMGEFF_DEFAULT),
-    /* Giant spin    */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT),
-    /* Master spin   */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Kokiri jump   */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Giant jump    */ DMG_ENTRY(8, ENMB_DMGEFF_DEFAULT),
-    /* Master jump   */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT),
-    /* Unknown 1     */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE),
-    /* Unblockable   */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE),
-    /* Hammer jump   */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT),
-    /* Unknown 2     */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE),
+    /* Deku nut      */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE),
+    /* Deku stick    */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Slingshot     */ DMG_ENTRY(1, ENMB_DMG_REACT_DEFAULT),
+    /* Explosive     */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Boomerang     */ DMG_ENTRY(0, ENMB_DMG_REACT_STUN),
+    /* Normal arrow  */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Hammer swing  */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Hookshot      */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Kokiri sword  */ DMG_ENTRY(1, ENMB_DMG_REACT_DEFAULT),
+    /* Master sword  */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Giant's Knife */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT),
+    /* Fire arrow    */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Ice arrow     */ DMG_ENTRY(4, ENMB_DMG_REACT_STUN_ICE),
+    /* Light arrow   */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Unk arrow 1   */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT),
+    /* Unk arrow 2   */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Unk arrow 3   */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Fire magic    */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE),
+    /* Ice magic     */ DMG_ENTRY(3, ENMB_DMG_REACT_STUN_ICE),
+    /* Light magic   */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE),
+    /* Shield        */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE),
+    /* Mirror Ray    */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE),
+    /* Kokiri spin   */ DMG_ENTRY(1, ENMB_DMG_REACT_DEFAULT),
+    /* Giant spin    */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT),
+    /* Master spin   */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Kokiri jump   */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Giant jump    */ DMG_ENTRY(8, ENMB_DMG_REACT_DEFAULT),
+    /* Master jump   */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT),
+    /* Unknown 1     */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE),
+    /* Unblockable   */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE),
+    /* Hammer jump   */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT),
+    /* Unknown 2     */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE),
 };
 
 static DamageTable sClubMoblinDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE),
-    /* Deku stick    */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Slingshot     */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE),
-    /* Explosive     */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Boomerang     */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE),
-    /* Normal arrow  */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Hammer swing  */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Hookshot      */ DMG_ENTRY(0, ENMB_DMGEFF_STUN),
-    /* Kokiri sword  */ DMG_ENTRY(1, ENMB_DMGEFF_DEFAULT),
-    /* Master sword  */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Giant's Knife */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT),
-    /* Fire arrow    */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Ice arrow     */ DMG_ENTRY(4, ENMB_DMGEFF_STUN_ICE),
-    /* Light arrow   */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Unk arrow 1   */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT),
-    /* Unk arrow 2   */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Unk arrow 3   */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Fire magic    */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE),
-    /* Ice magic     */ DMG_ENTRY(3, ENMB_DMGEFF_STUN_ICE),
-    /* Light magic   */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE),
-    /* Shield        */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE),
-    /* Mirror Ray    */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE),
-    /* Kokiri spin   */ DMG_ENTRY(1, ENMB_DMGEFF_DEFAULT),
-    /* Giant spin    */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT),
-    /* Master spin   */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Kokiri jump   */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT),
-    /* Giant jump    */ DMG_ENTRY(8, ENMB_DMGEFF_DEFAULT),
-    /* Master jump   */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT),
-    /* Unknown 1     */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE),
-    /* Unblockable   */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE),
-    /* Hammer jump   */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT),
-    /* Unknown 2     */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE),
+    /* Deku nut      */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE),
+    /* Deku stick    */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Slingshot     */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE),
+    /* Explosive     */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Boomerang     */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE),
+    /* Normal arrow  */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Hammer swing  */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Hookshot      */ DMG_ENTRY(0, ENMB_DMG_REACT_STUN),
+    /* Kokiri sword  */ DMG_ENTRY(1, ENMB_DMG_REACT_DEFAULT),
+    /* Master sword  */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Giant's Knife */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT),
+    /* Fire arrow    */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Ice arrow     */ DMG_ENTRY(4, ENMB_DMG_REACT_STUN_ICE),
+    /* Light arrow   */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Unk arrow 1   */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT),
+    /* Unk arrow 2   */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Unk arrow 3   */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Fire magic    */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE),
+    /* Ice magic     */ DMG_ENTRY(3, ENMB_DMG_REACT_STUN_ICE),
+    /* Light magic   */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE),
+    /* Shield        */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE),
+    /* Mirror Ray    */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE),
+    /* Kokiri spin   */ DMG_ENTRY(1, ENMB_DMG_REACT_DEFAULT),
+    /* Giant spin    */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT),
+    /* Master spin   */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Kokiri jump   */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT),
+    /* Giant jump    */ DMG_ENTRY(8, ENMB_DMG_REACT_DEFAULT),
+    /* Master jump   */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT),
+    /* Unknown 1     */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE),
+    /* Unblockable   */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE),
+    /* Hammer jump   */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT),
+    /* Unknown 2     */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE),
 };
 
 static InitChainEntry sInitChain[] = {
@@ -605,7 +605,7 @@ void EnMb_SetupStunned(EnMb* this) {
     this->state = ENMB_STATE_STUNNED;
     this->actor.speed = 0.0f;
     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80);
-    if (this->damageEffect == ENMB_DMGEFF_STUN_ICE) {
+    if (this->damageReaction == ENMB_DMG_REACT_STUN_ICE) {
         this->iceEffectTimer = 40;
     } else {
         if (this->actor.params != ENMB_TYPE_CLUB) {
@@ -1440,8 +1440,8 @@ void EnMb_CheckColliding(EnMb* this, PlayState* play) {
         this->bodyCollider.base.acFlags &= ~AC_HIT;
     } else if ((this->bodyCollider.base.acFlags & AC_HIT) && this->state >= ENMB_STATE_STUNNED) {
         this->bodyCollider.base.acFlags &= ~AC_HIT;
-        if (this->actor.colChkInfo.damageEffect != ENMB_DMGEFF_IGNORE &&
-            this->actor.colChkInfo.damageEffect != ENMB_DMGEFF_FREEZE) {
+        if (this->actor.colChkInfo.damageReaction != ENMB_DMG_REACT_IGNORE &&
+            this->actor.colChkInfo.damageReaction != ENMB_DMG_REACT_FREEZE) {
             if ((player->stateFlags2 & PLAYER_STATE2_7) && player->actor.parent == &this->actor) {
                 player->stateFlags2 &= ~PLAYER_STATE2_7;
                 player->actor.parent = NULL;
@@ -1450,11 +1450,11 @@ void EnMb_CheckColliding(EnMb* this, PlayState* play) {
 #endif
                 Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 6.0f, this->actor.world.rot.y, 6.0f);
             }
-            this->damageEffect = this->actor.colChkInfo.damageEffect;
+            this->damageReaction = this->actor.colChkInfo.damageReaction;
             this->attack = ENMB_ATTACK_NONE;
             Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, false);
-            if (this->actor.colChkInfo.damageEffect == ENMB_DMGEFF_STUN ||
-                this->actor.colChkInfo.damageEffect == ENMB_DMGEFF_STUN_ICE) {
+            if (this->actor.colChkInfo.damageReaction == ENMB_DMG_REACT_STUN ||
+                this->actor.colChkInfo.damageReaction == ENMB_DMG_REACT_STUN_ICE) {
                 if (this->state != ENMB_STATE_STUNNED) {
                     Actor_ApplyDamage(&this->actor);
                     EnMb_SetupStunned(this);
@@ -1485,7 +1485,7 @@ void EnMb_Update(Actor* thisx, PlayState* play) {
     s32 pad;
 
     EnMb_CheckColliding(this, play);
-    if (thisx->colChkInfo.damageEffect != ENMB_DMGEFF_FREEZE) {
+    if (thisx->colChkInfo.damageReaction != ENMB_DMG_REACT_FREEZE) {
         this->actionFunc(this, play);
         Actor_MoveXZGravity(thisx);
         Actor_UpdateBgCheckInfo(play, thisx, 40.0f, 40.0f, 70.0f,
diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.h b/src/overlays/actors/ovl_En_Mb/z_en_mb.h
index 776e7421e0..c8413b8173 100644
--- a/src/overlays/actors/ovl_En_Mb/z_en_mb.h
+++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.h
@@ -2,7 +2,7 @@
 #define Z_EN_MB_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnMb;
 
@@ -23,7 +23,7 @@ typedef enum EnMbState {
 typedef struct EnMb {
     /* 0x0000 */ Actor actor;
     /* 0x014C */ Vec3s bodyPartsPos[10];
-    /* 0x0188 */ u8 damageEffect;
+    /* 0x0188 */ u8 damageReaction;
     /* 0x018C */ SkelAnime skelAnime;
     /* 0x01D0 */ Vec3s jointTable[28];
     /* 0x0278 */ Vec3s morphTable[28];
diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c
index 296f4d42af..3059baa7bb 100644
--- a/src/overlays/actors/ovl_En_Md/z_en_md.c
+++ b/src/overlays/actors/ovl_En_Md/z_en_md.c
@@ -14,11 +14,11 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_md/object_md.h"
 
diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.h b/src/overlays/actors/ovl_En_Md/z_en_md.h
index bfd9b0450a..3b5cc079bb 100644
--- a/src/overlays/actors/ovl_En_Md/z_en_md.h
+++ b/src/overlays/actors/ovl_En_Md/z_en_md.h
@@ -2,7 +2,7 @@
 #define Z_EN_MD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnMd;
 
diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c
index f035f2d331..59257e93d3 100644
--- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c
+++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c
@@ -11,10 +11,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_mk/object_mk.h"
 
diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.h b/src/overlays/actors/ovl_En_Mk/z_en_mk.h
index 53df56b76a..d9c85a90d8 100644
--- a/src/overlays/actors/ovl_En_Mk/z_en_mk.h
+++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.h
@@ -2,7 +2,7 @@
 #define Z_EN_MK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnMk;
 
diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c
index 75969dd224..9881334a0a 100644
--- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c
+++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c
@@ -14,10 +14,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_mm/object_mm.h"
 #include "assets/objects/object_link_child/object_link_child.h"
diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.h b/src/overlays/actors/ovl_En_Mm/z_en_mm.h
index 555073753f..b7def02740 100644
--- a/src/overlays/actors/ovl_En_Mm/z_en_mm.h
+++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.h
@@ -2,7 +2,7 @@
 #define Z_EN_MM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnMm;
 
diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c
index 2144294ab3..187b576594 100644
--- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c
+++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c
@@ -16,8 +16,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_mm/object_mm.h"
 
diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h
index 8e48261d7c..e855b99c88 100644
--- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h
+++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h
@@ -2,7 +2,7 @@
 #define Z_EN_MM2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnMm2;
 
diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c
index 18ebac054a..e9012fb1e4 100644
--- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c
+++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c
@@ -10,9 +10,9 @@
 #include "gfx_setupdl.h"
 #include "ichain.h"
 #include "printf.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_ms/object_ms.h"
 
diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.h b/src/overlays/actors/ovl_En_Ms/z_en_ms.h
index 9ace7bc2d0..77a19a5004 100644
--- a/src/overlays/actors/ovl_En_Ms/z_en_ms.h
+++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.h
@@ -2,7 +2,7 @@
 #define Z_EN_MS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnMs;
 
diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c
index 7360dd7f18..78229fc754 100644
--- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c
+++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c
@@ -10,9 +10,9 @@
 #include "gfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_mu/object_mu.h"
 
diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.h b/src/overlays/actors/ovl_En_Mu/z_en_mu.h
index 417ce242b1..0fce157890 100644
--- a/src/overlays/actors/ovl_En_Mu/z_en_mu.h
+++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.h
@@ -2,7 +2,7 @@
 #define Z_EN_MU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnMu;
 
diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c
index 1c937e8721..c2120b1fc9 100644
--- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c
+++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c
@@ -21,10 +21,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_nb/object_nb.h"
 
diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.h b/src/overlays/actors/ovl_En_Nb/z_en_nb.h
index 3ed08cbf8e..397c6b63a2 100644
--- a/src/overlays/actors/ovl_En_Nb/z_en_nb.h
+++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.h
@@ -2,7 +2,7 @@
 #define Z_EN_NB_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnNb;
 
diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c
index 3c3a68311c..15d6ff298f 100644
--- a/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c
+++ b/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c
@@ -1,5 +1,5 @@
 #include "z_en_nb.h"
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 static CutsceneData gSpiritMedallionCs[] = {
diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c
index 71cc497e10..5acaf3f9ed 100644
--- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c
+++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c
@@ -24,10 +24,10 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_niw/object_niw.h"
 
@@ -155,7 +155,7 @@ void EnNiw_Init(Actor* thisx, PlayState* play) {
         if (sLowerRiverSpawned) {
             Actor_Kill(&this->actor);
             PRINTF(VT_FGCOL(YELLOW)
-                       T("☆☆☆☆☆ もういてる原 Ver.1 ☆☆☆☆☆ \n", "☆☆☆☆☆ Original is already here Ver.1 ☆☆☆☆☆ \n") VT_RST);
+                       T("☆☆☆☆☆ もういてる原 Ver.1 ☆☆☆☆☆ \n", "☆☆☆☆☆ I'm already here -Hara Ver.1 ☆☆☆☆☆ \n") VT_RST);
             return;
         }
         sLowerRiverSpawned = true;
@@ -167,7 +167,7 @@ void EnNiw_Init(Actor* thisx, PlayState* play) {
         if (sUpperRiverSpawned) {
             Actor_Kill(&this->actor);
             PRINTF(VT_FGCOL(YELLOW)
-                       T("☆☆☆☆☆ もういてる原 Ver.2 ☆☆☆☆☆ \n", "☆☆☆☆☆ Original is already here Ver.2 ☆☆☆☆☆ \n") VT_RST);
+                       T("☆☆☆☆☆ もういてる原 Ver.2 ☆☆☆☆☆ \n", "☆☆☆☆☆ I'm already here -Hara Ver.2 ☆☆☆☆☆ \n") VT_RST);
             return;
         }
         sUpperRiverSpawned = true;
@@ -390,7 +390,7 @@ void EnNiw_SpawnAttackCucco(EnNiw* this, PlayState* play) {
             this->timer5 = 10;
         } else {
             PRINTF("\n\n");
-            PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 発生できず  ☆☆☆☆☆ \n", " ☆☆☆☆☆ Cannot occur  ☆☆☆☆☆ \n") VT_RST);
+            PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 発生できず  ☆☆☆☆☆ \n", " ☆☆☆☆☆ Cannot spawn  ☆☆☆☆☆ \n") VT_RST);
         }
     }
 }
diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.h b/src/overlays/actors/ovl_En_Niw/z_en_niw.h
index a0f58d0a35..b64180af22 100644
--- a/src/overlays/actors/ovl_En_Niw/z_en_niw.h
+++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.h
@@ -2,7 +2,7 @@
 #define Z_EN_NIW_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnNiw;
 
diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c
index 6a2468f93f..8949be2892 100644
--- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c
+++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c
@@ -15,10 +15,11 @@
 #include "segmented_address.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_gr/object_gr.h"
 
@@ -90,15 +91,21 @@ void EnNiwGirl_Init(Actor* thisx, PlayState* play) {
         &play->actorCtx, &this->actor, play, ACTOR_EN_NIW, this->actor.world.pos.x + vec2.x,
         this->actor.world.pos.y + vec2.y, this->actor.world.pos.z + vec2.z, 0, this->actor.world.rot.y, 0, 0xA);
     if (this->chasedEnNiw != NULL) {
-        PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ シツレイしちゃうわね！プンプン ☆☆☆☆☆ %d\n" VT_RST, this->actor.params);
-        PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ きゃははははは、まてー ☆☆☆☆☆ %d\n" VT_RST, this->path);
+        PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ シツレイしちゃうわね！プンプン ☆☆☆☆☆ %d\n",
+                                 "☆☆☆☆☆ That's so mean! Punpun ☆☆☆☆☆ %d\n") VT_RST,
+               this->actor.params);
+        PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ きゃははははは、まてー ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Kyahahahaha, wait ☆☆☆☆☆ %d\n")
+                   VT_RST,
+               this->path);
         PRINTF("\n\n");
         this->actor.colChkInfo.mass = MASS_IMMOVABLE;
         this->actionFunc = EnNiwGirl_Talk;
     } else {
         PRINTF("\n\n");
-        PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ なぜか、セットできむぅあせん ☆☆☆☆☆ %d\n" VT_RST, this->actor.params);
-        PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ んんがくく ☆☆☆☆☆ %d\n" VT_RST, this->path);
+        PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ なぜか、セットできむぅあせん ☆☆☆☆☆ %d\n",
+                                 "☆☆☆☆☆ For some reason, I can't set it up ☆☆☆☆☆ %d\n") VT_RST,
+               this->actor.params);
+        PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ んんがくく ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Language ☆☆☆☆☆ %d\n") VT_RST, this->path);
         PRINTF("\n\n");
         Actor_Kill(&this->actor);
     }
diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h
index 422cf33e48..2651d95d8f 100644
--- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h
+++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h
@@ -2,7 +2,7 @@
 #define Z_EN_NIW_GIRL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnNiwGirl;
 
diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
index 1ea6397096..2ea1ace664 100644
--- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
+++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
@@ -13,10 +13,10 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ane/object_ane.h"
 #include "assets/objects/object_os_anime/object_os_anime.h"
diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h
index a6167454da..124efa5947 100644
--- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h
+++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h
@@ -2,7 +2,7 @@
 #define Z_EN_NIW_LADY_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnNiwLady;
 
diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
index 3511a3c45d..9417316e4c 100644
--- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
+++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
@@ -11,10 +11,10 @@
 #include "gfx_setupdl.h"
 #include "sfx.h"
 #include "sys_matrix.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_dekunuts/object_dekunuts.h"
 #include "assets/objects/object_hintnuts/object_hintnuts.h"
diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h
index bcd4e0a936..9af4b042d7 100644
--- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h
+++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h
@@ -2,7 +2,7 @@
 #define Z_EN_NUTSBALL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #define NUTSBALL_GET_TYPE(thisx) ((thisx)->params)
 
diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c
index a5f322def6..4d5ec7f3ca 100644
--- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c
+++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c
@@ -11,7 +11,7 @@
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_nwc/object_nwc.h"
 
diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h
index fbb64d1ca2..5e33e2fd36 100644
--- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h
+++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h
@@ -2,7 +2,7 @@
 #define Z_EN_NWC_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnNwc;
 struct EnNwcChick;
diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c
index be7fc69f09..38167bef26 100644
--- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c
+++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c
@@ -12,8 +12,8 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_ny/object_ny.h"
 
@@ -323,7 +323,7 @@ s32 EnNy_CollisionCheck(EnNy* this, PlayState* play) {
             effectPos.y = this->collider.elements[0].base.acDmgInfo.hitPos.y;
             effectPos.z = this->collider.elements[0].base.acDmgInfo.hitPos.z;
             if ((this->unk_1E0 == 0.25f) && (this->unk_1D4 == 0xFF)) {
-                switch (this->actor.colChkInfo.damageEffect) {
+                switch (this->actor.colChkInfo.damageReaction) {
                     case 0xE:
                         sp3F = 1;
                         FALLTHROUGH;
diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.h b/src/overlays/actors/ovl_En_Ny/z_en_ny.h
index 03cace42fb..714858408f 100644
--- a/src/overlays/actors/ovl_En_Ny/z_en_ny.h
+++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.h
@@ -2,7 +2,7 @@
 #define Z_EN_NY_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnNy;
 
diff --git a/src/overlays/actors/ovl_En_OE2/z_en_oe2.c b/src/overlays/actors/ovl_En_OE2/z_en_oe2.c
index f568d1812b..1d6b8dec43 100644
--- a/src/overlays/actors/ovl_En_OE2/z_en_oe2.c
+++ b/src/overlays/actors/ovl_En_OE2/z_en_oe2.c
@@ -6,7 +6,7 @@
 
 #include "z_en_oe2.h"
 
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
 
diff --git a/src/overlays/actors/ovl_En_OE2/z_en_oe2.h b/src/overlays/actors/ovl_En_OE2/z_en_oe2.h
index 062e103819..35cd7f65f8 100644
--- a/src/overlays/actors/ovl_En_OE2/z_en_oe2.h
+++ b/src/overlays/actors/ovl_En_OE2/z_en_oe2.h
@@ -2,7 +2,7 @@
 #define Z_EN_OE2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnOE2;
 
diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
index 5b361c6f1f..d58918ea82 100644
--- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
+++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
@@ -12,12 +12,12 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64cutscene_flags.h"
-#include "z64debug_display.h"
-#include "z64frame_advance.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "audio.h"
+#include "cutscene_flags.h"
+#include "debug_display.h"
+#include "frame_advance.h"
+#include "play_state.h"
+#include "save.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h
index bca8c99234..2596766d3a 100644
--- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h
+++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h
@@ -2,7 +2,7 @@
 #define Z_EN_OKARINA_EFFECT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnOkarinaEffect;
 
diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
index 430540c659..13bba29d07 100644
--- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
+++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
@@ -15,12 +15,12 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64debug_display.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "debug_display.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h"
 #include "assets/scenes/overworld/spot02/spot02_scene.h"
@@ -60,7 +60,7 @@ void EnOkarinaTag_Init(Actor* thisx, PlayState* play) {
     EnOkarinaTag* this = (EnOkarinaTag*)thisx;
 
     PRINTF("\n\n");
-    PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ オカリナタグ発生 ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Ocarina tag occurrence ☆☆☆☆☆ %x\n") VT_RST,
+    PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ オカリナタグ発生 ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Ocarina tag spawn ☆☆☆☆☆ %x\n") VT_RST,
            this->actor.params);
     this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
     this->type = PARAMS_GET_U(this->actor.params, 10, 6);
@@ -229,7 +229,7 @@ void func_80ABF28C(EnOkarinaTag* this, PlayState* play) {
                         break;
                     default:
                         PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ オカリナ透明君デモ開始チェックエラー原 ☆☆☆☆☆ %d\n",
-                                                 "☆☆☆☆☆ Ocarina Invisible-kun demo start check error source ☆☆☆☆☆ %d\n")
+                                                 "☆☆☆☆☆ Ocarina Invisible-kun demo start check error -Hara ☆☆☆☆☆ %d\n")
                                    VT_RST,
                                this->type);
                         Actor_Kill(&this->actor);
diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h
index 76ac1581a5..4e0fff553c 100644
--- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h
+++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h
@@ -2,7 +2,7 @@
 #define Z_EN_OKARINA_TAG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnOkarinaTag;
 
diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c
index 2ff69c780e..fde49023cd 100644
--- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c
+++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c
@@ -1,6 +1,6 @@
 #include "sequence.h"
-#include "z64cutscene_commands.h"
-#include "z64player.h"
+#include "cutscene_commands.h"
+#include "player.h"
 
 // clang-format off
 CutsceneData gWindmillSpinningFasterCs[] = {
diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
index b7063e0f00..1503bb265c 100644
--- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
+++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
@@ -8,10 +8,10 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_okuta/object_okuta.h"
 
@@ -570,11 +570,11 @@ void EnOkuta_ColliderCheck(EnOkuta* this, PlayState* play) {
     if (this->collider.base.acFlags & AC_HIT) {
         this->collider.base.acFlags &= ~AC_HIT;
         Actor_SetDropFlag(&this->actor, &this->collider.elem, true);
-        if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) {
+        if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) {
             Enemy_StartFinishingBlow(play, &this->actor);
             this->actor.colChkInfo.health = 0;
             this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
-            if (this->actor.colChkInfo.damageEffect == 3) {
+            if (this->actor.colChkInfo.damageReaction == 3) {
                 EnOkuta_SetupFreeze(this);
             } else {
                 EnOkuta_SetupWaitToDie(this);
diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h
index 5409481022..0e0a7a74eb 100644
--- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h
+++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h
@@ -2,7 +2,7 @@
 #define Z_EN_OKUTA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnOkuta;
 
diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index 25f881cf99..ab3c142984 100644
--- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
@@ -15,9 +15,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_ossan/object_ossan.h"
@@ -1203,7 +1203,7 @@ void EnOssan_State_BrowseLeftShelf(EnOssan* this, PlayState* play, Player* playe
     s32 d;
 
     if (!EnOssan_ReturnItemToShelf(this)) {
-        PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2152);
+        PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2152);
         this->delayTimer = 3;
         return;
     }
@@ -1262,7 +1262,7 @@ void EnOssan_State_BrowseRightShelf(EnOssan* this, PlayState* play, Player* play
 
     prevIndex = this->cursorIndex;
     if (!EnOssan_ReturnItemToShelf(this)) {
-        PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2244);
+        PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2244);
         this->delayTimer = 3;
         return;
     }
@@ -1327,7 +1327,7 @@ void EnOssan_State_LookFromShelfToShopkeeper(EnOssan* this, PlayState* play, Pla
 
 void EnOssan_State_DisplayOnlyBombDialog(EnOssan* this, PlayState* play, Player* player) {
     if (!EnOssan_ReturnItemToShelf(this)) {
-        PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2355);
+        PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2355);
         return;
     }
     Math_ApproachF(&this->cameraFaceAngle, 0.0f, 0.5f, 10.0f);
@@ -1344,7 +1344,7 @@ void EnOssan_State_DisplayOnlyBombDialog(EnOssan* this, PlayState* play, Player*
 void EnOssan_GiveItemWithFanfare(PlayState* play, EnOssan* this) {
     Player* player = GET_PLAYER(play);
 
-    PRINTF("\n" VT_FGCOL(YELLOW) "初めて手にいれた！！" VT_RST "\n\n");
+    PRINTF("\n" VT_FGCOL(YELLOW) T("初めて手にいれた！！", "I got it for the first time!!") VT_RST "\n\n");
     Actor_OfferGetItem(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
     play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
     play->msgCtx.stateTimer = 4;
@@ -1354,7 +1354,7 @@ void EnOssan_GiveItemWithFanfare(PlayState* play, EnOssan* this) {
     this->drawCursor = 0;
     EnOssan_UpdateCameraDirection(this, play, 0.0f);
     this->stateFlag = OSSAN_STATE_GIVE_ITEM_FANFARE;
-    PRINTF(VT_FGCOL(YELLOW) "持ち上げ開始！！" VT_RST "\n\n");
+    PRINTF(VT_FGCOL(YELLOW) T("持ち上げ開始！！", "Start lifting!!") VT_RST "\n\n");
 }
 
 void EnOssan_SetStateCantGetItem(PlayState* play, EnOssan* this, u16 textId) {
@@ -1506,7 +1506,7 @@ void EnOssan_State_ItemSelected(EnOssan* this, PlayState* play2, Player* player)
     PlayState* play = play2; // Necessary for OKs
 
     if (!EnOssan_TakeItemOffShelf(this)) {
-        PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2654);
+        PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2654);
         return;
     }
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE &&
@@ -1527,7 +1527,7 @@ void EnOssan_State_SelectMilkBottle(EnOssan* this, PlayState* play2, Player* pla
     PlayState* play = play2; // Need for OK
 
     if (!EnOssan_TakeItemOffShelf(this)) {
-        PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2693);
+        PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2693);
         return;
     }
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE &&
@@ -1548,7 +1548,7 @@ void EnOssan_State_SelectWeirdEgg(EnOssan* this, PlayState* play2, Player* playe
     PlayState* play = play2; // Needed for OK
 
     if (!EnOssan_TakeItemOffShelf(this)) {
-        PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2732);
+        PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2732);
         return;
     }
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE &&
@@ -1567,7 +1567,7 @@ void EnOssan_State_SelectWeirdEgg(EnOssan* this, PlayState* play2, Player* playe
 
 void EnOssan_State_SelectUnimplementedItem(EnOssan* this, PlayState* play, Player* player) {
     if (!EnOssan_TakeItemOffShelf(this)) {
-        PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2771);
+        PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2771);
         return;
     }
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT && Message_ShouldAdvance(play)) {
@@ -1578,10 +1578,10 @@ void EnOssan_State_SelectUnimplementedItem(EnOssan* this, PlayState* play, Playe
 
 void EnOssan_State_SelectBombs(EnOssan* this, PlayState* play, Player* player) {
     if (!EnOssan_TakeItemOffShelf(this)) {
-        PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2798);
+        PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2798);
         return;
     }
-    PRINTF("店主の依頼 ( %d )\n", GET_INFTABLE(INFTABLE_FC));
+    PRINTF(T("店主の依頼 ( %d )\n", "Shopkeeper's request ( %d )\n"), GET_INFTABLE(INFTABLE_FC));
     if (this->actor.params != OSSAN_TYPE_GORON) {
         EnOssan_State_ItemSelected(this, play, player);
         return;
@@ -1605,7 +1605,7 @@ void EnOssan_State_SelectMaskItem(EnOssan* this, PlayState* play, Player* player
     EnGirlA* item = this->shelfSlots[this->cursorIndex];
 
     if (!EnOssan_TakeItemOffShelf(this)) {
-        PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2845);
+        PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2845);
         return;
     }
     if (talkState == TEXT_STATE_EVENT) {
@@ -1722,7 +1722,7 @@ void EnOssan_State_ContinueShoppingPrompt(EnOssan* this, PlayState* play, Player
 
                 switch (play->msgCtx.choiceIndex) {
                     case 0:
-                        PRINTF(VT_FGCOL(YELLOW) "★★★ 続けるよ！！ ★★★" VT_RST "\n");
+                        PRINTF(VT_FGCOL(YELLOW) T("★★★ 続けるよ！！ ★★★", "★★★ I will continue!! ★★★") VT_RST "\n");
                         player->actor.shape.rot.y += 0x8000;
                         player->stateFlags2 |= PLAYER_STATE2_29;
                         Play_SetViewpoint(play, VIEWPOINT_PIVOT);
@@ -1732,7 +1732,7 @@ void EnOssan_State_ContinueShoppingPrompt(EnOssan* this, PlayState* play, Player
                         break;
                     case 1:
                     default:
-                        PRINTF(VT_FGCOL(YELLOW) "★★★ やめるよ！！ ★★★" VT_RST "\n");
+                        PRINTF(VT_FGCOL(YELLOW) T("★★★ やめるよ！！ ★★★", "★★★ I'm quitting!! ★★★") VT_RST "\n");
                         EnOssan_EndInteraction(play, this);
                         break;
                 }
diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h
index 7df4be57b8..e1b9e4691d 100644
--- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h
+++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h
@@ -2,7 +2,7 @@
 #define Z_EN_OSSAN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnOssan;
 
diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c
index 3ec065c696..cd5da7dd2f 100644
--- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c
+++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c
@@ -22,10 +22,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_owl/object_owl.h"
 #include "assets/scenes/overworld/spot06/spot06_scene.h"
diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.h b/src/overlays/actors/ovl_En_Owl/z_en_owl.h
index 2f9e0939f8..5ba352a4c4 100644
--- a/src/overlays/actors/ovl_En_Owl/z_en_owl.h
+++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.h
@@ -2,7 +2,7 @@
 #define Z_EN_OWL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnOwl;
 
diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c
index c10a8edcb4..27956fd3d4 100644
--- a/src/overlays/actors/ovl_En_Part/z_en_part.c
+++ b/src/overlays/actors/ovl_En_Part/z_en_part.c
@@ -15,9 +15,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_tite/object_tite.h"
 #include "assets/objects/object_ik/object_ik.h"
diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.h b/src/overlays/actors/ovl_En_Part/z_en_part.h
index 405e795e75..e6b618fcb9 100644
--- a/src/overlays/actors/ovl_En_Part/z_en_part.h
+++ b/src/overlays/actors/ovl_En_Part/z_en_part.h
@@ -2,7 +2,7 @@
 #define Z_EN_PART_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnPart;
 
diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
index 2246b3df16..a4225d0ff4 100644
--- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
+++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
@@ -12,10 +12,10 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_peehat/object_peehat.h"
 
@@ -137,48 +137,48 @@ static ColliderQuadInit sQuadInit = {
     { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
 };
 
-typedef enum DamageEffect {
-    /* 00 */ PEAHAT_DMG_EFF_ATTACK = 0,
-    /* 06 */ PEAHAT_DMG_EFF_LIGHT_ICE_ARROW = 6,
-    /* 12 */ PEAHAT_DMG_EFF_FIRE = 12,
-    /* 13 */ PEAHAT_DMG_EFF_HOOKSHOT = 13,
-    /* 14 */ PEAHAT_DMG_EFF_BOOMERANG = 14,
-    /* 15 */ PEAHAT_DMG_EFF_NUT = 15
-} DamageEffect;
+typedef enum EnPeehatDamageReaction {
+    /* 00 */ PEAHAT_DMG_REACT_ATTACK = 0,
+    /* 06 */ PEAHAT_DMG_REACT_LIGHT_ICE_ARROW = 6,
+    /* 12 */ PEAHAT_DMG_REACT_FIRE = 12,
+    /* 13 */ PEAHAT_DMG_REACT_HOOKSHOT = 13,
+    /* 14 */ PEAHAT_DMG_REACT_BOOMERANG = 14,
+    /* 15 */ PEAHAT_DMG_REACT_NUT = 15
+} EnPeehatDamageReaction;
 
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, PEAHAT_DMG_EFF_NUT),
-    /* Deku stick    */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK),
-    /* Slingshot     */ DMG_ENTRY(1, PEAHAT_DMG_EFF_ATTACK),
-    /* Explosive     */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK),
-    /* Boomerang     */ DMG_ENTRY(0, PEAHAT_DMG_EFF_BOOMERANG),
-    /* Normal arrow  */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK),
-    /* Hammer swing  */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK),
-    /* Hookshot      */ DMG_ENTRY(2, PEAHAT_DMG_EFF_HOOKSHOT),
-    /* Kokiri sword  */ DMG_ENTRY(1, PEAHAT_DMG_EFF_ATTACK),
-    /* Master sword  */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK),
-    /* Giant's Knife */ DMG_ENTRY(4, PEAHAT_DMG_EFF_ATTACK),
-    /* Fire arrow    */ DMG_ENTRY(4, PEAHAT_DMG_EFF_FIRE),
-    /* Ice arrow     */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK),
-    /* Light arrow   */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK),
-    /* Unk arrow 1   */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK),
-    /* Unk arrow 2   */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK),
-    /* Unk arrow 3   */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK),
-    /* Fire magic    */ DMG_ENTRY(3, PEAHAT_DMG_EFF_FIRE),
-    /* Ice magic     */ DMG_ENTRY(0, PEAHAT_DMG_EFF_LIGHT_ICE_ARROW),
-    /* Light magic   */ DMG_ENTRY(0, PEAHAT_DMG_EFF_LIGHT_ICE_ARROW),
-    /* Shield        */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK),
-    /* Mirror Ray    */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK),
-    /* Kokiri spin   */ DMG_ENTRY(1, PEAHAT_DMG_EFF_ATTACK),
-    /* Giant spin    */ DMG_ENTRY(4, PEAHAT_DMG_EFF_ATTACK),
-    /* Master spin   */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK),
-    /* Kokiri jump   */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK),
-    /* Giant jump    */ DMG_ENTRY(8, PEAHAT_DMG_EFF_ATTACK),
-    /* Master jump   */ DMG_ENTRY(4, PEAHAT_DMG_EFF_ATTACK),
-    /* Unknown 1     */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK),
-    /* Unblockable   */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK),
-    /* Hammer jump   */ DMG_ENTRY(4, PEAHAT_DMG_EFF_ATTACK),
-    /* Unknown 2     */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK),
+    /* Deku nut      */ DMG_ENTRY(0, PEAHAT_DMG_REACT_NUT),
+    /* Deku stick    */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK),
+    /* Slingshot     */ DMG_ENTRY(1, PEAHAT_DMG_REACT_ATTACK),
+    /* Explosive     */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK),
+    /* Boomerang     */ DMG_ENTRY(0, PEAHAT_DMG_REACT_BOOMERANG),
+    /* Normal arrow  */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK),
+    /* Hammer swing  */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK),
+    /* Hookshot      */ DMG_ENTRY(2, PEAHAT_DMG_REACT_HOOKSHOT),
+    /* Kokiri sword  */ DMG_ENTRY(1, PEAHAT_DMG_REACT_ATTACK),
+    /* Master sword  */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK),
+    /* Giant's Knife */ DMG_ENTRY(4, PEAHAT_DMG_REACT_ATTACK),
+    /* Fire arrow    */ DMG_ENTRY(4, PEAHAT_DMG_REACT_FIRE),
+    /* Ice arrow     */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK),
+    /* Light arrow   */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK),
+    /* Unk arrow 1   */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK),
+    /* Unk arrow 2   */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK),
+    /* Unk arrow 3   */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK),
+    /* Fire magic    */ DMG_ENTRY(3, PEAHAT_DMG_REACT_FIRE),
+    /* Ice magic     */ DMG_ENTRY(0, PEAHAT_DMG_REACT_LIGHT_ICE_ARROW),
+    /* Light magic   */ DMG_ENTRY(0, PEAHAT_DMG_REACT_LIGHT_ICE_ARROW),
+    /* Shield        */ DMG_ENTRY(0, PEAHAT_DMG_REACT_ATTACK),
+    /* Mirror Ray    */ DMG_ENTRY(0, PEAHAT_DMG_REACT_ATTACK),
+    /* Kokiri spin   */ DMG_ENTRY(1, PEAHAT_DMG_REACT_ATTACK),
+    /* Giant spin    */ DMG_ENTRY(4, PEAHAT_DMG_REACT_ATTACK),
+    /* Master spin   */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK),
+    /* Kokiri jump   */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK),
+    /* Giant jump    */ DMG_ENTRY(8, PEAHAT_DMG_REACT_ATTACK),
+    /* Master jump   */ DMG_ENTRY(4, PEAHAT_DMG_REACT_ATTACK),
+    /* Unknown 1     */ DMG_ENTRY(0, PEAHAT_DMG_REACT_ATTACK),
+    /* Unblockable   */ DMG_ENTRY(0, PEAHAT_DMG_REACT_ATTACK),
+    /* Hammer jump   */ DMG_ENTRY(4, PEAHAT_DMG_REACT_ATTACK),
+    /* Unknown 2     */ DMG_ENTRY(0, PEAHAT_DMG_REACT_ATTACK),
 };
 
 typedef enum PeahatState {
@@ -902,13 +902,13 @@ void EnPeehat_Adult_CollisionCheck(EnPeehat* this, PlayState* play) {
     } else if (this->colliderJntSph.base.acFlags & AC_HIT) {
         this->colliderJntSph.base.acFlags &= ~AC_HIT;
         Actor_SetDropFlagJntSph(&this->actor, &this->colliderJntSph, true);
-        if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_NUT ||
-            this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) {
+        if (this->actor.colChkInfo.damageReaction == PEAHAT_DMG_REACT_NUT ||
+            this->actor.colChkInfo.damageReaction == PEAHAT_DMG_REACT_LIGHT_ICE_ARROW) {
             return;
         }
-        if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_HOOKSHOT) {
+        if (this->actor.colChkInfo.damageReaction == PEAHAT_DMG_REACT_HOOKSHOT) {
             this->actor.colChkInfo.health = 0;
-        } else if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_BOOMERANG) {
+        } else if (this->actor.colChkInfo.damageReaction == PEAHAT_DMG_REACT_BOOMERANG) {
             if (this->state != PEAHAT_STATE_STUNNED) {
                 EnPeehat_SetStateBoomerangStunned(this);
             }
@@ -919,7 +919,7 @@ void EnPeehat_Adult_CollisionCheck(EnPeehat* this, PlayState* play) {
             Actor_PlaySfx(&this->actor, NA_SE_EN_PIHAT_DAMAGE);
         }
 
-        if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_FIRE) {
+        if (this->actor.colChkInfo.damageReaction == PEAHAT_DMG_REACT_FIRE) {
             Vec3f pos;
             s32 i;
             for (i = 4; i >= 0; i--) {
@@ -949,7 +949,7 @@ void EnPeehat_Update(Actor* thisx, PlayState* play) {
     if (thisx->params <= 0) {
         EnPeehat_Adult_CollisionCheck(this, play);
     }
-    if (thisx->colChkInfo.damageEffect != PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) {
+    if (thisx->colChkInfo.damageReaction != PEAHAT_DMG_REACT_LIGHT_ICE_ARROW) {
         if (thisx->speed != 0.0f || thisx->velocity.y != 0.0f) {
             Actor_MoveXZGravity(thisx);
             Actor_UpdateBgCheckInfo(play, thisx, 25.0f, 30.0f, 30.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h
index deb24089f6..2f554ef29e 100644
--- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h
+++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h
@@ -2,7 +2,7 @@
 #define Z_EN_PEEHAT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum PeahatType {
     /* -1 */ PEAHAT_TYPE_GROUNDED = -1,
diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c
index 8110c00f3e..caf492b8be 100644
--- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c
+++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c
@@ -14,8 +14,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64light.h"
-#include "z64play.h"
+#include "light.h"
+#include "play_state.h"
 
 #include "assets/objects/object_po_field/object_po_field.h"
 
diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h
index 3f93eeb01d..729388ca19 100644
--- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h
+++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h
@@ -2,8 +2,8 @@
 #define Z_EN_PO_DESERT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct EnPoDesert;
 
diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
index 30218e20e5..2989292f7f 100644
--- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
+++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
@@ -14,11 +14,11 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_po_field/object_po_field.h"
@@ -744,7 +744,7 @@ void EnPoField_SoulInteract(EnPoField* this, PlayState* play) {
 void EnPoField_TestForDamage(EnPoField* this, PlayState* play) {
     if (this->collider.base.acFlags & AC_HIT) {
         this->collider.base.acFlags &= ~AC_HIT;
-        if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) {
+        if (this->actor.colChkInfo.damageReaction != 0 || this->actor.colChkInfo.damage != 0) {
             if (Actor_ApplyDamage(&this->actor) == 0) {
                 Enemy_StartFinishingBlow(play, &this->actor);
                 Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DEAD);
diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h
index 17e08ee999..06f36af808 100644
--- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h
+++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h
@@ -2,8 +2,8 @@
 #define Z_EN_PO_FIELD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct EnPoField;
 
diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c
index 983dbf0d71..b2effdffed 100644
--- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c
+++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c
@@ -17,11 +17,11 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_tk/object_tk.h"
 
diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h
index e4a440d940..483208f9f0 100644
--- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h
+++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h
@@ -2,8 +2,8 @@
 #define Z_EN_PO_RELAY_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct EnPoRelay;
 
diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
index ba165bd3ad..fcd5a3ce27 100644
--- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
+++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
@@ -17,11 +17,11 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "audio.h"
+#include "effect.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_po_sisters/object_po_sisters.h"
@@ -1166,15 +1166,15 @@ void func_80ADC10C(EnPoSisters* this, PlayState* play) {
                 Item_DropCollectible(play, &sp24, ITEM00_ARROWS_SMALL);
             }
         } else if (this->collider.base.colMaterial == COL_MATERIAL_METAL ||
-                   (this->actor.colChkInfo.damageEffect == 0 && this->actor.colChkInfo.damage == 0)) {
+                   (this->actor.colChkInfo.damageReaction == 0 && this->actor.colChkInfo.damage == 0)) {
             if (this->unk_194 == 0) {
                 this->actor.freezeTimer = 0;
             }
-        } else if (this->actor.colChkInfo.damageEffect == 0xF) {
+        } else if (this->actor.colChkInfo.damageReaction == 0xF) {
             this->actor.world.rot.y = this->actor.shape.rot.y;
             this->unk_199 |= 2;
             func_80AD98F4(this, play);
-        } else if (this->unk_194 == 0 && this->actor.colChkInfo.damageEffect == 0xE &&
+        } else if (this->unk_194 == 0 && this->actor.colChkInfo.damageReaction == 0xE &&
                    this->actionFunc == func_80ADB770) {
             if (this->unk_19C == 0) {
                 this->unk_19C = -45;
diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
index bc25e9d035..fdfd734360 100644
--- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
+++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
@@ -2,8 +2,8 @@
 #define Z_EN_PO_SISTERS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct EnPoSisters;
 
diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c
index fceb18ef7c..b6e7232852 100644
--- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c
+++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c
@@ -14,11 +14,11 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_poh/object_poh.h"
 #include "assets/objects/object_po_composer/object_po_composer.h"
@@ -880,7 +880,7 @@ void EnPoh_TalkComposer(EnPoh* this, PlayState* play) {
 void func_80AE032C(EnPoh* this, PlayState* play) {
     if (this->colliderCylinder.base.acFlags & AC_HIT) {
         this->colliderCylinder.base.acFlags &= ~AC_HIT;
-        if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) {
+        if (this->actor.colChkInfo.damageReaction != 0 || this->actor.colChkInfo.damage != 0) {
             if (Actor_ApplyDamage(&this->actor) == 0) {
                 Enemy_StartFinishingBlow(play, &this->actor);
                 Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DEAD);
diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.h b/src/overlays/actors/ovl_En_Poh/z_en_poh.h
index 7e7db7d997..6973719638 100644
--- a/src/overlays/actors/ovl_En_Poh/z_en_poh.h
+++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.h
@@ -2,8 +2,8 @@
 #define Z_EN_POH_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct EnPoh;
 
diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c
index e984f316f7..5f72ceeb4d 100644
--- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c
+++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c
@@ -8,7 +8,7 @@
 
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_pu_box/object_pu_box.h"
 
diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h
index cd15c66c18..c128c86dfb 100644
--- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h
+++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h
@@ -2,7 +2,7 @@
 #define Z_EN_PU_BOX_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnPubox;
 
diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c
index af9ed8f112..3091697443 100644
--- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c
+++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c
@@ -16,10 +16,10 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_rd/object_rd.h"
 
@@ -108,48 +108,48 @@ static ColliderCylinderInit sCylinderInit = {
     { 20, 70, 0, { 0, 0, 0 } },
 };
 
-typedef enum EnRdDamageEffect {
-    /* 0x0 */ REDEAD_DMGEFF_NONE,              // Does not interact with the Gibdo/Redead at all
-    /* 0x1 */ REDEAD_DMGEFF_HOOKSHOT,          // Stuns the Gibdo/Redead
-    /* 0x6 */ REDEAD_DMGEFF_ICE_MAGIC = 0x6,   // Does not interact with the Gibdo/Redead at all
-    /* 0xD */ REDEAD_DMGEFF_LIGHT_MAGIC = 0xD, // Stuns the Gibdo/Redead
-    /* 0xE */ REDEAD_DMGEFF_FIRE_MAGIC,        // Applies a fire effect
-    /* 0xF */ REDEAD_DMGEFF_DAMAGE             // Deals damage without stunning or applying an effect
-} EnRdDamageEffect;
+typedef enum EnRdDamageReaction {
+    /* 0x0 */ REDEAD_DMG_REACT_NONE,              // Does not interact with the Gibdo/Redead at all
+    /* 0x1 */ REDEAD_DMG_REACT_HOOKSHOT,          // Stuns the Gibdo/Redead
+    /* 0x6 */ REDEAD_DMG_REACT_ICE_MAGIC = 0x6,   // Does not interact with the Gibdo/Redead at all
+    /* 0xD */ REDEAD_DMG_REACT_LIGHT_MAGIC = 0xD, // Stuns the Gibdo/Redead
+    /* 0xE */ REDEAD_DMG_REACT_FIRE_MAGIC,        // Applies a fire effect
+    /* 0xF */ REDEAD_DMG_REACT_DAMAGE             // Deals damage without stunning or applying an effect
+} EnRdDamageReaction;
 
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Deku stick    */ DMG_ENTRY(2, REDEAD_DMGEFF_DAMAGE),
-    /* Slingshot     */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Explosive     */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Boomerang     */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Normal arrow  */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Hammer swing  */ DMG_ENTRY(2, REDEAD_DMGEFF_DAMAGE),
-    /* Hookshot      */ DMG_ENTRY(0, REDEAD_DMGEFF_HOOKSHOT),
-    /* Kokiri sword  */ DMG_ENTRY(1, REDEAD_DMGEFF_DAMAGE),
-    /* Master sword  */ DMG_ENTRY(2, REDEAD_DMGEFF_DAMAGE),
-    /* Giant's Knife */ DMG_ENTRY(4, REDEAD_DMGEFF_DAMAGE),
-    /* Fire arrow    */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Ice arrow     */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Light arrow   */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Unk arrow 1   */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Unk arrow 2   */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Unk arrow 3   */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Fire magic    */ DMG_ENTRY(4, REDEAD_DMGEFF_FIRE_MAGIC),
-    /* Ice magic     */ DMG_ENTRY(0, REDEAD_DMGEFF_ICE_MAGIC),
-    /* Light magic   */ DMG_ENTRY(3, REDEAD_DMGEFF_LIGHT_MAGIC),
-    /* Shield        */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Mirror Ray    */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Kokiri spin   */ DMG_ENTRY(1, REDEAD_DMGEFF_DAMAGE),
-    /* Giant spin    */ DMG_ENTRY(4, REDEAD_DMGEFF_DAMAGE),
-    /* Master spin   */ DMG_ENTRY(2, REDEAD_DMGEFF_DAMAGE),
-    /* Kokiri jump   */ DMG_ENTRY(2, REDEAD_DMGEFF_DAMAGE),
-    /* Giant jump    */ DMG_ENTRY(8, REDEAD_DMGEFF_DAMAGE),
-    /* Master jump   */ DMG_ENTRY(4, REDEAD_DMGEFF_DAMAGE),
-    /* Unknown 1     */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Unblockable   */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
-    /* Hammer jump   */ DMG_ENTRY(4, REDEAD_DMGEFF_DAMAGE),
-    /* Unknown 2     */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE),
+    /* Deku nut      */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Deku stick    */ DMG_ENTRY(2, REDEAD_DMG_REACT_DAMAGE),
+    /* Slingshot     */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Explosive     */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Boomerang     */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Normal arrow  */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Hammer swing  */ DMG_ENTRY(2, REDEAD_DMG_REACT_DAMAGE),
+    /* Hookshot      */ DMG_ENTRY(0, REDEAD_DMG_REACT_HOOKSHOT),
+    /* Kokiri sword  */ DMG_ENTRY(1, REDEAD_DMG_REACT_DAMAGE),
+    /* Master sword  */ DMG_ENTRY(2, REDEAD_DMG_REACT_DAMAGE),
+    /* Giant's Knife */ DMG_ENTRY(4, REDEAD_DMG_REACT_DAMAGE),
+    /* Fire arrow    */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Ice arrow     */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Light arrow   */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Unk arrow 1   */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Unk arrow 2   */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Unk arrow 3   */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Fire magic    */ DMG_ENTRY(4, REDEAD_DMG_REACT_FIRE_MAGIC),
+    /* Ice magic     */ DMG_ENTRY(0, REDEAD_DMG_REACT_ICE_MAGIC),
+    /* Light magic   */ DMG_ENTRY(3, REDEAD_DMG_REACT_LIGHT_MAGIC),
+    /* Shield        */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(1, REDEAD_DMG_REACT_DAMAGE),
+    /* Giant spin    */ DMG_ENTRY(4, REDEAD_DMG_REACT_DAMAGE),
+    /* Master spin   */ DMG_ENTRY(2, REDEAD_DMG_REACT_DAMAGE),
+    /* Kokiri jump   */ DMG_ENTRY(2, REDEAD_DMG_REACT_DAMAGE),
+    /* Giant jump    */ DMG_ENTRY(8, REDEAD_DMG_REACT_DAMAGE),
+    /* Master jump   */ DMG_ENTRY(4, REDEAD_DMG_REACT_DAMAGE),
+    /* Unknown 1     */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Unblockable   */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(4, REDEAD_DMG_REACT_DAMAGE),
+    /* Unknown 2     */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE),
 };
 
 static InitChainEntry sInitChain[] = {
@@ -768,7 +768,7 @@ void EnRd_SetupStunned(EnRd* this) {
         Actor_PlaySfx(&this->actor, NA_SE_EN_LIGHT_ARROW_HIT);
         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, COLORFILTER_INTENSITY_FLAG | 200,
                              COLORFILTER_BUFFLAG_OPA, 255);
-    } else if (this->damageEffect == REDEAD_DMGEFF_HOOKSHOT) {
+    } else if (this->damageReaction == REDEAD_DMG_REACT_HOOKSHOT) {
         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 200, COLORFILTER_BUFFLAG_OPA, 80);
     } else {
         Actor_PlaySfx(&this->actor, NA_SE_EN_LIGHT_ARROW_HIT);
@@ -835,7 +835,7 @@ void EnRd_UpdateDamage(EnRd* this, PlayState* play) {
 
     if (this->collider.base.acFlags & AC_HIT) {
         this->collider.base.acFlags &= ~AC_HIT;
-        this->damageEffect = this->actor.colChkInfo.damageEffect;
+        this->damageReaction = this->actor.colChkInfo.damageReaction;
 
         if (this->action != REDEAD_ACTION_RISE_FROM_COFFIN) {
             Actor_SetDropFlag(&this->actor, &this->collider.elem, true);
@@ -843,9 +843,10 @@ void EnRd_UpdateDamage(EnRd* this, PlayState* play) {
                 this->unk_31D = player->unk_845;
             }
 
-            if ((this->damageEffect != REDEAD_DMGEFF_NONE) && (this->damageEffect != REDEAD_DMGEFF_ICE_MAGIC)) {
-                if (((this->damageEffect == REDEAD_DMGEFF_HOOKSHOT) ||
-                     (this->damageEffect == REDEAD_DMGEFF_LIGHT_MAGIC)) &&
+            if ((this->damageReaction != REDEAD_DMG_REACT_NONE) &&
+                (this->damageReaction != REDEAD_DMG_REACT_ICE_MAGIC)) {
+                if (((this->damageReaction == REDEAD_DMG_REACT_HOOKSHOT) ||
+                     (this->damageReaction == REDEAD_DMG_REACT_LIGHT_MAGIC)) &&
                     (this->action != REDEAD_ACTION_STUNNED)) {
                     Actor_ApplyDamage(&this->actor);
                     EnRd_SetupStunned(this);
@@ -855,7 +856,7 @@ void EnRd_UpdateDamage(EnRd* this, PlayState* play) {
                 this->stunnedBySunsSong = false;
                 this->sunsSongStunTimer = 0;
 
-                if (this->damageEffect == REDEAD_DMGEFF_FIRE_MAGIC) {
+                if (this->damageReaction == REDEAD_DMG_REACT_FIRE_MAGIC) {
                     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 80);
                     this->fireTimer = 40;
                 } else {
@@ -887,8 +888,8 @@ void EnRd_Update(Actor* thisx, PlayState* play) {
         gSaveContext.sunsSongState = SUNSSONG_INACTIVE;
     }
 
-    if (this->damageEffect != REDEAD_DMGEFF_ICE_MAGIC &&
-        ((this->action != REDEAD_ACTION_RISE_FROM_COFFIN) || (this->damageEffect != REDEAD_DMGEFF_FIRE_MAGIC))) {
+    if (this->damageReaction != REDEAD_DMG_REACT_ICE_MAGIC &&
+        ((this->action != REDEAD_ACTION_RISE_FROM_COFFIN) || (this->damageReaction != REDEAD_DMG_REACT_FIRE_MAGIC))) {
         if (this->playerStunWaitTimer != 0) {
             this->playerStunWaitTimer--;
         }
diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.h b/src/overlays/actors/ovl_En_Rd/z_en_rd.h
index 5e9f328dee..1e85e119f8 100644
--- a/src/overlays/actors/ovl_En_Rd/z_en_rd.h
+++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h
@@ -2,7 +2,7 @@
 #define Z_EN_RD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnRd;
 
@@ -71,7 +71,7 @@ typedef struct EnRd {
     /* 0x0319 */ u8 grabDamageTimer;
     /* 0x031A */ u8 fireTimer;
     /* 0x031B */ u8 action;
-    /* 0x031C */ u8 damageEffect;
+    /* 0x031C */ u8 damageReaction;
     /* 0x031D */ u8 unk_31D; // related to player->unk_845
     /* 0x0320 */ ColliderCylinder collider;
 } EnRd; // size = 0x036C
diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
index b4cafe6817..1cb43e2481 100644
--- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
+++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
@@ -20,10 +20,10 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "debug_display.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_reeba/object_reeba.h"
 
@@ -49,49 +49,49 @@ void EnReeba_Die(EnReeba* this, PlayState* play);
 void EnReeba_Stunned(EnReeba* this, PlayState* play);
 void EnReeba_StunDie(EnReeba* this, PlayState* play);
 
-typedef enum LeeverDamageEffect {
-    /* 0x00 */ LEEVER_DMGEFF_NONE, // used by anything that cant kill the Leever
-    /* 0x01 */ LEEVER_DMGEFF_UNK,  // used by "unknown 1" attack
-    /* 0x03 */ LEEVER_DMGEFF_ICE = 3,
-    /* 0x0B */ LEEVER_DMGEFF_UNUSED = 11, // not used in the damage table, but still checked for.
-    /* 0x0C */ LEEVER_DMGEFF_BOOMERANG,
-    /* 0x0D */ LEEVER_DMGEFF_HOOKSHOT,
-    /* 0x0E */ LEEVER_DMGEFF_OTHER
-} LeeverDamageEffect;
+typedef enum LeeverDamageReaction {
+    /* 0x00 */ LEEVER_DMG_REACT_NONE, // used by anything that cant kill the Leever
+    /* 0x01 */ LEEVER_DMG_REACT_UNK,  // used by "unknown 1" attack
+    /* 0x03 */ LEEVER_DMG_REACT_ICE = 3,
+    /* 0x0B */ LEEVER_DMG_REACT_UNUSED = 11, // not used in the damage table, but still checked for.
+    /* 0x0C */ LEEVER_DMG_REACT_BOOMERANG,
+    /* 0x0D */ LEEVER_DMG_REACT_HOOKSHOT,
+    /* 0x0E */ LEEVER_DMG_REACT_OTHER
+} LeeverDamageReaction;
 
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE),
-    /* Deku stick    */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER),
-    /* Slingshot     */ DMG_ENTRY(1, LEEVER_DMGEFF_OTHER),
-    /* Explosive     */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER),
-    /* Boomerang     */ DMG_ENTRY(1, LEEVER_DMGEFF_BOOMERANG),
-    /* Normal arrow  */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER),
-    /* Hammer swing  */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER),
-    /* Hookshot      */ DMG_ENTRY(2, LEEVER_DMGEFF_HOOKSHOT),
-    /* Kokiri sword  */ DMG_ENTRY(1, LEEVER_DMGEFF_OTHER),
-    /* Master sword  */ DMG_ENTRY(4, LEEVER_DMGEFF_OTHER),
-    /* Giant's Knife */ DMG_ENTRY(6, LEEVER_DMGEFF_OTHER),
-    /* Fire arrow    */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER),
-    /* Ice arrow     */ DMG_ENTRY(4, LEEVER_DMGEFF_ICE),
-    /* Light arrow   */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER),
-    /* Unk arrow 1   */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER),
-    /* Unk arrow 2   */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER),
-    /* Unk arrow 3   */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER),
-    /* Fire magic    */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE),
-    /* Ice magic     */ DMG_ENTRY(4, LEEVER_DMGEFF_ICE),
-    /* Light magic   */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE),
-    /* Shield        */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE),
-    /* Mirror Ray    */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE),
-    /* Kokiri spin   */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER),
-    /* Giant spin    */ DMG_ENTRY(8, LEEVER_DMGEFF_OTHER),
-    /* Master spin   */ DMG_ENTRY(4, LEEVER_DMGEFF_OTHER),
-    /* Kokiri jump   */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER),
-    /* Giant jump    */ DMG_ENTRY(8, LEEVER_DMGEFF_OTHER),
-    /* Master jump   */ DMG_ENTRY(4, LEEVER_DMGEFF_OTHER),
-    /* Unknown 1     */ DMG_ENTRY(0, LEEVER_DMGEFF_UNK),
-    /* Unblockable   */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE),
-    /* Hammer jump   */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE),
-    /* Unknown 2     */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE),
+    /* Deku nut      */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE),
+    /* Deku stick    */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER),
+    /* Slingshot     */ DMG_ENTRY(1, LEEVER_DMG_REACT_OTHER),
+    /* Explosive     */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER),
+    /* Boomerang     */ DMG_ENTRY(1, LEEVER_DMG_REACT_BOOMERANG),
+    /* Normal arrow  */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER),
+    /* Hammer swing  */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER),
+    /* Hookshot      */ DMG_ENTRY(2, LEEVER_DMG_REACT_HOOKSHOT),
+    /* Kokiri sword  */ DMG_ENTRY(1, LEEVER_DMG_REACT_OTHER),
+    /* Master sword  */ DMG_ENTRY(4, LEEVER_DMG_REACT_OTHER),
+    /* Giant's Knife */ DMG_ENTRY(6, LEEVER_DMG_REACT_OTHER),
+    /* Fire arrow    */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER),
+    /* Ice arrow     */ DMG_ENTRY(4, LEEVER_DMG_REACT_ICE),
+    /* Light arrow   */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER),
+    /* Unk arrow 1   */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER),
+    /* Unk arrow 2   */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER),
+    /* Unk arrow 3   */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER),
+    /* Fire magic    */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE),
+    /* Ice magic     */ DMG_ENTRY(4, LEEVER_DMG_REACT_ICE),
+    /* Light magic   */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE),
+    /* Shield        */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER),
+    /* Giant spin    */ DMG_ENTRY(8, LEEVER_DMG_REACT_OTHER),
+    /* Master spin   */ DMG_ENTRY(4, LEEVER_DMG_REACT_OTHER),
+    /* Kokiri jump   */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER),
+    /* Giant jump    */ DMG_ENTRY(8, LEEVER_DMG_REACT_OTHER),
+    /* Master jump   */ DMG_ENTRY(4, LEEVER_DMG_REACT_OTHER),
+    /* Unknown 1     */ DMG_ENTRY(0, LEEVER_DMG_REACT_UNK),
+    /* Unblockable   */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE),
+    /* Unknown 2     */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE),
 };
 
 ActorProfile En_Reeba_Profile = {
@@ -557,9 +557,9 @@ void EnReeba_CheckDamage(EnReeba* this, PlayState* play) {
             this->actor.shape.rot.x = this->actor.shape.rot.z = 0;
             this->stunType = LEEVER_STUN_NONE;
 
-            switch (this->actor.colChkInfo.damageEffect) {
-                case LEEVER_DMGEFF_UNUSED:
-                case LEEVER_DMGEFF_BOOMERANG:
+            switch (this->actor.colChkInfo.damageReaction) {
+                case LEEVER_DMG_REACT_UNUSED:
+                case LEEVER_DMG_REACT_BOOMERANG:
                     if ((this->actor.colChkInfo.health > 1) && (this->stunType != LEEVER_STUN_OTHER)) {
                         this->stunType = LEEVER_STUN_OTHER;
                         Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
@@ -569,7 +569,7 @@ void EnReeba_CheckDamage(EnReeba* this, PlayState* play) {
                         break;
                     }
                     FALLTHROUGH;
-                case LEEVER_DMGEFF_HOOKSHOT:
+                case LEEVER_DMG_REACT_HOOKSHOT:
                     if ((this->actor.colChkInfo.health > 2) && (this->stunType != LEEVER_STUN_OTHER)) {
                         this->stunType = LEEVER_STUN_OTHER;
                         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA,
@@ -579,7 +579,7 @@ void EnReeba_CheckDamage(EnReeba* this, PlayState* play) {
                         break;
                     }
                     FALLTHROUGH;
-                case LEEVER_DMGEFF_OTHER:
+                case LEEVER_DMG_REACT_OTHER:
                     this->unkDamageField = 6;
                     Actor_ApplyDamage(&this->actor);
                     if (this->actor.colChkInfo.health == 0) {
@@ -595,7 +595,7 @@ void EnReeba_CheckDamage(EnReeba* this, PlayState* play) {
                     }
                     break;
 
-                case LEEVER_DMGEFF_ICE:
+                case LEEVER_DMG_REACT_ICE:
                     Actor_ApplyDamage(&this->actor);
                     this->unkDamageField = 2;
                     this->stunType = LEEVER_STUN_ICE;
@@ -603,7 +603,7 @@ void EnReeba_CheckDamage(EnReeba* this, PlayState* play) {
                     this->actionfunc = EnReeba_SetupStunned;
                     break;
 
-                case LEEVER_DMGEFF_UNK:
+                case LEEVER_DMG_REACT_UNK:
                     if (this->stunType != LEEVER_STUN_OTHER) {
                         this->stunType = LEEVER_STUN_OTHER;
                         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA,
diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h
index a357af86ef..9f4ba8c07d 100644
--- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h
+++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h
@@ -2,7 +2,7 @@
 #define Z_EN_REEBA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnReeba;
 
diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c
index 871cf6668f..1b1d066b00 100644
--- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c
+++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c
@@ -10,10 +10,10 @@
 #include "sequence.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h
index 4332af6021..1b9622ae53 100644
--- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h
+++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h
@@ -2,7 +2,7 @@
 #define Z_EN_RIVER_SOUND_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnRiverSound;
 
diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c
index ff57761161..83b51453e5 100644
--- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c
+++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c
@@ -14,9 +14,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_rl/object_rl.h"
 
diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.h b/src/overlays/actors/ovl_En_Rl/z_en_rl.h
index 9ce9949aa6..b06f3fff09 100644
--- a/src/overlays/actors/ovl_En_Rl/z_en_rl.h
+++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.h
@@ -2,7 +2,7 @@
 #define Z_EN_RL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnRl;
 
diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c
index ad19ebe447..5ed4a1ea37 100644
--- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c
+++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c
@@ -20,10 +20,10 @@
 #include "versions.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_rr/object_rr.h"
 
@@ -45,18 +45,18 @@ typedef enum EnRrReachState {
     /* 5 */ REACH_CLOSE
 } EnRrReachState;
 
-typedef enum EnRrDamageEffect {
-    /* 0x0 */ RR_DMG_NONE,
-    /* 0x1 */ RR_DMG_STUN,
-    /* 0x2 */ RR_DMG_FIRE,
-    /* 0x3 */ RR_DMG_ICE,
-    /* 0x4 */ RR_DMG_LIGHT_MAGIC,
-    /* 0xB */ RR_DMG_LIGHT_ARROW = 11,
-    /* 0xC */ RR_DMG_SHDW_ARROW,
-    /* 0xD */ RR_DMG_WIND_ARROW,
-    /* 0xE */ RR_DMG_SPRT_ARROW,
-    /* 0xF */ RR_DMG_NORMAL
-} EnRrDamageEffect;
+typedef enum EnRrDamageReaction {
+    /* 0x0 */ RR_DMG_REACT_NONE,
+    /* 0x1 */ RR_DMG_REACT_STUN,
+    /* 0x2 */ RR_DMG_REACT_FIRE,
+    /* 0x3 */ RR_DMG_REACT_ICE,
+    /* 0x4 */ RR_DMG_REACT_LIGHT_MAGIC,
+    /* 0xB */ RR_DMG_REACT_LIGHT_ARROW = 11,
+    /* 0xC */ RR_DMG_REACT_SHDW_ARROW,
+    /* 0xD */ RR_DMG_REACT_WIND_ARROW,
+    /* 0xE */ RR_DMG_REACT_SPRT_ARROW,
+    /* 0xF */ RR_DMG_REACT_NORMAL
+} EnRrDamageReaction;
 
 typedef enum EnRrDropType {
     /* 0 */ RR_DROP_RANDOM_RUPEE,
@@ -99,8 +99,8 @@ ActorProfile En_Rr_Profile = {
 
 #if DEBUG_FEATURES
 static char* sDropNames[] = {
-    // "type 7", "small magic jar", "arrow", "fairy", "20 rupees", "50 rupees"
-    "タイプ７  ", "魔法の壷小", "矢        ", "妖精      ", "20ルピー  ", "50ルピー  ",
+    T("タイプ７  ", "Type 7    "), T("魔法の壷小", "Small magic jar"), T("矢        ", "Arrow     "),
+    T("妖精      ", "Fairy     "), T("20ルピー  ", "20 rupees "),      T("50ルピー  ", "50 rupees "),
 };
 #endif
 
@@ -143,38 +143,38 @@ static ColliderCylinderInitType1 sCylinderInit2 = {
 };
 
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, RR_DMG_NONE),
-    /* Deku stick    */ DMG_ENTRY(2, RR_DMG_NORMAL),
-    /* Slingshot     */ DMG_ENTRY(1, RR_DMG_NORMAL),
-    /* Explosive     */ DMG_ENTRY(2, RR_DMG_NORMAL),
-    /* Boomerang     */ DMG_ENTRY(0, RR_DMG_STUN),
-    /* Normal arrow  */ DMG_ENTRY(2, RR_DMG_NORMAL),
-    /* Hammer swing  */ DMG_ENTRY(2, RR_DMG_NORMAL),
-    /* Hookshot      */ DMG_ENTRY(0, RR_DMG_STUN),
-    /* Kokiri sword  */ DMG_ENTRY(1, RR_DMG_NORMAL),
-    /* Master sword  */ DMG_ENTRY(2, RR_DMG_NORMAL),
-    /* Giant's Knife */ DMG_ENTRY(4, RR_DMG_NORMAL),
-    /* Fire arrow    */ DMG_ENTRY(4, RR_DMG_FIRE),
-    /* Ice arrow     */ DMG_ENTRY(4, RR_DMG_ICE),
-    /* Light arrow   */ DMG_ENTRY(15, RR_DMG_LIGHT_ARROW),
-    /* Unk arrow 1   */ DMG_ENTRY(4, RR_DMG_WIND_ARROW),
-    /* Unk arrow 2   */ DMG_ENTRY(15, RR_DMG_SHDW_ARROW),
-    /* Unk arrow 3   */ DMG_ENTRY(15, RR_DMG_SPRT_ARROW),
-    /* Fire magic    */ DMG_ENTRY(4, RR_DMG_FIRE),
-    /* Ice magic     */ DMG_ENTRY(3, RR_DMG_ICE),
-    /* Light magic   */ DMG_ENTRY(10, RR_DMG_LIGHT_MAGIC),
-    /* Shield        */ DMG_ENTRY(0, RR_DMG_NONE),
-    /* Mirror Ray    */ DMG_ENTRY(0, RR_DMG_NONE),
-    /* Kokiri spin   */ DMG_ENTRY(1, RR_DMG_NORMAL),
-    /* Giant spin    */ DMG_ENTRY(4, RR_DMG_NORMAL),
-    /* Master spin   */ DMG_ENTRY(2, RR_DMG_NORMAL),
-    /* Kokiri jump   */ DMG_ENTRY(2, RR_DMG_NORMAL),
-    /* Giant jump    */ DMG_ENTRY(8, RR_DMG_NORMAL),
-    /* Master jump   */ DMG_ENTRY(4, RR_DMG_NORMAL),
-    /* Unknown 1     */ DMG_ENTRY(10, RR_DMG_SPRT_ARROW),
-    /* Unblockable   */ DMG_ENTRY(0, RR_DMG_NONE),
-    /* Hammer jump   */ DMG_ENTRY(0, RR_DMG_NONE),
-    /* Unknown 2     */ DMG_ENTRY(0, RR_DMG_NONE),
+    /* Deku nut      */ DMG_ENTRY(0, RR_DMG_REACT_NONE),
+    /* Deku stick    */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL),
+    /* Slingshot     */ DMG_ENTRY(1, RR_DMG_REACT_NORMAL),
+    /* Explosive     */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL),
+    /* Boomerang     */ DMG_ENTRY(0, RR_DMG_REACT_STUN),
+    /* Normal arrow  */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL),
+    /* Hammer swing  */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL),
+    /* Hookshot      */ DMG_ENTRY(0, RR_DMG_REACT_STUN),
+    /* Kokiri sword  */ DMG_ENTRY(1, RR_DMG_REACT_NORMAL),
+    /* Master sword  */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL),
+    /* Giant's Knife */ DMG_ENTRY(4, RR_DMG_REACT_NORMAL),
+    /* Fire arrow    */ DMG_ENTRY(4, RR_DMG_REACT_FIRE),
+    /* Ice arrow     */ DMG_ENTRY(4, RR_DMG_REACT_ICE),
+    /* Light arrow   */ DMG_ENTRY(15, RR_DMG_REACT_LIGHT_ARROW),
+    /* Unk arrow 1   */ DMG_ENTRY(4, RR_DMG_REACT_WIND_ARROW),
+    /* Unk arrow 2   */ DMG_ENTRY(15, RR_DMG_REACT_SHDW_ARROW),
+    /* Unk arrow 3   */ DMG_ENTRY(15, RR_DMG_REACT_SPRT_ARROW),
+    /* Fire magic    */ DMG_ENTRY(4, RR_DMG_REACT_FIRE),
+    /* Ice magic     */ DMG_ENTRY(3, RR_DMG_REACT_ICE),
+    /* Light magic   */ DMG_ENTRY(10, RR_DMG_REACT_LIGHT_MAGIC),
+    /* Shield        */ DMG_ENTRY(0, RR_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, RR_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(1, RR_DMG_REACT_NORMAL),
+    /* Giant spin    */ DMG_ENTRY(4, RR_DMG_REACT_NORMAL),
+    /* Master spin   */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL),
+    /* Kokiri jump   */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL),
+    /* Giant jump    */ DMG_ENTRY(8, RR_DMG_REACT_NORMAL),
+    /* Master jump   */ DMG_ENTRY(4, RR_DMG_REACT_NORMAL),
+    /* Unknown 1     */ DMG_ENTRY(10, RR_DMG_REACT_SPRT_ARROW),
+    /* Unblockable   */ DMG_ENTRY(0, RR_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(0, RR_DMG_REACT_NONE),
+    /* Unknown 2     */ DMG_ENTRY(0, RR_DMG_REACT_NONE),
 };
 
 static InitChainEntry sInitChain[] = {
@@ -438,8 +438,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) {
 
     if (this->collider2.base.acFlags & AC_HIT) {
         this->collider2.base.acFlags &= ~AC_HIT;
-        // "Kakin" (not sure what this means)
-        PRINTF(VT_FGCOL(GREEN) "カキン(%d)！！" VT_RST "\n", this->frameCount);
+        PRINTF(VT_FGCOL(GREEN) T("カキン(%d)！！", "Kakin (%d)!!") VT_RST "\n", this->frameCount);
         hitPos.x = this->collider2.elem.acDmgInfo.hitPos.x;
         hitPos.y = this->collider2.elem.acDmgInfo.hitPos.y;
         hitPos.z = this->collider2.elem.acDmgInfo.hitPos.z;
@@ -449,30 +448,30 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) {
             u8 dropType = RR_DROP_RANDOM_RUPEE;
 
             this->collider1.base.acFlags &= ~AC_HIT;
-            if (this->actor.colChkInfo.damageEffect != 0) {
+            if (this->actor.colChkInfo.damageReaction != 0) {
                 hitPos.x = this->collider1.elem.acDmgInfo.hitPos.x;
                 hitPos.y = this->collider1.elem.acDmgInfo.hitPos.y;
                 hitPos.z = this->collider1.elem.acDmgInfo.hitPos.z;
                 CollisionCheck_BlueBlood(play, NULL, &hitPos);
             }
-            switch (this->actor.colChkInfo.damageEffect) {
-                case RR_DMG_LIGHT_ARROW:
+            switch (this->actor.colChkInfo.damageReaction) {
+                case RR_DMG_REACT_LIGHT_ARROW:
                     dropType++; // purple rupee
                     FALLTHROUGH;
-                case RR_DMG_SHDW_ARROW:
+                case RR_DMG_REACT_SHDW_ARROW:
                     dropType++; // flexible
                     FALLTHROUGH;
-                case RR_DMG_WIND_ARROW:
+                case RR_DMG_REACT_WIND_ARROW:
                     dropType++; // arrow
                     FALLTHROUGH;
-                case RR_DMG_SPRT_ARROW:
+                case RR_DMG_REACT_SPRT_ARROW:
                     dropType++; // magic jar
                     FALLTHROUGH;
-                case RR_DMG_NORMAL:
+                case RR_DMG_REACT_NORMAL:
                     PRINTF(VT_FGCOL(RED) T("いてっ( %d : LIFE %d : DAMAGE %d : %x )！！",
                                            "ouch ( %d : LIFE %d : DAMAGE %d : %x )!!") VT_RST "\n",
                            this->frameCount, this->actor.colChkInfo.health, this->actor.colChkInfo.damage,
-                           this->actor.colChkInfo.damageEffect);
+                           this->actor.colChkInfo.damageReaction);
                     this->stopScroll = false;
                     Actor_ApplyDamage(&this->actor);
                     this->invincibilityTimer = 40;
@@ -487,7 +486,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) {
                         EnRr_SetupDeath(this);
                     }
                     return;
-                case RR_DMG_FIRE: // Fire Arrow and Din's Fire
+                case RR_DMG_REACT_FIRE: // Fire Arrow and Din's Fire
                     Actor_ApplyDamage(&this->actor);
                     if (this->actor.colChkInfo.health == 0) {
                         this->dropType = RR_DROP_RANDOM_RUPEE;
@@ -496,7 +495,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) {
                     this->effectTimer = 20;
                     EnRr_SetupStunned(this);
                     return;
-                case RR_DMG_ICE: // Ice Arrow and unused ice magic
+                case RR_DMG_REACT_ICE: // Ice Arrow and unused ice magic
                     Actor_ApplyDamage(&this->actor);
                     if (this->actor.colChkInfo.health == 0) {
                         this->dropType = RR_DROP_RANDOM_RUPEE;
@@ -513,7 +512,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) {
 #endif
                     EnRr_SetupStunned(this);
                     return;
-                case RR_DMG_LIGHT_MAGIC: // Unused light magic
+                case RR_DMG_REACT_LIGHT_MAGIC: // Unused light magic
                     Actor_ApplyDamage(&this->actor);
                     if (this->actor.colChkInfo.health == 0) {
                         this->dropType = RR_DROP_RUPEE_RED;
@@ -521,7 +520,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) {
                     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 255, COLORFILTER_BUFFLAG_XLU, 80);
                     EnRr_SetupStunned(this);
                     return;
-                case RR_DMG_STUN: // Boomerang and Hookshot
+                case RR_DMG_REACT_STUN: // Boomerang and Hookshot
                     Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
                     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_XLU, 80);
                     EnRr_SetupStunned(this);
diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.h b/src/overlays/actors/ovl_En_Rr/z_en_rr.h
index f0ed5b5c30..e39d79d160 100644
--- a/src/overlays/actors/ovl_En_Rr/z_en_rr.h
+++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.h
@@ -2,7 +2,7 @@
 #define Z_EN_RR_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnRr;
 
diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
index 0e4573f90d..aea5f9ba2e 100644
--- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
+++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
@@ -22,11 +22,11 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ru1/object_ru1.h"
 
@@ -90,7 +90,14 @@ void EnRu1_DrawNothing(EnRu1* this, PlayState* play);
 void EnRu1_DrawOpa(EnRu1* this, PlayState* play);
 void EnRu1_DrawXlu(EnRu1* this, PlayState* play);
 
-static ColliderCylinderInitType1 sCylinderInit1 = {
+typedef enum EnRu1WaterState {
+    /* 0 */ ENRU1_WATER_OUTSIDE,
+    /* 1 */ ENRU1_WATER_IMMERSED,
+    /* 2 */ ENRU1_WATER_BOBBING,
+    /* 3 */ ENRU1_WATER_SINKING,
+} EnRu1WaterState;
+
+static ColliderCylinderInitType1 sStandingCylinderInit = {
     {
         COL_MATERIAL_HIT0,
         AT_NONE,
@@ -102,7 +109,7 @@ static ColliderCylinderInitType1 sCylinderInit1 = {
     { 25, 80, 0, { 0 } },
 };
 
-static ColliderCylinderInitType1 sCylinderInit2 = {
+static ColliderCylinderInitType1 sSittingCylinderInit = {
     {
         COL_MATERIAL_HIT0,
         AT_ON | AT_TYPE_PLAYER,
@@ -165,60 +172,60 @@ ActorProfile En_Ru1_Profile = {
     /**/ EnRu1_Draw,
 };
 
-void func_80AEAC10(EnRu1* this, PlayState* play) {
+void EnRu1_UpdateStandingOC(EnRu1* this, PlayState* play) {
     s32 pad[5];
 
-    Collider_UpdateCylinder(&this->actor, &this->collider);
-    CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
+    Collider_UpdateCylinder(&this->actor, &this->standingCollider);
+    CollisionCheck_SetOC(play, &play->colChkCtx, &this->standingCollider.base);
 }
 
-void func_80AEAC54(EnRu1* this, PlayState* play) {
+void EnRu1_UpdateSittingOC(EnRu1* this, PlayState* play) {
     s32 pad[5];
 
-    Collider_UpdateCylinder(&this->actor, &this->collider2);
-    if (this->unk_34C != 0) {
-        CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider2.base);
+    Collider_UpdateCylinder(&this->actor, &this->sittingCollider);
+    if (this->isSittingOCActive) {
+        CollisionCheck_SetOC(play, &play->colChkCtx, &this->sittingCollider.base);
     } else if (this->actor.xzDistToPlayer > 32.0f) {
-        this->unk_34C = 1;
+        this->isSittingOCActive = true;
     }
 }
 
-void func_80AEACDC(EnRu1* this, PlayState* play) {
+void EnRu1_UpdateSittingAT(EnRu1* this, PlayState* play) {
     s32 pad[5];
 
-    Collider_UpdateCylinder(&this->actor, &this->collider2);
-    CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider2.base);
+    Collider_UpdateCylinder(&this->actor, &this->sittingCollider);
+    CollisionCheck_SetAT(play, &play->colChkCtx, &this->sittingCollider.base);
 }
 
-void func_80AEAD20(Actor* thisx, PlayState* play) {
+void EnRu1_InitColliders(Actor* thisx, PlayState* play) {
     EnRu1* this = (EnRu1*)thisx;
 
-    Collider_InitCylinder(play, &this->collider);
-    Collider_SetCylinderType1(play, &this->collider, &this->actor, &sCylinderInit1);
+    Collider_InitCylinder(play, &this->standingCollider);
+    Collider_SetCylinderType1(play, &this->standingCollider, &this->actor, &sStandingCylinderInit);
 
-    Collider_InitCylinder(play, &this->collider2);
-    Collider_SetCylinderType1(play, &this->collider2, &this->actor, &sCylinderInit2);
+    Collider_InitCylinder(play, &this->sittingCollider);
+    Collider_SetCylinderType1(play, &this->sittingCollider, &this->actor, &sSittingCylinderInit);
 }
 
 void EnRu1_DestroyColliders(EnRu1* this, PlayState* play) {
-    Collider_DestroyCylinder(play, &this->collider);
-    Collider_DestroyCylinder(play, &this->collider2);
+    Collider_DestroyCylinder(play, &this->standingCollider);
+    Collider_DestroyCylinder(play, &this->sittingCollider);
 }
 
-void func_80AEADD8(EnRu1* this) {
-    this->unk_34C = 0;
+void EnRu1_DisableSittingOC(EnRu1* this) {
+    this->isSittingOCActive = false;
 }
 
-u8 func_80AEADE0(EnRu1* this) {
-    u8 params = PARAMS_GET_U(this->actor.params, 8, 8);
+u8 EnRu1_GetSwitchFlag(EnRu1* this) {
+    u8 switchFlag = ENRU1_SWITCH_FLAG(&this->actor);
 
-    return params;
+    return switchFlag;
 }
 
-u8 func_80AEADF0(EnRu1* this) {
-    u8 params = PARAMS_GET_U(this->actor.params, 0, 8);
+u8 EnRu1_GetType(EnRu1* this) {
+    u8 type = ENRU1_TYPE(&this->actor);
 
-    return params;
+    return type;
 }
 
 void EnRu1_Destroy(Actor* thisx, PlayState* play) {
@@ -313,7 +320,7 @@ s32 func_80AEB020(EnRu1* this, PlayState* play) {
     return false;
 }
 
-BgBdanObjects* EnRu1_FindSwitch(PlayState* play) {
+BgBdanObjects* EnRu1_FindBigOctoPlatform(PlayState* play) {
     Actor* actorIt = play->actorCtx.actorLists[ACTORCAT_BG].head;
 
     while (actorIt != NULL) {
@@ -327,15 +334,15 @@ BgBdanObjects* EnRu1_FindSwitch(PlayState* play) {
     return NULL;
 }
 
-void func_80AEB0EC(EnRu1* this, s32 cameraSetting) {
-    if (this->unk_28C != NULL) {
-        this->unk_28C->cameraSetting = cameraSetting;
+void EnRu1_SetPlatformCamSetting(EnRu1* this, s32 cameraSetting) {
+    if (this->bigOctoPlatform != NULL) {
+        this->bigOctoPlatform->cameraSetting = cameraSetting;
     }
 }
 
-s32 func_80AEB104(EnRu1* this) {
-    if (this->unk_28C != NULL) {
-        return this->unk_28C->cameraSetting;
+s32 EnRu1_GetPlatformCamSetting(EnRu1* this) {
+    if (this->bigOctoPlatform != NULL) {
+        return this->bigOctoPlatform->cameraSetting;
     } else {
         return 0;
     }
@@ -371,7 +378,7 @@ void func_80AEB1D8(EnRu1* this) {
     this->actor.speed = 0.0f;
     this->actor.gravity = 0.0f;
     this->actor.minVelocityY = 0.0f;
-    func_80AEB0EC(this, 0);
+    EnRu1_SetPlatformCamSetting(this, 0);
 }
 
 void func_80AEB220(EnRu1* this, PlayState* play) {
@@ -381,25 +388,25 @@ void func_80AEB220(EnRu1* this, PlayState* play) {
 }
 #endif
 
-void func_80AEB264(EnRu1* this, AnimationHeader* animation, u8 arg2, f32 morphFrames, s32 arg4) {
+void EnRu1_AnimationChange(EnRu1* this, AnimationHeader* animation, u8 mode, f32 morphFrames, s32 playReversed) {
     s32 pad[2];
     AnimationHeader* animHeader = SEGMENTED_TO_VIRTUAL(animation);
     f32 frameCount = Animation_GetLastFrame(animHeader);
     f32 playbackSpeed;
-    f32 unk0;
-    f32 fc;
+    f32 startFrame;
+    f32 endFrame;
 
-    if (arg4 == 0) {
-        unk0 = 0.0f;
-        fc = frameCount;
+    if (!playReversed) {
+        startFrame = 0.0f;
+        endFrame = frameCount;
         playbackSpeed = 1.0f;
     } else {
-        unk0 = frameCount;
-        fc = 0.0f;
+        startFrame = frameCount;
+        endFrame = 0.0f;
         playbackSpeed = -1.0f;
     }
 
-    Animation_Change(&this->skelAnime, animHeader, playbackSpeed, unk0, fc, arg2, morphFrames);
+    Animation_Change(&this->skelAnime, animHeader, playbackSpeed, startFrame, endFrame, mode, morphFrames);
 }
 
 s32 EnRu1_UpdateSkelAnime(EnRu1* this) {
@@ -425,8 +432,8 @@ void func_80AEB3CC(EnRu1* this) {
     this->skelAnime.movementFlags &= ~ANIM_FLAG_UPDATE_XZ;
 }
 
-void func_80AEB3DC(EnRu1* this, PlayState* play) {
-    func_80AEB264(this, &gRutoChildWaitHandsBehindBackAnim, 0, 0, 0);
+void EnRu1_InitOutsideJabuJabu(EnRu1* this, PlayState* play) {
+    EnRu1_AnimationChange(this, &gRutoChildWaitHandsBehindBackAnim, ANIMMODE_LOOP, 0, false);
     this->action = 0;
     this->drawConfig = 1;
     EnRu1_SetEyeIndex(this, 4);
@@ -645,10 +652,10 @@ void func_80AEBD94(EnRu1* this, PlayState* play) {
     f32 frameCount;
 
     if (func_80AEB480(play, 3)) {
-        frameCount = Animation_GetLastFrame(&gRutoChildAnim_009060);
+        frameCount = Animation_GetLastFrame(&gRutoChildResurfaceAnim);
         func_80AEB934(this, play);
         func_80AEB738(this, play);
-        Animation_Change(&this->skelAnime, &gRutoChildAnim_009060, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, 0.0f);
+        Animation_Change(&this->skelAnime, &gRutoChildResurfaceAnim, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, 0.0f);
         this->action = 2;
         this->drawConfig = 1;
     }
@@ -782,16 +789,16 @@ void func_80AEC2C0(EnRu1* this, PlayState* play) {
     func_80AEC070(this, play, something);
 }
 
-void func_80AEC320(EnRu1* this, PlayState* play) {
+void EnRu1_InitInJabuJabuHolesRoom(EnRu1* this, PlayState* play) {
     if (!GET_INFTABLE(INFTABLE_141)) {
-        func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0);
+        EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false);
         this->action = 7;
         EnRu1_SetMouthIndex(this, 1);
     } else if (GET_INFTABLE(INFTABLE_147) && !GET_INFTABLE(INFTABLE_140) && !GET_INFTABLE(INFTABLE_145)) {
         if (!func_80AEB020(this, play)) {
             s8 actorRoom;
 
-            func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0);
+            EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false);
             actorRoom = this->actor.room;
             this->action = 22;
             this->actor.room = -1;
@@ -1027,8 +1034,8 @@ void func_80AECCB0(EnRu1* this, PlayState* play) {
                                                     spawnY, spawnZ, 0, yawTowardsPlayer, 0, WARP_BLUE_RUTO);
 }
 
-void func_80AECDA0(EnRu1* this, PlayState* play) {
-    func_80AEB264(this, &gRutoChildWaitHandsOnHipsAnim, 0, 0, 0);
+void EnRu1_InitInBossRoom(EnRu1* this, PlayState* play) {
+    EnRu1_AnimationChange(this, &gRutoChildWaitHandsOnHipsAnim, ANIMMODE_LOOP, 0, false);
     this->action = 15;
     this->actor.shape.yOffset = -10000.0f;
     EnRu1_SetEyeIndex(this, 5);
@@ -1193,13 +1200,13 @@ void func_80AED414(EnRu1* this, PlayState* play) {
     EnRu1_UpdateSkelAnime(this);
 }
 
-void func_80AED44C(EnRu1* this, PlayState* play) {
+void EnRu1_InitInJabuJabuBasement(EnRu1* this, PlayState* play) {
     if (GET_INFTABLE(INFTABLE_141) && !GET_INFTABLE(INFTABLE_145) && !GET_INFTABLE(INFTABLE_140) &&
         !GET_INFTABLE(INFTABLE_147)) {
         if (!func_80AEB020(this, play)) {
             s8 actorRoom;
 
-            func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0);
+            EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false);
             actorRoom = this->actor.room;
             this->action = 22;
             this->actor.room = -1;
@@ -1307,35 +1314,35 @@ void func_80AED83C(EnRu1* this) {
     Math_SmoothStepToS(&torsoRot->y, 0, 0x14, 0x1838, 0x64);
 }
 
-void func_80AED8DC(EnRu1* this) {
-    s32 temp_hi;
-    s16* unk_2AC = &this->unk_2AC;
+void EnRu1_UpdateHeadRotation(EnRu1* this) {
+    s32 headRotOffset;
+    s16* headRotTimer = &this->headRotTimer;
     s16* headRotY = &this->interactInfo.headRot.y;
-    s16* unk_29E = &this->unk_29E;
+    s16* headTurnSpeed = &this->headTurnSpeed;
     s32 pad[2];
 
-    if (DECR(*unk_2AC) == 0) {
-        *unk_2AC = Rand_S16Offset(0xA, 0x19);
-        temp_hi = *unk_2AC % 5;
-        if (temp_hi == 0) {
-            this->unk_2B0 = 1;
-        } else if (temp_hi == 1) {
-            this->unk_2B0 = 2;
+    if (DECR(*headRotTimer) == 0) {
+        *headRotTimer = Rand_S16Offset(0xA, 0x19);
+        headRotOffset = *headRotTimer % 5;
+        if (headRotOffset == 0) {
+            this->headRotDirection = 1;
+        } else if (headRotOffset == 1) {
+            this->headRotDirection = 2;
         } else {
-            this->unk_2B0 = 0;
+            this->headRotDirection = 0;
         }
-        *unk_29E = 0;
+        *headTurnSpeed = 0;
     }
 
-    if (this->unk_2B0 == 0) {
-        Math_SmoothStepToS(unk_29E, 0 - *headRotY, 1, 0x190, 0x190);
-        Math_SmoothStepToS(headRotY, 0, 3, ABS(*unk_29E), 0x64);
-    } else if (this->unk_2B0 == 1) {
-        Math_SmoothStepToS(unk_29E, -0x2AAA - *headRotY, 1, 0x190, 0x190);
-        Math_SmoothStepToS(headRotY, -0x2AAA, 3, ABS(*unk_29E), 0x64);
+    if (this->headRotDirection == 0) {
+        Math_SmoothStepToS(headTurnSpeed, 0 - *headRotY, 1, 0x190, 0x190);
+        Math_SmoothStepToS(headRotY, 0, 3, ABS(*headTurnSpeed), 0x64);
+    } else if (this->headRotDirection == 1) {
+        Math_SmoothStepToS(headTurnSpeed, -0x2AAA - *headRotY, 1, 0x190, 0x190);
+        Math_SmoothStepToS(headRotY, -0x2AAA, 3, ABS(*headTurnSpeed), 0x64);
     } else {
-        Math_SmoothStepToS(unk_29E, 0x2AAA - *headRotY, 1, 0x190, 0x190);
-        Math_SmoothStepToS(headRotY, 0x2AAA, 3, ABS(*unk_29E), 0x64);
+        Math_SmoothStepToS(headTurnSpeed, 0x2AAA - *headRotY, 1, 0x190, 0x190);
+        Math_SmoothStepToS(headRotY, 0x2AAA, 3, ABS(*headTurnSpeed), 0x64);
     }
 }
 
@@ -1470,20 +1477,22 @@ void func_80AEE02C(EnRu1* this) {
     this->actor.minVelocityY = 0.0f;
 }
 
-void func_80AEE050(EnRu1* this) {
+void EnRu1_UpdateWaterState(EnRu1* this) {
     s32 pad;
-    f32 sp28;
-    f32 sp24;
+    f32 bobMagnitude;
+    f32 startY;
     EnRu1* thisx = this; // necessary to match
 
-    if (this->unk_350 == 0) {
+    if (this->waterState == ENRU1_WATER_OUTSIDE) {
         if ((this->actor.minVelocityY == 0.0f) && (this->actor.speed == 0.0f)) {
-            this->unk_350 = 1;
+            // When Ruto's velocity has been slowed enough by the water, stop her motion
+            this->waterState = ENRU1_WATER_IMMERSED;
             func_80AEE02C(this);
-            this->unk_35C = 0;
-            this->unk_358 = (this->actor.depthInWater - 10.0f) * 0.5f;
-            this->unk_354 = this->actor.world.pos.y + thisx->unk_358; // thisx only used here
+            this->bobPhase = 0;
+            this->bobDepth = (this->actor.depthInWater - 10.0f) * 0.5f;
+            this->sinkingStartPosY = this->actor.world.pos.y + thisx->bobDepth;
         } else {
+            // Ruto is touching the water but still in motion, e.g. from being thrown
             this->actor.gravity = 0.0f;
             this->actor.minVelocityY *= 0.2f;
             this->actor.velocity.y *= 0.2f;
@@ -1500,25 +1509,25 @@ void func_80AEE050(EnRu1* this) {
             Actor_UpdatePos(&this->actor);
         }
     } else {
-        if (this->unk_350 == 1) {
-            if (this->unk_358 <= 1.0f) {
+        if (this->waterState == ENRU1_WATER_IMMERSED) {
+            if (this->bobDepth <= 1.0f) {
                 func_80AEE02C(this);
-                this->unk_350 = 2;
-                this->unk_360 = 0.0f;
+                this->waterState = ENRU1_WATER_BOBBING;
+                this->isSinking = 0.0f;
             } else {
-                f32 temp_f10;
+                f32 deltaY;
 
-                sp28 = this->unk_358;
-                sp24 = this->unk_354;
-                temp_f10 = Math_CosS(this->unk_35C) * -sp28;
-                this->actor.world.pos.y = temp_f10 + sp24;
-                this->unk_35C += 0x3E8;
-                this->unk_358 *= 0.95f;
+                bobMagnitude = this->bobDepth;
+                startY = this->sinkingStartPosY;
+                deltaY = Math_CosS(this->bobPhase) * -bobMagnitude;
+                this->actor.world.pos.y = deltaY + startY;
+                this->bobPhase += 0x3E8;
+                this->bobDepth *= 0.95f;
             }
         } else {
-            this->unk_360 += 1.0f;
-            if (this->unk_360 > 0.0f) {
-                this->unk_350 = 3;
+            this->isSinking += 1.0f;
+            if (this->isSinking > 0.0f) {
+                this->waterState = ENRU1_WATER_SINKING;
             }
         }
     }
@@ -1576,7 +1585,7 @@ s32 func_80AEE394(EnRu1* this, PlayState* play) {
             gSaveContext.cutsceneTrigger = 1;
             this->action = 36;
             this->drawConfig = 0;
-            this->unk_28C = (BgBdanObjects*)dynaPolyActor;
+            this->bigOctoPlatform = (BgBdanObjects*)dynaPolyActor;
             this->actor.shape.shadowAlpha = 0;
             return true;
         }
@@ -1610,13 +1619,13 @@ void func_80AEE568(EnRu1* this, PlayState* play) {
             func_80AEE02C(this);
             Actor_OfferCarry(&this->actor, play);
             this->action = 27;
-            func_80AEADD8(this);
+            EnRu1_DisableSittingOC(this);
             return;
         }
 
         if (this->actor.depthInWater > 0.0f) {
             this->action = 29;
-            this->unk_350 = 0;
+            this->waterState = ENRU1_WATER_OUTSIDE;
         }
     }
 }
@@ -1655,10 +1664,10 @@ s32 func_80AEE6D0(EnRu1* this, PlayState* play) {
     return false;
 }
 
-void func_80AEE7C4(EnRu1* this, PlayState* play) {
+void EnRu1_UpdateCarriedBehavior(EnRu1* this, PlayState* play) {
     s32 pad[9];
     Player* player;
-    f32* unk_370 = &this->unk_370;
+    f32* carryIdleTimer = &this->carryIdleTimer;
 
     if (Actor_HasNoParent(&this->actor, play)) {
         f32 frameCount = Animation_GetLastFrame(&gRutoChildSittingAnim);
@@ -1671,17 +1680,17 @@ void func_80AEE7C4(EnRu1* this, PlayState* play) {
         this->actor.gravity = -((kREG(23) * 0.01f) + 1.3f);
         func_80AED57C(this);
         this->action = 28;
-        *unk_370 = 0.0f;
+        *carryIdleTimer = 0.0f;
     } else if (func_80AEE6D0(this, play)) {
         s32 pad;
 
-        *unk_370 = 0.0f;
+        *carryIdleTimer = 0.0f;
     } else {
         player = GET_PLAYER(play);
         if (player->stateFlags2 & PLAYER_STATE2_IDLE_FIDGET) {
-            this->unk_370 += 1.0f;
+            this->carryIdleTimer += 1.0f;
             if (this->action != 32) {
-                if (*unk_370 > 30.0f) {
+                if (*carryIdleTimer > 30.0f) {
                     if (Rand_S16Offset(0, 3) == 0) {
                         f32 frameCount = Animation_GetLastFrame(&gRutoChildSquirmAnim);
 
@@ -1690,42 +1699,42 @@ void func_80AEE7C4(EnRu1* this, PlayState* play) {
                         func_80AED5DC(this);
                         this->action = 32;
                     }
-                    *unk_370 = 0.0f;
+                    *carryIdleTimer = 0.0f;
                 }
             } else {
-                if (*unk_370 > 50.0f) {
+                if (*carryIdleTimer > 50.0f) {
                     f32 frameCount = Animation_GetLastFrame(&gRutoChildSittingAnim);
 
                     Animation_Change(&this->skelAnime, &gRutoChildSittingAnim, 1.0f, 0, frameCount, ANIMMODE_LOOP,
                                      -8.0f);
                     this->action = 31;
-                    *unk_370 = 0.0f;
+                    *carryIdleTimer = 0.0f;
                 }
             }
         } else {
             f32 frameCount = Animation_GetLastFrame(&gRutoChildSittingAnim);
 
             Animation_Change(&this->skelAnime, &gRutoChildSittingAnim, 1.0f, 0, frameCount, ANIMMODE_LOOP, -8.0f);
-            *unk_370 = 0.0f;
+            *carryIdleTimer = 0.0f;
         }
     }
 }
 
-s32 func_80AEEAC8(EnRu1* this, PlayState* play) {
+s32 EnRu1_CheckHitBottomUnderwater(EnRu1* this, PlayState* play) {
     if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) {
         s32 pad;
 
         func_80AEE02C(this);
         Actor_OfferCarry(&this->actor, play);
         this->action = 27;
-        func_80AEADD8(this);
+        EnRu1_DisableSittingOC(this);
         return true;
     }
     return false;
 }
 
-void func_80AEEB24(EnRu1* this, PlayState* play) {
-    if ((func_80AEEAC8(this, play) == 0) && (this->unk_350 == 3)) {
+void EnRu1_CheckSinkingState(EnRu1* this, PlayState* play) {
+    if ((EnRu1_CheckHitBottomUnderwater(this, play) == 0) && (this->waterState == ENRU1_WATER_SINKING)) {
         this->action = 30;
         func_80AEE02C(this);
         this->actor.gravity = -0.1f;
@@ -1739,7 +1748,7 @@ void func_80AEEBB4(EnRu1* this, PlayState* play) {
 
 void func_80AEEBD4(EnRu1* this, PlayState* play) {
     func_80AED83C(this);
-    func_80AEAC54(this, play);
+    EnRu1_UpdateSittingOC(this, play);
     func_80AEAECC(this, play);
     EnRu1_UpdateSkelAnime(this);
     EnRu1_UpdateEyes(this);
@@ -1751,7 +1760,7 @@ void func_80AEEBD4(EnRu1* this, PlayState* play) {
 
 void func_80AEEC5C(EnRu1* this, PlayState* play) {
     func_80AED83C(this);
-    func_80AEACDC(this, play);
+    EnRu1_UpdateSittingAT(this, play);
     func_80AEAECC(this, play);
     func_80AEE2F8(this, play);
     func_80AEDFF4(this, play);
@@ -1765,10 +1774,10 @@ void func_80AEEC5C(EnRu1* this, PlayState* play) {
 void func_80AEECF0(EnRu1* this, PlayState* play) {
     func_80AED83C(this);
     func_80AEAECC(this, play);
-    func_80AEE050(this);
+    EnRu1_UpdateWaterState(this);
     EnRu1_UpdateSkelAnime(this);
     EnRu1_UpdateEyes(this);
-    func_80AEEB24(this, play);
+    EnRu1_CheckSinkingState(this, play);
     func_80AED624(this, play);
 }
 
@@ -1778,19 +1787,19 @@ void func_80AEED58(EnRu1* this, PlayState* play) {
     Actor_MoveXZGravity(&this->actor);
     EnRu1_UpdateSkelAnime(this);
     EnRu1_UpdateEyes(this);
-    func_80AEEAC8(this, play);
+    EnRu1_CheckHitBottomUnderwater(this, play);
     func_80AED624(this, play);
     func_80AEDAE0(this, play);
 }
 
 void func_80AEEDCC(EnRu1* this, PlayState* play) {
-    func_80AED8DC(this);
+    EnRu1_UpdateHeadRotation(this);
     EnRu1_UpdateSkelAnime(this);
     func_80AEAECC(this, play);
     func_80AEE2F8(this, play);
     EnRu1_UpdateEyes(this);
     func_80AED6F8(play);
-    func_80AEE7C4(this, play);
+    EnRu1_UpdateCarriedBehavior(this, play);
 }
 
 void func_80AEEE34(EnRu1* this, PlayState* play) {
@@ -1800,7 +1809,7 @@ void func_80AEEE34(EnRu1* this, PlayState* play) {
     func_80AEE2F8(this, play);
     EnRu1_UpdateEyes(this);
     func_80AED6F8(play);
-    func_80AEE7C4(this, play);
+    EnRu1_UpdateCarriedBehavior(this, play);
 }
 
 void func_80AEEE9C(EnRu1* this, PlayState* play) {
@@ -1887,7 +1896,7 @@ void func_80AEF1F0(EnRu1* this, PlayState* play, UNK_TYPE arg2) {
         func_80AED6DC(this, play);
         Actor_OfferCarry(&this->actor, play);
         this->action = 27;
-        func_80AEADD8(this);
+        EnRu1_DisableSittingOC(this);
     }
 }
 
@@ -1907,7 +1916,7 @@ void func_80AEF2D0(EnRu1* this, PlayState* play) {
     func_80AEEF68(this, play);
     EnRu1_UpdateSkelAnime(this);
     EnRu1_UpdateEyes(this);
-    func_80AEAC10(this, play);
+    EnRu1_UpdateStandingOC(this, play);
     func_80AEAECC(this, play);
     cond = func_80AEE264(this, play);
     func_80AED624(this, play);
@@ -1958,11 +1967,11 @@ void func_80AEF51C(EnRu1* this) {
 }
 
 void func_80AEF540(EnRu1* this) {
-    if (func_80AEB104(this) == 2) {
+    if (EnRu1_GetPlatformCamSetting(this) == 2) {
         EnRu1_SetEyeIndex(this, 3);
         EnRu1_SetMouthIndex(this, 2);
         if (this->skelAnime.mode != 2) {
-            func_80AEB264(this, &gRutoChildShutterAnim, 2, -8.0f, 0);
+            EnRu1_AnimationChange(this, &gRutoChildShutterAnim, ANIMMODE_ONCE, -8.0f, false);
             func_80AEF51C(this);
         }
     }
@@ -2046,15 +2055,15 @@ void func_80AEF890(EnRu1* this, PlayState* play) {
     if (!(DEBUG_FEATURES && IS_CUTSCENE_LAYER) && EnRu1_IsCsStateIdle(play)) {
         curRoomNum = play->roomCtx.curRoom.num;
         SET_INFTABLE(INFTABLE_145);
-        Flags_SetSwitch(play, func_80AEADE0(this));
-        func_80AEB0EC(this, 1);
+        Flags_SetSwitch(play, EnRu1_GetSwitchFlag(this));
+        EnRu1_SetPlatformCamSetting(this, 1);
         this->action = 42;
         this->actor.room = curRoomNum;
     }
 }
 
 void func_80AEF930(EnRu1* this, PlayState* play) {
-    if (func_80AEB104(this) == 3) {
+    if (EnRu1_GetPlatformCamSetting(this) == 3) {
         this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY;
         this->actor.textId = 0x4048;
 #if !OOT_PAL_N64
@@ -2070,7 +2079,7 @@ void func_80AEF930(EnRu1* this, PlayState* play) {
 
 void func_80AEF99C(EnRu1* this, PlayState* play) {
     if (func_80AEB1B4(play) != 0) {
-        func_80AEB0EC(this, 4);
+        EnRu1_SetPlatformCamSetting(this, 4);
         Actor_Kill(&this->actor);
     }
 }
@@ -2149,14 +2158,14 @@ void func_80AEFC24(EnRu1* this, PlayState* play) {
     func_80AEF99C(this, play);
 }
 
-void func_80AEFC54(EnRu1* this, PlayState* play) {
+void EnRu1_InitInSapphireRoom(EnRu1* this, PlayState* play) {
     if (GET_INFTABLE(INFTABLE_145) && !GET_INFTABLE(INFTABLE_146)) {
         s32 pad;
 
-        func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0);
+        EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false);
         this->action = 41;
-        this->unk_28C = EnRu1_FindSwitch(play);
-        func_80AEB0EC(this, 1);
+        this->bigOctoPlatform = EnRu1_FindBigOctoPlatform(play);
+        EnRu1_SetPlatformCamSetting(this, 1);
         this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY);
     } else {
         Actor_Kill(&this->actor);
@@ -2164,17 +2173,17 @@ void func_80AEFC54(EnRu1* this, PlayState* play) {
 }
 
 void func_80AEFCE8(EnRu1* this, PlayState* play) {
-    this->unk_28C = EnRu1_FindSwitch(play);
-    if (this->unk_28C != NULL) {
+    this->bigOctoPlatform = EnRu1_FindBigOctoPlatform(play);
+    if (this->bigOctoPlatform != NULL) {
         this->action = 42;
         this->drawConfig = 1;
-        func_80AEB0EC(this, 1);
+        EnRu1_SetPlatformCamSetting(this, 1);
     }
 }
 
-void func_80AEFD38(EnRu1* this, PlayState* play) {
+void EnRu1_InitBesideKingZora(EnRu1* this, PlayState* play) {
     if (GET_EVENTCHKINF(EVENTCHKINF_37) && LINK_IS_CHILD) {
-        func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0);
+        EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false);
         this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED;
         this->action = 44;
         this->drawConfig = 1;
@@ -2220,7 +2229,7 @@ void func_80AEFECC(EnRu1* this, PlayState* play) {
     func_80AEEF68(this, play);
     EnRu1_UpdateSkelAnime(this);
     EnRu1_UpdateEyes(this);
-    func_80AEAC10(this, play);
+    EnRu1_UpdateStandingOC(this, play);
     func_80AEAECC(this, play);
     func_80AEFE84(this, play, func_80AEFDC0(this, play));
 }
@@ -2233,12 +2242,15 @@ void func_80AEFF40(EnRu1* this, PlayState* play) {
     func_80AEFE9C(this, play);
 }
 
-void func_80AEFF94(EnRu1* this, PlayState* play) {
+/**
+ * Places Ruto beside the door switch outside the room with the map.
+ */
+void EnRu1_InitBesideDoorSwitch(EnRu1* this, PlayState* play) {
     s8 actorRoom;
 
     if (GET_INFTABLE(INFTABLE_141) && GET_INFTABLE(INFTABLE_140) && !GET_INFTABLE(INFTABLE_145) &&
         (!(func_80AEB020(this, play)))) {
-        func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0);
+        EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false);
         actorRoom = this->actor.room;
         this->action = 22;
         this->actor.room = -1;
@@ -2255,10 +2267,10 @@ void func_80AEFF94(EnRu1* this, PlayState* play) {
 
 #if DEBUG_FEATURES
 void func_80AF0050(EnRu1* this, PlayState* play) {
-    func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0);
+    EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false);
     this->action = 36;
     this->roomNum1 = this->actor.room;
-    this->unk_28C = EnRu1_FindSwitch(play);
+    this->bigOctoPlatform = EnRu1_FindBigOctoPlatform(play);
     this->actor.room = -1;
 }
 #endif
@@ -2281,37 +2293,37 @@ void EnRu1_Init(Actor* thisx, PlayState* play) {
 
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
     SkelAnime_InitFlex(play, &this->skelAnime, &gRutoChildSkel, NULL, this->jointTable, this->morphTable, 17);
-    func_80AEAD20(&this->actor, play);
-    switch (func_80AEADF0(this)) {
-        case 0:
-            func_80AECDA0(this, play);
+    EnRu1_InitColliders(&this->actor, play);
+    switch (EnRu1_GetType(this)) {
+        case ENRU1_TYPE_BOSS_ROOM:
+            EnRu1_InitInBossRoom(this, play);
             break;
-        case 1:
-            func_80AEB3DC(this, play);
+        case ENRU1_TYPE_FOUNTAIN:
+            EnRu1_InitOutsideJabuJabu(this, play);
             break;
-        case 2:
-            func_80AEC320(this, play);
+        case ENRU1_TYPE_HOLES_ROOM:
+            EnRu1_InitInJabuJabuHolesRoom(this, play);
             break;
-        case 3:
-            func_80AED44C(this, play);
+        case ENRU1_TYPE_BASEMENT:
+            EnRu1_InitInJabuJabuBasement(this, play);
             break;
-        case 4:
-            func_80AEFC54(this, play);
+        case ENRU1_TYPE_SAPPHIRE_ROOM:
+            EnRu1_InitInSapphireRoom(this, play);
             break;
-        case 5:
-            func_80AEFD38(this, play);
+        case ENRU1_TYPE_BESIDE_KZ:
+            EnRu1_InitBesideKingZora(this, play);
             break;
-        case 6:
-            func_80AEFF94(this, play);
+        case ENRU1_TYPE_BESIDE_DOOR_SWITCH:
+            EnRu1_InitBesideDoorSwitch(this, play);
             break;
 #if DEBUG_FEATURES
-        case 10:
+        case ENRU1_TYPE_DEBUG:
             func_80AF0050(this, play);
             break;
 #endif
         default:
             Actor_Kill(&this->actor);
-            PRINTF(T("該当 arge_data = %d 無し\n", "Relevant arge_data = %d unacceptable\n"), func_80AEADF0(this));
+            PRINTF(T("該当 arge_data = %d 無し\n", "Relevant arge_data = %d unacceptable\n"), EnRu1_GetType(this));
             break;
     }
 }
diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
index 8778174ef5..80f1bccb13 100644
--- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
+++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
@@ -2,11 +2,14 @@
 #define Z_EN_RU1_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #include "overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 
+#define ENRU1_SWITCH_FLAG(thisx) PARAMS_GET_U((thisx)->params, 8, 8)
+#define ENRU1_TYPE(thisx) PARAMS_GET_U((thisx)->params, 0, 8)
+
 struct EnRu1;
 
 typedef void (*EnRu1ActionFunc)(struct EnRu1*, struct PlayState*);
@@ -33,41 +36,54 @@ typedef struct EnRu1 {
     /* 0x0285 */ s8 roomNum2;
     /* 0x0286 */ s8 roomNum3;
     /* 0x0288 */ f32 unk_288;
-    /* 0x028C */ BgBdanObjects* unk_28C;
+    /* 0x028C */ BgBdanObjects* bigOctoPlatform;
     /* 0x0290 */ s32 unk_290;
     /* 0x0294 */ char unk_294[0x4];
     /* 0x0298 */ s32 unk_298;
     /* 0x029C */ char unk_29C[0x2];
-    /* 0x029E */ s16 unk_29E;
+    /* 0x029E */ s16 headTurnSpeed;
     /* 0x02A0 */ char unk_2A0[0x4];
     /* 0x02A4 */ f32 unk_2A4;
     /* 0x02A8 */ s32 alpha;
-    /* 0x02AC */ s16 unk_2AC;
-    /* 0x02B0 */ s32 unk_2B0;
-    /* 0x02B4 */ ColliderCylinder collider;
-    /* 0x0300 */ ColliderCylinder collider2;
-    /* 0x034C */ s32 unk_34C;
-    /* 0x0350 */ s32 unk_350;
-    /* 0x0354 */ f32 unk_354;
-    /* 0x0358 */ f32 unk_358;
-    /* 0x035C */ s16 unk_35C;
-    /* 0x0360 */ f32 unk_360;
+    /* 0x02AC */ s16 headRotTimer;
+    /* 0x02B0 */ s32 headRotDirection;
+    /* 0x02B4 */ ColliderCylinder standingCollider;
+    /* 0x0300 */ ColliderCylinder sittingCollider;
+    /* 0x034C */ s32 isSittingOCActive;
+    /* 0x0350 */ s32 waterState;
+    /* 0x0354 */ f32 sinkingStartPosY;
+    /* 0x0358 */ f32 bobDepth;
+    /* 0x035C */ s16 bobPhase;
+    /* 0x0360 */ f32 isSinking;
     /* 0x0364 */ Vec3f unk_364;
-    /* 0x0370 */ f32 unk_370;
+    /* 0x0370 */ f32 carryIdleTimer;
     /* 0x0374 */ NpcInteractInfo interactInfo;
 } EnRu1; // size = 0x039C
 
+typedef enum EnRu1Type {
+    /*  0 */ ENRU1_TYPE_BOSS_ROOM,
+    /*  1 */ ENRU1_TYPE_FOUNTAIN,
+    /*  2 */ ENRU1_TYPE_HOLES_ROOM,
+    /*  3 */ ENRU1_TYPE_BASEMENT,
+    /*  4 */ ENRU1_TYPE_SAPPHIRE_ROOM,
+    /*  5 */ ENRU1_TYPE_BESIDE_KZ,
+    /*  6 */ ENRU1_TYPE_BESIDE_DOOR_SWITCH,
+#if DEBUG_FEATURES
+    /* 10 */ ENRU1_TYPE_DEBUG = 10,
+#endif
+} EnRu1Type;
+
 typedef enum RutoLimb {
-    /* 0 */ RUTO_CHILD_NONE,
-    /* 1 */ RUTO_CHILD_ROOT,
-    /* 2 */ RUTO_CHILD_LEFT_THIGH,
-    /* 3 */ RUTO_CHILD_LEFT_SHIN,
-    /* 4 */ RUTO_CHILD_LEFT_FOOT,
-    /* 5 */ RUTO_CHILD_RIGHT_THIGH,
-    /* 6 */ RUTO_CHILD_RIGHT_SHIN,
-    /* 7 */ RUTO_CHILD_RIGHT_FOOT,
-    /* 8 */ RUTO_CHILD_CHEST,
-    /* 9 */ RUTO_CHILD_LEFT_UPPER_ARM,
+    /*  0 */ RUTO_CHILD_NONE,
+    /*  1 */ RUTO_CHILD_ROOT,
+    /*  2 */ RUTO_CHILD_LEFT_THIGH,
+    /*  3 */ RUTO_CHILD_LEFT_SHIN,
+    /*  4 */ RUTO_CHILD_LEFT_FOOT,
+    /*  5 */ RUTO_CHILD_RIGHT_THIGH,
+    /*  6 */ RUTO_CHILD_RIGHT_SHIN,
+    /*  7 */ RUTO_CHILD_RIGHT_FOOT,
+    /*  8 */ RUTO_CHILD_CHEST,
+    /*  9 */ RUTO_CHILD_LEFT_UPPER_ARM,
     /* 10 */ RUTO_CHILD_LEFT_FIN,
     /* 11 */ RUTO_CHILD_LEFT_HAND,
     /* 12 */ RUTO_CHILD_RIGHT_UPPER_ARM,
diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c
index bce6bf6cac..32717457ef 100644
--- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c
+++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c
@@ -1,5 +1,5 @@
 #include "z_en_ru1.h"
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 static CutsceneData gRutoFirstMeetingCs[] = {
diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
index b6c7405a03..6e35bd842f 100644
--- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
+++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
@@ -19,10 +19,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ru2/object_ru2.h"
 
@@ -835,13 +835,11 @@ void EnRu2_DialogCameraHandler(EnRu2* this, PlayState* play) {
 
     if (dialogState == TEXT_STATE_DONE_FADING) {
         if (this->lastDialogState != TEXT_STATE_DONE_FADING) {
-            // "I'm Komatsu!" (cinema scene dev)
-            PRINTF("おれが小松だ！ \n");
+            PRINTF(T("おれが小松だ！ \n", "I'm Komatsu! \n")); // (cinema scene dev)
             this->textboxCount++;
             if (this->textboxCount % 6 == 3) {
                 player = GET_PLAYER(play);
-                // "uorya-!" (screeming sound)
-                PRINTF("うおりゃー！ \n");
+                PRINTF(T("うおりゃー！ \n", "uorya-! \n")); // (screaming sound)
                 Camera_SetFinishedFlag(GET_ACTIVE_CAM(play));
                 player->actor.world.pos.x = 820.0f;
                 player->actor.world.pos.y = 0.0f;
diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
index ca051d1800..7b2b0ff2b1 100644
--- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
+++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
@@ -2,7 +2,7 @@
 #define Z_EN_RU2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #define ENRU2_GET_SWITCH_FLAG(thisx) PARAMS_GET_U(thisx->actor.params, 8, 8)
 #define ENRU2_GET_TYPE(thisx) PARAMS_GET_U(thisx->actor.params, 0, 8)
diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c
index 4efe6fb390..92b2634543 100644
--- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c
+++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c
@@ -1,5 +1,5 @@
 #include "z_en_ru2.h"
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 // clang-format off
 static CutsceneData gWaterMedallionCs[] = {
diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c
index fb834576fb..2f39fefa34 100644
--- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c
+++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c
@@ -7,10 +7,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_sa/object_sa.h"
 #include "assets/scenes/overworld/spot04/spot04_scene.h"
diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.h b/src/overlays/actors/ovl_En_Sa/z_en_sa.h
index 0132877731..1161b67ca4 100644
--- a/src/overlays/actors/ovl_En_Sa/z_en_sa.h
+++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.h
@@ -2,7 +2,7 @@
 #define Z_EN_SA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSa;
 
diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c
index 52e3134b6a..6ece8b50b5 100644
--- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c
+++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c
@@ -15,8 +15,8 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_sb/object_sb.h"
 
@@ -393,7 +393,7 @@ s32 EnSb_UpdateDamage(EnSb* this, PlayState* play) {
         tookDamage = false;
         this->collider.base.acFlags &= ~AC_HIT;
 
-        switch (this->actor.colChkInfo.damageEffect) {
+        switch (this->actor.colChkInfo.damageReaction) {
             case 14: // wind arrow
                 hitByWindArrow = true;
                 FALLTHROUGH;
diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.h b/src/overlays/actors/ovl_En_Sb/z_en_sb.h
index f2f0e42adb..e57381420d 100644
--- a/src/overlays/actors/ovl_En_Sb/z_en_sb.h
+++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.h
@@ -2,7 +2,7 @@
 #define Z_EN_SB_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSb;
 
diff --git a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c
index 425b30b8f4..3ba16d656c 100644
--- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c
+++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c
@@ -8,7 +8,7 @@
 
 #include "gfx.h"
 #include "gfx_setupdl.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS 0
 
diff --git a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h
index d1fcb16d90..b1925c1e80 100644
--- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h
+++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h
@@ -2,7 +2,7 @@
 #define Z_ITEM_SCENE_CHANGE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSceneChange;
 
diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c
index 7cec1579b8..1276b7f5ee 100644
--- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c
+++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c
@@ -11,8 +11,8 @@
 #include "printf.h"
 #include "regs.h"
 #include "sys_matrix.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.h b/src/overlays/actors/ovl_En_Sda/z_en_sda.h
index 27cba99665..bd9f623f7c 100644
--- a/src/overlays/actors/ovl_En_Sda/z_en_sda.h
+++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.h
@@ -2,7 +2,7 @@
 #define Z_EN_SDA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSda;
 
diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c
index 4e082fcd47..03ef38b658 100644
--- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c
+++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c
@@ -13,8 +13,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_shopnuts/object_shopnuts.h"
 
diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h
index 8bea3a0a68..32657cce02 100644
--- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h
+++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h
@@ -2,7 +2,7 @@
 #define Z_EN_SHOPNUTS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "assets/objects/object_shopnuts/object_shopnuts.h"
 
 struct EnShopnuts;
diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c
index b5bf27be16..f3894ac83b 100644
--- a/src/overlays/actors/ovl_En_Si/z_en_si.c
+++ b/src/overlays/actors/ovl_En_Si/z_en_si.c
@@ -8,11 +8,11 @@
 
 #include "sequence.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64draw.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "draw.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR)
 
diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.h b/src/overlays/actors/ovl_En_Si/z_en_si.h
index a4ec863028..6aa91c0f30 100644
--- a/src/overlays/actors/ovl_En_Si/z_en_si.h
+++ b/src/overlays/actors/ovl_En_Si/z_en_si.h
@@ -2,7 +2,7 @@
 #define Z_EN_SI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSi;
 
diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c
index ecdab8d5b2..b56bca6f67 100644
--- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c
+++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c
@@ -14,10 +14,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_siofuki/object_siofuki.h"
 
diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h
index 56a08bff6f..4804f961aa 100644
--- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h
+++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h
@@ -2,7 +2,7 @@
 #define Z_EN_SIOFUKI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum EnSiofukiType {
     /* 0x00 */ EN_SIOFUKI_RAISING,
diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c
index 52e521df9c..5d21c25fb4 100644
--- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c
+++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c
@@ -16,10 +16,10 @@
 #include "sys_math.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_skb/object_skb.h"
 
@@ -472,11 +472,11 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) {
     } else if (this->actionState >= SKB_BEHAVIOR_ATTACKING) {
         if (this->collider.base.acFlags & AC_HIT) {
             this->collider.base.acFlags &= ~AC_HIT;
-            if (this->actor.colChkInfo.damageEffect != 6) {
-                this->lastDamageEffect = this->actor.colChkInfo.damageEffect;
+            if (this->actor.colChkInfo.damageReaction != 6) {
+                this->lastDamageReaction = this->actor.colChkInfo.damageReaction;
                 Actor_SetDropFlag(&this->actor, &this->collider.elements[1].base, true);
                 this->setColliderAT = false;
-                if (this->actor.colChkInfo.damageEffect == 1) {
+                if (this->actor.colChkInfo.damageReaction == 1) {
                     if (this->actionState != SKB_BEHAVIOR_STUNNED) {
                         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA,
                                              80);
@@ -485,7 +485,7 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) {
                     }
                 } else {
                     colorFilterDuration = 8;
-                    if (this->actor.colChkInfo.damageEffect == 7) {
+                    if (this->actor.colChkInfo.damageReaction == 7) {
                         scale = this->actor.scale.y * 7500.0f;
                         for (i = 4; i >= 0; i--) {
                             flamePos = this->actor.world.pos;
@@ -504,8 +504,8 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) {
                     }
                     player = GET_PLAYER(play);
                     if (this->breakFlags == 0) {
-                        if ((this->actor.colChkInfo.damageEffect == 0xD) ||
-                            ((this->actor.colChkInfo.damageEffect == 0xE) &&
+                        if ((this->actor.colChkInfo.damageReaction == 0xD) ||
+                            ((this->actor.colChkInfo.damageReaction == 0xE) &&
                              ((player->meleeWeaponAnimation >= PLAYER_MWA_RIGHT_SLASH_1H &&
                                player->meleeWeaponAnimation <= PLAYER_MWA_LEFT_COMBO_2H) ||
                               (player->meleeWeaponAnimation == PLAYER_MWA_BACKSLASH_RIGHT ||
diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h
index dd96d9e16e..e40c049cfa 100644
--- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h
+++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h
@@ -2,7 +2,7 @@
 #define Z_EN_SKB_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSkb;
 
@@ -15,7 +15,7 @@ typedef struct EnSkb {
     /* 0x0208 */ Vec3s morphTable[20];
     /* 0x0280 */ u8 actionState;
     /* 0x0281 */ u8 setColliderAT;
-    /* 0x0282 */ u8 lastDamageEffect;
+    /* 0x0282 */ u8 lastDamageReaction;
     /* 0x0283 */ u8 breakFlags;
     /* 0x0284 */ EnSkbActionFunc actionFunc;
     /* 0x0288 */ s16 headlessYawOffset;
diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c
index 52b1c4ae3f..492b973735 100644
--- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c
+++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c
@@ -12,14 +12,14 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64debug_display.h"
-#include "z64face_reaction.h"
-#include "z64ocarina.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "debug_display.h"
+#include "face_reaction.h"
+#include "ocarina.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_skj/object_skj.h"
 
@@ -606,7 +606,7 @@ s32 EnSkj_CollisionCheck(EnSkj* this, PlayState* play) {
 
     if (!((this->unk_2D3 == 0) || (D_80B01EA0 != 0) || !(this->collider.base.acFlags & AC_HIT))) {
         this->collider.base.acFlags &= ~AC_HIT;
-        switch (this->actor.colChkInfo.damageEffect) {
+        switch (this->actor.colChkInfo.damageReaction) {
             case 0xF:
                 effectPos.x = this->collider.elem.acDmgInfo.hitPos.x;
                 effectPos.y = this->collider.elem.acDmgInfo.hitPos.y;
diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.h b/src/overlays/actors/ovl_En_Skj/z_en_skj.h
index 1d49c81c42..1a9ccda020 100644
--- a/src/overlays/actors/ovl_En_Skj/z_en_skj.h
+++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.h
@@ -2,7 +2,7 @@
 #define Z_EN_SKJ_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSkj;
 
diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c
index 91e9273054..11c33d8469 100644
--- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c
+++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c
@@ -10,7 +10,7 @@
 #include "gfx_setupdl.h"
 #include "ichain.h"
 #include "sys_matrix.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_skj/object_skj.h"
 
diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h
index 08ec8f4639..a58a37b933 100644
--- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h
+++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h
@@ -2,7 +2,7 @@
 #define Z_EN_SKJNEEDLE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSkjneedle;
 
diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
index 95abf52374..f3649fa697 100644
--- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
+++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
@@ -6,11 +6,11 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ssh/object_ssh.h"
 
diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h
index 741770cec5..fd056a0cc4 100644
--- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h
+++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h
@@ -2,7 +2,7 @@
 #define Z_EN_SSH_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSsh;
 
diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c
index d0e8f79ecc..f32ce0ba67 100644
--- a/src/overlays/actors/ovl_En_St/z_en_st.c
+++ b/src/overlays/actors/ovl_En_St/z_en_st.c
@@ -14,9 +14,9 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_st/object_st.h"
 
@@ -36,7 +36,13 @@ void EnSt_Die(EnSt* this, PlayState* play);
 void EnSt_BounceAround(EnSt* this, PlayState* play);
 void EnSt_FinishBouncing(EnSt* this, PlayState* play);
 
-#include "assets/overlays/ovl_En_St/ovl_En_St.c"
+static Vtx sSkulltulaUnusedVtx[] = {
+#include "assets/overlays/ovl_En_St/sSkulltulaUnusedVtx.inc.c"
+};
+
+static Gfx sSkulltulaUnusedDL[10] = {
+#include "assets/overlays/ovl_En_St/sSkulltulaUnusedDL.inc.c"
+};
 
 ActorProfile En_St_Profile = {
     /**/ ACTOR_EN_ST,
@@ -461,7 +467,7 @@ s32 EnSt_CheckHitBackside(EnSt* this, PlayState* play) {
     }
 
     this->invulnerableTimer = 8;
-    if (this->actor.colChkInfo.damageEffect == 1) {
+    if (this->actor.colChkInfo.damageReaction == 1) {
         if (this->stunTimer == 0) {
             Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
             this->stunTimer = 120;
diff --git a/src/overlays/actors/ovl_En_St/z_en_st.h b/src/overlays/actors/ovl_En_St/z_en_st.h
index 08e9e8bd8d..36ecd714d2 100644
--- a/src/overlays/actors/ovl_En_St/z_en_st.h
+++ b/src/overlays/actors/ovl_En_St/z_en_st.h
@@ -2,7 +2,7 @@
 #define Z_EN_ST_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSt;
 
diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c
index 58ee87f235..5cd96b9c63 100644
--- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c
+++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c
@@ -14,8 +14,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_ahg/object_ahg.h"
 #include "assets/objects/object_boj/object_boj.h"
diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.h b/src/overlays/actors/ovl_En_Sth/z_en_sth.h
index a135fea2aa..d63682a474 100644
--- a/src/overlays/actors/ovl_En_Sth/z_en_sth.h
+++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.h
@@ -2,7 +2,7 @@
 #define Z_EN_STH_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSth;
 
diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c
index 118328e793..c8c301cb2d 100644
--- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c
+++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c
@@ -13,8 +13,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_stream/object_stream.h"
 
diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.h b/src/overlays/actors/ovl_En_Stream/z_en_stream.h
index 0a21d54d84..e188cb1dca 100644
--- a/src/overlays/actors/ovl_En_Stream/z_en_stream.h
+++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.h
@@ -2,7 +2,7 @@
 #define Z_EN_STREAM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnStream;
 
diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c
index 8e10154c10..44a589c993 100644
--- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c
+++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c
@@ -10,10 +10,10 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_st/object_st.h"
 
diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.h b/src/overlays/actors/ovl_En_Sw/z_en_sw.h
index fe68092667..6a22eb7ba1 100644
--- a/src/overlays/actors/ovl_En_Sw/z_en_sw.h
+++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h
@@ -2,7 +2,7 @@
 #define Z_EN_SW_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSw;
 
diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
index 0dc3434660..045c8afbc0 100644
--- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
+++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
@@ -10,10 +10,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "debug_display.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
@@ -86,7 +86,7 @@ void EnSyatekiItm_Init(Actor* thisx, PlayState* play2) {
     this->man = (EnSyatekiMan*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_SYATEKI_MAN, 140.0f,
                                                   0.0f, 255.0f, 0, -0x4000, 0, 0);
     if (this->man == NULL) {
-        PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ エラー原 ☆☆☆☆ \n", "☆☆☆☆☆ Spawn error ☆☆☆☆ \n") VT_RST);
+        PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ エラー原 ☆☆☆☆ \n", "☆☆☆☆☆ Error -Hara ☆☆☆☆ \n") VT_RST);
         Actor_Kill(&this->actor);
         return;
     }
@@ -94,7 +94,7 @@ void EnSyatekiItm_Init(Actor* thisx, PlayState* play2) {
         this->markers[i] = (EnExRuppy*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_EX_RUPPY,
                                                           sRupeePos[i].x, sRupeePos[i].y, sRupeePos[i].z, 0, 0, 0, 4);
         if (this->markers[i] == NULL) {
-            PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ エラー原セカンド ☆☆☆☆ \n", "☆☆☆☆☆ Second spawn error ☆☆☆☆ \n") VT_RST);
+            PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ エラー原セカンド ☆☆☆☆ \n", "☆☆☆☆☆ Second error -Hara ☆☆☆☆ \n") VT_RST);
             Actor_Kill(&this->actor);
             return;
         }
@@ -245,7 +245,7 @@ void EnSyatekiItm_SpawnTargets(EnSyatekiItm* this, PlayState* play) {
                 &play->actorCtx, &this->actor, play, ACTOR_EN_G_SWITCH, this->targetHome[i].x, this->targetHome[i].y,
                 this->targetHome[i].z, 0, 0, 0, (ENGSWITCH_TARGET_RUPEE << 0xC) | 0x3F);
             if (this->targets[i] == NULL) {
-                PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ ルピーでエラー原 ☆☆☆☆ \n", "☆☆☆☆☆ Rupee spawn error ☆☆☆☆ \n") VT_RST);
+                PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ ルピーでエラー原 ☆☆☆☆ \n", "☆☆☆☆☆ Rupee error -Hara ☆☆☆☆ \n") VT_RST);
                 Actor_Kill(&this->actor);
                 return;
             }
diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h
index 46f54b7c79..fba3f9fac6 100644
--- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h
+++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h
@@ -2,7 +2,7 @@
 #define Z_EN_SYATEKI_ITM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSyatekiItm;
 
diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
index 5829aa68f1..3c983d700f 100644
--- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
@@ -11,9 +11,9 @@
 #include "sequence.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ossan/object_ossan.h"
 
diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
index 306c33104f..b17187573c 100644
--- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
+++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
@@ -2,7 +2,7 @@
 #define Z_EN_SYATEKI_MAN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSyatekiMan;
 
diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c
index 5eca8ac947..c01b1a22d2 100644
--- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c
+++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c
@@ -17,10 +17,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_niw/object_niw.h"
 
diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h
index 37db3e65fd..97ea786921 100644
--- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h
+++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h
@@ -2,7 +2,7 @@
 #define Z_EN_SYATEKI_NIW_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnSyatekiNiw;
 
diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c
index fd4f5b91c1..353cb507b4 100644
--- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c
+++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c
@@ -22,11 +22,11 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_ta/object_ta.h"
 
@@ -231,7 +231,8 @@ void EnTa_Init(Actor* thisx, PlayState* play2) {
                     this->actor.shape.shadowScale = 54.0f;
                 }
             } else if (play->sceneId == SCENE_LON_LON_BUILDINGS) {
-                PRINTF(VT_FGCOL(CYAN) " ロンロン牧場の倉庫 の タロン\n" VT_RST);
+                PRINTF(VT_FGCOL(CYAN) T(" ロンロン牧場の倉庫 の タロン\n", " Talon in the warehouse at Lon Lon Ranch\n")
+                           VT_RST);
                 if (!GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
                     Actor_Kill(&this->actor);
                 } else if (LINK_IS_ADULT) {
diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.h b/src/overlays/actors/ovl_En_Ta/z_en_ta.h
index d230c2b757..d8888d79b3 100644
--- a/src/overlays/actors/ovl_En_Ta/z_en_ta.h
+++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.h
@@ -2,7 +2,7 @@
 #define Z_EN_TA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnTa;
 
diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
index b61e51abdb..f087395369 100644
--- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
+++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
@@ -14,8 +14,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_ts/object_ts.h"
 
@@ -57,7 +57,7 @@ void EnTakaraMan_Init(Actor* thisx, PlayState* play) {
 
     if (sTakaraIsInitialized) {
         Actor_Kill(&this->actor);
-        PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n", "☆☆☆☆☆ Already initialized ☆☆☆☆☆ \n") VT_RST);
+        PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n", "☆☆☆☆☆ I'm already here -Hara ☆☆☆☆☆ \n") VT_RST);
         return;
     }
 
diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h
index e7d51c4b07..dbc0f80f45 100644
--- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h
+++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h
@@ -2,7 +2,7 @@
 #define Z_EN_TAKARA_MAN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnTakaraMan;
 
diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c
index ddb9e8d8d9..31df49fbc1 100644
--- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c
+++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c
@@ -11,7 +11,8 @@
 #include "printf.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64play.h"
+#include "translation.h"
+#include "play_state.h"
 
 #include "assets/objects/object_shop_dungen/object_shop_dungen.h"
 
@@ -40,8 +41,8 @@ ActorProfile En_Tana_Profile = {
 //! next data entry will be dereferenced and print garbage, stopping any future printing.
 //! In a non-matching context, this can cause a crash if the next item isn't a valid pointer.
 static const char* sShelfTypes[] = {
-    "木の棚", // "Wooden Shelves"
-    "石の棚", // "Stone Shelves"
+    T("木の棚", "Wooden shelf"),
+    T("石の棚", "Stone shelf"),
 #ifdef AVOID_UB
     "",
 #endif
diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.h b/src/overlays/actors/ovl_En_Tana/z_en_tana.h
index 1804bcd798..28f9c50f7c 100644
--- a/src/overlays/actors/ovl_En_Tana/z_en_tana.h
+++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.h
@@ -2,7 +2,7 @@
 #define Z_EN_TANA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnTana;
 
diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c
index 17a18d8a6a..f81eba1e5d 100644
--- a/src/overlays/actors/ovl_En_Test/z_en_test.c
+++ b/src/overlays/actors/ovl_En_Test/z_en_test.c
@@ -15,10 +15,10 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_sk2/object_sk2.h"
 
@@ -212,48 +212,48 @@ static ColliderQuadInit sSwordColliderQuadInit = {
     { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
 };
 
-typedef enum StalfosDamageEffect {
-    /* 0x0 */ STALFOS_DMGEFF_NORMAL,
-    /* 0x1 */ STALFOS_DMGEFF_STUN,
-    /* 0x6 */ STALFOS_DMGEFF_FIREMAGIC = 6,
-    /* 0xD */ STALFOS_DMGEFF_SLING = 0xD,
-    /* 0xE */ STALFOS_DMGEFF_LIGHT,
-    /* 0xF */ STALFOS_DMGEFF_FREEZE
-} StalfosDamageEffect;
+typedef enum StalfosDamageReaction {
+    /* 0x0 */ STALFOS_DMG_REACT_NORMAL,
+    /* 0x1 */ STALFOS_DMG_REACT_STUN,
+    /* 0x6 */ STALFOS_DMG_REACT_FIREMAGIC = 6,
+    /* 0xD */ STALFOS_DMG_REACT_SLING = 0xD,
+    /* 0xE */ STALFOS_DMG_REACT_LIGHT,
+    /* 0xF */ STALFOS_DMG_REACT_FREEZE
+} StalfosDamageReaction;
 
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, STALFOS_DMGEFF_STUN),
-    /* Deku stick    */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL),
-    /* Slingshot     */ DMG_ENTRY(1, STALFOS_DMGEFF_SLING),
-    /* Explosive     */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL),
-    /* Boomerang     */ DMG_ENTRY(0, STALFOS_DMGEFF_STUN),
-    /* Normal arrow  */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL),
-    /* Hammer swing  */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL),
-    /* Hookshot      */ DMG_ENTRY(0, STALFOS_DMGEFF_STUN),
-    /* Kokiri sword  */ DMG_ENTRY(1, STALFOS_DMGEFF_NORMAL),
-    /* Master sword  */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL),
-    /* Giant's Knife */ DMG_ENTRY(4, STALFOS_DMGEFF_NORMAL),
-    /* Fire arrow    */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL),
-    /* Ice arrow     */ DMG_ENTRY(4, STALFOS_DMGEFF_FREEZE),
-    /* Light arrow   */ DMG_ENTRY(2, STALFOS_DMGEFF_LIGHT),
-    /* Unk arrow 1   */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL),
-    /* Unk arrow 2   */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL),
-    /* Unk arrow 3   */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL),
-    /* Fire magic    */ DMG_ENTRY(0, STALFOS_DMGEFF_FIREMAGIC),
-    /* Ice magic     */ DMG_ENTRY(3, STALFOS_DMGEFF_FREEZE),
-    /* Light magic   */ DMG_ENTRY(0, STALFOS_DMGEFF_LIGHT),
-    /* Shield        */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL),
-    /* Mirror Ray    */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL),
-    /* Kokiri spin   */ DMG_ENTRY(1, STALFOS_DMGEFF_NORMAL),
-    /* Giant spin    */ DMG_ENTRY(4, STALFOS_DMGEFF_NORMAL),
-    /* Master spin   */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL),
-    /* Kokiri jump   */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL),
-    /* Giant jump    */ DMG_ENTRY(8, STALFOS_DMGEFF_NORMAL),
-    /* Master jump   */ DMG_ENTRY(4, STALFOS_DMGEFF_NORMAL),
-    /* Unknown 1     */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL),
-    /* Unblockable   */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL),
-    /* Hammer jump   */ DMG_ENTRY(4, STALFOS_DMGEFF_NORMAL),
-    /* Unknown 2     */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL),
+    /* Deku nut      */ DMG_ENTRY(0, STALFOS_DMG_REACT_STUN),
+    /* Deku stick    */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL),
+    /* Slingshot     */ DMG_ENTRY(1, STALFOS_DMG_REACT_SLING),
+    /* Explosive     */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL),
+    /* Boomerang     */ DMG_ENTRY(0, STALFOS_DMG_REACT_STUN),
+    /* Normal arrow  */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL),
+    /* Hammer swing  */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL),
+    /* Hookshot      */ DMG_ENTRY(0, STALFOS_DMG_REACT_STUN),
+    /* Kokiri sword  */ DMG_ENTRY(1, STALFOS_DMG_REACT_NORMAL),
+    /* Master sword  */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL),
+    /* Giant's Knife */ DMG_ENTRY(4, STALFOS_DMG_REACT_NORMAL),
+    /* Fire arrow    */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL),
+    /* Ice arrow     */ DMG_ENTRY(4, STALFOS_DMG_REACT_FREEZE),
+    /* Light arrow   */ DMG_ENTRY(2, STALFOS_DMG_REACT_LIGHT),
+    /* Unk arrow 1   */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL),
+    /* Unk arrow 2   */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL),
+    /* Unk arrow 3   */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL),
+    /* Fire magic    */ DMG_ENTRY(0, STALFOS_DMG_REACT_FIREMAGIC),
+    /* Ice magic     */ DMG_ENTRY(3, STALFOS_DMG_REACT_FREEZE),
+    /* Light magic   */ DMG_ENTRY(0, STALFOS_DMG_REACT_LIGHT),
+    /* Shield        */ DMG_ENTRY(0, STALFOS_DMG_REACT_NORMAL),
+    /* Mirror Ray    */ DMG_ENTRY(0, STALFOS_DMG_REACT_NORMAL),
+    /* Kokiri spin   */ DMG_ENTRY(1, STALFOS_DMG_REACT_NORMAL),
+    /* Giant spin    */ DMG_ENTRY(4, STALFOS_DMG_REACT_NORMAL),
+    /* Master spin   */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL),
+    /* Kokiri jump   */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL),
+    /* Giant jump    */ DMG_ENTRY(8, STALFOS_DMG_REACT_NORMAL),
+    /* Master jump   */ DMG_ENTRY(4, STALFOS_DMG_REACT_NORMAL),
+    /* Unknown 1     */ DMG_ENTRY(0, STALFOS_DMG_REACT_NORMAL),
+    /* Unblockable   */ DMG_ENTRY(0, STALFOS_DMG_REACT_NORMAL),
+    /* Hammer jump   */ DMG_ENTRY(4, STALFOS_DMG_REACT_NORMAL),
+    /* Unknown 2     */ DMG_ENTRY(0, STALFOS_DMG_REACT_NORMAL),
 };
 
 static InitChainEntry sInitChain[] = {
@@ -1313,12 +1313,12 @@ void EnTest_SetupStunned(EnTest* this) {
     this->skelAnime.playSpeed = 0.0f;
     this->actor.speed = -4.0f;
 
-    if (this->lastDamageEffect == STALFOS_DMGEFF_LIGHT) {
+    if (this->lastDamageReaction == STALFOS_DMG_REACT_LIGHT) {
         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 120, COLORFILTER_BUFFLAG_OPA, 80);
     } else {
         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80);
 
-        if (this->lastDamageEffect == STALFOS_DMGEFF_FREEZE) {
+        if (this->lastDamageReaction == STALFOS_DMG_REACT_FREEZE) {
             this->iceTimer = 36;
         } else {
             Animation_PlayOnceSetSpeed(&this->skelAnime, &gStalfosFlinchFromHitFrontAnim, 0.0f);
@@ -1678,9 +1678,9 @@ void EnTest_UpdateDamage(EnTest* this, PlayState* play) {
     } else if (this->bodyCollider.base.acFlags & AC_HIT) {
         this->bodyCollider.base.acFlags &= ~AC_HIT;
 
-        if ((this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_SLING) &&
-            (this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_FIREMAGIC)) {
-            this->lastDamageEffect = this->actor.colChkInfo.damageEffect;
+        if ((this->actor.colChkInfo.damageReaction != STALFOS_DMG_REACT_SLING) &&
+            (this->actor.colChkInfo.damageReaction != STALFOS_DMG_REACT_FIREMAGIC)) {
+            this->lastDamageReaction = this->actor.colChkInfo.damageReaction;
             if (this->swordState >= 1) {
                 this->swordState = 0;
             }
@@ -1689,9 +1689,9 @@ void EnTest_UpdateDamage(EnTest* this, PlayState* play) {
             Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, false);
             Audio_StopSfxByPosAndId(&this->actor.projectedPos, NA_SE_EN_STAL_WARAU);
 
-            if ((this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_STUN) ||
-                (this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_FREEZE) ||
-                (this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_LIGHT)) {
+            if ((this->actor.colChkInfo.damageReaction == STALFOS_DMG_REACT_STUN) ||
+                (this->actor.colChkInfo.damageReaction == STALFOS_DMG_REACT_FREEZE) ||
+                (this->actor.colChkInfo.damageReaction == STALFOS_DMG_REACT_LIGHT)) {
                 if (this->unk_7C8 != 0xB) {
                     Actor_ApplyDamage(&this->actor);
                     EnTest_SetupStunned(this);
@@ -1723,7 +1723,7 @@ void EnTest_Update(Actor* thisx, PlayState* play) {
 
     EnTest_UpdateDamage(this, play);
 
-    if (this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_FIREMAGIC) {
+    if (this->actor.colChkInfo.damageReaction != STALFOS_DMG_REACT_FIREMAGIC) {
         Actor_MoveXZGravity(&this->actor);
         Actor_UpdateBgCheckInfo(play, &this->actor, 75.0f, 30.0f, 30.0f,
                                 UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.h b/src/overlays/actors/ovl_En_Test/z_en_test.h
index 030fcf740f..8a0e41abf6 100644
--- a/src/overlays/actors/ovl_En_Test/z_en_test.h
+++ b/src/overlays/actors/ovl_En_Test/z_en_test.h
@@ -2,7 +2,7 @@
 #define Z_EN_TEST_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnTest;
 
@@ -90,7 +90,7 @@ typedef struct EnTest {
     /* 0x7DD */ char unk_7DD[0x1];
     /* 0x7DE */ u8 unk_7DE;
     /* 0x7E0 */ s16 iceTimer;
-    /* 0x7E2 */ u8 lastDamageEffect;
+    /* 0x7E2 */ u8 lastDamageReaction;
     /* 0x7E4 */ s32 unk_7E4;
     /* 0x7E8 */ s32 timer;
     /* 0x7EC */ f32 unk_7EC;
diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c
index 1fc830181b..e0e7ef04b2 100644
--- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c
+++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c
@@ -8,8 +8,8 @@
 
 #include "gfx.h"
 #include "sys_matrix.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
+#include "face_reaction.h"
+#include "play_state.h"
 
 #include "assets/objects/object_mu/object_mu.h"
 
diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.h b/src/overlays/actors/ovl_En_Tg/z_en_tg.h
index b4d9bfe063..f32b2b698f 100644
--- a/src/overlays/actors/ovl_En_Tg/z_en_tg.h
+++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.h
@@ -2,7 +2,7 @@
 #define Z_EN_TG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnTg;
 
diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c
index 71ea089bbd..1f45f2541b 100644
--- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c
+++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c
@@ -20,9 +20,9 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_tite/object_tite.h"
 
@@ -227,8 +227,7 @@ void EnTite_Destroy(Actor* thisx, PlayState* play) {
             spawner->curNumSpawn--;
         }
         PRINTF("\n\n");
-        PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n", "☆☆☆☆☆ Number of simultaneous occurrences ☆☆☆☆☆%d\n")
-                   VT_RST,
+        PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n", "☆☆☆☆☆ Number of simultaneous spawns ☆☆☆☆☆%d\n") VT_RST,
                spawner->curNumSpawn);
         PRINTF("\n\n");
     }
@@ -696,7 +695,7 @@ void EnTite_SetupStunned(EnTite* this) {
     this->action = TEKTITE_STUNNED;
     this->actor.speed = -6.0f;
     this->actor.world.rot.y = this->actor.yawTowardsPlayer;
-    if (this->damageEffect == 0xF) {
+    if (this->damageReaction == 0xF) {
         this->spawnIceTimer = 48;
     }
     Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
@@ -867,11 +866,11 @@ void EnTite_CheckDamage(Actor* thisx, PlayState* play) {
 
     if ((this->collider.base.acFlags & AC_HIT) && (this->action >= TEKTITE_IDLE)) {
         this->collider.base.acFlags &= ~AC_HIT;
-        if (thisx->colChkInfo.damageEffect != 0xE) { // Immune to fire magic
-            this->damageEffect = thisx->colChkInfo.damageEffect;
+        if (thisx->colChkInfo.damageReaction != 0xE) { // Immune to fire magic
+            this->damageReaction = thisx->colChkInfo.damageReaction;
             Actor_SetDropFlag(thisx, &this->collider.elements[0].base, false);
             // Stun if Tektite hit by nut, boomerang, hookshot, ice arrow or ice magic
-            if ((thisx->colChkInfo.damageEffect == 1) || (thisx->colChkInfo.damageEffect == 0xF)) {
+            if ((thisx->colChkInfo.damageReaction == 1) || (thisx->colChkInfo.damageReaction == 0xF)) {
                 if (this->action != TEKTITE_STUNNED) {
                     Actor_SetColorFilter(thisx, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80);
                     Actor_ApplyDamage(thisx);
@@ -917,7 +916,7 @@ void EnTite_Update(Actor* thisx, PlayState* play) {
 
     EnTite_CheckDamage(thisx, play);
     // Stay still if hit by immunity damage type this frame
-    if (thisx->colChkInfo.damageEffect != 0xE) {
+    if (thisx->colChkInfo.damageReaction != 0xE) {
         this->actionFunc(this, play);
         Actor_MoveXZGravity(thisx);
         Actor_UpdateBgCheckInfo(play, thisx, 25.0f, 40.0f, 20.0f, this->unk_2DC);
diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.h b/src/overlays/actors/ovl_En_Tite/z_en_tite.h
index d4ec9ab8dd..4fedb782d1 100755
--- a/src/overlays/actors/ovl_En_Tite/z_en_tite.h
+++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.h
@@ -2,7 +2,7 @@
 #define Z_EN_TITE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnTite;
 
@@ -26,7 +26,7 @@ typedef struct EnTite {
     /* 0x02E0 */ s16 actionVar1; // Usage depends on current action function
     /* 0x02E2 */ u8 actionVar2; // Usage depends on current action function
     /* 0x02E3 */ u8 spawnIceTimer;
-    /* 0x02E4 */ u8 damageEffect;
+    /* 0x02E4 */ u8 damageReaction;
     /* 0x02E8 */ ColliderJntSph collider;
     /* 0x0308 */ ColliderJntSphElement colliderElements[1];
     /* 0x0348 */ Vec3f frontLeftFootPos;
diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
index 4f697c29b8..a802541986 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
@@ -17,9 +17,9 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_tk/object_tk.h"
diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h
index 2ce0b9ef87..26f9774d41 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h
@@ -2,7 +2,7 @@
 #define Z_EN_TK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 /* Dirt particle effect */
 struct EnTkEff;
diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.c b/src/overlays/actors/ovl_En_Torch/z_en_torch.c
index 6e406c6bab..1219bab670 100644
--- a/src/overlays/actors/ovl_En_Torch/z_en_torch.c
+++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.c
@@ -7,8 +7,8 @@
 #include "z_en_torch.h"
 #include "overlays/actors/ovl_En_Box/z_en_box.h"
 
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #define FLAGS 0
 
diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.h b/src/overlays/actors/ovl_En_Torch/z_en_torch.h
index fc3e2dabac..88b339c7ef 100644
--- a/src/overlays/actors/ovl_En_Torch/z_en_torch.h
+++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.h
@@ -2,7 +2,7 @@
 #define Z_EN_TORCH_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnTorch;
 
diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
index a02e9bc3bb..3f10462ead 100644
--- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
+++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
@@ -17,11 +17,11 @@
 #include "versions.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_torch2/object_torch2.h"
 
@@ -612,7 +612,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) {
             this->stateFlags3 &= ~PLAYER_STATE3_2;
         } else {
             func_800F5ACC(NA_BGM_MINI_BOSS);
-            if (this->actor.colChkInfo.damageEffect == 1) {
+            if (this->actor.colChkInfo.damageReaction == 1) {
                 if (sAlpha == 255) {
                     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 80);
                 } else {
diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h
index bb132bc91e..a45afbba4a 100644
--- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h
+++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h
@@ -2,8 +2,8 @@
 #define Z_EN_TORCH2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
-// Uses the Player struct (from z64player.h)
+// Uses the Player struct (from player.h)
 
 #endif
diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
index 2ac84162c6..361ef77182 100644
--- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
+++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
@@ -11,10 +11,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_toryo/object_toryo.h"
 
diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h
index f8d04e74ac..479b97e8bb 100644
--- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h
+++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h
@@ -2,7 +2,7 @@
 #define Z_EN_TORYO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnToryo;
 
diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c
index a1ce22995c..f197510c55 100644
--- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c
+++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c
@@ -18,9 +18,9 @@
 #include "versions.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_tp/object_tp.h"
 
@@ -95,46 +95,46 @@ static ColliderJntSphInit sJntSphInit = {
     sJntSphElementsInit,
 };
 
-typedef enum TailpasaranDamageEffect {
-    /* 00 */ TAILPASARAN_DMGEFF_NONE,
-    /* 01 */ TAILPASARAN_DMGEFF_DEKUNUT,
-    /* 14 */ TAILPASARAN_DMGEFF_SHOCKING = 14, // Kills the Tailpasaran but shocks Player
-    /* 15 */ TAILPASARAN_DMGEFF_INSULATING     // Kills the Tailpasaran and does not shock Player
-} TailpasaranDamageEffect;
+typedef enum TailpasaranDamageReaction {
+    /* 00 */ TAILPASARAN_DMG_REACT_NONE,
+    /* 01 */ TAILPASARAN_DMG_REACT_DEKUNUT,
+    /* 14 */ TAILPASARAN_DMG_REACT_SHOCKING = 14, // Kills the Tailpasaran but shocks Player
+    /* 15 */ TAILPASARAN_DMG_REACT_INSULATING     // Kills the Tailpasaran and does not shock Player
+} TailpasaranDamageReaction;
 
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_DEKUNUT),
-    /* Deku stick    */ DMG_ENTRY(2, TAILPASARAN_DMGEFF_INSULATING),
-    /* Slingshot     */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Explosive     */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Boomerang     */ DMG_ENTRY(1, TAILPASARAN_DMGEFF_INSULATING),
-    /* Normal arrow  */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Hammer swing  */ DMG_ENTRY(2, TAILPASARAN_DMGEFF_SHOCKING),
-    /* Hookshot      */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Kokiri sword  */ DMG_ENTRY(1, TAILPASARAN_DMGEFF_SHOCKING),
-    /* Master sword  */ DMG_ENTRY(2, TAILPASARAN_DMGEFF_SHOCKING),
-    /* Giant's Knife */ DMG_ENTRY(4, TAILPASARAN_DMGEFF_SHOCKING),
-    /* Fire arrow    */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Ice arrow     */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Light arrow   */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Unk arrow 1   */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Unk arrow 2   */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Unk arrow 3   */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Fire magic    */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Ice magic     */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Light magic   */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Shield        */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Mirror Ray    */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Kokiri spin   */ DMG_ENTRY(1, TAILPASARAN_DMGEFF_SHOCKING),
-    /* Giant spin    */ DMG_ENTRY(4, TAILPASARAN_DMGEFF_SHOCKING),
-    /* Master spin   */ DMG_ENTRY(2, TAILPASARAN_DMGEFF_SHOCKING),
-    /* Kokiri jump   */ DMG_ENTRY(2, TAILPASARAN_DMGEFF_SHOCKING),
-    /* Giant jump    */ DMG_ENTRY(8, TAILPASARAN_DMGEFF_SHOCKING),
-    /* Master jump   */ DMG_ENTRY(4, TAILPASARAN_DMGEFF_SHOCKING),
-    /* Unknown 1     */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Unblockable   */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
-    /* Hammer jump   */ DMG_ENTRY(4, TAILPASARAN_DMGEFF_SHOCKING),
-    /* Unknown 2     */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE),
+    /* Deku nut      */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_DEKUNUT),
+    /* Deku stick    */ DMG_ENTRY(2, TAILPASARAN_DMG_REACT_INSULATING),
+    /* Slingshot     */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Explosive     */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Boomerang     */ DMG_ENTRY(1, TAILPASARAN_DMG_REACT_INSULATING),
+    /* Normal arrow  */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Hammer swing  */ DMG_ENTRY(2, TAILPASARAN_DMG_REACT_SHOCKING),
+    /* Hookshot      */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Kokiri sword  */ DMG_ENTRY(1, TAILPASARAN_DMG_REACT_SHOCKING),
+    /* Master sword  */ DMG_ENTRY(2, TAILPASARAN_DMG_REACT_SHOCKING),
+    /* Giant's Knife */ DMG_ENTRY(4, TAILPASARAN_DMG_REACT_SHOCKING),
+    /* Fire arrow    */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Ice arrow     */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Light arrow   */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Unk arrow 1   */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Unk arrow 2   */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Unk arrow 3   */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Fire magic    */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Ice magic     */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Light magic   */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Shield        */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(1, TAILPASARAN_DMG_REACT_SHOCKING),
+    /* Giant spin    */ DMG_ENTRY(4, TAILPASARAN_DMG_REACT_SHOCKING),
+    /* Master spin   */ DMG_ENTRY(2, TAILPASARAN_DMG_REACT_SHOCKING),
+    /* Kokiri jump   */ DMG_ENTRY(2, TAILPASARAN_DMG_REACT_SHOCKING),
+    /* Giant jump    */ DMG_ENTRY(8, TAILPASARAN_DMG_REACT_SHOCKING),
+    /* Master jump   */ DMG_ENTRY(4, TAILPASARAN_DMG_REACT_SHOCKING),
+    /* Unknown 1     */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Unblockable   */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(4, TAILPASARAN_DMG_REACT_SHOCKING),
+    /* Unknown 2     */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE),
 };
 
 static InitChainEntry sInitChain[] = {
@@ -604,10 +604,10 @@ void EnTp_UpdateDamage(EnTp* this, PlayState* play) {
 
         this->collider.base.acFlags &= ~AC_HIT;
         Actor_SetDropFlagJntSph(&this->actor, &this->collider, true);
-        this->damageEffect = this->actor.colChkInfo.damageEffect;
+        this->damageReaction = this->actor.colChkInfo.damageReaction;
 
-        if (this->actor.colChkInfo.damageEffect != TAILPASARAN_DMGEFF_NONE) {
-            if (this->actor.colChkInfo.damageEffect == TAILPASARAN_DMGEFF_DEKUNUT) {
+        if (this->actor.colChkInfo.damageReaction != TAILPASARAN_DMG_REACT_NONE) {
+            if (this->actor.colChkInfo.damageReaction == TAILPASARAN_DMG_REACT_DEKUNUT) {
                 phi_s4 = 1;
             }
 
@@ -622,7 +622,7 @@ void EnTp_UpdateDamage(EnTp* this, PlayState* play) {
 
                 if (head->actor.params <= TAILPASARAN_HEAD) {
                     EnTp_SetupDie(head);
-                    head->damageEffect = this->actor.colChkInfo.damageEffect;
+                    head->damageReaction = this->actor.colChkInfo.damageReaction;
                     head->actor.params = TAILPASARAN_HEAD_DYING;
                 }
             } else {
@@ -686,7 +686,7 @@ void EnTp_Update(Actor* thisx, PlayState* play) {
     s16 yawToWall;
 
     if (player->stateFlags1 & PLAYER_STATE1_26) { // Shielding
-        this->damageEffect = TAILPASARAN_DMGEFF_NONE;
+        this->damageReaction = TAILPASARAN_DMG_REACT_NONE;
     }
 
     if (this->actor.colChkInfo.health != 0) {
@@ -737,7 +737,7 @@ void EnTp_Update(Actor* thisx, PlayState* play) {
 
     this->actor.focus.pos = this->actor.world.pos;
 
-    if (this->damageEffect == TAILPASARAN_DMGEFF_SHOCKING) {
+    if (this->damageReaction == TAILPASARAN_DMG_REACT_SHOCKING) {
         CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base);
     }
 
diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.h b/src/overlays/actors/ovl_En_Tp/z_en_tp.h
index 71fdca8188..7e596aadbd 100644
--- a/src/overlays/actors/ovl_En_Tp/z_en_tp.h
+++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.h
@@ -2,7 +2,7 @@
 #define Z_EN_TP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnTp;
 
@@ -13,7 +13,7 @@ typedef struct EnTp {
     /* 0x014C */ s32 actionIndex;
     /* 0x0150 */ s32 unk_150; // Some kind of state indicator
     /* 0x0154 */ EnTpActionFunc actionFunc;
-    /* 0x0158 */ u8 damageEffect; // Used to propagate the effect to the other segments' actors
+    /* 0x0158 */ u8 damageReaction; // Used to propagate the reaction to the other segments' actors
     /* 0x015A */ s16 timer;
     /* 0x015C */ s16 unk_15C; // Multipurpose, used to change the horizontal position of tail segments
     /* 0x015E */ s16 alpha; // The dying types fade away
diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c
index 3f2672cde4..84b2dd4cf6 100644
--- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c
+++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c
@@ -13,9 +13,9 @@
 #include "sys_math.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_tr/object_tr.h"
 
diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.h b/src/overlays/actors/ovl_En_Tr/z_en_tr.h
index 091aa5c52f..d649090229 100644
--- a/src/overlays/actors/ovl_En_Tr/z_en_tr.h
+++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.h
@@ -2,7 +2,7 @@
 #define Z_EN_TR_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnTr;
 
diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c
index 848e6701b0..22b44abdfc 100644
--- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c
+++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c
@@ -8,8 +8,8 @@
 
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_trap/object_trap.h"
 
diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.h b/src/overlays/actors/ovl_En_Trap/z_en_trap.h
index fcd62dd170..86b0c1d043 100644
--- a/src/overlays/actors/ovl_En_Trap/z_en_trap.h
+++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.h
@@ -2,7 +2,7 @@
 #define Z_EN_TRAP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 // Different movement modes (set in params):
 #define SPIKETRAP_MODE_LINEAR 0x10
diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
index 7ff6013e48..b7afe53f41 100644
--- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
+++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
@@ -15,10 +15,10 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h
index 3abe8b625a..04d54d3847 100644
--- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h
+++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h
@@ -2,7 +2,7 @@
 #define Z_EN_TUBO_TRAP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnTuboTrap;
 
diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c
index 011b004b68..643cae1b35 100644
--- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c
+++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c
@@ -15,8 +15,8 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_vali/object_vali.h"
 
@@ -97,48 +97,48 @@ static ColliderCylinderInit sCylinderInit = {
 
 static CollisionCheckInfoInit sColChkInfoInit = { 2, 18, 32, MASS_HEAVY };
 
-typedef enum BariDamageEffect {
-    /* 0x0 */ BARI_DMGEFF_NONE,
-    /* 0x1 */ BARI_DMGEFF_STUN,
-    /* 0x2 */ BARI_DMGEFF_FIRE,
-    /* 0x3 */ BARI_DMGEFF_ICE,
-    /* 0xE */ BARI_DMGEFF_SLINGSHOT = 0xE,
-    /* 0xF */ BARI_DMGEFF_SWORD
-} BariDamageEffect;
+typedef enum BariDamageReaction {
+    /* 0x0 */ BARI_DMG_REACT_NONE,
+    /* 0x1 */ BARI_DMG_REACT_STUN,
+    /* 0x2 */ BARI_DMG_REACT_FIRE,
+    /* 0x3 */ BARI_DMG_REACT_ICE,
+    /* 0xE */ BARI_DMG_REACT_SLINGSHOT = 0xE,
+    /* 0xF */ BARI_DMG_REACT_SWORD
+} BariDamageReaction;
 
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, BARI_DMGEFF_STUN),
-    /* Deku stick    */ DMG_ENTRY(2, BARI_DMGEFF_NONE),
-    /* Slingshot     */ DMG_ENTRY(0, BARI_DMGEFF_SLINGSHOT),
-    /* Explosive     */ DMG_ENTRY(2, BARI_DMGEFF_NONE),
-    /* Boomerang     */ DMG_ENTRY(0, BARI_DMGEFF_STUN),
-    /* Normal arrow  */ DMG_ENTRY(2, BARI_DMGEFF_NONE),
-    /* Hammer swing  */ DMG_ENTRY(2, BARI_DMGEFF_NONE),
-    /* Hookshot      */ DMG_ENTRY(2, BARI_DMGEFF_NONE),
-    /* Kokiri sword  */ DMG_ENTRY(1, BARI_DMGEFF_SWORD),
-    /* Master sword  */ DMG_ENTRY(2, BARI_DMGEFF_SWORD),
-    /* Giant's Knife */ DMG_ENTRY(4, BARI_DMGEFF_SWORD),
-    /* Fire arrow    */ DMG_ENTRY(4, BARI_DMGEFF_FIRE),
-    /* Ice arrow     */ DMG_ENTRY(4, BARI_DMGEFF_ICE),
-    /* Light arrow   */ DMG_ENTRY(2, BARI_DMGEFF_NONE),
-    /* Unk arrow 1   */ DMG_ENTRY(2, BARI_DMGEFF_NONE),
-    /* Unk arrow 2   */ DMG_ENTRY(2, BARI_DMGEFF_NONE),
-    /* Unk arrow 3   */ DMG_ENTRY(2, BARI_DMGEFF_NONE),
-    /* Fire magic    */ DMG_ENTRY(4, BARI_DMGEFF_FIRE),
-    /* Ice magic     */ DMG_ENTRY(4, BARI_DMGEFF_ICE),
-    /* Light magic   */ DMG_ENTRY(0, BARI_DMGEFF_NONE),
-    /* Shield        */ DMG_ENTRY(0, BARI_DMGEFF_NONE),
-    /* Mirror Ray    */ DMG_ENTRY(0, BARI_DMGEFF_NONE),
-    /* Kokiri spin   */ DMG_ENTRY(1, BARI_DMGEFF_NONE),
-    /* Giant spin    */ DMG_ENTRY(4, BARI_DMGEFF_NONE),
-    /* Master spin   */ DMG_ENTRY(2, BARI_DMGEFF_NONE),
-    /* Kokiri jump   */ DMG_ENTRY(2, BARI_DMGEFF_NONE),
-    /* Giant jump    */ DMG_ENTRY(8, BARI_DMGEFF_NONE),
-    /* Master jump   */ DMG_ENTRY(4, BARI_DMGEFF_NONE),
-    /* Unknown 1     */ DMG_ENTRY(0, BARI_DMGEFF_NONE),
-    /* Unblockable   */ DMG_ENTRY(0, BARI_DMGEFF_NONE),
-    /* Hammer jump   */ DMG_ENTRY(4, BARI_DMGEFF_NONE),
-    /* Unknown 2     */ DMG_ENTRY(0, BARI_DMGEFF_NONE),
+    /* Deku nut      */ DMG_ENTRY(0, BARI_DMG_REACT_STUN),
+    /* Deku stick    */ DMG_ENTRY(2, BARI_DMG_REACT_NONE),
+    /* Slingshot     */ DMG_ENTRY(0, BARI_DMG_REACT_SLINGSHOT),
+    /* Explosive     */ DMG_ENTRY(2, BARI_DMG_REACT_NONE),
+    /* Boomerang     */ DMG_ENTRY(0, BARI_DMG_REACT_STUN),
+    /* Normal arrow  */ DMG_ENTRY(2, BARI_DMG_REACT_NONE),
+    /* Hammer swing  */ DMG_ENTRY(2, BARI_DMG_REACT_NONE),
+    /* Hookshot      */ DMG_ENTRY(2, BARI_DMG_REACT_NONE),
+    /* Kokiri sword  */ DMG_ENTRY(1, BARI_DMG_REACT_SWORD),
+    /* Master sword  */ DMG_ENTRY(2, BARI_DMG_REACT_SWORD),
+    /* Giant's Knife */ DMG_ENTRY(4, BARI_DMG_REACT_SWORD),
+    /* Fire arrow    */ DMG_ENTRY(4, BARI_DMG_REACT_FIRE),
+    /* Ice arrow     */ DMG_ENTRY(4, BARI_DMG_REACT_ICE),
+    /* Light arrow   */ DMG_ENTRY(2, BARI_DMG_REACT_NONE),
+    /* Unk arrow 1   */ DMG_ENTRY(2, BARI_DMG_REACT_NONE),
+    /* Unk arrow 2   */ DMG_ENTRY(2, BARI_DMG_REACT_NONE),
+    /* Unk arrow 3   */ DMG_ENTRY(2, BARI_DMG_REACT_NONE),
+    /* Fire magic    */ DMG_ENTRY(4, BARI_DMG_REACT_FIRE),
+    /* Ice magic     */ DMG_ENTRY(4, BARI_DMG_REACT_ICE),
+    /* Light magic   */ DMG_ENTRY(0, BARI_DMG_REACT_NONE),
+    /* Shield        */ DMG_ENTRY(0, BARI_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, BARI_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(1, BARI_DMG_REACT_NONE),
+    /* Giant spin    */ DMG_ENTRY(4, BARI_DMG_REACT_NONE),
+    /* Master spin   */ DMG_ENTRY(2, BARI_DMG_REACT_NONE),
+    /* Kokiri jump   */ DMG_ENTRY(2, BARI_DMG_REACT_NONE),
+    /* Giant jump    */ DMG_ENTRY(8, BARI_DMG_REACT_NONE),
+    /* Master jump   */ DMG_ENTRY(4, BARI_DMG_REACT_NONE),
+    /* Unknown 1     */ DMG_ENTRY(0, BARI_DMG_REACT_NONE),
+    /* Unblockable   */ DMG_ENTRY(0, BARI_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(4, BARI_DMG_REACT_NONE),
+    /* Unknown 2     */ DMG_ENTRY(0, BARI_DMG_REACT_NONE),
 };
 
 static InitChainEntry sInitChain[] = {
@@ -512,21 +512,21 @@ void EnVali_UpdateDamage(EnVali* this, PlayState* play) {
         this->bodyCollider.base.acFlags &= ~AC_HIT;
         Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, true);
 
-        if ((this->actor.colChkInfo.damageEffect != BARI_DMGEFF_NONE) || (this->actor.colChkInfo.damage != 0)) {
+        if ((this->actor.colChkInfo.damageReaction != BARI_DMG_REACT_NONE) || (this->actor.colChkInfo.damage != 0)) {
             if (Actor_ApplyDamage(&this->actor) == 0) {
                 Actor_PlaySfx(&this->actor, NA_SE_EN_BARI_DEAD);
                 Enemy_StartFinishingBlow(play, &this->actor);
                 this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
-            } else if ((this->actor.colChkInfo.damageEffect != BARI_DMGEFF_STUN) &&
-                       (this->actor.colChkInfo.damageEffect != BARI_DMGEFF_SLINGSHOT)) {
+            } else if ((this->actor.colChkInfo.damageReaction != BARI_DMG_REACT_STUN) &&
+                       (this->actor.colChkInfo.damageReaction != BARI_DMG_REACT_SLINGSHOT)) {
                 Actor_PlaySfx(&this->actor, NA_SE_EN_BARI_DAMAGE);
             }
 
-            if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_STUN) {
+            if (this->actor.colChkInfo.damageReaction == BARI_DMG_REACT_STUN) {
                 if (this->actionFunc != EnVali_Stunned) {
                     EnVali_SetupStunned(this);
                 }
-            } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_SWORD) {
+            } else if (this->actor.colChkInfo.damageReaction == BARI_DMG_REACT_SWORD) {
                 if (this->actionFunc != EnVali_Stunned) {
                     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 150, COLORFILTER_BUFFLAG_XLU, 30);
                     this->actor.params = BARI_TYPE_SWORD_DAMAGE;
@@ -534,11 +534,11 @@ void EnVali_UpdateDamage(EnVali* this, PlayState* play) {
                 } else {
                     EnVali_SetupRetaliate(this);
                 }
-            } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_FIRE) {
+            } else if (this->actor.colChkInfo.damageReaction == BARI_DMG_REACT_FIRE) {
                 EnVali_SetupBurnt(this);
-            } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_ICE) {
+            } else if (this->actor.colChkInfo.damageReaction == BARI_DMG_REACT_ICE) {
                 EnVali_SetupFrozen(this);
-            } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_SLINGSHOT) {
+            } else if (this->actor.colChkInfo.damageReaction == BARI_DMG_REACT_SLINGSHOT) {
                 if (this->slingshotReactionTimer == 0) {
                     this->slingshotReactionTimer = 20;
                 }
diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.h b/src/overlays/actors/ovl_En_Vali/z_en_vali.h
index 1a031d964b..66ac96d3d1 100644
--- a/src/overlays/actors/ovl_En_Vali/z_en_vali.h
+++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.h
@@ -2,7 +2,7 @@
 #define Z_EN_VALI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnVali;
 
diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.c b/src/overlays/actors/ovl_En_Vase/z_en_vase.c
index 30f8b32b18..4e8cec5ff4 100644
--- a/src/overlays/actors/ovl_En_Vase/z_en_vase.c
+++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.c
@@ -6,7 +6,7 @@
 
 #include "z_en_vase.h"
 
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_vase/object_vase.h"
 
diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.h b/src/overlays/actors/ovl_En_Vase/z_en_vase.h
index 04a8381e29..50cc1d08e3 100644
--- a/src/overlays/actors/ovl_En_Vase/z_en_vase.h
+++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.h
@@ -2,7 +2,7 @@
 #define Z_EN_VASE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnVase;
 
diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c
index 8791409d01..826d7f0ebe 100644
--- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c
+++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c
@@ -15,8 +15,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_fd/object_fd.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h
index e81bc1ac25..e7954751de 100644
--- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h
+++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h
@@ -2,7 +2,7 @@
 #define Z_EN_VB_BALL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnVbBall;
 
diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
index 165065d714..ce7ea7e2c9 100644
--- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
+++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
@@ -20,10 +20,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64save.h"
-#include "z64skin.h"
+#include "audio.h"
+#include "play_state.h"
+#include "save.h"
+#include "skin.h"
 
 #include "assets/objects/object_zl4/object_zl4.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
@@ -34,6 +34,8 @@
 #include "assets/objects/object_ganon/object_ganon.h"
 #include "assets/objects/object_opening_demo1/object_opening_demo1.h"
 
+#pragma increment_block_number "ntsc-1.0:128"
+
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
 void EnViewer_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
index a06435d553..1bb5780203 100644
--- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
+++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
@@ -2,8 +2,8 @@
 #define Z_EN_VIEWER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64skin.h"
+#include "actor.h"
+#include "skin.h"
 
 struct EnViewer;
 
diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c
index 2ee230d9bd..128a0af5f4 100644
--- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c
+++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c
@@ -17,9 +17,9 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_vm/object_vm.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.h b/src/overlays/actors/ovl_En_Vm/z_en_vm.h
index 7705d87032..33d52e2fb8 100644
--- a/src/overlays/actors/ovl_En_Vm/z_en_vm.h
+++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.h
@@ -2,7 +2,7 @@
 #define Z_EN_VM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnVm;
 
diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c
index d54a570d2a..cda2c07dc0 100644
--- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c
+++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c
@@ -17,9 +17,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "debug_display.h"
+#include "effect.h"
+#include "play_state.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
@@ -135,12 +135,12 @@ void EnWallTubo_SetWallFall(EnWallTubo* this, PlayState* play) {
 
         if ((wall != NULL) && (wall->dyna.actor.update != NULL)) {
             wall->isHit = true;
-            // "You did it field!" (repeated 5 times)
-            PRINTF(VT_FGCOL(GREEN) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST);
-            PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST);
-            PRINTF(VT_FGCOL(BLUE) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST);
-            PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST);
-            PRINTF(VT_FGCOL(CYAN) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST);
+            // "Hara" may stand for the developer name Kuzuhara
+            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆ やった原！ ☆☆☆☆☆ \n", "☆☆☆☆ I did it! -Hara ☆☆☆☆☆ \n") VT_RST);
+            PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆ やった原！ ☆☆☆☆☆ \n", "☆☆☆☆ I did it! -Hara ☆☆☆☆☆ \n") VT_RST);
+            PRINTF(VT_FGCOL(BLUE) T("☆☆☆☆ やった原！ ☆☆☆☆☆ \n", "☆☆☆☆ I did it! -Hara ☆☆☆☆☆ \n") VT_RST);
+            PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆ やった原！ ☆☆☆☆☆ \n", "☆☆☆☆ I did it! -Hara ☆☆☆☆☆ \n") VT_RST);
+            PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆ やった原！ ☆☆☆☆☆ \n", "☆☆☆☆ I did it! -Hara ☆☆☆☆☆ \n") VT_RST);
         }
 
         Actor_Kill(&this->actor);
diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h
index b2e9005372..5cbbb878e7 100644
--- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h
+++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h
@@ -2,7 +2,7 @@
 #define Z_EN_WALL_TUBO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h"
 
 struct EnWallTubo;
diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
index abb91c80b9..7373f441a6 100644
--- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
+++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
@@ -14,10 +14,10 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_wallmaster/object_wallmaster.h"
@@ -26,10 +26,6 @@
 
 #define TIMER_SCALE ((f32)OS_CLOCK_RATE / 10000000000)
 
-#define DAMAGE_EFFECT_BURN 2
-#define DAMAGE_EFFECT_STUN_WHITE 4
-#define DAMAGE_EFFECT_STUN_BLUE 1
-
 void EnWallmas_Init(Actor* thisx, PlayState* play);
 void EnWallmas_Destroy(Actor* thisx, PlayState* play);
 void EnWallmas_Update(Actor* thisx, PlayState* play);
@@ -86,39 +82,46 @@ static ColliderCylinderInit sCylinderInit = {
 
 static CollisionCheckInfoInit sColChkInfoInit = { 4, 30, 40, 150 };
 
+typedef enum EnWallmasDamageReaction {
+    /* 0 */ WALLMAS_DMG_REACT_NONE,
+    /* 1 */ WALLMAS_DMG_REACT_STUN_BLUE,
+    /* 2 */ WALLMAS_DMG_REACT_BURN,
+    /* 4 */ WALLMAS_DMG_REACT_STUN_WHITE = 4
+} EnWallmasDamageReaction;
+
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, 0x1),
-    /* Deku stick    */ DMG_ENTRY(2, 0x0),
-    /* Slingshot     */ DMG_ENTRY(1, 0x0),
-    /* Explosive     */ DMG_ENTRY(2, 0x0),
-    /* Boomerang     */ DMG_ENTRY(0, 0x1),
-    /* Normal arrow  */ DMG_ENTRY(2, 0x0),
-    /* Hammer swing  */ DMG_ENTRY(2, 0x0),
-    /* Hookshot      */ DMG_ENTRY(0, 0x1),
-    /* Kokiri sword  */ DMG_ENTRY(1, 0x0),
-    /* Master sword  */ DMG_ENTRY(2, 0x0),
-    /* Giant's Knife */ DMG_ENTRY(4, 0x0),
-    /* Fire arrow    */ DMG_ENTRY(4, 0x2),
-    /* Ice arrow     */ DMG_ENTRY(2, 0x0),
-    /* Light arrow   */ DMG_ENTRY(4, 0x4),
-    /* Unk arrow 1   */ DMG_ENTRY(4, 0x0),
-    /* Unk arrow 2   */ DMG_ENTRY(2, 0x0),
-    /* Unk arrow 3   */ DMG_ENTRY(2, 0x0),
-    /* Fire magic    */ DMG_ENTRY(4, 0x2),
-    /* Ice magic     */ DMG_ENTRY(0, 0x0),
-    /* Light magic   */ DMG_ENTRY(4, 0x4),
-    /* Shield        */ DMG_ENTRY(0, 0x0),
-    /* Mirror Ray    */ DMG_ENTRY(0, 0x0),
-    /* Kokiri spin   */ DMG_ENTRY(1, 0x0),
-    /* Giant spin    */ DMG_ENTRY(4, 0x0),
-    /* Master spin   */ DMG_ENTRY(2, 0x0),
-    /* Kokiri jump   */ DMG_ENTRY(2, 0x0),
-    /* Giant jump    */ DMG_ENTRY(8, 0x0),
-    /* Master jump   */ DMG_ENTRY(4, 0x0),
-    /* Unknown 1     */ DMG_ENTRY(0, 0x0),
-    /* Unblockable   */ DMG_ENTRY(0, 0x0),
-    /* Hammer jump   */ DMG_ENTRY(4, 0x0),
-    /* Unknown 2     */ DMG_ENTRY(0, 0x0),
+    /* Deku nut      */ DMG_ENTRY(0, WALLMAS_DMG_REACT_STUN_BLUE),
+    /* Deku stick    */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE),
+    /* Slingshot     */ DMG_ENTRY(1, WALLMAS_DMG_REACT_NONE),
+    /* Explosive     */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE),
+    /* Boomerang     */ DMG_ENTRY(0, WALLMAS_DMG_REACT_STUN_BLUE),
+    /* Normal arrow  */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE),
+    /* Hammer swing  */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE),
+    /* Hookshot      */ DMG_ENTRY(0, WALLMAS_DMG_REACT_STUN_BLUE),
+    /* Kokiri sword  */ DMG_ENTRY(1, WALLMAS_DMG_REACT_NONE),
+    /* Master sword  */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE),
+    /* Giant's Knife */ DMG_ENTRY(4, WALLMAS_DMG_REACT_NONE),
+    /* Fire arrow    */ DMG_ENTRY(4, WALLMAS_DMG_REACT_BURN),
+    /* Ice arrow     */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE),
+    /* Light arrow   */ DMG_ENTRY(4, WALLMAS_DMG_REACT_STUN_WHITE),
+    /* Unk arrow 1   */ DMG_ENTRY(4, WALLMAS_DMG_REACT_NONE),
+    /* Unk arrow 2   */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE),
+    /* Unk arrow 3   */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE),
+    /* Fire magic    */ DMG_ENTRY(4, WALLMAS_DMG_REACT_BURN),
+    /* Ice magic     */ DMG_ENTRY(0, WALLMAS_DMG_REACT_NONE),
+    /* Light magic   */ DMG_ENTRY(4, WALLMAS_DMG_REACT_STUN_WHITE),
+    /* Shield        */ DMG_ENTRY(0, WALLMAS_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, WALLMAS_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(1, WALLMAS_DMG_REACT_NONE),
+    /* Giant spin    */ DMG_ENTRY(4, WALLMAS_DMG_REACT_NONE),
+    /* Master spin   */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE),
+    /* Kokiri jump   */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE),
+    /* Giant jump    */ DMG_ENTRY(8, WALLMAS_DMG_REACT_NONE),
+    /* Master jump   */ DMG_ENTRY(4, WALLMAS_DMG_REACT_NONE),
+    /* Unknown 1     */ DMG_ENTRY(0, WALLMAS_DMG_REACT_NONE),
+    /* Unblockable   */ DMG_ENTRY(0, WALLMAS_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(4, WALLMAS_DMG_REACT_NONE),
+    /* Unknown 2     */ DMG_ENTRY(0, WALLMAS_DMG_REACT_NONE),
 };
 
 static InitChainEntry sInitChain[] = {
@@ -292,7 +295,7 @@ void EnWallmas_SetupStun(EnWallmas* this) {
     Animation_Change(&this->skelAnime, &gWallmasterJumpAnim, 1.5f, 0, 20.0f, ANIMMODE_ONCE, -3.0f);
 
     this->actor.speed = 0.0f;
-    if (this->actor.colChkInfo.damageEffect == 4) {
+    if (this->actor.colChkInfo.damageReaction == 4) {
         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 255, COLORFILTER_BUFFLAG_OPA, 80);
     } else {
         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 80);
@@ -522,7 +525,7 @@ void EnWallmas_ColUpdate(EnWallmas* this, PlayState* play) {
     if (this->collider.base.acFlags & AC_HIT) {
         this->collider.base.acFlags &= ~AC_HIT;
         Actor_SetDropFlag(&this->actor, &this->collider.elem, true);
-        if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) {
+        if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) {
             if (Actor_ApplyDamage(&this->actor) == 0) {
                 Enemy_StartFinishingBlow(play, &this->actor);
                 Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_DEAD);
@@ -533,13 +536,13 @@ void EnWallmas_ColUpdate(EnWallmas* this, PlayState* play) {
                 }
             }
 
-            if ((this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_STUN_WHITE) ||
-                (this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_STUN_BLUE)) {
+            if ((this->actor.colChkInfo.damageReaction == WALLMAS_DMG_REACT_STUN_WHITE) ||
+                (this->actor.colChkInfo.damageReaction == WALLMAS_DMG_REACT_STUN_BLUE)) {
                 if (this->actionFunc != EnWallmas_Stun) {
                     EnWallmas_SetupStun(this);
                 }
             } else {
-                if (this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_BURN) {
+                if (this->actor.colChkInfo.damageReaction == WALLMAS_DMG_REACT_BURN) {
                     EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos, 40, 40);
                 }
 
diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
index 76ee52d9e0..664bc80778 100644
--- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
+++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
@@ -2,7 +2,7 @@
 #define Z_EN_WALLMAS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum WallmasType {
     /* 0x00 */ WMT_TIMER,
diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
index 520e7edc61..3fe70749c9 100644
--- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
+++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
@@ -12,10 +12,10 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "debug_display.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
index 52b617a0e7..e3db54c571 100644
--- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
+++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
@@ -2,7 +2,7 @@
 #define Z_EN_WEATHER_TAG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnWeatherTag;
 
diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c
index 2e19328961..35e232c69b 100644
--- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c
+++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c
@@ -13,9 +13,9 @@
 #include "sfx.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_ei/object_ei.h"
 
@@ -575,8 +575,8 @@ void func_80B3368C(EnWeiyer* this, PlayState* play) {
         this->collider.base.acFlags &= ~AC_HIT;
         Actor_SetDropFlag(&this->actor, &this->collider.elem, true);
 
-        if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) {
-            if (this->actor.colChkInfo.damageEffect == 1) {
+        if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) {
+            if (this->actor.colChkInfo.damageReaction == 1) {
                 if (this->actionFunc != func_80B333B8) {
                     func_80B32660(this);
                 }
diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h
index ab1b81c34f..d35e43544f 100644
--- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h
+++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h
@@ -2,7 +2,7 @@
 #define Z_EN_WEIYER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnWeiyer;
 
diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c
index f7ae2db60b..c651e4ff4a 100644
--- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c
+++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c
@@ -22,10 +22,10 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_wf/object_wf.h"
 
@@ -163,48 +163,48 @@ static ColliderCylinderInit sTailCylinderInit = {
     { 15, 20, -15, { 0, 0, 0 } },
 };
 
-typedef enum EnWfDamageEffect {
-    /*  0 */ ENWF_DMGEFF_NONE,
-    /*  1 */ ENWF_DMGEFF_STUN,
-    /*  6 */ ENWF_DMGEFF_ICE_MAGIC = 6,
-    /* 13 */ ENWF_DMGEFF_LIGHT_MAGIC = 13,
-    /* 14 */ ENWF_DMGEFF_FIRE,
-    /* 15 */ ENWF_DMGEFF_UNDEF // used like STUN in the code, but not in the table
-} EnWfDamageEffect;
+typedef enum EnWfDamageReaction {
+    /*  0 */ ENWF_DMG_REACT_NONE,
+    /*  1 */ ENWF_DMG_REACT_STUN,
+    /*  6 */ ENWF_DMG_REACT_ICE_MAGIC = 6,
+    /* 13 */ ENWF_DMG_REACT_LIGHT_MAGIC = 13,
+    /* 14 */ ENWF_DMG_REACT_FIRE,
+    /* 15 */ ENWF_DMG_REACT_UNDEF // used like STUN in the code, but not in the table
+} EnWfDamageReaction;
 
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, ENWF_DMGEFF_STUN),
-    /* Deku stick    */ DMG_ENTRY(2, ENWF_DMGEFF_NONE),
-    /* Slingshot     */ DMG_ENTRY(1, ENWF_DMGEFF_NONE),
-    /* Explosive     */ DMG_ENTRY(2, ENWF_DMGEFF_NONE),
-    /* Boomerang     */ DMG_ENTRY(0, ENWF_DMGEFF_STUN),
-    /* Normal arrow  */ DMG_ENTRY(2, ENWF_DMGEFF_NONE),
-    /* Hammer swing  */ DMG_ENTRY(2, ENWF_DMGEFF_NONE),
-    /* Hookshot      */ DMG_ENTRY(0, ENWF_DMGEFF_STUN),
-    /* Kokiri sword  */ DMG_ENTRY(1, ENWF_DMGEFF_NONE),
-    /* Master sword  */ DMG_ENTRY(2, ENWF_DMGEFF_NONE),
-    /* Giant's Knife */ DMG_ENTRY(4, ENWF_DMGEFF_NONE),
-    /* Fire arrow    */ DMG_ENTRY(4, ENWF_DMGEFF_FIRE),
-    /* Ice arrow     */ DMG_ENTRY(2, ENWF_DMGEFF_NONE),
-    /* Light arrow   */ DMG_ENTRY(2, ENWF_DMGEFF_NONE),
-    /* Unk arrow 1   */ DMG_ENTRY(2, ENWF_DMGEFF_NONE),
-    /* Unk arrow 2   */ DMG_ENTRY(2, ENWF_DMGEFF_NONE),
-    /* Unk arrow 3   */ DMG_ENTRY(2, ENWF_DMGEFF_NONE),
-    /* Fire magic    */ DMG_ENTRY(4, ENWF_DMGEFF_FIRE),
-    /* Ice magic     */ DMG_ENTRY(0, ENWF_DMGEFF_ICE_MAGIC),
-    /* Light magic   */ DMG_ENTRY(3, ENWF_DMGEFF_LIGHT_MAGIC),
-    /* Shield        */ DMG_ENTRY(0, ENWF_DMGEFF_NONE),
-    /* Mirror Ray    */ DMG_ENTRY(0, ENWF_DMGEFF_NONE),
-    /* Kokiri spin   */ DMG_ENTRY(1, ENWF_DMGEFF_NONE),
-    /* Giant spin    */ DMG_ENTRY(4, ENWF_DMGEFF_NONE),
-    /* Master spin   */ DMG_ENTRY(2, ENWF_DMGEFF_NONE),
-    /* Kokiri jump   */ DMG_ENTRY(2, ENWF_DMGEFF_NONE),
-    /* Giant jump    */ DMG_ENTRY(8, ENWF_DMGEFF_NONE),
-    /* Master jump   */ DMG_ENTRY(4, ENWF_DMGEFF_NONE),
-    /* Unknown 1     */ DMG_ENTRY(0, ENWF_DMGEFF_NONE),
-    /* Unblockable   */ DMG_ENTRY(0, ENWF_DMGEFF_NONE),
-    /* Hammer jump   */ DMG_ENTRY(4, ENWF_DMGEFF_NONE),
-    /* Unknown 2     */ DMG_ENTRY(0, ENWF_DMGEFF_NONE),
+    /* Deku nut      */ DMG_ENTRY(0, ENWF_DMG_REACT_STUN),
+    /* Deku stick    */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE),
+    /* Slingshot     */ DMG_ENTRY(1, ENWF_DMG_REACT_NONE),
+    /* Explosive     */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE),
+    /* Boomerang     */ DMG_ENTRY(0, ENWF_DMG_REACT_STUN),
+    /* Normal arrow  */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE),
+    /* Hammer swing  */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE),
+    /* Hookshot      */ DMG_ENTRY(0, ENWF_DMG_REACT_STUN),
+    /* Kokiri sword  */ DMG_ENTRY(1, ENWF_DMG_REACT_NONE),
+    /* Master sword  */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE),
+    /* Giant's Knife */ DMG_ENTRY(4, ENWF_DMG_REACT_NONE),
+    /* Fire arrow    */ DMG_ENTRY(4, ENWF_DMG_REACT_FIRE),
+    /* Ice arrow     */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE),
+    /* Light arrow   */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE),
+    /* Unk arrow 1   */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE),
+    /* Unk arrow 2   */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE),
+    /* Unk arrow 3   */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE),
+    /* Fire magic    */ DMG_ENTRY(4, ENWF_DMG_REACT_FIRE),
+    /* Ice magic     */ DMG_ENTRY(0, ENWF_DMG_REACT_ICE_MAGIC),
+    /* Light magic   */ DMG_ENTRY(3, ENWF_DMG_REACT_LIGHT_MAGIC),
+    /* Shield        */ DMG_ENTRY(0, ENWF_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, ENWF_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(1, ENWF_DMG_REACT_NONE),
+    /* Giant spin    */ DMG_ENTRY(4, ENWF_DMG_REACT_NONE),
+    /* Master spin   */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE),
+    /* Kokiri jump   */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE),
+    /* Giant jump    */ DMG_ENTRY(8, ENWF_DMG_REACT_NONE),
+    /* Master jump   */ DMG_ENTRY(4, ENWF_DMG_REACT_NONE),
+    /* Unknown 1     */ DMG_ENTRY(0, ENWF_DMG_REACT_NONE),
+    /* Unblockable   */ DMG_ENTRY(0, ENWF_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(4, ENWF_DMG_REACT_NONE),
+    /* Unknown 2     */ DMG_ENTRY(0, ENWF_DMG_REACT_NONE),
 };
 
 ActorProfile En_Wf_Profile = {
@@ -293,7 +293,7 @@ void EnWf_Destroy(Actor* thisx, PlayState* play) {
             }
 
             PRINTF("\n\n");
-            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n", "☆☆☆☆☆ Number of simultaneous occurrences ☆☆☆☆☆%d\n")
+            PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n", "☆☆☆☆☆ Number of simultaneous spawns ☆☆☆☆☆%d\n")
                        VT_RST,
                    parent->curNumSpawn);
             PRINTF("\n\n");
@@ -1285,15 +1285,15 @@ void EnWf_UpdateDamage(EnWf* this, PlayState* play) {
             this->bodyColliderCylinder.base.acFlags &= ~AC_HIT;
             this->tailColliderCylinder.base.acFlags &= ~AC_HIT;
 
-            if (this->actor.colChkInfo.damageEffect != ENWF_DMGEFF_ICE_MAGIC) {
-                this->damageEffect = this->actor.colChkInfo.damageEffect;
+            if (this->actor.colChkInfo.damageReaction != ENWF_DMG_REACT_ICE_MAGIC) {
+                this->damageReaction = this->actor.colChkInfo.damageReaction;
                 Actor_SetDropFlag(&this->actor, &this->bodyColliderCylinder.elem, true);
 #if OOT_VERSION >= PAL_1_0
                 this->slashStatus = 0;
 #endif
 
-                if ((this->actor.colChkInfo.damageEffect == ENWF_DMGEFF_STUN) ||
-                    (this->actor.colChkInfo.damageEffect == ENWF_DMGEFF_UNDEF)) {
+                if ((this->actor.colChkInfo.damageReaction == ENWF_DMG_REACT_STUN) ||
+                    (this->actor.colChkInfo.damageReaction == ENWF_DMG_REACT_UNDEF)) {
                     if (this->action != WOLFOS_ACTION_STUNNED) {
                         Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA,
                                              80);
@@ -1303,7 +1303,7 @@ void EnWf_UpdateDamage(EnWf* this, PlayState* play) {
                 } else { // LIGHT_MAGIC, FIRE, NONE
                     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 8);
 
-                    if (this->damageEffect == ENWF_DMGEFF_FIRE) {
+                    if (this->damageReaction == ENWF_DMG_REACT_FIRE) {
                         this->fireTimer = 40;
                     }
 
@@ -1325,7 +1325,7 @@ void EnWf_Update(Actor* thisx, PlayState* play) {
 
     EnWf_UpdateDamage(this, play);
 
-    if (this->actor.colChkInfo.damageEffect != ENWF_DMGEFF_ICE_MAGIC) {
+    if (this->actor.colChkInfo.damageReaction != ENWF_DMG_REACT_ICE_MAGIC) {
         Actor_MoveXZGravity(&this->actor);
         Actor_UpdateBgCheckInfo(play, &this->actor, 32.0f, 30.0f, 60.0f,
                                 UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.h b/src/overlays/actors/ovl_En_Wf/z_en_wf.h
index afc18f7d01..cc69df8ad4 100644
--- a/src/overlays/actors/ovl_En_Wf/z_en_wf.h
+++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.h
@@ -2,7 +2,7 @@
 #define Z_EN_WF_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnWf;
 
@@ -63,7 +63,7 @@ typedef struct EnWf {
     /* 0x02E0 */ s16 unk_2E0; // Used, but has no effect
     /* 0x02E2 */ s16 unk_2E2;
     /* 0x02E4 */ s16 fireTimer;
-    /* 0x02E6 */ u8 damageEffect;
+    /* 0x02E6 */ u8 damageReaction;
     /* 0x02E8 */ s32 actionTimer; // Used to make an action last for a certain amount of time
     /* 0x02EC */ f32 runSpeed;
     /* 0x02F0 */ char unk_2F0[4];
diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
index a1cf8f5be6..7cfe974b8a 100644
--- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
+++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
@@ -13,9 +13,9 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "debug_display.h"
+#include "play_state.h"
+#include "player.h"
 
 #define FLAGS 0
 
diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h
index 5b99e235c3..2910fcae17 100644
--- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h
+++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h
@@ -2,7 +2,7 @@
 #define Z_EN_WONDER_ITEM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnWonderItem;
 
diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c
index 4b43e59cb2..7313c8100d 100644
--- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c
+++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c
@@ -10,9 +10,9 @@
 #include "regs.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64debug_display.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "debug_display.h"
+#include "play_state.h"
+#include "save.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_LOCK_ON_DISABLED)
 
diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h
index a42c3febfc..7850cf6fff 100644
--- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h
+++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h
@@ -2,7 +2,7 @@
 #define Z_EN_WONDER_TALK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnWonderTalk;
 
diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
index 78e8d152d7..137cbf619e 100644
--- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
+++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
@@ -10,10 +10,10 @@
 #include "regs.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64debug_display.h"
-#include "z64item.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "debug_display.h"
+#include "item.h"
+#include "play_state.h"
+#include "player.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_LOCK_ON_DISABLED)
 
diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h
index 0dad49d375..d48ad99777 100644
--- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h
+++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h
@@ -2,7 +2,7 @@
 #define Z_EN_WONDER_TALK2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnWonderTalk2;
 
diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
index bf32807226..2d351c9184 100644
--- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
+++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
@@ -16,9 +16,9 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64skin_matrix.h"
+#include "play_state.h"
+#include "player.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/object_wood02/object_wood02.h"
 
diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h
index 89242188ae..d9ebab697a 100644
--- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h
+++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h
@@ -2,7 +2,7 @@
 #define Z_EN_WOOD02_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnWood02;
 
diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c
index 27c069981e..3311bf4ae4 100644
--- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c
@@ -21,11 +21,11 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/object_xc/object_xc.h"
 #include "assets/scenes/overworld/spot05/spot05_scene.h"
diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.h b/src/overlays/actors/ovl_En_Xc/z_en_xc.h
index 1cc56f68e6..419f67d55d 100644
--- a/src/overlays/actors/ovl_En_Xc/z_en_xc.h
+++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.h
@@ -2,7 +2,7 @@
 #define Z_EN_XC_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnXc;
 
diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c
index e5f75d60df..ee1d8b8161 100644
--- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c
+++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c
@@ -11,12 +11,13 @@
 #include "sequence.h"
 #include "sfx.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64debug_display.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "audio.h"
+#include "debug_display.h"
+#include "effect.h"
+#include "play_state.h"
+#include "save.h"
 
 #define FLAGS 0
 
@@ -90,11 +91,14 @@ void EnYabusameMark_Init(Actor* thisx, PlayState* play) {
     EnYabusameMark* this = (EnYabusameMark*)thisx;
 
     PRINTF("\n\n");
-    PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ やぶさめまと ☆☆☆☆☆ %x\n" VT_RST, this->actor.params);
+    // "まと" could be a typo for "まこ", in which case this could be "Yabusame mark"
+    PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ やぶさめまと ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Yabusame mato ☆☆☆☆☆ %x\n") VT_RST,
+           this->actor.params);
     this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
     this->typeIndex = this->actor.params;
     this->actor.attentionRangeType = ATTENTION_RANGE_5;
-    PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 種類インデックス \t   ☆☆☆☆☆ %d\n" VT_RST, this->typeIndex);
+    PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 種類インデックス \t   ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Type index \t   ☆☆☆☆☆ %d\n") VT_RST,
+           this->typeIndex);
     switch (this->typeIndex) {
         case 0:
             this->subTypeIndex = 0;
@@ -120,8 +124,9 @@ void EnYabusameMark_Init(Actor* thisx, PlayState* play) {
         Actor_Kill(&this->actor);
         return;
     }
-    PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 種類       ☆☆☆☆☆ %d\n" VT_RST, this->typeIndex);
-    PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ さらに分類 ☆☆☆☆☆ %d\n" VT_RST, this->subTypeIndex);
+    PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 種類       ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Type       ☆☆☆☆☆ %d\n") VT_RST, this->typeIndex);
+    PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ さらに分類 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Further classification ☆☆☆☆☆ %d\n") VT_RST,
+           this->subTypeIndex);
     this->actionFunc = func_80B42F74;
 }
 
@@ -177,8 +182,8 @@ void func_80B42F74(EnYabusameMark* this, PlayState* play) {
         PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ hitＸ ☆☆☆☆☆ %f\n" VT_RST, sTargetPos[this->subTypeIndex].x);
         PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ hitＹ ☆☆☆☆☆ %f\n" VT_RST, sTargetPos[this->subTypeIndex].y);
         PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ hitＺ ☆☆☆☆☆ %f\n" VT_RST, sTargetPos[this->subTypeIndex].z);
-        PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 小    ☆☆☆☆☆ %f\n" VT_RST, scoreDistance100);
-        PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 大    ☆☆☆☆☆ %f\n" VT_RST, scoreDistance60);
+        PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 小    ☆☆☆☆☆ %f\n", "☆☆☆☆☆ small ☆☆☆☆☆ %f\n") VT_RST, scoreDistance100);
+        PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 大    ☆☆☆☆☆ %f\n", "☆☆☆☆☆ large ☆☆☆☆☆ %f\n") VT_RST, scoreDistance60);
         PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ point ☆☆☆☆☆ %d\n" VT_RST, scoreIndex);
         PRINTF("\n\n");
 
diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h
index 12cfb46cbb..f7587d8152 100644
--- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h
+++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h
@@ -2,7 +2,7 @@
 #define Z_EN_YABUSAME_MARK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnYabusameMark;
 
diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c
index 22d454fb61..772eceb114 100644
--- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c
+++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c
@@ -13,8 +13,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_yukabyun/object_yukabyun.h"
 
diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h
index a695fb4c1f..36e7b13512 100644
--- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h
+++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h
@@ -2,7 +2,7 @@
 #define Z_EN_YUKABYUN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnYukabyun;
 
diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c
index b49481e881..7fa645e64a 100644
--- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c
+++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c
@@ -18,10 +18,10 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "audio.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_zf/object_zf.h"
 
@@ -169,47 +169,47 @@ static ColliderQuadInit sSwordQuadInit = {
     { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
 };
 
-typedef enum EnZfDamageEffect {
-    /* 0x0 */ ENZF_DMGEFF_NONE,
-    /* 0x1 */ ENZF_DMGEFF_STUN,
-    /* 0x6 */ ENZF_DMGEFF_IMMUNE = 6,       // Skips damage code, but also skips the top half of Update
-    /* 0xD */ ENZF_DMGEFF_PROJECTILE = 0xD, // Projectiles that don't have another damageeffect
-    /* 0xF */ ENZF_DMGEFF_ICE = 0xF
-} EnZfDamageEffect;
+typedef enum EnZfDamageReaction {
+    /* 0x0 */ ENZF_DMG_REACT_NONE,
+    /* 0x1 */ ENZF_DMG_REACT_STUN,
+    /* 0x6 */ ENZF_DMG_REACT_IMMUNE = 6,       // Skips damage code, but also skips the top half of Update
+    /* 0xD */ ENZF_DMG_REACT_PROJECTILE = 0xD, // Projectiles that don't have another damageeffect
+    /* 0xF */ ENZF_DMG_REACT_ICE = 0xF
+} EnZfDamageReaction;
 
 static DamageTable sDamageTable = {
-    /* Deku nut      */ DMG_ENTRY(0, ENZF_DMGEFF_STUN),
-    /* Deku stick    */ DMG_ENTRY(2, ENZF_DMGEFF_NONE),
-    /* Slingshot     */ DMG_ENTRY(1, ENZF_DMGEFF_PROJECTILE),
-    /* Explosive     */ DMG_ENTRY(2, ENZF_DMGEFF_NONE),
-    /* Boomerang     */ DMG_ENTRY(0, ENZF_DMGEFF_STUN),
-    /* Normal arrow  */ DMG_ENTRY(2, ENZF_DMGEFF_NONE),
-    /* Hammer swing  */ DMG_ENTRY(2, ENZF_DMGEFF_NONE),
-    /* Hookshot      */ DMG_ENTRY(0, ENZF_DMGEFF_STUN),
-    /* Kokiri sword  */ DMG_ENTRY(1, ENZF_DMGEFF_NONE),
-    /* Master sword  */ DMG_ENTRY(2, ENZF_DMGEFF_NONE),
-    /* Giant's Knife */ DMG_ENTRY(4, ENZF_DMGEFF_NONE),
-    /* Fire arrow    */ DMG_ENTRY(2, ENZF_DMGEFF_PROJECTILE),
-    /* Ice arrow     */ DMG_ENTRY(4, ENZF_DMGEFF_ICE),
-    /* Light arrow   */ DMG_ENTRY(2, ENZF_DMGEFF_PROJECTILE),
-    /* Unk arrow 1   */ DMG_ENTRY(2, ENZF_DMGEFF_PROJECTILE),
-    /* Unk arrow 2   */ DMG_ENTRY(2, ENZF_DMGEFF_PROJECTILE),
-    /* Unk arrow 3   */ DMG_ENTRY(2, ENZF_DMGEFF_PROJECTILE),
-    /* Fire magic    */ DMG_ENTRY(0, ENZF_DMGEFF_IMMUNE),
-    /* Ice magic     */ DMG_ENTRY(3, ENZF_DMGEFF_ICE),
-    /* Light magic   */ DMG_ENTRY(0, ENZF_DMGEFF_IMMUNE),
-    /* Shield        */ DMG_ENTRY(0, ENZF_DMGEFF_NONE),
-    /* Mirror Ray    */ DMG_ENTRY(0, ENZF_DMGEFF_NONE),
-    /* Kokiri spin   */ DMG_ENTRY(1, ENZF_DMGEFF_NONE),
-    /* Giant spin    */ DMG_ENTRY(4, ENZF_DMGEFF_NONE),
-    /* Master spin   */ DMG_ENTRY(2, ENZF_DMGEFF_NONE),
-    /* Kokiri jump   */ DMG_ENTRY(2, ENZF_DMGEFF_NONE),
-    /* Giant jump    */ DMG_ENTRY(8, ENZF_DMGEFF_NONE),
-    /* Master jump   */ DMG_ENTRY(4, ENZF_DMGEFF_NONE),
-    /* Unknown 1     */ DMG_ENTRY(0, ENZF_DMGEFF_NONE),
-    /* Unblockable   */ DMG_ENTRY(0, ENZF_DMGEFF_NONE),
-    /* Hammer jump   */ DMG_ENTRY(4, ENZF_DMGEFF_NONE),
-    /* Unknown 2     */ DMG_ENTRY(0, ENZF_DMGEFF_NONE),
+    /* Deku nut      */ DMG_ENTRY(0, ENZF_DMG_REACT_STUN),
+    /* Deku stick    */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE),
+    /* Slingshot     */ DMG_ENTRY(1, ENZF_DMG_REACT_PROJECTILE),
+    /* Explosive     */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE),
+    /* Boomerang     */ DMG_ENTRY(0, ENZF_DMG_REACT_STUN),
+    /* Normal arrow  */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE),
+    /* Hammer swing  */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE),
+    /* Hookshot      */ DMG_ENTRY(0, ENZF_DMG_REACT_STUN),
+    /* Kokiri sword  */ DMG_ENTRY(1, ENZF_DMG_REACT_NONE),
+    /* Master sword  */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE),
+    /* Giant's Knife */ DMG_ENTRY(4, ENZF_DMG_REACT_NONE),
+    /* Fire arrow    */ DMG_ENTRY(2, ENZF_DMG_REACT_PROJECTILE),
+    /* Ice arrow     */ DMG_ENTRY(4, ENZF_DMG_REACT_ICE),
+    /* Light arrow   */ DMG_ENTRY(2, ENZF_DMG_REACT_PROJECTILE),
+    /* Unk arrow 1   */ DMG_ENTRY(2, ENZF_DMG_REACT_PROJECTILE),
+    /* Unk arrow 2   */ DMG_ENTRY(2, ENZF_DMG_REACT_PROJECTILE),
+    /* Unk arrow 3   */ DMG_ENTRY(2, ENZF_DMG_REACT_PROJECTILE),
+    /* Fire magic    */ DMG_ENTRY(0, ENZF_DMG_REACT_IMMUNE),
+    /* Ice magic     */ DMG_ENTRY(3, ENZF_DMG_REACT_ICE),
+    /* Light magic   */ DMG_ENTRY(0, ENZF_DMG_REACT_IMMUNE),
+    /* Shield        */ DMG_ENTRY(0, ENZF_DMG_REACT_NONE),
+    /* Mirror Ray    */ DMG_ENTRY(0, ENZF_DMG_REACT_NONE),
+    /* Kokiri spin   */ DMG_ENTRY(1, ENZF_DMG_REACT_NONE),
+    /* Giant spin    */ DMG_ENTRY(4, ENZF_DMG_REACT_NONE),
+    /* Master spin   */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE),
+    /* Kokiri jump   */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE),
+    /* Giant jump    */ DMG_ENTRY(8, ENZF_DMG_REACT_NONE),
+    /* Master jump   */ DMG_ENTRY(4, ENZF_DMG_REACT_NONE),
+    /* Unknown 1     */ DMG_ENTRY(0, ENZF_DMG_REACT_NONE),
+    /* Unblockable   */ DMG_ENTRY(0, ENZF_DMG_REACT_NONE),
+    /* Hammer jump   */ DMG_ENTRY(4, ENZF_DMG_REACT_NONE),
+    /* Unknown 2     */ DMG_ENTRY(0, ENZF_DMG_REACT_NONE),
 };
 
 static InitChainEntry sInitChain[] = {
@@ -1324,7 +1324,7 @@ void EnZf_SetupStunned(EnZf* this) {
         this->hopAnimIndex = 1;
     }
 
-    if (this->damageEffect == ENZF_DMGEFF_ICE) {
+    if (this->damageReaction == ENZF_DMG_REACT_ICE) {
         this->iceTimer = 36;
     } else {
         Animation_PlayOnceSetSpeed(&this->skelAnime, &gZfKnockedBackAnim, 0.0f);
@@ -1685,7 +1685,7 @@ void EnZf_Damaged(EnZf* this, PlayState* play) {
         SkelAnime_Update(&this->skelAnime) && (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) {
 
         if (D_80B4A1B4 != -1) {
-            if (this->damageEffect == ENZF_DMGEFF_PROJECTILE) {
+            if (this->damageReaction == ENZF_DMG_REACT_PROJECTILE) {
                 D_80B4A1B0++;
             } else {
                 this->actor.world.rot.y = this->actor.shape.rot.y;
@@ -2028,12 +2028,12 @@ void EnZf_UpdateDamage(EnZf* this, PlayState* play) {
 
         if (((this->actor.params < ENZF_TYPE_LIZALFOS_MINIBOSS_A) /* not miniboss */ ||
              (D_80B4A1B4 != this->actor.params)) &&
-            (this->actor.colChkInfo.damageEffect != ENZF_DMGEFF_IMMUNE)) {
-            this->damageEffect = this->actor.colChkInfo.damageEffect;
+            (this->actor.colChkInfo.damageReaction != ENZF_DMG_REACT_IMMUNE)) {
+            this->damageReaction = this->actor.colChkInfo.damageReaction;
             Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, false);
 
-            if ((this->actor.colChkInfo.damageEffect == ENZF_DMGEFF_STUN) ||
-                (this->actor.colChkInfo.damageEffect == ENZF_DMGEFF_ICE)) {
+            if ((this->actor.colChkInfo.damageReaction == ENZF_DMG_REACT_STUN) ||
+                (this->actor.colChkInfo.damageReaction == ENZF_DMG_REACT_ICE)) {
                 if (this->action != ENZF_ACTION_STUNNED) {
                     Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80);
                     Actor_ApplyDamage(&this->actor);
@@ -2056,7 +2056,7 @@ void EnZf_UpdateDamage(EnZf* this, PlayState* play) {
                 } else {
                     if ((D_80B4A1B4 != -1) && ((this->actor.colChkInfo.health + this->actor.colChkInfo.damage) >= 4) &&
                         (this->actor.colChkInfo.health < 4)) {
-                        this->damageEffect = ENZF_DMGEFF_PROJECTILE;
+                        this->damageReaction = ENZF_DMG_REACT_PROJECTILE;
                     }
 
                     EnZf_SetupDamaged(this);
@@ -2072,7 +2072,7 @@ void EnZf_Update(Actor* thisx, PlayState* play) {
     s32 pad2;
 
     EnZf_UpdateDamage(this, play);
-    if (this->actor.colChkInfo.damageEffect != ENZF_DMGEFF_IMMUNE) {
+    if (this->actor.colChkInfo.damageReaction != ENZF_DMG_REACT_IMMUNE) {
         this->unk_3F8 = false;
         if ((this->hopAnimIndex != 1) && (this->action != ENZF_ACTION_HOP_AWAY)) {
             if (this->actor.speed != 0.0f) {
diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.h b/src/overlays/actors/ovl_En_Zf/z_en_zf.h
index 9dfb3119b9..1ecd0b646b 100644
--- a/src/overlays/actors/ovl_En_Zf/z_en_zf.h
+++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.h
@@ -2,7 +2,7 @@
 #define Z_EN_ZF_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnZf;
 
@@ -112,7 +112,7 @@ typedef struct EnZf {
     /* 0x0404 */ u8 alpha;
     /* 0x0408 */ f32 unk_408; // related to XZ speeds
     /* 0x040C */ f32 unk_40C; // related to y velocity
-    /* 0x0410 */ u8 damageEffect;
+    /* 0x0410 */ u8 damageReaction;
     /* 0x0414 */ s32 blureIndex;
     /* 0x0418 */ ColliderCylinder bodyCollider;
     /* 0x0464 */ ColliderQuad swordCollider;
diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
index 5c60653b4e..8de9163341 100644
--- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
+++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
@@ -14,10 +14,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_zl1/object_zl1.h"
 
diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h
index ada1335819..f1a07e1930 100644
--- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h
+++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h
@@ -2,7 +2,7 @@
 #define Z_EN_ZL1_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnZl1;
 
diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c
index f6fac8940a..4c763e5583 100644
--- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c
+++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c
@@ -1,4 +1,4 @@
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 static CutsceneCameraDirection D_80B4D5C0[] = {
     { { -440.0f, 117.0f, 0.0f }, { -490.0f, 120.0f, 0.0f }, 0, 45 },
diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c
index 4a8622cbba..77709ec0fb 100644
--- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c
+++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c
@@ -1,6 +1,6 @@
 #include "sequence.h"
-#include "z64cutscene_commands.h"
-#include "z64player.h"
+#include "cutscene_commands.h"
+#include "player.h"
 
 // clang-format off
 CutsceneData gTriforceCreationStartCs[] = {
diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
index c00790e02c..817ac9c3dd 100644
--- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
+++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
@@ -18,10 +18,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64frame_advance.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "frame_advance.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_zl2/object_zl2.h"
 #include "assets/objects/object_zl2_anime1/object_zl2_anime1.h"
@@ -1603,7 +1603,8 @@ void func_80B52114(EnZl2* this, PlayState* play) {
             break;
 #endif
         default:
-            PRINTF(VT_FGCOL(RED) " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
+            PRINTF(VT_FGCOL(RED) T(" En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n",
+                                   " En_Oa2 arg_data is wrong!!!!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST);
             func_80B4FD90(this, play);
     }
 }
@@ -1616,7 +1617,8 @@ void func_80B521A0(EnZl2* this, PlayState* play) {
 
 #if DEBUG_FEATURES
     if (objectSlot < 0) {
-        PRINTF(VT_FGCOL(RED) "En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST);
+        PRINTF(VT_FGCOL(RED) T("En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n",
+                               "En_Zl2_main_bank Can't read animation bank!!!!!!!!!!!!\n") VT_RST);
         return;
     }
 #endif
@@ -1665,7 +1667,8 @@ s32 EnZl2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p
 
     if (this->overrideLimbDrawConfig < 0 || this->overrideLimbDrawConfig > 0 ||
         sOverrideLimbDrawFuncs[this->overrideLimbDrawConfig] == NULL) {
-        PRINTF(VT_FGCOL(RED) "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
+        PRINTF(VT_FGCOL(RED) T("描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n",
+                               "The pre-drawing mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST);
         return 0;
     }
     return sOverrideLimbDrawFuncs[this->overrideLimbDrawConfig](play, limbIndex, dList, pos, rot, thisx, gfx);
diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h
index 4bd0730de7..42ea682f68 100644
--- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h
+++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h
@@ -2,7 +2,7 @@
 #define Z_EN_ZL2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnZl2;
 
diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
index 7977dfbe55..b9c396dfcc 100644
--- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
+++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
@@ -24,11 +24,11 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64frame_advance.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "frame_advance.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
@@ -813,7 +813,8 @@ void func_80B54F18(EnZl3* this, PlayState* play) {
 }
 
 void func_80B54FB4(EnZl3* this, PlayState* play) {
-    PRINTF("ゼルダ姫のEn_Zl3_Actor_inFinal_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+    PRINTF(T("ゼルダ姫のEn_Zl3_Actor_inFinal_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n",
+             "I'm going through Princess Zelda's En_Zl3_Actor_inFinal_Init!!!!!!!!!!!!!!!!!!!!!!!!!\n"));
     func_80B54E14(this, &gZelda2Anime2Anim_008AD0, 0, 0.0f, 0);
     EnZl3_setEyeIndex(this, 4);
     EnZl3_setMouthIndex(this, 2);
@@ -823,7 +824,8 @@ void func_80B54FB4(EnZl3* this, PlayState* play) {
     this->actor.shape.rot.z = 0;
     this->unk_3C4 = this->actor.world.rot.z;
     this->actor.world.rot.z = this->actor.shape.rot.z;
-    PRINTF("ゼルダ姫のEn_Zl3_Actor_inFinal_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+    PRINTF(T("ゼルダ姫のEn_Zl3_Actor_inFinal_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n",
+             "Princess Zelda's En_Zl3_Actor_inFinal_Init passed!!!!!!!!!!!!!!!!!!!!!!!!!\n"));
 }
 
 void func_80B55054(EnZl3* this) {
@@ -1028,11 +1030,13 @@ void func_80B5572C(EnZl3* this, PlayState* play) {
 }
 
 void func_80B55780(EnZl3* this, PlayState* play) {
-    PRINTF("ゼルダ姫のEn_Zl3_Actor_inFinal2_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+    PRINTF(T("ゼルダ姫のEn_Zl3_Actor_inFinal2_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n",
+             "I'm going through Princess Zelda's En_Zl3_Actor_inFinal2_Init!!!!!!!!!!!!!!!!!!!!!!!!!\n"));
     func_80B54E14(this, &gZelda2Anime2Anim_005A0C, 0, 0.0f, 0);
     this->action = 7;
     this->drawConfig = 1;
-    PRINTF("ゼルダ姫のEn_Zl3_Actor_inFinal2_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+    PRINTF(T("ゼルダ姫のEn_Zl3_Actor_inFinal2_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n",
+             "Princess Zelda's En_Zl3_Actor_inFinal2_Init passed!!!!!!!!!!!!!!!!!!!!!!!!!\n"));
     EnZl3_setMouthIndex(this, 1);
     this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
 }
@@ -2660,7 +2664,8 @@ void func_80B59B6C(EnZl3* this, PlayState* play) {
             func_80B59828(this, play);
             break;
         default:
-            PRINTF(VT_FGCOL(RED) " En_Oa3 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
+            PRINTF(VT_FGCOL(RED) T(" En_Oa3 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n",
+                                   " En_Oa3 arg_data is wrong!!!!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST);
             Actor_Kill(&this->actor);
     }
 }
@@ -2673,7 +2678,8 @@ void func_80B59DB8(EnZl3* this, PlayState* play) {
 
 #if DEBUG_FEATURES
     if (objectSlot < 0) {
-        PRINTF(VT_FGCOL(RED) "En_Zl3_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST);
+        PRINTF(VT_FGCOL(RED) T("En_Zl3_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n",
+                               "En_Zl3_main_bank Can't read animation bank!!!!!!!!!!!!\n") VT_RST);
         return;
     }
 #endif
@@ -2710,7 +2716,8 @@ void EnZl3_Init(Actor* thisx, PlayState* play) {
     ActorShape* shape = &this->actor.shape;
     s32 pad;
 
-    PRINTF("ゼルダ姫のEn_Zl3_Actor_ct通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+    PRINTF(T("ゼルダ姫のEn_Zl3_Actor_ct通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n",
+             "I'm going through Princess Zelda's En_Zl3_Actor_ct!!!!!!!!!!!!!!!!!!!!!!!!!\n"));
     ActorShape_Init(shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
     shape->shadowAlpha = 0;
     func_80B533B0(thisx, play);
@@ -2725,7 +2732,8 @@ void EnZl3_Init(Actor* thisx, PlayState* play) {
             break;
     }
 
-    PRINTF("ゼルダ姫のEn_Zl3_Actor_ctは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+    PRINTF(T("ゼルダ姫のEn_Zl3_Actor_ctは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n",
+             "Princess Zelda's En_Zl3_Actor_ct passed!!!!!!!!!!!!!!!!!!!!!!!!!\n"));
 }
 
 static OverrideLimbDraw sOverrideLimbDrawFuncs[] = {
@@ -2739,7 +2747,8 @@ s32 EnZl3_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p
 
     if (this->unk_308 < 0 || this->unk_308 >= ARRAY_COUNT(sOverrideLimbDrawFuncs) ||
         sOverrideLimbDrawFuncs[this->unk_308] == NULL) {
-        PRINTF(VT_FGCOL(RED) "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
+        PRINTF(VT_FGCOL(RED) T("描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n",
+                               "The pre-drawing mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST);
         return 0;
     }
     return sOverrideLimbDrawFuncs[this->unk_308](play, limbIndex, dList, pos, rot, thisx, gfx);
diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h
index 695588fd52..ab656ead8c 100644
--- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h
+++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h
@@ -2,8 +2,8 @@
 #define Z_EN_ZL3_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64scene.h"
+#include "actor.h"
+#include "scene.h"
 
 #include "overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h"
 
diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
index a18efd4ba9..be729698f4 100644
--- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
+++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
@@ -16,11 +16,11 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_zl4/object_zl4.h"
 #include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h"
diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
index b371092e08..c7020df315 100644
--- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
+++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
@@ -2,7 +2,7 @@
 #define Z_EN_ZL4_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnZl4;
 
diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c
index 933f7e0aaa..3819247d5c 100644
--- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c
+++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c
@@ -1,4 +1,4 @@
-#include "z64cutscene_commands.h"
+#include "cutscene_commands.h"
 
 static CutsceneCameraDirection sCamDirections[] = {
     { { -490.0f, 120.0f, 0.0f }, { -440.0f, 117.0f, 0.0f }, 0, 45 },
diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c
index 95a9f6e07c..85f0f300e9 100644
--- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c
+++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c
@@ -14,10 +14,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "face_reaction.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_zo/object_zo.h"
 
diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.h b/src/overlays/actors/ovl_En_Zo/z_en_zo.h
index 5f26a20230..a0ada224a1 100644
--- a/src/overlays/actors/ovl_En_Zo/z_en_zo.h
+++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.h
@@ -2,7 +2,7 @@
 #define Z_EN_ZO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EnZo;
 
diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c
index 02e24ff540..5b37333bc9 100644
--- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c
+++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c
@@ -20,10 +20,10 @@
 #include "sequence.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
-#include "z64skin.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
+#include "skin.h"
 
 #include "assets/objects/object_fhg/object_fhg.h"
 
diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.h b/src/overlays/actors/ovl_En_fHG/z_en_fhg.h
index dca6eeb82a..f8f514dfdb 100644
--- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.h
+++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.h
@@ -2,8 +2,8 @@
 #define Z_EN_FHG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64skin.h"
+#include "actor.h"
+#include "skin.h"
 
 struct EnfHG;
 
diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c
index 3e2d26e509..20c26abb89 100644
--- a/src/overlays/actors/ovl_End_Title/z_end_title.c
+++ b/src/overlays/actors/ovl_End_Title/z_end_title.c
@@ -9,9 +9,10 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
+#include "tex_len.h"
 #include "versions.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
@@ -33,7 +34,125 @@ ActorProfile End_Title_Profile = {
     /**/ EndTitle_DrawFull,
 };
 
-#include "assets/overlays/ovl_End_Title/ovl_End_Title.c"
+#if OOT_VERSION != IQUE_CN
+
+#define sTheLegendOfZeldaTex_WIDTH 120
+#define sTheLegendOfZeldaTex_HEIGHT 24
+static u64 sTheLegendOfZeldaTex[TEX_LEN(u64, sTheLegendOfZeldaTex_WIDTH, sTheLegendOfZeldaTex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_End_Title/sTheLegendOfZeldaTex.ia8.inc.c"
+};
+
+#define sOcarinaOfTimeTex_WIDTH 112
+#define sOcarinaOfTimeTex_HEIGHT 16
+static u64 sOcarinaOfTimeTex[TEX_LEN(u64, sOcarinaOfTimeTex_WIDTH, sOcarinaOfTimeTex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_End_Title/sOcarinaOfTimeTex.ia8.inc.c"
+};
+
+#define sTheEndTex_WIDTH 80
+#define sTheEndTex_HEIGHT 24
+static u64 sTheEndTex[TEX_LEN(u64, sTheEndTex_WIDTH, sTheEndTex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_End_Title/sTheEndTex.ia8.inc.c"
+};
+
+#else
+
+static Gfx sEmptyDL1[1] = {
+#include "assets/overlays/ovl_End_Title/sEmptyDL1.inc.c"
+};
+
+#define sIQueTop_WIDTH 128
+#define sIQueTop_HEIGHT 24
+static u64 sIQueTop[TEX_LEN(u64, sIQueTop_WIDTH, sIQueTop_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_End_Title/sIQueTop.ia8.inc.c"
+};
+
+#define sIQueBottom_WIDTH 128
+#define sIQueBottom_HEIGHT 24
+static u64 sIQueBottom[TEX_LEN(u64, sIQueBottom_WIDTH, sIQueBottom_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_End_Title/sIQueBottom.ia8.inc.c"
+};
+
+static Gfx sEmptyDL2[1] = {
+#include "assets/overlays/ovl_End_Title/sEmptyDL2.inc.c"
+};
+
+#endif
+
+#define sNintendoLeftTex_WIDTH 64
+#define sNintendoLeftTex_HEIGHT 48
+static u64 sNintendoLeftTex[TEX_LEN(u64, sNintendoLeftTex_WIDTH, sNintendoLeftTex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_End_Title/sNintendoLeftTex.ia8.inc.c"
+};
+
+#if OOT_VERSION == IQUE_CN
+static Gfx sEmptyDL3[1] = {
+#include "assets/overlays/ovl_End_Title/sEmptyDL3.inc.c"
+};
+#endif
+
+#define sNintendoRightTex_WIDTH 64
+#define sNintendoRightTex_HEIGHT 48
+static u64 sNintendoRightTex[TEX_LEN(u64, sNintendoRightTex_WIDTH, sNintendoRightTex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_End_Title/sNintendoRightTex.ia8.inc.c"
+};
+
+#if OOT_VERSION == IQUE_CN
+static Gfx sEmptyDL4[1] = {
+#include "assets/overlays/ovl_End_Title/sEmptyDL4.inc.c"
+};
+#endif
+
+#define sPresentedByTex_WIDTH 96
+#define sPresentedByTex_HEIGHT 16
+static u64 sPresentedByTex[TEX_LEN(u64, sPresentedByTex_WIDTH, sPresentedByTex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_End_Title/sPresentedByTex.ia8.inc.c"
+};
+
+#if OOT_VERSION == IQUE_CN
+
+static Gfx sEmptyDL5[1] = {
+#include "assets/overlays/ovl_End_Title/sEmptyDL5.inc.c"
+};
+
+#define sTheEndTex_WIDTH 80
+#define sTheEndTex_HEIGHT 24
+static u64 sTheEndTex[TEX_LEN(u64, sTheEndTex_WIDTH, sTheEndTex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_End_Title/sTheEndTex.ia8.inc.c"
+};
+
+static Gfx sEmptyDL6[1] = {
+#include "assets/overlays/ovl_End_Title/sEmptyDL6.inc.c"
+};
+
+#define sTheLegendOfZeldaTex_WIDTH 120
+#define sTheLegendOfZeldaTex_HEIGHT 24
+static u64 sTheLegendOfZeldaTex[TEX_LEN(u64, sTheLegendOfZeldaTex_WIDTH, sTheLegendOfZeldaTex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_End_Title/sTheLegendOfZeldaTex.ia8.inc.c"
+};
+
+static Gfx sEmptyDL7[1] = {
+#include "assets/overlays/ovl_End_Title/sEmptyDL7.inc.c"
+};
+
+#define sOcarinaOfTimeTex_WIDTH 112
+#define sOcarinaOfTimeTex_HEIGHT 16
+static u64 sOcarinaOfTimeTex[TEX_LEN(u64, sOcarinaOfTimeTex_WIDTH, sOcarinaOfTimeTex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_End_Title/sOcarinaOfTimeTex.ia8.inc.c"
+};
+
+#endif
+
+static Vtx sTriforceVtx[] = {
+#include "assets/overlays/ovl_End_Title/sTriforceVtx.inc.c"
+};
+
+static Gfx sTriforceDL[12] = {
+#include "assets/overlays/ovl_End_Title/sTriforceDL.inc.c"
+};
+
+static Gfx sPresentedByNintendoDL[] = {
+#include "assets/overlays/ovl_End_Title/sPresentedByNintendoDL.inc.c"
+};
 
 void EndTitle_Init(Actor* thisx, PlayState* play) {
     EndTitle* this = (EndTitle*)thisx;
@@ -94,19 +213,21 @@ void EndTitle_DrawFull(Actor* thisx, PlayState* play) {
     gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0,
                       COMBINED, 0, 0, 0, COMBINED);
     gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->endAlpha);
-    gDPLoadTextureTile(OVERLAY_DISP++, sTheEndTex, G_IM_FMT_IA, G_IM_SIZ_8b, 80, 24, 0, 0, 80, 24, 0,
-                       G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0);
+    gDPLoadTextureTile(OVERLAY_DISP++, sTheEndTex, G_IM_FMT_IA, G_IM_SIZ_8b, sTheEndTex_WIDTH, sTheEndTex_HEIGHT, 0, 0,
+                       80, 24, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0);
     gSPTextureRectangle(OVERLAY_DISP++, 120 << 2, 90 << 2, 200 << 2, 113 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
     gDPPipeSync(OVERLAY_DISP++);
     gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->tlozAlpha);
-    gDPLoadTextureTile(OVERLAY_DISP++, sTheLegendOfZeldaTex, G_IM_FMT_IA, G_IM_SIZ_8b, 120, 24, 0, 0, 120, 24, 0,
-                       G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0);
+    gDPLoadTextureTile(OVERLAY_DISP++, sTheLegendOfZeldaTex, G_IM_FMT_IA, G_IM_SIZ_8b, sTheLegendOfZeldaTex_WIDTH,
+                       sTheLegendOfZeldaTex_HEIGHT, 0, 0, 120, 24, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                       G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0);
     gSPTextureRectangle(OVERLAY_DISP++, 100 << 2, 160 << 2, 220 << 2, 183 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10,
                         1 << 10);
     gDPPipeSync(OVERLAY_DISP++);
     gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->ootAlpha);
-    gDPLoadTextureTile(OVERLAY_DISP++, sOcarinaOfTimeTex, G_IM_FMT_IA, G_IM_SIZ_8b, 112, 16, 0, 0, 112, 16, 0,
-                       G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0);
+    gDPLoadTextureTile(OVERLAY_DISP++, sOcarinaOfTimeTex, G_IM_FMT_IA, G_IM_SIZ_8b, sOcarinaOfTimeTex_WIDTH,
+                       sOcarinaOfTimeTex_HEIGHT, 0, 0, 112, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
+                       0, 0, 0, 0);
     gSPTextureRectangle(OVERLAY_DISP++, 104 << 2, 177 << 2, 216 << 2, 192 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10,
                         1 << 10);
 
diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.h b/src/overlays/actors/ovl_End_Title/z_end_title.h
index cd29ff507c..41cbb8664b 100644
--- a/src/overlays/actors/ovl_End_Title/z_end_title.h
+++ b/src/overlays/actors/ovl_End_Title/z_end_title.h
@@ -2,7 +2,7 @@
 #define Z_END_TITLE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct EndTitle;
 
diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c
index 7f3c3eb85b..9f94310a35 100644
--- a/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -28,11 +28,11 @@
 #include "terminal.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
+#include "skin_matrix.h"
 #if PLATFORM_N64
 #include "cic6105.h"
 #endif
diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.h b/src/overlays/actors/ovl_Fishing/z_fishing.h
index 6836ce79f8..7cb72e88dd 100644
--- a/src/overlays/actors/ovl_Fishing/z_fishing.h
+++ b/src/overlays/actors/ovl_Fishing/z_fishing.h
@@ -2,8 +2,8 @@
 #define Z_FISHING_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct Fishing;
 
diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
index a690bfa73f..3c636bc128 100644
--- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
+++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
@@ -11,8 +11,8 @@
 #include "ichain.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64item.h"
-#include "z64play.h"
+#include "item.h"
+#include "play_state.h"
 
 #include "assets/objects/object_gi_hearts/object_gi_hearts.h"
 
diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
index ef92f86b86..d8bc6bfe72 100644
--- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
+++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
@@ -2,7 +2,7 @@
 #define Z_ITEM_B_HEART_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ItemBHeart;
 
diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
index 3909fb72f9..99db32656c 100644
--- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
+++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
@@ -10,10 +10,10 @@
 #include "libu64/debug.h"
 #include "printf.h"
 #include "rand.h"
-#include "z64draw.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "draw.h"
+#include "effect.h"
+#include "play_state.h"
+#include "save.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
index e938c81267..dcae852df4 100644
--- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
+++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
@@ -2,7 +2,7 @@
 #define Z_ITEM_ETC_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ItemEtcetera;
 
diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c
index 40594c86f6..4459188135 100644
--- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c
+++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c
@@ -5,8 +5,8 @@
  */
 
 #include "z_item_inbox.h"
-#include "z64draw.h"
-#include "z64play.h"
+#include "draw.h"
+#include "play_state.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
 
diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h
index d13bad0053..c22eda0a95 100644
--- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h
+++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h
@@ -2,7 +2,7 @@
 #define Z_ITEM_INBOX_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ItemInbox;
 
diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
index fa4f500c87..7e6630f4f8 100644
--- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
+++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
@@ -9,10 +9,10 @@
 #include "libu64/debug.h"
 #include "segmented_address.h"
 #include "sfx.h"
-#include "z64draw.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "draw.h"
+#include "effect.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/scenes/overworld/spot00/spot00_scene.h"
 
diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h
index 3ae598e7d1..5dd7dd74de 100644
--- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h
+++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h
@@ -2,7 +2,7 @@
 #define Z_ITEM_OCARINA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ItemOcarina;
 
diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c
index 2f281a17d2..9dda7af3f0 100644
--- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c
+++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c
@@ -15,10 +15,10 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64item.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "item.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_link_child/object_link_child.h"
 
diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.h b/src/overlays/actors/ovl_Item_Shield/z_item_shield.h
index 564170e465..6fcfcbd209 100644
--- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.h
+++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.h
@@ -2,7 +2,7 @@
 #define Z_ITEM_SHIELD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ItemShield;
 
diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
index d2912c7ea5..21827f32c0 100644
--- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
+++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
@@ -12,9 +12,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h
index 59344baff1..d475bab70f 100644
--- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h
+++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h
@@ -2,7 +2,7 @@
 #define Z_MAGIC_DARK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct MagicDark;
 
diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c
index e60e524b84..103a7ee1b8 100644
--- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c
+++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c
@@ -12,8 +12,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h
index ae953c0d3c..d561d291e6 100644
--- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h
+++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h
@@ -2,7 +2,7 @@
 #define Z_MAGIC_FIRE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct MagicFire;
 
diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
index 2dca261b93..aff6fcd55a 100644
--- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
+++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
@@ -6,16 +6,15 @@
 
 #include "z_magic_wind.h"
 
-#include "libu64/debug.h"
 #include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "printf.h"
 #include "sfx.h"
 #include "translation.h"
-#include "z64curve.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "curve.h"
+#include "play_state.h"
+#include "player.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
@@ -69,8 +68,7 @@ void MagicWind_Init(Actor* thisx, PlayState* play) {
         case 1:
             SkelCurve_SetAnim(&this->skelCurve, &sAnim, 60.0f, 0.0f, 60.0f, -1.0f);
             MagicWind_SetupAction(this, MagicWind_Shrink);
-            // "Means start"
-            LOG_STRING("表示開始", "../z_magic_wind.c", 486);
+            LOG_STRING_T("表示開始", "Start displaying", "../z_magic_wind.c", 486);
             Player_PlaySfx(player, NA_SE_PL_MAGIC_WIND_WARP);
             break;
     }
@@ -80,8 +78,7 @@ void MagicWind_Destroy(Actor* thisx, PlayState* play) {
     MagicWind* this = (MagicWind*)thisx;
     SkelCurve_Destroy(play, &this->skelCurve);
     Magic_Reset(play);
-    // "wipe out"
-    LOG_STRING("消滅", "../z_magic_wind.c", 505);
+    LOG_STRING_T("消滅", "Disappearance", "../z_magic_wind.c", 505);
 }
 
 void MagicWind_UpdateAlpha(f32 alpha) {
@@ -100,8 +97,7 @@ void MagicWind_WaitForTimer(MagicWind* this, PlayState* play) {
         return;
     }
 
-    // "Means start"
-    LOG_STRING("表示開始", "../z_magic_wind.c", 539);
+    LOG_STRING_T("表示開始", "Start displaying", "../z_magic_wind.c", 539);
     Player_PlaySfx(player, NA_SE_PL_MAGIC_WIND_NORMAL);
     MagicWind_UpdateAlpha(1.0f);
     MagicWind_SetupAction(this, MagicWind_Grow);
diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h
index b7ba93c264..6a186dcb56 100644
--- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h
+++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h
@@ -2,8 +2,8 @@
 #define Z_MAGIC_WIND_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64curve.h"
+#include "actor.h"
+#include "curve.h"
 
 struct MagicWind;
 
diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
index b89838083f..06254d6ca6 100644
--- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
+++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
@@ -16,9 +16,9 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_mir_ray/object_mir_ray.h"
 
@@ -182,12 +182,11 @@ void MirRay_Init(Actor* thisx, PlayState* play) {
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
     PRINTF(T("反射用 光の発生!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n",
-             "Generation of reflectable light!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"));
+             "Spawn of reflectable light!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"));
     LOG_NUM("this->actor.arg_data", this->actor.params, "../z_mir_ray.c", 518);
 
     if (this->actor.params >= 0xA) {
-        // "Reflected light generation failure"
-        LOG_STRING("反射光 発生失敗", "../z_mir_ray.c", 521);
+        LOG_STRING_T("反射光 発生失敗", "Reflected light failed to spawn", "../z_mir_ray.c", 521);
         Actor_Kill(&this->actor);
     }
 
diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
index 245cf1007b..ddc4a4708d 100644
--- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
+++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
@@ -2,8 +2,8 @@
 #define Z_MIR_RAY_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct MirRay;
 
diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
index 88638e1ed8..7ccb70299d 100644
--- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
+++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
@@ -19,10 +19,10 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64cutscene_flags.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "cutscene_flags.h"
+#include "effect.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_mamenoki/object_mamenoki.h"
@@ -163,8 +163,8 @@ void ObjBean_InitDynaPoly(ObjBean* this, PlayState* play, CollisionHeader* colli
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_obj_bean.c", 374, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
index 42ba39261c..172fa66101 100644
--- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
+++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_BEAN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjBean;
 
diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c
index 8f24b7e647..5f76c6e02a 100644
--- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c
+++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c
@@ -9,7 +9,7 @@
 
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS 0
 
diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h
index e0159e0f97..a8e75a42cd 100644
--- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h
+++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_BLOCKSTOP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjBlockstop;
 
diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
index c6d7b1da3f..1ebc95cff8 100644
--- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
+++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
@@ -13,8 +13,8 @@
 #include "rand.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_bombiwa/object_bombiwa.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h
index 9c5c38d127..f12a0d246e 100644
--- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h
+++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_BOMBIWA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjBombiwa;
 
diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
index d3affc90a9..9430414f3e 100644
--- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
+++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
@@ -14,8 +14,8 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
index acda97f16d..5395353efb 100644
--- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
+++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_COMB_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjComb;
 
diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
index 2c77570a41..3484ffcefa 100644
--- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
+++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
@@ -10,8 +10,8 @@
 #include "gfx_setupdl.h"
 #include "sfx.h"
 #include "sys_matrix.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/object_dekujr/object_dekujr.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h
index 68b483f8dc..4c7b50b9f9 100644
--- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h
+++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_DEKUJR_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjDekujr;
 
diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c
index 2163114cd2..ad572f17be 100644
--- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c
+++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c
@@ -11,7 +11,7 @@
 #include "sfx.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_d_elevator/object_d_elevator.h"
 
@@ -63,8 +63,8 @@ void func_80B92B08(ObjElevator* this, PlayState* play, CollisionHeader* collisio
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_obj_elevator.c", 136, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h
index e6b8d4b6d8..a6d665d55a 100644
--- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h
+++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_ELEVATOR_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjElevator;
 
diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c
index 39d6de7d65..97c898f466 100644
--- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c
+++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c
@@ -15,8 +15,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h
index 8a2256bf04..457a413f85 100644
--- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h
+++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_HAMISHI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjHamishi;
 
diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c
index f1f8000063..8cfaa9599e 100644
--- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c
+++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c
@@ -7,8 +7,8 @@
 #include "z_obj_hana.h"
 
 #include "ichain.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h
index 69c08b4cb6..1296e275c7 100644
--- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h
+++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_HANA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjHana;
 
diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c
index c057c6b875..3d8af090e5 100644
--- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c
+++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c
@@ -14,7 +14,7 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/object_d_hsblock/object_d_hsblock.h"
 
@@ -75,8 +75,8 @@ void func_80B93B68(ObjHsblock* this, PlayState* play, CollisionHeader* collision
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_obj_hsblock.c", 163, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h
index 299ba7d3d6..4f4696eb6c 100644
--- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h
+++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_HSBLOCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjHsblock;
 
diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c
index 71ff43d277..3dac2d7fe4 100644
--- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c
+++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c
@@ -13,8 +13,8 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h
index c6a56d16f1..bb2c860a7d 100644
--- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h
+++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_ICE_POLY_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjIcePoly;
 
diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
index 8501c29f5b..b4dd823735 100644
--- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
+++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
@@ -14,9 +14,9 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h
index 7538b53705..8a299bfe07 100644
--- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h
+++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_KIBAKO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjKibako;
 
diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
index 9233f00c7a..c8c0a1211f 100644
--- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
+++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
@@ -14,8 +14,8 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_kibako2/object_kibako2.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h
index 177ef0b04c..201e5cde88 100644
--- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h
+++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_KIBAKO2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjKibako2;
 
diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c
index 0a5866d1d1..a6c35ed922 100644
--- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c
+++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c
@@ -15,8 +15,8 @@
 #include "sfx.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_d_lift/object_d_lift.h"
 
@@ -84,8 +84,8 @@ void ObjLift_InitDynaPoly(ObjLift* this, PlayState* play, CollisionHeader* colli
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_obj_lift.c", 188, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h
index e3f217b930..58bebccf1e 100644
--- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h
+++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_LIFT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjLift;
 
diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
index 05fe7a206f..3a99282723 100644
--- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
+++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
@@ -19,8 +19,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_lightswitch/object_lightswitch.h"
 
@@ -205,7 +205,7 @@ void ObjLightswitch_Init(Actor* thisx, PlayState* play) {
                                (0xFF << 8) | PUSHBLOCK_SMALL_START_ON) == NULL) {
             PRINTF_COLOR_ERROR();
             PRINTF(T("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n",
-                     "Push/pull block failure(%s %d)(arg_data 0x%04x)\n"),
+                     "Push/pull block failed to spawn (%s %d)(arg_data 0x%04x)\n"),
                    "../z_obj_lightswitch.c", 452, this->actor.params);
             PRINTF_RST();
             removeSelf = true;
diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h
index 7f0834a240..0b11c6ae72 100644
--- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h
+++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_LIGHTSWITCH_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjLightswitch;
 
diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
index cc7651b6b4..ca902bce1b 100644
--- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
+++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
@@ -9,8 +9,8 @@
 #include "printf.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h
index 0ac9b7ab84..c6134808c5 100644
--- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h
+++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_MAKEKINSUTA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjMakekinsuta;
 
diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c
index ee2e8801c5..ad06491a54 100644
--- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c
+++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c
@@ -14,7 +14,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED
 
@@ -80,7 +80,7 @@ void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play) {
     if (Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_OBJ_OSHIHIKI, spawnPos->x, spawnPos->y, spawnPos->z, 0,
                            block->rotY, 0, ((block->color << 6) & 0xC0) | (block->type & 0xF) | 0xFF00) == NULL) {
         PRINTF_COLOR_ERROR();
-        PRINTF(T("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", "Error : Push/pull block failure (%s %d)\n"),
+        PRINTF(T("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", "Error : Push/pull block failed to spawn (%s %d)\n"),
                "../z_obj_makeoshihiki.c", 194);
         PRINTF_RST();
         Actor_Kill(thisx);
diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h
index 84938f578a..8ff31186c5 100644
--- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h
+++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_MAKEOSHIHIKI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjMakeoshihiki;
 
diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c
index 126e2c42ec..238bf69cf6 100644
--- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c
+++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c
@@ -11,7 +11,7 @@
 #include "ichain.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS 0
 
@@ -176,7 +176,7 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) {
                     this->children[i]->flags |= ACTOR_FLAG_GRASS_DESTROYED;
                     this->children[i]->room = actor->room;
                 } else {
-                    PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to occur (%s %d)\n"), "../z_obj_mure.c",
+                    PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to spawn (%s %d)\n"), "../z_obj_mure.c",
                            359);
                 }
                 break;
@@ -188,7 +188,7 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) {
                 if (this->children[i] != NULL) {
                     this->children[i]->room = actor->room;
                 } else {
-                    PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to occur (%s %d)\n"), "../z_obj_mure.c",
+                    PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to spawn (%s %d)\n"), "../z_obj_mure.c",
                            382);
                 }
                 break;
@@ -221,7 +221,7 @@ void ObjMure_SpawnActors1(ObjMure* this, PlayState* play2) {
             this->children[i]->room = actor->room;
         } else {
             this->childrenStates[i] = OBJMURE_CHILD_STATE_1;
-            PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to occur (%s %d)\n"), "../z_obj_mure.c", 438);
+            PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to spawn (%s %d)\n"), "../z_obj_mure.c", 438);
         }
     }
 }
diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h
index 20cf667daa..bc6fc66e9a 100644
--- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h
+++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_MURE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjMure;
 
diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c
index eca8b0d933..e2e50736e0 100644
--- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c
+++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c
@@ -11,7 +11,7 @@
 #include "sys_math3d.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS 0
 
diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h
index 8643d477e1..b15386e945 100644
--- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h
+++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_MURE2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjMure2;
 
diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c
index 51035c0678..ff37f4b8e1 100644
--- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c
+++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c
@@ -10,7 +10,7 @@
 #include "sys_math3d.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS 0
 
diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
index fc9a3e83aa..e9b237361b 100644
--- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
+++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_MURE3_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjMure3;
 
diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
index efa0fe3f46..b328e2b6c1 100644
--- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
+++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
@@ -18,8 +18,8 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 
@@ -111,8 +111,8 @@ void ObjOshihiki_InitDynapoly(ObjOshihiki* this, PlayState* play, CollisionHeade
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_obj_oshihiki.c", 280, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
index 265ba4691c..45e72bec96 100644
--- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
+++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_OSHIHIKI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjOshihiki;
 
diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c
index 6eca379686..0ff67cc85c 100644
--- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c
+++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c
@@ -8,8 +8,8 @@
 
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
index ee8e74eaa2..c23785a32a 100644
--- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
+++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_ROOMTIMER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjRoomtimer;
 
diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
index 2ad4bbf09a..f8cc6397f8 100644
--- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
+++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
@@ -19,8 +19,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 
@@ -218,8 +218,8 @@ void ObjSwitch_InitDynaPoly(ObjSwitch* this, PlayState* play, CollisionHeader* c
     if (this->dyna.bgId == BG_ACTOR_MAX) {
         s32 pad2;
 
-        PRINTF(T("Warning : move BG 登録失敗",
-                 "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n",
+        PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n",
+                 "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"),
                "../z_obj_switch.c", 531, this->dyna.actor.id, this->dyna.actor.params);
     }
 #endif
@@ -339,7 +339,7 @@ void ObjSwitch_Init(Actor* thisx, PlayState* play) {
 
     if (OBJSWITCH_FROZEN(&this->dyna.actor) && (ObjSwitch_SpawnIce(this, play) == NULL)) {
         PRINTF_COLOR_RED();
-        PRINTF(T("Error : 氷発生失敗 (%s %d)\n", "Error : Ice generation failure (%s %d)\n"), "../z_obj_switch.c", 732);
+        PRINTF(T("Error : 氷発生失敗 (%s %d)\n", "Error : Ice failed to spawn (%s %d)\n"), "../z_obj_switch.c", 732);
         PRINTF_RST();
         this->dyna.actor.params &= ~OBJSWITCH_FROZEN_FLAG;
     }
diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
index b4d3ae8b20..328f6389c0 100644
--- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
+++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_SWITCH_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjSwitch;
 
diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
index a189fe4345..9409ee0a52 100644
--- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
+++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
@@ -15,7 +15,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_syokudai/object_syokudai.h"
diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h
index 4dee2ba671..e651bc29de 100644
--- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h
+++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h
@@ -2,8 +2,8 @@
 #define Z_OBJ_SYOKUDAI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct ObjSyokudai;
 
diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c
index b3dc890ca8..2e3f6e0186 100644
--- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c
+++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c
@@ -15,10 +15,10 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_timeblock/object_timeblock.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h
index 966f474496..1cd2a07644 100644
--- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h
+++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_TIMEBLOCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjTimeblock;
 
diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
index 9afd53ae53..4a2ba2d3d9 100644
--- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
+++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
@@ -14,10 +14,10 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64item.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "item.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 #include "assets/objects/object_tsubo/object_tsubo.h"
diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
index 8e27cc8310..b42de51f48 100644
--- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
+++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_TSUBO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjTsubo;
 
diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c
index 55023cccc1..0d5e46873a 100644
--- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c
+++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c
@@ -17,9 +17,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/object_timeblock/object_timeblock.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h
index 8f22398db7..199dca053a 100644
--- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h
+++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h
@@ -2,7 +2,7 @@
 #define Z_OBJ_WARP2BLOCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjWarp2block;
 
diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
index c170279758..5f8f580e4e 100644
--- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
+++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
@@ -16,10 +16,10 @@
 #include "sys_math3d.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
index 40307f5e91..a225f53bc9 100644
--- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
+++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
@@ -2,7 +2,7 @@
 #define Z_OBJECT_KANKYO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ObjectKankyo;
 
diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
index ab09e7420b..61772fa0c1 100644
--- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
+++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
@@ -15,11 +15,11 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64light.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "light.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
index 222c977fc2..be5389c74c 100644
--- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
+++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
@@ -2,8 +2,8 @@
 #define Z_OCEFF_SPOT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64light.h"
+#include "actor.h"
+#include "light.h"
 
 struct OceffSpot;
 
diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c
index 5e236c86f4..036349d0e9 100644
--- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c
+++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c
@@ -9,9 +9,9 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
index aebc002780..269d57d8b5 100644
--- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
+++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
@@ -2,7 +2,7 @@
 #define Z_OCEFF_STORM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct OceffStorm;
 
diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
index 36177c0729..8346407c9a 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
+++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
@@ -12,9 +12,9 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h
index 65a18468a3..5e6e4add96 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h
@@ -2,7 +2,7 @@
 #define Z_OCEFF_WIPE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum OceffWipeType {
     /* 0x00 */ OCEFF_WIPE_ZL,
diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
index db8171b362..71498caa13 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
+++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
@@ -12,9 +12,9 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h
index 6276bb33c4..c83616da8c 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h
@@ -2,7 +2,7 @@
 #define Z_OCEFF_WIPE2_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct OceffWipe2;
 
diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
index 7aec9136f2..6ec42324a2 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
+++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
@@ -12,9 +12,9 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h
index 5e6abb0456..b7fddd9f60 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h
@@ -2,7 +2,7 @@
 #define Z_OCEFF_WIPE3_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct OceffWipe3;
 
diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
index 0828ba289f..8b860cc0c1 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
+++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
@@ -12,7 +12,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h
index bd82ddc7c4..f7eac4cf04 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h
@@ -2,7 +2,7 @@
 #define Z_OCEFF_WIPE4_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum OceffWipe4Type {
     /* 0x00 */ OCEFF_WIPE4_SCARECROWS,
diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
index e069f1730a..1ba86361ed 100644
--- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
+++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
@@ -17,11 +17,11 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64environment.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "environment.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/scenes/overworld/spot06/spot06_scene.h"
 
@@ -78,7 +78,7 @@ void ShotSun_Init(Actor* thisx, PlayState* play) {
     ShotSun* this = (ShotSun*)thisx;
     s32 params;
 
-    PRINTF(T("%d ---- オカリナの秘密発生!!!!!!!!!!!!!\n", "%d ---- Ocarina secret occurrence!!!!!!!!!!!!!\n"),
+    PRINTF(T("%d ---- オカリナの秘密発生!!!!!!!!!!!!!\n", "%d ---- Ocarina secret spawn!!!!!!!!!!!!!\n"),
            this->actor.params);
     params = PARAMS_GET_U(this->actor.params, 0, 8);
     if (params == 0x40 || params == 0x41) {
diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
index 4415e6e98f..3404d52013 100644
--- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
+++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
@@ -2,7 +2,7 @@
 #define Z_SHOT_SUN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ShotSun;
 
diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c
index 8032614078..e6e017490a 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -42,14 +42,14 @@
 #include "z_en_item00.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
-#include "z64audio.h"
-#include "z64debug.h"
-#include "z64effect.h"
-#include "z64lifemeter.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "audio.h"
+#include "debug.h"
+#include "effect.h"
+#include "lifemeter.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_link_child/object_link_child.h"
@@ -10776,7 +10776,8 @@ void Player_Init(Actor* thisx, PlayState* play2) {
                 ((play->sceneId != SCENE_BOMBCHU_SHOP) || GET_EVENTCHKINF(EVENTCHKINF_25))
 #endif
             ) {
-                TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, this->giObjectSegment, 160, 120, 144, 24, 20);
+                TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, this->giObjectSegment, 160, 120,
+                                        PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 20);
             }
         }
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
index 9ff1bd5a96..aa9ae498eb 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
@@ -11,8 +11,8 @@
 #include "segmented_address.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
index bfceec5856..22be855946 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsBlastParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c
index 2ab88a16b1..f78c1e2f56 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c
@@ -13,9 +13,9 @@
 #include "segmented_address.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h
index 923739819b..6939246900 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_BOMB_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsBombInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
index 4ec61bc8ea..176f68acc1 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
@@ -11,9 +11,9 @@
 #include "segmented_address.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h
index 8aea4d3cc5..91dbf726f3 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_BOMB2_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsBomb2InitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
index f23d0a9aab..49f3ace0c1 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
@@ -12,8 +12,8 @@
 #include "segmented_address.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h
index 7701365bdc..52d7c40e26 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_BUBBLE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsBubbleInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c
index c32349e1fa..f89b0840b8 100644
--- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c
+++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c
@@ -9,9 +9,9 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "segmented_address.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/object_dodongo/object_dodongo.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h
index fbaa8aa28c..686d02b183 100644
--- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_D_FIRE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDFireInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
index e8b904a4b6..b75a7077c8 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
@@ -10,9 +10,9 @@
 #include "gfx_setupdl.h"
 #include "segmented_address.h"
 #include "sfx.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h
index fb7fc84af1..f4297d8fe4 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDeadDbInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
index cb6d76eeb3..7bc0936907 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
@@ -11,9 +11,9 @@
 #include "gfx_setupdl.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h
index c9c91ec609..0adb102caa 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDeadDdInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
index 4d649d4be4..5f6da1295f 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
@@ -9,8 +9,8 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h
index 7a7d57363a..a248e76229 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_DEAD_DS_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDeadDsInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c
index 58daefa387..4a577652b9 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c
@@ -8,8 +8,8 @@
 #include "printf.h"
 #include "sfx.h"
 #include "translation.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #define rSfxId regs[10]
 #define rRepeatMode regs[11] // sound is replayed every update. unused in the original game
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h
index 1f8ca9304c..7c9a67b3d2 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_DEAD_SOUND_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDeadSoundInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
index 2f5901ca2e..1e7e3ca2ed 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
@@ -12,8 +12,8 @@
 #include "gfx_setupdl.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h
index 6138c86046..2d51f1ed11 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDtBubbleInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
index 899e9f2a2d..f06b5f3031 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
@@ -12,9 +12,9 @@
 #include "segmented_address.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h
index 958bde91f8..4a4d9ec4bd 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDustInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
index 56dc375337..d632dfaa52 100644
--- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
@@ -11,8 +11,8 @@
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
index 14acb95e40..e4ec69ea9a 100644
--- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_EN_FIRE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsEnFireInitParams {
     /* 0x00 */ struct Actor* actor;
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
index e1ed9e924f..d4b07ef730 100644
--- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
@@ -15,8 +15,8 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h
index 238b005bcc..a9b60960d0 100644
--- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsEnIceInitParams {
     /* 0x00 */ struct Actor* actor;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c
index c5cee8db21..f2eaceaee8 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c
@@ -10,8 +10,8 @@
 #include "gfx_setupdl.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_yabusame_point/object_yabusame_point.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h
index 1bf5a5d30c..b4d77a21c1 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_EXTRA_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsExtraInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
index 9f00f52e30..c9bfbe981a 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
@@ -10,8 +10,8 @@
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h
index fc2a4ec2de..0a16be9333 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_FCIRCLE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsFcircleInitParams {
     /* 0x00 */ struct Actor* actor;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c
index a5b8a24d1b..b44cc99533 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c
@@ -15,10 +15,10 @@
 #include "segmented_address.h"
 #include "sys_matrix.h"
 #include "translation.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64skin.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "skin.h"
 
 #include "assets/objects/object_fhg/object_fhg.h"
 
@@ -39,8 +39,6 @@ EffectSsProfile Effect_Ss_Fhg_Flash_Profile = {
     EffectSsFhgFlash_Init,
 };
 
-// Should eventually come from assets/overlays/ovl_Effect_Ss_Fhg_Flash/ovl_Effect_Ss_Fhg_Flash.h
-//! TODO: investigate having ZAPD forward declare static variables
 static Gfx sShockDL[15];
 
 u32 EffectSsFhgFlash_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) {
@@ -216,4 +214,18 @@ void EffectSsFhgFlash_UpdateShock(PlayState* play, u32 index, EffectSs* this) {
     }
 }
 
-#include "assets/overlays/ovl_Effect_Ss_Fhg_Flash/ovl_Effect_Ss_Fhg_Flash.c"
+static Vtx sShockVtx[] = {
+#include "assets/overlays/ovl_Effect_Ss_Fhg_Flash/sShockVtx.inc.c"
+};
+
+#define sShockTex_WIDTH 32
+#define sShockTex_HEIGHT 32
+static u64 sShockTex[TEX_LEN(u64, sShockTex_WIDTH, sShockTex_HEIGHT, 8)];
+
+static Gfx sShockDL[15] = {
+#include "assets/overlays/ovl_Effect_Ss_Fhg_Flash/sShockDL.inc.c"
+};
+
+static u64 sShockTex[TEX_LEN(u64, sShockTex_WIDTH, sShockTex_HEIGHT, 8)] = {
+#include "assets/overlays/ovl_Effect_Ss_Fhg_Flash/sShockTex.i8.inc.c"
+};
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
index f3c1ea6168..8c57bad37d 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_FHGFLASH_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct Actor;
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
index de4ae887bb..8a5e416a6a 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
@@ -10,9 +10,9 @@
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
index ebe8a7203d..01e80d30d0 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsFireTailInitParams {
     /* 0x00 */ struct Actor* actor;
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c
index 05e4a3d8bf..9fc9d920dd 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c
@@ -7,8 +7,8 @@
 #include "z_eff_ss_g_fire.h"
 
 #include "segmented_address.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h
index 52312527d9..d1673ab4f7 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_G_FIRE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsGFireInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c
index 9610917043..b37136a18c 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c
@@ -8,8 +8,8 @@
 
 #include "libc64/qrand.h"
 #include "segmented_address.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h
index 55215239d2..e2361a3ed2 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_G_MAGMA_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsGMagmaInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c
index 316f65258a..19f535ef71 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c
@@ -10,8 +10,8 @@
 #include "gfx_setupdl.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_kingdodongo/object_kingdodongo.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h
index 2ddc9f4ce7..9ab63141a0 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsGMagma2InitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
index 2c83108d35..ef0565c8f8 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
@@ -10,9 +10,9 @@
 #include "gfx_setupdl.h"
 #include "segmented_address.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h
index 86a7d8378e..196e688c88 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_G_RIPPLE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsGRippleInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c
index a5472c29fa..783224c9e0 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c
@@ -11,9 +11,9 @@
 #include "gfx_setupdl.h"
 #include "segmented_address.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h
index 0d94bd7e0a..d88cdfcf86 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsGSpkInitParams {
     /* 0x00 */ struct Actor* actor;
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c
index 3baab32db9..5995c1b563 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c
@@ -7,8 +7,8 @@
 #include "z_eff_ss_g_splash.h"
 
 #include "segmented_address.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h
index fa1907f667..507117656e 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsGSplashInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
index e084b5f1f6..550c4a08d3 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
@@ -11,9 +11,9 @@
 #include "gfx_setupdl.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h
index d598cebf5d..a6a5d7acf3 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_HAHEN_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsHahenInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c
index 9be42db8d9..e1fa2a982e 100644
--- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c
+++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c
@@ -10,9 +10,9 @@
 #include "gfx_setupdl.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
index 591ba5a7d0..cbe297176d 100644
--- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
+++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_HITMARK_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsHitMarkInitParams {
     /* 0x00 */ s32 type;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
index 9ce9885de3..4bad83b5f0 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
@@ -11,8 +11,8 @@
 #include "rand.h"
 #include "sys_math.h"
 #include "sys_matrix.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h
index afb96c213c..6ed2557174 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_ICE_PIECE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsIcePieceInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c
index 9e2757049d..bfa4d40db8 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c
@@ -13,8 +13,8 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/object_fz/object_fz.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h
index 24c27f1cf6..649aff9adb 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_ICE_SMOKE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsIceSmokeInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
index 12d9c5a5eb..ce06859168 100644
--- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
+++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
@@ -10,8 +10,8 @@
 #include "gfx_setupdl.h"
 #include "rand.h"
 #include "sys_matrix.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h
index eb8e8764d7..2afeb50935 100644
--- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_K_FIRE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsKFireInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c
index b0ba95adae..cf5f3a2b88 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c
@@ -15,9 +15,9 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #define rReg0 regs[0]
 #define rGravity regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h
index 90f3a8cdab..09d38ed7e9 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_KAKERA_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsKakeraInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
index f7c22aaa19..a4093ead1b 100644
--- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
+++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
@@ -13,9 +13,9 @@
 #include "segmented_address.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h
index 0c128ff7ab..64612fcbb4 100644
--- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h
+++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsKiraKiraInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
index f44ac38496..5e2ff3aaf0 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
@@ -12,9 +12,9 @@
 #include "segmented_address.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h
index 39f5d51841..75af1b7e0c 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsLightningInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
index 1dadd7f069..aecdd6c936 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
@@ -13,9 +13,9 @@
 #include "segmented_address.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h
index e45c2c6f2a..11eb6c9e8b 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_SIBUKI_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsSibukiInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c
index 8566be1623..24e484c1ee 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c
@@ -10,8 +10,8 @@
 #include "gfx_setupdl.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "effect.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h
index 37a9425dc7..a01146d3e0 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_SIBUKI2_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsSibuki2InitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c
index 2277a71d85..beac5fd414 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c
@@ -6,10 +6,10 @@
 
 #include "z_eff_ss_solder_srch_ball.h"
 
-#include "z64bgcheck.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "bgcheck.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
 
 #define rUnused regs[1]
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
index b105f063d5..c68ae12bfa 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_SOLDERSRCHBALL_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsSolderSrchBallInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c
index 520f8af02a..d7758d3b97 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c
@@ -10,10 +10,10 @@
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/object_link_boy/object_link_boy.h"
 #include "assets/objects/object_link_child/object_link_child.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h
index 4b5ccda965..1748ca5249 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_STICK_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsStickInitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
index 5ecd83add1..bdd99e1e31 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
@@ -12,9 +12,9 @@
 #include "regs.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
index efb8df225d..c84ab06f9c 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_STONE1_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsStone1InitParams {
     /* 0x00 */ Vec3f pos;
diff --git a/src/overlays/gamestates/ovl_file_choose/file_select.h b/src/overlays/gamestates/ovl_file_choose/file_select.h
index 69d71f71d5..016c04dce5 100644
--- a/src/overlays/gamestates/ovl_file_choose/file_select.h
+++ b/src/overlays/gamestates/ovl_file_choose/file_select.h
@@ -5,7 +5,7 @@
 #include "ultra64.h"
 #include "gfx.h"
 #include "versions.h"
-#include "z64game.h"
+#include "game.h"
 
 
 #define GET_NEWF(sramCtx, slotNum, index) (sramCtx->readBuff[gSramSlotOffsets[slotNum] + offsetof(SaveContext, save.info.playerData.newf[index])])
@@ -225,4 +225,26 @@ void FileSelect_DrawCharacter(GraphicsContext* gfxCtx, void* texture, s16 vtx);
 extern s16 D_808124C0[];
 #endif
 
+extern Vtx gNameEntryVtx[];
+extern Vtx gOptionsMenuHeadersVtx[];
+extern Vtx gOptionsMenuSettingsVtx[];
+extern Vtx gOptionsDividerSoundVtx[];
+extern Vtx gOptionsDividerZTargetVtx[];
+extern Vtx gOptionsDividerBrightnessVtx[];
+extern s16 gCharPageEng[];
+#if OOT_NTSC
+extern s16 gCharPageHira[];
+extern s16 gCharPageKata[];
+extern s16 gNextCharPage[];
+#endif
+#if OOT_PAL && PLATFORM_N64
+extern Vtx gOptionsMenuBrightnessVtx[];
+extern Vtx gOptionsMenuLanguageVtx[];
+extern Vtx gOptionsDividerLanguageVtx[];
+#endif
+#if OOT_PAL && PLATFORM_GC
+extern Vtx gOptionsMenuHeadersGERVtx[];
+extern Vtx gOptionsMenuSettingsGERVtx[];
+#endif
+
 #endif
diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index 2ad81b90f3..fdb36d94bd 100644
--- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -25,14 +25,14 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64environment.h"
-#include "z64play.h"
-#include "z64save.h"
-#include "z64skybox.h"
-#include "z64sram.h"
-#include "z64ss_sram.h"
-#include "z64view.h"
+#include "audio.h"
+#include "environment.h"
+#include "play_state.h"
+#include "save.h"
+#include "skybox.h"
+#include "sram.h"
+#include "ss_sram.h"
+#include "view.h"
 
 #if OOT_PAL_N64
 #include "assets/objects/object_mag/object_mag.h"
diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c
index 03fb5d0f12..fb14504bd7 100644
--- a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c
+++ b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c
@@ -6,8 +6,8 @@
 #include "regs.h"
 #include "rumble.h"
 #include "sfx.h"
-#include "z64save.h"
-#include "z64sram.h"
+#include "save.h"
+#include "sram.h"
 
 // In iQue versions, this file contains many workarounds for EGCS internal
 // compiler errors (see docs/compilers.md)
diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
index c3042a2ce9..faf219fd93 100644
--- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
+++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
@@ -14,11 +14,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64save.h"
+#include "audio.h"
+#include "save.h"
 
 #include "assets/textures/title_static/title_static.h"
-#include "assets/overlays/ovl_file_choose/ovl_file_choose.h"
 
 void FileSelect_DrawCharacter(GraphicsContext* gfxCtx, void* texture, s16 vtx) {
     OPEN_DISPS(gfxCtx, "../z_file_nameset_PAL.c", 110);
diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c
index 2fc9670b89..b51fd2eceb 100644
--- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c
+++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c
@@ -1 +1,83 @@
-#include "assets/overlays/ovl_file_choose/ovl_file_choose.c"
+#include "file_select.h"
+
+#include "ultra64.h"
+#include "gfx.h"
+#include "versions.h"
+
+Vtx gNameEntryVtx[] = {
+#include "assets/overlays/ovl_file_choose/gNameEntryVtx.inc.c"
+};
+
+#if OOT_NTSC
+s16 gCharPageHira[] = {
+#include "assets/overlays/ovl_file_choose/gCharPageHira.inc.c"
+};
+
+s16 gCharPageKata[] = {
+#include "assets/overlays/ovl_file_choose/gCharPageKata.inc.c"
+};
+
+s16 gCharPageEng[] = {
+#include "assets/overlays/ovl_file_choose/gCharPageEng.inc.c"
+};
+
+s16 gNextCharPage[] = {
+#include "assets/overlays/ovl_file_choose/gNextCharPage.inc.c"
+};
+#endif
+
+Vtx gOptionsMenuHeadersVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsMenuHeadersVtx.inc.c"
+};
+
+#if OOT_PAL && PLATFORM_GC
+Vtx gOptionsMenuHeadersGERVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsMenuHeadersGERVtx.inc.c"
+};
+#endif
+
+Vtx gOptionsMenuSettingsVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsMenuSettingsVtx.inc.c"
+};
+
+#if OOT_PAL && PLATFORM_GC
+Vtx gOptionsMenuSettingsGERVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsMenuSettingsGERVtx.inc.c"
+};
+#endif
+
+#if OOT_PAL && PLATFORM_N64
+Vtx gOptionsMenuBrightnessVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsMenuBrightnessVtx.inc.c"
+};
+
+Vtx gOptionsMenuLanguageVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsMenuLanguageVtx.inc.c"
+};
+
+u8 ovl_file_choose_zeros_000640[320] = { 0 };
+#endif
+
+Vtx gOptionsDividerSoundVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsDividerSoundVtx.inc.c"
+};
+
+Vtx gOptionsDividerZTargetVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsDividerZTargetVtx.inc.c"
+};
+
+Vtx gOptionsDividerBrightnessVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsDividerBrightnessVtx.inc.c"
+};
+
+#if OOT_PAL && PLATFORM_N64
+Vtx gOptionsDividerLanguageVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsDividerLanguageVtx.inc.c"
+};
+#endif
+
+#if OOT_PAL
+s16 gCharPageEng[] = {
+#include "assets/overlays/ovl_file_choose/gCharPageEng.inc.c"
+};
+#endif
diff --git a/src/overlays/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c
index ad36b6e205..f300c1ea7b 100644
--- a/src/overlays/gamestates/ovl_opening/z_opening.c
+++ b/src/overlays/gamestates/ovl_opening/z_opening.c
@@ -8,11 +8,11 @@
 #include "regs.h"
 #include "sys_matrix.h"
 #include "title_setup_state.h"
-#include "z64game.h"
-#include "z64play.h"
-#include "z64save.h"
-#include "z64sram.h"
-#include "z64view.h"
+#include "game.h"
+#include "play_state.h"
+#include "save.h"
+#include "sram.h"
+#include "view.h"
 
 void TitleSetup_SetupTitleScreen(TitleSetupState* this) {
     gSaveContext.gameMode = GAMEMODE_TITLE_SCREEN;
diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c
index 84b1cb69ae..329af45f22 100644
--- a/src/overlays/gamestates/ovl_select/z_select.c
+++ b/src/overlays/gamestates/ovl_select/z_select.c
@@ -25,9 +25,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "ultra64.h"
-#include "z64play.h"
-#include "z64save.h"
-#include "z64sram.h"
+#include "play_state.h"
+#include "save.h"
+#include "sram.h"
 
 void MapSelect_LoadTitle(MapSelectState* this) {
     this->state.running = false;
diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c
index 588588b243..907fdb886c 100644
--- a/src/overlays/gamestates/ovl_title/z_title.c
+++ b/src/overlays/gamestates/ovl_title/z_title.c
@@ -25,9 +25,9 @@
 #include "sys_freeze.h"
 #include "title_setup_state.h"
 #include "versions.h"
-#include "z64actor.h"
-#include "z64environment.h"
-#include "z64save.h"
+#include "actor.h"
+#include "environment.h"
+#include "save.h"
 
 #include "assets/textures/nintendo_rogo_static/nintendo_rogo_static.h"
 
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
index 013928dddc..df53489569 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
@@ -6,9 +6,9 @@
 #include "printf.h"
 #include "regs.h"
 #include "sfx.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 #include "assets/textures/icon_item_static/icon_item_static.h"
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
index b849ca74b4..2ba3fd1139 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
@@ -7,8 +7,8 @@
 #include "gfxalloc.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
index 9843e4efa3..1f573ca3e3 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
@@ -7,9 +7,9 @@
 #include "regs.h"
 #include "sfx.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/textures/icon_item_static/icon_item_static.h"
 #include "assets/textures/parameter_static/parameter_static.h"
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
index ce8ac331f4..552ba7d3ef 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
@@ -8,8 +8,8 @@
 #include "regs.h"
 #include "sfx.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c
index 8c58493ccf..8b50fcae96 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c
@@ -9,8 +9,8 @@
 #include "sfx.h"
 #include "sys_ucode.h"
 #include "versions.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/textures/icon_item_24_static/icon_item_24_static.h"
 #if OOT_NTSC
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c
index 6264c4147c..265a122116 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c
@@ -3,7 +3,7 @@
 #include "libu64/pad.h"
 #include "regs.h"
 #include "sfx.h"
-#include "z64play.h"
+#include "play_state.h"
 
 static s16 sKaleidoPromptCursorAlphaVals[] = { 100, 255 };
 
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
index d6eb08184f..46d7022792 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
@@ -22,11 +22,11 @@
 #include "title_setup_state.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/textures/icon_item_static/icon_item_static.h"
 #include "assets/textures/icon_item_24_static/icon_item_24_static.h"
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
index a7506c77c6..7a0102e079 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
@@ -3,8 +3,8 @@
 
 #include "ultra64.h"
 #include "gfx.h"
-#include "z64inventory.h"
-#include "z64pause.h"
+#include "inventory.h"
+#include "pause.h"
 
 struct PlayState;
 
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
index ec2c566ece..05371b7149 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
@@ -5,7 +5,7 @@
 #include "sys_matrix.h"
 #include "z_kaleido_scope.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 
diff --git a/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c b/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c
index 48a18fff9d..bb78417dde 100644
--- a/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c
+++ b/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c
@@ -1,4 +1,4 @@
-#include "z64map_mark.h"
+#include "map_mark.h"
 
 static MapMarkData sMapMarkDekuTree[] = {
     // Deku Tree minimap 0
diff --git a/src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c b/src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c
index ba7517034c..1587228a44 100644
--- a/src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c
+++ b/src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c
@@ -1,4 +1,4 @@
-#include "z64map_mark.h"
+#include "map_mark.h"
 
 static MapMarkData sMapMarkDekuTree[] = {
     // Deku Tree minimap 0
diff --git a/tools/assets/extract/extase/__init__.py b/tools/assets/extract/extase/__init__.py
index 527a187a72..029b20d214 100644
--- a/tools/assets/extract/extase/__init__.py
+++ b/tools/assets/extract/extase/__init__.py
@@ -1110,6 +1110,10 @@ class BinaryBlobResource(Resource):
         # Nothing specific to do
         return RESOURCE_PARSE_SUCCESS
 
+    def get_as_xml(self):
+        return f"""\
+        <Blob Name="{self.symbol_name}" Size="0x{self.range_end - self.range_start:X}" Offset="0x{self.range_start:X}"/>"""
+
     def get_c_reference(self, resource_offset):
         return f"&{self.symbol_name}[{resource_offset}]"
 
diff --git a/tools/assets/extract/extase/cdata_resources.py b/tools/assets/extract/extase/cdata_resources.py
index 8358694a9f..d959a0c1f5 100644
--- a/tools/assets/extract/extase/cdata_resources.py
+++ b/tools/assets/extract/extase/cdata_resources.py
@@ -443,7 +443,7 @@ class Vec3sArrayResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64math.h",)
+        return ("z_math.h",)
 
 
 class S16ArrayResource(CDataResource):
diff --git a/tools/assets/extract/extase_oot64/animation_resources.py b/tools/assets/extract/extase_oot64/animation_resources.py
index 164c093ac0..7a54f00c85 100644
--- a/tools/assets/extract/extase_oot64/animation_resources.py
+++ b/tools/assets/extract/extase_oot64/animation_resources.py
@@ -84,7 +84,7 @@ class AnimationJointIndicesResource(CDataResource, can_size_be_unknown=True):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)
 
 
 class AnimationResource(CDataResource):
@@ -210,4 +210,4 @@ class AnimationResource(CDataResource):
         return f"AnimationHeader {self.symbol_name}"
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)
diff --git a/tools/assets/extract/extase_oot64/collision_resources.py b/tools/assets/extract/extase_oot64/collision_resources.py
index c96b0ad5be..d8005ba446 100644
--- a/tools/assets/extract/extase_oot64/collision_resources.py
+++ b/tools/assets/extract/extase_oot64/collision_resources.py
@@ -58,7 +58,7 @@ class CollisionVtxListResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64math.h",)
+        return ("z_math.h",)
 
 
 class CollisionPolyListResource(CDataResource):
@@ -177,7 +177,7 @@ class CollisionPolyListResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64bgcheck.h",)
+        return ("bgcheck.h",)
 
 
 class CollisionSurfaceTypeListResource(CDataResource):
@@ -305,7 +305,7 @@ class CollisionSurfaceTypeListResource(CDataResource):
         return ("stdbool.h",)
 
     def get_h_includes(self):
-        return ("z64bgcheck.h",)
+        return ("bgcheck.h",)
 
 
 class BgCamFuncDataResource(CDataResource):
@@ -332,7 +332,7 @@ class BgCamFuncDataResource(CDataResource):
         return f"&{self.symbol_name}[{index}]"
 
     def get_h_includes(self):
-        return ("z64math.h",)
+        return ("z_math.h",)
 
 
 class CollisionBgCamListResource(CDataResource):
@@ -429,10 +429,10 @@ class CollisionBgCamListResource(CDataResource):
             raise ValueError()
 
     def get_c_includes(self):
-        return ("z64camera.h",)
+        return ("camera.h",)
 
     def get_h_includes(self):
-        return ("z64bgcheck.h",)
+        return ("bgcheck.h",)
 
 
 class CollisionWaterBoxesResource(CDataResource):
@@ -479,7 +479,7 @@ class CollisionWaterBoxesResource(CDataResource):
         return ("stdbool.h",)
 
     def get_h_includes(self):
-        return ("z64bgcheck.h",)
+        return ("bgcheck.h",)
 
 
 def transfer_HACK_IS_STATIC_ON(source, dest):
@@ -829,4 +829,4 @@ class CollisionResource(CDataResource):
         return ("array_count.h",)
 
     def get_h_includes(self):
-        return ("z64bgcheck.h",)
+        return ("bgcheck.h",)
diff --git a/tools/assets/extract/extase_oot64/dlist_resources.py b/tools/assets/extract/extase_oot64/dlist_resources.py
index ad470c33aa..f80a2f9954 100644
--- a/tools/assets/extract/extase_oot64/dlist_resources.py
+++ b/tools/assets/extract/extase_oot64/dlist_resources.py
@@ -43,6 +43,7 @@ VERBOSE_ColorIndexedTexturesManager = False
 VERBOSE_BEST_EFFORT_TLUT_NO_REAL_USER = True
 
 EXPLICIT_DL_AND_TEX_SIZES = True
+TEXS_SHORTER_NAMES = True
 
 
 class MtxResource(CDataResource):
@@ -275,6 +276,15 @@ class TextureResource(Resource):
         self.width_name = f"{self.symbol_name}_WIDTH"
         self.height_name = f"{self.symbol_name}_HEIGHT"
 
+    def get_as_xml(self):
+        tlut_offset_attr = (
+            f' TlutOffset="0x{self.resource_tlut.range_start:X}"'
+            if self.resource_tlut
+            else ""
+        )
+        return f"""\
+        <Texture Name="{self.symbol_name}" Format="{self.fmt.name.lower()}{self.siz.bpp}" Width="{self.width}" Height="{self.height}" Offset="0x{self.range_start:X}"{tlut_offset_attr}/>"""
+
     def check_declare_length(self):
         return (
             hasattr(self, "HACK_IS_STATIC_ON") or EXPLICIT_DL_AND_TEX_SIZES
@@ -1159,7 +1169,7 @@ class ColorIndexedTexturesManager:
                     lambda file, offset: TextureResource(
                         file,
                         offset,
-                        f"{reporter.name}_{offset:08X}_CITex",
+                        f"{file.name if TEXS_SHORTER_NAMES else reporter.name}_{offset:08X}_CITex",
                         tex.fmt,
                         tex.siz,
                         tex.width,
@@ -1181,7 +1191,7 @@ class ColorIndexedTexturesManager:
                     lambda file, offset: TLUTResource(
                         file,
                         offset,
-                        f"{reporter.name}_{offset:08X}_TLUT",
+                        f"{file.name if TEXS_SHORTER_NAMES else reporter.name}_{offset:08X}_TLUT",
                         {
                             G_TT.RGBA16: G_IM_FMT.RGBA,
                             G_TT.IA16: G_IM_FMT.IA,
@@ -1249,7 +1259,7 @@ class DListResource(Resource, can_size_be_unknown=True):
                     lambda file, offset: TextureResource(
                         file,
                         offset,
-                        f"{self.name}_{offset:08X}_Tex",
+                        f"{file.name if TEXS_SHORTER_NAMES else self.name}_{offset:08X}_Tex",
                         g_fmt,
                         g_siz,
                         width,
@@ -1347,6 +1357,10 @@ class DListResource(Resource, can_size_be_unknown=True):
 
         return RESOURCE_PARSE_SUCCESS
 
+    def get_as_xml(self):
+        return f"""\
+        <DList Name="{self.symbol_name}" Offset="0x{self.range_start:X}"/>"""
+
     def get_c_declaration_base(self):
         if hasattr(self, "HACK_IS_STATIC_ON") or EXPLICIT_DL_AND_TEX_SIZES:
             length = (self.range_end - self.range_start) // 8
diff --git a/tools/assets/extract/extase_oot64/misc_resources.py b/tools/assets/extract/extase_oot64/misc_resources.py
index 6f5f3a8265..b4c02c82c5 100644
--- a/tools/assets/extract/extase_oot64/misc_resources.py
+++ b/tools/assets/extract/extase_oot64/misc_resources.py
@@ -53,11 +53,11 @@ class CutsceneResource(Resource, can_size_be_unknown=True):
 
     def get_c_includes(self):
         return (
-            "z64cutscene_commands.h",
+            "cutscene_commands.h",
             # TODO these are not always needed:
-            "z64ocarina.h", # for OCARINA_ACTION_*
-            "z64player.h", # for PLAYER_CUEID_*
+            "ocarina.h", # for OCARINA_ACTION_*
+            "player.h", # for PLAYER_CUEID_*
         )
 
     def get_h_includes(self):
-        return ("z64cutscene.h",)
+        return ("cutscene.h",)
diff --git a/tools/assets/extract/extase_oot64/playeranim_resources.py b/tools/assets/extract/extase_oot64/playeranim_resources.py
index b002f91ff9..9dd9dd960e 100644
--- a/tools/assets/extract/extase_oot64/playeranim_resources.py
+++ b/tools/assets/extract/extase_oot64/playeranim_resources.py
@@ -35,7 +35,7 @@ class PlayerAnimationDataResource(CDataArrayResource):
         return f"s16 {self.symbol_name}[{self.frame_count_name} * (PLAYER_LIMB_MAX * 3 + 1)]"
 
     def get_h_includes(self):
-        return ("ultra64.h", "z64player.h")
+        return ("ultra64.h", "player.h")
 
 
 class PlayerAnimationResource(CDataResource):
@@ -99,4 +99,4 @@ class PlayerAnimationResource(CDataResource):
         return f"LinkAnimationHeader {self.symbol_name}"
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)
diff --git a/tools/assets/extract/extase_oot64/room_shape_resources.py b/tools/assets/extract/extase_oot64/room_shape_resources.py
index e6e43b30bf..935c5045b0 100644
--- a/tools/assets/extract/extase_oot64/room_shape_resources.py
+++ b/tools/assets/extract/extase_oot64/room_shape_resources.py
@@ -113,7 +113,7 @@ class RoomShapeNormalEntryArrayResource(CDataArrayNamedLengthResource):
         return f"RoomShapeDListsEntry {self.symbol_name}[{self.length_name}]"
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 class RoomShapeNormalResource(CDataResource):
@@ -191,7 +191,7 @@ class RoomShapeNormalResource(CDataResource):
         return ("array_count.h",)
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 class RoomShapeDListsEntryResource(CDataResource):
@@ -207,7 +207,7 @@ class RoomShapeDListsEntryResource(CDataResource):
             raise ValueError
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 def report_RoomShapeImageBase_entry(resource, memory_context: "MemoryContext", v):
@@ -343,7 +343,7 @@ class RoomShapeImageSingleResource(CDataResource):
             raise ValueError
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 class RoomShapeImageMultiBgEntryArrayResource(CDataArrayNamedLengthResource):
@@ -395,7 +395,7 @@ class RoomShapeImageMultiBgEntryArrayResource(CDataArrayNamedLengthResource):
         return f"RoomShapeImageMultiBgEntry {self.name}[{self.length_name}]"
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 class RoomShapeImageMultiResource(CDataResource):
@@ -462,7 +462,7 @@ class RoomShapeImageMultiResource(CDataResource):
             raise ValueError
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 class RoomShapeCullableEntryArrayResource(CDataArrayNamedLengthResource):
@@ -479,7 +479,7 @@ class RoomShapeCullableEntryArrayResource(CDataArrayNamedLengthResource):
         return f"RoomShapeCullableEntry {self.symbol_name}[{self.length_name}]"
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 class RoomShapeCullableResource(CDataResource):
@@ -554,4 +554,4 @@ class RoomShapeCullableResource(CDataResource):
             raise ValueError
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
diff --git a/tools/assets/extract/extase_oot64/scene_commands_resource.py b/tools/assets/extract/extase_oot64/scene_commands_resource.py
index 1579fe1a48..57f2cbf440 100644
--- a/tools/assets/extract/extase_oot64/scene_commands_resource.py
+++ b/tools/assets/extract/extase_oot64/scene_commands_resource.py
@@ -635,14 +635,14 @@ class SceneCommandsResource(Resource, can_size_be_unknown=True):
     def get_c_includes(self):
         return (
             "array_count.h",
-            "z64object.h",  # for OBJECT_*
+            "object.h",  # for OBJECT_*
             # TODO these are not always needed:
             "sequence.h",  # for NATURE_ID_* and NA_BGM_*
-            "z64skybox.h",  # for SKYBOX_*
+            "skybox.h",  # for SKYBOX_*
         )
 
     def get_h_includes(self):
-        return ("z64scene.h",)
+        return ("scene.h",)
 
 
 class AltHeadersResource(CDataArrayResource):
@@ -714,4 +714,4 @@ class AltHeadersResource(CDataArrayResource):
         return f"SceneCmd* {self.symbol_name}[]"
 
     def get_h_includes(self):
-        return ("z64scene.h",)
+        return ("scene.h",)
diff --git a/tools/assets/extract/extase_oot64/scene_rooms_resources.py b/tools/assets/extract/extase_oot64/scene_rooms_resources.py
index 86baae7ae0..d3b8903f2a 100644
--- a/tools/assets/extract/extase_oot64/scene_rooms_resources.py
+++ b/tools/assets/extract/extase_oot64/scene_rooms_resources.py
@@ -76,10 +76,10 @@ class ActorEntryListResource(CDataArrayNamedLengthResource):
         return f"ActorEntry {self.symbol_name}[{self.length_name}]"
 
     def get_c_includes(self):
-        return ("z64actor.h",)
+        return ("actor.h",)
 
     def get_h_includes(self):
-        return ("z64scene.h",)
+        return ("scene.h",)
 
 
 class ObjectListResource(CDataArrayNamedLengthResource):
@@ -91,7 +91,7 @@ class ObjectListResource(CDataArrayNamedLengthResource):
         return f"s16 {self.symbol_name}[{self.length_name}]"
 
     def get_c_includes(self):
-        return ("z64object.h",)
+        return ("object.h",)
 
     def get_h_includes(self):
         return ("ultra64.h",)
@@ -256,7 +256,7 @@ class SpawnListResource(CDataArrayResource):
         return f"Spawn {self.symbol_name}[]"
 
     def get_h_includes(self):
-        return ("z64scene.h",)
+        return ("scene.h",)
 
 
 class ExitListResource(CDataArrayResource):
@@ -316,7 +316,7 @@ class EnvLightSettingsListResource(CDataArrayNamedLengthResource):
         return f"EnvLightSettings {self.symbol_name}[{self.length_name}]"
 
     def get_h_includes(self):
-        return ("z64environment.h",)
+        return ("environment.h",)
 
 
 class TransitionActorEntryListResource(CDataArrayNamedLengthResource):
@@ -392,10 +392,10 @@ class TransitionActorEntryListResource(CDataArrayNamedLengthResource):
         return f"TransitionActorEntry {self.symbol_name}[{self.length_name}]"
 
     def get_c_includes(self):
-        return ("z64actor.h",)
+        return ("actor.h",)
 
     def get_h_includes(self):
-        return ("z64scene.h",)
+        return ("scene.h",)
 
 
 class PathListResource(CDataArrayResource):
@@ -454,4 +454,4 @@ class PathListResource(CDataArrayResource):
         return f"Path {self.symbol_name}[]"
 
     def get_h_includes(self):
-        return ("z64path.h",)
+        return ("path.h",)
diff --git a/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py b/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py
index 056e49762b..42cf8c4c3f 100644
--- a/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py
+++ b/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py
@@ -79,7 +79,7 @@ class LegacyLimbResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64animation_legacy.h",)
+        return ("animation_legacy.h",)
 
 
 class LegacyJointKeyArrayResource(CDataArrayResource):
@@ -104,7 +104,7 @@ class LegacyJointKeyArrayResource(CDataArrayResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64animation_legacy.h",)
+        return ("animation_legacy.h",)
 
 
 class LegacyAnimationResource(CDataResource):
@@ -164,7 +164,11 @@ class LegacyAnimationResource(CDataResource):
             lambda file, offset: LegacyJointKeyArrayResource(
                 file,
                 offset,
-                f"{self.name}_{address_jointKey:08X}_JointKeys",
+                (
+                    f"{self.symbol_name.removesuffix('Anim')}JointKeys"
+                    if self.symbol_name.endswith("Anim")
+                    else f"{self.symbol_name}_{address_jointKey:08X}_JointKeys"
+                ),
             ),
         )
         resource_jointKey.set_length(self.cdata_unpacked["limbCount"] + 1)
@@ -207,7 +211,7 @@ class LegacyAnimationResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64animation_legacy.h",)
+        return ("animation_legacy.h",)
 
 
 class LegacyLimbsArrayResource(skeleton_resources.LimbsArrayResourceABC):
@@ -215,4 +219,4 @@ class LegacyLimbsArrayResource(skeleton_resources.LimbsArrayResourceABC):
     c_limb_type = "LegacyLimb"
 
     def get_h_includes(self):
-        return ("z64animation_legacy.h",)
+        return ("animation_legacy.h",)
diff --git a/tools/assets/extract/extase_oot64/skelcurve_resources.py b/tools/assets/extract/extase_oot64/skelcurve_resources.py
index 4b140c2568..ea872b8bc1 100644
--- a/tools/assets/extract/extase_oot64/skelcurve_resources.py
+++ b/tools/assets/extract/extase_oot64/skelcurve_resources.py
@@ -83,7 +83,7 @@ class CurveInterpKnotArrayResource(CDataResource, can_size_be_unknown=True):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64curve.h",)
+        return ("curve.h",)
 
 
 class ConstantDataArrayResource(CDataResource, can_size_be_unknown=True):
@@ -254,7 +254,7 @@ class CurveAnimationHeaderResource(CDataResource):
         raise ValueError()
 
     def get_h_includes(self):
-        return ("z64curve.h",)
+        return ("curve.h",)
 
 
 class SkelCurveLimbResource(CDataResource):
@@ -283,7 +283,7 @@ class SkelCurveLimbResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64curve.h",)
+        return ("curve.h",)
 
 
 class SkelCurveLimbArrayResource(CDataResource):
@@ -328,7 +328,7 @@ class SkelCurveLimbArrayResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64curve.h",)
+        return ("curve.h",)
 
 
 class CurveSkeletonHeaderResource(CDataResource):
@@ -375,4 +375,4 @@ class CurveSkeletonHeaderResource(CDataResource):
         raise ValueError()
 
     def get_h_includes(self):
-        return ("z64curve.h",)
+        return ("curve.h",)
diff --git a/tools/assets/extract/extase_oot64/skeleton_resources.py b/tools/assets/extract/extase_oot64/skeleton_resources.py
index a3459d1172..12fe050a61 100644
--- a/tools/assets/extract/extase_oot64/skeleton_resources.py
+++ b/tools/assets/extract/extase_oot64/skeleton_resources.py
@@ -65,6 +65,10 @@ class StandardLimbResource(CDataResource):
     def set_enum_member_name(self, enum_member_name: str):
         self.enum_member_name = enum_member_name
 
+    def get_as_xml(self) -> str:
+        return f"""\
+        <Limb Name="{self.symbol_name}" LimbType="Standard" EnumName="{self.enum_member_name}" Offset="0x{self.range_start:X}"/>"""
+
     def get_c_declaration_base(self):
         return f"StandardLimb {self.symbol_name}"
 
@@ -75,7 +79,7 @@ class StandardLimbResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)
 
 
 class LODLimbResource(CDataResource):
@@ -101,6 +105,10 @@ class LODLimbResource(CDataResource):
     def set_enum_member_name(self, enum_member_name: str):
         self.enum_member_name = enum_member_name
 
+    def get_as_xml(self):
+        return f"""\
+        <Limb Name="{self.symbol_name}" LimbType="LOD" EnumName="{self.enum_member_name}" Offset="0x{self.range_start:X}"/>"""
+
     def get_c_declaration_base(self):
         return f"LodLimb {self.symbol_name}"
 
@@ -111,7 +119,7 @@ class LODLimbResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)
 
 
 class LimbsArrayResourceABC(CDataArrayResource):
@@ -241,7 +249,11 @@ class SkeletonResourceABC(SkeletonResourceBaseABC):
             lambda file, offset: resource.limbs_array_type(
                 file,
                 offset,
-                f"{resource.name}_{address:08X}_Limbs",
+                (
+                    f"{resource.name.removesuffix('Skel')}Limbs"
+                    if resource.name.endswith("Skel")
+                    else f"{resource.name}_{address:08X}_Limbs"
+                ),
             ),
         )
         resource_limbs.set_length(
@@ -299,7 +311,7 @@ class SkeletonResourceABC(SkeletonResourceBaseABC):
         return ("array_count.h",)
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)
 
 
 class SkeletonNormalResource(SkeletonResourceABC):
@@ -345,7 +357,7 @@ class SkeletonFlexResourceABC(SkeletonResourceBaseABC):
         return ("array_count.h",)
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)
 
 
 class SkeletonFlexResource(SkeletonFlexResourceABC):
diff --git a/tools/assets/extract/extase_oot64/skeleton_skin_resources.py b/tools/assets/extract/extase_oot64/skeleton_skin_resources.py
index b1ad1e5b3a..e4b06e7001 100644
--- a/tools/assets/extract/extase_oot64/skeleton_skin_resources.py
+++ b/tools/assets/extract/extase_oot64/skeleton_skin_resources.py
@@ -38,7 +38,7 @@ class SkinVertexArrayResource(CDataArrayResource):
         return f"SkinVertex {self.symbol_name}[]"
 
     def get_h_includes(self):
-        return ("z64skin.h",)
+        return ("skin.h",)
 
 
 class SkinTransformationArrayResource(CDataArrayResource):
@@ -58,7 +58,7 @@ class SkinTransformationArrayResource(CDataArrayResource):
         return f"SkinTransformation {self.symbol_name}[]"
 
     def get_h_includes(self):
-        return ("z64skin.h",)
+        return ("skin.h",)
 
 
 class SkinLimbModifArrayResource(CDataArrayResource):
@@ -132,7 +132,7 @@ class SkinLimbModifArrayResource(CDataArrayResource):
         return f"SkinLimbModif {self.symbol_name}[]"
 
     def get_h_includes(self):
-        return ("z64skin.h",)
+        return ("skin.h",)
 
 
 class SkinAnimatedLimbDataResource(CDataResource):
@@ -186,7 +186,7 @@ class SkinAnimatedLimbDataResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64skin.h",)
+        return ("skin.h",)
 
 
 class SkinLimbResource(CDataResource):
@@ -267,7 +267,7 @@ class SkinLimbResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64skin.h",)
+        return ("skin.h",)
 
 
 class SkinLimbsArrayResource(skeleton_resources.LimbsArrayResourceABC):
diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt
index e687efff02..5d19b2a10a 100644
--- a/tools/assets/extract/write_source.txt
+++ b/tools/assets/extract/write_source.txt
@@ -382,32 +382,19 @@ assets/objects/object_zl2_anime2/object_zl2_anime2.c
 assets/objects/object_zl2/object_zl2.c
 assets/objects/object_zl4/object_zl4.c
 assets/objects/object_zo/object_zo.c
-assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c
-assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c
-assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.c
-assets/overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.c
-assets/overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.c
-assets/overlays/ovl_Boss_Dodongo/ovl_Boss_Dodongo.c
 assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.c
 assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.c
 assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.c
 assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.c
-assets/overlays/ovl_Effect_Ss_Fhg_Flash/ovl_Effect_Ss_Fhg_Flash.c
 assets/overlays/ovl_Elf_Msg2/ovl_Elf_Msg2.c
 assets/overlays/ovl_Elf_Msg/ovl_Elf_Msg.c
 assets/overlays/ovl_En_Bili/ovl_En_Bili.c
 assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.c
-assets/overlays/ovl_End_Title/ovl_End_Title.c
-assets/overlays/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant.c
 assets/overlays/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ.c
-assets/overlays/ovl_En_Holl/ovl_En_Holl.c
-assets/overlays/ovl_En_Jsjutan/ovl_En_Jsjutan.c
-assets/overlays/ovl_En_Kanban/ovl_En_Kanban.c
 assets/overlays/ovl_En_Mag/ovl_En_Mag.c
 assets/overlays/ovl_En_Sda/ovl_En_Sda.c
 assets/overlays/ovl_En_Ssh/ovl_En_Ssh.c
 assets/overlays/ovl_En_Sth/ovl_En_Sth.c
-assets/overlays/ovl_En_St/ovl_En_St.c
 assets/overlays/ovl_file_choose/ovl_file_choose.c
 assets/overlays/ovl_Magic_Dark/ovl_Magic_Dark.c
 assets/overlays/ovl_Magic_Fire/ovl_Magic_Fire.c
@@ -988,63 +975,6 @@ assets/textures/message_texture_static/message_texture_static.c
 assets/textures/nes_font_static/nes_font_static.c
 assets/textures/nintendo_rogo_static/nintendo_rogo_static.c
 assets/textures/parameter_static/parameter_static.c
-assets/textures/place_title_cards/g_pn_01.c
-assets/textures/place_title_cards/g_pn_02.c
-assets/textures/place_title_cards/g_pn_03.c
-assets/textures/place_title_cards/g_pn_04.c
-assets/textures/place_title_cards/g_pn_05.c
-assets/textures/place_title_cards/g_pn_06.c
-assets/textures/place_title_cards/g_pn_07.c
-assets/textures/place_title_cards/g_pn_08.c
-assets/textures/place_title_cards/g_pn_09.c
-assets/textures/place_title_cards/g_pn_10.c
-assets/textures/place_title_cards/g_pn_11.c
-assets/textures/place_title_cards/g_pn_12.c
-assets/textures/place_title_cards/g_pn_13.c
-assets/textures/place_title_cards/g_pn_14.c
-assets/textures/place_title_cards/g_pn_15.c
-assets/textures/place_title_cards/g_pn_16.c
-assets/textures/place_title_cards/g_pn_17.c
-assets/textures/place_title_cards/g_pn_18.c
-assets/textures/place_title_cards/g_pn_19.c
-assets/textures/place_title_cards/g_pn_20.c
-assets/textures/place_title_cards/g_pn_21.c
-assets/textures/place_title_cards/g_pn_22.c
-assets/textures/place_title_cards/g_pn_23.c
-assets/textures/place_title_cards/g_pn_24.c
-assets/textures/place_title_cards/g_pn_25.c
-assets/textures/place_title_cards/g_pn_26.c
-assets/textures/place_title_cards/g_pn_27.c
-assets/textures/place_title_cards/g_pn_28.c
-assets/textures/place_title_cards/g_pn_29.c
-assets/textures/place_title_cards/g_pn_30.c
-assets/textures/place_title_cards/g_pn_31.c
-assets/textures/place_title_cards/g_pn_32.c
-assets/textures/place_title_cards/g_pn_33.c
-assets/textures/place_title_cards/g_pn_34.c
-assets/textures/place_title_cards/g_pn_35.c
-assets/textures/place_title_cards/g_pn_36.c
-assets/textures/place_title_cards/g_pn_37.c
-assets/textures/place_title_cards/g_pn_38.c
-assets/textures/place_title_cards/g_pn_39.c
-assets/textures/place_title_cards/g_pn_40.c
-assets/textures/place_title_cards/g_pn_41.c
-assets/textures/place_title_cards/g_pn_42.c
-assets/textures/place_title_cards/g_pn_43.c
-assets/textures/place_title_cards/g_pn_44.c
-assets/textures/place_title_cards/g_pn_45.c
-assets/textures/place_title_cards/g_pn_46.c
-assets/textures/place_title_cards/g_pn_47.c
-assets/textures/place_title_cards/g_pn_48.c
-assets/textures/place_title_cards/g_pn_49.c
-assets/textures/place_title_cards/g_pn_50.c
-assets/textures/place_title_cards/g_pn_51.c
-assets/textures/place_title_cards/g_pn_52.c
-assets/textures/place_title_cards/g_pn_53.c
-assets/textures/place_title_cards/g_pn_54.c
-assets/textures/place_title_cards/g_pn_55.c
-assets/textures/place_title_cards/g_pn_56.c
-assets/textures/place_title_cards/g_pn_57.c
 assets/textures/skyboxes/vr_cloud0_pal_static.c
 assets/textures/skyboxes/vr_cloud0_static.c
 assets/textures/skyboxes/vr_cloud1_pal_static.c