From 65ce753b8d498a24ff64f0478ac11d97865e8920 Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Tue, 23 Apr 2024 19:09:01 +0100 Subject: [PATCH] Add Geo External Files and Fill in dependencies (#36) --- assets/ymls/jp/actors/breakable_box.yml | 2 +- assets/ymls/jp/actors/mario_cap.yml | 2 +- assets/ymls/jp/actors/spindrift.yml | 30 + assets/ymls/jp/levels/bitfs.yml | 92 +++ assets/ymls/jp/levels/ccm.yml | 628 +++++++++++++++ assets/ymls/jp/levels/ddd.yml | 237 ++++++ assets/ymls/jp/levels/rr.yml | 176 ++++ assets/ymls/jp/levels/ttm.yml | 753 ++++++++++++++++++ assets/ymls/jp/levels/wf.yml | 701 ++++++++++++++++ assets/ymls/us/actors/amp/geo.yml | 2 + assets/ymls/us/actors/bird/geo.yml | 2 + assets/ymls/us/actors/blargg/geo.yml | 2 + .../ymls/us/actors/blue_coin_switch/geo.yml | 2 + assets/ymls/us/actors/blue_fish/geo.yml | 2 + assets/ymls/us/actors/bobomb/geo.yml | 2 + assets/ymls/us/actors/bomb/geo.yml | 2 + assets/ymls/us/actors/boo/geo.yml | 2 + assets/ymls/us/actors/boo_castle/geo.yml | 2 + assets/ymls/us/actors/book/geo.yml | 2 + assets/ymls/us/actors/bookend/geo.yml | 2 + assets/ymls/us/actors/bowling_ball/geo.yml | 2 + assets/ymls/us/actors/bowser/geo.yml | 2 + assets/ymls/us/actors/bowser_flame/geo.yml | 2 + assets/ymls/us/actors/bowser_key/geo.yml | 2 + assets/ymls/us/actors/breakable_box.yml | 2 +- assets/ymls/us/actors/breakable_box/geo.yml | 2 + assets/ymls/us/actors/bub/geo.yml | 2 + assets/ymls/us/actors/bubba/geo.yml | 2 + assets/ymls/us/actors/bubble/geo.yml | 2 + assets/ymls/us/actors/bullet_bill/geo.yml | 2 + assets/ymls/us/actors/bully/geo.yml | 2 + assets/ymls/us/actors/burn_smoke/geo.yml | 2 + assets/ymls/us/actors/butterfly/geo.yml | 2 + assets/ymls/us/actors/cannon_barrel/geo.yml | 2 + assets/ymls/us/actors/cannon_base/geo.yml | 2 + assets/ymls/us/actors/capswitch/geo.yml | 2 + assets/ymls/us/actors/chain_ball/geo.yml | 2 + assets/ymls/us/actors/chain_chomp/geo.yml | 2 + assets/ymls/us/actors/chair/geo.yml | 2 + .../us/actors/checkerboard_platform/geo.yml | 2 + assets/ymls/us/actors/chillychief/geo.yml | 2 + assets/ymls/us/actors/chuckya/geo.yml | 2 + assets/ymls/us/actors/clam_shell/geo.yml | 2 + assets/ymls/us/actors/door/geo.yml | 2 + assets/ymls/us/actors/dorrie/geo.yml | 2 + assets/ymls/us/actors/exclamation_box/geo.yml | 2 + .../us/actors/exclamation_box_outline/geo.yml | 2 + assets/ymls/us/actors/explosion/geo.yml | 2 + assets/ymls/us/actors/eyerok/geo.yml | 2 + assets/ymls/us/actors/flame/geo.yml | 2 + assets/ymls/us/actors/flyguy/geo.yml | 2 + assets/ymls/us/actors/fwoosh/geo.yml | 2 + assets/ymls/us/actors/goomba/geo.yml | 2 + assets/ymls/us/actors/haunted_cage/geo.yml | 2 + assets/ymls/us/actors/heart/geo.yml | 2 + assets/ymls/us/actors/heave_ho/geo.yml | 2 + assets/ymls/us/actors/hoot/geo.yml | 2 + assets/ymls/us/actors/impact_ring/geo.yml | 2 + assets/ymls/us/actors/impact_smoke.yml | 20 +- assets/ymls/us/actors/impact_smoke/geo.yml | 2 + assets/ymls/us/actors/king_bobomb/geo.yml | 2 + assets/ymls/us/actors/klepto/geo.yml | 5 + assets/ymls/us/actors/koopa/geo.yml | 2 + assets/ymls/us/actors/koopa_flag/geo.yml | 2 + assets/ymls/us/actors/koopa_shell/geo.yml | 2 + .../ymls/us/actors/lakitu_cameraman/geo.yml | 2 + assets/ymls/us/actors/lakitu_enemy/geo.yml | 2 + assets/ymls/us/actors/leaves/geo.yml | 2 + assets/ymls/us/actors/mad_piano/geo.yml | 2 + assets/ymls/us/actors/manta/geo.yml | 2 + assets/ymls/us/actors/mario/geo.yml | 2 + assets/ymls/us/actors/mario_cap.yml | 2 +- assets/ymls/us/actors/mario_cap/geo.yml | 2 + assets/ymls/us/actors/metal_box/geo.yml | 2 + assets/ymls/us/actors/mips/geo.yml | 2 + assets/ymls/us/actors/mist/geo.yml | 2 + assets/ymls/us/actors/moneybag/geo.yml | 2 + assets/ymls/us/actors/monty_mole/geo.yml | 2 + assets/ymls/us/actors/mr_i_eyeball/geo.yml | 2 + assets/ymls/us/actors/mr_i_iris/geo.yml | 2 + assets/ymls/us/actors/mushroom_1up/geo.yml | 2 + assets/ymls/us/actors/number/geo.yml | 12 +- assets/ymls/us/actors/peach/geo.yml | 2 + assets/ymls/us/actors/penguin/geo.yml | 2 + assets/ymls/us/actors/piranha_plant/geo.yml | 2 + assets/ymls/us/actors/pokey/geo.yml | 2 + assets/ymls/us/actors/poundable_pole/geo.yml | 2 + assets/ymls/us/actors/purple_switch/geo.yml | 2 + assets/ymls/us/actors/scuttlebug/geo.yml | 2 + assets/ymls/us/actors/seaweed/geo.yml | 2 + assets/ymls/us/actors/skeeter/geo.yml | 2 + assets/ymls/us/actors/small_key/geo.yml | 2 + assets/ymls/us/actors/snowman/geo.yml | 3 + assets/ymls/us/actors/snufit/geo.yml | 2 + assets/ymls/us/actors/sparkle/geo.yml | 2 + .../ymls/us/actors/sparkle_animation/geo.yml | 2 + assets/ymls/us/actors/spindrift.yml | 30 + assets/ymls/us/actors/spindrift/geo.yml | 2 + assets/ymls/us/actors/spiny/geo.yml | 2 + assets/ymls/us/actors/spiny_egg/geo.yml | 2 + assets/ymls/us/actors/springboard/geo.yml | 2 + assets/ymls/us/actors/star/geo.yml | 2 + assets/ymls/us/actors/stomp_smoke/geo.yml | 2 + assets/ymls/us/actors/sushi/geo.yml | 2 + assets/ymls/us/actors/swoop/geo.yml | 2 + assets/ymls/us/actors/test_platform/geo.yml | 2 + assets/ymls/us/actors/thwomp/geo.yml | 2 + assets/ymls/us/actors/toad/geo.yml | 2 + assets/ymls/us/actors/tornado/geo.yml | 2 + .../ymls/us/actors/transparent_star/geo.yml | 2 + assets/ymls/us/actors/treasure_chest/geo.yml | 2 + assets/ymls/us/actors/tree/geo.yml | 2 + assets/ymls/us/actors/ukiki/geo.yml | 3 + assets/ymls/us/actors/unagi/geo.yml | 2 + assets/ymls/us/actors/walk_smoke/geo.yml | 2 + assets/ymls/us/actors/warp_pipe/geo.yml | 2 + assets/ymls/us/actors/water_bubble/geo.yml | 2 + assets/ymls/us/actors/water_mine/geo.yml | 2 + assets/ymls/us/actors/water_ring/geo.yml | 2 + assets/ymls/us/actors/water_splash/geo.yml | 2 + assets/ymls/us/actors/water_wave/geo.yml | 2 + assets/ymls/us/actors/white_particle/geo.yml | 2 + assets/ymls/us/actors/whomp/geo.yml | 2 + assets/ymls/us/actors/wiggler_body.yml | 4 + assets/ymls/us/actors/wiggler_body/geo.yml | 13 - assets/ymls/us/actors/wiggler_head/geo.yml | 3 + assets/ymls/us/actors/wooden_signpost/geo.yml | 2 + assets/ymls/us/actors/yellow_sphere/geo.yml | 2 + .../us/actors/yellow_sphere_small/geo.yml | 2 + assets/ymls/us/actors/yoshi.yml | 222 +++--- assets/ymls/us/actors/yoshi/geo.yml | 2 + assets/ymls/us/actors/yoshi_egg/geo.yml | 2 + assets/ymls/us/levels/bbh/geo.yml | 2 + assets/ymls/us/levels/bitdw/geo.yml | 2 + assets/ymls/us/levels/bitfs.yml | 92 +++ assets/ymls/us/levels/bitfs/geo.yml | 2 + assets/ymls/us/levels/bits/geo.yml | 2 + assets/ymls/us/levels/bob/geo.yml | 2 + assets/ymls/us/levels/bowser_1/geo.yml | 2 + assets/ymls/us/levels/bowser_2/geo.yml | 2 + assets/ymls/us/levels/bowser_3/geo.yml | 2 + .../ymls/us/levels/castle_courtyard/geo.yml | 2 + assets/ymls/us/levels/castle_grounds/geo.yml | 2 + assets/ymls/us/levels/castle_inside/geo.yml | 2 + assets/ymls/us/levels/ccm.yml | 628 +++++++++++++++ assets/ymls/us/levels/ccm/geo.yml | 2 + assets/ymls/us/levels/cotmc/geo.yml | 2 + assets/ymls/us/levels/ddd.yml | 253 ++++++ assets/ymls/us/levels/ddd/geo.yml | 2 + assets/ymls/us/levels/ending/geo.yml | 2 + assets/ymls/us/levels/hmc/geo.yml | 2 + assets/ymls/us/levels/intro/geo.yml | 12 +- assets/ymls/us/levels/jrb/geo.yml | 2 + assets/ymls/us/levels/lll/geo.yml | 2 + assets/ymls/us/levels/menu/geo.yml | 100 +-- assets/ymls/us/levels/pss/geo.yml | 2 + assets/ymls/us/levels/rr.yml | 178 +++++ assets/ymls/us/levels/rr/geo.yml | 2 + assets/ymls/us/levels/sa/geo.yml | 2 + assets/ymls/us/levels/sl/geo.yml | 2 + assets/ymls/us/levels/ssl/geo.yml | 2 + assets/ymls/us/levels/thi/geo.yml | 2 + assets/ymls/us/levels/totwc/geo.yml | 2 + assets/ymls/us/levels/ttc/geo.yml | 2 + assets/ymls/us/levels/ttm.yml | 753 ++++++++++++++++++ assets/ymls/us/levels/ttm/geo.yml | 2 + assets/ymls/us/levels/vcutm/geo.yml | 2 + assets/ymls/us/levels/wdw/geo.yml | 2 + assets/ymls/us/levels/wf.yml | 717 +++++++++++++++++ assets/ymls/us/levels/wf/geo.yml | 2 + assets/ymls/us/levels/wmotr/geo.yml | 2 + 171 files changed, 5765 insertions(+), 192 deletions(-) delete mode 100644 assets/ymls/us/actors/wiggler_body/geo.yml diff --git a/assets/ymls/jp/actors/breakable_box.yml b/assets/ymls/jp/actors/breakable_box.yml index 25669131..9dcf96a0 100644 --- a/assets/ymls/jp/actors/breakable_box.yml +++ b/assets/ymls/jp/actors/breakable_box.yml @@ -57,6 +57,6 @@ breakable_box_seg8_dl_08012D20: breakable_box_seg8_dl_08012D48: type: GFX - offset: 0x12D20 + offset: 0x12D48 symbol: breakable_box_seg8_dl_08012D48 diff --git a/assets/ymls/jp/actors/mario_cap.yml b/assets/ymls/jp/actors/mario_cap.yml index 35dd2c07..48567b5c 100644 --- a/assets/ymls/jp/actors/mario_cap.yml +++ b/assets/ymls/jp/actors/mario_cap.yml @@ -3,7 +3,7 @@ compression: offset: 0x112B50 segments: - - [0x04, 0x112B50] + - [0x03, 0x112B50] mario_cap_logo: type: TEXTURE diff --git a/assets/ymls/jp/actors/spindrift.yml b/assets/ymls/jp/actors/spindrift.yml index bd340ff3..8b1ee09f 100644 --- a/assets/ymls/jp/actors/spindrift.yml +++ b/assets/ymls/jp/actors/spindrift.yml @@ -120,3 +120,33 @@ spindrift_seg5_dl_05000328: offset: 0x328 symbol: spindrift_seg5_dl_05000328 +spindrift_seg5_dl_05002748: + type: GFX + offset: 0x2748 + symbol: spindrift_seg5_dl_05002748 + +spindrift_seg5_dl_05002830: + type: GFX + offset: 0x2830 + symbol: spindrift_seg5_dl_05002830 + +spindrift_seg5_dl_05002900: + type: GFX + offset: 0x2900 + symbol: spindrift_seg5_dl_05002900 + +spindrift_seg5_dl_05002A20: + type: GFX + offset: 0x2A20 + symbol: spindrift_seg5_dl_05002A20 + +spindrift_seg5_dl_05002B30: + type: GFX + offset: 0x2B30 + symbol: spindrift_seg5_dl_05002B30 + +spindrift_seg5_dl_05002D08: + type: GFX + offset: 0x2D08 + symbol: spindrift_seg5_dl_05002D08 + diff --git a/assets/ymls/jp/levels/bitfs.yml b/assets/ymls/jp/levels/bitfs.yml index 12ebf93a..46610762 100644 --- a/assets/ymls/jp/levels/bitfs.yml +++ b/assets/ymls/jp/levels/bitfs.yml @@ -1748,3 +1748,95 @@ bitfs_seg7_dl_0700F508: offset: 0xF508 symbol: bitfs_seg7_dl_0700F508 +bitfs_seg7_vertex_070103B0: + type: VTX + count: 15 + offset: 0x103B0 + symbol: bitfs_seg7_vertex_070103B0 + +bitfs_seg7_vertex_070104A0: + type: VTX + count: 15 + offset: 0x104A0 + symbol: bitfs_seg7_vertex_070104A0 + +bitfs_seg7_vertex_07010590: + type: VTX + count: 15 + offset: 0x10590 + symbol: bitfs_seg7_vertex_07010590 + +bitfs_seg7_vertex_07010680: + type: VTX + count: 15 + offset: 0x10680 + symbol: bitfs_seg7_vertex_07010680 + +bitfs_seg7_vertex_07010770: + type: VTX + count: 14 + offset: 0x10770 + symbol: bitfs_seg7_vertex_07010770 + +bitfs_seg7_vertex_07010850: + type: VTX + count: 15 + offset: 0x10850 + symbol: bitfs_seg7_vertex_07010850 + +bitfs_seg7_vertex_07010940: + type: VTX + count: 16 + offset: 0x10940 + symbol: bitfs_seg7_vertex_07010940 + +bitfs_seg7_vertex_07010A40: + type: VTX + count: 15 + offset: 0x10A40 + symbol: bitfs_seg7_vertex_07010A40 + +bitfs_seg7_vertex_07010B30: + type: VTX + count: 16 + offset: 0x10B30 + symbol: bitfs_seg7_vertex_07010B30 + +bitfs_seg7_vertex_07010C30: + type: VTX + count: 15 + offset: 0x10C30 + symbol: bitfs_seg7_vertex_07010C30 + +bitfs_seg7_vertex_07010D20: + type: VTX + count: 16 + offset: 0x10D20 + symbol: bitfs_seg7_vertex_07010D20 + +bitfs_seg7_dl_07010E20: + type: GFX + offset: 0x10E20 + symbol: bitfs_seg7_dl_07010E20 + +bitfs_seg7_dl_07011138: + type: GFX + offset: 0x11138 + symbol: bitfs_seg7_dl_07011138 + +bitfs_seg7_vertex_070101D8: + type: VTX + count: 16 + offset: 0x101D8 + symbol: bitfs_seg7_vertex_070101D8 + +bitfs_seg7_dl_070102D8: + type: GFX + offset: 0x102D8 + symbol: bitfs_seg7_dl_070102D8 + +bitfs_seg7_dl_07010340: + type: GFX + offset: 0x10340 + symbol: bitfs_seg7_dl_07010340 + diff --git a/assets/ymls/jp/levels/ccm.yml b/assets/ymls/jp/levels/ccm.yml index 4aea66cb..3e5f3bdd 100644 --- a/assets/ymls/jp/levels/ccm.yml +++ b/assets/ymls/jp/levels/ccm.yml @@ -2038,3 +2038,631 @@ ccm_seg7_dl_07012BD8: offset: 0x12BD8 symbol: ccm_seg7_dl_07012BD8 +ccm_seg7_vertex_0700F4C0: + type: VTX + count: 4 + offset: 0xF4C0 + symbol: ccm_seg7_vertex_0700F4C0 + +ccm_seg7_vertex_0700F500: + type: VTX + count: 12 + offset: 0xF500 + symbol: ccm_seg7_vertex_0700F500 + +ccm_seg7_dl_0700F5C0: + type: GFX + offset: 0xF5C0 + symbol: ccm_seg7_dl_0700F5C0 + +ccm_seg7_dl_0700F5F8: + type: GFX + offset: 0xF5F8 + symbol: ccm_seg7_dl_0700F5F8 + +ccm_seg7_dl_0700F650: + type: GFX + offset: 0xF650 + symbol: ccm_seg7_dl_0700F650 + +ccm_seg7_lights_0700EA00: + type: LIGHTS + size: 24 + offset: 0xEA00 + symbol: ccm_seg7_lights_0700EA00 + +ccm_seg7_lights_0700EA18: + type: LIGHTS + size: 24 + offset: 0xEA18 + symbol: ccm_seg7_lights_0700EA18 + +ccm_seg7_lights_0700EA30: + type: LIGHTS + size: 24 + offset: 0xEA30 + symbol: ccm_seg7_lights_0700EA30 + +ccm_seg7_vertex_0700EA48: + type: VTX + count: 10 + offset: 0xEA48 + symbol: ccm_seg7_vertex_0700EA48 + +ccm_seg7_vertex_0700EAE8: + type: VTX + count: 15 + offset: 0xEAE8 + symbol: ccm_seg7_vertex_0700EAE8 + +ccm_seg7_vertex_0700EBD8: + type: VTX + count: 14 + offset: 0xEBD8 + symbol: ccm_seg7_vertex_0700EBD8 + +ccm_seg7_vertex_0700ECB8: + type: VTX + count: 14 + offset: 0xECB8 + symbol: ccm_seg7_vertex_0700ECB8 + +ccm_seg7_vertex_0700ED98: + type: VTX + count: 10 + offset: 0xED98 + symbol: ccm_seg7_vertex_0700ED98 + +ccm_seg7_vertex_0700EE38: + type: VTX + count: 16 + offset: 0xEE38 + symbol: ccm_seg7_vertex_0700EE38 + +ccm_seg7_vertex_0700EF38: + type: VTX + count: 6 + offset: 0xEF38 + symbol: ccm_seg7_vertex_0700EF38 + +ccm_seg7_vertex_0700EF98: + type: VTX + count: 12 + offset: 0xEF98 + symbol: ccm_seg7_vertex_0700EF98 + +ccm_seg7_vertex_0700F058: + type: VTX + count: 15 + offset: 0xF058 + symbol: ccm_seg7_vertex_0700F058 + +ccm_seg7_vertex_0700F148: + type: VTX + count: 7 + offset: 0xF148 + symbol: ccm_seg7_vertex_0700F148 + +ccm_seg7_dl_0700F1B8: + type: GFX + offset: 0xF1B8 + symbol: ccm_seg7_dl_0700F1B8 + +ccm_seg7_dl_0700F210: + type: GFX + offset: 0xF210 + symbol: ccm_seg7_dl_0700F210 + +ccm_seg7_dl_0700F3B0: + type: GFX + offset: 0xF3B0 + symbol: ccm_seg7_dl_0700F3B0 + +ccm_seg7_dl_0700F440: + type: GFX + offset: 0xF440 + symbol: ccm_seg7_dl_0700F440 + +ccm_seg7_vertex_0700E790: + type: VTX + count: 12 + offset: 0xE790 + symbol: ccm_seg7_vertex_0700E790 + +ccm_seg7_vertex_0700E850: + type: VTX + count: 8 + offset: 0xE850 + symbol: ccm_seg7_vertex_0700E850 + +ccm_seg7_dl_0700E8D0: + type: GFX + offset: 0xE8D0 + symbol: ccm_seg7_dl_0700E8D0 + +ccm_seg7_dl_0700E928: + type: GFX + offset: 0xE928 + symbol: ccm_seg7_dl_0700E928 + +ccm_seg7_dl_0700E970: + type: GFX + offset: 0xE970 + symbol: ccm_seg7_dl_0700E970 + +ccm_seg7_lights_0700DE68: + type: LIGHTS + size: 24 + offset: 0xDE68 + symbol: ccm_seg7_lights_0700DE68 + +ccm_seg7_lights_0700DE80: + type: LIGHTS + size: 24 + offset: 0xDE80 + symbol: ccm_seg7_lights_0700DE80 + +ccm_seg7_lights_0700DE98: + type: LIGHTS + size: 24 + offset: 0xDE98 + symbol: ccm_seg7_lights_0700DE98 + +ccm_seg7_lights_0700DEB0: + type: LIGHTS + size: 24 + offset: 0xDEB0 + symbol: ccm_seg7_lights_0700DEB0 + +ccm_seg7_vertex_0700DEC8: + type: VTX + count: 12 + offset: 0xDEC8 + symbol: ccm_seg7_vertex_0700DEC8 + +ccm_seg7_vertex_0700DF88: + type: VTX + count: 14 + offset: 0xDF88 + symbol: ccm_seg7_vertex_0700DF88 + +ccm_seg7_vertex_0700E068: + type: VTX + count: 16 + offset: 0xE068 + symbol: ccm_seg7_vertex_0700E068 + +ccm_seg7_vertex_0700E168: + type: VTX + count: 16 + offset: 0xE168 + symbol: ccm_seg7_vertex_0700E168 + +ccm_seg7_vertex_0700E268: + type: VTX + count: 6 + offset: 0xE268 + symbol: ccm_seg7_vertex_0700E268 + +ccm_seg7_vertex_0700E2C8: + type: VTX + count: 14 + offset: 0xE2C8 + symbol: ccm_seg7_vertex_0700E2C8 + +ccm_seg7_vertex_0700E3A8: + type: VTX + count: 8 + offset: 0xE3A8 + symbol: ccm_seg7_vertex_0700E3A8 + +ccm_seg7_vertex_0700E428: + type: VTX + count: 4 + offset: 0xE428 + symbol: ccm_seg7_vertex_0700E428 + +ccm_seg7_vertex_0700E468: + type: VTX + count: 4 + offset: 0xE468 + symbol: ccm_seg7_vertex_0700E468 + +ccm_seg7_dl_0700E4A8: + type: GFX + offset: 0xE4A8 + symbol: ccm_seg7_dl_0700E4A8 + +ccm_seg7_dl_0700E530: + type: GFX + offset: 0xE530 + symbol: ccm_seg7_dl_0700E530 + +ccm_seg7_dl_0700E668: + type: GFX + offset: 0xE668 + symbol: ccm_seg7_dl_0700E668 + +ccm_seg7_dl_0700E6C0: + type: GFX + offset: 0xE6C0 + symbol: ccm_seg7_dl_0700E6C0 + +ccm_seg7_dl_0700E708: + type: GFX + offset: 0xE708 + symbol: ccm_seg7_dl_0700E708 + +ccm_seg7_vertex_070106D8: + type: VTX + count: 8 + offset: 0x106D8 + symbol: ccm_seg7_vertex_070106D8 + +ccm_seg7_vertex_07010758: + type: VTX + count: 15 + offset: 0x10758 + symbol: ccm_seg7_vertex_07010758 + +ccm_seg7_vertex_07010848: + type: VTX + count: 11 + offset: 0x10848 + symbol: ccm_seg7_vertex_07010848 + +ccm_seg7_dl_070108F8: + type: GFX + offset: 0x108F8 + symbol: ccm_seg7_dl_070108F8 + +ccm_seg7_dl_07010940: + type: GFX + offset: 0x10940 + symbol: ccm_seg7_dl_07010940 + +ccm_seg7_dl_070109D0: + type: GFX + offset: 0x109D0 + symbol: ccm_seg7_dl_070109D0 + +ccm_seg7_lights_0700FD88: + type: LIGHTS + size: 24 + offset: 0xFD88 + symbol: ccm_seg7_lights_0700FD88 + +ccm_seg7_lights_0700FDA0: + type: LIGHTS + size: 24 + offset: 0xFDA0 + symbol: ccm_seg7_lights_0700FDA0 + +ccm_seg7_lights_0700FDB8: + type: LIGHTS + size: 24 + offset: 0xFDB8 + symbol: ccm_seg7_lights_0700FDB8 + +ccm_seg7_vertex_0700FDD0: + type: VTX + count: 4 + offset: 0xFDD0 + symbol: ccm_seg7_vertex_0700FDD0 + +ccm_seg7_vertex_0700FE10: + type: VTX + count: 14 + offset: 0xFE10 + symbol: ccm_seg7_vertex_0700FE10 + +ccm_seg7_vertex_0700FEF0: + type: VTX + count: 8 + offset: 0xFEF0 + symbol: ccm_seg7_vertex_0700FEF0 + +ccm_seg7_vertex_0700FF70: + type: VTX + count: 4 + offset: 0xFF70 + symbol: ccm_seg7_vertex_0700FF70 + +ccm_seg7_vertex_0700FFB0: + type: VTX + count: 12 + offset: 0xFFB0 + symbol: ccm_seg7_vertex_0700FFB0 + +ccm_seg7_vertex_07010070: + type: VTX + count: 15 + offset: 0x10070 + symbol: ccm_seg7_vertex_07010070 + +ccm_seg7_vertex_07010160: + type: VTX + count: 4 + offset: 0x10160 + symbol: ccm_seg7_vertex_07010160 + +ccm_seg7_vertex_070101A0: + type: VTX + count: 14 + offset: 0x101A0 + symbol: ccm_seg7_vertex_070101A0 + +ccm_seg7_vertex_07010280: + type: VTX + count: 10 + offset: 0x10280 + symbol: ccm_seg7_vertex_07010280 + +ccm_seg7_vertex_07010320: + type: VTX + count: 7 + offset: 0x10320 + symbol: ccm_seg7_vertex_07010320 + +ccm_seg7_dl_07010390: + type: GFX + offset: 0x10390 + symbol: ccm_seg7_dl_07010390 + +ccm_seg7_dl_07010480: + type: GFX + offset: 0x10480 + symbol: ccm_seg7_dl_07010480 + +ccm_seg7_dl_07010518: + type: GFX + offset: 0x10518 + symbol: ccm_seg7_dl_07010518 + +ccm_seg7_dl_07010610: + type: GFX + offset: 0x10610 + symbol: ccm_seg7_dl_07010610 + +ccm_seg7_dl_07010660: + type: GFX + offset: 0x10660 + symbol: ccm_seg7_dl_07010660 + +ccm_seg7_lights_07010FB8: + type: LIGHTS + size: 24 + offset: 0x10FB8 + symbol: ccm_seg7_lights_07010FB8 + +ccm_seg7_vertex_07010FD0: + type: VTX + count: 15 + offset: 0x10FD0 + symbol: ccm_seg7_vertex_07010FD0 + +ccm_seg7_vertex_070110C0: + type: VTX + count: 15 + offset: 0x110C0 + symbol: ccm_seg7_vertex_070110C0 + +ccm_seg7_vertex_070111B0: + type: VTX + count: 15 + offset: 0x111B0 + symbol: ccm_seg7_vertex_070111B0 + +ccm_seg7_vertex_070112A0: + type: VTX + count: 15 + offset: 0x112A0 + symbol: ccm_seg7_vertex_070112A0 + +ccm_seg7_vertex_07011390: + type: VTX + count: 8 + offset: 0x11390 + symbol: ccm_seg7_vertex_07011390 + +ccm_seg7_vertex_07011410: + type: VTX + count: 15 + offset: 0x11410 + symbol: ccm_seg7_vertex_07011410 + +ccm_seg7_vertex_07011500: + type: VTX + count: 16 + offset: 0x11500 + symbol: ccm_seg7_vertex_07011500 + +ccm_seg7_vertex_07011600: + type: VTX + count: 6 + offset: 0x11600 + symbol: ccm_seg7_vertex_07011600 + +ccm_seg7_dl_07011660: + type: GFX + offset: 0x11660 + symbol: ccm_seg7_dl_07011660 + +ccm_seg7_dl_070117B8: + type: GFX + offset: 0x117B8 + symbol: ccm_seg7_dl_070117B8 + +ccm_seg7_dl_070118B0: + type: GFX + offset: 0x118B0 + symbol: ccm_seg7_dl_070118B0 + +ccm_seg7_vertex_07010BD0: + type: VTX + count: 15 + offset: 0x10BD0 + symbol: ccm_seg7_vertex_07010BD0 + +ccm_seg7_vertex_07010CC0: + type: VTX + count: 7 + offset: 0x10CC0 + symbol: ccm_seg7_vertex_07010CC0 + +ccm_seg7_vertex_07010D30: + type: VTX + count: 16 + offset: 0x10D30 + symbol: ccm_seg7_vertex_07010D30 + +ccm_seg7_dl_07010E30: + type: GFX + offset: 0x10E30 + symbol: ccm_seg7_dl_07010E30 + +ccm_seg7_dl_07010EC0: + type: GFX + offset: 0x10EC0 + symbol: ccm_seg7_dl_07010EC0 + +ccm_seg7_dl_07010F28: + type: GFX + offset: 0x10F28 + symbol: ccm_seg7_dl_07010F28 + +ccm_seg7_vertex_07013730: + type: VTX + count: 8 + offset: 0x13730 + symbol: ccm_seg7_vertex_07013730 + +ccm_seg7_vertex_070137B0: + type: VTX + count: 4 + offset: 0x137B0 + symbol: ccm_seg7_vertex_070137B0 + +ccm_seg7_dl_070137F0: + type: GFX + offset: 0x137F0 + symbol: ccm_seg7_dl_070137F0 + +ccm_seg7_dl_07013838: + type: GFX + offset: 0x13838 + symbol: ccm_seg7_dl_07013838 + +ccm_seg7_dl_07013870: + type: GFX + offset: 0x13870 + symbol: ccm_seg7_dl_07013870 + +ccm_seg7_lights_07012C38: + type: LIGHTS + size: 24 + offset: 0x12C38 + symbol: ccm_seg7_lights_07012C38 + +ccm_seg7_vertex_07012C50: + type: VTX + count: 16 + offset: 0x12C50 + symbol: ccm_seg7_vertex_07012C50 + +ccm_seg7_vertex_07012D50: + type: VTX + count: 16 + offset: 0x12D50 + symbol: ccm_seg7_vertex_07012D50 + +ccm_seg7_vertex_07012E50: + type: VTX + count: 16 + offset: 0x12E50 + symbol: ccm_seg7_vertex_07012E50 + +ccm_seg7_vertex_07012F50: + type: VTX + count: 16 + offset: 0x12F50 + symbol: ccm_seg7_vertex_07012F50 + +ccm_seg7_vertex_07013050: + type: VTX + count: 16 + offset: 0x13050 + symbol: ccm_seg7_vertex_07013050 + +ccm_seg7_vertex_07013150: + type: VTX + count: 16 + offset: 0x13150 + symbol: ccm_seg7_vertex_07013150 + +ccm_seg7_vertex_07013250: + type: VTX + count: 16 + offset: 0x13250 + symbol: ccm_seg7_vertex_07013250 + +ccm_seg7_vertex_07013350: + type: VTX + count: 9 + offset: 0x13350 + symbol: ccm_seg7_vertex_07013350 + +ccm_seg7_dl_070133E0: + type: GFX + offset: 0x133E0 + symbol: ccm_seg7_dl_070133E0 + +ccm_seg7_dl_070136D0: + type: GFX + offset: 0x136D0 + symbol: ccm_seg7_dl_070136D0 + +ccm_seg7_lights_0700F6E0: + type: LIGHTS + size: 24 + offset: 0xF6E0 + symbol: ccm_seg7_lights_0700F6E0 + +ccm_seg7_vertex_0700F6F8: + type: VTX + count: 4 + offset: 0xF6F8 + symbol: ccm_seg7_vertex_0700F6F8 + +ccm_seg7_dl_0700F738: + type: GFX + offset: 0xF738 + symbol: ccm_seg7_dl_0700F738 + +ccm_seg7_dl_0700F780: + type: GFX + offset: 0xF780 + symbol: ccm_seg7_dl_0700F780 + +ccm_seg7_lights_07010A60: + type: LIGHTS + size: 24 + offset: 0x10A60 + symbol: ccm_seg7_lights_07010A60 + +ccm_seg7_vertex_07010A78: + type: VTX + count: 8 + offset: 0x10A78 + symbol: ccm_seg7_vertex_07010A78 + +ccm_seg7_dl_07010AF8: + type: GFX + offset: 0x10AF8 + symbol: ccm_seg7_dl_07010AF8 + +ccm_seg7_dl_07010B50: + type: GFX + offset: 0x10B50 + symbol: ccm_seg7_dl_07010B50 + diff --git a/assets/ymls/jp/levels/ddd.yml b/assets/ymls/jp/levels/ddd.yml index 55a9b28e..06716e97 100644 --- a/assets/ymls/jp/levels/ddd.yml +++ b/assets/ymls/jp/levels/ddd.yml @@ -912,3 +912,240 @@ ddd_seg7_dl_0700D2A0: offset: 0xD2A0 symbol: ddd_seg7_dl_0700D2A0 +ddd_seg7_lights_07009080: + type: LIGHTS + size: 24 + offset: 0x9080 + symbol: ddd_seg7_lights_07009080 + +ddd_seg7_vertex_07009098: + type: VTX + count: 4 + offset: 0x9098 + symbol: ddd_seg7_vertex_07009098 + +ddd_seg7_dl_070090D8: + type: GFX + offset: 0x90D8 + symbol: ddd_seg7_dl_070090D8 + +ddd_seg7_dl_07009120: + type: GFX + offset: 0x9120 + symbol: ddd_seg7_dl_07009120 + +ddd_seg7_vertex_07008FD0: + type: VTX + count: 4 + offset: 0x8FD0 + symbol: ddd_seg7_vertex_07008FD0 + +ddd_seg7_dl_07009010: + type: GFX + offset: 0x9010 + symbol: ddd_seg7_dl_07009010 + +ddd_seg7_dl_07009030: + type: GFX + offset: 0x9030 + symbol: ddd_seg7_dl_07009030 + +ddd_seg7_lights_0700AF78: + type: LIGHTS + size: 24 + offset: 0xAF78 + symbol: ddd_seg7_lights_0700AF78 + +ddd_seg7_vertex_0700AF90: + type: VTX + count: 8 + offset: 0xAF90 + symbol: ddd_seg7_vertex_0700AF90 + +ddd_seg7_dl_0700B010: + type: GFX + offset: 0xB010 + symbol: ddd_seg7_dl_0700B010 + +ddd_seg7_dl_0700B068: + type: GFX + offset: 0xB068 + symbol: ddd_seg7_dl_0700B068 + +ddd_seg7_lights_07009288: + type: LIGHTS + size: 24 + offset: 0x9288 + symbol: ddd_seg7_lights_07009288 + +ddd_seg7_lights_070092A0: + type: LIGHTS + size: 24 + offset: 0x92A0 + symbol: ddd_seg7_lights_070092A0 + +ddd_seg7_lights_070092B8: + type: LIGHTS + size: 24 + offset: 0x92B8 + symbol: ddd_seg7_lights_070092B8 + +ddd_seg7_lights_070092D0: + type: LIGHTS + size: 24 + offset: 0x92D0 + symbol: ddd_seg7_lights_070092D0 + +ddd_seg7_lights_070092E8: + type: LIGHTS + size: 24 + offset: 0x92E8 + symbol: ddd_seg7_lights_070092E8 + +ddd_seg7_vertex_07009300: + type: VTX + count: 16 + offset: 0x9300 + symbol: ddd_seg7_vertex_07009300 + +ddd_seg7_vertex_07009400: + type: VTX + count: 9 + offset: 0x9400 + symbol: ddd_seg7_vertex_07009400 + +ddd_seg7_vertex_07009490: + type: VTX + count: 16 + offset: 0x9490 + symbol: ddd_seg7_vertex_07009490 + +ddd_seg7_vertex_07009590: + type: VTX + count: 5 + offset: 0x9590 + symbol: ddd_seg7_vertex_07009590 + +ddd_seg7_vertex_070095E0: + type: VTX + count: 8 + offset: 0x95E0 + symbol: ddd_seg7_vertex_070095E0 + +ddd_seg7_vertex_07009660: + type: VTX + count: 15 + offset: 0x9660 + symbol: ddd_seg7_vertex_07009660 + +ddd_seg7_vertex_07009750: + type: VTX + count: 11 + offset: 0x9750 + symbol: ddd_seg7_vertex_07009750 + +ddd_seg7_vertex_07009800: + type: VTX + count: 14 + offset: 0x9800 + symbol: ddd_seg7_vertex_07009800 + +ddd_seg7_vertex_070098E0: + type: VTX + count: 16 + offset: 0x98E0 + symbol: ddd_seg7_vertex_070098E0 + +ddd_seg7_vertex_070099E0: + type: VTX + count: 15 + offset: 0x99E0 + symbol: ddd_seg7_vertex_070099E0 + +ddd_seg7_vertex_07009AD0: + type: VTX + count: 16 + offset: 0x9AD0 + symbol: ddd_seg7_vertex_07009AD0 + +ddd_seg7_vertex_07009BD0: + type: VTX + count: 16 + offset: 0x9BD0 + symbol: ddd_seg7_vertex_07009BD0 + +ddd_seg7_vertex_07009CD0: + type: VTX + count: 16 + offset: 0x9CD0 + symbol: ddd_seg7_vertex_07009CD0 + +ddd_seg7_vertex_07009DD0: + type: VTX + count: 16 + offset: 0x9DD0 + symbol: ddd_seg7_vertex_07009DD0 + +ddd_seg7_vertex_07009ED0: + type: VTX + count: 16 + offset: 0x9ED0 + symbol: ddd_seg7_vertex_07009ED0 + +ddd_seg7_vertex_07009FD0: + type: VTX + count: 16 + offset: 0x9FD0 + symbol: ddd_seg7_vertex_07009FD0 + +ddd_seg7_vertex_0700A0D0: + type: VTX + count: 16 + offset: 0xA0D0 + symbol: ddd_seg7_vertex_0700A0D0 + +ddd_seg7_vertex_0700A1D0: + type: VTX + count: 16 + offset: 0xA1D0 + symbol: ddd_seg7_vertex_0700A1D0 + +ddd_seg7_vertex_0700A2D0: + type: VTX + count: 15 + offset: 0xA2D0 + symbol: ddd_seg7_vertex_0700A2D0 + +ddd_seg7_vertex_0700A3C0: + type: VTX + count: 16 + offset: 0xA3C0 + symbol: ddd_seg7_vertex_0700A3C0 + +ddd_seg7_vertex_0700A4C0: + type: VTX + count: 12 + offset: 0xA4C0 + symbol: ddd_seg7_vertex_0700A4C0 + +ddd_seg7_vertex_0700A580: + type: VTX + count: 8 + offset: 0xA580 + symbol: ddd_seg7_vertex_0700A580 + +ddd_seg7_dl_0700A600: + type: GFX + offset: 0xA600 + symbol: ddd_seg7_dl_0700A600 + +ddd_seg7_dl_0700AEB8: + type: GFX + offset: 0xAEB8 + symbol: ddd_seg7_dl_0700AEB8 + +ddd_seg7_dl_0700AF10: + type: GFX + offset: 0xAF10 + symbol: ddd_seg7_dl_0700AF10 + diff --git a/assets/ymls/jp/levels/rr.yml b/assets/ymls/jp/levels/rr.yml index f60b61f7..afdb54b8 100644 --- a/assets/ymls/jp/levels/rr.yml +++ b/assets/ymls/jp/levels/rr.yml @@ -3595,3 +3595,179 @@ rr_seg7_dl_0701A680: offset: 0x1A680 symbol: rr_seg7_dl_0701A680 +rr_seg7_vertex_0701B8B8: + type: VTX + count: 8 + offset: 0x1B8B8 + symbol: rr_seg7_vertex_0701B8B8 + +rr_seg7_dl_0701B938: + type: GFX + offset: 0x1B938 + symbol: rr_seg7_dl_0701B938 + +rr_seg7_dl_0701B980: + type: GFX + offset: 0x1B980 + symbol: rr_seg7_dl_0701B980 + +rr_seg7_vertex_0701B530: + type: VTX + count: 16 + offset: 0x1B530 + symbol: rr_seg7_vertex_0701B530 + +rr_seg7_vertex_0701B630: + type: VTX + count: 14 + offset: 0x1B630 + symbol: rr_seg7_vertex_0701B630 + +rr_seg7_vertex_0701B710: + type: VTX + count: 6 + offset: 0x1B710 + symbol: rr_seg7_vertex_0701B710 + +rr_seg7_dl_0701B770: + type: GFX + offset: 0x1B770 + symbol: rr_seg7_dl_0701B770 + +rr_seg7_dl_0701B848: + type: GFX + offset: 0x1B848 + symbol: rr_seg7_dl_0701B848 + +rr_seg7_vertex_0700DC58: + type: VTX + count: 15 + offset: 0xDC58 + symbol: rr_seg7_vertex_0700DC58 + +rr_seg7_vertex_0700DD48: + type: VTX + count: 11 + offset: 0xDD48 + symbol: rr_seg7_vertex_0700DD48 + +rr_seg7_dl_0700DDF8: + type: GFX + offset: 0xDDF8 + symbol: rr_seg7_dl_0700DDF8 + +rr_seg7_dl_0700DE88: + type: GFX + offset: 0xDE88 + symbol: rr_seg7_dl_0700DE88 + +rr_seg7_vertex_0700CAB8: + type: VTX + count: 15 + offset: 0xCAB8 + symbol: rr_seg7_vertex_0700CAB8 + +rr_seg7_vertex_0700CBA8: + type: VTX + count: 16 + offset: 0xCBA8 + symbol: rr_seg7_vertex_0700CBA8 + +rr_seg7_vertex_0700CCA8: + type: VTX + count: 14 + offset: 0xCCA8 + symbol: rr_seg7_vertex_0700CCA8 + +rr_seg7_vertex_0700CD88: + type: VTX + count: 16 + offset: 0xCD88 + symbol: rr_seg7_vertex_0700CD88 + +rr_seg7_vertex_0700CE88: + type: VTX + count: 16 + offset: 0xCE88 + symbol: rr_seg7_vertex_0700CE88 + +rr_seg7_vertex_0700CF88: + type: VTX + count: 15 + offset: 0xCF88 + symbol: rr_seg7_vertex_0700CF88 + +rr_seg7_vertex_0700D078: + type: VTX + count: 16 + offset: 0xD078 + symbol: rr_seg7_vertex_0700D078 + +rr_seg7_vertex_0700D178: + type: VTX + count: 15 + offset: 0xD178 + symbol: rr_seg7_vertex_0700D178 + +rr_seg7_vertex_0700D268: + type: VTX + count: 15 + offset: 0xD268 + symbol: rr_seg7_vertex_0700D268 + +rr_seg7_vertex_0700D358: + type: VTX + count: 15 + offset: 0xD358 + symbol: rr_seg7_vertex_0700D358 + +rr_seg7_vertex_0700D448: + type: VTX + count: 4 + offset: 0xD448 + symbol: rr_seg7_vertex_0700D448 + +rr_seg7_vertex_0700D488: + type: VTX + count: 16 + offset: 0xD488 + symbol: rr_seg7_vertex_0700D488 + +rr_seg7_vertex_0700D588: + type: VTX + count: 16 + offset: 0xD588 + symbol: rr_seg7_vertex_0700D588 + +rr_seg7_vertex_0700D688: + type: VTX + count: 8 + offset: 0xD688 + symbol: rr_seg7_vertex_0700D688 + +rr_seg7_vertex_0700D708: + type: VTX + count: 6 + offset: 0xD708 + symbol: rr_seg7_vertex_0700D708 + +rr_seg7_dl_0700D768: + type: GFX + offset: 0xD768 + symbol: rr_seg7_dl_0700D768 + +rr_seg7_dl_0700DAD8: + type: GFX + offset: 0xDAD8 + symbol: rr_seg7_dl_0700DAD8 + +rr_seg7_dl_0700DBA8: + type: GFX + offset: 0xDBA8 + symbol: rr_seg7_dl_0700DBA8 + +rr_seg7_dl_0700DBD8: + type: GFX + offset: 0xDBD8 + symbol: rr_seg7_dl_0700DBD8 + diff --git a/assets/ymls/jp/levels/ttm.yml b/assets/ymls/jp/levels/ttm.yml index c3d3f02c..ec448ba3 100644 --- a/assets/ymls/jp/levels/ttm.yml +++ b/assets/ymls/jp/levels/ttm.yml @@ -3414,3 +3414,756 @@ ttm_seg7_dl_0702BB60: offset: 0x2BB60 symbol: ttm_seg7_dl_0702BB60 +ttm_seg7_vertex_070109F0: + type: VTX + count: 4 + offset: 0x109F0 + symbol: ttm_seg7_vertex_070109F0 + +ttm_seg7_dl_07010A30: + type: GFX + offset: 0x10A30 + symbol: ttm_seg7_dl_07010A30 + +ttm_seg7_dl_07010A68: + type: GFX + offset: 0x10A68 + symbol: ttm_seg7_dl_07010A68 + +ttm_seg7_lights_0700FA90: + type: LIGHTS + size: 24 + offset: 0xFA90 + symbol: ttm_seg7_lights_0700FA90 + +ttm_seg7_lights_0700FAA8: + type: LIGHTS + size: 24 + offset: 0xFAA8 + symbol: ttm_seg7_lights_0700FAA8 + +ttm_seg7_lights_0700FAC0: + type: LIGHTS + size: 24 + offset: 0xFAC0 + symbol: ttm_seg7_lights_0700FAC0 + +ttm_seg7_vertex_0700FAD8: + type: VTX + count: 14 + offset: 0xFAD8 + symbol: ttm_seg7_vertex_0700FAD8 + +ttm_seg7_vertex_0700FBB8: + type: VTX + count: 16 + offset: 0xFBB8 + symbol: ttm_seg7_vertex_0700FBB8 + +ttm_seg7_vertex_0700FCB8: + type: VTX + count: 9 + offset: 0xFCB8 + symbol: ttm_seg7_vertex_0700FCB8 + +ttm_seg7_vertex_0700FD48: + type: VTX + count: 15 + offset: 0xFD48 + symbol: ttm_seg7_vertex_0700FD48 + +ttm_seg7_vertex_0700FE38: + type: VTX + count: 16 + offset: 0xFE38 + symbol: ttm_seg7_vertex_0700FE38 + +ttm_seg7_vertex_0700FF38: + type: VTX + count: 12 + offset: 0xFF38 + symbol: ttm_seg7_vertex_0700FF38 + +ttm_seg7_vertex_0700FFF8: + type: VTX + count: 16 + offset: 0xFFF8 + symbol: ttm_seg7_vertex_0700FFF8 + +ttm_seg7_vertex_070100F8: + type: VTX + count: 15 + offset: 0x100F8 + symbol: ttm_seg7_vertex_070100F8 + +ttm_seg7_vertex_070101E8: + type: VTX + count: 9 + offset: 0x101E8 + symbol: ttm_seg7_vertex_070101E8 + +ttm_seg7_vertex_07010278: + type: VTX + count: 16 + offset: 0x10278 + symbol: ttm_seg7_vertex_07010278 + +ttm_seg7_vertex_07010378: + type: VTX + count: 15 + offset: 0x10378 + symbol: ttm_seg7_vertex_07010378 + +ttm_seg7_vertex_07010468: + type: VTX + count: 4 + offset: 0x10468 + symbol: ttm_seg7_vertex_07010468 + +ttm_seg7_vertex_070104A8: + type: VTX + count: 12 + offset: 0x104A8 + symbol: ttm_seg7_vertex_070104A8 + +ttm_seg7_vertex_07010568: + type: VTX + count: 13 + offset: 0x10568 + symbol: ttm_seg7_vertex_07010568 + +ttm_seg7_dl_07010638: + type: GFX + offset: 0x10638 + symbol: ttm_seg7_dl_07010638 + +ttm_seg7_dl_07010830: + type: GFX + offset: 0x10830 + symbol: ttm_seg7_dl_07010830 + +ttm_seg7_dl_07010978: + type: GFX + offset: 0x10978 + symbol: ttm_seg7_dl_07010978 + +ttm_seg7_vertex_0700EB40: + type: VTX + count: 12 + offset: 0xEB40 + symbol: ttm_seg7_vertex_0700EB40 + +ttm_seg7_dl_0700EC00: + type: GFX + offset: 0xEC00 + symbol: ttm_seg7_dl_0700EC00 + +ttm_seg7_dl_0700EC58: + type: GFX + offset: 0xEC58 + symbol: ttm_seg7_dl_0700EC58 + +ttm_seg7_lights_0700E378: + type: LIGHTS + size: 24 + offset: 0xE378 + symbol: ttm_seg7_lights_0700E378 + +ttm_seg7_lights_0700E390: + type: LIGHTS + size: 24 + offset: 0xE390 + symbol: ttm_seg7_lights_0700E390 + +ttm_seg7_lights_0700E3A8: + type: LIGHTS + size: 24 + offset: 0xE3A8 + symbol: ttm_seg7_lights_0700E3A8 + +ttm_seg7_vertex_0700E3C0: + type: VTX + count: 15 + offset: 0xE3C0 + symbol: ttm_seg7_vertex_0700E3C0 + +ttm_seg7_vertex_0700E4B0: + type: VTX + count: 14 + offset: 0xE4B0 + symbol: ttm_seg7_vertex_0700E4B0 + +ttm_seg7_vertex_0700E590: + type: VTX + count: 15 + offset: 0xE590 + symbol: ttm_seg7_vertex_0700E590 + +ttm_seg7_vertex_0700E680: + type: VTX + count: 6 + offset: 0xE680 + symbol: ttm_seg7_vertex_0700E680 + +ttm_seg7_vertex_0700E6E0: + type: VTX + count: 4 + offset: 0xE6E0 + symbol: ttm_seg7_vertex_0700E6E0 + +ttm_seg7_vertex_0700E720: + type: VTX + count: 16 + offset: 0xE720 + symbol: ttm_seg7_vertex_0700E720 + +ttm_seg7_vertex_0700E820: + type: VTX + count: 9 + offset: 0xE820 + symbol: ttm_seg7_vertex_0700E820 + +ttm_seg7_vertex_0700E8B0: + type: VTX + count: 6 + offset: 0xE8B0 + symbol: ttm_seg7_vertex_0700E8B0 + +ttm_seg7_dl_0700E910: + type: GFX + offset: 0xE910 + symbol: ttm_seg7_dl_0700E910 + +ttm_seg7_dl_0700EA28: + type: GFX + offset: 0xEA28 + symbol: ttm_seg7_dl_0700EA28 + +ttm_seg7_dl_0700EAC8: + type: GFX + offset: 0xEAC8 + symbol: ttm_seg7_dl_0700EAC8 + +ttm_seg7_lights_0700BB30: + type: LIGHTS + size: 24 + offset: 0xBB30 + symbol: ttm_seg7_lights_0700BB30 + +ttm_seg7_vertex_0700BB48: + type: VTX + count: 6 + offset: 0xBB48 + symbol: ttm_seg7_vertex_0700BB48 + +ttm_seg7_dl_0700BBA8: + type: GFX + offset: 0xBBA8 + symbol: ttm_seg7_dl_0700BBA8 + +ttm_seg7_dl_0700BC10: + type: GFX + offset: 0xBC10 + symbol: ttm_seg7_dl_0700BC10 + +ttm_seg7_lights_0700B6D0: + type: LIGHTS + size: 24 + offset: 0xB6D0 + symbol: ttm_seg7_lights_0700B6D0 + +ttm_seg7_vertex_0700B6E8: + type: VTX + count: 15 + offset: 0xB6E8 + symbol: ttm_seg7_vertex_0700B6E8 + +ttm_seg7_vertex_0700B7D8: + type: VTX + count: 16 + offset: 0xB7D8 + symbol: ttm_seg7_vertex_0700B7D8 + +ttm_seg7_vertex_0700B8D8: + type: VTX + count: 12 + offset: 0xB8D8 + symbol: ttm_seg7_vertex_0700B8D8 + +ttm_seg7_dl_0700B998: + type: GFX + offset: 0xB998 + symbol: ttm_seg7_dl_0700B998 + +ttm_seg7_dl_0700BAD0: + type: GFX + offset: 0xBAD0 + symbol: ttm_seg7_dl_0700BAD0 + +ttm_seg7_lights_0700F300: + type: LIGHTS + size: 24 + offset: 0xF300 + symbol: ttm_seg7_lights_0700F300 + +ttm_seg7_vertex_0700F318: + type: VTX + count: 16 + offset: 0xF318 + symbol: ttm_seg7_vertex_0700F318 + +ttm_seg7_vertex_0700F418: + type: VTX + count: 15 + offset: 0xF418 + symbol: ttm_seg7_vertex_0700F418 + +ttm_seg7_vertex_0700F508: + type: VTX + count: 15 + offset: 0xF508 + symbol: ttm_seg7_vertex_0700F508 + +ttm_seg7_vertex_0700F5F8: + type: VTX + count: 15 + offset: 0xF5F8 + symbol: ttm_seg7_vertex_0700F5F8 + +ttm_seg7_vertex_0700F6E8: + type: VTX + count: 15 + offset: 0xF6E8 + symbol: ttm_seg7_vertex_0700F6E8 + +ttm_seg7_vertex_0700F7D8: + type: VTX + count: 8 + offset: 0xF7D8 + symbol: ttm_seg7_vertex_0700F7D8 + +ttm_seg7_dl_0700F858: + type: GFX + offset: 0xF858 + symbol: ttm_seg7_dl_0700F858 + +ttm_seg7_dl_0700F8D0: + type: GFX + offset: 0xF8D0 + symbol: ttm_seg7_dl_0700F8D0 + +ttm_seg7_dl_0700FA18: + type: GFX + offset: 0xFA18 + symbol: ttm_seg7_dl_0700FA18 + +ttm_seg7_vertex_0700ECC8: + type: VTX + count: 13 + offset: 0xECC8 + symbol: ttm_seg7_vertex_0700ECC8 + +ttm_seg7_vertex_0700ED98: + type: VTX + count: 15 + offset: 0xED98 + symbol: ttm_seg7_vertex_0700ED98 + +ttm_seg7_vertex_0700EE88: + type: VTX + count: 15 + offset: 0xEE88 + symbol: ttm_seg7_vertex_0700EE88 + +ttm_seg7_vertex_0700EF78: + type: VTX + count: 15 + offset: 0xEF78 + symbol: ttm_seg7_vertex_0700EF78 + +ttm_seg7_vertex_0700F068: + type: VTX + count: 7 + offset: 0xF068 + symbol: ttm_seg7_vertex_0700F068 + +ttm_seg7_dl_0700F0D8: + type: GFX + offset: 0xF0D8 + symbol: ttm_seg7_dl_0700F0D8 + +ttm_seg7_dl_0700F170: + type: GFX + offset: 0xF170 + symbol: ttm_seg7_dl_0700F170 + +ttm_seg7_dl_0700F270: + type: GFX + offset: 0xF270 + symbol: ttm_seg7_dl_0700F270 + +ttm_seg7_vertex_07011D00: + type: VTX + count: 4 + offset: 0x11D00 + symbol: ttm_seg7_vertex_07011D00 + +ttm_seg7_dl_07011D40: + type: GFX + offset: 0x11D40 + symbol: ttm_seg7_dl_07011D40 + +ttm_seg7_dl_07011D78: + type: GFX + offset: 0x11D78 + symbol: ttm_seg7_dl_07011D78 + +ttm_seg7_lights_07011680: + type: LIGHTS + size: 24 + offset: 0x11680 + symbol: ttm_seg7_lights_07011680 + +ttm_seg7_lights_07011698: + type: LIGHTS + size: 24 + offset: 0x11698 + symbol: ttm_seg7_lights_07011698 + +ttm_seg7_lights_070116B0: + type: LIGHTS + size: 24 + offset: 0x116B0 + symbol: ttm_seg7_lights_070116B0 + +ttm_seg7_vertex_070116C8: + type: VTX + count: 16 + offset: 0x116C8 + symbol: ttm_seg7_vertex_070116C8 + +ttm_seg7_vertex_070117C8: + type: VTX + count: 4 + offset: 0x117C8 + symbol: ttm_seg7_vertex_070117C8 + +ttm_seg7_vertex_07011808: + type: VTX + count: 15 + offset: 0x11808 + symbol: ttm_seg7_vertex_07011808 + +ttm_seg7_vertex_070118F8: + type: VTX + count: 16 + offset: 0x118F8 + symbol: ttm_seg7_vertex_070118F8 + +ttm_seg7_vertex_070119F8: + type: VTX + count: 3 + offset: 0x119F8 + symbol: ttm_seg7_vertex_070119F8 + +ttm_seg7_vertex_07011A28: + type: VTX + count: 4 + offset: 0x11A28 + symbol: ttm_seg7_vertex_07011A28 + +ttm_seg7_vertex_07011A68: + type: VTX + count: 4 + offset: 0x11A68 + symbol: ttm_seg7_vertex_07011A68 + +ttm_seg7_dl_07011AA8: + type: GFX + offset: 0x11AA8 + symbol: ttm_seg7_dl_07011AA8 + +ttm_seg7_dl_07011B20: + type: GFX + offset: 0x11B20 + symbol: ttm_seg7_dl_07011B20 + +ttm_seg7_dl_07011C10: + type: GFX + offset: 0x11C10 + symbol: ttm_seg7_dl_07011C10 + +ttm_seg7_dl_07011C48: + type: GFX + offset: 0x11C48 + symbol: ttm_seg7_dl_07011C48 + +ttm_seg7_dl_07011C78: + type: GFX + offset: 0x11C78 + symbol: ttm_seg7_dl_07011C78 + +ttm_seg7_lights_0700AFF0: + type: LIGHTS + size: 24 + offset: 0xAFF0 + symbol: ttm_seg7_lights_0700AFF0 + +ttm_seg7_vertex_0700B008: + type: VTX + count: 6 + offset: 0xB008 + symbol: ttm_seg7_vertex_0700B008 + +ttm_seg7_dl_0700B068: + type: GFX + offset: 0xB068 + symbol: ttm_seg7_dl_0700B068 + +ttm_seg7_dl_0700B0D0: + type: GFX + offset: 0xB0D0 + symbol: ttm_seg7_dl_0700B0D0 + +ttm_seg7_lights_0700AB70: + type: LIGHTS + size: 24 + offset: 0xAB70 + symbol: ttm_seg7_lights_0700AB70 + +ttm_seg7_vertex_0700AB88: + type: VTX + count: 15 + offset: 0xAB88 + symbol: ttm_seg7_vertex_0700AB88 + +ttm_seg7_vertex_0700AC78: + type: VTX + count: 16 + offset: 0xAC78 + symbol: ttm_seg7_vertex_0700AC78 + +ttm_seg7_vertex_0700AD78: + type: VTX + count: 14 + offset: 0xAD78 + symbol: ttm_seg7_vertex_0700AD78 + +ttm_seg7_dl_0700AE58: + type: GFX + offset: 0xAE58 + symbol: ttm_seg7_dl_0700AE58 + +ttm_seg7_dl_0700AF90: + type: GFX + offset: 0xAF90 + symbol: ttm_seg7_dl_0700AF90 + +ttm_seg7_lights_0700A928: + type: LIGHTS + size: 24 + offset: 0xA928 + symbol: ttm_seg7_lights_0700A928 + +ttm_seg7_vertex_0700A940: + type: VTX + count: 8 + offset: 0xA940 + symbol: ttm_seg7_vertex_0700A940 + +ttm_seg7_vertex_0700A9C0: + type: VTX + count: 8 + offset: 0xA9C0 + symbol: ttm_seg7_vertex_0700A9C0 + +ttm_seg7_dl_0700AA40: + type: GFX + offset: 0xAA40 + symbol: ttm_seg7_dl_0700AA40 + +ttm_seg7_dl_0700AAB8: + type: GFX + offset: 0xAAB8 + symbol: ttm_seg7_dl_0700AAB8 + +ttm_seg7_dl_0700AB08: + type: GFX + offset: 0xAB08 + symbol: ttm_seg7_dl_0700AB08 + +ttm_seg7_lights_0700A340: + type: LIGHTS + size: 24 + offset: 0xA340 + symbol: ttm_seg7_lights_0700A340 + +ttm_seg7_lights_0700A358: + type: LIGHTS + size: 24 + offset: 0xA358 + symbol: ttm_seg7_lights_0700A358 + +ttm_seg7_vertex_0700A370: + type: VTX + count: 15 + offset: 0xA370 + symbol: ttm_seg7_vertex_0700A370 + +ttm_seg7_vertex_0700A460: + type: VTX + count: 16 + offset: 0xA460 + symbol: ttm_seg7_vertex_0700A460 + +ttm_seg7_vertex_0700A560: + type: VTX + count: 14 + offset: 0xA560 + symbol: ttm_seg7_vertex_0700A560 + +ttm_seg7_vertex_0700A640: + type: VTX + count: 13 + offset: 0xA640 + symbol: ttm_seg7_vertex_0700A640 + +ttm_seg7_dl_0700A710: + type: GFX + offset: 0xA710 + symbol: ttm_seg7_dl_0700A710 + +ttm_seg7_dl_0700A848: + type: GFX + offset: 0xA848 + symbol: ttm_seg7_dl_0700A848 + +ttm_seg7_dl_0700A8C0: + type: GFX + offset: 0xA8C0 + symbol: ttm_seg7_dl_0700A8C0 + +ttm_seg7_lights_0700B590: + type: LIGHTS + size: 24 + offset: 0xB590 + symbol: ttm_seg7_lights_0700B590 + +ttm_seg7_vertex_0700B5A8: + type: VTX + count: 6 + offset: 0xB5A8 + symbol: ttm_seg7_vertex_0700B5A8 + +ttm_seg7_dl_0700B608: + type: GFX + offset: 0xB608 + symbol: ttm_seg7_dl_0700B608 + +ttm_seg7_dl_0700B670: + type: GFX + offset: 0xB670 + symbol: ttm_seg7_dl_0700B670 + +ttm_seg7_lights_0700B130: + type: LIGHTS + size: 24 + offset: 0xB130 + symbol: ttm_seg7_lights_0700B130 + +ttm_seg7_vertex_0700B148: + type: VTX + count: 16 + offset: 0xB148 + symbol: ttm_seg7_vertex_0700B148 + +ttm_seg7_vertex_0700B248: + type: VTX + count: 15 + offset: 0xB248 + symbol: ttm_seg7_vertex_0700B248 + +ttm_seg7_vertex_0700B338: + type: VTX + count: 12 + offset: 0xB338 + symbol: ttm_seg7_vertex_0700B338 + +ttm_seg7_dl_0700B3F8: + type: GFX + offset: 0xB3F8 + symbol: ttm_seg7_dl_0700B3F8 + +ttm_seg7_dl_0700B530: + type: GFX + offset: 0xB530 + symbol: ttm_seg7_dl_0700B530 + +ttm_seg7_vertex_070134A0: + type: VTX + count: 16 + offset: 0x134A0 + symbol: ttm_seg7_vertex_070134A0 + +ttm_seg7_dl_070135A0: + type: GFX + offset: 0x135A0 + symbol: ttm_seg7_dl_070135A0 + +ttm_seg7_dl_07013608: + type: GFX + offset: 0x13608 + symbol: ttm_seg7_dl_07013608 + +ttm_seg7_lights_07012F78: + type: LIGHTS + size: 24 + offset: 0x12F78 + symbol: ttm_seg7_lights_07012F78 + +ttm_seg7_lights_07012F90: + type: LIGHTS + size: 24 + offset: 0x12F90 + symbol: ttm_seg7_lights_07012F90 + +ttm_seg7_vertex_07012FA8: + type: VTX + count: 8 + offset: 0x12FA8 + symbol: ttm_seg7_vertex_07012FA8 + +ttm_seg7_vertex_07013028: + type: VTX + count: 14 + offset: 0x13028 + symbol: ttm_seg7_vertex_07013028 + +ttm_seg7_vertex_07013108: + type: VTX + count: 14 + offset: 0x13108 + symbol: ttm_seg7_vertex_07013108 + +ttm_seg7_vertex_070131E8: + type: VTX + count: 14 + offset: 0x131E8 + symbol: ttm_seg7_vertex_070131E8 + +ttm_seg7_vertex_070132C8: + type: VTX + count: 4 + offset: 0x132C8 + symbol: ttm_seg7_vertex_070132C8 + +ttm_seg7_dl_07013308: + type: GFX + offset: 0x13308 + symbol: ttm_seg7_dl_07013308 + +ttm_seg7_dl_07013430: + type: GFX + offset: 0x13430 + symbol: ttm_seg7_dl_07013430 + diff --git a/assets/ymls/jp/levels/wf.yml b/assets/ymls/jp/levels/wf.yml index 9ec22f5b..e7e2ab18 100644 --- a/assets/ymls/jp/levels/wf.yml +++ b/assets/ymls/jp/levels/wf.yml @@ -1233,3 +1233,704 @@ wf_seg7_dl_0700F340: offset: 0xF340 symbol: wf_seg7_dl_0700F340 +wf_seg7_lights_07006558: + type: LIGHTS + size: 24 + offset: 0x6558 + symbol: wf_seg7_lights_07006558 + +wf_seg7_vertex_07006570: + type: VTX + count: 4 + offset: 0x6570 + symbol: wf_seg7_vertex_07006570 + +wf_seg7_dl_070065B0: + type: GFX + offset: 0x65B0 + symbol: wf_seg7_dl_070065B0 + +wf_seg7_dl_070065F8: + type: GFX + offset: 0x65F8 + symbol: wf_seg7_dl_070065F8 + +wf_seg7_lights_07005F58: + type: LIGHTS + size: 24 + offset: 0x5F58 + symbol: wf_seg7_lights_07005F58 + +wf_seg7_vertex_07005F70: + type: VTX + count: 15 + offset: 0x5F70 + symbol: wf_seg7_vertex_07005F70 + +wf_seg7_vertex_07006060: + type: VTX + count: 15 + offset: 0x6060 + symbol: wf_seg7_vertex_07006060 + +wf_seg7_vertex_07006150: + type: VTX + count: 16 + offset: 0x6150 + symbol: wf_seg7_vertex_07006150 + +wf_seg7_vertex_07006250: + type: VTX + count: 14 + offset: 0x6250 + symbol: wf_seg7_vertex_07006250 + +wf_seg7_vertex_07006330: + type: VTX + count: 7 + offset: 0x6330 + symbol: wf_seg7_vertex_07006330 + +wf_seg7_dl_070063A0: + type: GFX + offset: 0x63A0 + symbol: wf_seg7_dl_070063A0 + +wf_seg7_dl_070064E8: + type: GFX + offset: 0x64E8 + symbol: wf_seg7_dl_070064E8 + +wf_seg7_lights_07008838: + type: LIGHTS + size: 24 + offset: 0x8838 + symbol: wf_seg7_lights_07008838 + +wf_seg7_vertex_07008850: + type: VTX + count: 16 + offset: 0x8850 + symbol: wf_seg7_vertex_07008850 + +wf_seg7_vertex_07008950: + type: VTX + count: 10 + offset: 0x8950 + symbol: wf_seg7_vertex_07008950 + +wf_seg7_vertex_070089F0: + type: VTX + count: 16 + offset: 0x89F0 + symbol: wf_seg7_vertex_070089F0 + +wf_seg7_vertex_07008AF0: + type: VTX + count: 14 + offset: 0x8AF0 + symbol: wf_seg7_vertex_07008AF0 + +wf_seg7_vertex_07008BD0: + type: VTX + count: 6 + offset: 0x8BD0 + symbol: wf_seg7_vertex_07008BD0 + +wf_seg7_vertex_07008C30: + type: VTX + count: 15 + offset: 0x8C30 + symbol: wf_seg7_vertex_07008C30 + +wf_seg7_vertex_07008D20: + type: VTX + count: 11 + offset: 0x8D20 + symbol: wf_seg7_vertex_07008D20 + +wf_seg7_dl_07008DD0: + type: GFX + offset: 0x8DD0 + symbol: wf_seg7_dl_07008DD0 + +wf_seg7_dl_07008E48: + type: GFX + offset: 0x8E48 + symbol: wf_seg7_dl_07008E48 + +wf_seg7_dl_07008EA0: + type: GFX + offset: 0x8EA0 + symbol: wf_seg7_dl_07008EA0 + +wf_seg7_dl_07008F58: + type: GFX + offset: 0x8F58 + symbol: wf_seg7_dl_07008F58 + +wf_seg7_dl_07008FE8: + type: GFX + offset: 0x8FE8 + symbol: wf_seg7_dl_07008FE8 + +wf_seg7_lights_07007590: + type: LIGHTS + size: 24 + offset: 0x7590 + symbol: wf_seg7_lights_07007590 + +wf_seg7_vertex_070075A8: + type: VTX + count: 16 + offset: 0x75A8 + symbol: wf_seg7_vertex_070075A8 + +wf_seg7_vertex_070076A8: + type: VTX + count: 16 + offset: 0x76A8 + symbol: wf_seg7_vertex_070076A8 + +wf_seg7_vertex_070077A8: + type: VTX + count: 15 + offset: 0x77A8 + symbol: wf_seg7_vertex_070077A8 + +wf_seg7_vertex_07007898: + type: VTX + count: 15 + offset: 0x7898 + symbol: wf_seg7_vertex_07007898 + +wf_seg7_vertex_07007988: + type: VTX + count: 15 + offset: 0x7988 + symbol: wf_seg7_vertex_07007988 + +wf_seg7_vertex_07007A78: + type: VTX + count: 16 + offset: 0x7A78 + symbol: wf_seg7_vertex_07007A78 + +wf_seg7_vertex_07007B78: + type: VTX + count: 15 + offset: 0x7B78 + symbol: wf_seg7_vertex_07007B78 + +wf_seg7_vertex_07007C68: + type: VTX + count: 14 + offset: 0x7C68 + symbol: wf_seg7_vertex_07007C68 + +wf_seg7_vertex_07007D48: + type: VTX + count: 15 + offset: 0x7D48 + symbol: wf_seg7_vertex_07007D48 + +wf_seg7_vertex_07007E38: + type: VTX + count: 15 + offset: 0x7E38 + symbol: wf_seg7_vertex_07007E38 + +wf_seg7_vertex_07007F28: + type: VTX + count: 8 + offset: 0x7F28 + symbol: wf_seg7_vertex_07007F28 + +wf_seg7_vertex_07007FA8: + type: VTX + count: 16 + offset: 0x7FA8 + symbol: wf_seg7_vertex_07007FA8 + +wf_seg7_vertex_070080A8: + type: VTX + count: 15 + offset: 0x80A8 + symbol: wf_seg7_vertex_070080A8 + +wf_seg7_vertex_07008198: + type: VTX + count: 15 + offset: 0x8198 + symbol: wf_seg7_vertex_07008198 + +wf_seg7_vertex_07008288: + type: VTX + count: 14 + offset: 0x8288 + symbol: wf_seg7_vertex_07008288 + +wf_seg7_dl_07008368: + type: GFX + offset: 0x8368 + symbol: wf_seg7_dl_07008368 + +wf_seg7_dl_070083E0: + type: GFX + offset: 0x83E0 + symbol: wf_seg7_dl_070083E0 + +wf_seg7_dl_07008468: + type: GFX + offset: 0x8468 + symbol: wf_seg7_dl_07008468 + +wf_seg7_dl_07008690: + type: GFX + offset: 0x8690 + symbol: wf_seg7_dl_07008690 + +wf_seg7_dl_070087B0: + type: GFX + offset: 0x87B0 + symbol: wf_seg7_dl_070087B0 + +wf_seg7_lights_0700AC70: + type: LIGHTS + size: 24 + offset: 0xAC70 + symbol: wf_seg7_lights_0700AC70 + +wf_seg7_vertex_0700AC88: + type: VTX + count: 6 + offset: 0xAC88 + symbol: wf_seg7_vertex_0700AC88 + +wf_seg7_vertex_0700ACE8: + type: VTX + count: 16 + offset: 0xACE8 + symbol: wf_seg7_vertex_0700ACE8 + +wf_seg7_dl_0700ADE8: + type: GFX + offset: 0xADE8 + symbol: wf_seg7_dl_0700ADE8 + +wf_seg7_dl_0700AE40: + type: GFX + offset: 0xAE40 + symbol: wf_seg7_dl_0700AE40 + +wf_seg7_dl_0700AEC8: + type: GFX + offset: 0xAEC8 + symbol: wf_seg7_dl_0700AEC8 + +wf_seg7_lights_0700A1E0: + type: LIGHTS + size: 24 + offset: 0xA1E0 + symbol: wf_seg7_lights_0700A1E0 + +wf_seg7_vertex_0700A1F8: + type: VTX + count: 15 + offset: 0xA1F8 + symbol: wf_seg7_vertex_0700A1F8 + +wf_seg7_vertex_0700A2E8: + type: VTX + count: 7 + offset: 0xA2E8 + symbol: wf_seg7_vertex_0700A2E8 + +wf_seg7_vertex_0700A358: + type: VTX + count: 6 + offset: 0xA358 + symbol: wf_seg7_vertex_0700A358 + +wf_seg7_vertex_0700A3B8: + type: VTX + count: 15 + offset: 0xA3B8 + symbol: wf_seg7_vertex_0700A3B8 + +wf_seg7_vertex_0700A4A8: + type: VTX + count: 15 + offset: 0xA4A8 + symbol: wf_seg7_vertex_0700A4A8 + +wf_seg7_vertex_0700A598: + type: VTX + count: 15 + offset: 0xA598 + symbol: wf_seg7_vertex_0700A598 + +wf_seg7_vertex_0700A688: + type: VTX + count: 15 + offset: 0xA688 + symbol: wf_seg7_vertex_0700A688 + +wf_seg7_vertex_0700A778: + type: VTX + count: 8 + offset: 0xA778 + symbol: wf_seg7_vertex_0700A778 + +wf_seg7_vertex_0700A7F8: + type: VTX + count: 16 + offset: 0xA7F8 + symbol: wf_seg7_vertex_0700A7F8 + +wf_seg7_dl_0700A8F8: + type: GFX + offset: 0xA8F8 + symbol: wf_seg7_dl_0700A8F8 + +wf_seg7_dl_0700A988: + type: GFX + offset: 0xA988 + symbol: wf_seg7_dl_0700A988 + +wf_seg7_dl_0700A9D0: + type: GFX + offset: 0xA9D0 + symbol: wf_seg7_dl_0700A9D0 + +wf_seg7_dl_0700AB18: + type: GFX + offset: 0xAB18 + symbol: wf_seg7_dl_0700AB18 + +wf_seg7_dl_0700ABA0: + type: GFX + offset: 0xABA0 + symbol: wf_seg7_dl_0700ABA0 + +wf_seg7_lights_070097F0: + type: LIGHTS + size: 24 + offset: 0x97F0 + symbol: wf_seg7_lights_070097F0 + +wf_seg7_vertex_07009808: + type: VTX + count: 4 + offset: 0x9808 + symbol: wf_seg7_vertex_07009808 + +wf_seg7_dl_07009848: + type: GFX + offset: 0x9848 + symbol: wf_seg7_dl_07009848 + +wf_seg7_dl_07009890: + type: GFX + offset: 0x9890 + symbol: wf_seg7_dl_07009890 + +wf_seg7_lights_070092F0: + type: LIGHTS + size: 24 + offset: 0x92F0 + symbol: wf_seg7_lights_070092F0 + +wf_seg7_vertex_07009308: + type: VTX + count: 15 + offset: 0x9308 + symbol: wf_seg7_vertex_07009308 + +wf_seg7_vertex_070093F8: + type: VTX + count: 15 + offset: 0x93F8 + symbol: wf_seg7_vertex_070093F8 + +wf_seg7_vertex_070094E8: + type: VTX + count: 15 + offset: 0x94E8 + symbol: wf_seg7_vertex_070094E8 + +wf_seg7_vertex_070095D8: + type: VTX + count: 12 + offset: 0x95D8 + symbol: wf_seg7_vertex_070095D8 + +wf_seg7_dl_07009698: + type: GFX + offset: 0x9698 + symbol: wf_seg7_dl_07009698 + +wf_seg7_dl_07009780: + type: GFX + offset: 0x9780 + symbol: wf_seg7_dl_07009780 + +wf_seg7_lights_07005E48: + type: LIGHTS + size: 24 + offset: 0x5E48 + symbol: wf_seg7_lights_07005E48 + +wf_seg7_vertex_07005E60: + type: VTX + count: 4 + offset: 0x5E60 + symbol: wf_seg7_vertex_07005E60 + +wf_seg7_dl_07005EA0: + type: GFX + offset: 0x5EA0 + symbol: wf_seg7_dl_07005EA0 + +wf_seg7_dl_07005EE8: + type: GFX + offset: 0x5EE8 + symbol: wf_seg7_dl_07005EE8 + +wf_seg7_lights_070056C0: + type: LIGHTS + size: 24 + offset: 0x56C0 + symbol: wf_seg7_lights_070056C0 + +wf_seg7_vertex_070056D8: + type: VTX + count: 15 + offset: 0x56D8 + symbol: wf_seg7_vertex_070056D8 + +wf_seg7_vertex_070057C8: + type: VTX + count: 15 + offset: 0x57C8 + symbol: wf_seg7_vertex_070057C8 + +wf_seg7_vertex_070058B8: + type: VTX + count: 15 + offset: 0x58B8 + symbol: wf_seg7_vertex_070058B8 + +wf_seg7_vertex_070059A8: + type: VTX + count: 15 + offset: 0x59A8 + symbol: wf_seg7_vertex_070059A8 + +wf_seg7_vertex_07005A98: + type: VTX + count: 15 + offset: 0x5A98 + symbol: wf_seg7_vertex_07005A98 + +wf_seg7_vertex_07005B88: + type: VTX + count: 11 + offset: 0x5B88 + symbol: wf_seg7_vertex_07005B88 + +wf_seg7_dl_07005C38: + type: GFX + offset: 0x5C38 + symbol: wf_seg7_dl_07005C38 + +wf_seg7_dl_07005DD8: + type: GFX + offset: 0x5DD8 + symbol: wf_seg7_dl_07005DD8 + +wf_seg7_lights_0700E7D0: + type: LIGHTS + size: 24 + offset: 0xE7D0 + symbol: wf_seg7_lights_0700E7D0 + +wf_seg7_vertex_0700E7E8: + type: VTX + count: 16 + offset: 0xE7E8 + symbol: wf_seg7_vertex_0700E7E8 + +wf_seg7_vertex_0700E8E8: + type: VTX + count: 3 + offset: 0xE8E8 + symbol: wf_seg7_vertex_0700E8E8 + +wf_seg7_dl_0700E918: + type: GFX + offset: 0xE918 + symbol: wf_seg7_dl_0700E918 + +wf_seg7_dl_0700E9B8: + type: GFX + offset: 0xE9B8 + symbol: wf_seg7_dl_0700E9B8 + +wf_seg7_lights_0700E440: + type: LIGHTS + size: 24 + offset: 0xE440 + symbol: wf_seg7_lights_0700E440 + +wf_seg7_vertex_0700E458: + type: VTX + count: 15 + offset: 0xE458 + symbol: wf_seg7_vertex_0700E458 + +wf_seg7_vertex_0700E548: + type: VTX + count: 15 + offset: 0xE548 + symbol: wf_seg7_vertex_0700E548 + +wf_seg7_vertex_0700E638: + type: VTX + count: 6 + offset: 0xE638 + symbol: wf_seg7_vertex_0700E638 + +wf_seg7_dl_0700E698: + type: GFX + offset: 0xE698 + symbol: wf_seg7_dl_0700E698 + +wf_seg7_dl_0700E760: + type: GFX + offset: 0xE760 + symbol: wf_seg7_dl_0700E760 + +wf_seg7_vertex_0700F680: + type: VTX + count: 4 + offset: 0xF680 + symbol: wf_seg7_vertex_0700F680 + +wf_seg7_dl_0700F6C0: + type: GFX + offset: 0xF6C0 + symbol: wf_seg7_dl_0700F6C0 + +wf_seg7_lights_0700F3B8: + type: LIGHTS + size: 24 + offset: 0xF3B8 + symbol: wf_seg7_lights_0700F3B8 + +wf_seg7_vertex_0700F3D0: + type: VTX + count: 15 + offset: 0xF3D0 + symbol: wf_seg7_vertex_0700F3D0 + +wf_seg7_vertex_0700F4C0: + type: VTX + count: 11 + offset: 0xF4C0 + symbol: wf_seg7_vertex_0700F4C0 + +wf_seg7_dl_0700F570: + type: GFX + offset: 0xF570 + symbol: wf_seg7_dl_0700F570 + +wf_seg7_dl_0700F610: + type: GFX + offset: 0xF610 + symbol: wf_seg7_dl_0700F610 + +wf_seg7_lights_0700D780: + type: LIGHTS + size: 24 + offset: 0xD780 + symbol: wf_seg7_lights_0700D780 + +wf_seg7_vertex_0700D798: + type: VTX + count: 16 + offset: 0xD798 + symbol: wf_seg7_vertex_0700D798 + +wf_seg7_vertex_0700D898: + type: VTX + count: 6 + offset: 0xD898 + symbol: wf_seg7_vertex_0700D898 + +wf_seg7_vertex_0700D8F8: + type: VTX + count: 4 + offset: 0xD8F8 + symbol: wf_seg7_vertex_0700D8F8 + +wf_seg7_dl_0700D938: + type: GFX + offset: 0xD938 + symbol: wf_seg7_dl_0700D938 + +wf_seg7_dl_0700D9B8: + type: GFX + offset: 0xD9B8 + symbol: wf_seg7_dl_0700D9B8 + +wf_seg7_dl_0700D9F0: + type: GFX + offset: 0xD9F0 + symbol: wf_seg7_dl_0700D9F0 + +wf_seg7_lights_0700D370: + type: LIGHTS + size: 24 + offset: 0xD370 + symbol: wf_seg7_lights_0700D370 + +wf_seg7_vertex_0700D388: + type: VTX + count: 16 + offset: 0xD388 + symbol: wf_seg7_vertex_0700D388 + +wf_seg7_vertex_0700D488: + type: VTX + count: 14 + offset: 0xD488 + symbol: wf_seg7_vertex_0700D488 + +wf_seg7_vertex_0700D568: + type: VTX + count: 6 + offset: 0xD568 + symbol: wf_seg7_vertex_0700D568 + +wf_seg7_vertex_0700D5C8: + type: VTX + count: 4 + offset: 0xD5C8 + symbol: wf_seg7_vertex_0700D5C8 + +wf_seg7_dl_0700D608: + type: GFX + offset: 0xD608 + symbol: wf_seg7_dl_0700D608 + +wf_seg7_dl_0700D6D0: + type: GFX + offset: 0xD6D0 + symbol: wf_seg7_dl_0700D6D0 + +wf_seg7_dl_0700D708: + type: GFX + offset: 0xD708 + symbol: wf_seg7_dl_0700D708 + diff --git a/assets/ymls/us/actors/amp/geo.yml b/assets/ymls/us/actors/amp/geo.yml index 9d4e70cc..dd32aaf8 100644 --- a/assets/ymls/us/actors/amp/geo.yml +++ b/assets/ymls/us/actors/amp/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/amp.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/bird/geo.yml b/assets/ymls/us/actors/bird/geo.yml index afbb31ab..8323b995 100644 --- a/assets/ymls/us/actors/bird/geo.yml +++ b/assets/ymls/us/actors/bird/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/bird.yml" autopads: false segments: - [0x0C, 0x180540] diff --git a/assets/ymls/us/actors/blargg/geo.yml b/assets/ymls/us/actors/blargg/geo.yml index 203e89fb..69e1fef3 100644 --- a/assets/ymls/us/actors/blargg/geo.yml +++ b/assets/ymls/us/actors/blargg/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/blargg.yml" autopads: false segments: - [0x0C, 0x134A70] diff --git a/assets/ymls/us/actors/blue_coin_switch/geo.yml b/assets/ymls/us/actors/blue_coin_switch/geo.yml index 08780101..d39307d1 100644 --- a/assets/ymls/us/actors/blue_coin_switch/geo.yml +++ b/assets/ymls/us/actors/blue_coin_switch/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/blue_coin_switch.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/blue_fish/geo.yml b/assets/ymls/us/actors/blue_fish/geo.yml index b65fa569..1c6c9507 100644 --- a/assets/ymls/us/actors/blue_fish/geo.yml +++ b/assets/ymls/us/actors/blue_fish/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/blue_fish.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/bobomb/geo.yml b/assets/ymls/us/actors/bobomb/geo.yml index 9c6bb5b2..eeb930b4 100644 --- a/assets/ymls/us/actors/bobomb/geo.yml +++ b/assets/ymls/us/actors/bobomb/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/bobomb.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/bomb/geo.yml b/assets/ymls/us/actors/bomb/geo.yml index c61bea2b..aa9a8051 100644 --- a/assets/ymls/us/actors/bomb/geo.yml +++ b/assets/ymls/us/actors/bomb/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/bomb.yml" autopads: false segments: - [0x0D, 0x1B9070] diff --git a/assets/ymls/us/actors/boo/geo.yml b/assets/ymls/us/actors/boo/geo.yml index e24e44f2..57a10d62 100644 --- a/assets/ymls/us/actors/boo/geo.yml +++ b/assets/ymls/us/actors/boo/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/boo.yml" autopads: false segments: - [0x0C, 0x16D5C0] diff --git a/assets/ymls/us/actors/boo_castle/geo.yml b/assets/ymls/us/actors/boo_castle/geo.yml index b9c00cda..91a5efa2 100644 --- a/assets/ymls/us/actors/boo_castle/geo.yml +++ b/assets/ymls/us/actors/boo_castle/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/boo_castle.yml" autopads: false segments: - [0x0D, 0x1E4BF0] diff --git a/assets/ymls/us/actors/book/geo.yml b/assets/ymls/us/actors/book/geo.yml index f7275f9e..200835c7 100644 --- a/assets/ymls/us/actors/book/geo.yml +++ b/assets/ymls/us/actors/book/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/book.yml" autopads: false segments: - [0x0C, 0x16D5C0] diff --git a/assets/ymls/us/actors/bookend/geo.yml b/assets/ymls/us/actors/bookend/geo.yml index 52e40daf..2bebfe38 100644 --- a/assets/ymls/us/actors/bookend/geo.yml +++ b/assets/ymls/us/actors/bookend/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/bookend.yml" autopads: false segments: - [0x0C, 0x16D5C0] diff --git a/assets/ymls/us/actors/bowling_ball/geo.yml b/assets/ymls/us/actors/bowling_ball/geo.yml index c85305d2..702ee55b 100644 --- a/assets/ymls/us/actors/bowling_ball/geo.yml +++ b/assets/ymls/us/actors/bowling_ball/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/bobomb.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/bowser/geo.yml b/assets/ymls/us/actors/bowser/geo.yml index 2980f9a2..2556a67e 100644 --- a/assets/ymls/us/actors/bowser/geo.yml +++ b/assets/ymls/us/actors/bowser/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/bowser.yml" autopads: false segments: - [0x0D, 0x1B9070] diff --git a/assets/ymls/us/actors/bowser_flame/geo.yml b/assets/ymls/us/actors/bowser_flame/geo.yml index 9a2d2013..c53979ed 100644 --- a/assets/ymls/us/actors/bowser_flame/geo.yml +++ b/assets/ymls/us/actors/bowser_flame/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/bowser_flame.yml" autopads: false segments: - [0x0D, 0x1B9070] diff --git a/assets/ymls/us/actors/bowser_key/geo.yml b/assets/ymls/us/actors/bowser_key/geo.yml index 134020ac..77148c6b 100644 --- a/assets/ymls/us/actors/bowser_key/geo.yml +++ b/assets/ymls/us/actors/bowser_key/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/bowser_key.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/breakable_box.yml b/assets/ymls/us/actors/breakable_box.yml index be500a13..49195305 100644 --- a/assets/ymls/us/actors/breakable_box.yml +++ b/assets/ymls/us/actors/breakable_box.yml @@ -57,6 +57,6 @@ breakable_box_seg8_dl_08012D20: breakable_box_seg8_dl_08012D48: type: GFX - offset: 0x12D20 + offset: 0x12D48 symbol: breakable_box_seg8_dl_08012D48 diff --git a/assets/ymls/us/actors/breakable_box/geo.yml b/assets/ymls/us/actors/breakable_box/geo.yml index 1c3faa1d..ba9db951 100644 --- a/assets/ymls/us/actors/breakable_box/geo.yml +++ b/assets/ymls/us/actors/breakable_box/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/breakable_box.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/bub/geo.yml b/assets/ymls/us/actors/bub/geo.yml index a22aca14..3252d173 100644 --- a/assets/ymls/us/actors/bub/geo.yml +++ b/assets/ymls/us/actors/bub/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/bub.yml" autopads: false segments: - [0x0D, 0x1C3DB0] diff --git a/assets/ymls/us/actors/bubba/geo.yml b/assets/ymls/us/actors/bubba/geo.yml index af491c73..e3238002 100644 --- a/assets/ymls/us/actors/bubba/geo.yml +++ b/assets/ymls/us/actors/bubba/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/bubba.yml" autopads: false segments: - [0x0C, 0x187FA0] diff --git a/assets/ymls/us/actors/bubble/geo.yml b/assets/ymls/us/actors/bubble/geo.yml index ceb44b79..e065c1c0 100644 --- a/assets/ymls/us/actors/bubble/geo.yml +++ b/assets/ymls/us/actors/bubble/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/bubble.yml" autopads: false segments: - [0x17, 0x1279B0] diff --git a/assets/ymls/us/actors/bullet_bill/geo.yml b/assets/ymls/us/actors/bullet_bill/geo.yml index 29de2f4f..6a664f13 100644 --- a/assets/ymls/us/actors/bullet_bill/geo.yml +++ b/assets/ymls/us/actors/bullet_bill/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/bullet_bill.yml" autopads: false segments: - [0x0C, 0x132850] diff --git a/assets/ymls/us/actors/bully/geo.yml b/assets/ymls/us/actors/bully/geo.yml index 75cea45c..efb34d67 100644 --- a/assets/ymls/us/actors/bully/geo.yml +++ b/assets/ymls/us/actors/bully/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/bully.yml" autopads: false segments: - [0x0C, 0x134A70] diff --git a/assets/ymls/us/actors/burn_smoke/geo.yml b/assets/ymls/us/actors/burn_smoke/geo.yml index ca0b2673..579d52d3 100644 --- a/assets/ymls/us/actors/burn_smoke/geo.yml +++ b/assets/ymls/us/actors/burn_smoke/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/burn_smoke.yml" autopads: false segments: - [0x17, 0x1279B0] diff --git a/assets/ymls/us/actors/butterfly/geo.yml b/assets/ymls/us/actors/butterfly/geo.yml index d8f7de84..34aae71c 100644 --- a/assets/ymls/us/actors/butterfly/geo.yml +++ b/assets/ymls/us/actors/butterfly/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/butterfly.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/cannon_barrel/geo.yml b/assets/ymls/us/actors/cannon_barrel/geo.yml index 6afa860b..040d8836 100644 --- a/assets/ymls/us/actors/cannon_barrel/geo.yml +++ b/assets/ymls/us/actors/cannon_barrel/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/cannon_barrel.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/cannon_base/geo.yml b/assets/ymls/us/actors/cannon_base/geo.yml index 30590b41..3db52622 100644 --- a/assets/ymls/us/actors/cannon_base/geo.yml +++ b/assets/ymls/us/actors/cannon_base/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/cannon_base.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/capswitch/geo.yml b/assets/ymls/us/actors/capswitch/geo.yml index 0c57ec9f..2525433d 100644 --- a/assets/ymls/us/actors/capswitch/geo.yml +++ b/assets/ymls/us/actors/capswitch/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/capswitch.yml" autopads: false segments: - [0x0C, 0x166BD0] diff --git a/assets/ymls/us/actors/chain_ball/geo.yml b/assets/ymls/us/actors/chain_ball/geo.yml index 8cc2f1be..d65a8540 100644 --- a/assets/ymls/us/actors/chain_ball/geo.yml +++ b/assets/ymls/us/actors/chain_ball/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/chain_ball.yml" autopads: false segments: - [0x0D, 0x1D7C90] diff --git a/assets/ymls/us/actors/chain_chomp/geo.yml b/assets/ymls/us/actors/chain_chomp/geo.yml index 0892f56a..32b288d5 100644 --- a/assets/ymls/us/actors/chain_chomp/geo.yml +++ b/assets/ymls/us/actors/chain_chomp/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/chain_chomp.yml" autopads: false segments: - [0x0D, 0x1D7C90] diff --git a/assets/ymls/us/actors/chair/geo.yml b/assets/ymls/us/actors/chair/geo.yml index 33a179ee..74c95842 100644 --- a/assets/ymls/us/actors/chair/geo.yml +++ b/assets/ymls/us/actors/chair/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/chair.yml" autopads: false segments: - [0x0C, 0x16D5C0] diff --git a/assets/ymls/us/actors/checkerboard_platform/geo.yml b/assets/ymls/us/actors/checkerboard_platform/geo.yml index f7be3eb6..fb23d7f3 100644 --- a/assets/ymls/us/actors/checkerboard_platform/geo.yml +++ b/assets/ymls/us/actors/checkerboard_platform/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/checkerboard_platform.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/chillychief/geo.yml b/assets/ymls/us/actors/chillychief/geo.yml index e6bf6e33..54a52f12 100644 --- a/assets/ymls/us/actors/chillychief/geo.yml +++ b/assets/ymls/us/actors/chillychief/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/chillychief.yml" autopads: false compression: offset: 0x1E51F0 diff --git a/assets/ymls/us/actors/chuckya/geo.yml b/assets/ymls/us/actors/chuckya/geo.yml index be098270..dc4763e9 100644 --- a/assets/ymls/us/actors/chuckya/geo.yml +++ b/assets/ymls/us/actors/chuckya/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/chuckya.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/clam_shell/geo.yml b/assets/ymls/us/actors/clam_shell/geo.yml index 25e28ebf..151e250b 100644 --- a/assets/ymls/us/actors/clam_shell/geo.yml +++ b/assets/ymls/us/actors/clam_shell/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/clam_shell.yml" autopads: false segments: - [0x0C, 0x145C10] diff --git a/assets/ymls/us/actors/door/geo.yml b/assets/ymls/us/actors/door/geo.yml index 3eecb2f0..e5b7a378 100644 --- a/assets/ymls/us/actors/door/geo.yml +++ b/assets/ymls/us/actors/door/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/door.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/dorrie/geo.yml b/assets/ymls/us/actors/dorrie/geo.yml index e6c01a03..daec3e93 100644 --- a/assets/ymls/us/actors/dorrie/geo.yml +++ b/assets/ymls/us/actors/dorrie/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/dorrie.yml" autopads: false segments: - [0x0D, 0x1F1B30] diff --git a/assets/ymls/us/actors/exclamation_box/geo.yml b/assets/ymls/us/actors/exclamation_box/geo.yml index 06d1c722..c810310d 100644 --- a/assets/ymls/us/actors/exclamation_box/geo.yml +++ b/assets/ymls/us/actors/exclamation_box/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/exclamation_box.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/exclamation_box_outline/geo.yml b/assets/ymls/us/actors/exclamation_box_outline/geo.yml index 638d050f..0acd8ee4 100644 --- a/assets/ymls/us/actors/exclamation_box_outline/geo.yml +++ b/assets/ymls/us/actors/exclamation_box_outline/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/exclamation_box_outline.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/explosion/geo.yml b/assets/ymls/us/actors/explosion/geo.yml index 48f6e19c..107cb5e7 100644 --- a/assets/ymls/us/actors/explosion/geo.yml +++ b/assets/ymls/us/actors/explosion/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/explosion.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/eyerok/geo.yml b/assets/ymls/us/actors/eyerok/geo.yml index 09722133..e61d0ab6 100644 --- a/assets/ymls/us/actors/eyerok/geo.yml +++ b/assets/ymls/us/actors/eyerok/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/eyerok.yml" autopads: false segments: - [0x0C, 0x151B70] diff --git a/assets/ymls/us/actors/flame/geo.yml b/assets/ymls/us/actors/flame/geo.yml index 1eb6e534..507319fa 100644 --- a/assets/ymls/us/actors/flame/geo.yml +++ b/assets/ymls/us/actors/flame/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/flame.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/flyguy/geo.yml b/assets/ymls/us/actors/flyguy/geo.yml index f02d7eb2..5683013e 100644 --- a/assets/ymls/us/actors/flyguy/geo.yml +++ b/assets/ymls/us/actors/flyguy/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/flyguy.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/fwoosh/geo.yml b/assets/ymls/us/actors/fwoosh/geo.yml index 8a515a2d..3004d6e1 100644 --- a/assets/ymls/us/actors/fwoosh/geo.yml +++ b/assets/ymls/us/actors/fwoosh/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/fwoosh.yml" autopads: false segments: - [0x0C, 0x1602E0] diff --git a/assets/ymls/us/actors/goomba/geo.yml b/assets/ymls/us/actors/goomba/geo.yml index e20eb4d8..c5594bde 100644 --- a/assets/ymls/us/actors/goomba/geo.yml +++ b/assets/ymls/us/actors/goomba/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/goomba.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/haunted_cage/geo.yml b/assets/ymls/us/actors/haunted_cage/geo.yml index 870bca84..2ba50f32 100644 --- a/assets/ymls/us/actors/haunted_cage/geo.yml +++ b/assets/ymls/us/actors/haunted_cage/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/haunted_cage.yml" autopads: false segments: - [0x0C, 0x16D5C0] diff --git a/assets/ymls/us/actors/heart/geo.yml b/assets/ymls/us/actors/heart/geo.yml index 5024e9d4..74bddaf0 100644 --- a/assets/ymls/us/actors/heart/geo.yml +++ b/assets/ymls/us/actors/heart/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/heart.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/heave_ho/geo.yml b/assets/ymls/us/actors/heave_ho/geo.yml index 443fdc7a..eb54ed0e 100644 --- a/assets/ymls/us/actors/heave_ho/geo.yml +++ b/assets/ymls/us/actors/heave_ho/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/heave_ho.yml" autopads: false segments: - [0x0C, 0x132850] diff --git a/assets/ymls/us/actors/hoot/geo.yml b/assets/ymls/us/actors/hoot/geo.yml index b96892f5..d2763824 100644 --- a/assets/ymls/us/actors/hoot/geo.yml +++ b/assets/ymls/us/actors/hoot/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/hoot.yml" autopads: false segments: - [0x0C, 0x132850] diff --git a/assets/ymls/us/actors/impact_ring/geo.yml b/assets/ymls/us/actors/impact_ring/geo.yml index 1b6091f6..55e0eb78 100644 --- a/assets/ymls/us/actors/impact_ring/geo.yml +++ b/assets/ymls/us/actors/impact_ring/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/impact_ring.yml" autopads: false segments: - [0x0D, 0x1B9070] diff --git a/assets/ymls/us/actors/impact_smoke.yml b/assets/ymls/us/actors/impact_smoke.yml index e96cee48..c825b335 100644 --- a/assets/ymls/us/actors/impact_smoke.yml +++ b/assets/ymls/us/actors/impact_smoke.yml @@ -5,6 +5,8 @@ segments: - [0x06, 0x188440] +# shifted 0x150 compared to JP + impact_smoke_0: type: TEXTURE size: 8192 @@ -41,46 +43,46 @@ impact_smoke_3: impact_smoke_seg6_vertex_06062A28: type: VTX count: 8 - offset: 0x62A28 + offset: 0x62B78 symbol: impact_smoke_seg6_vertex_06062A28 impact_smoke_seg6_dl_06062AA8: type: GFX - offset: 0x62AA8 + offset: 0x62BF8 symbol: impact_smoke_seg6_dl_06062AA8 impact_smoke_seg6_dl_06062AD8: type: GFX - offset: 0x62AD8 + offset: 0x62C28 symbol: impact_smoke_seg6_dl_06062AD8 impact_smoke_seg6_dl_06062AF0: type: GFX - offset: 0x62AF0 + offset: 0x62C40 symbol: impact_smoke_seg6_dl_06062AF0 impact_smoke_seg6_dl_06062B08: type: GFX - offset: 0x62B08 + offset: 0x62C58 symbol: impact_smoke_seg6_dl_06062B08 impact_smoke_seg6_dl_06062B38: type: GFX - offset: 0x62B38 + offset: 0x62C88 symbol: impact_smoke_seg6_dl_06062B38 impact_smoke_seg6_dl_06062BD8: type: GFX - offset: 0x62BD8 + offset: 0x62D28 symbol: impact_smoke_seg6_dl_06062BD8 impact_smoke_seg6_dl_06062C78: type: GFX - offset: 0x62C78 + offset: 0x62DC8 symbol: impact_smoke_seg6_dl_06062C78 impact_smoke_seg6_dl_06062D18: type: GFX - offset: 0x62D18 + offset: 0x62E68 symbol: impact_smoke_seg6_dl_06062D18 diff --git a/assets/ymls/us/actors/impact_smoke/geo.yml b/assets/ymls/us/actors/impact_smoke/geo.yml index c361e544..ed9b3436 100644 --- a/assets/ymls/us/actors/impact_smoke/geo.yml +++ b/assets/ymls/us/actors/impact_smoke/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/impact_smoke.yml" autopads: false segments: - [0x0D, 0x1B9070] diff --git a/assets/ymls/us/actors/king_bobomb/geo.yml b/assets/ymls/us/actors/king_bobomb/geo.yml index e044a7e2..7ddbfe44 100644 --- a/assets/ymls/us/actors/king_bobomb/geo.yml +++ b/assets/ymls/us/actors/king_bobomb/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/king_bobomb.yml" autopads: false segments: - [0x0C, 0x13B5D0] diff --git a/assets/ymls/us/actors/klepto/geo.yml b/assets/ymls/us/actors/klepto/geo.yml index 9bee8f59..b8f88893 100644 --- a/assets/ymls/us/actors/klepto/geo.yml +++ b/assets/ymls/us/actors/klepto/geo.yml @@ -1,4 +1,9 @@ :config: + external_files: + - "assets/ymls/us/actors/klepto.yml" + - "assets/ymls/us/actors/mario_cap.yml" + - "assets/ymls/us/actors/star.yml" + - "assets/ymls/us/actors/transparent_star.yml" autopads: false segments: - [0x0C, 0x151B70] diff --git a/assets/ymls/us/actors/koopa/geo.yml b/assets/ymls/us/actors/koopa/geo.yml index 34409680..a7515998 100644 --- a/assets/ymls/us/actors/koopa/geo.yml +++ b/assets/ymls/us/actors/koopa/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/koopa.yml" autopads: false segments: - [0x0D, 0x1D7C90] diff --git a/assets/ymls/us/actors/koopa_flag/geo.yml b/assets/ymls/us/actors/koopa_flag/geo.yml index ff97ba28..8d334771 100644 --- a/assets/ymls/us/actors/koopa_flag/geo.yml +++ b/assets/ymls/us/actors/koopa_flag/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/koopa_flag.yml" autopads: false segments: - [0x0D, 0x1D7C90] diff --git a/assets/ymls/us/actors/koopa_shell/geo.yml b/assets/ymls/us/actors/koopa_shell/geo.yml index b0990bea..8d4606aa 100644 --- a/assets/ymls/us/actors/koopa_shell/geo.yml +++ b/assets/ymls/us/actors/koopa_shell/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/koopa_shell.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/lakitu_cameraman/geo.yml b/assets/ymls/us/actors/lakitu_cameraman/geo.yml index 5895626a..ebd5681a 100644 --- a/assets/ymls/us/actors/lakitu_cameraman/geo.yml +++ b/assets/ymls/us/actors/lakitu_cameraman/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/lakitu_cameraman.yml" autopads: false segments: - [0x0D, 0x1E4BF0] diff --git a/assets/ymls/us/actors/lakitu_enemy/geo.yml b/assets/ymls/us/actors/lakitu_enemy/geo.yml index 7ce81992..a1f940d8 100644 --- a/assets/ymls/us/actors/lakitu_enemy/geo.yml +++ b/assets/ymls/us/actors/lakitu_enemy/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/lakitu_enemy.yml" autopads: false segments: - [0x0C, 0x187FA0] diff --git a/assets/ymls/us/actors/leaves/geo.yml b/assets/ymls/us/actors/leaves/geo.yml index fd778d09..49f7262a 100644 --- a/assets/ymls/us/actors/leaves/geo.yml +++ b/assets/ymls/us/actors/leaves/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/leaves.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/mad_piano/geo.yml b/assets/ymls/us/actors/mad_piano/geo.yml index c576ff9a..7222d60c 100644 --- a/assets/ymls/us/actors/mad_piano/geo.yml +++ b/assets/ymls/us/actors/mad_piano/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/mad_piano.yml" autopads: false segments: - [0x0C, 0x16D5C0] diff --git a/assets/ymls/us/actors/manta/geo.yml b/assets/ymls/us/actors/manta/geo.yml index 4ff6d832..15a28f3a 100644 --- a/assets/ymls/us/actors/manta/geo.yml +++ b/assets/ymls/us/actors/manta/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/manta.yml" autopads: false segments: - [0x05, 0x13B910] diff --git a/assets/ymls/us/actors/mario/geo.yml b/assets/ymls/us/actors/mario/geo.yml index 6dcb857d..59906e55 100644 --- a/assets/ymls/us/actors/mario/geo.yml +++ b/assets/ymls/us/actors/mario/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/mario.yml" autopads: false segments: - [0x17, 0x1279b0] diff --git a/assets/ymls/us/actors/mario_cap.yml b/assets/ymls/us/actors/mario_cap.yml index 1a134f72..258b8ef7 100644 --- a/assets/ymls/us/actors/mario_cap.yml +++ b/assets/ymls/us/actors/mario_cap.yml @@ -3,7 +3,7 @@ compression: offset: 0x114750 segments: - - [0x04, 0x114750] + - [0x03, 0x114750] mario_cap_logo: type: TEXTURE diff --git a/assets/ymls/us/actors/mario_cap/geo.yml b/assets/ymls/us/actors/mario_cap/geo.yml index a090e1cb..0f7948c0 100644 --- a/assets/ymls/us/actors/mario_cap/geo.yml +++ b/assets/ymls/us/actors/mario_cap/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/mario_cap.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/metal_box/geo.yml b/assets/ymls/us/actors/metal_box/geo.yml index cbb71420..edc83281 100644 --- a/assets/ymls/us/actors/metal_box/geo.yml +++ b/assets/ymls/us/actors/metal_box/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/metal_box.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/mips/geo.yml b/assets/ymls/us/actors/mips/geo.yml index 47f661ec..42b58497 100644 --- a/assets/ymls/us/actors/mips/geo.yml +++ b/assets/ymls/us/actors/mips/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/mips.yml" autopads: false segments: - [0x0D, 0x1E4BF0] diff --git a/assets/ymls/us/actors/mist/geo.yml b/assets/ymls/us/actors/mist/geo.yml index c1dfedc4..c7f98bd9 100644 --- a/assets/ymls/us/actors/mist/geo.yml +++ b/assets/ymls/us/actors/mist/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/mist.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/moneybag/geo.yml b/assets/ymls/us/actors/moneybag/geo.yml index 3b6f5ecc..f9988f49 100644 --- a/assets/ymls/us/actors/moneybag/geo.yml +++ b/assets/ymls/us/actors/moneybag/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/moneybag.yml" autopads: false segments: - [0x0D, 0x1E7D90] diff --git a/assets/ymls/us/actors/monty_mole/geo.yml b/assets/ymls/us/actors/monty_mole/geo.yml index ab05af74..d7b5c414 100644 --- a/assets/ymls/us/actors/monty_mole/geo.yml +++ b/assets/ymls/us/actors/monty_mole/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/monty_mole.yml" autopads: false segments: - [0x0C, 0x1602E0] diff --git a/assets/ymls/us/actors/mr_i_eyeball/geo.yml b/assets/ymls/us/actors/mr_i_eyeball/geo.yml index c0900593..9ec3b14b 100644 --- a/assets/ymls/us/actors/mr_i_eyeball/geo.yml +++ b/assets/ymls/us/actors/mr_i_eyeball/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/mr_i_eyeball.yml" autopads: false segments: - [0x0D, 0x1F1B30] diff --git a/assets/ymls/us/actors/mr_i_iris/geo.yml b/assets/ymls/us/actors/mr_i_iris/geo.yml index ef1855bf..4f15f4d8 100644 --- a/assets/ymls/us/actors/mr_i_iris/geo.yml +++ b/assets/ymls/us/actors/mr_i_iris/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/mr_i_iris.yml" autopads: false segments: - [0x0D, 0x1F1B30] diff --git a/assets/ymls/us/actors/mushroom_1up/geo.yml b/assets/ymls/us/actors/mushroom_1up/geo.yml index 09223fa5..3ab0ecf7 100644 --- a/assets/ymls/us/actors/mushroom_1up/geo.yml +++ b/assets/ymls/us/actors/mushroom_1up/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/mushroom_1up.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/number/geo.yml b/assets/ymls/us/actors/number/geo.yml index df36d97b..7d18ab23 100644 --- a/assets/ymls/us/actors/number/geo.yml +++ b/assets/ymls/us/actors/number/geo.yml @@ -1,9 +1,13 @@ :config: + external_files: + - "assets/ymls/us/actors/number.yml" autopads: false segments: - [0x16, 0x218DA0] -number_geo: - type: SM64:GEO_LAYOUT - offset: 0x16000E14 - symbol: number_geo +# TODO: Needs segment2 completed + +# number_geo: +# type: SM64:GEO_LAYOUT +# offset: 0x16000E14 +# symbol: number_geo diff --git a/assets/ymls/us/actors/peach/geo.yml b/assets/ymls/us/actors/peach/geo.yml index 4ee6941d..646ee5bb 100644 --- a/assets/ymls/us/actors/peach/geo.yml +++ b/assets/ymls/us/actors/peach/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/peach.yml" autopads: false segments: - [0x0C, 0x180540] diff --git a/assets/ymls/us/actors/penguin/geo.yml b/assets/ymls/us/actors/penguin/geo.yml index 3c4b607d..8ffd571c 100644 --- a/assets/ymls/us/actors/penguin/geo.yml +++ b/assets/ymls/us/actors/penguin/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/penguin.yml" autopads: false segments: - [0x0C, 0x1656E0] diff --git a/assets/ymls/us/actors/piranha_plant/geo.yml b/assets/ymls/us/actors/piranha_plant/geo.yml index da395e2e..2ba92105 100644 --- a/assets/ymls/us/actors/piranha_plant/geo.yml +++ b/assets/ymls/us/actors/piranha_plant/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/piranha_plant.yml" autopads: false segments: - [0x0D, 0x1D7C90] diff --git a/assets/ymls/us/actors/pokey/geo.yml b/assets/ymls/us/actors/pokey/geo.yml index ca431ca0..f9836bba 100644 --- a/assets/ymls/us/actors/pokey/geo.yml +++ b/assets/ymls/us/actors/pokey/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/pokey.yml" autopads: false segments: - [0x0C, 0x151B70] diff --git a/assets/ymls/us/actors/poundable_pole/geo.yml b/assets/ymls/us/actors/poundable_pole/geo.yml index ec7c4775..6b7ce505 100644 --- a/assets/ymls/us/actors/poundable_pole/geo.yml +++ b/assets/ymls/us/actors/poundable_pole/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/poundable_pole.yml" autopads: false segments: - [0x0D, 0x1D7C90] diff --git a/assets/ymls/us/actors/purple_switch/geo.yml b/assets/ymls/us/actors/purple_switch/geo.yml index 530b4e45..07128fb2 100644 --- a/assets/ymls/us/actors/purple_switch/geo.yml +++ b/assets/ymls/us/actors/purple_switch/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/purple_switch.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/scuttlebug/geo.yml b/assets/ymls/us/actors/scuttlebug/geo.yml index 9bb76e7f..cfa61ad2 100644 --- a/assets/ymls/us/actors/scuttlebug/geo.yml +++ b/assets/ymls/us/actors/scuttlebug/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/scuttlebug.yml" autopads: false segments: - [0x0D, 0x1F1B30] diff --git a/assets/ymls/us/actors/seaweed/geo.yml b/assets/ymls/us/actors/seaweed/geo.yml index 9dc61dc6..7e7de314 100644 --- a/assets/ymls/us/actors/seaweed/geo.yml +++ b/assets/ymls/us/actors/seaweed/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/seaweed.yml" autopads: false segments: - [0x0D, 0x1C3DB0] diff --git a/assets/ymls/us/actors/skeeter/geo.yml b/assets/ymls/us/actors/skeeter/geo.yml index 64186d36..0a5a6aac 100644 --- a/assets/ymls/us/actors/skeeter/geo.yml +++ b/assets/ymls/us/actors/skeeter/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/skeeter.yml" autopads: false segments: - [0x0D, 0x1C3DB0] diff --git a/assets/ymls/us/actors/small_key/geo.yml b/assets/ymls/us/actors/small_key/geo.yml index d847c44b..0c4157c7 100644 --- a/assets/ymls/us/actors/small_key/geo.yml +++ b/assets/ymls/us/actors/small_key/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/small_key.yml" autopads: false segments: - [0x0C, 0x16D5C0] diff --git a/assets/ymls/us/actors/snowman/geo.yml b/assets/ymls/us/actors/snowman/geo.yml index 6ebd99bb..e2f38680 100644 --- a/assets/ymls/us/actors/snowman/geo.yml +++ b/assets/ymls/us/actors/snowman/geo.yml @@ -1,4 +1,7 @@ :config: + external_files: + - "assets/ymls/us/actors/snowman.yml" + - "assets/ymls/us/actors/mario_cap.yml" autopads: false segments: - [0x0C, 0x1656E0] diff --git a/assets/ymls/us/actors/snufit/geo.yml b/assets/ymls/us/actors/snufit/geo.yml index 24e27f64..555a1b9e 100644 --- a/assets/ymls/us/actors/snufit/geo.yml +++ b/assets/ymls/us/actors/snufit/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/snufit.yml" autopads: false segments: - [0x0D, 0x1F1B30] diff --git a/assets/ymls/us/actors/sparkle/geo.yml b/assets/ymls/us/actors/sparkle/geo.yml index e1a2c623..15cf744c 100644 --- a/assets/ymls/us/actors/sparkle/geo.yml +++ b/assets/ymls/us/actors/sparkle/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/sparkle.yml" autopads: false segments: - [0x17, 0x1279B0] diff --git a/assets/ymls/us/actors/sparkle_animation/geo.yml b/assets/ymls/us/actors/sparkle_animation/geo.yml index f33cf18b..afeea033 100644 --- a/assets/ymls/us/actors/sparkle_animation/geo.yml +++ b/assets/ymls/us/actors/sparkle_animation/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/sparkle_animation.yml" autopads: false segments: - [0x17, 0x1279B0] diff --git a/assets/ymls/us/actors/spindrift.yml b/assets/ymls/us/actors/spindrift.yml index 3168bd30..43e2d260 100644 --- a/assets/ymls/us/actors/spindrift.yml +++ b/assets/ymls/us/actors/spindrift.yml @@ -120,3 +120,33 @@ spindrift_seg5_dl_05000328: offset: 0x328 symbol: spindrift_seg5_dl_05000328 +spindrift_seg5_dl_05002748: + type: GFX + offset: 0x2748 + symbol: spindrift_seg5_dl_05002748 + +spindrift_seg5_dl_05002830: + type: GFX + offset: 0x2830 + symbol: spindrift_seg5_dl_05002830 + +spindrift_seg5_dl_05002900: + type: GFX + offset: 0x2900 + symbol: spindrift_seg5_dl_05002900 + +spindrift_seg5_dl_05002A20: + type: GFX + offset: 0x2A20 + symbol: spindrift_seg5_dl_05002A20 + +spindrift_seg5_dl_05002B30: + type: GFX + offset: 0x2B30 + symbol: spindrift_seg5_dl_05002B30 + +spindrift_seg5_dl_05002D08: + type: GFX + offset: 0x2D08 + symbol: spindrift_seg5_dl_05002D08 + diff --git a/assets/ymls/us/actors/spindrift/geo.yml b/assets/ymls/us/actors/spindrift/geo.yml index a4d274dd..4ba11af6 100644 --- a/assets/ymls/us/actors/spindrift/geo.yml +++ b/assets/ymls/us/actors/spindrift/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/spindrift.yml" autopads: false segments: - [0x0C, 0x1656E0] diff --git a/assets/ymls/us/actors/spiny/geo.yml b/assets/ymls/us/actors/spiny/geo.yml index b3c77166..3ca3d819 100644 --- a/assets/ymls/us/actors/spiny/geo.yml +++ b/assets/ymls/us/actors/spiny/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/spiny.yml" autopads: false segments: - [0x0C, 0x187FA0] diff --git a/assets/ymls/us/actors/spiny_egg/geo.yml b/assets/ymls/us/actors/spiny_egg/geo.yml index 7f92569e..0a13c0ec 100644 --- a/assets/ymls/us/actors/spiny_egg/geo.yml +++ b/assets/ymls/us/actors/spiny_egg/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/spiny_egg.yml" autopads: false segments: - [0x0C, 0x187FA0] diff --git a/assets/ymls/us/actors/springboard/geo.yml b/assets/ymls/us/actors/springboard/geo.yml index 334157b6..d20dba92 100644 --- a/assets/ymls/us/actors/springboard/geo.yml +++ b/assets/ymls/us/actors/springboard/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/springboard.yml" autopads: false segments: - [0x0C, 0x166BD0] diff --git a/assets/ymls/us/actors/star/geo.yml b/assets/ymls/us/actors/star/geo.yml index 7323aedf..d725d162 100644 --- a/assets/ymls/us/actors/star/geo.yml +++ b/assets/ymls/us/actors/star/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/star.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/stomp_smoke/geo.yml b/assets/ymls/us/actors/stomp_smoke/geo.yml index 0dfa3c39..4fdb8ca3 100644 --- a/assets/ymls/us/actors/stomp_smoke/geo.yml +++ b/assets/ymls/us/actors/stomp_smoke/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/stomp_smoke.yml" autopads: false segments: - [0x17, 0x1279B0] diff --git a/assets/ymls/us/actors/sushi/geo.yml b/assets/ymls/us/actors/sushi/geo.yml index d1726e35..756511cc 100644 --- a/assets/ymls/us/actors/sushi/geo.yml +++ b/assets/ymls/us/actors/sushi/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/sushi.yml" autopads: false segments: - [0x0C, 0x145C10] diff --git a/assets/ymls/us/actors/swoop/geo.yml b/assets/ymls/us/actors/swoop/geo.yml index a933290c..bec23e2b 100644 --- a/assets/ymls/us/actors/swoop/geo.yml +++ b/assets/ymls/us/actors/swoop/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/swoop.yml" autopads: false segments: - [0x0D, 0x1F1B30] diff --git a/assets/ymls/us/actors/test_platform/geo.yml b/assets/ymls/us/actors/test_platform/geo.yml index a44b7fad..699176ad 100644 --- a/assets/ymls/us/actors/test_platform/geo.yml +++ b/assets/ymls/us/actors/test_platform/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/test_platform.yml" autopads: false segments: - [0x0F, 0x2008D0] diff --git a/assets/ymls/us/actors/thwomp/geo.yml b/assets/ymls/us/actors/thwomp/geo.yml index 3df5fc72..91e19378 100644 --- a/assets/ymls/us/actors/thwomp/geo.yml +++ b/assets/ymls/us/actors/thwomp/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/thwomp.yml" autopads: false segments: - [0x0C, 0x132850] diff --git a/assets/ymls/us/actors/toad/geo.yml b/assets/ymls/us/actors/toad/geo.yml index ad461830..b956f682 100644 --- a/assets/ymls/us/actors/toad/geo.yml +++ b/assets/ymls/us/actors/toad/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/toad.yml" autopads: false segments: - [0x0D, 0x1E4BF0] diff --git a/assets/ymls/us/actors/tornado/geo.yml b/assets/ymls/us/actors/tornado/geo.yml index 6f6ed6c0..6238ed7d 100644 --- a/assets/ymls/us/actors/tornado/geo.yml +++ b/assets/ymls/us/actors/tornado/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/tornado.yml" autopads: false compression: offset: 0x145E90 diff --git a/assets/ymls/us/actors/transparent_star/geo.yml b/assets/ymls/us/actors/transparent_star/geo.yml index cad166f0..4d6f04b7 100644 --- a/assets/ymls/us/actors/transparent_star/geo.yml +++ b/assets/ymls/us/actors/transparent_star/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/transparent_star.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/treasure_chest/geo.yml b/assets/ymls/us/actors/treasure_chest/geo.yml index 39a65ed1..6649f923 100644 --- a/assets/ymls/us/actors/treasure_chest/geo.yml +++ b/assets/ymls/us/actors/treasure_chest/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/treasure_chest.yml" autopads: false segments: - [0x0D, 0x1C3DB0] diff --git a/assets/ymls/us/actors/tree/geo.yml b/assets/ymls/us/actors/tree/geo.yml index 5659f666..04665181 100644 --- a/assets/ymls/us/actors/tree/geo.yml +++ b/assets/ymls/us/actors/tree/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/tree.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/ukiki/geo.yml b/assets/ymls/us/actors/ukiki/geo.yml index 8c66aaaa..c1debe4d 100644 --- a/assets/ymls/us/actors/ukiki/geo.yml +++ b/assets/ymls/us/actors/ukiki/geo.yml @@ -1,4 +1,7 @@ :config: + external_files: + - "assets/ymls/us/actors/ukiki.yml" + - "assets/ymls/us/actors/mario_cap.yml" autopads: false segments: - [0x0C, 0x1602E0] diff --git a/assets/ymls/us/actors/unagi/geo.yml b/assets/ymls/us/actors/unagi/geo.yml index 2fc9a9b1..792b748e 100644 --- a/assets/ymls/us/actors/unagi/geo.yml +++ b/assets/ymls/us/actors/unagi/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/unagi.yml" autopads: false segments: - [0x0C, 0x145C10] diff --git a/assets/ymls/us/actors/walk_smoke/geo.yml b/assets/ymls/us/actors/walk_smoke/geo.yml index fbdd808c..e56cb04d 100644 --- a/assets/ymls/us/actors/walk_smoke/geo.yml +++ b/assets/ymls/us/actors/walk_smoke/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/walk_smoke.yml" autopads: false segments: - [0x17, 0x1279B0] diff --git a/assets/ymls/us/actors/warp_pipe/geo.yml b/assets/ymls/us/actors/warp_pipe/geo.yml index d91ca479..0b11b71e 100644 --- a/assets/ymls/us/actors/warp_pipe/geo.yml +++ b/assets/ymls/us/actors/warp_pipe/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/warp_pipe.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/water_bubble/geo.yml b/assets/ymls/us/actors/water_bubble/geo.yml index 81f66519..94670b84 100644 --- a/assets/ymls/us/actors/water_bubble/geo.yml +++ b/assets/ymls/us/actors/water_bubble/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/water_bubble.yml" autopads: false segments: - [0x0C, 0x13B5D0] diff --git a/assets/ymls/us/actors/water_mine/geo.yml b/assets/ymls/us/actors/water_mine/geo.yml index b88bd3b4..2deb1f4d 100644 --- a/assets/ymls/us/actors/water_mine/geo.yml +++ b/assets/ymls/us/actors/water_mine/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/water_mine.yml" autopads: false segments: - [0x0D, 0x1C3DB0] diff --git a/assets/ymls/us/actors/water_ring/geo.yml b/assets/ymls/us/actors/water_ring/geo.yml index 686aa9d2..e8bddb91 100644 --- a/assets/ymls/us/actors/water_ring/geo.yml +++ b/assets/ymls/us/actors/water_ring/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/water_ring.yml" autopads: false segments: - [0x0D, 0x1C3DB0] diff --git a/assets/ymls/us/actors/water_splash/geo.yml b/assets/ymls/us/actors/water_splash/geo.yml index 42b73c0f..14c9eb75 100644 --- a/assets/ymls/us/actors/water_splash/geo.yml +++ b/assets/ymls/us/actors/water_splash/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/water_splash.yml" autopads: false segments: - [0x17, 0x1279B0] diff --git a/assets/ymls/us/actors/water_wave/geo.yml b/assets/ymls/us/actors/water_wave/geo.yml index ac5134dc..b2df9ee7 100644 --- a/assets/ymls/us/actors/water_wave/geo.yml +++ b/assets/ymls/us/actors/water_wave/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/water_wave.yml" autopads: false segments: - [0x17, 0x1279B0] diff --git a/assets/ymls/us/actors/white_particle/geo.yml b/assets/ymls/us/actors/white_particle/geo.yml index ea9260c4..3cd2e2ae 100644 --- a/assets/ymls/us/actors/white_particle/geo.yml +++ b/assets/ymls/us/actors/white_particle/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/white_particle.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/whomp/geo.yml b/assets/ymls/us/actors/whomp/geo.yml index 08788f4a..291e2e87 100644 --- a/assets/ymls/us/actors/whomp/geo.yml +++ b/assets/ymls/us/actors/whomp/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/whomp.yml" autopads: false segments: - [0x0D, 0x1D7C90] diff --git a/assets/ymls/us/actors/wiggler_body.yml b/assets/ymls/us/actors/wiggler_body.yml index 86ffc01f..708ff73b 100644 --- a/assets/ymls/us/actors/wiggler_body.yml +++ b/assets/ymls/us/actors/wiggler_body.yml @@ -209,3 +209,7 @@ wiggler_seg5_dl_0500C278: offset: 0xC278 symbol: wiggler_seg5_dl_0500C278 +wiggler_body_geo: + type: SM64:GEO_LAYOUT + offset: 0xC778 + symbol: wiggler_body_geo \ No newline at end of file diff --git a/assets/ymls/us/actors/wiggler_body/geo.yml b/assets/ymls/us/actors/wiggler_body/geo.yml deleted file mode 100644 index 3c88265f..00000000 --- a/assets/ymls/us/actors/wiggler_body/geo.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Move into wiggler? - -:config: - autopads: false - compression: - offset: 0x180BB0 - segments: - - [0x05, 0x180BB0] - -wiggler_body_geo: - type: SM64:GEO_LAYOUT - offset: 0xC778 - symbol: wiggler_body_geo diff --git a/assets/ymls/us/actors/wiggler_head/geo.yml b/assets/ymls/us/actors/wiggler_head/geo.yml index 07fa09a3..59808d8c 100644 --- a/assets/ymls/us/actors/wiggler_head/geo.yml +++ b/assets/ymls/us/actors/wiggler_head/geo.yml @@ -1,4 +1,7 @@ :config: + external_files: + - "assets/ymls/us/actors/wiggler_head.yml" + - "assets/ymls/us/actors/wiggler_body.yml" autopads: false segments: - [0x0C, 0x187FA0] diff --git a/assets/ymls/us/actors/wooden_signpost/geo.yml b/assets/ymls/us/actors/wooden_signpost/geo.yml index 0042d30e..ed4d3b13 100644 --- a/assets/ymls/us/actors/wooden_signpost/geo.yml +++ b/assets/ymls/us/actors/wooden_signpost/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/wooden_signpost.yml" autopads: false segments: - [0x16, 0x218DA0] diff --git a/assets/ymls/us/actors/yellow_sphere/geo.yml b/assets/ymls/us/actors/yellow_sphere/geo.yml index d9924100..e8d14bf0 100644 --- a/assets/ymls/us/actors/yellow_sphere/geo.yml +++ b/assets/ymls/us/actors/yellow_sphere/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/yellow_sphere.yml" autopads: false segments: - [0x0D, 0x1B9070] diff --git a/assets/ymls/us/actors/yellow_sphere_small/geo.yml b/assets/ymls/us/actors/yellow_sphere_small/geo.yml index 36bc986e..def9690e 100644 --- a/assets/ymls/us/actors/yellow_sphere_small/geo.yml +++ b/assets/ymls/us/actors/yellow_sphere_small/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/yellow_sphere_small.yml" autopads: false segments: - [0x0C, 0x132850] diff --git a/assets/ymls/us/actors/yoshi.yml b/assets/ymls/us/actors/yoshi.yml index 4b5dd1a2..e7486dde 100644 --- a/assets/ymls/us/actors/yoshi.yml +++ b/assets/ymls/us/actors/yoshi.yml @@ -5,6 +5,8 @@ segments: - [0x05, 0x16D870] +# shifted by 0xE8 compared to jp + yoshi_eye: type: TEXTURE size: 512 @@ -33,637 +35,637 @@ yoshi_nostril: yoshi_seg5_lights_0501C458: type: LIGHTS size: 24 - offset: 0x1C458 + offset: 0x1C540 symbol: yoshi_seg5_lights_0501C458 yoshi_seg5_lights_0501C470: type: LIGHTS size: 24 - offset: 0x1C470 + offset: 0x1C558 symbol: yoshi_seg5_lights_0501C470 yoshi_seg5_lights_0501C488: type: LIGHTS size: 24 - offset: 0x1C488 + offset: 0x1C570 symbol: yoshi_seg5_lights_0501C488 yoshi_seg5_vertex_0501CAA0: type: VTX count: 6 - offset: 0x1CAA0 + offset: 0x1CB88 symbol: yoshi_seg5_vertex_0501CAA0 yoshi_seg5_vertex_0501CB00: type: VTX count: 11 - offset: 0x1CB00 + offset: 0x1CBE8 symbol: yoshi_seg5_vertex_0501CB00 yoshi_seg5_vertex_0501CBB0: type: VTX count: 5 - offset: 0x1CBB0 + offset: 0x1CC98 symbol: yoshi_seg5_vertex_0501CBB0 yoshi_seg5_vertex_0501CC00: type: VTX count: 15 - offset: 0x1CC00 + offset: 0x1CCE8 symbol: yoshi_seg5_vertex_0501CC00 yoshi_seg5_vertex_0501CCF0: type: VTX count: 15 - offset: 0x1CCF0 + offset: 0x1CDD8 symbol: yoshi_seg5_vertex_0501CCF0 yoshi_seg5_vertex_0501CDE0: type: VTX count: 16 - offset: 0x1CDE0 + offset: 0x1CEC8 symbol: yoshi_seg5_vertex_0501CDE0 yoshi_seg5_vertex_0501CEE0: type: VTX count: 16 - offset: 0x1CEE0 + offset: 0x1CFC8 symbol: yoshi_seg5_vertex_0501CEE0 yoshi_seg5_vertex_0501CFE0: type: VTX count: 16 - offset: 0x1CFE0 + offset: 0x1D0C8 symbol: yoshi_seg5_vertex_0501CFE0 yoshi_seg5_vertex_0501D0E0: type: VTX count: 14 - offset: 0x1D0E0 + offset: 0x1D1C8 symbol: yoshi_seg5_vertex_0501D0E0 yoshi_seg5_vertex_0501D1C0: type: VTX count: 16 - offset: 0x1D1C0 + offset: 0x1D2A8 symbol: yoshi_seg5_vertex_0501D1C0 yoshi_seg5_vertex_0501D2C0: type: VTX count: 7 - offset: 0x1D2C0 + offset: 0x1D3A8 symbol: yoshi_seg5_vertex_0501D2C0 yoshi_seg5_vertex_0501D330: type: VTX count: 14 - offset: 0x1D330 + offset: 0x1D418 symbol: yoshi_seg5_vertex_0501D330 yoshi_seg5_vertex_0501D410: type: VTX count: 3 - offset: 0x1D410 + offset: 0x1D4F8 symbol: yoshi_seg5_vertex_0501D410 yoshi_seg5_dl_0501D440: type: GFX - offset: 0x1D440 + offset: 0x1D528 symbol: yoshi_seg5_dl_0501D440 yoshi_seg5_dl_0501D488: type: GFX - offset: 0x1D488 + offset: 0x1D570 symbol: yoshi_seg5_dl_0501D488 yoshi_seg5_dl_0501D4E0: type: GFX - offset: 0x1D4E0 + offset: 0x1D5C8 symbol: yoshi_seg5_dl_0501D4E0 yoshi_seg5_dl_0501D8F8: type: GFX - offset: 0x1D8F8 + offset: 0x1D9E0 symbol: yoshi_seg5_dl_0501D8F8 yoshi_seg5_dl_0501D940: type: GFX - offset: 0x1D940 + offset: 0x1DA28 symbol: yoshi_seg5_dl_0501D940 yoshi_seg5_dl_0501D970: type: GFX - offset: 0x1D970 + offset: 0x1DA58 symbol: yoshi_seg5_dl_0501D970 yoshi_seg5_dl_0501D998: type: GFX - offset: 0x1D998 + offset: 0x1DA80 symbol: yoshi_seg5_dl_0501D998 yoshi_seg5_lights_0501D9C0: type: LIGHTS size: 24 - offset: 0x1D9C0 + offset: 0x1DAA8 symbol: yoshi_seg5_lights_0501D9C0 yoshi_seg5_lights_0501D9D8: type: LIGHTS size: 24 - offset: 0x1D9D8 + offset: 0x1DAC0 symbol: yoshi_seg5_lights_0501D9D8 yoshi_seg5_lights_0501D9F0: type: LIGHTS size: 24 - offset: 0x1D9F0 + offset: 0x1DAD8 symbol: yoshi_seg5_lights_0501D9F0 yoshi_lights_unused1: type: LIGHTS size: 24 - offset: 0x1DA08 + offset: 0x1DAF0 symbol: yoshi_lights_unused1 yoshi_lights_unused2: type: LIGHTS size: 24 - offset: 0x1DA20 + offset: 0x1DB08 symbol: yoshi_lights_unused2 yoshi_seg5_lights_0501DA38: type: LIGHTS size: 24 - offset: 0x1DA38 + offset: 0x1DB20 symbol: yoshi_seg5_lights_0501DA38 yoshi_seg5_vertex_0501DA50: type: VTX count: 15 - offset: 0x1DA50 + offset: 0x1DB38 symbol: yoshi_seg5_vertex_0501DA50 yoshi_seg5_vertex_0501DB40: type: VTX count: 15 - offset: 0x1DB40 + offset: 0x1DC28 symbol: yoshi_seg5_vertex_0501DB40 yoshi_seg5_vertex_0501DC30: type: VTX count: 14 - offset: 0x1DC30 + offset: 0x1DD18 symbol: yoshi_seg5_vertex_0501DC30 yoshi_seg5_vertex_0501DD10: type: VTX count: 16 - offset: 0x1DD10 + offset: 0x1DDF8 symbol: yoshi_seg5_vertex_0501DD10 yoshi_seg5_vertex_0501DE10: type: VTX count: 15 - offset: 0x1DE10 + offset: 0x1DEF8 symbol: yoshi_seg5_vertex_0501DE10 yoshi_seg5_vertex_0501DF00: type: VTX count: 15 - offset: 0x1DF00 + offset: 0x1DFE8 symbol: yoshi_seg5_vertex_0501DF00 yoshi_seg5_vertex_0501DFF0: type: VTX count: 14 - offset: 0x1DFF0 + offset: 0x1E0D8 symbol: yoshi_seg5_vertex_0501DFF0 yoshi_seg5_vertex_0501E0D0: type: VTX count: 14 - offset: 0x1E0D0 + offset: 0x1E1B8 symbol: yoshi_seg5_vertex_0501E0D0 yoshi_seg5_vertex_0501E1B0: type: VTX count: 3 - offset: 0x1E1B0 + offset: 0x1E298 symbol: yoshi_seg5_vertex_0501E1B0 yoshi_seg5_vertex_0501E1E0: type: VTX count: 14 - offset: 0x1E1E0 + offset: 0x1E2C8 symbol: yoshi_seg5_vertex_0501E1E0 yoshi_seg5_vertex_0501E2C0: type: VTX count: 16 - offset: 0x1E2C0 + offset: 0x1E3A8 symbol: yoshi_seg5_vertex_0501E2C0 yoshi_seg5_vertex_0501E3C0: type: VTX count: 15 - offset: 0x1E3C0 + offset: 0x1E4A8 symbol: yoshi_seg5_vertex_0501E3C0 yoshi_seg5_vertex_0501E4B0: type: VTX count: 8 - offset: 0x1E4B0 + offset: 0x1E598 symbol: yoshi_seg5_vertex_0501E4B0 yoshi_seg5_vertex_0501E530: type: VTX count: 10 - offset: 0x1E530 + offset: 0x1E618 symbol: yoshi_seg5_vertex_0501E530 yoshi_seg5_vertex_0501E5D0: type: VTX count: 11 - offset: 0x1E5D0 + offset: 0x1E6B8 symbol: yoshi_seg5_vertex_0501E5D0 yoshi_seg5_vertex_0501E680: type: VTX count: 14 - offset: 0x1E680 + offset: 0x1E768 symbol: yoshi_seg5_vertex_0501E680 yoshi_seg5_vertex_0501E760: type: VTX count: 16 - offset: 0x1E760 + offset: 0x1E848 symbol: yoshi_seg5_vertex_0501E760 yoshi_seg5_vertex_0501E860: type: VTX count: 15 - offset: 0x1E860 + offset: 0x1E948 symbol: yoshi_seg5_vertex_0501E860 yoshi_seg5_vertex_0501E950: type: VTX count: 8 - offset: 0x1E950 + offset: 0x1EA38 symbol: yoshi_seg5_vertex_0501E950 yoshi_seg5_vertex_0501E9D0: type: VTX count: 10 - offset: 0x1E9D0 + offset: 0x1EAB8 symbol: yoshi_seg5_vertex_0501E9D0 yoshi_seg5_vertex_0501EA70: type: VTX count: 11 - offset: 0x1EA70 + offset: 0x1EB58 symbol: yoshi_seg5_vertex_0501EA70 yoshi_seg5_vertex_0501EB20: type: VTX count: 15 - offset: 0x1EB20 + offset: 0x1EC08 symbol: yoshi_seg5_vertex_0501EB20 yoshi_seg5_vertex_0501EC10: type: VTX count: 16 - offset: 0x1EC10 + offset: 0x1ECF8 symbol: yoshi_seg5_vertex_0501EC10 yoshi_seg5_vertex_0501ED10: type: VTX count: 16 - offset: 0x1ED10 + offset: 0x1EDF8 symbol: yoshi_seg5_vertex_0501ED10 yoshi_seg5_vertex_0501EE10: type: VTX count: 16 - offset: 0x1EE10 + offset: 0x1EEF8 symbol: yoshi_seg5_vertex_0501EE10 yoshi_seg5_vertex_0501EF10: type: VTX count: 15 - offset: 0x1EF10 + offset: 0x1EFF8 symbol: yoshi_seg5_vertex_0501EF10 yoshi_seg5_vertex_0501F000: type: VTX count: 16 - offset: 0x1F000 + offset: 0x1F0E8 symbol: yoshi_seg5_vertex_0501F000 yoshi_seg5_vertex_0501F100: type: VTX count: 8 - offset: 0x1F100 + offset: 0x1F1E8 symbol: yoshi_seg5_vertex_0501F100 yoshi_seg5_vertex_0501F180: type: VTX count: 16 - offset: 0x1F180 + offset: 0x1F268 symbol: yoshi_seg5_vertex_0501F180 yoshi_seg5_vertex_0501F280: type: VTX count: 16 - offset: 0x1F280 + offset: 0x1F368 symbol: yoshi_seg5_vertex_0501F280 yoshi_seg5_vertex_0501F380: type: VTX count: 16 - offset: 0x1F380 + offset: 0x1F468 symbol: yoshi_seg5_vertex_0501F380 yoshi_seg5_vertex_0501F480: type: VTX count: 12 - offset: 0x1F480 + offset: 0x1F568 symbol: yoshi_seg5_vertex_0501F480 yoshi_seg5_vertex_0501F540: type: VTX count: 16 - offset: 0x1F540 + offset: 0x1F628 symbol: yoshi_seg5_vertex_0501F540 yoshi_seg5_vertex_0501F640: type: VTX count: 15 - offset: 0x1F640 + offset: 0x1F728 symbol: yoshi_seg5_vertex_0501F640 yoshi_seg5_vertex_0501F730: type: VTX count: 15 - offset: 0x1F730 + offset: 0x1F818 symbol: yoshi_seg5_vertex_0501F730 yoshi_seg5_vertex_0501F820: type: VTX count: 15 - offset: 0x1F820 + offset: 0x1F908 symbol: yoshi_seg5_vertex_0501F820 yoshi_seg5_vertex_0501F910: type: VTX count: 15 - offset: 0x1F910 + offset: 0x1F9F8 symbol: yoshi_seg5_vertex_0501F910 yoshi_seg5_vertex_0501FA00: type: VTX count: 15 - offset: 0x1FA00 + offset: 0x1FAE8 symbol: yoshi_seg5_vertex_0501FA00 yoshi_seg5_vertex_0501FAF0: type: VTX count: 11 - offset: 0x1FAF0 + offset: 0x1FBD8 symbol: yoshi_seg5_vertex_0501FAF0 yoshi_seg5_vertex_0501FBA0: type: VTX count: 15 - offset: 0x1FBA0 + offset: 0x1FC88 symbol: yoshi_seg5_vertex_0501FBA0 yoshi_seg5_vertex_0501FC90: type: VTX count: 16 - offset: 0x1FC90 + offset: 0x1FD78 symbol: yoshi_seg5_vertex_0501FC90 yoshi_seg5_vertex_0501FD90: type: VTX count: 16 - offset: 0x1FD90 + offset: 0x1FE78 symbol: yoshi_seg5_vertex_0501FD90 yoshi_seg5_vertex_0501FE90: type: VTX count: 16 - offset: 0x1FE90 + offset: 0x1FF78 symbol: yoshi_seg5_vertex_0501FE90 yoshi_seg5_vertex_0501FF90: type: VTX count: 15 - offset: 0x1FF90 + offset: 0x20078 symbol: yoshi_seg5_vertex_0501FF90 yoshi_seg5_vertex_05020080: type: VTX count: 16 - offset: 0x20080 + offset: 0x20168 symbol: yoshi_seg5_vertex_05020080 yoshi_seg5_vertex_05020180: type: VTX count: 8 - offset: 0x20180 + offset: 0x20268 symbol: yoshi_seg5_vertex_05020180 yoshi_seg5_vertex_05020200: type: VTX count: 16 - offset: 0x20200 + offset: 0x202E8 symbol: yoshi_seg5_vertex_05020200 yoshi_seg5_vertex_05020300: type: VTX count: 16 - offset: 0x20300 + offset: 0x203E8 symbol: yoshi_seg5_vertex_05020300 yoshi_seg5_vertex_05020400: type: VTX count: 16 - offset: 0x20400 + offset: 0x204E8 symbol: yoshi_seg5_vertex_05020400 yoshi_seg5_vertex_05020500: type: VTX count: 12 - offset: 0x20500 + offset: 0x205E8 symbol: yoshi_seg5_vertex_05020500 yoshi_seg5_vertex_050205C0: type: VTX count: 16 - offset: 0x205C0 + offset: 0x206A8 symbol: yoshi_seg5_vertex_050205C0 yoshi_seg5_vertex_050206C0: type: VTX count: 15 - offset: 0x206C0 + offset: 0x207A8 symbol: yoshi_seg5_vertex_050206C0 yoshi_seg5_vertex_050207B0: type: VTX count: 15 - offset: 0x207B0 + offset: 0x20898 symbol: yoshi_seg5_vertex_050207B0 yoshi_seg5_vertex_050208A0: type: VTX count: 15 - offset: 0x208A0 + offset: 0x20988 symbol: yoshi_seg5_vertex_050208A0 yoshi_seg5_vertex_05020990: type: VTX count: 15 - offset: 0x20990 + offset: 0x20A78 symbol: yoshi_seg5_vertex_05020990 yoshi_seg5_vertex_05020A80: type: VTX count: 16 - offset: 0x20A80 + offset: 0x20B68 symbol: yoshi_seg5_vertex_05020A80 yoshi_seg5_vertex_05020B80: type: VTX count: 16 - offset: 0x20B80 + offset: 0x20C68 symbol: yoshi_seg5_vertex_05020B80 yoshi_seg5_vertex_05020C80: type: VTX count: 14 - offset: 0x20C80 + offset: 0x20D68 symbol: yoshi_seg5_vertex_05020C80 yoshi_seg5_vertex_05020D60: type: VTX count: 16 - offset: 0x20D60 + offset: 0x20E48 symbol: yoshi_seg5_vertex_05020D60 yoshi_seg5_vertex_05020E60: type: VTX count: 3 - offset: 0x20E60 + offset: 0x20F48 symbol: yoshi_seg5_vertex_05020E60 yoshi_seg5_vertex_05020E90: type: VTX count: 16 - offset: 0x20E90 + offset: 0x20F78 symbol: yoshi_seg5_vertex_05020E90 yoshi_seg5_vertex_05020F90: type: VTX count: 8 - offset: 0x20F90 + offset: 0x21078 symbol: yoshi_seg5_vertex_05020F90 yoshi_seg5_vertex_05021010: type: VTX count: 16 - offset: 0x21010 + offset: 0x210F8 symbol: yoshi_seg5_vertex_05021010 yoshi_seg5_vertex_05021110: type: VTX count: 12 - offset: 0x21110 + offset: 0x211F8 symbol: yoshi_seg5_vertex_05021110 yoshi_seg5_vertex_050211D0: type: VTX count: 14 - offset: 0x211D0 + offset: 0x212B8 symbol: yoshi_seg5_vertex_050211D0 yoshi_seg5_dl_050212B0: type: GFX - offset: 0x212B0 + offset: 0x21398 symbol: yoshi_seg5_dl_050212B0 yoshi_seg5_dl_05021490: type: GFX - offset: 0x21490 + offset: 0x21578 symbol: yoshi_seg5_dl_05021490 yoshi_seg5_dl_050215D8: type: GFX - offset: 0x215D8 + offset: 0x216C0 symbol: yoshi_seg5_dl_050215D8 yoshi_seg5_dl_05021678: type: GFX - offset: 0x21678 + offset: 0x21760 symbol: yoshi_seg5_dl_05021678 yoshi_seg5_dl_05021718: type: GFX - offset: 0x21718 + offset: 0x21800 symbol: yoshi_seg5_dl_05021718 yoshi_seg5_dl_05021860: type: GFX - offset: 0x21860 + offset: 0x21948 symbol: yoshi_seg5_dl_05021860 yoshi_seg5_dl_05021900: type: GFX - offset: 0x21900 + offset: 0x219E8 symbol: yoshi_seg5_dl_05021900 yoshi_seg5_dl_050219A0: type: GFX - offset: 0x219A0 + offset: 0x21A88 symbol: yoshi_seg5_dl_050219A0 yoshi_seg5_dl_05021B90: type: GFX - offset: 0x21B90 + offset: 0x21C78 symbol: yoshi_seg5_dl_05021B90 yoshi_seg5_dl_05021CD8: type: GFX - offset: 0x21CD8 + offset: 0x21DC0 symbol: yoshi_seg5_dl_05021CD8 yoshi_seg5_dl_05021E38: type: GFX - offset: 0x21E38 + offset: 0x21F20 symbol: yoshi_seg5_dl_05021E38 yoshi_seg5_dl_05021F70: type: GFX - offset: 0x21F70 + offset: 0x22058 symbol: yoshi_seg5_dl_05021F70 yoshi_seg5_dl_05022160: type: GFX - offset: 0x22160 + offset: 0x22248 symbol: yoshi_seg5_dl_05022160 yoshi_seg5_dl_050222A8: type: GFX - offset: 0x222A8 + offset: 0x22390 symbol: yoshi_seg5_dl_050222A8 yoshi_seg5_dl_05022408: type: GFX - offset: 0x22408 + offset: 0x224F0 symbol: yoshi_seg5_dl_05022408 yoshi_seg5_dl_05022608: type: GFX - offset: 0x22608 + offset: 0x226F0 symbol: yoshi_seg5_dl_05022608 diff --git a/assets/ymls/us/actors/yoshi/geo.yml b/assets/ymls/us/actors/yoshi/geo.yml index 4b1182bd..e2ec2efb 100644 --- a/assets/ymls/us/actors/yoshi/geo.yml +++ b/assets/ymls/us/actors/yoshi/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/yoshi.yml" autopads: false segments: - [0x0C, 0x180540] diff --git a/assets/ymls/us/actors/yoshi_egg/geo.yml b/assets/ymls/us/actors/yoshi_egg/geo.yml index bf3764e5..af0699e7 100644 --- a/assets/ymls/us/actors/yoshi_egg/geo.yml +++ b/assets/ymls/us/actors/yoshi_egg/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/actors/yoshi_egg.yml" autopads: false segments: - [0x0C, 0x132850] diff --git a/assets/ymls/us/levels/bbh/geo.yml b/assets/ymls/us/levels/bbh/geo.yml index 68b52645..4ce28feb 100644 --- a/assets/ymls/us/levels/bbh/geo.yml +++ b/assets/ymls/us/levels/bbh/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/bbh.yml" autopads: false segments: - [0x0E, 0x3828C0] diff --git a/assets/ymls/us/levels/bitdw/geo.yml b/assets/ymls/us/levels/bitdw/geo.yml index 87b5243d..3197a0b4 100644 --- a/assets/ymls/us/levels/bitdw/geo.yml +++ b/assets/ymls/us/levels/bitdw/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/bitdw.yml" autopads: false segments: - [0x0E, 0x45BF60] diff --git a/assets/ymls/us/levels/bitfs.yml b/assets/ymls/us/levels/bitfs.yml index b327ebaa..0a093486 100644 --- a/assets/ymls/us/levels/bitfs.yml +++ b/assets/ymls/us/levels/bitfs.yml @@ -1747,3 +1747,95 @@ bitfs_seg7_dl_0700F508: offset: 0xF508 symbol: bitfs_seg7_dl_0700F508 +bitfs_seg7_vertex_070103B0: + type: VTX + count: 15 + offset: 0x103B0 + symbol: bitfs_seg7_vertex_070103B0 + +bitfs_seg7_vertex_070104A0: + type: VTX + count: 15 + offset: 0x104A0 + symbol: bitfs_seg7_vertex_070104A0 + +bitfs_seg7_vertex_07010590: + type: VTX + count: 15 + offset: 0x10590 + symbol: bitfs_seg7_vertex_07010590 + +bitfs_seg7_vertex_07010680: + type: VTX + count: 15 + offset: 0x10680 + symbol: bitfs_seg7_vertex_07010680 + +bitfs_seg7_vertex_07010770: + type: VTX + count: 14 + offset: 0x10770 + symbol: bitfs_seg7_vertex_07010770 + +bitfs_seg7_vertex_07010850: + type: VTX + count: 15 + offset: 0x10850 + symbol: bitfs_seg7_vertex_07010850 + +bitfs_seg7_vertex_07010940: + type: VTX + count: 16 + offset: 0x10940 + symbol: bitfs_seg7_vertex_07010940 + +bitfs_seg7_vertex_07010A40: + type: VTX + count: 15 + offset: 0x10A40 + symbol: bitfs_seg7_vertex_07010A40 + +bitfs_seg7_vertex_07010B30: + type: VTX + count: 16 + offset: 0x10B30 + symbol: bitfs_seg7_vertex_07010B30 + +bitfs_seg7_vertex_07010C30: + type: VTX + count: 15 + offset: 0x10C30 + symbol: bitfs_seg7_vertex_07010C30 + +bitfs_seg7_vertex_07010D20: + type: VTX + count: 16 + offset: 0x10D20 + symbol: bitfs_seg7_vertex_07010D20 + +bitfs_seg7_dl_07010E20: + type: GFX + offset: 0x10E20 + symbol: bitfs_seg7_dl_07010E20 + +bitfs_seg7_dl_07011138: + type: GFX + offset: 0x11138 + symbol: bitfs_seg7_dl_07011138 + +bitfs_seg7_vertex_070101D8: + type: VTX + count: 16 + offset: 0x101D8 + symbol: bitfs_seg7_vertex_070101D8 + +bitfs_seg7_dl_070102D8: + type: GFX + offset: 0x102D8 + symbol: bitfs_seg7_dl_070102D8 + +bitfs_seg7_dl_07010340: + type: GFX + offset: 0x10340 + symbol: bitfs_seg7_dl_07010340 + diff --git a/assets/ymls/us/levels/bitfs/geo.yml b/assets/ymls/us/levels/bitfs/geo.yml index a3e8fcdf..6fa418ad 100644 --- a/assets/ymls/us/levels/bitfs/geo.yml +++ b/assets/ymls/us/levels/bitfs/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/bitfs.yml" autopads: false segments: - [0x0E, 0x46A840] diff --git a/assets/ymls/us/levels/bits/geo.yml b/assets/ymls/us/levels/bits/geo.yml index cd7b8379..fb55c65a 100644 --- a/assets/ymls/us/levels/bits/geo.yml +++ b/assets/ymls/us/levels/bits/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/bits.yml" autopads: false segments: - [0x0E, 0x477D00] diff --git a/assets/ymls/us/levels/bob/geo.yml b/assets/ymls/us/levels/bob/geo.yml index 33334c43..ac615944 100644 --- a/assets/ymls/us/levels/bob/geo.yml +++ b/assets/ymls/us/levels/bob/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/bob.yml" autopads: false segments: - [0x0E, 0x405A60] diff --git a/assets/ymls/us/levels/bowser_1/geo.yml b/assets/ymls/us/levels/bowser_1/geo.yml index 523ec3e3..b5c2b51b 100644 --- a/assets/ymls/us/levels/bowser_1/geo.yml +++ b/assets/ymls/us/levels/bowser_1/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/bowser_1.yml" autopads: false segments: - [0x0E, 0x4C41C0] diff --git a/assets/ymls/us/levels/bowser_2/geo.yml b/assets/ymls/us/levels/bowser_2/geo.yml index 6936e20b..43d0654b 100644 --- a/assets/ymls/us/levels/bowser_2/geo.yml +++ b/assets/ymls/us/levels/bowser_2/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/bowser_2.yml" autopads: false segments: - [0x0E, 0x4CE9F0] diff --git a/assets/ymls/us/levels/bowser_3/geo.yml b/assets/ymls/us/levels/bowser_3/geo.yml index ae532ea7..0d72682f 100644 --- a/assets/ymls/us/levels/bowser_3/geo.yml +++ b/assets/ymls/us/levels/bowser_3/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/bowser_3.yml" autopads: false segments: - [0x0E, 0x4D14F0] diff --git a/assets/ymls/us/levels/castle_courtyard/geo.yml b/assets/ymls/us/levels/castle_courtyard/geo.yml index 54aee4c1..de6ee176 100644 --- a/assets/ymls/us/levels/castle_courtyard/geo.yml +++ b/assets/ymls/us/levels/castle_courtyard/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/castle_courtyard.yml" autopads: false segments: - [0x0E, 0x4AF670] diff --git a/assets/ymls/us/levels/castle_grounds/geo.yml b/assets/ymls/us/levels/castle_grounds/geo.yml index 12f955cc..1da1b90b 100644 --- a/assets/ymls/us/levels/castle_grounds/geo.yml +++ b/assets/ymls/us/levels/castle_grounds/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/castle_grounds.yml" autopads: false segments: - [0x0E, 0x4545E0] diff --git a/assets/ymls/us/levels/castle_inside/geo.yml b/assets/ymls/us/levels/castle_inside/geo.yml index 9c4efce5..40b67072 100644 --- a/assets/ymls/us/levels/castle_inside/geo.yml +++ b/assets/ymls/us/levels/castle_inside/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/castle_inside.yml" autopads: false segments: - [0x0E, 0x3CF0D0] diff --git a/assets/ymls/us/levels/ccm.yml b/assets/ymls/us/levels/ccm.yml index 7bb2cebc..9e608999 100644 --- a/assets/ymls/us/levels/ccm.yml +++ b/assets/ymls/us/levels/ccm.yml @@ -2037,3 +2037,631 @@ ccm_seg7_dl_07012BD8: offset: 0x12BD8 symbol: ccm_seg7_dl_07012BD8 +ccm_seg7_vertex_0700F4C0: + type: VTX + count: 4 + offset: 0xF4C0 + symbol: ccm_seg7_vertex_0700F4C0 + +ccm_seg7_vertex_0700F500: + type: VTX + count: 12 + offset: 0xF500 + symbol: ccm_seg7_vertex_0700F500 + +ccm_seg7_dl_0700F5C0: + type: GFX + offset: 0xF5C0 + symbol: ccm_seg7_dl_0700F5C0 + +ccm_seg7_dl_0700F5F8: + type: GFX + offset: 0xF5F8 + symbol: ccm_seg7_dl_0700F5F8 + +ccm_seg7_dl_0700F650: + type: GFX + offset: 0xF650 + symbol: ccm_seg7_dl_0700F650 + +ccm_seg7_lights_0700EA00: + type: LIGHTS + size: 24 + offset: 0xEA00 + symbol: ccm_seg7_lights_0700EA00 + +ccm_seg7_lights_0700EA18: + type: LIGHTS + size: 24 + offset: 0xEA18 + symbol: ccm_seg7_lights_0700EA18 + +ccm_seg7_lights_0700EA30: + type: LIGHTS + size: 24 + offset: 0xEA30 + symbol: ccm_seg7_lights_0700EA30 + +ccm_seg7_vertex_0700EA48: + type: VTX + count: 10 + offset: 0xEA48 + symbol: ccm_seg7_vertex_0700EA48 + +ccm_seg7_vertex_0700EAE8: + type: VTX + count: 15 + offset: 0xEAE8 + symbol: ccm_seg7_vertex_0700EAE8 + +ccm_seg7_vertex_0700EBD8: + type: VTX + count: 14 + offset: 0xEBD8 + symbol: ccm_seg7_vertex_0700EBD8 + +ccm_seg7_vertex_0700ECB8: + type: VTX + count: 14 + offset: 0xECB8 + symbol: ccm_seg7_vertex_0700ECB8 + +ccm_seg7_vertex_0700ED98: + type: VTX + count: 10 + offset: 0xED98 + symbol: ccm_seg7_vertex_0700ED98 + +ccm_seg7_vertex_0700EE38: + type: VTX + count: 16 + offset: 0xEE38 + symbol: ccm_seg7_vertex_0700EE38 + +ccm_seg7_vertex_0700EF38: + type: VTX + count: 6 + offset: 0xEF38 + symbol: ccm_seg7_vertex_0700EF38 + +ccm_seg7_vertex_0700EF98: + type: VTX + count: 12 + offset: 0xEF98 + symbol: ccm_seg7_vertex_0700EF98 + +ccm_seg7_vertex_0700F058: + type: VTX + count: 15 + offset: 0xF058 + symbol: ccm_seg7_vertex_0700F058 + +ccm_seg7_vertex_0700F148: + type: VTX + count: 7 + offset: 0xF148 + symbol: ccm_seg7_vertex_0700F148 + +ccm_seg7_dl_0700F1B8: + type: GFX + offset: 0xF1B8 + symbol: ccm_seg7_dl_0700F1B8 + +ccm_seg7_dl_0700F210: + type: GFX + offset: 0xF210 + symbol: ccm_seg7_dl_0700F210 + +ccm_seg7_dl_0700F3B0: + type: GFX + offset: 0xF3B0 + symbol: ccm_seg7_dl_0700F3B0 + +ccm_seg7_dl_0700F440: + type: GFX + offset: 0xF440 + symbol: ccm_seg7_dl_0700F440 + +ccm_seg7_vertex_0700E790: + type: VTX + count: 12 + offset: 0xE790 + symbol: ccm_seg7_vertex_0700E790 + +ccm_seg7_vertex_0700E850: + type: VTX + count: 8 + offset: 0xE850 + symbol: ccm_seg7_vertex_0700E850 + +ccm_seg7_dl_0700E8D0: + type: GFX + offset: 0xE8D0 + symbol: ccm_seg7_dl_0700E8D0 + +ccm_seg7_dl_0700E928: + type: GFX + offset: 0xE928 + symbol: ccm_seg7_dl_0700E928 + +ccm_seg7_dl_0700E970: + type: GFX + offset: 0xE970 + symbol: ccm_seg7_dl_0700E970 + +ccm_seg7_lights_0700DE68: + type: LIGHTS + size: 24 + offset: 0xDE68 + symbol: ccm_seg7_lights_0700DE68 + +ccm_seg7_lights_0700DE80: + type: LIGHTS + size: 24 + offset: 0xDE80 + symbol: ccm_seg7_lights_0700DE80 + +ccm_seg7_lights_0700DE98: + type: LIGHTS + size: 24 + offset: 0xDE98 + symbol: ccm_seg7_lights_0700DE98 + +ccm_seg7_lights_0700DEB0: + type: LIGHTS + size: 24 + offset: 0xDEB0 + symbol: ccm_seg7_lights_0700DEB0 + +ccm_seg7_vertex_0700DEC8: + type: VTX + count: 12 + offset: 0xDEC8 + symbol: ccm_seg7_vertex_0700DEC8 + +ccm_seg7_vertex_0700DF88: + type: VTX + count: 14 + offset: 0xDF88 + symbol: ccm_seg7_vertex_0700DF88 + +ccm_seg7_vertex_0700E068: + type: VTX + count: 16 + offset: 0xE068 + symbol: ccm_seg7_vertex_0700E068 + +ccm_seg7_vertex_0700E168: + type: VTX + count: 16 + offset: 0xE168 + symbol: ccm_seg7_vertex_0700E168 + +ccm_seg7_vertex_0700E268: + type: VTX + count: 6 + offset: 0xE268 + symbol: ccm_seg7_vertex_0700E268 + +ccm_seg7_vertex_0700E2C8: + type: VTX + count: 14 + offset: 0xE2C8 + symbol: ccm_seg7_vertex_0700E2C8 + +ccm_seg7_vertex_0700E3A8: + type: VTX + count: 8 + offset: 0xE3A8 + symbol: ccm_seg7_vertex_0700E3A8 + +ccm_seg7_vertex_0700E428: + type: VTX + count: 4 + offset: 0xE428 + symbol: ccm_seg7_vertex_0700E428 + +ccm_seg7_vertex_0700E468: + type: VTX + count: 4 + offset: 0xE468 + symbol: ccm_seg7_vertex_0700E468 + +ccm_seg7_dl_0700E4A8: + type: GFX + offset: 0xE4A8 + symbol: ccm_seg7_dl_0700E4A8 + +ccm_seg7_dl_0700E530: + type: GFX + offset: 0xE530 + symbol: ccm_seg7_dl_0700E530 + +ccm_seg7_dl_0700E668: + type: GFX + offset: 0xE668 + symbol: ccm_seg7_dl_0700E668 + +ccm_seg7_dl_0700E6C0: + type: GFX + offset: 0xE6C0 + symbol: ccm_seg7_dl_0700E6C0 + +ccm_seg7_dl_0700E708: + type: GFX + offset: 0xE708 + symbol: ccm_seg7_dl_0700E708 + +ccm_seg7_vertex_070106D8: + type: VTX + count: 8 + offset: 0x106D8 + symbol: ccm_seg7_vertex_070106D8 + +ccm_seg7_vertex_07010758: + type: VTX + count: 15 + offset: 0x10758 + symbol: ccm_seg7_vertex_07010758 + +ccm_seg7_vertex_07010848: + type: VTX + count: 11 + offset: 0x10848 + symbol: ccm_seg7_vertex_07010848 + +ccm_seg7_dl_070108F8: + type: GFX + offset: 0x108F8 + symbol: ccm_seg7_dl_070108F8 + +ccm_seg7_dl_07010940: + type: GFX + offset: 0x10940 + symbol: ccm_seg7_dl_07010940 + +ccm_seg7_dl_070109D0: + type: GFX + offset: 0x109D0 + symbol: ccm_seg7_dl_070109D0 + +ccm_seg7_lights_0700FD88: + type: LIGHTS + size: 24 + offset: 0xFD88 + symbol: ccm_seg7_lights_0700FD88 + +ccm_seg7_lights_0700FDA0: + type: LIGHTS + size: 24 + offset: 0xFDA0 + symbol: ccm_seg7_lights_0700FDA0 + +ccm_seg7_lights_0700FDB8: + type: LIGHTS + size: 24 + offset: 0xFDB8 + symbol: ccm_seg7_lights_0700FDB8 + +ccm_seg7_vertex_0700FDD0: + type: VTX + count: 4 + offset: 0xFDD0 + symbol: ccm_seg7_vertex_0700FDD0 + +ccm_seg7_vertex_0700FE10: + type: VTX + count: 14 + offset: 0xFE10 + symbol: ccm_seg7_vertex_0700FE10 + +ccm_seg7_vertex_0700FEF0: + type: VTX + count: 8 + offset: 0xFEF0 + symbol: ccm_seg7_vertex_0700FEF0 + +ccm_seg7_vertex_0700FF70: + type: VTX + count: 4 + offset: 0xFF70 + symbol: ccm_seg7_vertex_0700FF70 + +ccm_seg7_vertex_0700FFB0: + type: VTX + count: 12 + offset: 0xFFB0 + symbol: ccm_seg7_vertex_0700FFB0 + +ccm_seg7_vertex_07010070: + type: VTX + count: 15 + offset: 0x10070 + symbol: ccm_seg7_vertex_07010070 + +ccm_seg7_vertex_07010160: + type: VTX + count: 4 + offset: 0x10160 + symbol: ccm_seg7_vertex_07010160 + +ccm_seg7_vertex_070101A0: + type: VTX + count: 14 + offset: 0x101A0 + symbol: ccm_seg7_vertex_070101A0 + +ccm_seg7_vertex_07010280: + type: VTX + count: 10 + offset: 0x10280 + symbol: ccm_seg7_vertex_07010280 + +ccm_seg7_vertex_07010320: + type: VTX + count: 7 + offset: 0x10320 + symbol: ccm_seg7_vertex_07010320 + +ccm_seg7_dl_07010390: + type: GFX + offset: 0x10390 + symbol: ccm_seg7_dl_07010390 + +ccm_seg7_dl_07010480: + type: GFX + offset: 0x10480 + symbol: ccm_seg7_dl_07010480 + +ccm_seg7_dl_07010518: + type: GFX + offset: 0x10518 + symbol: ccm_seg7_dl_07010518 + +ccm_seg7_dl_07010610: + type: GFX + offset: 0x10610 + symbol: ccm_seg7_dl_07010610 + +ccm_seg7_dl_07010660: + type: GFX + offset: 0x10660 + symbol: ccm_seg7_dl_07010660 + +ccm_seg7_lights_07010FB8: + type: LIGHTS + size: 24 + offset: 0x10FB8 + symbol: ccm_seg7_lights_07010FB8 + +ccm_seg7_vertex_07010FD0: + type: VTX + count: 15 + offset: 0x10FD0 + symbol: ccm_seg7_vertex_07010FD0 + +ccm_seg7_vertex_070110C0: + type: VTX + count: 15 + offset: 0x110C0 + symbol: ccm_seg7_vertex_070110C0 + +ccm_seg7_vertex_070111B0: + type: VTX + count: 15 + offset: 0x111B0 + symbol: ccm_seg7_vertex_070111B0 + +ccm_seg7_vertex_070112A0: + type: VTX + count: 15 + offset: 0x112A0 + symbol: ccm_seg7_vertex_070112A0 + +ccm_seg7_vertex_07011390: + type: VTX + count: 8 + offset: 0x11390 + symbol: ccm_seg7_vertex_07011390 + +ccm_seg7_vertex_07011410: + type: VTX + count: 15 + offset: 0x11410 + symbol: ccm_seg7_vertex_07011410 + +ccm_seg7_vertex_07011500: + type: VTX + count: 16 + offset: 0x11500 + symbol: ccm_seg7_vertex_07011500 + +ccm_seg7_vertex_07011600: + type: VTX + count: 6 + offset: 0x11600 + symbol: ccm_seg7_vertex_07011600 + +ccm_seg7_dl_07011660: + type: GFX + offset: 0x11660 + symbol: ccm_seg7_dl_07011660 + +ccm_seg7_dl_070117B8: + type: GFX + offset: 0x117B8 + symbol: ccm_seg7_dl_070117B8 + +ccm_seg7_dl_070118B0: + type: GFX + offset: 0x118B0 + symbol: ccm_seg7_dl_070118B0 + +ccm_seg7_vertex_07010BD0: + type: VTX + count: 15 + offset: 0x10BD0 + symbol: ccm_seg7_vertex_07010BD0 + +ccm_seg7_vertex_07010CC0: + type: VTX + count: 7 + offset: 0x10CC0 + symbol: ccm_seg7_vertex_07010CC0 + +ccm_seg7_vertex_07010D30: + type: VTX + count: 16 + offset: 0x10D30 + symbol: ccm_seg7_vertex_07010D30 + +ccm_seg7_dl_07010E30: + type: GFX + offset: 0x10E30 + symbol: ccm_seg7_dl_07010E30 + +ccm_seg7_dl_07010EC0: + type: GFX + offset: 0x10EC0 + symbol: ccm_seg7_dl_07010EC0 + +ccm_seg7_dl_07010F28: + type: GFX + offset: 0x10F28 + symbol: ccm_seg7_dl_07010F28 + +ccm_seg7_vertex_07013730: + type: VTX + count: 8 + offset: 0x13730 + symbol: ccm_seg7_vertex_07013730 + +ccm_seg7_vertex_070137B0: + type: VTX + count: 4 + offset: 0x137B0 + symbol: ccm_seg7_vertex_070137B0 + +ccm_seg7_dl_070137F0: + type: GFX + offset: 0x137F0 + symbol: ccm_seg7_dl_070137F0 + +ccm_seg7_dl_07013838: + type: GFX + offset: 0x13838 + symbol: ccm_seg7_dl_07013838 + +ccm_seg7_dl_07013870: + type: GFX + offset: 0x13870 + symbol: ccm_seg7_dl_07013870 + +ccm_seg7_lights_07012C38: + type: LIGHTS + size: 24 + offset: 0x12C38 + symbol: ccm_seg7_lights_07012C38 + +ccm_seg7_vertex_07012C50: + type: VTX + count: 16 + offset: 0x12C50 + symbol: ccm_seg7_vertex_07012C50 + +ccm_seg7_vertex_07012D50: + type: VTX + count: 16 + offset: 0x12D50 + symbol: ccm_seg7_vertex_07012D50 + +ccm_seg7_vertex_07012E50: + type: VTX + count: 16 + offset: 0x12E50 + symbol: ccm_seg7_vertex_07012E50 + +ccm_seg7_vertex_07012F50: + type: VTX + count: 16 + offset: 0x12F50 + symbol: ccm_seg7_vertex_07012F50 + +ccm_seg7_vertex_07013050: + type: VTX + count: 16 + offset: 0x13050 + symbol: ccm_seg7_vertex_07013050 + +ccm_seg7_vertex_07013150: + type: VTX + count: 16 + offset: 0x13150 + symbol: ccm_seg7_vertex_07013150 + +ccm_seg7_vertex_07013250: + type: VTX + count: 16 + offset: 0x13250 + symbol: ccm_seg7_vertex_07013250 + +ccm_seg7_vertex_07013350: + type: VTX + count: 9 + offset: 0x13350 + symbol: ccm_seg7_vertex_07013350 + +ccm_seg7_dl_070133E0: + type: GFX + offset: 0x133E0 + symbol: ccm_seg7_dl_070133E0 + +ccm_seg7_dl_070136D0: + type: GFX + offset: 0x136D0 + symbol: ccm_seg7_dl_070136D0 + +ccm_seg7_lights_0700F6E0: + type: LIGHTS + size: 24 + offset: 0xF6E0 + symbol: ccm_seg7_lights_0700F6E0 + +ccm_seg7_vertex_0700F6F8: + type: VTX + count: 4 + offset: 0xF6F8 + symbol: ccm_seg7_vertex_0700F6F8 + +ccm_seg7_dl_0700F738: + type: GFX + offset: 0xF738 + symbol: ccm_seg7_dl_0700F738 + +ccm_seg7_dl_0700F780: + type: GFX + offset: 0xF780 + symbol: ccm_seg7_dl_0700F780 + +ccm_seg7_lights_07010A60: + type: LIGHTS + size: 24 + offset: 0x10A60 + symbol: ccm_seg7_lights_07010A60 + +ccm_seg7_vertex_07010A78: + type: VTX + count: 8 + offset: 0x10A78 + symbol: ccm_seg7_vertex_07010A78 + +ccm_seg7_dl_07010AF8: + type: GFX + offset: 0x10AF8 + symbol: ccm_seg7_dl_07010AF8 + +ccm_seg7_dl_07010B50: + type: GFX + offset: 0x10B50 + symbol: ccm_seg7_dl_07010B50 + diff --git a/assets/ymls/us/levels/ccm/geo.yml b/assets/ymls/us/levels/ccm/geo.yml index 5bd560d4..e13c812a 100644 --- a/assets/ymls/us/levels/ccm/geo.yml +++ b/assets/ymls/us/levels/ccm/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/ccm.yml" autopads: false segments: - [0x0E, 0x395C90] diff --git a/assets/ymls/us/levels/cotmc/geo.yml b/assets/ymls/us/levels/cotmc/geo.yml index 6767351c..0f92fc95 100644 --- a/assets/ymls/us/levels/cotmc/geo.yml +++ b/assets/ymls/us/levels/cotmc/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/cotmc.yml" autopads: false segments: - [0x0E, 0x4BE9E0] diff --git a/assets/ymls/us/levels/ddd.yml b/assets/ymls/us/levels/ddd.yml index 08ff2ae0..86027093 100644 --- a/assets/ymls/us/levels/ddd.yml +++ b/assets/ymls/us/levels/ddd.yml @@ -912,3 +912,256 @@ ddd_seg7_dl_0700D2A0: offset: 0xD2A0 symbol: ddd_seg7_dl_0700D2A0 +ddd_seg7_lights_07009080: + type: LIGHTS + size: 24 + offset: 0x9080 + symbol: ddd_seg7_lights_07009080 + +ddd_seg7_vertex_07009098: + type: VTX + count: 4 + offset: 0x9098 + symbol: ddd_seg7_vertex_07009098 + +ddd_seg7_dl_070090D8: + type: GFX + offset: 0x90D8 + symbol: ddd_seg7_dl_070090D8 + +ddd_seg7_dl_07009120: + type: GFX + offset: 0x9120 + symbol: ddd_seg7_dl_07009120 + +ddd_seg7_vertex_07008FD0: + type: VTX + count: 4 + offset: 0x8FD0 + symbol: ddd_seg7_vertex_07008FD0 + +ddd_seg7_dl_07009010: + type: GFX + offset: 0x9010 + symbol: ddd_seg7_dl_07009010 + +ddd_seg7_dl_07009030: + type: GFX + offset: 0x9030 + symbol: ddd_seg7_dl_07009030 + +ddd_seg7_lights_0700AF78: + type: LIGHTS + size: 24 + offset: 0xAF78 + symbol: ddd_seg7_lights_0700AF78 + +ddd_seg7_vertex_0700AF90: + type: VTX + count: 8 + offset: 0xAF90 + symbol: ddd_seg7_vertex_0700AF90 + +ddd_seg7_dl_0700B010: + type: GFX + offset: 0xB010 + symbol: ddd_seg7_dl_0700B010 + +ddd_seg7_dl_0700B068: + type: GFX + offset: 0xB068 + symbol: ddd_seg7_dl_0700B068 + +ddd_seg7_lights_07009288: + type: LIGHTS + size: 24 + offset: 0x9288 + symbol: ddd_seg7_lights_07009288 + +ddd_seg7_lights_070092A0: + type: LIGHTS + size: 24 + offset: 0x92A0 + symbol: ddd_seg7_lights_070092A0 + +ddd_seg7_lights_070092B8: + type: LIGHTS + size: 24 + offset: 0x92B8 + symbol: ddd_seg7_lights_070092B8 + +ddd_seg7_lights_070092D0: + type: LIGHTS + size: 24 + offset: 0x92D0 + symbol: ddd_seg7_lights_070092D0 + +ddd_seg7_lights_070092E8: + type: LIGHTS + size: 24 + offset: 0x92E8 + symbol: ddd_seg7_lights_070092E8 + +ddd_seg7_vertex_07009300: + type: VTX + count: 16 + offset: 0x9300 + symbol: ddd_seg7_vertex_07009300 + +ddd_seg7_vertex_07009400: + type: VTX + count: 9 + offset: 0x9400 + symbol: ddd_seg7_vertex_07009400 + +ddd_seg7_vertex_07009490: + type: VTX + count: 16 + offset: 0x9490 + symbol: ddd_seg7_vertex_07009490 + +ddd_seg7_vertex_07009590: + type: VTX + count: 5 + offset: 0x9590 + symbol: ddd_seg7_vertex_07009590 + +ddd_seg7_vertex_070095E0: + type: VTX + count: 8 + offset: 0x95E0 + symbol: ddd_seg7_vertex_070095E0 + +ddd_seg7_vertex_07009660: + type: VTX + count: 15 + offset: 0x9660 + symbol: ddd_seg7_vertex_07009660 + +ddd_seg7_vertex_07009750: + type: VTX + count: 11 + offset: 0x9750 + symbol: ddd_seg7_vertex_07009750 + +ddd_seg7_vertex_07009800: + type: VTX + count: 14 + offset: 0x9800 + symbol: ddd_seg7_vertex_07009800 + +ddd_seg7_vertex_070098E0: + type: VTX + count: 16 + offset: 0x98E0 + symbol: ddd_seg7_vertex_070098E0 + +ddd_seg7_vertex_070099E0: + type: VTX + count: 15 + offset: 0x99E0 + symbol: ddd_seg7_vertex_070099E0 + +ddd_seg7_vertex_07009AD0: + type: VTX + count: 16 + offset: 0x9AD0 + symbol: ddd_seg7_vertex_07009AD0 + +ddd_seg7_vertex_07009BD0: + type: VTX + count: 16 + offset: 0x9BD0 + symbol: ddd_seg7_vertex_07009BD0 + +ddd_seg7_vertex_07009CD0: + type: VTX + count: 16 + offset: 0x9CD0 + symbol: ddd_seg7_vertex_07009CD0 + +ddd_seg7_vertex_07009DD0: + type: VTX + count: 16 + offset: 0x9DD0 + symbol: ddd_seg7_vertex_07009DD0 + +ddd_seg7_vertex_07009ED0: + type: VTX + count: 16 + offset: 0x9ED0 + symbol: ddd_seg7_vertex_07009ED0 + +ddd_seg7_vertex_07009FD0: + type: VTX + count: 16 + offset: 0x9FD0 + symbol: ddd_seg7_vertex_07009FD0 + +ddd_seg7_vertex_0700A0D0: + type: VTX + count: 16 + offset: 0xA0D0 + symbol: ddd_seg7_vertex_0700A0D0 + +ddd_seg7_vertex_0700A1D0: + type: VTX + count: 16 + offset: 0xA1D0 + symbol: ddd_seg7_vertex_0700A1D0 + +ddd_seg7_vertex_0700A2D0: + type: VTX + count: 15 + offset: 0xA2D0 + symbol: ddd_seg7_vertex_0700A2D0 + +ddd_seg7_vertex_0700A3C0: + type: VTX + count: 16 + offset: 0xA3C0 + symbol: ddd_seg7_vertex_0700A3C0 + +ddd_seg7_vertex_0700A4C0: + type: VTX + count: 12 + offset: 0xA4C0 + symbol: ddd_seg7_vertex_0700A4C0 + +ddd_seg7_vertex_0700A580: + type: VTX + count: 8 + offset: 0xA580 + symbol: ddd_seg7_vertex_0700A580 + +ddd_seg7_dl_0700A600: + type: GFX + offset: 0xA600 + symbol: ddd_seg7_dl_0700A600 + +ddd_seg7_dl_0700AEB8: + type: GFX + offset: 0xAEB8 + symbol: ddd_seg7_dl_0700AEB8 + +ddd_seg7_dl_0700AF10: + type: GFX + offset: 0xAF10 + symbol: ddd_seg7_dl_0700AF10 + +ddd_seg7_vertex_07009190: + type: VTX + count: 4 + offset: 0x9190 + symbol: ddd_seg7_vertex_07009190 + +ddd_seg7_dl_070091D0: + type: GFX + offset: 0x91D0 + symbol: ddd_seg7_dl_070091D0 + +ddd_seg7_dl_07009208: + type: GFX + offset: 0x9208 + symbol: ddd_seg7_dl_07009208 + diff --git a/assets/ymls/us/levels/ddd/geo.yml b/assets/ymls/us/levels/ddd/geo.yml index 992696f5..c3a94968 100644 --- a/assets/ymls/us/levels/ddd/geo.yml +++ b/assets/ymls/us/levels/ddd/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/ddd.yml" autopads: false segments: - [0x0E, 0x495A60] diff --git a/assets/ymls/us/levels/ending/geo.yml b/assets/ymls/us/levels/ending/geo.yml index 4dcb363e..daf85537 100644 --- a/assets/ymls/us/levels/ending/geo.yml +++ b/assets/ymls/us/levels/ending/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/ending.yml" autopads: false segments: - [0x0E, 0x4AC4B0] diff --git a/assets/ymls/us/levels/hmc/geo.yml b/assets/ymls/us/levels/hmc/geo.yml index b503ffec..7644c848 100644 --- a/assets/ymls/us/levels/hmc/geo.yml +++ b/assets/ymls/us/levels/hmc/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/hmc.yml" autopads: false segments: - [0x0E, 0x3E6A00] diff --git a/assets/ymls/us/levels/intro/geo.yml b/assets/ymls/us/levels/intro/geo.yml index 73f9e6ee..29010d51 100644 --- a/assets/ymls/us/levels/intro/geo.yml +++ b/assets/ymls/us/levels/intro/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/intro.yml" autopads: false segments: - [0x14, 0x269EA0] @@ -18,7 +20,9 @@ intro_geo_mario_head_dizzy: offset: 0x140003B8 symbol: intro_geo_mario_head_dizzy -intro_geo_000414: - type: SM64:GEO_LAYOUT - offset: 0x14000414 - symbol: intro_geo_000414 +# TODO: Requires debug_level_select + +# intro_geo_000414: +# type: SM64:GEO_LAYOUT +# offset: 0x14000414 +# symbol: intro_geo_000414 diff --git a/assets/ymls/us/levels/jrb/geo.yml b/assets/ymls/us/levels/jrb/geo.yml index 721a5de9..fea75b26 100644 --- a/assets/ymls/us/levels/jrb/geo.yml +++ b/assets/ymls/us/levels/jrb/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/jrb.yml" autopads: false segments: - [0x0E, 0x423B20] diff --git a/assets/ymls/us/levels/lll/geo.yml b/assets/ymls/us/levels/lll/geo.yml index 75330c0e..735a63cd 100644 --- a/assets/ymls/us/levels/lll/geo.yml +++ b/assets/ymls/us/levels/lll/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/lll.yml" autopads: false segments: - [0x0E, 0x48C9B0] diff --git a/assets/ymls/us/levels/menu/geo.yml b/assets/ymls/us/levels/menu/geo.yml index 08e42c42..61a9325a 100644 --- a/assets/ymls/us/levels/menu/geo.yml +++ b/assets/ymls/us/levels/menu/geo.yml @@ -1,64 +1,68 @@ :config: + external_files: + - "assets/ymls/us/levels/menu.yml" autopads: false segments: - [0x14, 0x2A6120] -geo_menu_mario_save_button: - type: SM64:GEO_LAYOUT - offset: 0x140001D0 - symbol: geo_menu_mario_save_button +# TODO: menu -geo_menu_mario_save_button_fade: - type: SM64:GEO_LAYOUT - offset: 0x14000200 - symbol: geo_menu_mario_save_button_fade +# geo_menu_mario_save_button: +# type: SM64:GEO_LAYOUT +# offset: 0x140001D0 +# symbol: geo_menu_mario_save_button -geo_menu_mario_new_button: - type: SM64:GEO_LAYOUT - offset: 0x14000230 - symbol: geo_menu_mario_new_button +# geo_menu_mario_save_button_fade: +# type: SM64:GEO_LAYOUT +# offset: 0x14000200 +# symbol: geo_menu_mario_save_button_fade -geo_menu_mario_new_button_fade: - type: SM64:GEO_LAYOUT - offset: 0x14000260 - symbol: geo_menu_mario_new_button_fade +# geo_menu_mario_new_button: +# type: SM64:GEO_LAYOUT +# offset: 0x14000230 +# symbol: geo_menu_mario_new_button -geo_menu_erase_button: - type: SM64:GEO_LAYOUT - offset: 0x14000290 - symbol: geo_menu_erase_button +# geo_menu_mario_new_button_fade: +# type: SM64:GEO_LAYOUT +# offset: 0x14000260 +# symbol: geo_menu_mario_new_button_fade -geo_menu_copy_button: - type: SM64:GEO_LAYOUT - offset: 0x140002B8 - symbol: geo_menu_copy_button +# geo_menu_erase_button: +# type: SM64:GEO_LAYOUT +# offset: 0x14000290 +# symbol: geo_menu_erase_button -geo_menu_file_button: - type: SM64:GEO_LAYOUT - offset: 0x140002E0 - symbol: geo_menu_file_button +# geo_menu_copy_button: +# type: SM64:GEO_LAYOUT +# offset: 0x140002B8 +# symbol: geo_menu_copy_button -geo_menu_score_button: - type: SM64:GEO_LAYOUT - offset: 0x14000308 - symbol: geo_menu_score_button +# geo_menu_file_button: +# type: SM64:GEO_LAYOUT +# offset: 0x140002E0 +# symbol: geo_menu_file_button -geo_menu_sound_button: - type: SM64:GEO_LAYOUT - offset: 0x14000330 - symbol: geo_menu_sound_button +# geo_menu_score_button: +# type: SM64:GEO_LAYOUT +# offset: 0x14000308 +# symbol: geo_menu_score_button -geo_menu_generic_button: - type: SM64:GEO_LAYOUT - offset: 0x14000358 - symbol: geo_menu_generic_button +# geo_menu_sound_button: +# type: SM64:GEO_LAYOUT +# offset: 0x14000330 +# symbol: geo_menu_sound_button -geo_menu_file_select_strings_and_menu_cursor: - type: SM64:GEO_LAYOUT - offset: 0x14000380 - symbol: geo_menu_file_select_strings_and_menu_cursor +# geo_menu_generic_button: +# type: SM64:GEO_LAYOUT +# offset: 0x14000358 +# symbol: geo_menu_generic_button -geo_menu_act_selector_strings: - type: SM64:GEO_LAYOUT - offset: 0x14000408 - symbol: geo_menu_act_selector_strings +# geo_menu_file_select_strings_and_menu_cursor: +# type: SM64:GEO_LAYOUT +# offset: 0x14000380 +# symbol: geo_menu_file_select_strings_and_menu_cursor + +# geo_menu_act_selector_strings: +# type: SM64:GEO_LAYOUT +# offset: 0x14000408 +# symbol: geo_menu_act_selector_strings diff --git a/assets/ymls/us/levels/pss/geo.yml b/assets/ymls/us/levels/pss/geo.yml index 5123e046..789642b7 100644 --- a/assets/ymls/us/levels/pss/geo.yml +++ b/assets/ymls/us/levels/pss/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/pss.yml" autopads: false segments: - [0x0E, 0x4B7F10] diff --git a/assets/ymls/us/levels/rr.yml b/assets/ymls/us/levels/rr.yml index 67516661..946e5c48 100644 --- a/assets/ymls/us/levels/rr.yml +++ b/assets/ymls/us/levels/rr.yml @@ -3804,3 +3804,181 @@ rr_seg7_dl_07028FA8: offset: 0x28DC0 symbol: rr_seg7_dl_07028FA8 +# TODO: correct shifts + +# rr_seg7_vertex_0701B8B8: +# type: VTX +# count: 8 +# offset: 0x1B8B8 +# symbol: rr_seg7_vertex_0701B8B8 + +# rr_seg7_dl_0701B938: +# type: GFX +# offset: 0x1B938 +# symbol: rr_seg7_dl_0701B938 + +# rr_seg7_dl_0701B980: +# type: GFX +# offset: 0x1B980 +# symbol: rr_seg7_dl_0701B980 + +# rr_seg7_vertex_0701B530: +# type: VTX +# count: 16 +# offset: 0x1B530 +# symbol: rr_seg7_vertex_0701B530 + +# rr_seg7_vertex_0701B630: +# type: VTX +# count: 14 +# offset: 0x1B630 +# symbol: rr_seg7_vertex_0701B630 + +# rr_seg7_vertex_0701B710: +# type: VTX +# count: 6 +# offset: 0x1B710 +# symbol: rr_seg7_vertex_0701B710 + +# rr_seg7_dl_0701B770: +# type: GFX +# offset: 0x1B770 +# symbol: rr_seg7_dl_0701B770 + +# rr_seg7_dl_0701B848: +# type: GFX +# offset: 0x1B848 +# symbol: rr_seg7_dl_0701B848 + +# rr_seg7_vertex_0700DC58: +# type: VTX +# count: 15 +# offset: 0xDC58 +# symbol: rr_seg7_vertex_0700DC58 + +# rr_seg7_vertex_0700DD48: +# type: VTX +# count: 11 +# offset: 0xDD48 +# symbol: rr_seg7_vertex_0700DD48 + +# rr_seg7_dl_0700DDF8: +# type: GFX +# offset: 0xDDF8 +# symbol: rr_seg7_dl_0700DDF8 + +# rr_seg7_dl_0700DE88: +# type: GFX +# offset: 0xDE88 +# symbol: rr_seg7_dl_0700DE88 + +# rr_seg7_vertex_0700CAB8: +# type: VTX +# count: 15 +# offset: 0xCAB8 +# symbol: rr_seg7_vertex_0700CAB8 + +# rr_seg7_vertex_0700CBA8: +# type: VTX +# count: 16 +# offset: 0xCBA8 +# symbol: rr_seg7_vertex_0700CBA8 + +# rr_seg7_vertex_0700CCA8: +# type: VTX +# count: 14 +# offset: 0xCCA8 +# symbol: rr_seg7_vertex_0700CCA8 + +# rr_seg7_vertex_0700CD88: +# type: VTX +# count: 16 +# offset: 0xCD88 +# symbol: rr_seg7_vertex_0700CD88 + +# rr_seg7_vertex_0700CE88: +# type: VTX +# count: 16 +# offset: 0xCE88 +# symbol: rr_seg7_vertex_0700CE88 + +# rr_seg7_vertex_0700CF88: +# type: VTX +# count: 15 +# offset: 0xCF88 +# symbol: rr_seg7_vertex_0700CF88 + +# rr_seg7_vertex_0700D078: +# type: VTX +# count: 16 +# offset: 0xD078 +# symbol: rr_seg7_vertex_0700D078 + +# rr_seg7_vertex_0700D178: +# type: VTX +# count: 15 +# offset: 0xD178 +# symbol: rr_seg7_vertex_0700D178 + +# rr_seg7_vertex_0700D268: +# type: VTX +# count: 15 +# offset: 0xD268 +# symbol: rr_seg7_vertex_0700D268 + +# rr_seg7_vertex_0700D358: +# type: VTX +# count: 15 +# offset: 0xD358 +# symbol: rr_seg7_vertex_0700D358 + +# rr_seg7_vertex_0700D448: +# type: VTX +# count: 4 +# offset: 0xD448 +# symbol: rr_seg7_vertex_0700D448 + +# rr_seg7_vertex_0700D488: +# type: VTX +# count: 16 +# offset: 0xD488 +# symbol: rr_seg7_vertex_0700D488 + +# rr_seg7_vertex_0700D588: +# type: VTX +# count: 16 +# offset: 0xD588 +# symbol: rr_seg7_vertex_0700D588 + +# rr_seg7_vertex_0700D688: +# type: VTX +# count: 8 +# offset: 0xD688 +# symbol: rr_seg7_vertex_0700D688 + +# rr_seg7_vertex_0700D708: +# type: VTX +# count: 6 +# offset: 0xD708 +# symbol: rr_seg7_vertex_0700D708 + +# rr_seg7_dl_0700D768: +# type: GFX +# offset: 0xD768 +# symbol: rr_seg7_dl_0700D768 + +# rr_seg7_dl_0700DAD8: +# type: GFX +# offset: 0xDAD8 +# symbol: rr_seg7_dl_0700DAD8 + +# rr_seg7_dl_0700DBA8: +# type: GFX +# offset: 0xDBA8 +# symbol: rr_seg7_dl_0700DBA8 + +# rr_seg7_dl_0700DBD8: +# type: GFX +# offset: 0xDBD8 +# symbol: rr_seg7_dl_0700DBD8 + diff --git a/assets/ymls/us/levels/rr/geo.yml b/assets/ymls/us/levels/rr/geo.yml index 8eb47b25..f4494bbf 100644 --- a/assets/ymls/us/levels/rr/geo.yml +++ b/assets/ymls/us/levels/rr/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/rr.yml" autopads: false segments: - [0x0E, 0x44A140] diff --git a/assets/ymls/us/levels/sa/geo.yml b/assets/ymls/us/levels/sa/geo.yml index 307b0056..362d574e 100644 --- a/assets/ymls/us/levels/sa/geo.yml +++ b/assets/ymls/us/levels/sa/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/sa.yml" autopads: false segments: - [0x0E, 0x46C1A0] diff --git a/assets/ymls/us/levels/sl/geo.yml b/assets/ymls/us/levels/sl/geo.yml index 1a96b3d8..2407e6a2 100644 --- a/assets/ymls/us/levels/sl/geo.yml +++ b/assets/ymls/us/levels/sl/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/sl.yml" autopads: false segments: - [0x0E, 0x40E840] diff --git a/assets/ymls/us/levels/ssl/geo.yml b/assets/ymls/us/levels/ssl/geo.yml index f6a0154a..5a3903ff 100644 --- a/assets/ymls/us/levels/ssl/geo.yml +++ b/assets/ymls/us/levels/ssl/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/ssl.yml" autopads: false segments: - [0x0E, 0x3FB990] diff --git a/assets/ymls/us/levels/thi/geo.yml b/assets/ymls/us/levels/thi/geo.yml index f6799859..b68733f7 100644 --- a/assets/ymls/us/levels/thi/geo.yml +++ b/assets/ymls/us/levels/thi/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/thi.yml" autopads: false segments: - [0x0E, 0x42C6E0] diff --git a/assets/ymls/us/levels/totwc/geo.yml b/assets/ymls/us/levels/totwc/geo.yml index 8328abd9..63ab708f 100644 --- a/assets/ymls/us/levels/totwc/geo.yml +++ b/assets/ymls/us/levels/totwc/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/totwc.yml" autopads: false segments: - [0x0E, 0x4C2700] diff --git a/assets/ymls/us/levels/ttc/geo.yml b/assets/ymls/us/levels/ttc/geo.yml index 23005d2e..a03459df 100644 --- a/assets/ymls/us/levels/ttc/geo.yml +++ b/assets/ymls/us/levels/ttc/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/ttc.yml" autopads: false segments: - [0x0E, 0x437400] diff --git a/assets/ymls/us/levels/ttm.yml b/assets/ymls/us/levels/ttm.yml index d8f1ab79..732cb8ed 100644 --- a/assets/ymls/us/levels/ttm.yml +++ b/assets/ymls/us/levels/ttm.yml @@ -3413,3 +3413,756 @@ ttm_seg7_dl_0702BB60: offset: 0x2BB60 symbol: ttm_seg7_dl_0702BB60 +ttm_seg7_vertex_070109F0: + type: VTX + count: 4 + offset: 0x109F0 + symbol: ttm_seg7_vertex_070109F0 + +ttm_seg7_dl_07010A30: + type: GFX + offset: 0x10A30 + symbol: ttm_seg7_dl_07010A30 + +ttm_seg7_dl_07010A68: + type: GFX + offset: 0x10A68 + symbol: ttm_seg7_dl_07010A68 + +ttm_seg7_lights_0700FA90: + type: LIGHTS + size: 24 + offset: 0xFA90 + symbol: ttm_seg7_lights_0700FA90 + +ttm_seg7_lights_0700FAA8: + type: LIGHTS + size: 24 + offset: 0xFAA8 + symbol: ttm_seg7_lights_0700FAA8 + +ttm_seg7_lights_0700FAC0: + type: LIGHTS + size: 24 + offset: 0xFAC0 + symbol: ttm_seg7_lights_0700FAC0 + +ttm_seg7_vertex_0700FAD8: + type: VTX + count: 14 + offset: 0xFAD8 + symbol: ttm_seg7_vertex_0700FAD8 + +ttm_seg7_vertex_0700FBB8: + type: VTX + count: 16 + offset: 0xFBB8 + symbol: ttm_seg7_vertex_0700FBB8 + +ttm_seg7_vertex_0700FCB8: + type: VTX + count: 9 + offset: 0xFCB8 + symbol: ttm_seg7_vertex_0700FCB8 + +ttm_seg7_vertex_0700FD48: + type: VTX + count: 15 + offset: 0xFD48 + symbol: ttm_seg7_vertex_0700FD48 + +ttm_seg7_vertex_0700FE38: + type: VTX + count: 16 + offset: 0xFE38 + symbol: ttm_seg7_vertex_0700FE38 + +ttm_seg7_vertex_0700FF38: + type: VTX + count: 12 + offset: 0xFF38 + symbol: ttm_seg7_vertex_0700FF38 + +ttm_seg7_vertex_0700FFF8: + type: VTX + count: 16 + offset: 0xFFF8 + symbol: ttm_seg7_vertex_0700FFF8 + +ttm_seg7_vertex_070100F8: + type: VTX + count: 15 + offset: 0x100F8 + symbol: ttm_seg7_vertex_070100F8 + +ttm_seg7_vertex_070101E8: + type: VTX + count: 9 + offset: 0x101E8 + symbol: ttm_seg7_vertex_070101E8 + +ttm_seg7_vertex_07010278: + type: VTX + count: 16 + offset: 0x10278 + symbol: ttm_seg7_vertex_07010278 + +ttm_seg7_vertex_07010378: + type: VTX + count: 15 + offset: 0x10378 + symbol: ttm_seg7_vertex_07010378 + +ttm_seg7_vertex_07010468: + type: VTX + count: 4 + offset: 0x10468 + symbol: ttm_seg7_vertex_07010468 + +ttm_seg7_vertex_070104A8: + type: VTX + count: 12 + offset: 0x104A8 + symbol: ttm_seg7_vertex_070104A8 + +ttm_seg7_vertex_07010568: + type: VTX + count: 13 + offset: 0x10568 + symbol: ttm_seg7_vertex_07010568 + +ttm_seg7_dl_07010638: + type: GFX + offset: 0x10638 + symbol: ttm_seg7_dl_07010638 + +ttm_seg7_dl_07010830: + type: GFX + offset: 0x10830 + symbol: ttm_seg7_dl_07010830 + +ttm_seg7_dl_07010978: + type: GFX + offset: 0x10978 + symbol: ttm_seg7_dl_07010978 + +ttm_seg7_vertex_0700EB40: + type: VTX + count: 12 + offset: 0xEB40 + symbol: ttm_seg7_vertex_0700EB40 + +ttm_seg7_dl_0700EC00: + type: GFX + offset: 0xEC00 + symbol: ttm_seg7_dl_0700EC00 + +ttm_seg7_dl_0700EC58: + type: GFX + offset: 0xEC58 + symbol: ttm_seg7_dl_0700EC58 + +ttm_seg7_lights_0700E378: + type: LIGHTS + size: 24 + offset: 0xE378 + symbol: ttm_seg7_lights_0700E378 + +ttm_seg7_lights_0700E390: + type: LIGHTS + size: 24 + offset: 0xE390 + symbol: ttm_seg7_lights_0700E390 + +ttm_seg7_lights_0700E3A8: + type: LIGHTS + size: 24 + offset: 0xE3A8 + symbol: ttm_seg7_lights_0700E3A8 + +ttm_seg7_vertex_0700E3C0: + type: VTX + count: 15 + offset: 0xE3C0 + symbol: ttm_seg7_vertex_0700E3C0 + +ttm_seg7_vertex_0700E4B0: + type: VTX + count: 14 + offset: 0xE4B0 + symbol: ttm_seg7_vertex_0700E4B0 + +ttm_seg7_vertex_0700E590: + type: VTX + count: 15 + offset: 0xE590 + symbol: ttm_seg7_vertex_0700E590 + +ttm_seg7_vertex_0700E680: + type: VTX + count: 6 + offset: 0xE680 + symbol: ttm_seg7_vertex_0700E680 + +ttm_seg7_vertex_0700E6E0: + type: VTX + count: 4 + offset: 0xE6E0 + symbol: ttm_seg7_vertex_0700E6E0 + +ttm_seg7_vertex_0700E720: + type: VTX + count: 16 + offset: 0xE720 + symbol: ttm_seg7_vertex_0700E720 + +ttm_seg7_vertex_0700E820: + type: VTX + count: 9 + offset: 0xE820 + symbol: ttm_seg7_vertex_0700E820 + +ttm_seg7_vertex_0700E8B0: + type: VTX + count: 6 + offset: 0xE8B0 + symbol: ttm_seg7_vertex_0700E8B0 + +ttm_seg7_dl_0700E910: + type: GFX + offset: 0xE910 + symbol: ttm_seg7_dl_0700E910 + +ttm_seg7_dl_0700EA28: + type: GFX + offset: 0xEA28 + symbol: ttm_seg7_dl_0700EA28 + +ttm_seg7_dl_0700EAC8: + type: GFX + offset: 0xEAC8 + symbol: ttm_seg7_dl_0700EAC8 + +ttm_seg7_lights_0700BB30: + type: LIGHTS + size: 24 + offset: 0xBB30 + symbol: ttm_seg7_lights_0700BB30 + +ttm_seg7_vertex_0700BB48: + type: VTX + count: 6 + offset: 0xBB48 + symbol: ttm_seg7_vertex_0700BB48 + +ttm_seg7_dl_0700BBA8: + type: GFX + offset: 0xBBA8 + symbol: ttm_seg7_dl_0700BBA8 + +ttm_seg7_dl_0700BC10: + type: GFX + offset: 0xBC10 + symbol: ttm_seg7_dl_0700BC10 + +ttm_seg7_lights_0700B6D0: + type: LIGHTS + size: 24 + offset: 0xB6D0 + symbol: ttm_seg7_lights_0700B6D0 + +ttm_seg7_vertex_0700B6E8: + type: VTX + count: 15 + offset: 0xB6E8 + symbol: ttm_seg7_vertex_0700B6E8 + +ttm_seg7_vertex_0700B7D8: + type: VTX + count: 16 + offset: 0xB7D8 + symbol: ttm_seg7_vertex_0700B7D8 + +ttm_seg7_vertex_0700B8D8: + type: VTX + count: 12 + offset: 0xB8D8 + symbol: ttm_seg7_vertex_0700B8D8 + +ttm_seg7_dl_0700B998: + type: GFX + offset: 0xB998 + symbol: ttm_seg7_dl_0700B998 + +ttm_seg7_dl_0700BAD0: + type: GFX + offset: 0xBAD0 + symbol: ttm_seg7_dl_0700BAD0 + +ttm_seg7_lights_0700F300: + type: LIGHTS + size: 24 + offset: 0xF300 + symbol: ttm_seg7_lights_0700F300 + +ttm_seg7_vertex_0700F318: + type: VTX + count: 16 + offset: 0xF318 + symbol: ttm_seg7_vertex_0700F318 + +ttm_seg7_vertex_0700F418: + type: VTX + count: 15 + offset: 0xF418 + symbol: ttm_seg7_vertex_0700F418 + +ttm_seg7_vertex_0700F508: + type: VTX + count: 15 + offset: 0xF508 + symbol: ttm_seg7_vertex_0700F508 + +ttm_seg7_vertex_0700F5F8: + type: VTX + count: 15 + offset: 0xF5F8 + symbol: ttm_seg7_vertex_0700F5F8 + +ttm_seg7_vertex_0700F6E8: + type: VTX + count: 15 + offset: 0xF6E8 + symbol: ttm_seg7_vertex_0700F6E8 + +ttm_seg7_vertex_0700F7D8: + type: VTX + count: 8 + offset: 0xF7D8 + symbol: ttm_seg7_vertex_0700F7D8 + +ttm_seg7_dl_0700F858: + type: GFX + offset: 0xF858 + symbol: ttm_seg7_dl_0700F858 + +ttm_seg7_dl_0700F8D0: + type: GFX + offset: 0xF8D0 + symbol: ttm_seg7_dl_0700F8D0 + +ttm_seg7_dl_0700FA18: + type: GFX + offset: 0xFA18 + symbol: ttm_seg7_dl_0700FA18 + +ttm_seg7_vertex_0700ECC8: + type: VTX + count: 13 + offset: 0xECC8 + symbol: ttm_seg7_vertex_0700ECC8 + +ttm_seg7_vertex_0700ED98: + type: VTX + count: 15 + offset: 0xED98 + symbol: ttm_seg7_vertex_0700ED98 + +ttm_seg7_vertex_0700EE88: + type: VTX + count: 15 + offset: 0xEE88 + symbol: ttm_seg7_vertex_0700EE88 + +ttm_seg7_vertex_0700EF78: + type: VTX + count: 15 + offset: 0xEF78 + symbol: ttm_seg7_vertex_0700EF78 + +ttm_seg7_vertex_0700F068: + type: VTX + count: 7 + offset: 0xF068 + symbol: ttm_seg7_vertex_0700F068 + +ttm_seg7_dl_0700F0D8: + type: GFX + offset: 0xF0D8 + symbol: ttm_seg7_dl_0700F0D8 + +ttm_seg7_dl_0700F170: + type: GFX + offset: 0xF170 + symbol: ttm_seg7_dl_0700F170 + +ttm_seg7_dl_0700F270: + type: GFX + offset: 0xF270 + symbol: ttm_seg7_dl_0700F270 + +ttm_seg7_vertex_07011D00: + type: VTX + count: 4 + offset: 0x11D00 + symbol: ttm_seg7_vertex_07011D00 + +ttm_seg7_dl_07011D40: + type: GFX + offset: 0x11D40 + symbol: ttm_seg7_dl_07011D40 + +ttm_seg7_dl_07011D78: + type: GFX + offset: 0x11D78 + symbol: ttm_seg7_dl_07011D78 + +ttm_seg7_lights_07011680: + type: LIGHTS + size: 24 + offset: 0x11680 + symbol: ttm_seg7_lights_07011680 + +ttm_seg7_lights_07011698: + type: LIGHTS + size: 24 + offset: 0x11698 + symbol: ttm_seg7_lights_07011698 + +ttm_seg7_lights_070116B0: + type: LIGHTS + size: 24 + offset: 0x116B0 + symbol: ttm_seg7_lights_070116B0 + +ttm_seg7_vertex_070116C8: + type: VTX + count: 16 + offset: 0x116C8 + symbol: ttm_seg7_vertex_070116C8 + +ttm_seg7_vertex_070117C8: + type: VTX + count: 4 + offset: 0x117C8 + symbol: ttm_seg7_vertex_070117C8 + +ttm_seg7_vertex_07011808: + type: VTX + count: 15 + offset: 0x11808 + symbol: ttm_seg7_vertex_07011808 + +ttm_seg7_vertex_070118F8: + type: VTX + count: 16 + offset: 0x118F8 + symbol: ttm_seg7_vertex_070118F8 + +ttm_seg7_vertex_070119F8: + type: VTX + count: 3 + offset: 0x119F8 + symbol: ttm_seg7_vertex_070119F8 + +ttm_seg7_vertex_07011A28: + type: VTX + count: 4 + offset: 0x11A28 + symbol: ttm_seg7_vertex_07011A28 + +ttm_seg7_vertex_07011A68: + type: VTX + count: 4 + offset: 0x11A68 + symbol: ttm_seg7_vertex_07011A68 + +ttm_seg7_dl_07011AA8: + type: GFX + offset: 0x11AA8 + symbol: ttm_seg7_dl_07011AA8 + +ttm_seg7_dl_07011B20: + type: GFX + offset: 0x11B20 + symbol: ttm_seg7_dl_07011B20 + +ttm_seg7_dl_07011C10: + type: GFX + offset: 0x11C10 + symbol: ttm_seg7_dl_07011C10 + +ttm_seg7_dl_07011C48: + type: GFX + offset: 0x11C48 + symbol: ttm_seg7_dl_07011C48 + +ttm_seg7_dl_07011C78: + type: GFX + offset: 0x11C78 + symbol: ttm_seg7_dl_07011C78 + +ttm_seg7_lights_0700AFF0: + type: LIGHTS + size: 24 + offset: 0xAFF0 + symbol: ttm_seg7_lights_0700AFF0 + +ttm_seg7_vertex_0700B008: + type: VTX + count: 6 + offset: 0xB008 + symbol: ttm_seg7_vertex_0700B008 + +ttm_seg7_dl_0700B068: + type: GFX + offset: 0xB068 + symbol: ttm_seg7_dl_0700B068 + +ttm_seg7_dl_0700B0D0: + type: GFX + offset: 0xB0D0 + symbol: ttm_seg7_dl_0700B0D0 + +ttm_seg7_lights_0700AB70: + type: LIGHTS + size: 24 + offset: 0xAB70 + symbol: ttm_seg7_lights_0700AB70 + +ttm_seg7_vertex_0700AB88: + type: VTX + count: 15 + offset: 0xAB88 + symbol: ttm_seg7_vertex_0700AB88 + +ttm_seg7_vertex_0700AC78: + type: VTX + count: 16 + offset: 0xAC78 + symbol: ttm_seg7_vertex_0700AC78 + +ttm_seg7_vertex_0700AD78: + type: VTX + count: 14 + offset: 0xAD78 + symbol: ttm_seg7_vertex_0700AD78 + +ttm_seg7_dl_0700AE58: + type: GFX + offset: 0xAE58 + symbol: ttm_seg7_dl_0700AE58 + +ttm_seg7_dl_0700AF90: + type: GFX + offset: 0xAF90 + symbol: ttm_seg7_dl_0700AF90 + +ttm_seg7_lights_0700A928: + type: LIGHTS + size: 24 + offset: 0xA928 + symbol: ttm_seg7_lights_0700A928 + +ttm_seg7_vertex_0700A940: + type: VTX + count: 8 + offset: 0xA940 + symbol: ttm_seg7_vertex_0700A940 + +ttm_seg7_vertex_0700A9C0: + type: VTX + count: 8 + offset: 0xA9C0 + symbol: ttm_seg7_vertex_0700A9C0 + +ttm_seg7_dl_0700AA40: + type: GFX + offset: 0xAA40 + symbol: ttm_seg7_dl_0700AA40 + +ttm_seg7_dl_0700AAB8: + type: GFX + offset: 0xAAB8 + symbol: ttm_seg7_dl_0700AAB8 + +ttm_seg7_dl_0700AB08: + type: GFX + offset: 0xAB08 + symbol: ttm_seg7_dl_0700AB08 + +ttm_seg7_lights_0700A340: + type: LIGHTS + size: 24 + offset: 0xA340 + symbol: ttm_seg7_lights_0700A340 + +ttm_seg7_lights_0700A358: + type: LIGHTS + size: 24 + offset: 0xA358 + symbol: ttm_seg7_lights_0700A358 + +ttm_seg7_vertex_0700A370: + type: VTX + count: 15 + offset: 0xA370 + symbol: ttm_seg7_vertex_0700A370 + +ttm_seg7_vertex_0700A460: + type: VTX + count: 16 + offset: 0xA460 + symbol: ttm_seg7_vertex_0700A460 + +ttm_seg7_vertex_0700A560: + type: VTX + count: 14 + offset: 0xA560 + symbol: ttm_seg7_vertex_0700A560 + +ttm_seg7_vertex_0700A640: + type: VTX + count: 13 + offset: 0xA640 + symbol: ttm_seg7_vertex_0700A640 + +ttm_seg7_dl_0700A710: + type: GFX + offset: 0xA710 + symbol: ttm_seg7_dl_0700A710 + +ttm_seg7_dl_0700A848: + type: GFX + offset: 0xA848 + symbol: ttm_seg7_dl_0700A848 + +ttm_seg7_dl_0700A8C0: + type: GFX + offset: 0xA8C0 + symbol: ttm_seg7_dl_0700A8C0 + +ttm_seg7_lights_0700B590: + type: LIGHTS + size: 24 + offset: 0xB590 + symbol: ttm_seg7_lights_0700B590 + +ttm_seg7_vertex_0700B5A8: + type: VTX + count: 6 + offset: 0xB5A8 + symbol: ttm_seg7_vertex_0700B5A8 + +ttm_seg7_dl_0700B608: + type: GFX + offset: 0xB608 + symbol: ttm_seg7_dl_0700B608 + +ttm_seg7_dl_0700B670: + type: GFX + offset: 0xB670 + symbol: ttm_seg7_dl_0700B670 + +ttm_seg7_lights_0700B130: + type: LIGHTS + size: 24 + offset: 0xB130 + symbol: ttm_seg7_lights_0700B130 + +ttm_seg7_vertex_0700B148: + type: VTX + count: 16 + offset: 0xB148 + symbol: ttm_seg7_vertex_0700B148 + +ttm_seg7_vertex_0700B248: + type: VTX + count: 15 + offset: 0xB248 + symbol: ttm_seg7_vertex_0700B248 + +ttm_seg7_vertex_0700B338: + type: VTX + count: 12 + offset: 0xB338 + symbol: ttm_seg7_vertex_0700B338 + +ttm_seg7_dl_0700B3F8: + type: GFX + offset: 0xB3F8 + symbol: ttm_seg7_dl_0700B3F8 + +ttm_seg7_dl_0700B530: + type: GFX + offset: 0xB530 + symbol: ttm_seg7_dl_0700B530 + +ttm_seg7_vertex_070134A0: + type: VTX + count: 16 + offset: 0x134A0 + symbol: ttm_seg7_vertex_070134A0 + +ttm_seg7_dl_070135A0: + type: GFX + offset: 0x135A0 + symbol: ttm_seg7_dl_070135A0 + +ttm_seg7_dl_07013608: + type: GFX + offset: 0x13608 + symbol: ttm_seg7_dl_07013608 + +ttm_seg7_lights_07012F78: + type: LIGHTS + size: 24 + offset: 0x12F78 + symbol: ttm_seg7_lights_07012F78 + +ttm_seg7_lights_07012F90: + type: LIGHTS + size: 24 + offset: 0x12F90 + symbol: ttm_seg7_lights_07012F90 + +ttm_seg7_vertex_07012FA8: + type: VTX + count: 8 + offset: 0x12FA8 + symbol: ttm_seg7_vertex_07012FA8 + +ttm_seg7_vertex_07013028: + type: VTX + count: 14 + offset: 0x13028 + symbol: ttm_seg7_vertex_07013028 + +ttm_seg7_vertex_07013108: + type: VTX + count: 14 + offset: 0x13108 + symbol: ttm_seg7_vertex_07013108 + +ttm_seg7_vertex_070131E8: + type: VTX + count: 14 + offset: 0x131E8 + symbol: ttm_seg7_vertex_070131E8 + +ttm_seg7_vertex_070132C8: + type: VTX + count: 4 + offset: 0x132C8 + symbol: ttm_seg7_vertex_070132C8 + +ttm_seg7_dl_07013308: + type: GFX + offset: 0x13308 + symbol: ttm_seg7_dl_07013308 + +ttm_seg7_dl_07013430: + type: GFX + offset: 0x13430 + symbol: ttm_seg7_dl_07013430 + diff --git a/assets/ymls/us/levels/ttm/geo.yml b/assets/ymls/us/levels/ttm/geo.yml index 622c5730..f93f859c 100644 --- a/assets/ymls/us/levels/ttm/geo.yml +++ b/assets/ymls/us/levels/ttm/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/ttm.yml" autopads: false segments: - [0x0E, 0x4EB1F0] diff --git a/assets/ymls/us/levels/vcutm/geo.yml b/assets/ymls/us/levels/vcutm/geo.yml index c056f708..6214e901 100644 --- a/assets/ymls/us/levels/vcutm/geo.yml +++ b/assets/ymls/us/levels/vcutm/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/vcutm.yml" autopads: false segments: - [0x0E, 0x461220] diff --git a/assets/ymls/us/levels/wdw/geo.yml b/assets/ymls/us/levels/wdw/geo.yml index de5568ce..e4c27d62 100644 --- a/assets/ymls/us/levels/wdw/geo.yml +++ b/assets/ymls/us/levels/wdw/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/wdw.yml" autopads: false segments: - [0x0E, 0x419F90] diff --git a/assets/ymls/us/levels/wf.yml b/assets/ymls/us/levels/wf.yml index 04977a98..285bde93 100644 --- a/assets/ymls/us/levels/wf.yml +++ b/assets/ymls/us/levels/wf.yml @@ -1232,3 +1232,720 @@ wf_seg7_dl_0700F340: offset: 0xF340 symbol: wf_seg7_dl_0700F340 +wf_seg7_lights_07006558: + type: LIGHTS + size: 24 + offset: 0x6558 + symbol: wf_seg7_lights_07006558 + +wf_seg7_vertex_07006570: + type: VTX + count: 4 + offset: 0x6570 + symbol: wf_seg7_vertex_07006570 + +wf_seg7_dl_070065B0: + type: GFX + offset: 0x65B0 + symbol: wf_seg7_dl_070065B0 + +wf_seg7_dl_070065F8: + type: GFX + offset: 0x65F8 + symbol: wf_seg7_dl_070065F8 + +wf_seg7_lights_07005F58: + type: LIGHTS + size: 24 + offset: 0x5F58 + symbol: wf_seg7_lights_07005F58 + +wf_seg7_vertex_07005F70: + type: VTX + count: 15 + offset: 0x5F70 + symbol: wf_seg7_vertex_07005F70 + +wf_seg7_vertex_07006060: + type: VTX + count: 15 + offset: 0x6060 + symbol: wf_seg7_vertex_07006060 + +wf_seg7_vertex_07006150: + type: VTX + count: 16 + offset: 0x6150 + symbol: wf_seg7_vertex_07006150 + +wf_seg7_vertex_07006250: + type: VTX + count: 14 + offset: 0x6250 + symbol: wf_seg7_vertex_07006250 + +wf_seg7_vertex_07006330: + type: VTX + count: 7 + offset: 0x6330 + symbol: wf_seg7_vertex_07006330 + +wf_seg7_dl_070063A0: + type: GFX + offset: 0x63A0 + symbol: wf_seg7_dl_070063A0 + +wf_seg7_dl_070064E8: + type: GFX + offset: 0x64E8 + symbol: wf_seg7_dl_070064E8 + +wf_seg7_lights_07008838: + type: LIGHTS + size: 24 + offset: 0x8838 + symbol: wf_seg7_lights_07008838 + +wf_seg7_vertex_07008850: + type: VTX + count: 16 + offset: 0x8850 + symbol: wf_seg7_vertex_07008850 + +wf_seg7_vertex_07008950: + type: VTX + count: 10 + offset: 0x8950 + symbol: wf_seg7_vertex_07008950 + +wf_seg7_vertex_070089F0: + type: VTX + count: 16 + offset: 0x89F0 + symbol: wf_seg7_vertex_070089F0 + +wf_seg7_vertex_07008AF0: + type: VTX + count: 14 + offset: 0x8AF0 + symbol: wf_seg7_vertex_07008AF0 + +wf_seg7_vertex_07008BD0: + type: VTX + count: 6 + offset: 0x8BD0 + symbol: wf_seg7_vertex_07008BD0 + +wf_seg7_vertex_07008C30: + type: VTX + count: 15 + offset: 0x8C30 + symbol: wf_seg7_vertex_07008C30 + +wf_seg7_vertex_07008D20: + type: VTX + count: 11 + offset: 0x8D20 + symbol: wf_seg7_vertex_07008D20 + +wf_seg7_dl_07008DD0: + type: GFX + offset: 0x8DD0 + symbol: wf_seg7_dl_07008DD0 + +wf_seg7_dl_07008E48: + type: GFX + offset: 0x8E48 + symbol: wf_seg7_dl_07008E48 + +wf_seg7_dl_07008EA0: + type: GFX + offset: 0x8EA0 + symbol: wf_seg7_dl_07008EA0 + +wf_seg7_dl_07008F58: + type: GFX + offset: 0x8F58 + symbol: wf_seg7_dl_07008F58 + +wf_seg7_dl_07008FE8: + type: GFX + offset: 0x8FE8 + symbol: wf_seg7_dl_07008FE8 + +wf_seg7_lights_07007590: + type: LIGHTS + size: 24 + offset: 0x7590 + symbol: wf_seg7_lights_07007590 + +wf_seg7_vertex_070075A8: + type: VTX + count: 16 + offset: 0x75A8 + symbol: wf_seg7_vertex_070075A8 + +wf_seg7_vertex_070076A8: + type: VTX + count: 16 + offset: 0x76A8 + symbol: wf_seg7_vertex_070076A8 + +wf_seg7_vertex_070077A8: + type: VTX + count: 15 + offset: 0x77A8 + symbol: wf_seg7_vertex_070077A8 + +wf_seg7_vertex_07007898: + type: VTX + count: 15 + offset: 0x7898 + symbol: wf_seg7_vertex_07007898 + +wf_seg7_vertex_07007988: + type: VTX + count: 15 + offset: 0x7988 + symbol: wf_seg7_vertex_07007988 + +wf_seg7_vertex_07007A78: + type: VTX + count: 16 + offset: 0x7A78 + symbol: wf_seg7_vertex_07007A78 + +wf_seg7_vertex_07007B78: + type: VTX + count: 15 + offset: 0x7B78 + symbol: wf_seg7_vertex_07007B78 + +wf_seg7_vertex_07007C68: + type: VTX + count: 14 + offset: 0x7C68 + symbol: wf_seg7_vertex_07007C68 + +wf_seg7_vertex_07007D48: + type: VTX + count: 15 + offset: 0x7D48 + symbol: wf_seg7_vertex_07007D48 + +wf_seg7_vertex_07007E38: + type: VTX + count: 15 + offset: 0x7E38 + symbol: wf_seg7_vertex_07007E38 + +wf_seg7_vertex_07007F28: + type: VTX + count: 8 + offset: 0x7F28 + symbol: wf_seg7_vertex_07007F28 + +wf_seg7_vertex_07007FA8: + type: VTX + count: 16 + offset: 0x7FA8 + symbol: wf_seg7_vertex_07007FA8 + +wf_seg7_vertex_070080A8: + type: VTX + count: 15 + offset: 0x80A8 + symbol: wf_seg7_vertex_070080A8 + +wf_seg7_vertex_07008198: + type: VTX + count: 15 + offset: 0x8198 + symbol: wf_seg7_vertex_07008198 + +wf_seg7_vertex_07008288: + type: VTX + count: 14 + offset: 0x8288 + symbol: wf_seg7_vertex_07008288 + +wf_seg7_dl_07008368: + type: GFX + offset: 0x8368 + symbol: wf_seg7_dl_07008368 + +wf_seg7_dl_070083E0: + type: GFX + offset: 0x83E0 + symbol: wf_seg7_dl_070083E0 + +wf_seg7_dl_07008468: + type: GFX + offset: 0x8468 + symbol: wf_seg7_dl_07008468 + +wf_seg7_dl_07008690: + type: GFX + offset: 0x8690 + symbol: wf_seg7_dl_07008690 + +wf_seg7_dl_070087B0: + type: GFX + offset: 0x87B0 + symbol: wf_seg7_dl_070087B0 + +wf_seg7_lights_0700AC70: + type: LIGHTS + size: 24 + offset: 0xAC70 + symbol: wf_seg7_lights_0700AC70 + +wf_seg7_vertex_0700AC88: + type: VTX + count: 6 + offset: 0xAC88 + symbol: wf_seg7_vertex_0700AC88 + +wf_seg7_vertex_0700ACE8: + type: VTX + count: 16 + offset: 0xACE8 + symbol: wf_seg7_vertex_0700ACE8 + +wf_seg7_dl_0700ADE8: + type: GFX + offset: 0xADE8 + symbol: wf_seg7_dl_0700ADE8 + +wf_seg7_dl_0700AE40: + type: GFX + offset: 0xAE40 + symbol: wf_seg7_dl_0700AE40 + +wf_seg7_dl_0700AEC8: + type: GFX + offset: 0xAEC8 + symbol: wf_seg7_dl_0700AEC8 + +wf_seg7_lights_0700A1E0: + type: LIGHTS + size: 24 + offset: 0xA1E0 + symbol: wf_seg7_lights_0700A1E0 + +wf_seg7_vertex_0700A1F8: + type: VTX + count: 15 + offset: 0xA1F8 + symbol: wf_seg7_vertex_0700A1F8 + +wf_seg7_vertex_0700A2E8: + type: VTX + count: 7 + offset: 0xA2E8 + symbol: wf_seg7_vertex_0700A2E8 + +wf_seg7_vertex_0700A358: + type: VTX + count: 6 + offset: 0xA358 + symbol: wf_seg7_vertex_0700A358 + +wf_seg7_vertex_0700A3B8: + type: VTX + count: 15 + offset: 0xA3B8 + symbol: wf_seg7_vertex_0700A3B8 + +wf_seg7_vertex_0700A4A8: + type: VTX + count: 15 + offset: 0xA4A8 + symbol: wf_seg7_vertex_0700A4A8 + +wf_seg7_vertex_0700A598: + type: VTX + count: 15 + offset: 0xA598 + symbol: wf_seg7_vertex_0700A598 + +wf_seg7_vertex_0700A688: + type: VTX + count: 15 + offset: 0xA688 + symbol: wf_seg7_vertex_0700A688 + +wf_seg7_vertex_0700A778: + type: VTX + count: 8 + offset: 0xA778 + symbol: wf_seg7_vertex_0700A778 + +wf_seg7_vertex_0700A7F8: + type: VTX + count: 16 + offset: 0xA7F8 + symbol: wf_seg7_vertex_0700A7F8 + +wf_seg7_dl_0700A8F8: + type: GFX + offset: 0xA8F8 + symbol: wf_seg7_dl_0700A8F8 + +wf_seg7_dl_0700A988: + type: GFX + offset: 0xA988 + symbol: wf_seg7_dl_0700A988 + +wf_seg7_dl_0700A9D0: + type: GFX + offset: 0xA9D0 + symbol: wf_seg7_dl_0700A9D0 + +wf_seg7_dl_0700AB18: + type: GFX + offset: 0xAB18 + symbol: wf_seg7_dl_0700AB18 + +wf_seg7_dl_0700ABA0: + type: GFX + offset: 0xABA0 + symbol: wf_seg7_dl_0700ABA0 + +wf_seg7_lights_070097F0: + type: LIGHTS + size: 24 + offset: 0x97F0 + symbol: wf_seg7_lights_070097F0 + +wf_seg7_vertex_07009808: + type: VTX + count: 4 + offset: 0x9808 + symbol: wf_seg7_vertex_07009808 + +wf_seg7_dl_07009848: + type: GFX + offset: 0x9848 + symbol: wf_seg7_dl_07009848 + +wf_seg7_dl_07009890: + type: GFX + offset: 0x9890 + symbol: wf_seg7_dl_07009890 + +wf_seg7_lights_070092F0: + type: LIGHTS + size: 24 + offset: 0x92F0 + symbol: wf_seg7_lights_070092F0 + +wf_seg7_vertex_07009308: + type: VTX + count: 15 + offset: 0x9308 + symbol: wf_seg7_vertex_07009308 + +wf_seg7_vertex_070093F8: + type: VTX + count: 15 + offset: 0x93F8 + symbol: wf_seg7_vertex_070093F8 + +wf_seg7_vertex_070094E8: + type: VTX + count: 15 + offset: 0x94E8 + symbol: wf_seg7_vertex_070094E8 + +wf_seg7_vertex_070095D8: + type: VTX + count: 12 + offset: 0x95D8 + symbol: wf_seg7_vertex_070095D8 + +wf_seg7_dl_07009698: + type: GFX + offset: 0x9698 + symbol: wf_seg7_dl_07009698 + +wf_seg7_dl_07009780: + type: GFX + offset: 0x9780 + symbol: wf_seg7_dl_07009780 + +wf_seg7_lights_07005E48: + type: LIGHTS + size: 24 + offset: 0x5E48 + symbol: wf_seg7_lights_07005E48 + +wf_seg7_vertex_07005E60: + type: VTX + count: 4 + offset: 0x5E60 + symbol: wf_seg7_vertex_07005E60 + +wf_seg7_dl_07005EA0: + type: GFX + offset: 0x5EA0 + symbol: wf_seg7_dl_07005EA0 + +wf_seg7_dl_07005EE8: + type: GFX + offset: 0x5EE8 + symbol: wf_seg7_dl_07005EE8 + +wf_seg7_lights_070056C0: + type: LIGHTS + size: 24 + offset: 0x56C0 + symbol: wf_seg7_lights_070056C0 + +wf_seg7_vertex_070056D8: + type: VTX + count: 15 + offset: 0x56D8 + symbol: wf_seg7_vertex_070056D8 + +wf_seg7_vertex_070057C8: + type: VTX + count: 15 + offset: 0x57C8 + symbol: wf_seg7_vertex_070057C8 + +wf_seg7_vertex_070058B8: + type: VTX + count: 15 + offset: 0x58B8 + symbol: wf_seg7_vertex_070058B8 + +wf_seg7_vertex_070059A8: + type: VTX + count: 15 + offset: 0x59A8 + symbol: wf_seg7_vertex_070059A8 + +wf_seg7_vertex_07005A98: + type: VTX + count: 15 + offset: 0x5A98 + symbol: wf_seg7_vertex_07005A98 + +wf_seg7_vertex_07005B88: + type: VTX + count: 11 + offset: 0x5B88 + symbol: wf_seg7_vertex_07005B88 + +wf_seg7_dl_07005C38: + type: GFX + offset: 0x5C38 + symbol: wf_seg7_dl_07005C38 + +wf_seg7_dl_07005DD8: + type: GFX + offset: 0x5DD8 + symbol: wf_seg7_dl_07005DD8 + +wf_seg7_lights_0700E7D0: + type: LIGHTS + size: 24 + offset: 0xE7D0 + symbol: wf_seg7_lights_0700E7D0 + +wf_seg7_vertex_0700E7E8: + type: VTX + count: 16 + offset: 0xE7E8 + symbol: wf_seg7_vertex_0700E7E8 + +wf_seg7_vertex_0700E8E8: + type: VTX + count: 3 + offset: 0xE8E8 + symbol: wf_seg7_vertex_0700E8E8 + +wf_seg7_dl_0700E918: + type: GFX + offset: 0xE918 + symbol: wf_seg7_dl_0700E918 + +wf_seg7_dl_0700E9B8: + type: GFX + offset: 0xE9B8 + symbol: wf_seg7_dl_0700E9B8 + +wf_seg7_lights_0700E440: + type: LIGHTS + size: 24 + offset: 0xE440 + symbol: wf_seg7_lights_0700E440 + +wf_seg7_vertex_0700E458: + type: VTX + count: 15 + offset: 0xE458 + symbol: wf_seg7_vertex_0700E458 + +wf_seg7_vertex_0700E548: + type: VTX + count: 15 + offset: 0xE548 + symbol: wf_seg7_vertex_0700E548 + +wf_seg7_vertex_0700E638: + type: VTX + count: 6 + offset: 0xE638 + symbol: wf_seg7_vertex_0700E638 + +wf_seg7_dl_0700E698: + type: GFX + offset: 0xE698 + symbol: wf_seg7_dl_0700E698 + +wf_seg7_dl_0700E760: + type: GFX + offset: 0xE760 + symbol: wf_seg7_dl_0700E760 + +wf_seg7_vertex_0700F680: + type: VTX + count: 4 + offset: 0xF680 + symbol: wf_seg7_vertex_0700F680 + +wf_seg7_dl_0700F6C0: + type: GFX + offset: 0xF6C0 + symbol: wf_seg7_dl_0700F6C0 + +wf_seg7_lights_0700F3B8: + type: LIGHTS + size: 24 + offset: 0xF3B8 + symbol: wf_seg7_lights_0700F3B8 + +wf_seg7_vertex_0700F3D0: + type: VTX + count: 15 + offset: 0xF3D0 + symbol: wf_seg7_vertex_0700F3D0 + +wf_seg7_vertex_0700F4C0: + type: VTX + count: 11 + offset: 0xF4C0 + symbol: wf_seg7_vertex_0700F4C0 + +wf_seg7_dl_0700F570: + type: GFX + offset: 0xF570 + symbol: wf_seg7_dl_0700F570 + +wf_seg7_dl_0700F610: + type: GFX + offset: 0xF610 + symbol: wf_seg7_dl_0700F610 + +wf_seg7_lights_0700D780: + type: LIGHTS + size: 24 + offset: 0xD780 + symbol: wf_seg7_lights_0700D780 + +wf_seg7_vertex_0700D798: + type: VTX + count: 16 + offset: 0xD798 + symbol: wf_seg7_vertex_0700D798 + +wf_seg7_vertex_0700D898: + type: VTX + count: 6 + offset: 0xD898 + symbol: wf_seg7_vertex_0700D898 + +wf_seg7_vertex_0700D8F8: + type: VTX + count: 4 + offset: 0xD8F8 + symbol: wf_seg7_vertex_0700D8F8 + +wf_seg7_dl_0700D938: + type: GFX + offset: 0xD938 + symbol: wf_seg7_dl_0700D938 + +wf_seg7_dl_0700D9B8: + type: GFX + offset: 0xD9B8 + symbol: wf_seg7_dl_0700D9B8 + +wf_seg7_dl_0700D9F0: + type: GFX + offset: 0xD9F0 + symbol: wf_seg7_dl_0700D9F0 + +wf_seg7_lights_0700D370: + type: LIGHTS + size: 24 + offset: 0xD370 + symbol: wf_seg7_lights_0700D370 + +wf_seg7_vertex_0700D388: + type: VTX + count: 16 + offset: 0xD388 + symbol: wf_seg7_vertex_0700D388 + +wf_seg7_vertex_0700D488: + type: VTX + count: 14 + offset: 0xD488 + symbol: wf_seg7_vertex_0700D488 + +wf_seg7_vertex_0700D568: + type: VTX + count: 6 + offset: 0xD568 + symbol: wf_seg7_vertex_0700D568 + +wf_seg7_vertex_0700D5C8: + type: VTX + count: 4 + offset: 0xD5C8 + symbol: wf_seg7_vertex_0700D5C8 + +wf_seg7_dl_0700D608: + type: GFX + offset: 0xD608 + symbol: wf_seg7_dl_0700D608 + +wf_seg7_dl_0700D6D0: + type: GFX + offset: 0xD6D0 + symbol: wf_seg7_dl_0700D6D0 + +wf_seg7_dl_0700D708: + type: GFX + offset: 0xD708 + symbol: wf_seg7_dl_0700D708 + +wf_seg7_vertex_0700AF40: + type: VTX + count: 4 + offset: 0xAF40 + symbol: wf_seg7_vertex_0700AF40 + +wf_seg7_dl_0700AF80: + type: GFX + offset: 0xAF80 + symbol: wf_seg7_dl_0700AF80 + +wf_seg7_dl_0700AFB8: + type: GFX + offset: 0xAFB8 + symbol: wf_seg7_dl_0700AFB8 + diff --git a/assets/ymls/us/levels/wf/geo.yml b/assets/ymls/us/levels/wf/geo.yml index 17038a0a..921d0e51 100644 --- a/assets/ymls/us/levels/wf/geo.yml +++ b/assets/ymls/us/levels/wf/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/wf.yml" autopads: false segments: - [0x0E, 0x49DA50] diff --git a/assets/ymls/us/levels/wmotr/geo.yml b/assets/ymls/us/levels/wmotr/geo.yml index 39872ba0..38acb521 100644 --- a/assets/ymls/us/levels/wmotr/geo.yml +++ b/assets/ymls/us/levels/wmotr/geo.yml @@ -1,4 +1,6 @@ :config: + external_files: + - "assets/ymls/us/levels/wmotr.yml" autopads: false segments: - [0x0E, 0x4CD930]