From c418bbb19cef7621eed6d8a18e1e4b97c30f8862 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 7 Jun 2025 23:57:18 +0200 Subject: [PATCH] Add Vtx[] resources in xmls for (partially) documented assets 10 (#2609) * Add Vtx[] resources in xmls for (partially) documented assets 10 * bss --- assets/xml/objects/object_du.xml | 48 +++ assets/xml/objects/object_du_pal.xml | 48 +++ assets/xml/objects/object_goma.xml | 109 +++++++ assets/xml/objects/object_goma_pal.xml | 107 +++++++ assets/xml/objects/object_mo.xml | 144 ++++++++- assets/xml/objects/object_mo_pal.xml | 146 ++++++++- assets/xml/objects/object_tw.xml | 315 +++++++++++++++++- assets/xml/objects/object_tw_pal.xml | 406 +++++++++++++++++++++++- assets/xml/objects/object_xc.xml | 54 ++++ assets/xml/objects/object_xc_pal.xml | 54 ++++ src/overlays/actors/ovl_En_Xc/z_en_xc.c | 2 +- 11 files changed, 1410 insertions(+), 23 deletions(-) diff --git a/assets/xml/objects/object_du.xml b/assets/xml/objects/object_du.xml index 6309a37e59..3535c98e97 100644 --- a/assets/xml/objects/object_du.xml +++ b/assets/xml/objects/object_du.xml @@ -78,10 +78,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_du_pal.xml b/assets/xml/objects/object_du_pal.xml index ad2c6b4fe5..1ea1309b78 100644 --- a/assets/xml/objects/object_du_pal.xml +++ b/assets/xml/objects/object_du_pal.xml @@ -78,10 +78,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_goma.xml b/assets/xml/objects/object_goma.xml index be843c7ea2..f2429cd2b9 100644 --- a/assets/xml/objects/object_goma.xml +++ b/assets/xml/objects/object_goma.xml @@ -90,6 +90,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -162,8 +266,13 @@ + + + + + diff --git a/assets/xml/objects/object_goma_pal.xml b/assets/xml/objects/object_goma_pal.xml index 95c7f6ce0b..dbee83f7ca 100644 --- a/assets/xml/objects/object_goma_pal.xml +++ b/assets/xml/objects/object_goma_pal.xml @@ -90,6 +90,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -162,6 +266,9 @@ + + + diff --git a/assets/xml/objects/object_mo.xml b/assets/xml/objects/object_mo.xml index 1f82a6fe77..9844361f58 100644 --- a/assets/xml/objects/object_mo.xml +++ b/assets/xml/objects/object_mo.xml @@ -3,10 +3,132 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -53,19 +175,37 @@ + + + + + + + + + - + + + + + + + + + + diff --git a/assets/xml/objects/object_mo_pal.xml b/assets/xml/objects/object_mo_pal.xml index 34654ef1c5..71078c6a95 100644 --- a/assets/xml/objects/object_mo_pal.xml +++ b/assets/xml/objects/object_mo_pal.xml @@ -3,10 +3,132 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -52,20 +174,38 @@ - + + + + + + + + + + - + + + + + + + + + + diff --git a/assets/xml/objects/object_tw.xml b/assets/xml/objects/object_tw.xml index e99bd2c2aa..922d28ac65 100644 --- a/assets/xml/objects/object_tw.xml +++ b/assets/xml/objects/object_tw.xml @@ -76,6 +76,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -159,34 +245,58 @@ + + + + + + - + + + + + + + + + + - + + + + - + + + + + + + @@ -199,50 +309,95 @@ - + + + + + + + + + + + + + - + + + + - + + + + + + + + + + + + + - + + + + - + + + + - + + + + + + + + + + + + + @@ -292,6 +447,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -334,6 +575,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -415,6 +709,9 @@ + + + diff --git a/assets/xml/objects/object_tw_pal.xml b/assets/xml/objects/object_tw_pal.xml index e77e3c247e..2b777f3d3a 100644 --- a/assets/xml/objects/object_tw_pal.xml +++ b/assets/xml/objects/object_tw_pal.xml @@ -76,6 +76,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -106,7 +192,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -132,6 +264,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -155,34 +334,58 @@ + + + + + + + + + + + + + + + - + + + + - + + + + + + + @@ -195,50 +398,95 @@ - + + + + + + + + + + + + + - + + + + - + + + + + + + + + + + + + - + + + + - + + + + - + + + + + + + + + + + + + @@ -288,6 +536,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -330,6 +664,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -411,6 +798,9 @@ + + + diff --git a/assets/xml/objects/object_xc.xml b/assets/xml/objects/object_xc.xml index fa0ee758ef..f6f30b2f44 100644 --- a/assets/xml/objects/object_xc.xml +++ b/assets/xml/objects/object_xc.xml @@ -26,8 +26,17 @@ + + + + + + + + + @@ -46,6 +55,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_xc_pal.xml b/assets/xml/objects/object_xc_pal.xml index 6478af53b5..7d20f23661 100644 --- a/assets/xml/objects/object_xc_pal.xml +++ b/assets/xml/objects/object_xc_pal.xml @@ -26,8 +26,17 @@ + + + + + + + + + @@ -46,6 +55,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 2820225931..60a247490b 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -1416,7 +1416,7 @@ void func_80B3F3D8(void) { } #pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64 ique-cn:64" \ - "ntsc-1.0:64 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" + "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64" void EnXc_PlayDiveSFX(Vec3f* src, PlayState* play) { static Vec3f D_80B42DA0;