Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 17 commits into from
Jun 2, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
67e485f
Fix segments
AngheloAlf May 10, 2021
527ae0a
add CMD_PTR macro
AngheloAlf May 10, 2021
080093f
macro fixes
AngheloAlf May 10, 2021
14cd32b
add PolygonDlist2
AngheloAlf May 10, 2021
fe666b4
Fix XMLs
AngheloAlf May 10, 2021
103b78c
Merge remote-tracking branch 'upstream/master' into fix_scenes
AngheloAlf May 11, 2021
4db9a69
I hope this updates ZAPD
AngheloAlf May 11, 2021
508bf43
Add ZAPD config files
AngheloAlf May 11, 2021
73c0671
remove old structs
AngheloAlf May 11, 2021
41d97b3
update macro
AngheloAlf May 11, 2021
6dc6bd1
Merge remote-tracking branch 'upstream/master' into fix_scenes
AngheloAlf May 14, 2021
148b96c
Add newline
AngheloAlf May 22, 2021
31a1522
Merge remote-tracking branch 'upstream/master' into fix_scenes
AngheloAlf May 22, 2021
50cc5fb
Merge remote-tracking branch 'upstream/master' into fix_scenes
AngheloAlf May 27, 2021
8d47916
update ZAPD?
AngheloAlf May 27, 2021
885131d
update warnings
AngheloAlf May 27, 2021
071c149
update ZAPD
AngheloAlf Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions assets/xml/scenes/KAKUSIANA/KAKUSIANA.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions assets/xml/scenes/SPOT00/SPOT00.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
12 changes: 6 additions & 6 deletions assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
12 changes: 6 additions & 6 deletions assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
12 changes: 6 additions & 6 deletions assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions assets/xml/scenes/Z2_13HUBUKINOMITI/Z2_13HUBUKINOMITI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
12 changes: 6 additions & 6 deletions assets/xml/scenes/Z2_16GORON_HOUSE/Z2_16GORON_HOUSE.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
16 changes: 8 additions & 8 deletions assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
16 changes: 8 additions & 8 deletions assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions assets/xml/scenes/Z2_21MITURINMAE/Z2_21MITURINMAE.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
16 changes: 8 additions & 8 deletions assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Loading