From 4d5d1fd079401ed49920608041b60c443c0b006e Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Sun, 16 May 2021 12:36:40 -0400 Subject: [PATCH] Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> --- assets/xml/objects/object_Bb.xml | 37 ++ assets/xml/objects/object_ahg.xml | 67 +++ assets/xml/objects/object_b_heart.xml | 8 + assets/xml/objects/object_bba.xml | 45 ++ assets/xml/objects/object_bdoor.xml | 9 + assets/xml/objects/object_bigokuta.xml | 58 +++ assets/xml/objects/object_bird.xml | 27 ++ assets/xml/objects/object_bji.xml | 62 +++ assets/xml/objects/object_bl.xml | 14 + assets/xml/objects/object_bob.xml | 45 ++ assets/xml/objects/object_boj.xml | 69 +++ assets/xml/objects/object_bombiwa.xml | 7 + assets/xml/objects/object_brob.xml | 25 ++ assets/xml/objects/object_bw.xml | 29 ++ assets/xml/objects/object_bwall.xml | 7 + assets/xml/objects/object_bxa.xml | 12 + assets/xml/objects/object_cne.xml | 61 +++ assets/xml/objects/object_cob.xml | 41 ++ assets/xml/objects/object_d_elevator.xml | 7 + assets/xml/objects/object_daiku.xml | 60 +++ assets/xml/objects/object_dekubaba.xml | 27 ++ assets/xml/objects/object_dekujr.xml | 13 + assets/xml/objects/object_dekunuts.xml | 2 +- assets/xml/objects/object_demo_6k.xml | 10 + assets/xml/objects/object_demo_tre_lgt.xml | 6 + assets/xml/objects/object_dh.xml | 59 +++ assets/xml/objects/object_dodojr.xml | 33 ++ assets/xml/objects/object_door_killer.xml | 17 + assets/xml/objects/object_ds2.xml | 32 ++ assets/xml/objects/object_efc_erupc.xml | 12 + assets/xml/objects/object_efc_flash.xml | 6 + assets/xml/objects/object_efc_star_field.xml | 8 + assets/xml/objects/object_fa.xml | 14 + assets/xml/objects/object_fish.xml | 157 +++++++ assets/xml/objects/object_fr.xml | 64 +++ assets/xml/objects/object_fu.xml | 49 ++ assets/xml/objects/object_ganon.xml | 89 ++++ assets/xml/objects/object_ganon2.xml | 156 +++++++ assets/xml/objects/object_ganon_anime1.xml | 29 ++ assets/xml/objects/object_ganon_anime2.xml | 21 + assets/xml/objects/object_ganon_anime3.xml | 13 + assets/xml/objects/object_ganon_objects.xml | 6 + assets/xml/objects/object_gm.xml | 5 + assets/xml/objects/object_gnd_magic.xml | 7 + assets/xml/objects/object_gndd.xml | 94 ++++ assets/xml/objects/object_gol.xml | 54 +++ assets/xml/objects/object_haka_door.xml | 12 + assets/xml/objects/object_haka_objects.xml | 85 ++++ assets/xml/objects/object_hs.xml | 47 ++ assets/xml/objects/object_ice_objects.xml | 25 ++ assets/xml/objects/object_im.xml | 76 ++++ assets/xml/objects/object_in.xml | 125 ++++++ assets/xml/objects/object_ka.xml | 64 +++ assets/xml/objects/object_kanban.xml | 18 + assets/xml/objects/object_kingdodongo.xml | 112 +++++ assets/xml/objects/object_kusa.xml | 6 + assets/xml/objects/object_kw1.xml | 63 +++ assets/xml/objects/object_lightbox.xml | 15 + assets/xml/objects/object_lightswitch.xml | 9 + assets/xml/objects/object_ma1.xml | 57 +++ assets/xml/objects/object_ma2.xml | 65 +++ assets/xml/objects/object_masterkokiri.xml | 5 + assets/xml/objects/object_medal.xml | 17 + assets/xml/objects/object_mjin.xml | 8 + assets/xml/objects/object_mjin_dark.xml | 5 + assets/xml/objects/object_mjin_flame.xml | 5 + assets/xml/objects/object_mjin_flash.xml | 5 + assets/xml/objects/object_mjin_ice.xml | 5 + assets/xml/objects/object_mjin_oka.xml | 8 + assets/xml/objects/object_mjin_soul.xml | 5 + assets/xml/objects/object_mjin_wind.xml | 5 + assets/xml/objects/object_mk.xml | 44 ++ assets/xml/objects/object_mori_hineri1.xml | 6 + assets/xml/objects/object_mori_hineri1a.xml | 6 + assets/xml/objects/object_mori_hineri2.xml | 6 + assets/xml/objects/object_mori_hineri2a.xml | 6 + assets/xml/objects/object_mori_tex.xml | 5 + assets/xml/objects/object_mu.xml | 96 ++++ assets/xml/objects/object_ny.xml | 2 +- assets/xml/objects/object_oA1.xml | 69 +++ assets/xml/objects/object_oA10.xml | 66 +++ assets/xml/objects/object_oA11.xml | 66 +++ assets/xml/objects/object_oA2.xml | 58 +++ assets/xml/objects/object_oA3.xml | 11 + assets/xml/objects/object_oA4.xml | 64 +++ assets/xml/objects/object_oA5.xml | 64 +++ assets/xml/objects/object_oA6.xml | 64 +++ assets/xml/objects/object_oA7.xml | 62 +++ assets/xml/objects/object_oA8.xml | 61 +++ assets/xml/objects/object_oA9.xml | 7 + assets/xml/objects/object_oB1.xml | 69 +++ assets/xml/objects/object_oB2.xml | 76 ++++ assets/xml/objects/object_oB3.xml | 70 +++ assets/xml/objects/object_oB4.xml | 64 +++ assets/xml/objects/object_oE1.xml | 70 +++ assets/xml/objects/object_oE10.xml | 15 + assets/xml/objects/object_oE11.xml | 15 + assets/xml/objects/object_oE12.xml | 15 + assets/xml/objects/object_oE1s.xml | 50 +++ assets/xml/objects/object_oE2.xml | 71 +++ assets/xml/objects/object_oE3.xml | 73 +++ assets/xml/objects/object_oE4.xml | 69 +++ assets/xml/objects/object_oE4s.xml | 46 ++ assets/xml/objects/object_oE5.xml | 64 +++ assets/xml/objects/object_oE6.xml | 15 + assets/xml/objects/object_oE7.xml | 14 + assets/xml/objects/object_oE8.xml | 15 + assets/xml/objects/object_oE9.xml | 15 + assets/xml/objects/object_oE_anime.xml | 10 + assets/xml/objects/object_oF1s.xml | 69 +++ assets/xml/objects/object_o_anime.xml | 11 + assets/xml/objects/object_opening_demo1.xml | 11 + assets/xml/objects/object_os.xml | 35 ++ assets/xml/objects/object_ouke_haka.xml | 6 + assets/xml/objects/object_rd.xml | 106 +++++ assets/xml/objects/object_reeba.xml | 27 ++ assets/xml/objects/object_rl.xml | 47 ++ assets/xml/objects/object_rs.xml | 30 ++ assets/xml/objects/object_ru1.xml | 69 +++ assets/xml/objects/object_sb.xml | 30 ++ assets/xml/objects/object_shop_dungen.xml | 9 + assets/xml/objects/object_siofuki.xml | 7 + assets/xml/objects/object_skb.xml | 2 +- assets/xml/objects/object_spot02_objects.xml | 25 ++ assets/xml/objects/object_spot03_object.xml | 11 + assets/xml/objects/object_spot05_objects.xml | 10 + assets/xml/objects/object_spot07_object.xml | 23 + assets/xml/objects/object_ssh.xml | 60 +++ assets/xml/objects/object_st.xml | 71 +++ assets/xml/objects/object_stream.xml | 6 + assets/xml/objects/object_ta.xml | 67 +++ assets/xml/objects/object_tite.xml | 50 +++ assets/xml/objects/object_toryo.xml | 53 +++ assets/xml/objects/object_tr.xml | 148 +++++++ assets/xml/objects/object_ts.xml | 33 ++ assets/xml/objects/object_tsubo.xml | 9 + assets/xml/objects/object_vali.xml | 28 ++ assets/xml/objects/object_warp2.xml | 6 + assets/xml/objects/object_wf.xml | 114 +++++ assets/xml/objects/object_wood02.xml | 34 ++ assets/xml/objects/object_yabusame_point.xml | 6 + assets/xml/objects/object_zf.xml | 179 ++++++++ assets/xml/overlays/ovl_Boss_Dodongo.xml | 2 +- assets/xml/overlays/ovl_Magic_Dark.xml | 2 +- assets/xml/textures/icon_item_24_static.xml | 2 +- .../xml/textures/icon_item_dungeon_static.xml | 2 +- .../xml/textures/icon_item_field_static.xml | 2 +- .../textures/icon_item_gameover_static.xml | 2 +- docs/tutorial/object_decomp.md | 62 ++- docs/tutorial/object_decomp_example.md | 33 +- format.sh | 3 +- spec | 417 ++++++++++++------ .../ovl_Boss_Dodongo/z_boss_dodongo_data.c | 8 +- 153 files changed, 5845 insertions(+), 201 deletions(-) create mode 100644 assets/xml/objects/object_Bb.xml create mode 100644 assets/xml/objects/object_ahg.xml create mode 100644 assets/xml/objects/object_b_heart.xml create mode 100644 assets/xml/objects/object_bba.xml create mode 100644 assets/xml/objects/object_bdoor.xml create mode 100644 assets/xml/objects/object_bigokuta.xml create mode 100644 assets/xml/objects/object_bird.xml create mode 100644 assets/xml/objects/object_bji.xml create mode 100644 assets/xml/objects/object_bl.xml create mode 100644 assets/xml/objects/object_bob.xml create mode 100644 assets/xml/objects/object_boj.xml create mode 100644 assets/xml/objects/object_bombiwa.xml create mode 100644 assets/xml/objects/object_brob.xml create mode 100644 assets/xml/objects/object_bw.xml create mode 100644 assets/xml/objects/object_bwall.xml create mode 100644 assets/xml/objects/object_bxa.xml create mode 100644 assets/xml/objects/object_cne.xml create mode 100644 assets/xml/objects/object_cob.xml create mode 100644 assets/xml/objects/object_d_elevator.xml create mode 100644 assets/xml/objects/object_daiku.xml create mode 100644 assets/xml/objects/object_dekubaba.xml create mode 100644 assets/xml/objects/object_dekujr.xml create mode 100644 assets/xml/objects/object_demo_6k.xml create mode 100644 assets/xml/objects/object_demo_tre_lgt.xml create mode 100644 assets/xml/objects/object_dh.xml create mode 100644 assets/xml/objects/object_dodojr.xml create mode 100644 assets/xml/objects/object_door_killer.xml create mode 100644 assets/xml/objects/object_ds2.xml create mode 100644 assets/xml/objects/object_efc_erupc.xml create mode 100644 assets/xml/objects/object_efc_flash.xml create mode 100644 assets/xml/objects/object_efc_star_field.xml create mode 100644 assets/xml/objects/object_fa.xml create mode 100644 assets/xml/objects/object_fish.xml create mode 100644 assets/xml/objects/object_fr.xml create mode 100644 assets/xml/objects/object_fu.xml create mode 100644 assets/xml/objects/object_ganon.xml create mode 100644 assets/xml/objects/object_ganon2.xml create mode 100644 assets/xml/objects/object_ganon_anime1.xml create mode 100644 assets/xml/objects/object_ganon_anime2.xml create mode 100644 assets/xml/objects/object_ganon_anime3.xml create mode 100644 assets/xml/objects/object_ganon_objects.xml create mode 100644 assets/xml/objects/object_gm.xml create mode 100644 assets/xml/objects/object_gnd_magic.xml create mode 100644 assets/xml/objects/object_gndd.xml create mode 100644 assets/xml/objects/object_gol.xml create mode 100644 assets/xml/objects/object_haka_door.xml create mode 100644 assets/xml/objects/object_haka_objects.xml create mode 100644 assets/xml/objects/object_hs.xml create mode 100644 assets/xml/objects/object_ice_objects.xml create mode 100644 assets/xml/objects/object_im.xml create mode 100644 assets/xml/objects/object_in.xml create mode 100644 assets/xml/objects/object_ka.xml create mode 100644 assets/xml/objects/object_kanban.xml create mode 100644 assets/xml/objects/object_kingdodongo.xml create mode 100644 assets/xml/objects/object_kusa.xml create mode 100644 assets/xml/objects/object_kw1.xml create mode 100644 assets/xml/objects/object_lightbox.xml create mode 100644 assets/xml/objects/object_lightswitch.xml create mode 100644 assets/xml/objects/object_ma1.xml create mode 100644 assets/xml/objects/object_ma2.xml create mode 100644 assets/xml/objects/object_masterkokiri.xml create mode 100644 assets/xml/objects/object_medal.xml create mode 100644 assets/xml/objects/object_mjin.xml create mode 100644 assets/xml/objects/object_mjin_dark.xml create mode 100644 assets/xml/objects/object_mjin_flame.xml create mode 100644 assets/xml/objects/object_mjin_flash.xml create mode 100644 assets/xml/objects/object_mjin_ice.xml create mode 100644 assets/xml/objects/object_mjin_oka.xml create mode 100644 assets/xml/objects/object_mjin_soul.xml create mode 100644 assets/xml/objects/object_mjin_wind.xml create mode 100644 assets/xml/objects/object_mk.xml create mode 100644 assets/xml/objects/object_mori_hineri1.xml create mode 100644 assets/xml/objects/object_mori_hineri1a.xml create mode 100644 assets/xml/objects/object_mori_hineri2.xml create mode 100644 assets/xml/objects/object_mori_hineri2a.xml create mode 100644 assets/xml/objects/object_mori_tex.xml create mode 100644 assets/xml/objects/object_mu.xml create mode 100644 assets/xml/objects/object_oA1.xml create mode 100644 assets/xml/objects/object_oA10.xml create mode 100644 assets/xml/objects/object_oA11.xml create mode 100644 assets/xml/objects/object_oA2.xml create mode 100644 assets/xml/objects/object_oA3.xml create mode 100644 assets/xml/objects/object_oA4.xml create mode 100644 assets/xml/objects/object_oA5.xml create mode 100644 assets/xml/objects/object_oA6.xml create mode 100644 assets/xml/objects/object_oA7.xml create mode 100644 assets/xml/objects/object_oA8.xml create mode 100644 assets/xml/objects/object_oA9.xml create mode 100644 assets/xml/objects/object_oB1.xml create mode 100644 assets/xml/objects/object_oB2.xml create mode 100644 assets/xml/objects/object_oB3.xml create mode 100644 assets/xml/objects/object_oB4.xml create mode 100644 assets/xml/objects/object_oE1.xml create mode 100644 assets/xml/objects/object_oE10.xml create mode 100644 assets/xml/objects/object_oE11.xml create mode 100644 assets/xml/objects/object_oE12.xml create mode 100644 assets/xml/objects/object_oE1s.xml create mode 100644 assets/xml/objects/object_oE2.xml create mode 100644 assets/xml/objects/object_oE3.xml create mode 100644 assets/xml/objects/object_oE4.xml create mode 100644 assets/xml/objects/object_oE4s.xml create mode 100644 assets/xml/objects/object_oE5.xml create mode 100644 assets/xml/objects/object_oE6.xml create mode 100644 assets/xml/objects/object_oE7.xml create mode 100644 assets/xml/objects/object_oE8.xml create mode 100644 assets/xml/objects/object_oE9.xml create mode 100644 assets/xml/objects/object_oE_anime.xml create mode 100644 assets/xml/objects/object_oF1s.xml create mode 100644 assets/xml/objects/object_o_anime.xml create mode 100644 assets/xml/objects/object_opening_demo1.xml create mode 100644 assets/xml/objects/object_os.xml create mode 100644 assets/xml/objects/object_ouke_haka.xml create mode 100644 assets/xml/objects/object_rd.xml create mode 100644 assets/xml/objects/object_reeba.xml create mode 100644 assets/xml/objects/object_rl.xml create mode 100644 assets/xml/objects/object_rs.xml create mode 100644 assets/xml/objects/object_ru1.xml create mode 100644 assets/xml/objects/object_sb.xml create mode 100644 assets/xml/objects/object_shop_dungen.xml create mode 100644 assets/xml/objects/object_siofuki.xml create mode 100644 assets/xml/objects/object_spot02_objects.xml create mode 100644 assets/xml/objects/object_spot03_object.xml create mode 100644 assets/xml/objects/object_spot05_objects.xml create mode 100644 assets/xml/objects/object_spot07_object.xml create mode 100644 assets/xml/objects/object_ssh.xml create mode 100644 assets/xml/objects/object_st.xml create mode 100644 assets/xml/objects/object_stream.xml create mode 100644 assets/xml/objects/object_ta.xml create mode 100644 assets/xml/objects/object_tite.xml create mode 100644 assets/xml/objects/object_toryo.xml create mode 100644 assets/xml/objects/object_tr.xml create mode 100644 assets/xml/objects/object_ts.xml create mode 100644 assets/xml/objects/object_tsubo.xml create mode 100644 assets/xml/objects/object_vali.xml create mode 100644 assets/xml/objects/object_warp2.xml create mode 100644 assets/xml/objects/object_wf.xml create mode 100644 assets/xml/objects/object_wood02.xml create mode 100644 assets/xml/objects/object_yabusame_point.xml create mode 100644 assets/xml/objects/object_zf.xml diff --git a/assets/xml/objects/object_Bb.xml b/assets/xml/objects/object_Bb.xml new file mode 100644 index 000000000..67b134182 --- /dev/null +++ b/assets/xml/objects/object_Bb.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ahg.xml b/assets/xml/objects/object_ahg.xml new file mode 100644 index 000000000..fa822377d --- /dev/null +++ b/assets/xml/objects/object_ahg.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_b_heart.xml b/assets/xml/objects/object_b_heart.xml new file mode 100644 index 000000000..00f7cd677 --- /dev/null +++ b/assets/xml/objects/object_b_heart.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/objects/object_bba.xml b/assets/xml/objects/object_bba.xml new file mode 100644 index 000000000..7eb418ca7 --- /dev/null +++ b/assets/xml/objects/object_bba.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bdoor.xml b/assets/xml/objects/object_bdoor.xml new file mode 100644 index 000000000..e909cf634 --- /dev/null +++ b/assets/xml/objects/object_bdoor.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_bigokuta.xml b/assets/xml/objects/object_bigokuta.xml new file mode 100644 index 000000000..04740c2e0 --- /dev/null +++ b/assets/xml/objects/object_bigokuta.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bird.xml b/assets/xml/objects/object_bird.xml new file mode 100644 index 000000000..2d3c111f6 --- /dev/null +++ b/assets/xml/objects/object_bird.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bji.xml b/assets/xml/objects/object_bji.xml new file mode 100644 index 000000000..b628a641e --- /dev/null +++ b/assets/xml/objects/object_bji.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bl.xml b/assets/xml/objects/object_bl.xml new file mode 100644 index 000000000..63a21a91d --- /dev/null +++ b/assets/xml/objects/object_bl.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bob.xml b/assets/xml/objects/object_bob.xml new file mode 100644 index 000000000..20234a014 --- /dev/null +++ b/assets/xml/objects/object_bob.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_boj.xml b/assets/xml/objects/object_boj.xml new file mode 100644 index 000000000..7bf2d9e7b --- /dev/null +++ b/assets/xml/objects/object_boj.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bombiwa.xml b/assets/xml/objects/object_bombiwa.xml new file mode 100644 index 000000000..d069347bb --- /dev/null +++ b/assets/xml/objects/object_bombiwa.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/xml/objects/object_brob.xml b/assets/xml/objects/object_brob.xml new file mode 100644 index 000000000..54e8c4890 --- /dev/null +++ b/assets/xml/objects/object_brob.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bw.xml b/assets/xml/objects/object_bw.xml new file mode 100644 index 000000000..61005718e --- /dev/null +++ b/assets/xml/objects/object_bw.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bwall.xml b/assets/xml/objects/object_bwall.xml new file mode 100644 index 000000000..2e7f681c1 --- /dev/null +++ b/assets/xml/objects/object_bwall.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/xml/objects/object_bxa.xml b/assets/xml/objects/object_bxa.xml new file mode 100644 index 000000000..37e4d3227 --- /dev/null +++ b/assets/xml/objects/object_bxa.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/xml/objects/object_cne.xml b/assets/xml/objects/object_cne.xml new file mode 100644 index 000000000..3057e412b --- /dev/null +++ b/assets/xml/objects/object_cne.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_cob.xml b/assets/xml/objects/object_cob.xml new file mode 100644 index 000000000..0724ae670 --- /dev/null +++ b/assets/xml/objects/object_cob.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_d_elevator.xml b/assets/xml/objects/object_d_elevator.xml new file mode 100644 index 000000000..b94620339 --- /dev/null +++ b/assets/xml/objects/object_d_elevator.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/xml/objects/object_daiku.xml b/assets/xml/objects/object_daiku.xml new file mode 100644 index 000000000..49eee02cb --- /dev/null +++ b/assets/xml/objects/object_daiku.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dekubaba.xml b/assets/xml/objects/object_dekubaba.xml new file mode 100644 index 000000000..959b9a48f --- /dev/null +++ b/assets/xml/objects/object_dekubaba.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dekujr.xml b/assets/xml/objects/object_dekujr.xml new file mode 100644 index 000000000..0d01359fa --- /dev/null +++ b/assets/xml/objects/object_dekujr.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dekunuts.xml b/assets/xml/objects/object_dekunuts.xml index 6dbc2b241..ad2e59d80 100644 --- a/assets/xml/objects/object_dekunuts.xml +++ b/assets/xml/objects/object_dekunuts.xml @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/assets/xml/objects/object_demo_6k.xml b/assets/xml/objects/object_demo_6k.xml new file mode 100644 index 000000000..aef9f90ef --- /dev/null +++ b/assets/xml/objects/object_demo_6k.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/xml/objects/object_demo_tre_lgt.xml b/assets/xml/objects/object_demo_tre_lgt.xml new file mode 100644 index 000000000..9ea19012b --- /dev/null +++ b/assets/xml/objects/object_demo_tre_lgt.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_dh.xml b/assets/xml/objects/object_dh.xml new file mode 100644 index 000000000..65095069d --- /dev/null +++ b/assets/xml/objects/object_dh.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dodojr.xml b/assets/xml/objects/object_dodojr.xml new file mode 100644 index 000000000..e09acc957 --- /dev/null +++ b/assets/xml/objects/object_dodojr.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_door_killer.xml b/assets/xml/objects/object_door_killer.xml new file mode 100644 index 000000000..41cd4f8d1 --- /dev/null +++ b/assets/xml/objects/object_door_killer.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ds2.xml b/assets/xml/objects/object_ds2.xml new file mode 100644 index 000000000..5224a09e3 --- /dev/null +++ b/assets/xml/objects/object_ds2.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_efc_erupc.xml b/assets/xml/objects/object_efc_erupc.xml new file mode 100644 index 000000000..800d9535f --- /dev/null +++ b/assets/xml/objects/object_efc_erupc.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/xml/objects/object_efc_flash.xml b/assets/xml/objects/object_efc_flash.xml new file mode 100644 index 000000000..5f962f162 --- /dev/null +++ b/assets/xml/objects/object_efc_flash.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_efc_star_field.xml b/assets/xml/objects/object_efc_star_field.xml new file mode 100644 index 000000000..0908d2fea --- /dev/null +++ b/assets/xml/objects/object_efc_star_field.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/objects/object_fa.xml b/assets/xml/objects/object_fa.xml new file mode 100644 index 000000000..aef62fee6 --- /dev/null +++ b/assets/xml/objects/object_fa.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_fish.xml b/assets/xml/objects/object_fish.xml new file mode 100644 index 000000000..63865f41a --- /dev/null +++ b/assets/xml/objects/object_fish.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_fr.xml b/assets/xml/objects/object_fr.xml new file mode 100644 index 000000000..139731cfd --- /dev/null +++ b/assets/xml/objects/object_fr.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_fu.xml b/assets/xml/objects/object_fu.xml new file mode 100644 index 000000000..71e4381dc --- /dev/null +++ b/assets/xml/objects/object_fu.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/objects/object_ganon.xml b/assets/xml/objects/object_ganon.xml new file mode 100644 index 000000000..88434d28b --- /dev/null +++ b/assets/xml/objects/object_ganon.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon2.xml b/assets/xml/objects/object_ganon2.xml new file mode 100644 index 000000000..4dc569887 --- /dev/null +++ b/assets/xml/objects/object_ganon2.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon_anime1.xml b/assets/xml/objects/object_ganon_anime1.xml new file mode 100644 index 000000000..6441210a4 --- /dev/null +++ b/assets/xml/objects/object_ganon_anime1.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon_anime2.xml b/assets/xml/objects/object_ganon_anime2.xml new file mode 100644 index 000000000..96121689e --- /dev/null +++ b/assets/xml/objects/object_ganon_anime2.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon_anime3.xml b/assets/xml/objects/object_ganon_anime3.xml new file mode 100644 index 000000000..56dc16453 --- /dev/null +++ b/assets/xml/objects/object_ganon_anime3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon_objects.xml b/assets/xml/objects/object_ganon_objects.xml new file mode 100644 index 000000000..0fe106db7 --- /dev/null +++ b/assets/xml/objects/object_ganon_objects.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_gm.xml b/assets/xml/objects/object_gm.xml new file mode 100644 index 000000000..91b10cc42 --- /dev/null +++ b/assets/xml/objects/object_gm.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/xml/objects/object_gnd_magic.xml b/assets/xml/objects/object_gnd_magic.xml new file mode 100644 index 000000000..a88d419d7 --- /dev/null +++ b/assets/xml/objects/object_gnd_magic.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/xml/objects/object_gndd.xml b/assets/xml/objects/object_gndd.xml new file mode 100644 index 000000000..c2ec4bce5 --- /dev/null +++ b/assets/xml/objects/object_gndd.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_gol.xml b/assets/xml/objects/object_gol.xml new file mode 100644 index 000000000..64b0a49ae --- /dev/null +++ b/assets/xml/objects/object_gol.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_haka_door.xml b/assets/xml/objects/object_haka_door.xml new file mode 100644 index 000000000..7c021c113 --- /dev/null +++ b/assets/xml/objects/object_haka_door.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/xml/objects/object_haka_objects.xml b/assets/xml/objects/object_haka_objects.xml new file mode 100644 index 000000000..5c0b03cc6 --- /dev/null +++ b/assets/xml/objects/object_haka_objects.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_hs.xml b/assets/xml/objects/object_hs.xml new file mode 100644 index 000000000..9b8765abd --- /dev/null +++ b/assets/xml/objects/object_hs.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ice_objects.xml b/assets/xml/objects/object_ice_objects.xml new file mode 100644 index 000000000..abaa53ad5 --- /dev/null +++ b/assets/xml/objects/object_ice_objects.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_im.xml b/assets/xml/objects/object_im.xml new file mode 100644 index 000000000..c1dd7dc1e --- /dev/null +++ b/assets/xml/objects/object_im.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml new file mode 100644 index 000000000..3933e6e64 --- /dev/null +++ b/assets/xml/objects/object_in.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ka.xml b/assets/xml/objects/object_ka.xml new file mode 100644 index 000000000..8956c59fe --- /dev/null +++ b/assets/xml/objects/object_ka.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_kanban.xml b/assets/xml/objects/object_kanban.xml new file mode 100644 index 000000000..9ffc7a2ce --- /dev/null +++ b/assets/xml/objects/object_kanban.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_kingdodongo.xml b/assets/xml/objects/object_kingdodongo.xml new file mode 100644 index 000000000..a0b85a458 --- /dev/null +++ b/assets/xml/objects/object_kingdodongo.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_kusa.xml b/assets/xml/objects/object_kusa.xml new file mode 100644 index 000000000..67291a554 --- /dev/null +++ b/assets/xml/objects/object_kusa.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_kw1.xml b/assets/xml/objects/object_kw1.xml new file mode 100644 index 000000000..f9c9f5931 --- /dev/null +++ b/assets/xml/objects/object_kw1.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_lightbox.xml b/assets/xml/objects/object_lightbox.xml new file mode 100644 index 000000000..1477d2a5b --- /dev/null +++ b/assets/xml/objects/object_lightbox.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_lightswitch.xml b/assets/xml/objects/object_lightswitch.xml new file mode 100644 index 000000000..ff5097878 --- /dev/null +++ b/assets/xml/objects/object_lightswitch.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_ma1.xml b/assets/xml/objects/object_ma1.xml new file mode 100644 index 000000000..5422430a9 --- /dev/null +++ b/assets/xml/objects/object_ma1.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ma2.xml b/assets/xml/objects/object_ma2.xml new file mode 100644 index 000000000..8d2ce9353 --- /dev/null +++ b/assets/xml/objects/object_ma2.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_masterkokiri.xml b/assets/xml/objects/object_masterkokiri.xml new file mode 100644 index 000000000..af5a9ec15 --- /dev/null +++ b/assets/xml/objects/object_masterkokiri.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/xml/objects/object_medal.xml b/assets/xml/objects/object_medal.xml new file mode 100644 index 000000000..b2e87315e --- /dev/null +++ b/assets/xml/objects/object_medal.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mjin.xml b/assets/xml/objects/object_mjin.xml new file mode 100644 index 000000000..c6a84a8c4 --- /dev/null +++ b/assets/xml/objects/object_mjin.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/objects/object_mjin_dark.xml b/assets/xml/objects/object_mjin_dark.xml new file mode 100644 index 000000000..ce70269fe --- /dev/null +++ b/assets/xml/objects/object_mjin_dark.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/xml/objects/object_mjin_flame.xml b/assets/xml/objects/object_mjin_flame.xml new file mode 100644 index 000000000..33596818e --- /dev/null +++ b/assets/xml/objects/object_mjin_flame.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/xml/objects/object_mjin_flash.xml b/assets/xml/objects/object_mjin_flash.xml new file mode 100644 index 000000000..145080be7 --- /dev/null +++ b/assets/xml/objects/object_mjin_flash.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/xml/objects/object_mjin_ice.xml b/assets/xml/objects/object_mjin_ice.xml new file mode 100644 index 000000000..158cde21c --- /dev/null +++ b/assets/xml/objects/object_mjin_ice.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/xml/objects/object_mjin_oka.xml b/assets/xml/objects/object_mjin_oka.xml new file mode 100644 index 000000000..3697b6a2c --- /dev/null +++ b/assets/xml/objects/object_mjin_oka.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/objects/object_mjin_soul.xml b/assets/xml/objects/object_mjin_soul.xml new file mode 100644 index 000000000..b6fa50774 --- /dev/null +++ b/assets/xml/objects/object_mjin_soul.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/xml/objects/object_mjin_wind.xml b/assets/xml/objects/object_mjin_wind.xml new file mode 100644 index 000000000..e046e8eb3 --- /dev/null +++ b/assets/xml/objects/object_mjin_wind.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/xml/objects/object_mk.xml b/assets/xml/objects/object_mk.xml new file mode 100644 index 000000000..3849bd075 --- /dev/null +++ b/assets/xml/objects/object_mk.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mori_hineri1.xml b/assets/xml/objects/object_mori_hineri1.xml new file mode 100644 index 000000000..c86047131 --- /dev/null +++ b/assets/xml/objects/object_mori_hineri1.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_mori_hineri1a.xml b/assets/xml/objects/object_mori_hineri1a.xml new file mode 100644 index 000000000..ac1e44696 --- /dev/null +++ b/assets/xml/objects/object_mori_hineri1a.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_mori_hineri2.xml b/assets/xml/objects/object_mori_hineri2.xml new file mode 100644 index 000000000..2c9bfe44f --- /dev/null +++ b/assets/xml/objects/object_mori_hineri2.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_mori_hineri2a.xml b/assets/xml/objects/object_mori_hineri2a.xml new file mode 100644 index 000000000..14e22992c --- /dev/null +++ b/assets/xml/objects/object_mori_hineri2a.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_mori_tex.xml b/assets/xml/objects/object_mori_tex.xml new file mode 100644 index 000000000..ad4ba38e3 --- /dev/null +++ b/assets/xml/objects/object_mori_tex.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/xml/objects/object_mu.xml b/assets/xml/objects/object_mu.xml new file mode 100644 index 000000000..ef9a51e51 --- /dev/null +++ b/assets/xml/objects/object_mu.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ny.xml b/assets/xml/objects/object_ny.xml index 8be377a5e..c53059196 100644 --- a/assets/xml/objects/object_ny.xml +++ b/assets/xml/objects/object_ny.xml @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/assets/xml/objects/object_oA1.xml b/assets/xml/objects/object_oA1.xml new file mode 100644 index 000000000..d802e992e --- /dev/null +++ b/assets/xml/objects/object_oA1.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA10.xml b/assets/xml/objects/object_oA10.xml new file mode 100644 index 000000000..9c18a4cdf --- /dev/null +++ b/assets/xml/objects/object_oA10.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA11.xml b/assets/xml/objects/object_oA11.xml new file mode 100644 index 000000000..76d8649b7 --- /dev/null +++ b/assets/xml/objects/object_oA11.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA2.xml b/assets/xml/objects/object_oA2.xml new file mode 100644 index 000000000..ffdcd7989 --- /dev/null +++ b/assets/xml/objects/object_oA2.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA3.xml b/assets/xml/objects/object_oA3.xml new file mode 100644 index 000000000..a28c9de2c --- /dev/null +++ b/assets/xml/objects/object_oA3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA4.xml b/assets/xml/objects/object_oA4.xml new file mode 100644 index 000000000..344bcd1f5 --- /dev/null +++ b/assets/xml/objects/object_oA4.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA5.xml b/assets/xml/objects/object_oA5.xml new file mode 100644 index 000000000..c05a7fd55 --- /dev/null +++ b/assets/xml/objects/object_oA5.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA6.xml b/assets/xml/objects/object_oA6.xml new file mode 100644 index 000000000..a2008b705 --- /dev/null +++ b/assets/xml/objects/object_oA6.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA7.xml b/assets/xml/objects/object_oA7.xml new file mode 100644 index 000000000..e7f19c52b --- /dev/null +++ b/assets/xml/objects/object_oA7.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA8.xml b/assets/xml/objects/object_oA8.xml new file mode 100644 index 000000000..ada984426 --- /dev/null +++ b/assets/xml/objects/object_oA8.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA9.xml b/assets/xml/objects/object_oA9.xml new file mode 100644 index 000000000..663c554fc --- /dev/null +++ b/assets/xml/objects/object_oA9.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/xml/objects/object_oB1.xml b/assets/xml/objects/object_oB1.xml new file mode 100644 index 000000000..58e9f852a --- /dev/null +++ b/assets/xml/objects/object_oB1.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oB2.xml b/assets/xml/objects/object_oB2.xml new file mode 100644 index 000000000..f05ef79df --- /dev/null +++ b/assets/xml/objects/object_oB2.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oB3.xml b/assets/xml/objects/object_oB3.xml new file mode 100644 index 000000000..b5e6a30de --- /dev/null +++ b/assets/xml/objects/object_oB3.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oB4.xml b/assets/xml/objects/object_oB4.xml new file mode 100644 index 000000000..ba710a904 --- /dev/null +++ b/assets/xml/objects/object_oB4.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE1.xml b/assets/xml/objects/object_oE1.xml new file mode 100644 index 000000000..88afa53dc --- /dev/null +++ b/assets/xml/objects/object_oE1.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE10.xml b/assets/xml/objects/object_oE10.xml new file mode 100644 index 000000000..eb3afcb6e --- /dev/null +++ b/assets/xml/objects/object_oE10.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE11.xml b/assets/xml/objects/object_oE11.xml new file mode 100644 index 000000000..81bfebf3b --- /dev/null +++ b/assets/xml/objects/object_oE11.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE12.xml b/assets/xml/objects/object_oE12.xml new file mode 100644 index 000000000..72fd93201 --- /dev/null +++ b/assets/xml/objects/object_oE12.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE1s.xml b/assets/xml/objects/object_oE1s.xml new file mode 100644 index 000000000..a1c0374eb --- /dev/null +++ b/assets/xml/objects/object_oE1s.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE2.xml b/assets/xml/objects/object_oE2.xml new file mode 100644 index 000000000..ce1765b2d --- /dev/null +++ b/assets/xml/objects/object_oE2.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE3.xml b/assets/xml/objects/object_oE3.xml new file mode 100644 index 000000000..383dec1b4 --- /dev/null +++ b/assets/xml/objects/object_oE3.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE4.xml b/assets/xml/objects/object_oE4.xml new file mode 100644 index 000000000..b1dc8fa36 --- /dev/null +++ b/assets/xml/objects/object_oE4.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE4s.xml b/assets/xml/objects/object_oE4s.xml new file mode 100644 index 000000000..73498d3d0 --- /dev/null +++ b/assets/xml/objects/object_oE4s.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE5.xml b/assets/xml/objects/object_oE5.xml new file mode 100644 index 000000000..139c86375 --- /dev/null +++ b/assets/xml/objects/object_oE5.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE6.xml b/assets/xml/objects/object_oE6.xml new file mode 100644 index 000000000..2115502eb --- /dev/null +++ b/assets/xml/objects/object_oE6.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE7.xml b/assets/xml/objects/object_oE7.xml new file mode 100644 index 000000000..dd2cb23ed --- /dev/null +++ b/assets/xml/objects/object_oE7.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE8.xml b/assets/xml/objects/object_oE8.xml new file mode 100644 index 000000000..478611a90 --- /dev/null +++ b/assets/xml/objects/object_oE8.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE9.xml b/assets/xml/objects/object_oE9.xml new file mode 100644 index 000000000..e3ced8b60 --- /dev/null +++ b/assets/xml/objects/object_oE9.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE_anime.xml b/assets/xml/objects/object_oE_anime.xml new file mode 100644 index 000000000..f6b4659e2 --- /dev/null +++ b/assets/xml/objects/object_oE_anime.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/xml/objects/object_oF1s.xml b/assets/xml/objects/object_oF1s.xml new file mode 100644 index 000000000..f3e2ce163 --- /dev/null +++ b/assets/xml/objects/object_oF1s.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_o_anime.xml b/assets/xml/objects/object_o_anime.xml new file mode 100644 index 000000000..4ef4ac44c --- /dev/null +++ b/assets/xml/objects/object_o_anime.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/objects/object_opening_demo1.xml b/assets/xml/objects/object_opening_demo1.xml new file mode 100644 index 000000000..fd0323027 --- /dev/null +++ b/assets/xml/objects/object_opening_demo1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/objects/object_os.xml b/assets/xml/objects/object_os.xml new file mode 100644 index 000000000..82cc45a60 --- /dev/null +++ b/assets/xml/objects/object_os.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ouke_haka.xml b/assets/xml/objects/object_ouke_haka.xml new file mode 100644 index 000000000..11da9b26e --- /dev/null +++ b/assets/xml/objects/object_ouke_haka.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_rd.xml b/assets/xml/objects/object_rd.xml new file mode 100644 index 000000000..d23800ed1 --- /dev/null +++ b/assets/xml/objects/object_rd.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_reeba.xml b/assets/xml/objects/object_reeba.xml new file mode 100644 index 000000000..27dead1b9 --- /dev/null +++ b/assets/xml/objects/object_reeba.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_rl.xml b/assets/xml/objects/object_rl.xml new file mode 100644 index 000000000..bb33c2ce3 --- /dev/null +++ b/assets/xml/objects/object_rl.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_rs.xml b/assets/xml/objects/object_rs.xml new file mode 100644 index 000000000..33d484470 --- /dev/null +++ b/assets/xml/objects/object_rs.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ru1.xml b/assets/xml/objects/object_ru1.xml new file mode 100644 index 000000000..4831f04da --- /dev/null +++ b/assets/xml/objects/object_ru1.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_sb.xml b/assets/xml/objects/object_sb.xml new file mode 100644 index 000000000..11224e83a --- /dev/null +++ b/assets/xml/objects/object_sb.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/objects/object_shop_dungen.xml b/assets/xml/objects/object_shop_dungen.xml new file mode 100644 index 000000000..64f22e381 --- /dev/null +++ b/assets/xml/objects/object_shop_dungen.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_siofuki.xml b/assets/xml/objects/object_siofuki.xml new file mode 100644 index 000000000..453bc9474 --- /dev/null +++ b/assets/xml/objects/object_siofuki.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/xml/objects/object_skb.xml b/assets/xml/objects/object_skb.xml index 87d73f7da..5ff01449a 100644 --- a/assets/xml/objects/object_skb.xml +++ b/assets/xml/objects/object_skb.xml @@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/assets/xml/objects/object_spot02_objects.xml b/assets/xml/objects/object_spot02_objects.xml new file mode 100644 index 000000000..539002c65 --- /dev/null +++ b/assets/xml/objects/object_spot02_objects.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot03_object.xml b/assets/xml/objects/object_spot03_object.xml new file mode 100644 index 000000000..7f77013d2 --- /dev/null +++ b/assets/xml/objects/object_spot03_object.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot05_objects.xml b/assets/xml/objects/object_spot05_objects.xml new file mode 100644 index 000000000..fb9b9ba2f --- /dev/null +++ b/assets/xml/objects/object_spot05_objects.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/xml/objects/object_spot07_object.xml b/assets/xml/objects/object_spot07_object.xml new file mode 100644 index 000000000..2633529e0 --- /dev/null +++ b/assets/xml/objects/object_spot07_object.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ssh.xml b/assets/xml/objects/object_ssh.xml new file mode 100644 index 000000000..659a6c2c4 --- /dev/null +++ b/assets/xml/objects/object_ssh.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_st.xml b/assets/xml/objects/object_st.xml new file mode 100644 index 000000000..02b82d0cc --- /dev/null +++ b/assets/xml/objects/object_st.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_stream.xml b/assets/xml/objects/object_stream.xml new file mode 100644 index 000000000..59b0838e4 --- /dev/null +++ b/assets/xml/objects/object_stream.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_ta.xml b/assets/xml/objects/object_ta.xml new file mode 100644 index 000000000..691ff48c3 --- /dev/null +++ b/assets/xml/objects/object_ta.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_tite.xml b/assets/xml/objects/object_tite.xml new file mode 100644 index 000000000..018cff7c4 --- /dev/null +++ b/assets/xml/objects/object_tite.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_toryo.xml b/assets/xml/objects/object_toryo.xml new file mode 100644 index 000000000..d6668c5c9 --- /dev/null +++ b/assets/xml/objects/object_toryo.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_tr.xml b/assets/xml/objects/object_tr.xml new file mode 100644 index 000000000..fb54246e4 --- /dev/null +++ b/assets/xml/objects/object_tr.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ts.xml b/assets/xml/objects/object_ts.xml new file mode 100644 index 000000000..6931ea0f5 --- /dev/null +++ b/assets/xml/objects/object_ts.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_tsubo.xml b/assets/xml/objects/object_tsubo.xml new file mode 100644 index 000000000..438f10c38 --- /dev/null +++ b/assets/xml/objects/object_tsubo.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_vali.xml b/assets/xml/objects/object_vali.xml new file mode 100644 index 000000000..46178cc34 --- /dev/null +++ b/assets/xml/objects/object_vali.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_warp2.xml b/assets/xml/objects/object_warp2.xml new file mode 100644 index 000000000..b6d1b3624 --- /dev/null +++ b/assets/xml/objects/object_warp2.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_wf.xml b/assets/xml/objects/object_wf.xml new file mode 100644 index 000000000..eb50da38e --- /dev/null +++ b/assets/xml/objects/object_wf.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_wood02.xml b/assets/xml/objects/object_wood02.xml new file mode 100644 index 000000000..bc7ea39c4 --- /dev/null +++ b/assets/xml/objects/object_wood02.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_yabusame_point.xml b/assets/xml/objects/object_yabusame_point.xml new file mode 100644 index 000000000..dd709430d --- /dev/null +++ b/assets/xml/objects/object_yabusame_point.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_zf.xml b/assets/xml/objects/object_zf.xml new file mode 100644 index 000000000..5fea2b094 --- /dev/null +++ b/assets/xml/objects/object_zf.xml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Boss_Dodongo.xml b/assets/xml/overlays/ovl_Boss_Dodongo.xml index 8a09787f7..615252751 100644 --- a/assets/xml/overlays/ovl_Boss_Dodongo.xml +++ b/assets/xml/overlays/ovl_Boss_Dodongo.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/assets/xml/overlays/ovl_Magic_Dark.xml b/assets/xml/overlays/ovl_Magic_Dark.xml index 342a4641b..54c5c4ac8 100644 --- a/assets/xml/overlays/ovl_Magic_Dark.xml +++ b/assets/xml/overlays/ovl_Magic_Dark.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/assets/xml/textures/icon_item_24_static.xml b/assets/xml/textures/icon_item_24_static.xml index d45cf7e7e..7bd4fd5f5 100644 --- a/assets/xml/textures/icon_item_24_static.xml +++ b/assets/xml/textures/icon_item_24_static.xml @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/assets/xml/textures/icon_item_dungeon_static.xml b/assets/xml/textures/icon_item_dungeon_static.xml index 510b7d0b2..083dfba2f 100644 --- a/assets/xml/textures/icon_item_dungeon_static.xml +++ b/assets/xml/textures/icon_item_dungeon_static.xml @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/assets/xml/textures/icon_item_field_static.xml b/assets/xml/textures/icon_item_field_static.xml index 930619d1f..58dd89c96 100644 --- a/assets/xml/textures/icon_item_field_static.xml +++ b/assets/xml/textures/icon_item_field_static.xml @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/assets/xml/textures/icon_item_gameover_static.xml b/assets/xml/textures/icon_item_gameover_static.xml index 623d94e49..9ef6867bb 100644 --- a/assets/xml/textures/icon_item_gameover_static.xml +++ b/assets/xml/textures/icon_item_gameover_static.xml @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/docs/tutorial/object_decomp.md b/docs/tutorial/object_decomp.md index f7964bf32..1bef74525 100644 --- a/docs/tutorial/object_decomp.md +++ b/docs/tutorial/object_decomp.md @@ -5,12 +5,13 @@ Object decompilation is the process of taking an object file and writing instruc ## What is an object file? An object file is generally where most of the information used by overlays is stored. Its contents can include + - Vertices (positional/normal/color data used by displaylists) - Textures - DisplayLists (instructions to the graphics processor on how to put together textures and vertices) - Skeleton (The underlying structure of an actor's shape, that can be manipulated to change its "pose") - Animations - +- Prerendered backgrounds ## How we work with objects @@ -21,25 +22,23 @@ Because these are regarded as copyrighted, we do not want them in the repository Choose an object to decomp. As usual, some will be easier than others. For reasons explained shortly, it is much easier to decomp an object if all actors that use it are decompiled. +### Files and folders + +Select the XML file of your selected object, which should be in `assets/xml/objects/object_name.xml`. + +The ZAPD output will go in the folder `assets/objects/object_name/`. You'll want this folder open later to check the output is correct. ### Examining actor files -Most objects are used by at least one actor. For those used by an actor, we can use the script `xmlcreate.py` on the actor to separate all the blobs of data in the object that we already know about. (While it is possible to do this manually, it is much simpler to run the script first and sort it out afterwards, since it won't miss anything accidentally.) - - -### Files and folders - -Make an XML file for the instructions, `assets/xml/objects/object_name.xml`. - -The ZAPD output will go in the folder `assets/objects/object_name/`: you'll want this folder open later to check the output is correct. - +Most objects are used by at least one actor. For those used by an actor, we can use the script `tools/xmlcreate.py` on the actor to separate all the blobs of data in the object that we already know about. (While it is possible to do this manually, it is much simpler to run the script first and sort it out afterwards, since it won't miss anything accidentally.) +Many objects have been added in an automated way, so most constituent parts of each object are already identified, but will still need to be named and documented properly. Also, these objects usually have some blobs unreferenced by the object's own contents and hence not automatically extracted; most of the time these can be identified by looking at references in the actor which uses said object. ### Extracting assets You can run `extract_assets.py` to extract the object's assets. Running it with no arguments extracts *everything* all over again, though. A better way is to run it with `-s` (for single file), and give it the location of the object you want to extract relative to `assets`, i.e. -``` +```bash ./extract_assets.py -s objects/object_name ``` @@ -51,22 +50,20 @@ You now have to try and decipher these blobs using the [list of tools given belo A significant question is how deep into the object you want to explicitly categorise and name things. -1. As a minimum, you need to include every piece of data that is directly accessed by another part of the repo (generally, but not always, actors). This allows for elimination of entries in `undefined_syms.txt`. For most objects, this includes several of a skeleton, animations, some textures, and collision information. +1. As a minimum, you need to include every piece of data that is directly accessed by another part of the repo (generally, but not always, actors). This allows for elimination of entries in [`undefined_syms.txt`](../../undefined_syms.txt). For most objects, this includes several of a skeleton, animations, some textures, and collision information. -2. Naming display lists that are associated to limbs in the skeleton. This is usually straightforward, providing Hylian Toolbox can show the skeleton properly. +2. Naming display lists that are associated to limbs in the skeleton. This is usually straightforward, providing Z64Utils or Hylian Toolbox can show the skeleton properly. -3. The next level is to name and give a format to any texture files that are produced from the extraction that are so far unnamed. +3. The next level is to name and give a format to any texture files that are produced from the extraction that are so far unnamed. 4. If you really want to you can name the limbs themselves. 5. In very rare cases, you may also want to name a particular set of vertices. - Current naming practice is to name each item in the xml using camelCase as usual, with the `g` prefix (for "global"), and the type of data last (Skel, Anim, DL, Tex), while output texture files are named in `snake_case`. Each pass of a successive level will require extracting the single asset again. - ### Textures Textures are especially troublesome due to the abundance of formats they can be in. Some are simple RGBA textures, while others use external palettes, and can look meaningless without. If the texture is used in a displaylist, it will tell you the format, but if not, you have to use your best judgement based on anything you know about its context. @@ -89,70 +86,71 @@ The following is a list of the texture formats the Nintendo 64 supports, with th | 16-bit red, green, blue, alpha (RGBA) (5/5/5/1) | `G_IM_FMT_RGBA, G_IM_SIZ_16b` | rgb5a1 | | 16-bit IA (8/8) | `G_IM_FMT_IA, G_IM_SIZ_16b` | ia16 | | 16-bit YUV (Luminance, Blue-Y, Red-Y) | `G_IM_FMT_YUV, G_IM_SIZ_16b` | (not used) | -| 32-bit RGBA (8/8/8/8) | `G_IM_FMT_RGBA, G_IM_SIZ_32b` | rgba8 | +| 32-bit RGBA (8/8/8/8) | `G_IM_FMT_RGBA, G_IM_SIZ_32b` | rgba32 | -The 4-bit formats are loaded using `gDPLoadTextureBlock_4b `. The others use `gDPLoadTextureBlock`. +The 4-bit formats are loaded using `gDPLoadTextureBlock_4b`. The others use `gDPLoadTextureBlock`. For example, -``` + +```c gsDPLoadTextureBlock(D_06006110, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, 0, 0), ``` + says that there is a texture at offset `0x6110`, its Format is `rgb5a1`, Width is `16` and Height is `16`, so we can declare + ```XML ``` See [this web page](http://n64devkit.square7.ch/tutorial/graphics/3/3_3.htm) for more information about these formats, and [gSP functions](http://n64devkit.square7.ch/n64man/gsp/gSP_INDEX.htm) and [gDP functions](http://n64devkit.square7.ch/n64man/gdp/gDP_INDEX.htm) for more about the graphics functions used. -The ci formats use palettes, which are declared separately. The shape you give the palette does not matter, but to avoid overlap errors it needs to fit into a rectangle; choose the one you think looks best. +The `ci` formats use palettes, which are declared separately. The shape you give the palette does not matter, but to avoid overlap errors it needs to fit into a rectangle; choose the one you think looks best. If in doubt, look at completed objects in the repo, and if still in doubt, ask. - ### Telling the repo to use the new files Just as when you decomp an actor you have to change the `spec` to tell it to use the new files, you have to do a similar thing for the object. Find the appropriate section for the object you have decompiled, and replace the line -``` +```c include "build/baserom/object_name.o" ``` by -``` +```c include "build/assets/objects/object_name/object_name.o" number 6 ``` -(the second line tells it to assign the object to segment 6 for the actors that use it: some objects use other segments, but you'll know this from the generated xml already: the `Segment` argument in the `File` tag will be different). +(the second line tells it to assign the object to segment 6 for the actors that use it: some objects use other segments, but you'll know this from the generated XML already: the `Segment` argument in the `File` tag will be different). Now, add -``` + +```c #include "objects/object_name/object_name.h" ``` + to every actor that uses the file, to tell it about the new symbols you have defined. Finally, replace all the symbols in the actors that use the file by the new names you gave them, and remove the corresponding sections in `undefined_syms.txt` and any `extern`s to the object's data in the actor files. If you did everything correctly, you should still get OK when running `make`. - - ## Tools Object decompilation is essentially a descriptive process, but it requires that we know what each blob of data in the object file actually is, and sometimes, the actor files that use an object are not sufficient to determine what everything is. Therefore it is useful to have a battery of romhacking and examination tools to bring to bear on the file to read its contents. -- The state-of-the-art is random's Z64Utils. This can find and analyze the displaylists, textures and vertices in an object file (and skeleton and animation support is in beta). It is not perfect; the best model viewer remains the debug rom itself. -- The old solution to look at skeletons and animations is Hylian Toolbox. This suffers from numerous issues, but is usually suitable for looking at object files that contain one skeleton and a few animations. -- To look at textures that you know something about, a texture viewer such as Texture64 is often useful. You may have trouble determining things like the palette a texture uses, depending on the format. - +- The state-of-the-art is random's [Z64Utils](https://github.com/Random06457/Z64Utils). This can find and analyze the displaylists, textures and vertices in an object file, and even has an skeleton and animation viewer. It is not perfect; the best model viewer remains the debug rom itself. +- The old solution to look at skeletons and animations is [Hylian Toolbox](http://wiki.maco64.com/Tools/Hylian_Toolbox). This suffers from numerous issues, but is usually suitable for looking at object files that contain one skeleton and a few animations. +- To look at textures that you know something about, a texture viewer such as [Texture64](https://github.com/queueRAM/Texture64) is often useful. You may have trouble determining things like the palette a texture uses, depending on the format. ## Building and investigative modding Thankfully it is not necessary to do a full make from clean to check that a particular object file has been decompiled successfully. - With a valid xml file, run `extract_assets.py -s` on its object. -- make +- `make` If you want to change a texture, for example to see precisely where it is used, the following steps ensure it will be used in the build diff --git a/docs/tutorial/object_decomp_example.md b/docs/tutorial/object_decomp_example.md index 5a9581528..6afe87416 100644 --- a/docs/tutorial/object_decomp_example.md +++ b/docs/tutorial/object_decomp_example.md @@ -4,8 +4,9 @@ A fairly typical example of an NPC's object is `object_bg`. It is used by one ac ## First pass: getting it to compile -Running `xmlcreate.py` gives -``` +Running `tools/xmlcreate.py` gives + +```xml $ python3 tools/xmlcreate.py src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c chuGirl Unknown type at offset 004110 Unknown type at offset 004910 @@ -28,6 +29,7 @@ We have two issues here that need to be resolved: naming the animations and sort ### Animations You have three choices to work out what the animations are: + - Read the code and look at them in the game. - Hylian Toolbox - The latest versions of Z64Utils @@ -38,12 +40,11 @@ Hylian Toolbox is terrible, but good for quick-and-dirty things like finding out Z64Utils is way better than Hylian Toolbox, but still in development. - ### Unknowns Looking in the actor, the unknowns are assigned to segment 8 using `SEGMENTED_TO_VIRTUAL`. This indicates textures. To find out what type they are, we can find the displaylist that uses them, and look at it in Z64Utils: if we look at the object in the object analyser, then find the right displaylist, it will not display correctly in the DList viewer, asking for a texture to put on 08000000. Giving it one of the textures, we discover that it is the head displaylist and the textures are eye textures. Hence we can name them `gChuGirlEyeOpen/Half/ClosedTex` (we equivocate on half-open/half-closed since many actors use the half texture for both opening and closing). From the code in the displaylist that loads it, we can also extract the texture's format, namely -``` +```c 06002FD8: gsDPLoadTextureBlock(D_08000000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 5, 0, 0), ``` @@ -60,30 +61,35 @@ So all three are `Format="rgb5a1" Width="32" Height="32"`. - + - + ``` Having got this far, we can now run + +```bash +./extract_assets.py -s objects/object_bg ``` -extract_assets.py -s objects/object_bg -``` + to extract the contents of the object into the new folder, change the spec to use our newly extracted assets: -``` + +```txt beginseg name "object_bg" romalign 0x1000 include "build/baserom/object_bg.o" endseg ``` + to -``` + +```txt beginseg name "object_bg" romalign 0x1000 @@ -91,8 +97,10 @@ beginseg number 6 endseg ``` + and wipe the `z_en_bom_bowl_man` section from `undefined_syms.txt`: -``` + +```txt // z_en_bom_bowl_man D_06006EB0 = 0x06006EB0; D_06000710 = 0x06000710; @@ -102,12 +110,11 @@ D_060072AC = 0x060072AC; Now `make` should give OK. - ## The displaylists For this step, we use Hylian Toolbox; if you have more than one skeleton in your actor, Hylian Toolbox will only show the first one. The others can be examined in the latest version of Z64Utils. Z64Utils can also give you a list of every displaylist in an object, be it just for cross-checking or to find extras. -Opening the rom in Hylian Toolbox and looking at object_bg, we can note down the displaylist associated to each limb. +Opening the rom in Hylian Toolbox and looking at object_bg, we can note down the displaylist associated to each limb. In this case naming is easy: we just have to note down the limb each is attached to. We only need a name and offset, and we end up with: ```xml diff --git a/format.sh b/format.sh index a796a3dab..26f6f8a5b 100755 --- a/format.sh +++ b/format.sh @@ -25,4 +25,5 @@ echo "Running clang-tidy..." clang-tidy ${TIDY_OPTS} src/**/*.c -- ${COMPILER_OPTS} &> /dev/null echo "Adding missing final new lines..." find src/ -type f -name "*.c" -exec sed -i -e '$a\' {} \; -echo "Done formatting all files." \ No newline at end of file +find assets/xml/ -type f -name "*.xml" -exec sed -i -e '$a\' {} \; +echo "Done formatting all files." diff --git a/spec b/spec index 81130e4a1..1a721526e 100644 --- a/spec +++ b/spec @@ -3554,13 +3554,15 @@ endseg beginseg name "object_tite" romalign 0x1000 - include "build/baserom/object_tite.o" + include "build/assets/objects/object_tite/object_tite.o" + number 6 endseg beginseg name "object_reeba" romalign 0x1000 - include "build/baserom/object_reeba.o" + include "build/assets/objects/object_reeba/object_reeba.o" + number 6 endseg beginseg @@ -3572,7 +3574,8 @@ endseg beginseg name "object_kingdodongo" romalign 0x1000 - include "build/baserom/object_kingdodongo.o" + include "build/assets/objects/object_kingdodongo/object_kingdodongo.o" + number 6 endseg beginseg @@ -3585,7 +3588,8 @@ endseg beginseg name "object_zf" romalign 0x1000 - include "build/baserom/object_zf.o" + include "build/assets/objects/object_zf/object_zf.o" + number 6 endseg beginseg @@ -3604,7 +3608,8 @@ endseg beginseg name "object_gol" romalign 0x1000 - include "build/baserom/object_gol.o" + include "build/assets/objects/object_gol/object_gol.o" + number 6 endseg beginseg @@ -3616,7 +3621,8 @@ endseg beginseg name "object_dodojr" romalign 0x1000 - include "build/baserom/object_dodojr.o" + include "build/assets/objects/object_dodojr/object_dodojr.o" + number 6 endseg beginseg @@ -3629,7 +3635,8 @@ endseg beginseg name "object_bl" romalign 0x1000 - include "build/baserom/object_bl.o" + include "build/assets/objects/object_bl/object_bl.o" + number 6 endseg beginseg @@ -3642,19 +3649,22 @@ endseg beginseg name "object_oA1" romalign 0x1000 - include "build/baserom/object_oA1.o" + include "build/assets/objects/object_oA1/object_oA1.o" + number 6 endseg beginseg name "object_st" romalign 0x1000 - include "build/baserom/object_st.o" + include "build/assets/objects/object_st/object_st.o" + number 6 endseg beginseg name "object_bw" romalign 0x1000 - include "build/baserom/object_bw.o" + include "build/assets/objects/object_bw/object_bw.o" + number 6 endseg beginseg @@ -3673,13 +3683,15 @@ endseg beginseg name "object_oB1" romalign 0x1000 - include "build/baserom/object_oB1.o" + include "build/assets/objects/object_oB1/object_oB1.o" + number 6 endseg beginseg name "object_o_anime" romalign 0x1000 - include "build/baserom/object_o_anime.o" + include "build/assets/objects/object_o_anime/object_o_anime.o" + number 6 endseg beginseg @@ -3711,7 +3723,8 @@ endseg beginseg name "object_oA2" romalign 0x1000 - include "build/baserom/object_oA2.o" + include "build/assets/objects/object_oA2/object_oA2.o" + number 6 endseg beginseg @@ -3742,19 +3755,22 @@ endseg beginseg name "object_oE1" romalign 0x1000 - include "build/baserom/object_oE1.o" + include "build/assets/objects/object_oE1/object_oE1.o" + number 6 endseg beginseg name "object_oE_anime" romalign 0x1000 - include "build/baserom/object_oE_anime.o" + include "build/assets/objects/object_oE_anime/object_oE_anime.o" + number 6 endseg beginseg name "object_oE2" romalign 0x1000 - include "build/baserom/object_oE2.o" + include "build/assets/objects/object_oE2/object_oE2.o" + number 6 endseg beginseg @@ -3781,37 +3797,43 @@ endseg beginseg name "object_dekubaba" romalign 0x1000 - include "build/baserom/object_dekubaba.o" + include "build/assets/objects/object_dekubaba/object_dekubaba.o" + number 6 endseg beginseg name "object_oA3" romalign 0x1000 - include "build/baserom/object_oA3.o" + include "build/assets/objects/object_oA3/object_oA3.o" + number 6 endseg beginseg name "object_oA4" romalign 0x1000 - include "build/baserom/object_oA4.o" + include "build/assets/objects/object_oA4/object_oA4.o" + number 6 endseg beginseg name "object_oA5" romalign 0x1000 - include "build/baserom/object_oA5.o" + include "build/assets/objects/object_oA5/object_oA5.o" + number 6 endseg beginseg name "object_oA6" romalign 0x1000 - include "build/baserom/object_oA6.o" + include "build/assets/objects/object_oA6/object_oA6.o" + number 6 endseg beginseg name "object_oA7" romalign 0x1000 - include "build/baserom/object_oA7.o" + include "build/assets/objects/object_oA7/object_oA7.o" + number 6 endseg beginseg @@ -3824,31 +3846,36 @@ endseg beginseg name "object_oA8" romalign 0x1000 - include "build/baserom/object_oA8.o" + include "build/assets/objects/object_oA8/object_oA8.o" + number 6 endseg beginseg name "object_oA9" romalign 0x1000 - include "build/baserom/object_oA9.o" + include "build/assets/objects/object_oA9/object_oA9.o" + number 6 endseg beginseg name "object_oB2" romalign 0x1000 - include "build/baserom/object_oB2.o" + include "build/assets/objects/object_oB2/object_oB2.o" + number 6 endseg beginseg name "object_oB3" romalign 0x1000 - include "build/baserom/object_oB3.o" + include "build/assets/objects/object_oB3/object_oB3.o" + number 6 endseg beginseg name "object_oB4" romalign 0x1000 - include "build/baserom/object_oB4.o" + include "build/assets/objects/object_oB4/object_oB4.o" + number 6 endseg beginseg @@ -3861,7 +3888,8 @@ endseg beginseg name "object_opening_demo1" romalign 0x1000 - include "build/baserom/object_opening_demo1.o" + include "build/assets/objects/object_opening_demo1/object_opening_demo1.o" + number 6 endseg beginseg @@ -3873,7 +3901,8 @@ endseg beginseg name "object_b_heart" romalign 0x1000 - include "build/baserom/object_b_heart.o" + include "build/assets/objects/object_b_heart/object_b_heart.o" + number 6 endseg beginseg @@ -3886,13 +3915,15 @@ endseg beginseg name "object_oE3" romalign 0x1000 - include "build/baserom/object_oE3.o" + include "build/assets/objects/object_oE3/object_oE3.o" + number 6 endseg beginseg name "object_oE4" romalign 0x1000 - include "build/baserom/object_oE4.o" + include "build/assets/objects/object_oE4/object_oE4.o" + number 6 endseg beginseg @@ -3904,67 +3935,78 @@ endseg beginseg name "object_oE5" romalign 0x1000 - include "build/baserom/object_oE5.o" + include "build/assets/objects/object_oE5/object_oE5.o" + number 6 endseg beginseg name "object_oE6" romalign 0x1000 - include "build/baserom/object_oE6.o" + include "build/assets/objects/object_oE6/object_oE6.o" + number 6 endseg beginseg name "object_oE7" romalign 0x1000 - include "build/baserom/object_oE7.o" + include "build/assets/objects/object_oE7/object_oE7.o" + number 6 endseg beginseg name "object_oE8" romalign 0x1000 - include "build/baserom/object_oE8.o" + include "build/assets/objects/object_oE8/object_oE8.o" + number 6 endseg beginseg name "object_oE9" romalign 0x1000 - include "build/baserom/object_oE9.o" + include "build/assets/objects/object_oE9/object_oE9.o" + number 6 endseg beginseg name "object_oE10" romalign 0x1000 - include "build/baserom/object_oE10.o" + include "build/assets/objects/object_oE10/object_oE10.o" + number 6 endseg beginseg name "object_oE11" romalign 0x1000 - include "build/baserom/object_oE11.o" + include "build/assets/objects/object_oE11/object_oE11.o" + number 6 endseg beginseg name "object_oE12" romalign 0x1000 - include "build/baserom/object_oE12.o" + include "build/assets/objects/object_oE12/object_oE12.o" + number 6 endseg beginseg name "object_vali" romalign 0x1000 - include "build/baserom/object_vali.o" + include "build/assets/objects/object_vali/object_vali.o" + number 6 endseg beginseg name "object_oA10" romalign 0x1000 - include "build/baserom/object_oA10.o" + include "build/assets/objects/object_oA10/object_oA10.o" + number 6 endseg beginseg name "object_oA11" romalign 0x1000 - include "build/baserom/object_oA11.o" + include "build/assets/objects/object_oA11/object_oA11.o" + number 6 endseg beginseg @@ -3990,13 +4032,15 @@ endseg beginseg name "object_mori_hineri1" romalign 0x1000 - include "build/baserom/object_mori_hineri1.o" + include "build/assets/objects/object_mori_hineri1/object_mori_hineri1.o" + number 6 endseg beginseg name "object_Bb" romalign 0x1000 - include "build/baserom/object_Bb.o" + include "build/assets/objects/object_Bb/object_Bb.o" + number 6 endseg beginseg @@ -4021,55 +4065,64 @@ endseg beginseg name "object_mjin" romalign 0x1000 - include "build/baserom/object_mjin.o" + include "build/assets/objects/object_mjin/object_mjin.o" + number 6 endseg beginseg name "object_mjin_flash" romalign 0x1000 - include "build/baserom/object_mjin_flash.o" + include "build/assets/objects/object_mjin_flash/object_mjin_flash.o" + number 6 endseg beginseg name "object_mjin_dark" romalign 0x1000 - include "build/baserom/object_mjin_dark.o" + include "build/assets/objects/object_mjin_dark/object_mjin_dark.o" + number 6 endseg beginseg name "object_mjin_flame" romalign 0x1000 - include "build/baserom/object_mjin_flame.o" + include "build/assets/objects/object_mjin_flame/object_mjin_flame.o" + number 6 endseg beginseg name "object_mjin_ice" romalign 0x1000 - include "build/baserom/object_mjin_ice.o" + include "build/assets/objects/object_mjin_ice/object_mjin_ice.o" + number 6 endseg beginseg name "object_mjin_soul" romalign 0x1000 - include "build/baserom/object_mjin_soul.o" + include "build/assets/objects/object_mjin_soul/object_mjin_soul.o" + number 6 endseg beginseg name "object_mjin_wind" romalign 0x1000 - include "build/baserom/object_mjin_wind.o" + include "build/assets/objects/object_mjin_wind/object_mjin_wind.o" + number 6 endseg beginseg name "object_mjin_oka" romalign 0x1000 - include "build/baserom/object_mjin_oka.o" + include "build/assets/objects/object_mjin_oka/object_mjin_oka.o" + number 6 endseg beginseg name "object_haka_objects" romalign 0x1000 - include "build/baserom/object_haka_objects.o" + include "build/assets/objects/object_haka_objects/object_haka_objects.o" + number 6 endseg beginseg @@ -4081,7 +4134,8 @@ endseg beginseg name "object_ice_objects" romalign 0x1000 - include "build/baserom/object_ice_objects.o" + include "build/assets/objects/object_ice_objects/object_ice_objects.o" + number 6 endseg beginseg @@ -4093,19 +4147,22 @@ endseg beginseg name "object_mori_hineri1a" romalign 0x1000 - include "build/baserom/object_mori_hineri1a.o" + include "build/assets/objects/object_mori_hineri1a/object_mori_hineri1a.o" + number 6 endseg beginseg name "object_mori_hineri2" romalign 0x1000 - include "build/baserom/object_mori_hineri2.o" + include "build/assets/objects/object_mori_hineri2/object_mori_hineri2.o" + number 6 endseg beginseg name "object_mori_hineri2a" romalign 0x1000 - include "build/baserom/object_mori_hineri2a.o" + include "build/assets/objects/object_mori_hineri2a/object_mori_hineri2a.o" + number 6 endseg beginseg @@ -4117,7 +4174,8 @@ endseg beginseg name "object_mori_tex" romalign 0x1000 - include "build/baserom/object_mori_tex.o" + include "build/assets/objects/object_mori_tex/object_mori_tex.o" + number 6 endseg beginseg @@ -4129,7 +4187,8 @@ endseg beginseg name "object_warp2" romalign 0x1000 - include "build/baserom/object_warp2.o" + include "build/assets/objects/object_warp2/object_warp2.o" + number 6 endseg beginseg @@ -4141,19 +4200,22 @@ endseg beginseg name "object_bird" romalign 0x1000 - include "build/baserom/object_bird.o" + include "build/assets/objects/object_bird/object_bird.o" + number 6 endseg beginseg name "object_wood02" romalign 0x1000 - include "build/baserom/object_wood02.o" + include "build/assets/objects/object_wood02/object_wood02.o" + number 6 endseg beginseg name "object_lightbox" romalign 0x1000 - include "build/baserom/object_lightbox.o" + include "build/assets/objects/object_lightbox/object_lightbox.o" + number 6 endseg beginseg @@ -4179,13 +4241,15 @@ endseg beginseg name "object_im" romalign 0x1000 - include "build/baserom/object_im.o" + include "build/assets/objects/object_im/object_im.o" + number 6 endseg beginseg name "object_ta" romalign 0x1000 - include "build/baserom/object_ta.o" + include "build/assets/objects/object_ta/object_ta.o" + number 6 endseg beginseg @@ -4237,7 +4301,8 @@ endseg beginseg name "object_efc_flash" romalign 0x1000 - include "build/baserom/object_efc_flash.o" + include "build/assets/objects/object_efc_flash/object_efc_flash.o" + number 6 endseg beginseg @@ -4250,7 +4315,8 @@ endseg beginseg name "object_efc_star_field" romalign 0x1000 - include "build/baserom/object_efc_star_field.o" + include "build/assets/objects/object_efc_star_field/object_efc_star_field.o" + number 6 endseg beginseg @@ -4277,7 +4343,8 @@ endseg beginseg name "object_medal" romalign 0x1000 - include "build/baserom/object_medal.o" + include "build/assets/objects/object_medal/object_medal.o" + number 6 endseg beginseg @@ -4295,7 +4362,8 @@ endseg beginseg name "object_rd" romalign 0x1000 - include "build/baserom/object_rd.o" + include "build/assets/objects/object_rd/object_rd.o" + number 6 endseg beginseg @@ -4314,7 +4382,8 @@ endseg beginseg name "object_gndd" romalign 0x1000 - include "build/baserom/object_gndd.o" + include "build/assets/objects/object_gndd/object_gndd.o" + number 6 endseg beginseg @@ -4347,7 +4416,8 @@ endseg beginseg name "object_spot02_objects" romalign 0x1000 - include "build/baserom/object_spot02_objects.o" + include "build/assets/objects/object_spot02_objects/object_spot02_objects.o" + number 6 endseg beginseg @@ -4359,7 +4429,8 @@ endseg beginseg name "object_ru1" romalign 0x1000 - include "build/baserom/object_ru1.o" + include "build/assets/objects/object_ru1/object_ru1.o" + number 6 endseg beginseg @@ -4379,13 +4450,15 @@ endseg beginseg name "object_dh" romalign 0x1000 - include "build/baserom/object_dh.o" + include "build/assets/objects/object_dh/object_dh.o" + number 6 endseg beginseg name "object_rl" romalign 0x1000 - include "build/baserom/object_rl.o" + include "build/assets/objects/object_rl/object_rl.o" + number 6 endseg beginseg @@ -4398,7 +4471,8 @@ endseg beginseg name "object_demo_tre_lgt" romalign 0x1000 - include "build/baserom/object_demo_tre_lgt.o" + include "build/assets/objects/object_demo_tre_lgt/object_demo_tre_lgt.o" + number 6 endseg beginseg @@ -4418,7 +4492,8 @@ endseg beginseg name "object_brob" romalign 0x1000 - include "build/baserom/object_brob.o" + include "build/assets/objects/object_brob/object_brob.o" + number 6 endseg beginseg @@ -4444,7 +4519,8 @@ endseg beginseg name "object_bdoor" romalign 0x1000 - include "build/baserom/object_bdoor.o" + include "build/assets/objects/object_bdoor/object_bdoor.o" + number 6 endseg beginseg @@ -4457,7 +4533,8 @@ endseg beginseg name "object_shop_dungen" romalign 0x1000 - include "build/baserom/object_shop_dungen.o" + include "build/assets/objects/object_shop_dungen/object_shop_dungen.o" + number 6 endseg beginseg @@ -4476,7 +4553,8 @@ endseg beginseg name "object_sb" romalign 0x1000 - include "build/baserom/object_sb.o" + include "build/assets/objects/object_sb/object_sb.o" + number 6 endseg beginseg @@ -4551,13 +4629,15 @@ endseg beginseg name "object_in" romalign 0x1000 - include "build/baserom/object_in.o" + include "build/assets/objects/object_in/object_in.o" + number 6 endseg beginseg name "object_tr" romalign 0x1000 - include "build/baserom/object_tr.o" + include "build/assets/objects/object_tr/object_tr.o" + number 6 endseg beginseg @@ -4569,13 +4649,15 @@ endseg beginseg name "object_oE1s" romalign 0x1000 - include "build/baserom/object_oE1s.o" + include "build/assets/objects/object_oE1s/object_oE1s.o" + number 6 endseg beginseg name "object_oE4s" romalign 0x1000 - include "build/baserom/object_oE4s.o" + include "build/assets/objects/object_oE4s/object_oE4s.o" + number 6 endseg beginseg @@ -4627,7 +4709,8 @@ endseg beginseg name "object_dekujr" romalign 0x1000 - include "build/baserom/object_dekujr.o" + include "build/assets/objects/object_dekujr/object_dekujr.o" + number 6 endseg beginseg @@ -4647,13 +4730,15 @@ endseg beginseg name "object_oF1s" romalign 0x1000 - include "build/baserom/object_oF1s.o" + include "build/assets/objects/object_oF1s/object_oF1s.o" + number 6 endseg beginseg name "object_ma2" romalign 0x1000 - include "build/baserom/object_ma2.o" + include "build/assets/objects/object_ma2/object_ma2.o" + number 6 endseg beginseg @@ -4685,7 +4770,8 @@ endseg beginseg name "object_bxa" romalign 0x1000 - include "build/baserom/object_bxa.o" + include "build/assets/objects/object_bxa/object_bxa.o" + number 6 endseg beginseg @@ -4761,13 +4847,15 @@ endseg beginseg name "object_ma1" romalign 0x1000 - include "build/baserom/object_ma1.o" + include "build/assets/objects/object_ma1/object_ma1.o" + number 6 endseg beginseg name "object_ganon" romalign 0x1000 - include "build/baserom/object_ganon.o" + include "build/assets/objects/object_ganon/object_ganon.o" + number 6 endseg beginseg @@ -4787,7 +4875,8 @@ endseg beginseg name "object_fr" romalign 0x1000 - include "build/baserom/object_fr.o" + include "build/assets/objects/object_fr/object_fr.o" + number 6 endseg beginseg @@ -4834,7 +4923,8 @@ endseg beginseg name "object_demo_6k" romalign 0x1000 - include "build/baserom/object_demo_6k.o" + include "build/assets/objects/object_demo_6k/object_demo_6k.o" + number 6 endseg beginseg @@ -4933,7 +5023,8 @@ endseg beginseg name "object_kw1" romalign 0x1000 - include "build/baserom/object_kw1.o" + include "build/assets/objects/object_kw1/object_kw1.o" + number 6 endseg beginseg @@ -4958,7 +5049,8 @@ endseg beginseg name "object_masterkokiri" romalign 0x1000 - include "build/baserom/object_masterkokiri.o" + include "build/assets/objects/object_masterkokiri/object_masterkokiri.o" + number 6 endseg beginseg @@ -4994,13 +5086,15 @@ endseg beginseg name "object_ahg" romalign 0x1000 - include "build/baserom/object_ahg.o" + include "build/assets/objects/object_ahg/object_ahg.o" + number 6 endseg beginseg name "object_cne" romalign 0x1000 - include "build/baserom/object_cne.o" + include "build/assets/objects/object_cne/object_cne.o" + number 6 endseg beginseg @@ -5027,13 +5121,15 @@ endseg beginseg name "object_bji" romalign 0x1000 - include "build/baserom/object_bji.o" + include "build/assets/objects/object_bji/object_bji.o" + number 6 endseg beginseg name "object_bba" romalign 0x1000 - include "build/baserom/object_bba.o" + include "build/assets/objects/object_bba/object_bba.o" + number 6 endseg beginseg @@ -5058,19 +5154,22 @@ endseg beginseg name "object_boj" romalign 0x1000 - include "build/baserom/object_boj.o" + include "build/assets/objects/object_boj/object_boj.o" + number 6 endseg beginseg name "object_spot03_object" romalign 0x1000 - include "build/baserom/object_spot03_object.o" + include "build/assets/objects/object_spot03_object/object_spot03_object.o" + number 6 endseg beginseg name "object_spot07_object" romalign 0x1000 - include "build/baserom/object_spot07_object.o" + include "build/assets/objects/object_spot07_object/object_spot07_object.o" + number 6 endseg beginseg @@ -5082,7 +5181,8 @@ endseg beginseg name "object_bob" romalign 0x1000 - include "build/baserom/object_bob.o" + include "build/assets/objects/object_bob/object_bob.o" + number 6 endseg beginseg @@ -5095,7 +5195,8 @@ endseg beginseg name "object_yabusame_point" romalign 0x1000 - include "build/baserom/object_yabusame_point.o" + include "build/assets/objects/object_yabusame_point/object_yabusame_point.o" + number 6 endseg beginseg @@ -5115,13 +5216,15 @@ endseg beginseg name "object_gnd_magic" romalign 0x1000 - include "build/baserom/object_gnd_magic.o" + include "build/assets/objects/object_gnd_magic/object_gnd_magic.o" + number 6 endseg beginseg name "object_d_elevator" romalign 0x1000 - include "build/baserom/object_d_elevator.o" + include "build/assets/objects/object_d_elevator/object_d_elevator.o" + number 6 endseg beginseg @@ -5151,13 +5254,15 @@ endseg beginseg name "object_toryo" romalign 0x1000 - include "build/baserom/object_toryo.o" + include "build/assets/objects/object_toryo/object_toryo.o" + number 6 endseg beginseg name "object_daiku" romalign 0x1000 - include "build/baserom/object_daiku.o" + include "build/assets/objects/object_daiku/object_daiku.o" + number 6 endseg beginseg @@ -5176,7 +5281,8 @@ endseg beginseg name "object_gm" romalign 0x1000 - include "build/baserom/object_gm.o" + include "build/assets/objects/object_gm/object_gm.o" + number 6 endseg beginseg @@ -5188,7 +5294,8 @@ endseg beginseg name "object_hs" romalign 0x1000 - include "build/baserom/object_hs.o" + include "build/assets/objects/object_hs/object_hs.o" + number 6 endseg beginseg @@ -5200,19 +5307,22 @@ endseg beginseg name "object_lightswitch" romalign 0x1000 - include "build/baserom/object_lightswitch.o" + include "build/assets/objects/object_lightswitch/object_lightswitch.o" + number 6 endseg beginseg name "object_kusa" romalign 0x1000 - include "build/baserom/object_kusa.o" + include "build/assets/objects/object_kusa/object_kusa.o" + number 6 endseg beginseg name "object_tsubo" romalign 0x1000 - include "build/baserom/object_tsubo.o" + include "build/assets/objects/object_tsubo/object_tsubo.o" + number 6 endseg beginseg @@ -5232,7 +5342,8 @@ endseg beginseg name "object_kanban" romalign 0x1000 - include "build/baserom/object_kanban.o" + include "build/assets/objects/object_kanban/object_kanban.o" + number 6 endseg beginseg @@ -5250,13 +5361,15 @@ endseg beginseg name "object_mk" romalign 0x1000 - include "build/baserom/object_mk.o" + include "build/assets/objects/object_mk/object_mk.o" + number 6 endseg beginseg name "object_fu" romalign 0x1000 - include "build/baserom/object_fu.o" + include "build/assets/objects/object_fu/object_fu.o" + number 6 endseg beginseg @@ -5297,19 +5410,22 @@ endseg beginseg name "object_ganon_objects" romalign 0x1000 - include "build/baserom/object_ganon_objects.o" + include "build/assets/objects/object_ganon_objects/object_ganon_objects.o" + number 6 endseg beginseg name "object_siofuki" romalign 0x1000 - include "build/baserom/object_siofuki.o" + include "build/assets/objects/object_siofuki/object_siofuki.o" + number 6 endseg beginseg name "object_stream" romalign 0x1000 - include "build/baserom/object_stream.o" + include "build/assets/objects/object_stream/object_stream.o" + number 6 endseg beginseg @@ -5322,13 +5438,15 @@ endseg beginseg name "object_fa" romalign 0x1000 - include "build/baserom/object_fa.o" + include "build/assets/objects/object_fa/object_fa.o" + number 6 endseg beginseg name "object_os" romalign 0x1000 - include "build/baserom/object_os.o" + include "build/assets/objects/object_os/object_os.o" + number 6 endseg beginseg @@ -5427,7 +5545,8 @@ endseg beginseg name "object_efc_erupc" romalign 0x1000 - include "build/baserom/object_efc_erupc.o" + include "build/assets/objects/object_efc_erupc/object_efc_erupc.o" + number 6 endseg beginseg @@ -5468,19 +5587,22 @@ endseg beginseg name "object_ganon2" romalign 0x1000 - include "build/baserom/object_ganon2.o" + include "build/assets/objects/object_ganon2/object_ganon2.o" + number 6 endseg beginseg name "object_ka" romalign 0x1000 - include "build/baserom/object_ka.o" + include "build/assets/objects/object_ka/object_ka.o" + number 6 endseg beginseg name "object_ts" romalign 0x1000 - include "build/baserom/object_ts.o" + include "build/assets/objects/object_ts/object_ts.o" + number 6 endseg beginseg @@ -5506,7 +5628,8 @@ endseg beginseg name "object_ds2" romalign 0x1000 - include "build/baserom/object_ds2.o" + include "build/assets/objects/object_ds2/object_ds2.o" + number 6 endseg beginseg @@ -5518,7 +5641,8 @@ endseg beginseg name "object_fish" romalign 0x1000 - include "build/baserom/object_fish.o" + include "build/assets/objects/object_fish/object_fish.o" + number 6 endseg beginseg @@ -5538,13 +5662,15 @@ endseg beginseg name "object_ssh" romalign 0x1000 - include "build/baserom/object_ssh.o" + include "build/assets/objects/object_ssh/object_ssh.o" + number 6 endseg beginseg name "object_bigokuta" romalign 0x1000 - include "build/baserom/object_bigokuta.o" + include "build/assets/objects/object_bigokuta/object_bigokuta.o" + number 6 endseg beginseg @@ -5557,7 +5683,8 @@ endseg beginseg name "object_spot05_objects" romalign 0x1000 - include "build/baserom/object_spot05_objects.o" + include "build/assets/objects/object_spot05_objects/object_spot05_objects.o" + number 6 endseg beginseg @@ -5569,7 +5696,8 @@ endseg beginseg name "object_bombiwa" romalign 0x1000 - include "build/baserom/object_bombiwa.o" + include "build/assets/objects/object_bombiwa/object_bombiwa.o" + number 6 endseg beginseg @@ -5582,7 +5710,8 @@ endseg beginseg name "object_rs" romalign 0x1000 - include "build/baserom/object_rs.o" + include "build/assets/objects/object_rs/object_rs.o" + number 6 endseg beginseg @@ -5740,19 +5869,22 @@ endseg beginseg name "object_ganon_anime1" romalign 0x1000 - include "build/baserom/object_ganon_anime1.o" + include "build/assets/objects/object_ganon_anime1/object_ganon_anime1.o" + number 6 endseg beginseg name "object_ganon_anime2" romalign 0x1000 - include "build/baserom/object_ganon_anime2.o" + include "build/assets/objects/object_ganon_anime2/object_ganon_anime2.o" + number 6 endseg beginseg name "object_ganon_anime3" romalign 0x1000 - include "build/baserom/object_ganon_anime3.o" + include "build/assets/objects/object_ganon_anime3/object_ganon_anime3.o" + number 6 endseg beginseg @@ -5784,13 +5916,15 @@ endseg beginseg name "object_mu" romalign 0x1000 - include "build/baserom/object_mu.o" + include "build/assets/objects/object_mu/object_mu.o" + number 6 endseg beginseg name "object_wf" romalign 0x1000 - include "build/baserom/object_wf.o" + include "build/assets/objects/object_wf/object_wf.o" + number 6 endseg beginseg @@ -5816,7 +5950,8 @@ endseg beginseg name "object_haka_door" romalign 0x1000 - include "build/baserom/object_haka_door.o" + include "build/assets/objects/object_haka_door/object_haka_door.o" + number 6 endseg beginseg @@ -5835,7 +5970,8 @@ endseg beginseg name "object_bwall" romalign 0x1000 - include "build/baserom/object_bwall.o" + include "build/assets/objects/object_bwall/object_bwall.o" + number 6 endseg beginseg @@ -5854,7 +5990,8 @@ endseg beginseg name "object_cob" romalign 0x1000 - include "build/baserom/object_cob.o" + include "build/assets/objects/object_cob/object_cob.o" + number 6 endseg beginseg @@ -5867,13 +6004,15 @@ endseg beginseg name "object_door_killer" romalign 0x1000 - include "build/baserom/object_door_killer.o" + include "build/assets/objects/object_door_killer/object_door_killer.o" + number 6 endseg beginseg name "object_ouke_haka" romalign 0x1000 - include "build/baserom/object_ouke_haka.o" + include "build/assets/objects/object_ouke_haka/object_ouke_haka.o" + number 6 endseg beginseg diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.c index 0d0ae8d74..c31efd621 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.c @@ -237,10 +237,4 @@ static ColliderJntSphInit sJntSphInit = { static Vec3f sUnkZeroVec = { 0.0f, 0.0f, 0.0f }; -static u64 sLavaFloorLavaTex[] = { -#include "assets/overlays/ovl_Boss_Dodongo/lava_floor_lava.rgb5a1.inc.c" -}; - -static u64 sLavaFloorRockTex[] = { -#include "assets/overlays/ovl_Boss_Dodongo/lava_floor_rock.rgb5a1.inc.c" -}; +#include "overlays/ovl_Boss_Dodongo/ovl_Boss_Dodongo.c"