From fd512f02e9d6afcf07a5078b1e062ccdcacd4b54 Mon Sep 17 00:00:00 2001 From: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Date: Sun, 7 Nov 2021 17:13:44 +0000 Subject: [PATCH] `link_animetion` xml, and ExternalFile config (#1011) * Automatic XML for link_animetion * Make sure tutorial images are not gitignored * OK * Correct ovl_Boss_Sst RangeEnd * ExternalFiles * Remove Segment="128" * Remove segments from place_title_cards * format, newlines, remove previous xml --- .gitignore | 3 + assets/xml/misc/link_animetion.xml | 577 +++++++++++++++++++++ assets/xml/objects/gameplay_keep.xml | 1 + assets/xml/objects/object_bdoor.xml | 1 + assets/xml/objects/object_syokudai.xml | 1 + assets/xml/objects/object_wood02.xml | 1 + assets/xml/overlays/ovl_Boss_Dodongo.xml | 2 +- assets/xml/overlays/ovl_Boss_Ganon2.xml | 2 +- assets/xml/overlays/ovl_Boss_Sst.xml | 2 +- assets/xml/overlays/ovl_En_Clear_Tag.xml | 2 +- assets/xml/overlays/ovl_En_Ganon_Mant.xml | 2 +- assets/xml/overlays/ovl_En_Ganon_Organ.xml | 2 +- assets/xml/overlays/ovl_En_Jsjutan.xml | 2 +- assets/xml/overlays/ovl_Magic_Dark.xml | 2 +- assets/xml/textures/link_animetion.xml | 7 - assets/xml/textures/place_title_cards.xml | 5 +- spec | 3 +- tools/ZAPDConfigs/MqDbg/Config.xml | 4 +- 18 files changed, 599 insertions(+), 20 deletions(-) create mode 100644 assets/xml/misc/link_animetion.xml delete mode 100644 assets/xml/textures/link_animetion.xml diff --git a/.gitignore b/.gitignore index 06bad1aa4d..8478bc7d7f 100644 --- a/.gitignore +++ b/.gitignore @@ -49,5 +49,8 @@ graphs/ !*_custom* .extracted-assets.json +# Docs +!docs/tutorial/ + # Per-user configuration .python-version diff --git a/assets/xml/misc/link_animetion.xml b/assets/xml/misc/link_animetion.xml new file mode 100644 index 0000000000..9de1e92d36 --- /dev/null +++ b/assets/xml/misc/link_animetion.xml @@ -0,0 +1,577 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml index 93d3128601..cc8f986713 100644 --- a/assets/xml/objects/gameplay_keep.xml +++ b/assets/xml/objects/gameplay_keep.xml @@ -1,4 +1,5 @@ + diff --git a/assets/xml/objects/object_bdoor.xml b/assets/xml/objects/object_bdoor.xml index e909cf634b..80f7302fe2 100644 --- a/assets/xml/objects/object_bdoor.xml +++ b/assets/xml/objects/object_bdoor.xml @@ -1,4 +1,5 @@ + diff --git a/assets/xml/objects/object_syokudai.xml b/assets/xml/objects/object_syokudai.xml index 717aaf15c4..c1670edece 100644 --- a/assets/xml/objects/object_syokudai.xml +++ b/assets/xml/objects/object_syokudai.xml @@ -1,4 +1,5 @@ + diff --git a/assets/xml/objects/object_wood02.xml b/assets/xml/objects/object_wood02.xml index 3245612bde..47ec342caa 100644 --- a/assets/xml/objects/object_wood02.xml +++ b/assets/xml/objects/object_wood02.xml @@ -1,4 +1,5 @@ + diff --git a/assets/xml/overlays/ovl_Boss_Dodongo.xml b/assets/xml/overlays/ovl_Boss_Dodongo.xml index 24c6b90170..f2ee5b7b8c 100644 --- a/assets/xml/overlays/ovl_Boss_Dodongo.xml +++ b/assets/xml/overlays/ovl_Boss_Dodongo.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/overlays/ovl_Boss_Ganon2.xml b/assets/xml/overlays/ovl_Boss_Ganon2.xml index 64cda3a71c..73a8ebb3f7 100644 --- a/assets/xml/overlays/ovl_Boss_Ganon2.xml +++ b/assets/xml/overlays/ovl_Boss_Ganon2.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/overlays/ovl_Boss_Sst.xml b/assets/xml/overlays/ovl_Boss_Sst.xml index f364108896..e65a58ccd1 100644 --- a/assets/xml/overlays/ovl_Boss_Sst.xml +++ b/assets/xml/overlays/ovl_Boss_Sst.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/overlays/ovl_En_Clear_Tag.xml b/assets/xml/overlays/ovl_En_Clear_Tag.xml index 266acc3408..cd67b1f486 100644 --- a/assets/xml/overlays/ovl_En_Clear_Tag.xml +++ b/assets/xml/overlays/ovl_En_Clear_Tag.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/overlays/ovl_En_Ganon_Mant.xml b/assets/xml/overlays/ovl_En_Ganon_Mant.xml index ad045b43ec..6edb8ddb6e 100644 --- a/assets/xml/overlays/ovl_En_Ganon_Mant.xml +++ b/assets/xml/overlays/ovl_En_Ganon_Mant.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/overlays/ovl_En_Ganon_Organ.xml b/assets/xml/overlays/ovl_En_Ganon_Organ.xml index b0776fa2a0..864f08f003 100644 --- a/assets/xml/overlays/ovl_En_Ganon_Organ.xml +++ b/assets/xml/overlays/ovl_En_Ganon_Organ.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/overlays/ovl_En_Jsjutan.xml b/assets/xml/overlays/ovl_En_Jsjutan.xml index d7fe054972..2602120846 100644 --- a/assets/xml/overlays/ovl_En_Jsjutan.xml +++ b/assets/xml/overlays/ovl_En_Jsjutan.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/overlays/ovl_Magic_Dark.xml b/assets/xml/overlays/ovl_Magic_Dark.xml index 8ad980b778..54c5c4ac81 100644 --- a/assets/xml/overlays/ovl_Magic_Dark.xml +++ b/assets/xml/overlays/ovl_Magic_Dark.xml @@ -1,5 +1,5 @@ - + - + @@ -85,7 +84,7 @@ - + diff --git a/spec b/spec index 3ef32a93b8..1c5224e18a 100644 --- a/spec +++ b/spec @@ -133,7 +133,8 @@ endseg beginseg name "link_animetion" - include "build/baserom/link_animetion.o" + include "build/assets/misc/link_animetion/link_animetion.o" + number 7 endseg beginseg diff --git a/tools/ZAPDConfigs/MqDbg/Config.xml b/tools/ZAPDConfigs/MqDbg/Config.xml index 8ab4df57df..483ebc5a0d 100644 --- a/tools/ZAPDConfigs/MqDbg/Config.xml +++ b/tools/ZAPDConfigs/MqDbg/Config.xml @@ -2,4 +2,6 @@ - \ No newline at end of file + + +