izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Adds in scene support (#117)

Browse Source 
* 1 scene done, Z2_SOUGEN OK

* All scenes OK

* Makefile improvements

* Use WIP ZAPD branch as submodule

* Add spawn rotation flag macro

* Fix bad merge

* Move scenes to be in their own subfolders

* Rename and restructure extracted baserom files

* Progress tracking for assets

* Add asset progress to csv

* Use master ZAPD

* Use distclean like in OOT

* Fix up a few things with the makefile

* Fix scenes not being dumped from ELF

Co-authored-by: Rozelette <Uberpanzermensch@gmail.com>
This commit is contained in:
Kenix3
2021-04-29 18:56:18 -04:00
committed by GitHub
co-authored by Rozelette
parent e97f10a6fa
commit c40bb119e1
158 changed files with 9168 additions and 6817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/.gitignore
+1
View File
@@ -0,0 +1 @@
src/*
assets/xml/scenes/KAKUSIANA/KAKUSIANA.xml
+50
View File
@@ -0,0 +1,50 @@
<Root>
<File Name="KAKUSIANA" Game="MM">
<Scene Name="KAKUSIANA"/>
</File>
<File Name="KAKUSIANA_room_00" Game="MM">
<Room Name="KAKUSIANA_room_00"/>
</File>
<File Name="KAKUSIANA_room_01" Game="MM">
<Room Name="KAKUSIANA_room_01"/>
</File>
<File Name="KAKUSIANA_room_02" Game="MM">
<Room Name="KAKUSIANA_room_02"/>
</File>
<File Name="KAKUSIANA_room_03" Game="MM">
<Room Name="KAKUSIANA_room_03"/>
</File>
<File Name="KAKUSIANA_room_04" Game="MM">
<Room Name="KAKUSIANA_room_04"/>
</File>
<File Name="KAKUSIANA_room_05" Game="MM">
<Room Name="KAKUSIANA_room_05"/>
</File>
<File Name="KAKUSIANA_room_06" Game="MM">
<Room Name="KAKUSIANA_room_06"/>
</File>
<File Name="KAKUSIANA_room_07" Game="MM">
<Room Name="KAKUSIANA_room_07"/>
</File>
<File Name="KAKUSIANA_room_08" Game="MM">
<Room Name="KAKUSIANA_room_08"/>
</File>
<File Name="KAKUSIANA_room_09" Game="MM">
<Room Name="KAKUSIANA_room_09"/>
</File>
<File Name="KAKUSIANA_room_10" Game="MM">
<Room Name="KAKUSIANA_room_10"/>
</File>
<File Name="KAKUSIANA_room_11" Game="MM">
<Room Name="KAKUSIANA_room_11"/>
</File>
<File Name="KAKUSIANA_room_12" Game="MM">
<Room Name="KAKUSIANA_room_12"/>
</File>
<File Name="KAKUSIANA_room_13" Game="MM">
<Room Name="KAKUSIANA_room_13"/>
</File>
<File Name="KAKUSIANA_room_14" Game="MM">
<Room Name="KAKUSIANA_room_14"/>
</File>
</Root>
assets/xml/scenes/SPOT00/SPOT00.xml
+8
View File
@@ -0,0 +1,8 @@
<Root>
<File Name="SPOT00" Game="MM">
<Scene Name="SPOT00"/>
</File>
<File Name="SPOT00_room_00" Game="MM">
<Room Name="SPOT00_room_00"/>
</File>
</Root>
assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml
+8
View File
@@ -0,0 +1,8 @@
<Root>
<File Name="Z2_00KEIKOKU" Game="MM">
<Scene Name="Z2_00KEIKOKU"/>
</File>
<File Name="Z2_00KEIKOKU_room_00" Game="MM">
<Room Name="Z2_00KEIKOKU_room_00"/>
</File>
</Root>
assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml
+8
View File
@@ -0,0 +1,8 @@
<Root>
<File Name="Z2_10YUKIYAMANOMURA" Game="MM">
<Scene Name="Z2_10YUKIYAMANOMURA"/>
</File>
<File Name="Z2_10YUKIYAMANOMURA_room_00" Game="MM">
<Room Name="Z2_10YUKIYAMANOMURA_room_00"/>
</File>
</Root>
assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml
+11
View File
@@ -0,0 +1,11 @@
<Root>
<File Name="Z2_10YUKIYAMANOMURA2" Game="MM">
<Scene Name="Z2_10YUKIYAMANOMURA2"/>
</File>
<File Name="Z2_10YUKIYAMANOMURA2_room_00" Game="MM">
<Room Name="Z2_10YUKIYAMANOMURA2_room_00"/>
</File>
<File Name="Z2_10YUKIYAMANOMURA2_room_01" Game="MM">
<Room Name="Z2_10YUKIYAMANOMURA2_room_01"/>
</File>
</Root>
assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml
+11
View File
@@ -0,0 +1,11 @@
<Root>
<File Name="Z2_11GORONNOSATO" Game="MM">
<Scene Name="Z2_11GORONNOSATO"/>
</File>
<File Name="Z2_11GORONNOSATO_room_00" Game="MM">
<Room Name="Z2_11GORONNOSATO_room_00"/>
</File>
<File Name="Z2_11GORONNOSATO_room_01" Game="MM">
<Room Name="Z2_11GORONNOSATO_room_01"/>
</File>
</Root>
assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml
+11
View File
@@ -0,0 +1,11 @@
<Root>
<File Name="Z2_11GORONNOSATO2" Game="MM">
<Scene Name="Z2_11GORONNOSATO2"/>
</File>
<File Name="Z2_11GORONNOSATO2_room_00" Game="MM">
<Room Name="Z2_11GORONNOSATO2_room_00"/>
</File>
<File Name="Z2_11GORONNOSATO2_room_01" Game="MM">
<Room Name="Z2_11GORONNOSATO2_room_01"/>
</File>
</Root>
assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml
+8
View File
@@ -0,0 +1,8 @@
<Root>
<File Name="Z2_12HAKUGINMAE" Game="MM">
<Scene Name="Z2_12HAKUGINMAE"/>
</File>
<File Name="Z2_12HAKUGINMAE_room_00" Game="MM">
<Room Name="Z2_12HAKUGINMAE_room_00"/>
</File>
</Root>
assets/xml/scenes/Z2_13HUBUKINOMITI/Z2_13HUBUKINOMITI.xml
+8
View File
@@ -0,0 +1,8 @@
<Root>
<File Name="Z2_13HUBUKINOMITI" Game="MM">
<Scene Name="Z2_13HUBUKINOMITI"/>
</File>
<File Name="Z2_13HUBUKINOMITI_room_00" Game="MM">
<Room Name="Z2_13HUBUKINOMITI_room_00"/>
</File>
</Root>
assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml
+8
View File
@@ -0,0 +1,8 @@
<Root>
<File Name="Z2_14YUKIDAMANOMITI" Game="MM">
<Scene Name="Z2_14YUKIDAMANOMITI"/>
</File>
<File Name="Z2_14YUKIDAMANOMITI_room_00" Game="MM">
<Room Name="Z2_14YUKIDAMANOMITI_room_00"/>
</File>
</Root>
assets/xml/scenes/Z2_16GORON_HOUSE/Z2_16GORON_HOUSE.xml
+11
View File
@@ -0,0 +1,11 @@
<Root>
<File Name="Z2_16GORON_HOUSE" Game="MM">
<Scene Name="Z2_16GORON_HOUSE"/>
</File>
<File Name="Z2_16GORON_HOUSE_room_00" Game="MM">
<Room Name="Z2_16GORON_HOUSE_room_00"/>
</File>
<File Name="Z2_16GORON_HOUSE_room_01" Game="MM">
<Room Name="Z2_16GORON_HOUSE_room_01"/>
</File>
</Root>
assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml
+8
View File
@@ -0,0 +1,8 @@
<Root>
<File Name="Z2_17SETUGEN" Game="MM">
<Scene Name="Z2_17SETUGEN"/>
</File>
<File Name="Z2_17SETUGEN_room_00" Game="MM">
<Room Name="Z2_17SETUGEN_room_00"/>
</File>
</Root>
assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml
+8
View File
@@ -0,0 +1,8 @@
<Root>
<File Name="Z2_17SETUGEN2" Game="MM">
<Scene Name="Z2_17SETUGEN2"/>
</File>
<File Name="Z2_17SETUGEN2_room_00" Game="MM">
<Room Name="Z2_17SETUGEN2_room_00"/>
</File>
</Root>
assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml
+14
View File
@@ -0,0 +1,14 @@
<Root>
<File Name="Z2_20SICHITAI" Game="MM">
<Scene Name="Z2_20SICHITAI"/>
</File>
<File Name="Z2_20SICHITAI_room_00" Game="MM">
<Room Name="Z2_20SICHITAI_room_00"/>
</File>
<File Name="Z2_20SICHITAI_room_01" Game="MM">
<Room Name="Z2_20SICHITAI_room_01"/>
</File>
<File Name="Z2_20SICHITAI_room_02" Game="MM">
<Room Name="Z2_20SICHITAI_room_02"/>
</File>
</Root>
assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml
+14
View File
@@ -0,0 +1,14 @@
<Root>
<File Name="Z2_20SICHITAI2" Game="MM">
<Scene Name="Z2_20SICHITAI2"/>
</File>
<File Name="Z2_20SICHITAI2_room_00" Game="MM">
<Room Name="Z2_20SICHITAI2_room_00"/>
</File>
<File Name="Z2_20SICHITAI2_room_01" Game="MM">
<Room Name="Z2_20SICHITAI2_room_01"/>
</File>
<File Name="Z2_20SICHITAI2_room_02" Game="MM">
<Room Name="Z2_20SICHITAI2_room_02"/>
</File>
</Root>
assets/xml/scenes/Z2_21MITURINMAE/Z2_21MITURINMAE.xml
+8
View File
@@ -0,0 +1,8 @@
<Root>
<File Name="Z2_21MITURINMAE" Game="MM">
<Scene Name="Z2_21MITURINMAE"/>
</File>
<File Name="Z2_21MITURINMAE_room_00" Game="MM">
<Room Name="Z2_21MITURINMAE_room_00"/>
</File>
</Root>
assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml
+14
View File
@@ -0,0 +1,14 @@
<Root>
<File Name="Z2_22DEKUCITY" Game="MM">
<Scene Name="Z2_22DEKUCITY"/>
</File>
<File Name="Z2_22DEKUCITY_room_00" Game="MM">
<Room Name="Z2_22DEKUCITY_room_00"/>
</File>
<File Name="Z2_22DEKUCITY_room_01" Game="MM">
<Room Name="Z2_22DEKUCITY_room_01"/>
</File>
<File Name="Z2_22DEKUCITY_room_02" Game="MM">
<Room Name="Z2_22DEKUCITY_room_02"/>
</File>
</Root>
assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml
+8
View File
@@ -0,0 +1,8 @@
<Root>
<File Name="Z2_24KEMONOMITI" Game="MM">
<Scene Name="Z2_24KEMONOMITI"/>
</File>
<File Name="Z2_24KEMONOMITI_room_00" Game="MM">
<Room Name="Z2_24KEMONOMITI_room_00"/>
</File>
</Root>
assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml
+32
View File
@@ -0,0 +1,32 @@
<Root>
<File Name="Z2_26SARUNOMORI" Game="MM">
<Scene Name="Z2_26SARUNOMORI"/>
</File>
<File Name="Z2_26SARUNOMORI_room_00" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_00"/>
</File>
<File Name="Z2_26SARUNOMORI_room_01" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_01"/>
</File>
<File Name="Z2_26SARUNOMORI_room_02" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_02"/>
</File>
<File Name="Z2_26SARUNOMORI_room_03" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_03"/>
</File>
<File Name="Z2_26SARUNOMORI_room_04" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_04"/>
</File>
<File Name="Z2_26SARUNOMORI_room_05" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_05"/>
</File>
<File Name="Z2_26SARUNOMORI_room_06" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_06"/>
</File>
<File Name="Z2_26SARUNOMORI_room_07" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_07"/>
</File>
<File Name="Z2_26SARUNOMORI_room_08" Game="MM">
<Room Name="Z2_26SARUNOMORI_room_08"/>
</File>
</Root>

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