diff --git a/assets/xml/scenes/KAKUSIANA/KAKUSIANA.xml b/assets/xml/scenes/KAKUSIANA/KAKUSIANA.xml index caefeb4977..cc5a3c9991 100644 --- a/assets/xml/scenes/KAKUSIANA/KAKUSIANA.xml +++ b/assets/xml/scenes/KAKUSIANA/KAKUSIANA.xml @@ -1,50 +1,50 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/SPOT00/SPOT00.xml b/assets/xml/scenes/SPOT00/SPOT00.xml index ad68114e8e..b060c7ba3c 100644 --- a/assets/xml/scenes/SPOT00/SPOT00.xml +++ b/assets/xml/scenes/SPOT00/SPOT00.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml b/assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml index 1db8af28ab..58d50ee839 100644 --- a/assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml +++ b/assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml b/assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml index f2edceaa95..c48cb9646c 100644 --- a/assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml +++ b/assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml b/assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml index bbe27d6e96..565dcc06c8 100644 --- a/assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml +++ b/assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml b/assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml index d1ad7443f4..2a948603b3 100644 --- a/assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml +++ b/assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml b/assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml index df0b90d436..40e82522fb 100644 --- a/assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml +++ b/assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml b/assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml index 1c6872930b..ca23dfa17f 100644 --- a/assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml +++ b/assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_13HUBUKINOMITI/Z2_13HUBUKINOMITI.xml b/assets/xml/scenes/Z2_13HUBUKINOMITI/Z2_13HUBUKINOMITI.xml index 30598f49ad..5a6ad2c198 100644 --- a/assets/xml/scenes/Z2_13HUBUKINOMITI/Z2_13HUBUKINOMITI.xml +++ b/assets/xml/scenes/Z2_13HUBUKINOMITI/Z2_13HUBUKINOMITI.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml b/assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml index 88f85f30bc..2165e80f5c 100644 --- a/assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml +++ b/assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_16GORON_HOUSE/Z2_16GORON_HOUSE.xml b/assets/xml/scenes/Z2_16GORON_HOUSE/Z2_16GORON_HOUSE.xml index ef4ad48324..e3637907cb 100644 --- a/assets/xml/scenes/Z2_16GORON_HOUSE/Z2_16GORON_HOUSE.xml +++ b/assets/xml/scenes/Z2_16GORON_HOUSE/Z2_16GORON_HOUSE.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml b/assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml index 1042b18f6d..b5b9f6d773 100644 --- a/assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml +++ b/assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml b/assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml index 7f54355b4c..357c0b8979 100644 --- a/assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml +++ b/assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml b/assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml index 2385e6b243..73c697f167 100644 --- a/assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml +++ b/assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml @@ -1,14 +1,14 @@ - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml b/assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml index ea511e707c..fca3e68463 100644 --- a/assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml +++ b/assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml @@ -1,14 +1,14 @@ - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_21MITURINMAE/Z2_21MITURINMAE.xml b/assets/xml/scenes/Z2_21MITURINMAE/Z2_21MITURINMAE.xml index 3899f5b908..03b04f989d 100644 --- a/assets/xml/scenes/Z2_21MITURINMAE/Z2_21MITURINMAE.xml +++ b/assets/xml/scenes/Z2_21MITURINMAE/Z2_21MITURINMAE.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml b/assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml index a852953d8b..1db584d584 100644 --- a/assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml +++ b/assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml @@ -1,14 +1,14 @@ - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml b/assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml index 99fc8c2992..eb4b353dbb 100644 --- a/assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml +++ b/assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml b/assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml index efb6bceb0c..5055f4ff3d 100644 --- a/assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml +++ b/assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml @@ -1,32 +1,32 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml b/assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml index bc92254700..eca5397421 100644 --- a/assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml +++ b/assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml b/assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml index c48ab34418..918dc1cebc 100644 --- a/assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml +++ b/assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_33ZORACITY/Z2_33ZORACITY.xml b/assets/xml/scenes/Z2_33ZORACITY/Z2_33ZORACITY.xml index 768123b7bc..693a30a584 100644 --- a/assets/xml/scenes/Z2_33ZORACITY/Z2_33ZORACITY.xml +++ b/assets/xml/scenes/Z2_33ZORACITY/Z2_33ZORACITY.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_35TAKI/Z2_35TAKI.xml b/assets/xml/scenes/Z2_35TAKI/Z2_35TAKI.xml index abead5987d..b123f1b9c7 100644 --- a/assets/xml/scenes/Z2_35TAKI/Z2_35TAKI.xml +++ b/assets/xml/scenes/Z2_35TAKI/Z2_35TAKI.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_8ITEMSHOP/Z2_8ITEMSHOP.xml b/assets/xml/scenes/Z2_8ITEMSHOP/Z2_8ITEMSHOP.xml index 58ddc6b3a1..b3775346a0 100644 --- a/assets/xml/scenes/Z2_8ITEMSHOP/Z2_8ITEMSHOP.xml +++ b/assets/xml/scenes/Z2_8ITEMSHOP/Z2_8ITEMSHOP.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_ALLEY/Z2_ALLEY.xml b/assets/xml/scenes/Z2_ALLEY/Z2_ALLEY.xml index 9cf6802c11..d410d2098a 100644 --- a/assets/xml/scenes/Z2_ALLEY/Z2_ALLEY.xml +++ b/assets/xml/scenes/Z2_ALLEY/Z2_ALLEY.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml b/assets/xml/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml index 4061b6a0af..c757263f35 100644 --- a/assets/xml/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml +++ b/assets/xml/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_BACKTOWN/Z2_BACKTOWN.xml b/assets/xml/scenes/Z2_BACKTOWN/Z2_BACKTOWN.xml index ef54f46851..6289ccf82c 100644 --- a/assets/xml/scenes/Z2_BACKTOWN/Z2_BACKTOWN.xml +++ b/assets/xml/scenes/Z2_BACKTOWN/Z2_BACKTOWN.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_BANDROOM/Z2_BANDROOM.xml b/assets/xml/scenes/Z2_BANDROOM/Z2_BANDROOM.xml index cf81cc4865..8b6fbeb0f6 100644 --- a/assets/xml/scenes/Z2_BANDROOM/Z2_BANDROOM.xml +++ b/assets/xml/scenes/Z2_BANDROOM/Z2_BANDROOM.xml @@ -1,22 +1,22 @@ - - + + - - + + - - + + - - + + - - + + - - - - + + + + diff --git a/assets/xml/scenes/Z2_BOMYA/Z2_BOMYA.xml b/assets/xml/scenes/Z2_BOMYA/Z2_BOMYA.xml index 814997f7dd..4fd948a88d 100644 --- a/assets/xml/scenes/Z2_BOMYA/Z2_BOMYA.xml +++ b/assets/xml/scenes/Z2_BOMYA/Z2_BOMYA.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_BOTI/Z2_BOTI.xml b/assets/xml/scenes/Z2_BOTI/Z2_BOTI.xml index 3b211c004b..830df7f796 100644 --- a/assets/xml/scenes/Z2_BOTI/Z2_BOTI.xml +++ b/assets/xml/scenes/Z2_BOTI/Z2_BOTI.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_BOWLING/Z2_BOWLING.xml b/assets/xml/scenes/Z2_BOWLING/Z2_BOWLING.xml index 17a7ba0348..794d732719 100644 --- a/assets/xml/scenes/Z2_BOWLING/Z2_BOWLING.xml +++ b/assets/xml/scenes/Z2_BOWLING/Z2_BOWLING.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_CASTLE/Z2_CASTLE.xml b/assets/xml/scenes/Z2_CASTLE/Z2_CASTLE.xml index 25eaad10bb..8963d891ef 100644 --- a/assets/xml/scenes/Z2_CASTLE/Z2_CASTLE.xml +++ b/assets/xml/scenes/Z2_CASTLE/Z2_CASTLE.xml @@ -1,40 +1,40 @@ - - + + - - - - - + + + + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_CLOCKTOWER/Z2_CLOCKTOWER.xml b/assets/xml/scenes/Z2_CLOCKTOWER/Z2_CLOCKTOWER.xml index 9ebb6ea3f4..b6a593a0c0 100644 --- a/assets/xml/scenes/Z2_CLOCKTOWER/Z2_CLOCKTOWER.xml +++ b/assets/xml/scenes/Z2_CLOCKTOWER/Z2_CLOCKTOWER.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_DANPEI/Z2_DANPEI.xml b/assets/xml/scenes/Z2_DANPEI/Z2_DANPEI.xml index bfa4b267bb..444e3782f2 100644 --- a/assets/xml/scenes/Z2_DANPEI/Z2_DANPEI.xml +++ b/assets/xml/scenes/Z2_DANPEI/Z2_DANPEI.xml @@ -1,32 +1,32 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_DANPEI2TEST/Z2_DANPEI2TEST.xml b/assets/xml/scenes/Z2_DANPEI2TEST/Z2_DANPEI2TEST.xml index a68e15eabf..3906b57f36 100644 --- a/assets/xml/scenes/Z2_DANPEI2TEST/Z2_DANPEI2TEST.xml +++ b/assets/xml/scenes/Z2_DANPEI2TEST/Z2_DANPEI2TEST.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_DEKUTES/Z2_DEKUTES.xml b/assets/xml/scenes/Z2_DEKUTES/Z2_DEKUTES.xml index 2a7df77f93..070d35cdb9 100644 --- a/assets/xml/scenes/Z2_DEKUTES/Z2_DEKUTES.xml +++ b/assets/xml/scenes/Z2_DEKUTES/Z2_DEKUTES.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_DEKU_KING/Z2_DEKU_KING.xml b/assets/xml/scenes/Z2_DEKU_KING/Z2_DEKU_KING.xml index 7788c862a5..b283b92c06 100644 --- a/assets/xml/scenes/Z2_DEKU_KING/Z2_DEKU_KING.xml +++ b/assets/xml/scenes/Z2_DEKU_KING/Z2_DEKU_KING.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml b/assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml index 4610e22ff6..00e6702fae 100644 --- a/assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml +++ b/assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_F01/Z2_F01.xml b/assets/xml/scenes/Z2_F01/Z2_F01.xml index 0943be2307..cde89cdda2 100644 --- a/assets/xml/scenes/Z2_F01/Z2_F01.xml +++ b/assets/xml/scenes/Z2_F01/Z2_F01.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_F01C/Z2_F01C.xml b/assets/xml/scenes/Z2_F01C/Z2_F01C.xml index 37ab6354b2..ac179c6d26 100644 --- a/assets/xml/scenes/Z2_F01C/Z2_F01C.xml +++ b/assets/xml/scenes/Z2_F01C/Z2_F01C.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_F01_B/Z2_F01_B.xml b/assets/xml/scenes/Z2_F01_B/Z2_F01_B.xml index 5584191bcf..96c605641d 100644 --- a/assets/xml/scenes/Z2_F01_B/Z2_F01_B.xml +++ b/assets/xml/scenes/Z2_F01_B/Z2_F01_B.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_F40/Z2_F40.xml b/assets/xml/scenes/Z2_F40/Z2_F40.xml index cc0b0edfa7..d233785f42 100644 --- a/assets/xml/scenes/Z2_F40/Z2_F40.xml +++ b/assets/xml/scenes/Z2_F40/Z2_F40.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_F41/Z2_F41.xml b/assets/xml/scenes/Z2_F41/Z2_F41.xml index 23de2b6010..d34ed75c7f 100644 --- a/assets/xml/scenes/Z2_F41/Z2_F41.xml +++ b/assets/xml/scenes/Z2_F41/Z2_F41.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_FISHERMAN/Z2_FISHERMAN.xml b/assets/xml/scenes/Z2_FISHERMAN/Z2_FISHERMAN.xml index f0a0342948..3fdd11f3fe 100644 --- a/assets/xml/scenes/Z2_FISHERMAN/Z2_FISHERMAN.xml +++ b/assets/xml/scenes/Z2_FISHERMAN/Z2_FISHERMAN.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_GORONRACE/Z2_GORONRACE.xml b/assets/xml/scenes/Z2_GORONRACE/Z2_GORONRACE.xml index c595549457..f2e92ddb18 100644 --- a/assets/xml/scenes/Z2_GORONRACE/Z2_GORONRACE.xml +++ b/assets/xml/scenes/Z2_GORONRACE/Z2_GORONRACE.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_GORONSHOP/Z2_GORONSHOP.xml b/assets/xml/scenes/Z2_GORONSHOP/Z2_GORONSHOP.xml index b6a633c9ba..4fbfe5f07f 100644 --- a/assets/xml/scenes/Z2_GORONSHOP/Z2_GORONSHOP.xml +++ b/assets/xml/scenes/Z2_GORONSHOP/Z2_GORONSHOP.xml @@ -1,11 +1,11 @@ - - - - - + + + + + - - + + diff --git a/assets/xml/scenes/Z2_GORON_HAKA/Z2_GORON_HAKA.xml b/assets/xml/scenes/Z2_GORON_HAKA/Z2_GORON_HAKA.xml index e21e3eacbb..8b7dceaabc 100644 --- a/assets/xml/scenes/Z2_GORON_HAKA/Z2_GORON_HAKA.xml +++ b/assets/xml/scenes/Z2_GORON_HAKA/Z2_GORON_HAKA.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_HAKASHITA/Z2_HAKASHITA.xml b/assets/xml/scenes/Z2_HAKASHITA/Z2_HAKASHITA.xml index 3e61639021..24763ee091 100644 --- a/assets/xml/scenes/Z2_HAKASHITA/Z2_HAKASHITA.xml +++ b/assets/xml/scenes/Z2_HAKASHITA/Z2_HAKASHITA.xml @@ -1,20 +1,20 @@ - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_HAKUGIN/Z2_HAKUGIN.xml b/assets/xml/scenes/Z2_HAKUGIN/Z2_HAKUGIN.xml index 79d40e1254..9f3f39a8a9 100644 --- a/assets/xml/scenes/Z2_HAKUGIN/Z2_HAKUGIN.xml +++ b/assets/xml/scenes/Z2_HAKUGIN/Z2_HAKUGIN.xml @@ -1,47 +1,47 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_HAKUGIN_BS/Z2_HAKUGIN_BS.xml b/assets/xml/scenes/Z2_HAKUGIN_BS/Z2_HAKUGIN_BS.xml index 859cb5075b..ca1c2dd11a 100644 --- a/assets/xml/scenes/Z2_HAKUGIN_BS/Z2_HAKUGIN_BS.xml +++ b/assets/xml/scenes/Z2_HAKUGIN_BS/Z2_HAKUGIN_BS.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_ICHIBA/Z2_ICHIBA.xml b/assets/xml/scenes/Z2_ICHIBA/Z2_ICHIBA.xml index e23a853cb2..145b7b62d4 100644 --- a/assets/xml/scenes/Z2_ICHIBA/Z2_ICHIBA.xml +++ b/assets/xml/scenes/Z2_ICHIBA/Z2_ICHIBA.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_IKANA/Z2_IKANA.xml b/assets/xml/scenes/Z2_IKANA/Z2_IKANA.xml index 328af4d663..07cdcd3011 100644 --- a/assets/xml/scenes/Z2_IKANA/Z2_IKANA.xml +++ b/assets/xml/scenes/Z2_IKANA/Z2_IKANA.xml @@ -1,22 +1,22 @@ - - + + - - - - + + + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_IKANAMAE/Z2_IKANAMAE.xml b/assets/xml/scenes/Z2_IKANAMAE/Z2_IKANAMAE.xml index 9b85c776e6..3a738c04a8 100644 --- a/assets/xml/scenes/Z2_IKANAMAE/Z2_IKANAMAE.xml +++ b/assets/xml/scenes/Z2_IKANAMAE/Z2_IKANAMAE.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_IKNINSIDE/Z2_IKNINSIDE.xml b/assets/xml/scenes/Z2_IKNINSIDE/Z2_IKNINSIDE.xml index 9a5e08f40e..540e552a90 100644 --- a/assets/xml/scenes/Z2_IKNINSIDE/Z2_IKNINSIDE.xml +++ b/assets/xml/scenes/Z2_IKNINSIDE/Z2_IKNINSIDE.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_INISIE_BS/Z2_INISIE_BS.xml b/assets/xml/scenes/Z2_INISIE_BS/Z2_INISIE_BS.xml index ac0cd3b4c4..933ce678e7 100644 --- a/assets/xml/scenes/Z2_INISIE_BS/Z2_INISIE_BS.xml +++ b/assets/xml/scenes/Z2_INISIE_BS/Z2_INISIE_BS.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_INISIE_N/Z2_INISIE_N.xml b/assets/xml/scenes/Z2_INISIE_N/Z2_INISIE_N.xml index 2a44be0629..2954a41fea 100644 --- a/assets/xml/scenes/Z2_INISIE_N/Z2_INISIE_N.xml +++ b/assets/xml/scenes/Z2_INISIE_N/Z2_INISIE_N.xml @@ -1,41 +1,41 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_INISIE_R/Z2_INISIE_R.xml b/assets/xml/scenes/Z2_INISIE_R/Z2_INISIE_R.xml index 44bfb75a56..7ca2324781 100644 --- a/assets/xml/scenes/Z2_INISIE_R/Z2_INISIE_R.xml +++ b/assets/xml/scenes/Z2_INISIE_R/Z2_INISIE_R.xml @@ -1,41 +1,41 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_INSIDETOWER/Z2_INSIDETOWER.xml b/assets/xml/scenes/Z2_INSIDETOWER/Z2_INSIDETOWER.xml index 9b453a1d4d..b35391b778 100644 --- a/assets/xml/scenes/Z2_INSIDETOWER/Z2_INSIDETOWER.xml +++ b/assets/xml/scenes/Z2_INSIDETOWER/Z2_INSIDETOWER.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_KAIZOKU/Z2_KAIZOKU.xml b/assets/xml/scenes/Z2_KAIZOKU/Z2_KAIZOKU.xml index 347b581aa0..ac87890515 100644 --- a/assets/xml/scenes/Z2_KAIZOKU/Z2_KAIZOKU.xml +++ b/assets/xml/scenes/Z2_KAIZOKU/Z2_KAIZOKU.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml b/assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml index 8f8f20319b..6e73abc32a 100644 --- a/assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml +++ b/assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_KINDAN2/Z2_KINDAN2.xml b/assets/xml/scenes/Z2_KINDAN2/Z2_KINDAN2.xml index 237208fd61..3283d92adf 100644 --- a/assets/xml/scenes/Z2_KINDAN2/Z2_KINDAN2.xml +++ b/assets/xml/scenes/Z2_KINDAN2/Z2_KINDAN2.xml @@ -1,23 +1,23 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_KINSTA1/Z2_KINSTA1.xml b/assets/xml/scenes/Z2_KINSTA1/Z2_KINSTA1.xml index 77a2ae9aa4..1ae2684c5b 100644 --- a/assets/xml/scenes/Z2_KINSTA1/Z2_KINSTA1.xml +++ b/assets/xml/scenes/Z2_KINSTA1/Z2_KINSTA1.xml @@ -1,23 +1,23 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_KOEPONARACE/Z2_KOEPONARACE.xml b/assets/xml/scenes/Z2_KOEPONARACE/Z2_KOEPONARACE.xml index aefd9502db..b0edf047ea 100644 --- a/assets/xml/scenes/Z2_KOEPONARACE/Z2_KOEPONARACE.xml +++ b/assets/xml/scenes/Z2_KOEPONARACE/Z2_KOEPONARACE.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_KONPEKI_ENT/Z2_KONPEKI_ENT.xml b/assets/xml/scenes/Z2_KONPEKI_ENT/Z2_KONPEKI_ENT.xml index 6fcc6681a1..0811e4ecb7 100644 --- a/assets/xml/scenes/Z2_KONPEKI_ENT/Z2_KONPEKI_ENT.xml +++ b/assets/xml/scenes/Z2_KONPEKI_ENT/Z2_KONPEKI_ENT.xml @@ -1,10 +1,10 @@ - - - - + + + + - - + + diff --git a/assets/xml/scenes/Z2_KYOJINNOMA/Z2_KYOJINNOMA.xml b/assets/xml/scenes/Z2_KYOJINNOMA/Z2_KYOJINNOMA.xml index 9d95f5f492..23450a3eb1 100644 --- a/assets/xml/scenes/Z2_KYOJINNOMA/Z2_KYOJINNOMA.xml +++ b/assets/xml/scenes/Z2_KYOJINNOMA/Z2_KYOJINNOMA.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_LABO/Z2_LABO.xml b/assets/xml/scenes/Z2_LABO/Z2_LABO.xml index 59ad4bb7ba..7aa23fc769 100644 --- a/assets/xml/scenes/Z2_LABO/Z2_LABO.xml +++ b/assets/xml/scenes/Z2_LABO/Z2_LABO.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_LAST_BS/Z2_LAST_BS.xml b/assets/xml/scenes/Z2_LAST_BS/Z2_LAST_BS.xml index 4fae19f47d..fc488975d4 100644 --- a/assets/xml/scenes/Z2_LAST_BS/Z2_LAST_BS.xml +++ b/assets/xml/scenes/Z2_LAST_BS/Z2_LAST_BS.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_LAST_DEKU/Z2_LAST_DEKU.xml b/assets/xml/scenes/Z2_LAST_DEKU/Z2_LAST_DEKU.xml index bf9c8be9a0..409e6829a3 100644 --- a/assets/xml/scenes/Z2_LAST_DEKU/Z2_LAST_DEKU.xml +++ b/assets/xml/scenes/Z2_LAST_DEKU/Z2_LAST_DEKU.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_LAST_GORON/Z2_LAST_GORON.xml b/assets/xml/scenes/Z2_LAST_GORON/Z2_LAST_GORON.xml index 6a6ecfd80e..94f212234f 100644 --- a/assets/xml/scenes/Z2_LAST_GORON/Z2_LAST_GORON.xml +++ b/assets/xml/scenes/Z2_LAST_GORON/Z2_LAST_GORON.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_LAST_LINK/Z2_LAST_LINK.xml b/assets/xml/scenes/Z2_LAST_LINK/Z2_LAST_LINK.xml index a9b19a654a..3ad2ba8f0b 100644 --- a/assets/xml/scenes/Z2_LAST_LINK/Z2_LAST_LINK.xml +++ b/assets/xml/scenes/Z2_LAST_LINK/Z2_LAST_LINK.xml @@ -1,29 +1,29 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_LAST_ZORA/Z2_LAST_ZORA.xml b/assets/xml/scenes/Z2_LAST_ZORA/Z2_LAST_ZORA.xml index 44078405a9..5090c76a85 100644 --- a/assets/xml/scenes/Z2_LAST_ZORA/Z2_LAST_ZORA.xml +++ b/assets/xml/scenes/Z2_LAST_ZORA/Z2_LAST_ZORA.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_LOST_WOODS/Z2_LOST_WOODS.xml b/assets/xml/scenes/Z2_LOST_WOODS/Z2_LOST_WOODS.xml index c36fb81ef5..066cbe10e4 100644 --- a/assets/xml/scenes/Z2_LOST_WOODS/Z2_LOST_WOODS.xml +++ b/assets/xml/scenes/Z2_LOST_WOODS/Z2_LOST_WOODS.xml @@ -1,16 +1,16 @@ - - - - + + + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_MAP_SHOP/Z2_MAP_SHOP.xml b/assets/xml/scenes/Z2_MAP_SHOP/Z2_MAP_SHOP.xml index a110e19880..237791f400 100644 --- a/assets/xml/scenes/Z2_MAP_SHOP/Z2_MAP_SHOP.xml +++ b/assets/xml/scenes/Z2_MAP_SHOP/Z2_MAP_SHOP.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_MILK_BAR/Z2_MILK_BAR.xml b/assets/xml/scenes/Z2_MILK_BAR/Z2_MILK_BAR.xml index 4367fd8783..1c8a42e629 100644 --- a/assets/xml/scenes/Z2_MILK_BAR/Z2_MILK_BAR.xml +++ b/assets/xml/scenes/Z2_MILK_BAR/Z2_MILK_BAR.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_MITURIN/Z2_MITURIN.xml b/assets/xml/scenes/Z2_MITURIN/Z2_MITURIN.xml index 2fcc7fa0fd..d1a6af9cd4 100644 --- a/assets/xml/scenes/Z2_MITURIN/Z2_MITURIN.xml +++ b/assets/xml/scenes/Z2_MITURIN/Z2_MITURIN.xml @@ -1,44 +1,44 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_MITURIN_BS/Z2_MITURIN_BS.xml b/assets/xml/scenes/Z2_MITURIN_BS/Z2_MITURIN_BS.xml index d5053664a1..33402da41f 100644 --- a/assets/xml/scenes/Z2_MITURIN_BS/Z2_MITURIN_BS.xml +++ b/assets/xml/scenes/Z2_MITURIN_BS/Z2_MITURIN_BS.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_MUSICHOUSE/Z2_MUSICHOUSE.xml b/assets/xml/scenes/Z2_MUSICHOUSE/Z2_MUSICHOUSE.xml index b9e2a42cd0..2e5dc83d04 100644 --- a/assets/xml/scenes/Z2_MUSICHOUSE/Z2_MUSICHOUSE.xml +++ b/assets/xml/scenes/Z2_MUSICHOUSE/Z2_MUSICHOUSE.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_OKUJOU/Z2_OKUJOU.xml b/assets/xml/scenes/Z2_OKUJOU/Z2_OKUJOU.xml index 2e886730e2..f3970315bc 100644 --- a/assets/xml/scenes/Z2_OKUJOU/Z2_OKUJOU.xml +++ b/assets/xml/scenes/Z2_OKUJOU/Z2_OKUJOU.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_OMOYA/Z2_OMOYA.xml b/assets/xml/scenes/Z2_OMOYA/Z2_OMOYA.xml index cafff58cdd..5354762c89 100644 --- a/assets/xml/scenes/Z2_OMOYA/Z2_OMOYA.xml +++ b/assets/xml/scenes/Z2_OMOYA/Z2_OMOYA.xml @@ -1,14 +1,14 @@ - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_OPENINGDAN/Z2_OPENINGDAN.xml b/assets/xml/scenes/Z2_OPENINGDAN/Z2_OPENINGDAN.xml index 2bb3c98d16..901c1698ce 100644 --- a/assets/xml/scenes/Z2_OPENINGDAN/Z2_OPENINGDAN.xml +++ b/assets/xml/scenes/Z2_OPENINGDAN/Z2_OPENINGDAN.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_PIRATE/Z2_PIRATE.xml b/assets/xml/scenes/Z2_PIRATE/Z2_PIRATE.xml index afc872279f..1b459de39b 100644 --- a/assets/xml/scenes/Z2_PIRATE/Z2_PIRATE.xml +++ b/assets/xml/scenes/Z2_PIRATE/Z2_PIRATE.xml @@ -1,50 +1,50 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_POSTHOUSE/Z2_POSTHOUSE.xml b/assets/xml/scenes/Z2_POSTHOUSE/Z2_POSTHOUSE.xml index 1c3da77557..a0b71568b9 100644 --- a/assets/xml/scenes/Z2_POSTHOUSE/Z2_POSTHOUSE.xml +++ b/assets/xml/scenes/Z2_POSTHOUSE/Z2_POSTHOUSE.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_RANDOM/Z2_RANDOM.xml b/assets/xml/scenes/Z2_RANDOM/Z2_RANDOM.xml index 17d27b0fe2..0f4eafc229 100644 --- a/assets/xml/scenes/Z2_RANDOM/Z2_RANDOM.xml +++ b/assets/xml/scenes/Z2_RANDOM/Z2_RANDOM.xml @@ -1,23 +1,23 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_REDEAD/Z2_REDEAD.xml b/assets/xml/scenes/Z2_REDEAD/Z2_REDEAD.xml index 0af382f6e3..a2d1b14acc 100644 --- a/assets/xml/scenes/Z2_REDEAD/Z2_REDEAD.xml +++ b/assets/xml/scenes/Z2_REDEAD/Z2_REDEAD.xml @@ -1,47 +1,47 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml b/assets/xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml index bb4430b47d..e49402a101 100644 --- a/assets/xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml +++ b/assets/xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_SEA/Z2_SEA.xml b/assets/xml/scenes/Z2_SEA/Z2_SEA.xml index a62230d022..ad6ec36174 100644 --- a/assets/xml/scenes/Z2_SEA/Z2_SEA.xml +++ b/assets/xml/scenes/Z2_SEA/Z2_SEA.xml @@ -1,53 +1,53 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_SEA_BS/Z2_SEA_BS.xml b/assets/xml/scenes/Z2_SEA_BS/Z2_SEA_BS.xml index 0e972df62d..e602e7a7b9 100644 --- a/assets/xml/scenes/Z2_SEA_BS/Z2_SEA_BS.xml +++ b/assets/xml/scenes/Z2_SEA_BS/Z2_SEA_BS.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_SECOM/Z2_SECOM.xml b/assets/xml/scenes/Z2_SECOM/Z2_SECOM.xml index d07f57d673..e6b73162fb 100644 --- a/assets/xml/scenes/Z2_SECOM/Z2_SECOM.xml +++ b/assets/xml/scenes/Z2_SECOM/Z2_SECOM.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml b/assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml index f94cdca3aa..d2f362453a 100644 --- a/assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml +++ b/assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml b/assets/xml/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml index 06ee2a2643..36168378be 100644 --- a/assets/xml/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml +++ b/assets/xml/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml @@ -1,17 +1,17 @@ - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_SOUGEN/Z2_SOUGEN.xml b/assets/xml/scenes/Z2_SOUGEN/Z2_SOUGEN.xml index 88c179a9c2..56ff81de0d 100644 --- a/assets/xml/scenes/Z2_SOUGEN/Z2_SOUGEN.xml +++ b/assets/xml/scenes/Z2_SOUGEN/Z2_SOUGEN.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_SYATEKI_MIZU/Z2_SYATEKI_MIZU.xml b/assets/xml/scenes/Z2_SYATEKI_MIZU/Z2_SYATEKI_MIZU.xml index cc62ed2849..f4592c69b0 100644 --- a/assets/xml/scenes/Z2_SYATEKI_MIZU/Z2_SYATEKI_MIZU.xml +++ b/assets/xml/scenes/Z2_SYATEKI_MIZU/Z2_SYATEKI_MIZU.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_SYATEKI_MORI/Z2_SYATEKI_MORI.xml b/assets/xml/scenes/Z2_SYATEKI_MORI/Z2_SYATEKI_MORI.xml index c1f2353ecf..32a4c7ce9f 100644 --- a/assets/xml/scenes/Z2_SYATEKI_MORI/Z2_SYATEKI_MORI.xml +++ b/assets/xml/scenes/Z2_SYATEKI_MORI/Z2_SYATEKI_MORI.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_TAKARAKUJI/Z2_TAKARAKUJI.xml b/assets/xml/scenes/Z2_TAKARAKUJI/Z2_TAKARAKUJI.xml index 13929920fe..d305a1e91b 100644 --- a/assets/xml/scenes/Z2_TAKARAKUJI/Z2_TAKARAKUJI.xml +++ b/assets/xml/scenes/Z2_TAKARAKUJI/Z2_TAKARAKUJI.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_TAKARAYA/Z2_TAKARAYA.xml b/assets/xml/scenes/Z2_TAKARAYA/Z2_TAKARAYA.xml index 5a910ab231..d2845c4682 100644 --- a/assets/xml/scenes/Z2_TAKARAYA/Z2_TAKARAYA.xml +++ b/assets/xml/scenes/Z2_TAKARAYA/Z2_TAKARAYA.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_TENMON_DAI/Z2_TENMON_DAI.xml b/assets/xml/scenes/Z2_TENMON_DAI/Z2_TENMON_DAI.xml index 25049a1917..f572992ede 100644 --- a/assets/xml/scenes/Z2_TENMON_DAI/Z2_TENMON_DAI.xml +++ b/assets/xml/scenes/Z2_TENMON_DAI/Z2_TENMON_DAI.xml @@ -1,11 +1,11 @@ - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml b/assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml index a3d6a30f28..c8e4a16c26 100644 --- a/assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml +++ b/assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_TOUGITES/Z2_TOUGITES.xml b/assets/xml/scenes/Z2_TOUGITES/Z2_TOUGITES.xml index fbcd442d94..65752111f7 100644 --- a/assets/xml/scenes/Z2_TOUGITES/Z2_TOUGITES.xml +++ b/assets/xml/scenes/Z2_TOUGITES/Z2_TOUGITES.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_TOWN/Z2_TOWN.xml b/assets/xml/scenes/Z2_TOWN/Z2_TOWN.xml index da2a12aa57..be025d5ffd 100644 --- a/assets/xml/scenes/Z2_TOWN/Z2_TOWN.xml +++ b/assets/xml/scenes/Z2_TOWN/Z2_TOWN.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_WITCH_SHOP/Z2_WITCH_SHOP.xml b/assets/xml/scenes/Z2_WITCH_SHOP/Z2_WITCH_SHOP.xml index 8cc0fd613e..1401d58327 100644 --- a/assets/xml/scenes/Z2_WITCH_SHOP/Z2_WITCH_SHOP.xml +++ b/assets/xml/scenes/Z2_WITCH_SHOP/Z2_WITCH_SHOP.xml @@ -1,8 +1,8 @@ - - + + - - + + diff --git a/assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml b/assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml index cd80f86118..9a2ad70805 100644 --- a/assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml +++ b/assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml @@ -1,20 +1,20 @@ - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/scenes/Z2_YOUSEI_IZUMI/Z2_YOUSEI_IZUMI.xml b/assets/xml/scenes/Z2_YOUSEI_IZUMI/Z2_YOUSEI_IZUMI.xml index 03e6e178a9..10ebda0ba6 100644 --- a/assets/xml/scenes/Z2_YOUSEI_IZUMI/Z2_YOUSEI_IZUMI.xml +++ b/assets/xml/scenes/Z2_YOUSEI_IZUMI/Z2_YOUSEI_IZUMI.xml @@ -1,20 +1,20 @@ - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/include/command_macros_base.h b/include/command_macros_base.h index 8d0a3917ae..c0d2ac4e89 100644 --- a/include/command_macros_base.h +++ b/include/command_macros_base.h @@ -16,4 +16,6 @@ #define CMD_W(a) (a) +#define CMD_PTR(a) (u32)(a) + #endif diff --git a/include/z64.h b/include/z64.h index 9b69c168f5..697a27f408 100644 --- a/include/z64.h +++ b/include/z64.h @@ -79,6 +79,20 @@ typedef struct { /* 0x4 */ void* params; } AnimatedMaterial; // size = 0x8 +typedef struct { + /* 0x00 */ Vec3s pos; + /* 0x06 */ s16 unk_06; + /* 0x08 */ Gfx* opa; + /* 0x0C */ Gfx* xlu; +} PolygonDlist2; // size = 0x8 + +typedef struct { + /* 0x00 */ u8 type; + /* 0x01 */ u8 num; // number of dlist entries + /* 0x04 */ void* start; + /* 0x08 */ void* end; +} PolygonType2; // size = 0xC + typedef struct { /* 0x0 */ u16 floorHead; /* 0x2 */ u16 wallHead; diff --git a/include/z64scene.h b/include/z64scene.h index 9e6268e9b2..243aa73484 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -384,7 +384,7 @@ typedef struct { typedef struct { /* 0x0 */ u16 keyFrameLength; - /* 0x4 */ void** textureList; + /* 0x4 */ void* textureList; /* 0x8 */ u8* textureIndexList; } AnimatedMatTexCycleParams; // size = 0xC @@ -687,7 +687,7 @@ typedef enum { /* 0x06 */ SCENE_CMD_ID_ENTRANCE_LIST, /* 0x07 */ SCENE_CMD_ID_SPECIAL_FILES, /* 0x08 */ SCENE_CMD_ID_ROOM_BEHAVIOR, - /* 0x09 */ SCENE_CMD_ID_UNUSED_09, + /* 0x09 */ SCENE_CMD_ID_UNK_09, /* 0x0A */ SCENE_CMD_ID_MESH, /* 0x0B */ SCENE_CMD_ID_OBJECT_LIST, /* 0x0C */ SCENE_CMD_ID_LIGHT_LIST, @@ -718,8 +718,8 @@ typedef enum { #define SCENE_CMD_ACTOR_LIST(numActors, actorList) \ { SCENE_CMD_ID_ACTOR_LIST, numActors, CMD_PTR(actorList) } -#define SCENE_CMD_ACTOR_CUTSCENE_CAM_LIST(camList) \ - { SCENE_CMD_ID_ACTOR_CUTSCENE_CAM_LIST, 0, CMD_PTR(camList) } +#define SCENE_CMD_ACTOR_CUTSCENE_CAM_LIST(numCams, camList) \ + { SCENE_CMD_ID_ACTOR_CUTSCENE_CAM_LIST, numCams, CMD_PTR(camList) } #define SCENE_CMD_COL_HEADER(colHeader) \ { SCENE_CMD_ID_COL_HEADER, 0, CMD_PTR(colHeader) } @@ -744,6 +744,9 @@ typedef enum { _SHIFTL(enablePosLights, 11, 1) | _SHIFTL(kankyoContextUnkE2, 12, 1) \ } +#define SCENE_CMD_UNK_09() \ + { SCENE_CMD_ID_UNK_09, 0, CMD_W(0) } + #define SCENE_CMD_MESH(meshHeader) \ { SCENE_CMD_ID_MESH, 0, CMD_PTR(meshHeader) } @@ -751,7 +754,7 @@ typedef enum { { SCENE_CMD_ID_OBJECT_LIST, numObjects, CMD_PTR(objectList) } #define SCENE_CMD_LIGHT_LIST(numLights, lightList) \ - { SCENE_CMD_ID_POS_LIGHT_LIST, numLights, CMD_PTR(lightList) } + { SCENE_CMD_ID_LIGHT_LIST, numLights, CMD_PTR(lightList) } #define SCENE_CMD_PATH_LIST(pathList) \ { SCENE_CMD_ID_PATH_LIST, 0, CMD_PTR(pathList) } @@ -804,46 +807,4 @@ typedef enum { #define SCENE_CMD_MINIMAP_COMPASS_ICON_INFO(compassIconCount, compassIconInfo) \ { SCENE_CMD_ID_MINIMAP_COMPASS_ICON_INFO, compassIconCount, CMD_PTR(compassIconInfo) } -//! @TODO: Remove these! These are only here for the time being to prevent compiler errors with scenes and rooms! - -// ----> AnimatedMaterial -typedef struct { - /* 0x0 */ s8 segment; - /* 0x2 */ s16 type; - /* 0x4 */ void* params; -} AnimatedTexture; // size = 0x8 - -// ----> AnimatedMatTexScrollParams -typedef struct { - /* 0x0 */ s8 xStep; - /* 0x1 */ s8 yStep; - /* 0x2 */ u8 width; - /* 0x3 */ u8 height; -} ScrollingTextureParams; // size = 0x4 - -// ----> F3DPrimColor -typedef struct { - /* 0x0 */ u8 red; - /* 0x1 */ u8 green; - /* 0x2 */ u8 blue; - /* 0x3 */ u8 alpha; - /* 0x4 */ u8 lodFrac; -} FlashingTexturePrimColor; // size = 0x5 - -// ----> AnimatedMatColorParams -typedef struct { - /* 0x0 */ u16 cycleLength; - /* 0x2 */ u16 numKeyFrames; - /* 0x4 */ FlashingTexturePrimColor* primColors; - /* 0x8 */ Color_RGBA8* envColors; - /* 0xC */ u16* keyFrames; -} FlashingTextureParams; // size = 0x10 - -// ----> AnimatedMatTexCycleParams -typedef struct { - /* 0x0 */ u16 cycleLength; - /* 0x4 */ Gfx** textureDls; - /* 0x8 */ u8* textureDlOffsets; -} CyclingTextureParams; // size = 0xC - #endif diff --git a/tools/ZAPD b/tools/ZAPD index bbbbb046a5..ca229f19b9 160000 --- a/tools/ZAPD +++ b/tools/ZAPD @@ -1 +1 @@ -Subproject commit bbbbb046a54f99dcbc6cbcc765177d8b252546f0 +Subproject commit ca229f19b991c613c29afade3d70b100522cece1 diff --git a/tools/ZAPDConfigs/MM/ActorList_MM.txt b/tools/ZAPDConfigs/MM/ActorList_MM.txt new file mode 100644 index 0000000000..f899e9afa2 --- /dev/null +++ b/tools/ZAPDConfigs/MM/ActorList_MM.txt @@ -0,0 +1,691 @@ +ACTOR_PLAYER +ACTOR_EN_TEST +ACTOR_EN_GIRLA +ACTOR_EN_PART +ACTOR_EN_LIGHT +ACTOR_EN_DOOR +ACTOR_EN_BOX +ACTOR_EN_PAMETFROG +ACTOR_EN_OKUTA +ACTOR_EN_BOM +ACTOR_EN_WALLMAS +ACTOR_EN_DODONGO +ACTOR_EN_FIREFLY +ACTOR_EN_HORSE +ACTOR_EN_ITEM00 +ACTOR_EN_ARROW +ACTOR_EN_ELF +ACTOR_EN_NIW +ACTOR_EN_TITE +ACTOR_UNSET_13 +ACTOR_EN_PEEHAT +ACTOR_EN_BUTTE +ACTOR_EN_INSECT +ACTOR_EN_FISH +ACTOR_EN_HOLL +ACTOR_EN_DINOFOS +ACTOR_EN_HATA +ACTOR_EN_ZL1 +ACTOR_EN_VIEWER +ACTOR_EN_BUBBLE +ACTOR_DOOR_SHUTTER +ACTOR_UNSET_1F +ACTOR_EN_BOOM +ACTOR_EN_TORCH2 +ACTOR_EN_MINIFROG +ACTOR_UNSET_23 +ACTOR_EN_ST +ACTOR_UNSET_25 +ACTOR_EN_A_OBJ +ACTOR_OBJ_WTURN +ACTOR_EN_RIVER_SOUND +ACTOR_UNSET_29 +ACTOR_EN_OSSAN +ACTOR_UNSET_2B +ACTOR_UNSET_2C +ACTOR_EN_FAMOS +ACTOR_UNSET_2E +ACTOR_EN_BOMBF +ACTOR_UNSET_30 +ACTOR_UNSET_31 +ACTOR_EN_AM +ACTOR_EN_DEKUBABA +ACTOR_EN_M_FIRE1 +ACTOR_EN_M_THUNDER +ACTOR_BG_BREAKWALL +ACTOR_UNSET_37 +ACTOR_DOOR_WARP1 +ACTOR_OBJ_SYOKUDAI +ACTOR_ITEM_B_HEART +ACTOR_EN_DEKUNUTS +ACTOR_EN_BBFALL +ACTOR_ARMS_HOOK +ACTOR_EN_BB +ACTOR_BG_KEIKOKU_SPR +ACTOR_UNSET_40 +ACTOR_EN_WOOD02 +ACTOR_UNSET_42 +ACTOR_EN_DEATH +ACTOR_EN_MINIDEATH +ACTOR_UNSET_45 +ACTOR_UNSET_46 +ACTOR_EN_VM +ACTOR_DEMO_EFFECT +ACTOR_DEMO_KANKYO +ACTOR_EN_FLOORMAS +ACTOR_UNSET_4B +ACTOR_EN_RD +ACTOR_BG_F40_FLIFT +ACTOR_UNSET_4E +ACTOR_OBJ_MURE +ACTOR_EN_SW +ACTOR_OBJECT_KANKYO +ACTOR_UNSET_52 +ACTOR_UNSET_53 +ACTOR_EN_HORSE_LINK_CHILD +ACTOR_DOOR_ANA +ACTOR_UNSET_56 +ACTOR_UNSET_57 +ACTOR_UNSET_58 +ACTOR_UNSET_59 +ACTOR_UNSET_5A +ACTOR_EN_ENCOUNT1 +ACTOR_DEMO_TRE_LGT +ACTOR_UNSET_5D +ACTOR_UNSET_5E +ACTOR_EN_ENCOUNT2 +ACTOR_EN_FIRE_ROCK +ACTOR_BG_CTOWER_ROT +ACTOR_MIR_RAY +ACTOR_UNSET_63 +ACTOR_EN_SB +ACTOR_EN_BIGSLIME +ACTOR_EN_KAREBABA +ACTOR_EN_IN +ACTOR_UNSET_68 +ACTOR_EN_RU +ACTOR_EN_BOM_CHU +ACTOR_EN_HORSE_GAME_CHECK +ACTOR_EN_RR +ACTOR_UNSET_6D +ACTOR_UNSET_6E +ACTOR_UNSET_6F +ACTOR_UNSET_70 +ACTOR_UNSET_71 +ACTOR_UNSET_72 +ACTOR_EN_FR +ACTOR_UNSET_74 +ACTOR_UNSET_75 +ACTOR_UNSET_76 +ACTOR_UNSET_77 +ACTOR_UNSET_78 +ACTOR_UNSET_79 +ACTOR_OBJ_OSHIHIKI +ACTOR_EFF_DUST +ACTOR_BG_UMAJUMP +ACTOR_ARROW_FIRE +ACTOR_ARROW_ICE +ACTOR_ARROW_LIGHT +ACTOR_ITEM_ETCETERA +ACTOR_OBJ_KIBAKO +ACTOR_OBJ_TSUBO +ACTOR_UNSET_83 +ACTOR_EN_IK +ACTOR_UNSET_85 +ACTOR_UNSET_86 +ACTOR_UNSET_87 +ACTOR_UNSET_88 +ACTOR_DEMO_SHD +ACTOR_EN_DNS +ACTOR_ELF_MSG +ACTOR_EN_HONOTRAP +ACTOR_EN_TUBO_TRAP +ACTOR_OBJ_ICE_POLY +ACTOR_EN_FZ +ACTOR_EN_KUSA +ACTOR_OBJ_BEAN +ACTOR_OBJ_BOMBIWA +ACTOR_OBJ_SWITCH +ACTOR_UNSET_94 +ACTOR_OBJ_LIFT +ACTOR_OBJ_HSBLOCK +ACTOR_EN_OKARINA_TAG +ACTOR_UNSET_98 +ACTOR_EN_GOROIWA +ACTOR_UNSET_9A +ACTOR_UNSET_9B +ACTOR_EN_DAIKU +ACTOR_EN_NWC +ACTOR_ITEM_INBOX +ACTOR_EN_GE1 +ACTOR_OBJ_BLOCKSTOP +ACTOR_EN_SDA +ACTOR_EN_CLEAR_TAG +ACTOR_UNSET_A3 +ACTOR_EN_GM +ACTOR_EN_MS +ACTOR_EN_HS +ACTOR_BG_INGATE +ACTOR_EN_KANBAN +ACTOR_UNSET_A9 +ACTOR_EN_ATTACK_NIW +ACTOR_UNSET_AB +ACTOR_UNSET_AC +ACTOR_UNSET_AD +ACTOR_EN_MK +ACTOR_EN_OWL +ACTOR_EN_ISHI +ACTOR_OBJ_HANA +ACTOR_OBJ_LIGHTSWITCH +ACTOR_OBJ_MURE2 +ACTOR_UNSET_B4 +ACTOR_EN_FU +ACTOR_UNSET_B6 +ACTOR_UNSET_B7 +ACTOR_EN_STREAM +ACTOR_EN_MM +ACTOR_UNSET_BA +ACTOR_UNSET_BB +ACTOR_EN_WEATHER_TAG +ACTOR_EN_ANI +ACTOR_UNSET_BE +ACTOR_EN_JS +ACTOR_UNSET_C0 +ACTOR_UNSET_C1 +ACTOR_UNSET_C2 +ACTOR_UNSET_C3 +ACTOR_EN_OKARINA_EFFECT +ACTOR_EN_MAG +ACTOR_ELF_MSG2 +ACTOR_BG_F40_SWLIFT +ACTOR_UNSET_C8 +ACTOR_UNSET_C9 +ACTOR_EN_KAKASI +ACTOR_OBJ_MAKEOSHIHIKI +ACTOR_OCEFF_SPOT +ACTOR_UNSET_CD +ACTOR_EN_TORCH +ACTOR_UNSET_CF +ACTOR_SHOT_SUN +ACTOR_UNSET_D1 +ACTOR_UNSET_D2 +ACTOR_OBJ_ROOMTIMER +ACTOR_EN_SSH +ACTOR_UNSET_D5 +ACTOR_OCEFF_WIPE +ACTOR_OCEFF_STORM +ACTOR_OBJ_DEMO +ACTOR_EN_MINISLIME +ACTOR_EN_NUTSBALL +ACTOR_UNSET_DB +ACTOR_UNSET_DC +ACTOR_UNSET_DD +ACTOR_UNSET_DE +ACTOR_OCEFF_WIPE2 +ACTOR_OCEFF_WIPE3 +ACTOR_UNSET_E1 +ACTOR_EN_DG +ACTOR_EN_SI +ACTOR_OBJ_COMB +ACTOR_OBJ_KIBAKO2 +ACTOR_UNSET_E6 +ACTOR_EN_HS2 +ACTOR_OBJ_MURE3 +ACTOR_EN_TG +ACTOR_UNSET_EA +ACTOR_UNSET_EB +ACTOR_EN_WF +ACTOR_EN_SKB +ACTOR_UNSET_EE +ACTOR_EN_GS +ACTOR_OBJ_SOUND +ACTOR_EN_CROW +ACTOR_UNSET_F2 +ACTOR_EN_COW +ACTOR_UNSET_F4 +ACTOR_UNSET_F5 +ACTOR_OCEFF_WIPE4 +ACTOR_UNSET_F7 +ACTOR_EN_ZO +ACTOR_OBJ_MAKEKINSUTA +ACTOR_EN_GE3 +ACTOR_UNSET_FB +ACTOR_OBJ_HAMISHI +ACTOR_EN_ZL4 +ACTOR_EN_MM2 +ACTOR_UNSET_FF +ACTOR_DOOR_SPIRAL +ACTOR_UNSET_101 +ACTOR_OBJ_PZLBLOCK +ACTOR_OBJ_TOGE +ACTOR_UNSET_104 +ACTOR_OBJ_ARMOS +ACTOR_OBJ_BOYO +ACTOR_UNSET_107 +ACTOR_UNSET_108 +ACTOR_EN_GRASSHOPPER +ACTOR_UNSET_10A +ACTOR_OBJ_GRASS +ACTOR_OBJ_GRASS_CARRY +ACTOR_OBJ_GRASS_UNIT +ACTOR_UNSET_10E +ACTOR_UNSET_10F +ACTOR_BG_FIRE_WALL +ACTOR_EN_BU +ACTOR_EN_ENCOUNT3 +ACTOR_EN_JSO +ACTOR_OBJ_CHIKUWA +ACTOR_EN_KNIGHT +ACTOR_EN_WARP_TAG +ACTOR_EN_AOB_01 +ACTOR_EN_BOJ_01 +ACTOR_EN_BOJ_02 +ACTOR_EN_BOJ_03 +ACTOR_EN_ENCOUNT4 +ACTOR_EN_BOM_BOWL_MAN +ACTOR_EN_SYATEKI_MAN +ACTOR_UNSET_11E +ACTOR_BG_ICICLE +ACTOR_EN_SYATEKI_CROW +ACTOR_EN_BOJ_04 +ACTOR_EN_CNE_01 +ACTOR_EN_BBA_01 +ACTOR_EN_BJI_01 +ACTOR_BG_SPDWEB +ACTOR_UNSET_126 +ACTOR_UNSET_127 +ACTOR_EN_MT_TAG +ACTOR_BOSS_01 +ACTOR_BOSS_02 +ACTOR_BOSS_03 +ACTOR_BOSS_04 +ACTOR_BOSS_05 +ACTOR_BOSS_06 +ACTOR_BOSS_07 +ACTOR_BG_DY_YOSEIZO +ACTOR_UNSET_131 +ACTOR_EN_BOJ_05 +ACTOR_UNSET_133 +ACTOR_UNSET_134 +ACTOR_EN_SOB1 +ACTOR_UNSET_136 +ACTOR_UNSET_137 +ACTOR_EN_GO +ACTOR_UNSET_139 +ACTOR_EN_RAF +ACTOR_OBJ_FUNEN +ACTOR_OBJ_RAILLIFT +ACTOR_BG_NUMA_HANA +ACTOR_OBJ_FLOWERPOT +ACTOR_OBJ_SPINYROLL +ACTOR_DM_HINA +ACTOR_EN_SYATEKI_WF +ACTOR_OBJ_SKATEBLOCK +ACTOR_OBJ_ICEBLOCK +ACTOR_EN_BIGPAMET +ACTOR_EN_SYATEKI_DEKUNUTS +ACTOR_ELF_MSG3 +ACTOR_EN_FG +ACTOR_DM_RAVINE +ACTOR_DM_SA +ACTOR_EN_SLIME +ACTOR_EN_PR +ACTOR_OBJ_TOUDAI +ACTOR_OBJ_ENTOTU +ACTOR_OBJ_BELL +ACTOR_EN_SYATEKI_OKUTA +ACTOR_UNSET_150 +ACTOR_OBJ_SHUTTER +ACTOR_DM_ZL +ACTOR_EN_ELFGRP +ACTOR_DM_TSG +ACTOR_EN_BAGUO +ACTOR_OBJ_VSPINYROLL +ACTOR_OBJ_SMORK +ACTOR_EN_TEST2 +ACTOR_EN_TEST3 +ACTOR_EN_TEST4 +ACTOR_EN_BAT +ACTOR_EN_SEKIHI +ACTOR_EN_WIZ +ACTOR_EN_WIZ_BROCK +ACTOR_EN_WIZ_FIRE +ACTOR_EFF_CHANGE +ACTOR_DM_STATUE +ACTOR_OBJ_FIRESHIELD +ACTOR_BG_LADDER +ACTOR_EN_MKK +ACTOR_DEMO_GETITEM +ACTOR_UNSET_166 +ACTOR_EN_DNB +ACTOR_EN_DNH +ACTOR_EN_DNK +ACTOR_EN_DNQ +ACTOR_UNSET_16B +ACTOR_BG_KEIKOKU_SAKU +ACTOR_OBJ_HUGEBOMBIWA +ACTOR_EN_FIREFLY2 +ACTOR_EN_RAT +ACTOR_EN_WATER_EFFECT +ACTOR_EN_KUSA2 +ACTOR_BG_SPOUT_FIRE +ACTOR_UNSET_173 +ACTOR_BG_DBLUE_MOVEBG +ACTOR_EN_DY_EXTRA +ACTOR_EN_BAL +ACTOR_EN_GINKO_MAN +ACTOR_EN_WARP_UZU +ACTOR_OBJ_DRIFTICE +ACTOR_EN_LOOK_NUTS +ACTOR_EN_MUSHI2 +ACTOR_EN_FALL +ACTOR_EN_MM3 +ACTOR_BG_CRACE_MOVEBG +ACTOR_EN_DNO +ACTOR_EN_PR2 +ACTOR_EN_PRZ +ACTOR_EN_JSO2 +ACTOR_OBJ_ETCETERA +ACTOR_EN_EGOL +ACTOR_OBJ_MINE +ACTOR_OBJ_PURIFY +ACTOR_EN_TRU +ACTOR_EN_TRT +ACTOR_UNSET_189 +ACTOR_UNSET_18A +ACTOR_EN_TEST5 +ACTOR_EN_TEST6 +ACTOR_EN_AZ +ACTOR_EN_ESTONE +ACTOR_BG_HAKUGIN_POST +ACTOR_DM_OPSTAGE +ACTOR_DM_STK +ACTOR_DM_CHAR00 +ACTOR_DM_CHAR01 +ACTOR_DM_CHAR02 +ACTOR_DM_CHAR03 +ACTOR_DM_CHAR04 +ACTOR_DM_CHAR05 +ACTOR_DM_CHAR06 +ACTOR_DM_CHAR07 +ACTOR_DM_CHAR08 +ACTOR_DM_CHAR09 +ACTOR_OBJ_TOKEIDAI +ACTOR_UNSET_19D +ACTOR_EN_MNK +ACTOR_EN_EGBLOCK +ACTOR_EN_GUARD_NUTS +ACTOR_BG_HAKUGIN_BOMBWALL +ACTOR_OBJ_TOKEI_TOBIRA +ACTOR_BG_HAKUGIN_ELVPOLE +ACTOR_EN_MA4 +ACTOR_EN_TWIG +ACTOR_EN_PO_FUSEN +ACTOR_EN_DOOR_ETC +ACTOR_EN_BIGOKUTA +ACTOR_BG_ICEFLOE +ACTOR_OBJ_OCARINALIFT +ACTOR_EN_TIME_TAG +ACTOR_BG_OPEN_SHUTTER +ACTOR_BG_OPEN_SPOT +ACTOR_BG_FU_KAITEN +ACTOR_OBJ_AQUA +ACTOR_EN_ELFORG +ACTOR_EN_ELFBUB +ACTOR_UNSET_1B2 +ACTOR_EN_FU_MATO +ACTOR_EN_FU_KAGO +ACTOR_EN_OSN +ACTOR_BG_CTOWER_GEAR +ACTOR_EN_TRT2 +ACTOR_OBJ_TOKEI_STEP +ACTOR_BG_LOTUS +ACTOR_EN_KAME +ACTOR_OBJ_TAKARAYA_WALL +ACTOR_BG_FU_MIZU +ACTOR_EN_SELLNUTS +ACTOR_BG_DKJAIL_IVY +ACTOR_UNSET_1BF +ACTOR_OBJ_VISIBLOCK +ACTOR_EN_TAKARAYA +ACTOR_EN_TSN +ACTOR_EN_DS2N +ACTOR_EN_FSN +ACTOR_EN_SHN +ACTOR_UNSET_1C6 +ACTOR_EN_STOP_HEISHI +ACTOR_OBJ_BIGICICLE +ACTOR_EN_LIFT_NUTS +ACTOR_EN_TK +ACTOR_UNSET_1CB +ACTOR_BG_MARKET_STEP +ACTOR_OBJ_LUPYGAMELIFT +ACTOR_EN_TEST7 +ACTOR_OBJ_LIGHTBLOCK +ACTOR_MIR_RAY2 +ACTOR_EN_WDHAND +ACTOR_EN_GAMELUPY +ACTOR_BG_DANPEI_MOVEBG +ACTOR_EN_SNOWWD +ACTOR_EN_PM +ACTOR_EN_GAKUFU +ACTOR_ELF_MSG4 +ACTOR_ELF_MSG5 +ACTOR_EN_COL_MAN +ACTOR_EN_TALK_GIBUD +ACTOR_EN_GIANT +ACTOR_OBJ_SNOWBALL +ACTOR_BOSS_HAKUGIN +ACTOR_EN_GB2 +ACTOR_EN_ONPUMAN +ACTOR_BG_TOBIRA01 +ACTOR_EN_TAG_OBJ +ACTOR_OBJ_DHOUSE +ACTOR_OBJ_HAKAISI +ACTOR_BG_HAKUGIN_SWITCH +ACTOR_UNSET_1E5 +ACTOR_EN_SNOWMAN +ACTOR_TG_SW +ACTOR_EN_PO_SISTERS +ACTOR_EN_PP +ACTOR_EN_HAKUROCK +ACTOR_EN_HANABI +ACTOR_OBJ_DOWSING +ACTOR_OBJ_WIND +ACTOR_EN_RACEDOG +ACTOR_EN_KENDO_JS +ACTOR_BG_BOTIHASIRA +ACTOR_EN_FISH2 +ACTOR_EN_PST +ACTOR_EN_POH +ACTOR_OBJ_SPIDERTENT +ACTOR_EN_ZORAEGG +ACTOR_EN_KBT +ACTOR_EN_GG +ACTOR_EN_MARUTA +ACTOR_OBJ_SNOWBALL2 +ACTOR_EN_GG2 +ACTOR_OBJ_GHAKA +ACTOR_EN_DNP +ACTOR_EN_DAI +ACTOR_BG_GORON_OYU +ACTOR_EN_KGY +ACTOR_EN_INVADEPOH +ACTOR_EN_GK +ACTOR_EN_AN +ACTOR_UNSET_203 +ACTOR_EN_BEE +ACTOR_EN_OT +ACTOR_EN_DRAGON +ACTOR_OBJ_DORA +ACTOR_EN_BIGPO +ACTOR_OBJ_KENDO_KANBAN +ACTOR_OBJ_HARIKO +ACTOR_EN_STH +ACTOR_BG_SINKAI_KABE +ACTOR_BG_HAKA_CURTAIN +ACTOR_BG_KIN2_BOMBWALL +ACTOR_BG_KIN2_FENCE +ACTOR_BG_KIN2_PICTURE +ACTOR_BG_KIN2_SHELF +ACTOR_EN_RAIL_SKB +ACTOR_EN_JG +ACTOR_EN_TRU_MT +ACTOR_OBJ_UM +ACTOR_EN_NEO_REEBA +ACTOR_BG_MBAR_CHAIR +ACTOR_BG_IKANA_BLOCK +ACTOR_BG_IKANA_MIRROR +ACTOR_BG_IKANA_ROTARYROOM +ACTOR_BG_DBLUE_BALANCE +ACTOR_BG_DBLUE_WATERFALL +ACTOR_EN_KAIZOKU +ACTOR_EN_GE2 +ACTOR_EN_MA_YTS +ACTOR_EN_MA_YTO +ACTOR_OBJ_TOKEI_TURRET +ACTOR_BG_DBLUE_ELEVATOR +ACTOR_OBJ_WARPSTONE +ACTOR_EN_ZOG +ACTOR_OBJ_ROTLIFT +ACTOR_OBJ_JG_GAKKI +ACTOR_BG_INIBS_MOVEBG +ACTOR_EN_ZOT +ACTOR_OBJ_TREE +ACTOR_OBJ_Y2LIFT +ACTOR_OBJ_Y2SHUTTER +ACTOR_OBJ_BOAT +ACTOR_OBJ_TARU +ACTOR_OBJ_HUNSUI +ACTOR_EN_JC_MATO +ACTOR_MIR_RAY3 +ACTOR_EN_ZOB +ACTOR_ELF_MSG6 +ACTOR_OBJ_NOZOKI +ACTOR_EN_TOTO +ACTOR_EN_RAILGIBUD +ACTOR_EN_BABA +ACTOR_EN_SUTTARI +ACTOR_EN_ZOD +ACTOR_EN_KUJIYA +ACTOR_EN_GEG +ACTOR_OBJ_KINOKO +ACTOR_OBJ_YASI +ACTOR_EN_TANRON1 +ACTOR_EN_TANRON2 +ACTOR_EN_TANRON3 +ACTOR_OBJ_CHAN +ACTOR_EN_ZOS +ACTOR_EN_S_GORO +ACTOR_EN_NB +ACTOR_EN_JA +ACTOR_BG_F40_BLOCK +ACTOR_BG_F40_SWITCH +ACTOR_EN_PO_COMPOSER +ACTOR_EN_GURUGURU +ACTOR_OCEFF_WIPE5 +ACTOR_EN_STONE_HEISHI +ACTOR_OCEFF_WIPE6 +ACTOR_EN_SCOPENUTS +ACTOR_EN_SCOPECROW +ACTOR_OCEFF_WIPE7 +ACTOR_EFF_KAMEJIMA_WAVE +ACTOR_EN_HG +ACTOR_EN_HGO +ACTOR_EN_ZOV +ACTOR_EN_AH +ACTOR_OBJ_HGDOOR +ACTOR_BG_IKANA_BOMBWALL +ACTOR_BG_IKANA_RAY +ACTOR_BG_IKANA_SHUTTER +ACTOR_BG_HAKA_BOMBWALL +ACTOR_BG_HAKA_TOMB +ACTOR_EN_SC_RUPPE +ACTOR_BG_IKNV_DOUKUTU +ACTOR_BG_IKNV_OBJ +ACTOR_EN_PAMERA +ACTOR_OBJ_HSSTUMP +ACTOR_EN_HIDDEN_NUTS +ACTOR_EN_ZOW +ACTOR_EN_TALK +ACTOR_EN_AL +ACTOR_EN_TAB +ACTOR_EN_NIMOTSU +ACTOR_EN_HIT_TAG +ACTOR_EN_RUPPECROW +ACTOR_EN_TANRON4 +ACTOR_EN_TANRON5 +ACTOR_EN_TANRON6 +ACTOR_EN_DAIKU2 +ACTOR_EN_MUTO +ACTOR_EN_BAISEN +ACTOR_EN_HEISHI +ACTOR_EN_DEMO_HEISHI +ACTOR_EN_DT +ACTOR_EN_CHA +ACTOR_OBJ_DINNER +ACTOR_EFF_LASTDAY +ACTOR_BG_IKANA_DHARMA +ACTOR_EN_AKINDONUTS +ACTOR_EFF_STK +ACTOR_EN_IG +ACTOR_EN_RG +ACTOR_EN_OSK +ACTOR_EN_STH2 +ACTOR_EN_YB +ACTOR_EN_RZ +ACTOR_EN_SCOPECOIN +ACTOR_EN_BJT +ACTOR_EN_BOMJIMA +ACTOR_EN_BOMJIMB +ACTOR_EN_BOMBERS +ACTOR_EN_BOMBERS2 +ACTOR_EN_BOMBAL +ACTOR_OBJ_MOON_STONE +ACTOR_OBJ_MU_PICT +ACTOR_BG_IKNINSIDE +ACTOR_EFF_ZORABAND +ACTOR_OBJ_KEPN_KOYA +ACTOR_OBJ_USIYANE +ACTOR_EN_NNH +ACTOR_OBJ_KZSAKU +ACTOR_OBJ_MILK_BIN +ACTOR_EN_KITAN +ACTOR_BG_ASTR_BOMBWALL +ACTOR_BG_IKNIN_SUSCEIL +ACTOR_EN_BSB +ACTOR_EN_RECEPGIRL +ACTOR_EN_THIEFBIRD +ACTOR_EN_JGAME_TSN +ACTOR_OBJ_JGAME_LIGHT +ACTOR_OBJ_YADO +ACTOR_DEMO_SYOTEN +ACTOR_DEMO_MOONEND +ACTOR_BG_LBFSHOT +ACTOR_BG_LAST_BWALL +ACTOR_EN_AND +ACTOR_EN_INVADEPOH_DEMO +ACTOR_OBJ_DANPEILIFT +ACTOR_EN_FALL2 +ACTOR_DM_AL +ACTOR_DM_AN +ACTOR_DM_AH +ACTOR_DM_NB +ACTOR_EN_DRS +ACTOR_EN_ENDING_HERO +ACTOR_DM_BAL +ACTOR_EN_PAPER +ACTOR_EN_HINT_SKB +ACTOR_DM_TAG +ACTOR_EN_BH +ACTOR_EN_ENDING_HERO2 +ACTOR_EN_ENDING_HERO3 +ACTOR_EN_ENDING_HERO4 +ACTOR_EN_ENDING_HERO5 +ACTOR_EN_ENDING_HERO6 +ACTOR_DM_GM +ACTOR_OBJ_SWPRIZE +ACTOR_EN_INVISIBLE_RUPPE +ACTOR_OBJ_ENDING +ACTOR_EN_RSN +ACTOR_ID_MAX \ No newline at end of file diff --git a/tools/ZAPDConfigs/MM/Config.xml b/tools/ZAPDConfigs/MM/Config.xml new file mode 100644 index 0000000000..2817cf591e --- /dev/null +++ b/tools/ZAPDConfigs/MM/Config.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/tools/ZAPDConfigs/MM/ObjectList_MM.txt b/tools/ZAPDConfigs/MM/ObjectList_MM.txt new file mode 100644 index 0000000000..5d8968d973 --- /dev/null +++ b/tools/ZAPDConfigs/MM/ObjectList_MM.txt @@ -0,0 +1,643 @@ +OBJECT_UNSET_0 +GAMEPLAY_KEEP +GAMEPLAY_FIELD_KEEP +GAMEPLAY_DANGEON_KEEP +OBJECT_NB +OBJECT_OKUTA +OBJECT_CROW +OBJECT_AH +OBJECT_DY_OBJ +OBJECT_WALLMASTER +OBJECT_DODONGO +OBJECT_FIREFLY +OBJECT_BOX +OBJECT_AL +OBJECT_BUBBLE +OBJECT_NIW +OBJECT_LINK_BOY +OBJECT_LINK_CHILD +OBJECT_TITE +OBJECT_TAB +OBJECT_PH +OBJECT_AND +OBJECT_MSMO +OBJECT_DINOFOS +OBJECT_DRS +OBJECT_ZL1 +OBJECT_AN4 +OBJECT_UNSET_1B +OBJECT_TEST3 +OBJECT_FAMOS +OBJECT_UNSET_1E +OBJECT_UNSET_1F +OBJECT_ST +OBJECT_UNSET_21 +OBJECT_THIEFBIRD +OBJECT_UNSET_23 +OBJECT_UNSET_24 +OBJECT_UNSET_25 +OBJECT_UNSET_26 +OBJECT_UNSET_27 +OBJECT_UNSET_28 +OBJECT_UNSET_29 +OBJECT_BOMBF +OBJECT_UNSET_2B +OBJECT_UNSET_2C +OBJECT_UNSET_2D +OBJECT_UNSET_2E +OBJECT_UNSET_2F +OBJECT_AM +OBJECT_DEKUBABA +OBJECT_UNSET_32 +OBJECT_UNSET_33 +OBJECT_UNSET_34 +OBJECT_UNSET_35 +OBJECT_UNSET_36 +OBJECT_UNSET_37 +OBJECT_UNSET_38 +OBJECT_UNSET_39 +OBJECT_UNSET_3A +OBJECT_UNSET_3B +OBJECT_UNSET_3C +OBJECT_UNSET_3D +OBJECT_WARP1 +OBJECT_B_HEART +OBJECT_DEKUNUTS +OBJECT_UNSET_41 +OBJECT_UNSET_42 +OBJECT_UNSET_43 +OBJECT_UNSET_44 +OBJECT_UNSET_45 +OBJECT_UNSET_46 +OBJECT_UNSET_47 +OBJECT_UNSET_48 +OBJECT_UNSET_49 +OBJECT_UNSET_4A +OBJECT_UNSET_4B +OBJECT_UNSET_4C +OBJECT_UNSET_4D +OBJECT_UNSET_4E +OBJECT_UNSET_4F +OBJECT_UNSET_50 +OBJECT_BB +OBJECT_DEATH +OBJECT_UNSET_53 +OBJECT_UNSET_54 +OBJECT_UNSET_55 +OBJECT_UNSET_56 +OBJECT_UNSET_57 +OBJECT_UNSET_58 +OBJECT_UNSET_59 +OBJECT_UNSET_5A +OBJECT_UNSET_5B +OBJECT_F40_OBJ +OBJECT_PO_COMPOSER +OBJECT_UNSET_5E +OBJECT_HATA +OBJECT_UNSET_60 +OBJECT_WOOD02 +OBJECT_UNSET_62 +OBJECT_UNSET_63 +OBJECT_TRAP +OBJECT_UNSET_65 +OBJECT_UNSET_66 +OBJECT_UNSET_67 +OBJECT_UNSET_68 +OBJECT_UNSET_69 +OBJECT_VM +OBJECT_UNSET_6B +OBJECT_UNSET_6C +OBJECT_UNSET_6D +OBJECT_UNSET_6E +OBJECT_UNSET_6F +OBJECT_EFC_STAR_FIELD +OBJECT_UNSET_71 +OBJECT_UNSET_72 +OBJECT_UNSET_73 +OBJECT_UNSET_74 +OBJECT_RD +OBJECT_YUKIMURA_OBJ +OBJECT_HEAVY_OBJECT +OBJECT_UNSET_78 +OBJECT_UNSET_79 +OBJECT_UNSET_7A +OBJECT_UNSET_7B +OBJECT_UNSET_7C +OBJECT_HORSE_LINK_CHILD +OBJECT_UNSET_7E +OBJECT_UNSET_7F +OBJECT_SYOKUDAI +OBJECT_UNSET_81 +OBJECT_UNSET_82 +OBJECT_UNSET_83 +OBJECT_EFC_TW +OBJECT_UNSET_85 +OBJECT_GI_KEY +OBJECT_MIR_RAY +OBJECT_CTOWER_ROT +OBJECT_UNSET_89 +OBJECT_BDOOR +OBJECT_UNSET_8B +OBJECT_UNSET_8C +OBJECT_UNSET_8D +OBJECT_SB +OBJECT_GI_MELODY +OBJECT_GI_HEART +OBJECT_GI_COMPASS +OBJECT_GI_BOSSKEY +OBJECT_UNSET_93 +OBJECT_GI_NUTS +OBJECT_UNSET_95 +OBJECT_GI_HEARTS +OBJECT_GI_ARROWCASE +OBJECT_GI_BOMBPOUCH +OBJECT_IN +OBJECT_UNSET_9A +OBJECT_UNSET_9B +OBJECT_UNSET_9C +OBJECT_OS_ANIME +OBJECT_GI_BOTTLE +OBJECT_GI_STICK +OBJECT_GI_MAP +OBJECT_OF1D_MAP +OBJECT_RU2 +OBJECT_UNSET_A3 +OBJECT_GI_MAGICPOT +OBJECT_GI_BOMB_1 +OBJECT_UNSET_A6 +OBJECT_MA2 +OBJECT_GI_PURSE +OBJECT_UNSET_A9 +OBJECT_UNSET_AA +OBJECT_RR +OBJECT_UNSET_AC +OBJECT_UNSET_AD +OBJECT_UNSET_AE +OBJECT_GI_ARROW +OBJECT_GI_BOMB_2 +OBJECT_UNSET_B1 +OBJECT_UNSET_B2 +OBJECT_GI_SHIELD_2 +OBJECT_GI_HOOKSHOT +OBJECT_GI_OCARINA +OBJECT_GI_MILK +OBJECT_MA1 +OBJECT_UNSET_B8 +OBJECT_UNSET_B9 +OBJECT_UNSET_BA +OBJECT_NY +OBJECT_FR +OBJECT_UNSET_BD +OBJECT_UNSET_BE +OBJECT_GI_BOW +OBJECT_GI_GLASSES +OBJECT_GI_LIQUID +OBJECT_ANI +OBJECT_GI_SHIELD_3 +OBJECT_UNSET_C4 +OBJECT_UNSET_C5 +OBJECT_GI_BEAN +OBJECT_GI_FISH +OBJECT_UNSET_C8 +OBJECT_UNSET_C9 +OBJECT_UNSET_CA +OBJECT_GI_LONGSWORD +OBJECT_UNSET_CC +OBJECT_UNSET_CD +OBJECT_UNSET_CE +OBJECT_UNSET_CF +OBJECT_ZO +OBJECT_UNSET_D1 +OBJECT_UMAJUMP +OBJECT_UNSET_D3 +OBJECT_UNSET_D4 +OBJECT_MASTERGOLON +OBJECT_MASTERZOORA +OBJECT_AOB +OBJECT_IK +OBJECT_AHG +OBJECT_CNE +OBJECT_UNSET_DB +OBJECT_UNSET_DC +OBJECT_AN3 +OBJECT_BJI +OBJECT_BBA +OBJECT_AN2 +OBJECT_UNSET_E1 +OBJECT_AN1 +OBJECT_BOJ +OBJECT_FZ +OBJECT_BOB +OBJECT_GE1 +OBJECT_YABUSAME_POINT +OBJECT_UNSET_E8 +OBJECT_UNSET_E9 +OBJECT_UNSET_EA +OBJECT_UNSET_EB +OBJECT_D_HSBLOCK +OBJECT_D_LIFT +OBJECT_MAMENOKI +OBJECT_GOROIWA +OBJECT_TORYO +OBJECT_DAIKU +OBJECT_NWC +OBJECT_GM +OBJECT_MS +OBJECT_HS +OBJECT_UNSET_F6 +OBJECT_LIGHTSWITCH +OBJECT_KUSA +OBJECT_TSUBO +OBJECT_UNSET_FA +OBJECT_UNSET_FB +OBJECT_KANBAN +OBJECT_OWL +OBJECT_MK +OBJECT_FU +OBJECT_GI_KI_TAN_MASK +OBJECT_UNSET_101 +OBJECT_GI_MASK18 +OBJECT_GI_RABIT_MASK +OBJECT_GI_TRUTH_MASK +OBJECT_UNSET_105 +OBJECT_STREAM +OBJECT_MM +OBJECT_UNSET_108 +OBJECT_UNSET_109 +OBJECT_UNSET_10A +OBJECT_UNSET_10B +OBJECT_UNSET_10C +OBJECT_UNSET_10D +OBJECT_UNSET_10E +OBJECT_JS +OBJECT_CS +OBJECT_UNSET_111 +OBJECT_UNSET_112 +OBJECT_GI_SOLDOUT +OBJECT_UNSET_114 +OBJECT_MAG +OBJECT_UNSET_116 +OBJECT_UNSET_117 +OBJECT_UNSET_118 +OBJECT_GI_GOLONMASK +OBJECT_GI_ZORAMASK +OBJECT_UNSET_11B +OBJECT_UNSET_11C +OBJECT_KA +OBJECT_UNSET_11E +OBJECT_ZG +OBJECT_UNSET_120 +OBJECT_GI_M_ARROW +OBJECT_DS2 +OBJECT_UNSET_123 +OBJECT_FISH +OBJECT_GI_SUTARU +OBJECT_UNSET_126 +OBJECT_SSH +OBJECT_BIGSLIME +OBJECT_BG +OBJECT_BOMBIWA +OBJECT_HINTNUTS +OBJECT_RS +OBJECT_UNSET_12D +OBJECT_GLA +OBJECT_UNSET_12F +OBJECT_GELDB +OBJECT_UNSET_131 +OBJECT_DOG +OBJECT_KIBAKO2 +OBJECT_DNS +OBJECT_DNK +OBJECT_UNSET_136 +OBJECT_GI_INSECT +OBJECT_UNSET_138 +OBJECT_GI_GHOST +OBJECT_GI_SOUL +OBJECT_UNSET_13B +OBJECT_UNSET_13C +OBJECT_UNSET_13D +OBJECT_UNSET_13E +OBJECT_GI_RUPY +OBJECT_MU +OBJECT_WF +OBJECT_SKB +OBJECT_GS +OBJECT_PS +OBJECT_OMOYA_OBJ +OBJECT_COW +OBJECT_UNSET_147 +OBJECT_GI_SWORD_1 +OBJECT_UNSET_149 +OBJECT_UNSET_14A +OBJECT_ZL4 +OBJECT_LINK_GORON +OBJECT_LINK_ZORA +OBJECT_GRASSHOPPER +OBJECT_BOYO +OBJECT_UNSET_150 +OBJECT_UNSET_151 +OBJECT_UNSET_152 +OBJECT_FWALL +OBJECT_LINK_NUTS +OBJECT_JSO +OBJECT_KNIGHT +OBJECT_ICICLE +OBJECT_SPDWEB +OBJECT_UNSET_159 +OBJECT_BOSS01 +OBJECT_BOSS02 +OBJECT_BOSS03 +OBJECT_BOSS04 +OBJECT_BOSS05 +OBJECT_BOSS06 +OBJECT_BOSS07 +OBJECT_RAF +OBJECT_FUNEN +OBJECT_RAILLIFT +OBJECT_NUMA_OBJ +OBJECT_FLOWERPOT +OBJECT_SPINYROLL +OBJECT_ICE_BLOCK +OBJECT_UNSET_168 +OBJECT_KEIKOKU_DEMO +OBJECT_SLIME +OBJECT_PR +OBJECT_F52_OBJ +OBJECT_F53_OBJ +OBJECT_UNSET_16E +OBJECT_KIBAKO +OBJECT_SEK +OBJECT_GMO +OBJECT_BAT +OBJECT_SEKIHIL +OBJECT_SEKIHIG +OBJECT_SEKIHIN +OBJECT_SEKIHIZ +OBJECT_UNSET_177 +OBJECT_WIZ +OBJECT_LADDER +OBJECT_MKK +OBJECT_UNSET_17B +OBJECT_UNSET_17C +OBJECT_UNSET_17D +OBJECT_KEIKOKU_OBJ +OBJECT_SICHITAI_OBJ +OBJECT_DEKUCITY_ANA_OBJ +OBJECT_RAT +OBJECT_WATER_EFFECT +OBJECT_UNSET_183 +OBJECT_DBLUE_OBJECT +OBJECT_BAL +OBJECT_WARP_UZU +OBJECT_DRIFTICE +OBJECT_FALL +OBJECT_HANAREYAMA_OBJ +OBJECT_CRACE_OBJECT +OBJECT_DNQ +OBJECT_OBJECT_UNSET_TOKEIDAI +OBJECT_EG +OBJECT_TRU +OBJECT_TRT +OBJECT_HAKUGIN_OBJ +OBJECT_HORSE_GAME_CHECK +OBJECT_STK +OBJECT_UNSET_193 +OBJECT_UNSET_194 +OBJECT_MNK +OBJECT_GI_BOTTLE_RED +OBJECT_TOKEI_TOBIRA +OBJECT_AZ +OBJECT_TWIG +OBJECT_DEKUCITY_OBJ +OBJECT_PO_FUSEN +OBJECT_RACETSUBO +OBJECT_HA +OBJECT_BIGOKUTA +OBJECT_OPEN_OBJ +OBJECT_FU_KAITEN +OBJECT_FU_MATO +OBJECT_MTORIDE +OBJECT_OSN +OBJECT_TOKEI_STEP +OBJECT_LOTUS +OBJECT_TL +OBJECT_DKJAIL_OBJ +OBJECT_VISIBLOCK +OBJECT_TSN +OBJECT_DS2N +OBJECT_FSN +OBJECT_SHN +OBJECT_BIGICICLE +OBJECT_GI_BOTTLE_15 +OBJECT_TK +OBJECT_MARKET_OBJ +OBJECT_GI_RESERVE00 +OBJECT_GI_RESERVE01 +OBJECT_LIGHTBLOCK +OBJECT_TAKARAYA_OBJECTS +OBJECT_WDHAND +OBJECT_SDN +OBJECT_SNOWWD +OBJECT_GIANT +OBJECT_COMB +OBJECT_HANA +OBJECT_BOSS_HAKUGIN +OBJECT_MEGANEANA_OBJ +OBJECT_GI_NUTSMASK +OBJECT_STK2 +OBJECT_SPOT11_OBJ +OBJECT_DANPEI_OBJECT +OBJECT_DHOUSE +OBJECT_HAKAISI +OBJECT_PO +OBJECT_SNOWMAN +OBJECT_PO_SISTERS +OBJECT_PP +OBJECT_GORONSWITCH +OBJECT_DELF +OBJECT_BOTIHASIRA +OBJECT_GI_BIGBOMB +OBJECT_PST +OBJECT_BSMASK +OBJECT_SPIDERTENT +OBJECT_ZORAEGG +OBJECT_KBT +OBJECT_GG +OBJECT_MARUTA +OBJECT_GHAKA +OBJECT_OYU +OBJECT_DNP +OBJECT_DAI +OBJECT_KGY +OBJECT_FB +OBJECT_TAISOU +OBJECT_MASK_BU_SAN +OBJECT_MASK_KI_TAN +OBJECT_MASK_RABIT +OBJECT_MASK_SKJ +OBJECT_MASK_BAKURETU +OBJECT_MASK_TRUTH +OBJECT_GK +OBJECT_HAKA_OBJ +OBJECT_MASK_GORON +OBJECT_MASK_ZORA +OBJECT_MASK_NUTS +OBJECT_MASK_BOY +OBJECT_DNT +OBJECT_YUKIYAMA +OBJECT_ICEFLOE +OBJECT_GI_GOLD_DUST +OBJECT_GI_BOTTLE_16 +OBJECT_GI_BOTTLE_22 +OBJECT_BEE +OBJECT_OT +OBJECT_UTUBO +OBJECT_DORA +OBJECT_GI_LOACH +OBJECT_GI_SEAHORSE +OBJECT_BIGPO +OBJECT_HARIKO +OBJECT_DNO +OBJECT_SINKAI_KABE +OBJECT_KIN2_OBJ +OBJECT_ISHI +OBJECT_HAKUGIN_DEMO +OBJECT_JG +OBJECT_GI_SWORD_2 +OBJECT_GI_SWORD_3 +OBJECT_GI_SWORD_4 +OBJECT_UM +OBJECT_MASK_GIBUDO +OBJECT_MASK_JSON +OBJECT_MASK_KERFAY +OBJECT_MASK_BIGELF +OBJECT_RB +OBJECT_MBAR_OBJ +OBJECT_IKANA_OBJ +OBJECT_KZ +OBJECT_TOKEI_TURRET +OBJECT_ZOG +OBJECT_ROTLIFT +OBJECT_POSTHOUSE_OBJ +OBJECT_GI_MASK09 +OBJECT_GI_MASK14 +OBJECT_GI_MASK15 +OBJECT_INIBS_OBJECT +OBJECT_TREE +OBJECT_KAIZOKU_OBJ +OBJECT_GI_RESERVE_B_00 +OBJECT_GI_RESERVE_C_00 +OBJECT_ZOB +OBJECT_MILKBAR +OBJECT_DMASK +OBJECT_MASK_KYOJIN +OBJECT_GI_RESERVE_C_01 +OBJECT_ZOD +OBJECT_KUMO30 +OBJECT_OBJECT_UNSET_YASI +OBJECT_MASK_ROMERNY +OBJECT_TANRON1 +OBJECT_TANRON2 +OBJECT_TANRON3 +OBJECT_GI_MAGICMUSHROOM +OBJECT_OBJECT_UNSET_CHAN +OBJECT_GI_MASK10 +OBJECT_ZOS +OBJECT_MASK_POSTHAT +OBJECT_F40_SWITCH +OBJECT_LODMOON +OBJECT_TRO +OBJECT_GI_MASK12 +OBJECT_GI_MASK23 +OBJECT_GI_BOTTLE_21 +OBJECT_GI_CAMERA +OBJECT_KAMEJIMA +OBJECT_HARFGIBUD +OBJECT_ZOV +OBJECT_HGDOOR +OBJECT_UNSET_22D +OBJECT_UNSET_22E +OBJECT_UNSET_22F +OBJECT_DOR01 +OBJECT_DOR02 +OBJECT_DOR03 +OBJECT_DOR04 +OBJECT_LAST_OBJ +OBJECT_REDEAD_OBJ +OBJECT_IKNINSIDE_OBJ +OBJECT_IKNV_OBJ +OBJECT_PAMERA +OBJECT_HSSTUMP +OBJECT_ZM +OBJECT_BIG_FWALL +OBJECT_SECOM_OBJ +OBJECT_HUNSUI +OBJECT_UCH +OBJECT_TANRON4 +OBJECT_TANRON5 +OBJECT_DT +OBJECT_GI_MASK03 +OBJECT_CHA +OBJECT_OBJECT_UNSET_DINNER +OBJECT_GI_RESERVE_B_01 +OBJECT_LASTDAY +OBJECT_BAI +OBJECT_IN2 +OBJECT_IKN_DEMO +OBJECT_YB +OBJECT_RZ +OBJECT_MASK_ZACHO +OBJECT_GI_FIELDMAP +OBJECT_MASK_STONE +OBJECT_BJT +OBJECT_TARU +OBJECT_MOONSTON +OBJECT_MASK_BREE +OBJECT_GI_SCHEDULE +OBJECT_GI_STONEMASK +OBJECT_ZORABAND +OBJECT_KEPN_KOYA +OBJECT_OBJECT_UNSET_USIYANE +OBJECT_GI_MASK05 +OBJECT_GI_MASK11 +OBJECT_GI_MASK20 +OBJECT_NNH +OBJECT_MASK_GERO +OBJECT_MASK_YOFUKASI +OBJECT_MASK_MEOTO +OBJECT_MASK_DANCER +OBJECT_KZSAKU +OBJECT_OBJECT_UNSET_MILK_BIN +OBJECT_RANDOM_OBJ +OBJECT_KUJIYA +OBJECT_KITAN +OBJECT_GI_MASK06 +OBJECT_GI_MASK16 +OBJECT_ASTR_OBJ +OBJECT_BSB +OBJECT_FALL2 +OBJECT_STH +OBJECT_GI_MSSA +OBJECT_SMTOWER +OBJECT_GI_MASK21 +OBJECT_YADO_OBJ +OBJECT_SYOTEN +OBJECT_MOONEND +OBJECT_OB +OBJECT_GI_BOTTLE_04 +OBJECT_OBJECT_UNSET_DANPEILIFT +OBJECT_WDOR01 +OBJECT_WDOR02 +OBJECT_WDOR03 +OBJECT_STK3 +OBJECT_KINSTA1_OBJ +OBJECT_KINSTA2_OBJ +OBJECT_BH +OBJECT_WDOR04 +OBJECT_WDOR05 +OBJECT_GI_MASK17 +OBJECT_GI_MASK22 +OBJECT_LBFSHOT +OBJECT_FUSEN +OBJECT_ENDING_OBJ +OBJECT_GI_MASK13 \ No newline at end of file diff --git a/tools/ZAPDConfigs/MM/SymbolMap_MM.txt b/tools/ZAPDConfigs/MM/SymbolMap_MM.txt new file mode 100644 index 0000000000..015e7e88a3 --- /dev/null +++ b/tools/ZAPDConfigs/MM/SymbolMap_MM.txt @@ -0,0 +1 @@ +8012DB20 gMtxClear \ No newline at end of file diff --git a/tools/warnings_count/warnings_build_current.txt b/tools/warnings_count/warnings_build_current.txt index a5a5bcdb04..b70a2b4bc2 100644 --- a/tools/warnings_count/warnings_build_current.txt +++ b/tools/warnings_count/warnings_build_current.txt @@ -1,2 +1,5 @@ cc: Warning: -mips3 should not be used for ucode 32-bit compiles cc: Warning: -mips3 should not be used for ucode 32-bit compiles +cfe: Warning 709: /tmp/preprocessedgmaj2ffw.c, line 114: Incompatible pointer type assignment + 60, 5, Z2_LAST_BSAnimatedMaterialPrimColor_0001C0, Z2_LAST_BSAnimatedMaterialEnvColors0x0001DC, + -------------------------------------------------------^