From 484abb1d391bc34541c263e6dcfad187822139e3 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 7 Jun 2025 17:26:59 +0200 Subject: [PATCH] Add Vtx[] resources in xmls for (partially) documented assets 9 (#2607) --- assets/xml/overlays/ovl_Boss_Ganon.xml | 84 +++++++++++++++++++ assets/xml/overlays/ovl_Boss_Ganon2.xml | 24 ++++++ assets/xml/overlays/ovl_Boss_Sst.xml | 14 +++- assets/xml/overlays/ovl_Demo_Shd.xml | 13 ++- assets/xml/overlays/ovl_En_Clear_Tag.xml | 24 ++++++ assets/xml/overlays/ovl_En_Ganon_Organ.xml | 6 ++ assets/xml/overlays/ovl_En_Sth.xml | 6 ++ assets/xml/textures/nintendo_rogo_static.xml | 10 ++- .../xml/textures/nintendo_rogo_static_v2.xml | 10 ++- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 10 +-- 10 files changed, 180 insertions(+), 21 deletions(-) diff --git a/assets/xml/overlays/ovl_Boss_Ganon.xml b/assets/xml/overlays/ovl_Boss_Ganon.xml index 229ab58e1b..9afa6d1251 100644 --- a/assets/xml/overlays/ovl_Boss_Ganon.xml +++ b/assets/xml/overlays/ovl_Boss_Ganon.xml @@ -16,6 +16,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -29,25 +65,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Boss_Ganon2.xml b/assets/xml/overlays/ovl_Boss_Ganon2.xml index 6b92b19a09..75e7ee9fee 100644 --- a/assets/xml/overlays/ovl_Boss_Ganon2.xml +++ b/assets/xml/overlays/ovl_Boss_Ganon2.xml @@ -2,8 +2,14 @@ + + + + + + @@ -13,17 +19,35 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Boss_Sst.xml b/assets/xml/overlays/ovl_Boss_Sst.xml index 35584224de..93f66c6756 100644 --- a/assets/xml/overlays/ovl_Boss_Sst.xml +++ b/assets/xml/overlays/ovl_Boss_Sst.xml @@ -1,8 +1,14 @@ - - - - + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Demo_Shd.xml b/assets/xml/overlays/ovl_Demo_Shd.xml index 967f383ec3..49e5e30114 100644 --- a/assets/xml/overlays/ovl_Demo_Shd.xml +++ b/assets/xml/overlays/ovl_Demo_Shd.xml @@ -1,8 +1,13 @@ - - - - + + + + + + + + + diff --git a/assets/xml/overlays/ovl_En_Clear_Tag.xml b/assets/xml/overlays/ovl_En_Clear_Tag.xml index 05c9c29865..cfdb5fb764 100644 --- a/assets/xml/overlays/ovl_En_Clear_Tag.xml +++ b/assets/xml/overlays/ovl_En_Clear_Tag.xml @@ -1,14 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_En_Ganon_Organ.xml b/assets/xml/overlays/ovl_En_Ganon_Organ.xml index 639d68ad38..6668b85fd0 100644 --- a/assets/xml/overlays/ovl_En_Ganon_Organ.xml +++ b/assets/xml/overlays/ovl_En_Ganon_Organ.xml @@ -13,7 +13,13 @@ + + + + + + diff --git a/assets/xml/overlays/ovl_En_Sth.xml b/assets/xml/overlays/ovl_En_Sth.xml index 93d211cb99..2c4671e468 100644 --- a/assets/xml/overlays/ovl_En_Sth.xml +++ b/assets/xml/overlays/ovl_En_Sth.xml @@ -7,6 +7,12 @@ + + + + + + diff --git a/assets/xml/textures/nintendo_rogo_static.xml b/assets/xml/textures/nintendo_rogo_static.xml index c5e555fb18..229ccf2eb5 100644 --- a/assets/xml/textures/nintendo_rogo_static.xml +++ b/assets/xml/textures/nintendo_rogo_static.xml @@ -1,8 +1,10 @@ - - - - + + + + + + diff --git a/assets/xml/textures/nintendo_rogo_static_v2.xml b/assets/xml/textures/nintendo_rogo_static_v2.xml index 56792cf47f..f4df8cff3c 100644 --- a/assets/xml/textures/nintendo_rogo_static_v2.xml +++ b/assets/xml/textures/nintendo_rogo_static_v2.xml @@ -1,8 +1,10 @@ - - - - + + + + + + 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 fd18b10ece..e0c2239361 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -2769,7 +2769,7 @@ void BossSst_DrawHand(Actor* thisx, PlayState* play) { gSPSegment(POLY_OPA_DISP++, 0x08, &D_80116280[2]); } else { gDPSetEnvColor(POLY_OPA_DISP++, sStaticColor.r, sStaticColor.g, sStaticColor.b, 0); - gSPSegment(POLY_OPA_DISP++, 0x08, sBodyStaticDList); + gSPSegment(POLY_OPA_DISP++, 0x08, sBodyStaticDL); } SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, @@ -2795,7 +2795,7 @@ void BossSst_DrawHand(Actor* thisx, PlayState* play) { &trail->world.rot); Matrix_Scale(0.02f, 0.02f, 0.02f, MTXMODE_APPLY); - gSPSegment(POLY_XLU_DISP++, 0x08, sHandTrailDList); + gSPSegment(POLY_XLU_DISP++, 0x08, sHandTrailDL); gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x00, ((3 - i) * 10) + 20, 0, ((3 - i) * 20) + 50, ((3 - i) * 30) + 70); @@ -2904,7 +2904,7 @@ void BossSst_DrawHead(Actor* thisx, PlayState* play) { gSPSegment(POLY_OPA_DISP++, 0x08, &D_80116280[2]); } else { gDPSetEnvColor(POLY_OPA_DISP++, sStaticColor.r, sStaticColor.g, sStaticColor.b, 0); - gSPSegment(POLY_OPA_DISP++, 0x08, sBodyStaticDList); + gSPSegment(POLY_OPA_DISP++, 0x08, sBodyStaticDL); } } else { Gfx_SetupDL_25Xlu(play->state.gfxCtx); @@ -2956,7 +2956,7 @@ void BossSst_DrawHead(Actor* thisx, PlayState* play) { Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_boss_sst.c", 6934); - gSPDisplayList(POLY_XLU_DISP++, sIntroVanishDList); + gSPDisplayList(POLY_XLU_DISP++, sIntroVanishDL); } CLOSE_DISPS(play->state.gfxCtx, "../z_boss_sst.c", 6941); @@ -3257,7 +3257,7 @@ void BossSst_DrawEffects(Actor* thisx, PlayState* play) { Matrix_Scale(effect->scale * 0.001f, 1.0f, effect->scale * 0.001f, MTXMODE_APPLY); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_boss_sst.c", 7423); - gSPDisplayList(POLY_XLU_DISP++, sShadowDList); + gSPDisplayList(POLY_XLU_DISP++, sShadowDL); effect++; } }