Commit (inline) some assets/overlays/

src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c

@@ -13,6 +13,7 @@
 #include "ichain.h"
 #include "sfx.h"
 #include "sys_matrix.h"
+#include "tex_len.h"
 #include "z_lib.h"
 #include "z64play.h"
 
@@ -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,

src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c

@@ -13,6 +13,7 @@
 #include "ichain.h"
 #include "sfx.h"
 #include "sys_matrix.h"
+#include "tex_len.h"
 #include "z_lib.h"
 #include "z64play.h"
 
@@ -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,

src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c

@@ -13,6 +13,7 @@
 #include "ichain.h"
 #include "sfx.h"
 #include "sys_matrix.h"
+#include "tex_len.h"
 #include "z_lib.h"
 #include "z64play.h"
 
@@ -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,

src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c

@@ -16,6 +16,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "tex_len.h"
 #include "z_lib.h"
 #include "z64effect.h"
 #include "z64play.h"
@@ -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;

src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c

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

src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c

@@ -15,6 +15,7 @@
 #include "sequence.h"
 #include "sfx.h"
 #include "sys_matrix.h"
+#include "tex_len.h"
 #include "z_lib.h"
 #include "z64effect.h"
 #include "z64play.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),

src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c

@@ -12,6 +12,7 @@
 #include "segmented_address.h"
 #include "sys_math.h"
 #include "sys_matrix.h"
+#include "tex_len.h"
 #include "z_lib.h"
 #include "z64play.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;

src/overlays/actors/ovl_En_Holl/z_en_holl.c

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

src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c

@@ -13,6 +13,7 @@
 #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"
@@ -46,7 +47,61 @@ 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"
+};
+
+static u8 sZeros[4] = { 0 };
 
 void EnJsjutan_Init(Actor* thisx, PlayState* play) {
     EnJsjutan* this = (EnJsjutan*)thisx;

src/overlays/actors/ovl_En_Kanban/z_en_kanban.c

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

src/overlays/actors/ovl_En_St/z_en_st.c

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

src/overlays/actors/ovl_End_Title/z_end_title.c

@@ -9,6 +9,7 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
+#include "tex_len.h"
 #include "versions.h"
 #include "z64play.h"
 #include "z64player.h"
@@ -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);
 

src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c

@@ -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"
+};

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