Update ZAPD to use scene macros, improve texture system and others (#129)

* Fix segments

* add CMD_PTR macro

* macro fixes

* add PolygonDlist2

* Fix XMLs

* I hope this updates ZAPD

* Add ZAPD config files

* remove old structs

* update macro

* Add newline

* update ZAPD?

* update warnings

* update ZAPD
This commit is contained in:
Anghelo Carvajal
2021-06-02 18:18:38 -04:00
committed by GitHub
parent 7d476f7c71
commit f0bad10668
111 changed files with 2186 additions and 866 deletions
+32 -32
View File
@@ -1,50 +1,50 @@
<Root>
<File Name="KAKUSIANA" Game="MM">
<Scene Name="KAKUSIANA"/>
<File Name="KAKUSIANA" Segment="2" Game="MM">
<Scene Name="KAKUSIANA" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_00" Game="MM">
<Room Name="KAKUSIANA_room_00"/>
<File Name="KAKUSIANA_room_00" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_00" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_01" Game="MM">
<Room Name="KAKUSIANA_room_01"/>
<File Name="KAKUSIANA_room_01" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_01" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_02" Game="MM">
<Room Name="KAKUSIANA_room_02"/>
<File Name="KAKUSIANA_room_02" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_02" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_03" Game="MM">
<Room Name="KAKUSIANA_room_03"/>
<File Name="KAKUSIANA_room_03" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_03" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_04" Game="MM">
<Room Name="KAKUSIANA_room_04"/>
<File Name="KAKUSIANA_room_04" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_04" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_05" Game="MM">
<Room Name="KAKUSIANA_room_05"/>
<File Name="KAKUSIANA_room_05" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_05" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_06" Game="MM">
<Room Name="KAKUSIANA_room_06"/>
<File Name="KAKUSIANA_room_06" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_06" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_07" Game="MM">
<Room Name="KAKUSIANA_room_07"/>
<File Name="KAKUSIANA_room_07" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_07" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_08" Game="MM">
<Room Name="KAKUSIANA_room_08"/>
<File Name="KAKUSIANA_room_08" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_08" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_09" Game="MM">
<Room Name="KAKUSIANA_room_09"/>
<File Name="KAKUSIANA_room_09" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_09" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_10" Game="MM">
<Room Name="KAKUSIANA_room_10"/>
<File Name="KAKUSIANA_room_10" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_10" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_11" Game="MM">
<Room Name="KAKUSIANA_room_11"/>
<File Name="KAKUSIANA_room_11" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_11" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_12" Game="MM">
<Room Name="KAKUSIANA_room_12"/>
<File Name="KAKUSIANA_room_12" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_12" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_13" Game="MM">
<Room Name="KAKUSIANA_room_13"/>
<File Name="KAKUSIANA_room_13" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_13" Offset="0x0"/>
</File>
<File Name="KAKUSIANA_room_14" Game="MM">
<Room Name="KAKUSIANA_room_14"/>
<File Name="KAKUSIANA_room_14" Segment="3" Game="MM">
<Room Name="KAKUSIANA_room_14" Offset="0x0"/>
</File>
</Root>
+4 -4
View File
@@ -1,8 +1,8 @@
<Root>
<File Name="SPOT00" Game="MM">
<Scene Name="SPOT00"/>
<File Name="SPOT00" Segment="2" Game="MM">
<Scene Name="SPOT00" Offset="0x0"/>
</File>
<File Name="SPOT00_room_00" Game="MM">
<Room Name="SPOT00_room_00"/>
<File Name="SPOT00_room_00" Segment="3" Game="MM">
<Room Name="SPOT00_room_00" Offset="0x0"/>
</File>
</Root>
@@ -1,8 +1,8 @@
<Root>
<File Name="Z2_00KEIKOKU" Game="MM">
<Scene Name="Z2_00KEIKOKU"/>
<File Name="Z2_00KEIKOKU" Segment="2" Game="MM">
<Scene Name="Z2_00KEIKOKU" Offset="0x0"/>
</File>
<File Name="Z2_00KEIKOKU_room_00" Game="MM">
<Room Name="Z2_00KEIKOKU_room_00"/>
<File Name="Z2_00KEIKOKU_room_00" Segment="3" Game="MM">
<Room Name="Z2_00KEIKOKU_room_00" Offset="0x0"/>
</File>
</Root>
@@ -1,8 +1,8 @@
<Root>
<File Name="Z2_10YUKIYAMANOMURA" Game="MM">
<Scene Name="Z2_10YUKIYAMANOMURA"/>
<File Name="Z2_10YUKIYAMANOMURA" Segment="2" Game="MM">
<Scene Name="Z2_10YUKIYAMANOMURA" Offset="0x0"/>
</File>
<File Name="Z2_10YUKIYAMANOMURA_room_00" Game="MM">
<Room Name="Z2_10YUKIYAMANOMURA_room_00"/>
<File Name="Z2_10YUKIYAMANOMURA_room_00" Segment="3" Game="MM">
<Room Name="Z2_10YUKIYAMANOMURA_room_00" Offset="0x0"/>
</File>
</Root>
@@ -1,11 +1,11 @@
<Root>
<File Name="Z2_10YUKIYAMANOMURA2" Game="MM">
<Scene Name="Z2_10YUKIYAMANOMURA2"/>
<File Name="Z2_10YUKIYAMANOMURA2" Segment="2" Game="MM">
<Scene Name="Z2_10YUKIYAMANOMURA2" Offset="0x0"/>
</File>
<File Name="Z2_10YUKIYAMANOMURA2_room_00" Game="MM">
<Room Name="Z2_10YUKIYAMANOMURA2_room_00"/>
<File Name="Z2_10YUKIYAMANOMURA2_room_00" Segment="3" Game="MM">
<Room Name="Z2_10YUKIYAMANOMURA2_room_00" Offset="0x0"/>
</File>
<File Name="Z2_10YUKIYAMANOMURA2_room_01" Game="MM">
<Room Name="Z2_10YUKIYAMANOMURA2_room_01"/>
<File Name="Z2_10YUKIYAMANOMURA2_room_01" Segment="3" Game="MM">
<Room Name="Z2_10YUKIYAMANOMURA2_room_01" Offset="0x0"/>
</File>
</Root>
@@ -1,11 +1,11 @@
<Root>
<File Name="Z2_11GORONNOSATO" Game="MM">
<Scene Name="Z2_11GORONNOSATO"/>
<File Name="Z2_11GORONNOSATO" Segment="2" Game="MM">
<Scene Name="Z2_11GORONNOSATO" Offset="0x0"/>
</File>
<File Name="Z2_11GORONNOSATO_room_00" Game="MM">
<Room Name="Z2_11GORONNOSATO_room_00"/>
<File Name="Z2_11GORONNOSATO_room_00" Segment="3" Game="MM">
<Room Name="Z2_11GORONNOSATO_room_00" Offset="0x0"/>
</File>
<File Name="Z2_11GORONNOSATO_room_01" Game="MM">
<Room Name="Z2_11GORONNOSATO_room_01"/>
<File Name="Z2_11GORONNOSATO_room_01" Segment="3" Game="MM">
<Room Name="Z2_11GORONNOSATO_room_01" Offset="0x0"/>
</File>
</Root>
@@ -1,11 +1,11 @@
<Root>
<File Name="Z2_11GORONNOSATO2" Game="MM">
<Scene Name="Z2_11GORONNOSATO2"/>
<File Name="Z2_11GORONNOSATO2" Segment="2" Game="MM">
<Scene Name="Z2_11GORONNOSATO2" Offset="0x0"/>
</File>
<File Name="Z2_11GORONNOSATO2_room_00" Game="MM">
<Room Name="Z2_11GORONNOSATO2_room_00"/>
<File Name="Z2_11GORONNOSATO2_room_00" Segment="3" Game="MM">
<Room Name="Z2_11GORONNOSATO2_room_00" Offset="0x0"/>
</File>
<File Name="Z2_11GORONNOSATO2_room_01" Game="MM">
<Room Name="Z2_11GORONNOSATO2_room_01"/>
<File Name="Z2_11GORONNOSATO2_room_01" Segment="3" Game="MM">
<Room Name="Z2_11GORONNOSATO2_room_01" Offset="0x0"/>
</File>
</Root>
@@ -1,8 +1,8 @@
<Root>
<File Name="Z2_12HAKUGINMAE" Game="MM">
<Scene Name="Z2_12HAKUGINMAE"/>
<File Name="Z2_12HAKUGINMAE" Segment="2" Game="MM">
<Scene Name="Z2_12HAKUGINMAE" Offset="0x0"/>
</File>
<File Name="Z2_12HAKUGINMAE_room_00" Game="MM">
<Room Name="Z2_12HAKUGINMAE_room_00"/>
<File Name="Z2_12HAKUGINMAE_room_00" Segment="3" Game="MM">
<Room Name="Z2_12HAKUGINMAE_room_00" Offset="0x0"/>
</File>
</Root>
@@ -1,8 +1,8 @@
<Root>
<File Name="Z2_13HUBUKINOMITI" Game="MM">
<Scene Name="Z2_13HUBUKINOMITI"/>
<File Name="Z2_13HUBUKINOMITI" Segment="2" Game="MM">
<Scene Name="Z2_13HUBUKINOMITI" Offset="0x0"/>
</File>
<File Name="Z2_13HUBUKINOMITI_room_00" Game="MM">
<Room Name="Z2_13HUBUKINOMITI_room_00"/>
<File Name="Z2_13HUBUKINOMITI_room_00" Segment="3" Game="MM">
<Room Name="Z2_13HUBUKINOMITI_room_00" Offset="0x0"/>
</File>
</Root>
@@ -1,8 +1,8 @@
<Root>
<File Name="Z2_14YUKIDAMANOMITI" Game="MM">
<Scene Name="Z2_14YUKIDAMANOMITI"/>
<File Name="Z2_14YUKIDAMANOMITI" Segment="2" Game="MM">
<Scene Name="Z2_14YUKIDAMANOMITI" Offset="0x0"/>
</File>
<File Name="Z2_14YUKIDAMANOMITI_room_00" Game="MM">
<Room Name="Z2_14YUKIDAMANOMITI_room_00"/>
<File Name="Z2_14YUKIDAMANOMITI_room_00" Segment="3" Game="MM">
<Room Name="Z2_14YUKIDAMANOMITI_room_00" Offset="0x0"/>
</File>
</Root>
@@ -1,11 +1,11 @@
<Root>
<File Name="Z2_16GORON_HOUSE" Game="MM">
<Scene Name="Z2_16GORON_HOUSE"/>
<File Name="Z2_16GORON_HOUSE" Segment="2" Game="MM">
<Scene Name="Z2_16GORON_HOUSE" Offset="0x0"/>
</File>
<File Name="Z2_16GORON_HOUSE_room_00" Game="MM">
<Room Name="Z2_16GORON_HOUSE_room_00"/>
<File Name="Z2_16GORON_HOUSE_room_00" Segment="3" Game="MM">
<Room Name="Z2_16GORON_HOUSE_room_00" Offset="0x0"/>
</File>
<File Name="Z2_16GORON_HOUSE_room_01" Game="MM">
<Room Name="Z2_16GORON_HOUSE_room_01"/>
<File Name="Z2_16GORON_HOUSE_room_01" Segment="3" Game="MM">
<Room Name="Z2_16GORON_HOUSE_room_01" Offset="0x0"/>
</File>
</Root>
@@ -1,8 +1,8 @@
<Root>
<File Name="Z2_17SETUGEN" Game="MM">
<Scene Name="Z2_17SETUGEN"/>
<File Name="Z2_17SETUGEN" Segment="2" Game="MM">
<Scene Name="Z2_17SETUGEN" Offset="0x0"/>
</File>
<File Name="Z2_17SETUGEN_room_00" Game="MM">
<Room Name="Z2_17SETUGEN_room_00"/>
<File Name="Z2_17SETUGEN_room_00" Segment="3" Game="MM">
<Room Name="Z2_17SETUGEN_room_00" Offset="0x0"/>
</File>
</Root>
@@ -1,8 +1,8 @@
<Root>
<File Name="Z2_17SETUGEN2" Game="MM">
<Scene Name="Z2_17SETUGEN2"/>
<File Name="Z2_17SETUGEN2" Segment="2" Game="MM">
<Scene Name="Z2_17SETUGEN2" Offset="0x0"/>
</File>
<File Name="Z2_17SETUGEN2_room_00" Game="MM">
<Room Name="Z2_17SETUGEN2_room_00"/>
<File Name="Z2_17SETUGEN2_room_00" Segment="3" Game="MM">
<Room Name="Z2_17SETUGEN2_room_00" Offset="0x0"/>
</File>
</Root>
@@ -1,14 +1,14 @@
<Root>
<File Name="Z2_20SICHITAI" Game="MM">
<Scene Name="Z2_20SICHITAI"/>
<File Name="Z2_20SICHITAI" Segment="2" Game="MM">
<Scene Name="Z2_20SICHITAI" Offset="0x0"/>
</File>
<File Name="Z2_20SICHITAI_room_00" Game="MM">
<Room Name="Z2_20SICHITAI_room_00"/>
<File Name="Z2_20SICHITAI_room_00" Segment="3" Game="MM">
<Room Name="Z2_20SICHITAI_room_00" Offset="0x0"/>
</File>
<File Name="Z2_20SICHITAI_room_01" Game="MM">
<Room Name="Z2_20SICHITAI_room_01"/>
<File Name="Z2_20SICHITAI_room_01" Segment="3" Game="MM">
<Room Name="Z2_20SICHITAI_room_01" Offset="0x0"/>
</File>
<File Name="Z2_20SICHITAI_room_02" Game="MM">
<Room Name="Z2_20SICHITAI_room_02"/>
<File Name="Z2_20SICHITAI_room_02" Segment="3" Game="MM">
<Room Name="Z2_20SICHITAI_room_02" Offset="0x0"/>
</File>
</Root>
@@ -1,14 +1,14 @@
<Root>
<File Name="Z2_20SICHITAI2" Game="MM">
<Scene Name="Z2_20SICHITAI2"/>
<File Name="Z2_20SICHITAI2" Segment="2" Game="MM">
<Scene Name="Z2_20SICHITAI2" Offset="0x0"/>
</File>
<File Name="Z2_20SICHITAI2_room_00" Game="MM">
<Room Name="Z2_20SICHITAI2_room_00"/>
<File Name="Z2_20SICHITAI2_room_00" Segment="3" Game="MM">
<Room Name="Z2_20SICHITAI2_room_00" Offset="0x0"/>
</File>
<File Name="Z2_20SICHITAI2_room_01" Game="MM">
<Room Name="Z2_20SICHITAI2_room_01"/>
<File Name="Z2_20SICHITAI2_room_01" Segment="3" Game="MM">
<Room Name="Z2_20SICHITAI2_room_01" Offset="0x0"/>
</File>
<File Name="Z2_20SICHITAI2_room_02" Game="MM">
<Room Name="Z2_20SICHITAI2_room_02"/>
<File Name="Z2_20SICHITAI2_room_02" Segment="3" Game="MM">
<Room Name="Z2_20SICHITAI2_room_02" Offset="0x0"/>
</File>
</Root>
@@ -1,8 +1,8 @@
<Root>
<File Name="Z2_21MITURINMAE" Game="MM">
<Scene Name="Z2_21MITURINMAE"/>
<File Name="Z2_21MITURINMAE" Segment="2" Game="MM">
<Scene Name="Z2_21MITURINMAE" Offset="0x0"/>
</File>
<File Name="Z2_21MITURINMAE_room_00" Game="MM">
<Room Name="Z2_21MITURINMAE_room_00"/>
<File Name="Z2_21MITURINMAE_room_00" Segment="3" Game="MM">
<Room Name="Z2_21MITURINMAE_room_00" Offset="0x0"/>
</File>
</Root>
@@ -1,14 +1,14 @@
<Root>
<File Name="Z2_22DEKUCITY" Game="MM">
<Scene Name="Z2_22DEKUCITY"/>
<File Name="Z2_22DEKUCITY" Segment="2" Game="MM">
<Scene Name="Z2_22DEKUCITY" Offset="0x0"/>
</File>
<File Name="Z2_22DEKUCITY_room_00" Game="MM">
<Room Name="Z2_22DEKUCITY_room_00"/>
<File Name="Z2_22DEKUCITY_room_00" Segment="3" Game="MM">
<Room Name="Z2_22DEKUCITY_room_00" Offset="0x0"/>
</File>
<File Name="Z2_22DEKUCITY_room_01" Game="MM">
<Room Name="Z2_22DEKUCITY_room_01"/>
<File Name="Z2_22DEKUCITY_room_01" Segment="3" Game="MM">
<Room Name="Z2_22DEKUCITY_room_01" Offset="0x0"/>
</File>
<File Name="Z2_22DEKUCITY_room_02" Game="MM">
<Room Name="Z2_22DEKUCITY_room_02"/>
<File Name="Z2_22DEKUCITY_room_02" Segment="3" Game="MM">
<Room Name="Z2_22DEKUCITY_room_02" Offset="0x0"/>
</File>
</Root>
@@ -1,8 +1,8 @@
<Root>
<File Name="Z2_24KEMONOMITI" Game="MM">
<Scene Name="Z2_24KEMONOMITI"/>
<File Name="Z2_24KEMONOMITI" Segment="2" Game="MM">
<Scene Name="Z2_24KEMONOMITI" Offset="0x0"/>
</File>
<File Name="Z2_24KEMONOMITI_room_00" Game="MM">
<Room Name="Z2_24KEMONOMITI_room_00"/>
<File Name="Z2_24KEMONOMITI_room_00" Segment="3" Game="MM">
<Room Name="Z2_24KEMONOMITI_room_00" Offset="0x0"/>
</File>
</Root>
@@ -1,32 +1,32 @@
<Root>
<File Name="Z2_26SARUNOMORI" Game="MM">
<Scene Name="Z2_26SARUNOMORI"/>
<File Name="Z2_26SARUNOMORI" Segment="2" Game="MM">
<Scene Name="Z2_26SARUNOMORI" Offset="0x0"/>
</File>
<File Name="Z2_26SARUNOMORI_room_00" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_00"/>
<File Name="Z2_26SARUNOMORI_room_00" Segment="3" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_00" Offset="0x0"/>
</File>
<File Name="Z2_26SARUNOMORI_room_01" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_01"/>
<File Name="Z2_26SARUNOMORI_room_01" Segment="3" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_01" Offset="0x0"/>
</File>
<File Name="Z2_26SARUNOMORI_room_02" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_02"/>
<File Name="Z2_26SARUNOMORI_room_02" Segment="3" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_02" Offset="0x0"/>
</File>
<File Name="Z2_26SARUNOMORI_room_03" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_03"/>
<File Name="Z2_26SARUNOMORI_room_03" Segment="3" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_03" Offset="0x0"/>
</File>
<File Name="Z2_26SARUNOMORI_room_04" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_04"/>
<File Name="Z2_26SARUNOMORI_room_04" Segment="3" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_04" Offset="0x0"/>
</File>
<File Name="Z2_26SARUNOMORI_room_05" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_05"/>
<File Name="Z2_26SARUNOMORI_room_05" Segment="3" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_05" Offset="0x0"/>
</File>
<File Name="Z2_26SARUNOMORI_room_06" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_06"/>
<File Name="Z2_26SARUNOMORI_room_06" Segment="3" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_06" Offset="0x0"/>
</File>
<File Name="Z2_26SARUNOMORI_room_07" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_07"/>
<File Name="Z2_26SARUNOMORI_room_07" Segment="3" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_07" Offset="0x0"/>
</File>
<File Name="Z2_26SARUNOMORI_room_08" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_08"/>
<File Name="Z2_26SARUNOMORI_room_08" Segment="3" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_08" Offset="0x0"/>
</File>
</Root>
@@ -1,8 +1,8 @@
<Root>
<File Name="Z2_30GYOSON" Game="MM">
<Scene Name="Z2_30GYOSON"/>
<File Name="Z2_30GYOSON" Segment="2" Game="MM">
<Scene Name="Z2_30GYOSON" Offset="0x0"/>
</File>
<File Name="Z2_30GYOSON_room_00" Game="MM">
<Room Name="Z2_30GYOSON_room_00"/>
<File Name="Z2_30GYOSON_room_00" Segment="3" Game="MM">
<Room Name="Z2_30GYOSON_room_00" Offset="0x0"/>
</File>
</Root>

Some files were not shown because too many files have changed in this diff Show More