From 4357aa2dfbc6e4f60fe1e0f5a2595e1b7fc579ab Mon Sep 17 00:00:00 2001 From: inspectredc Date: Wed, 21 Feb 2024 00:32:22 +0000 Subject: [PATCH] rename geo_layout type --- assets/ymls/us/actors/amp.yml | 2 +- assets/ymls/us/actors/bird.yml | 2 +- assets/ymls/us/actors/blargg.yaml | 2 +- assets/ymls/us/actors/blue_coin_switch.yml | 2 +- assets/ymls/us/actors/blue_fish.yml | 4 +- assets/ymls/us/actors/bobomb.yml | 4 +- assets/ymls/us/actors/bomb.yml | 2 +- assets/ymls/us/actors/boo.yml | 2 +- assets/ymls/us/actors/boo_castle.yml | 2 +- assets/ymls/us/actors/book.yml | 2 +- assets/ymls/us/actors/bookend.yml | 2 +- assets/ymls/us/actors/bowling_ball.yml | 4 +- assets/ymls/us/actors/bowser.yml | 12 +-- assets/ymls/us/actors/bowser_flame.yml | 2 +- assets/ymls/us/actors/bowser_key.yml | 4 +- assets/ymls/us/actors/breakable_box.yml | 4 +- assets/ymls/us/actors/bub.yml | 2 +- assets/ymls/us/actors/bubba.yml | 2 +- assets/ymls/us/actors/bubble.yml | 4 +- assets/ymls/us/actors/bullet_bill.yml | 2 +- assets/ymls/us/actors/bully.yml | 4 +- assets/ymls/us/actors/burn_smoke.yml | 2 +- assets/ymls/us/actors/butterfly.yml | 2 +- assets/ymls/us/actors/cannon_barrel.yml | 2 +- assets/ymls/us/actors/cannon_base.yml | 2 +- assets/ymls/us/actors/capswitch.yml | 2 +- assets/ymls/us/actors/chain_ball.yml | 2 +- assets/ymls/us/actors/chain_chomp.yml | 2 +- assets/ymls/us/actors/chair.yml | 2 +- .../ymls/us/actors/checkerboard_platform.yml | 2 +- assets/ymls/us/actors/chillychief.yml | 4 +- assets/ymls/us/actors/chuckya.yml | 2 +- assets/ymls/us/actors/clam_shell.yml | 2 +- assets/ymls/us/actors/coin.yml | 12 +-- assets/ymls/us/actors/cyan_fish.yml | 2 +- assets/ymls/us/actors/dirt.yml | 4 +- assets/ymls/us/actors/door.yml | 22 ++--- assets/ymls/us/actors/dorrie.yml | 2 +- assets/ymls/us/actors/exclamation_box.yml | 2 +- .../us/actors/exclamation_box_outline.yml | 2 +- assets/ymls/us/actors/explosion.yml | 2 +- assets/ymls/us/actors/eyerok.yml | 6 +- assets/ymls/us/actors/flame.yml | 6 +- assets/ymls/us/actors/flyguy.yml | 2 +- assets/ymls/us/actors/fwoosh.yml | 2 +- assets/ymls/us/actors/goomba.yml | 2 +- assets/ymls/us/actors/haunted_cage.yml | 2 +- assets/ymls/us/actors/heart.yml | 2 +- assets/ymls/us/actors/heave_ho.yml | 2 +- assets/ymls/us/actors/hoot.yml | 2 +- assets/ymls/us/actors/impact_ring.yml | 2 +- assets/ymls/us/actors/impact_smoke.yml | 2 +- assets/ymls/us/actors/king_bobomb.yml | 2 +- assets/ymls/us/actors/klepto.yml | 2 +- assets/ymls/us/actors/koopa.yml | 4 +- assets/ymls/us/actors/koopa_flag.yml | 2 +- assets/ymls/us/actors/koopa_shell.yml | 6 +- assets/ymls/us/actors/lakitu_cameraman.yml | 2 +- assets/ymls/us/actors/lakitu_enemy.yml | 2 +- assets/ymls/us/actors/leaves.yml | 2 +- assets/ymls/us/actors/mad_piano.yml | 2 +- assets/ymls/us/actors/manta.yml | 2 +- assets/ymls/us/actors/mario.yml | 98 +++++++++---------- assets/ymls/us/actors/mario_cap.yml | 8 +- assets/ymls/us/actors/metal_box.yml | 2 +- assets/ymls/us/actors/mips.yml | 2 +- assets/ymls/us/actors/mist.yml | 4 +- assets/ymls/us/actors/moneybag.yml | 6 +- assets/ymls/us/actors/monty_mole.yml | 2 +- assets/ymls/us/actors/mr_i_eyeball.yml | 2 +- assets/ymls/us/actors/mr_i_iris.yml | 2 +- assets/ymls/us/actors/mushroom_1up.yml | 2 +- assets/ymls/us/actors/number.yml | 2 +- assets/ymls/us/actors/peach.yml | 6 +- assets/ymls/us/actors/penguin.yml | 2 +- assets/ymls/us/actors/piranha_plant.yml | 2 +- assets/ymls/us/actors/pokey.yml | 4 +- assets/ymls/us/actors/poundable_pole.yml | 2 +- assets/ymls/us/actors/purple_switch.yml | 2 +- assets/ymls/us/actors/scuttlebug.yml | 2 +- assets/ymls/us/actors/seaweed.yml | 2 +- assets/ymls/us/actors/skeeter.yml | 2 +- assets/ymls/us/actors/small_key.yml | 2 +- assets/ymls/us/actors/snowman.yml | 4 +- assets/ymls/us/actors/snufit.yml | 2 +- assets/ymls/us/actors/sparkle.yml | 2 +- assets/ymls/us/actors/sparkle_animation.yml | 2 +- assets/ymls/us/actors/spindrift.yml | 2 +- assets/ymls/us/actors/spiny.yml | 2 +- assets/ymls/us/actors/spiny_egg.yml | 2 +- assets/ymls/us/actors/springboard.yml | 6 +- assets/ymls/us/actors/star.yml | 2 +- assets/ymls/us/actors/stomp_smoke.yml | 4 +- assets/ymls/us/actors/sushi.yml | 2 +- assets/ymls/us/actors/swoop.yml | 2 +- assets/ymls/us/actors/test_platform.yml | 2 +- assets/ymls/us/actors/thwomp.yml | 2 +- assets/ymls/us/actors/toad.yml | 6 +- assets/ymls/us/actors/tornado.yml | 2 +- assets/ymls/us/actors/transparent_star | 2 +- assets/ymls/us/actors/treasure_chest.yml | 4 +- assets/ymls/us/actors/tree.yml | 10 +- assets/ymls/us/actors/ukiki.yml | 2 +- assets/ymls/us/actors/unagi.yml | 2 +- assets/ymls/us/actors/walk_smoke.yml | 2 +- assets/ymls/us/actors/warp_pipe.yml | 2 +- assets/ymls/us/actors/water_bubble.yml | 4 +- assets/ymls/us/actors/water_mine.yml | 2 +- assets/ymls/us/actors/water_ring.yml | 2 +- assets/ymls/us/actors/water_splash.yml | 2 +- assets/ymls/us/actors/water_wave.yml | 4 +- assets/ymls/us/actors/white_particle.yml | 2 +- assets/ymls/us/actors/whomp.yml | 2 +- assets/ymls/us/actors/wiggler_body.yaml | 2 +- assets/ymls/us/actors/wiggler_head.yml | 2 +- assets/ymls/us/actors/wooden_signpost.yml | 2 +- assets/ymls/us/actors/yellow_sphere.yml | 2 +- assets/ymls/us/actors/yellow_sphere_small.yml | 2 +- assets/ymls/us/actors/yoshi.yml | 2 +- assets/ymls/us/actors/yoshi_egg.yml | 2 +- assets/ymls/us/levels/bbh.yml | 82 ++++++++-------- assets/ymls/us/levels/bitdw.yml | 52 +++++----- assets/ymls/us/levels/bitfs.yml | 64 ++++++------ assets/ymls/us/levels/bits.yml | 64 ++++++------ assets/ymls/us/levels/bob.yml | 8 +- assets/ymls/us/levels/bowser_1.yml | 2 +- assets/ymls/us/levels/bowser_2.yml | 4 +- assets/ymls/us/levels/bowser_3.yml | 24 ++--- assets/ymls/us/levels/castle_courtyard.yml | 4 +- assets/ymls/us/levels/castle_grounds.yml | 10 +- assets/ymls/us/levels/castle_inside.yml | 94 +++++++++--------- assets/ymls/us/levels/ccm.yml | 20 ++-- assets/ymls/us/levels/cotmc.yml | 2 +- assets/ymls/us/levels/ddd.yml | 10 +- assets/ymls/us/levels/ending.yml | 2 +- assets/ymls/us/levels/hmc.yml | 52 +++++----- assets/ymls/us/levels/intro.yml | 8 +- assets/ymls/us/levels/jrb.yml | 26 ++--- assets/ymls/us/levels/lll.yml | 84 ++++++++-------- assets/ymls/us/levels/menu.yml | 24 ++--- assets/ymls/us/levels/pss.yml | 2 +- assets/ymls/us/levels/rr.yml | 74 +++++++------- assets/ymls/us/levels/sa.yml | 2 +- assets/ymls/us/levels/sl.yml | 10 +- assets/ymls/us/levels/ssl.yml | 22 ++--- assets/ymls/us/levels/thi.yml | 12 +-- assets/ymls/us/levels/totwc.yml | 4 +- assets/ymls/us/levels/ttc.yml | 32 +++--- assets/ymls/us/levels/ttm.yml | 60 ++++++------ assets/ymls/us/levels/vcutm.yml | 4 +- assets/ymls/us/levels/wdw.yml | 18 ++-- assets/ymls/us/levels/wf.yml | 62 ++++++------ assets/ymls/us/levels/wmotr.yml | 2 +- 153 files changed, 696 insertions(+), 696 deletions(-) diff --git a/assets/ymls/us/actors/amp.yml b/assets/ymls/us/actors/amp.yml index f852cd82..5a309a8c 100644 --- a/assets/ymls/us/actors/amp.yml +++ b/assets/ymls/us/actors/amp.yml @@ -40,6 +40,6 @@ amp_mouth: seg15: 0x2008d0 amp_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F000028 symbol: dAmpGeo diff --git a/assets/ymls/us/actors/bird.yml b/assets/ymls/us/actors/bird.yml index 50847d2b..b4db2a19 100644 --- a/assets/ymls/us/actors/bird.yml +++ b/assets/ymls/us/actors/bird.yml @@ -3,6 +3,6 @@ seg12: 0x180540 birds_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000000 symbol: birds_geo diff --git a/assets/ymls/us/actors/blargg.yaml b/assets/ymls/us/actors/blargg.yaml index bc25ad6a..350b374e 100644 --- a/assets/ymls/us/actors/blargg.yaml +++ b/assets/ymls/us/actors/blargg.yaml @@ -3,6 +3,6 @@ seg12: 0x134A70 blargg_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000240 symbol: blargg_geo diff --git a/assets/ymls/us/actors/blue_coin_switch.yml b/assets/ymls/us/actors/blue_coin_switch.yml index c5b58360..c6fb912c 100644 --- a/assets/ymls/us/actors/blue_coin_switch.yml +++ b/assets/ymls/us/actors/blue_coin_switch.yml @@ -22,6 +22,6 @@ blue_coin_switch_top: seg15: 0x2008D0 blue_coin_switch_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F000000 symbol: blue_coin_switch_geo diff --git a/assets/ymls/us/actors/blue_fish.yml b/assets/ymls/us/actors/blue_fish.yml index d6f624b5..89124eae 100644 --- a/assets/ymls/us/actors/blue_fish.yml +++ b/assets/ymls/us/actors/blue_fish.yml @@ -13,11 +13,11 @@ blue_fish: seg22: 0x218DA0 fish_shadow_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000BEC symbol: fish_shadow_geo fish_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000C44 symbol: fish_geo diff --git a/assets/ymls/us/actors/bobomb.yml b/assets/ymls/us/actors/bobomb.yml index 8279e046..05863cbf 100644 --- a/assets/ymls/us/actors/bobomb.yml +++ b/assets/ymls/us/actors/bobomb.yml @@ -58,11 +58,11 @@ bob-omb_right_side: seg15: 0x2008D0 black_bobomb_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F0007B8 symbol: black_bobomb_geo bobomb_buddy_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F0008F4 symbol: bobomb_buddy_geo diff --git a/assets/ymls/us/actors/bomb.yml b/assets/ymls/us/actors/bomb.yml index ed3eddea..b631d38b 100644 --- a/assets/ymls/us/actors/bomb.yml +++ b/assets/ymls/us/actors/bomb.yml @@ -31,6 +31,6 @@ bomb_spike: seg13: 0x1B9070 bowser_bomb_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000BBC symbol: bowser_bomb_geo diff --git a/assets/ymls/us/actors/boo.yml b/assets/ymls/us/actors/boo.yml index 2d7507b0..38c6f644 100644 --- a/assets/ymls/us/actors/boo.yml +++ b/assets/ymls/us/actors/boo.yml @@ -22,6 +22,6 @@ boo_mouth: seg12: 0x16D5C0 boo_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000224 symbol: boo_geo diff --git a/assets/ymls/us/actors/boo_castle.yml b/assets/ymls/us/actors/boo_castle.yml index bbbff097..590d23ce 100644 --- a/assets/ymls/us/actors/boo_castle.yml +++ b/assets/ymls/us/actors/boo_castle.yml @@ -22,6 +22,6 @@ bbh_boo_mouth: seg13: 0x1E4BF0 boo_castle_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D0005B0 symbol: boo_castle_geo diff --git a/assets/ymls/us/actors/book.yml b/assets/ymls/us/actors/book.yml index 9652a54f..2331b85b 100644 --- a/assets/ymls/us/actors/book.yml +++ b/assets/ymls/us/actors/book.yml @@ -13,6 +13,6 @@ book_cover: seg12: 0x16D5C0 bookend_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C0000C0 symbol: bookend_geo diff --git a/assets/ymls/us/actors/bookend.yml b/assets/ymls/us/actors/bookend.yml index a44fd69d..b9dd24f6 100644 --- a/assets/ymls/us/actors/bookend.yml +++ b/assets/ymls/us/actors/bookend.yml @@ -49,6 +49,6 @@ bookend_tooth: seg12: 0x16D5C0 bookend_part_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000000 symbol: bookend_part_geo diff --git a/assets/ymls/us/actors/bowling_ball.yml b/assets/ymls/us/actors/bowling_ball.yml index a22d93e7..128d93c6 100644 --- a/assets/ymls/us/actors/bowling_ball.yml +++ b/assets/ymls/us/actors/bowling_ball.yml @@ -3,11 +3,11 @@ seg15: 0x2008D0 bowling_ball_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F000640 symbol: bowling_ball_geo bowling_ball_track_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F00066C symbol: bowling_ball_track_geo diff --git a/assets/ymls/us/actors/bowser.yml b/assets/ymls/us/actors/bowser.yml index 750bbd7c..7bbf7a9d 100644 --- a/assets/ymls/us/actors/bowser.yml +++ b/assets/ymls/us/actors/bowser.yml @@ -265,31 +265,31 @@ bowser_upper_face: seg13: 0x1B9070 bowser_geo_0000D8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D0000D8 symbol: bowser_geo_0000D8 bowser_geo_000424: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000424 symbol: bowser_geo_000424 bowser_geo_000770: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000770 symbol: bowser_geo_000770 bowser_shadow_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000AB8 symbol: bowser_shadow_geo bowser_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000AC4 symbol: bowser_geo bowser_geo_no_shadow: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000B40 symbol: bowser_geo_no_shadow diff --git a/assets/ymls/us/actors/bowser_flame.yml b/assets/ymls/us/actors/bowser_flame.yml index 7417c32d..4ea371b0 100644 --- a/assets/ymls/us/actors/bowser_flame.yml +++ b/assets/ymls/us/actors/bowser_flame.yml @@ -130,6 +130,6 @@ bowser_flame_9: seg13: 0x1B9070 bowser_flames_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000000 symbol: bowser_flames_geo \ No newline at end of file diff --git a/assets/ymls/us/actors/bowser_key.yml b/assets/ymls/us/actors/bowser_key.yml index f7bd6105..4fc3ae62 100644 --- a/assets/ymls/us/actors/bowser_key.yml +++ b/assets/ymls/us/actors/bowser_key.yml @@ -3,11 +3,11 @@ seg22: 0x218DA0 bowser_key_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000A84 symbol: bowser_key_geo bowser_key_cutscene_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000AB0 symbol: bowser_key_cutscene_geo diff --git a/assets/ymls/us/actors/breakable_box.yml b/assets/ymls/us/actors/breakable_box.yml index f29d0b30..3d02113d 100644 --- a/assets/ymls/us/actors/breakable_box.yml +++ b/assets/ymls/us/actors/breakable_box.yml @@ -22,11 +22,11 @@ crazy_box_surface: seg15: 0x2008D0 breakable_box_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F0005D0 symbol: breakable_box_geo breakable_box_small_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F000610 symbol: breakable_box_small_geo diff --git a/assets/ymls/us/actors/bub.yml b/assets/ymls/us/actors/bub.yml index c31e18fd..962f85f5 100644 --- a/assets/ymls/us/actors/bub.yml +++ b/assets/ymls/us/actors/bub.yml @@ -40,6 +40,6 @@ bub_scales: seg13: 0x1C3DB0 bub_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D00038C symbol: bub_geo diff --git a/assets/ymls/us/actors/bubba.yml b/assets/ymls/us/actors/bubba.yml index 1f76455c..18f2b022 100644 --- a/assets/ymls/us/actors/bubba.yml +++ b/assets/ymls/us/actors/bubba.yml @@ -49,6 +49,6 @@ bubba_sunglasses: seg12: 0x187FA0 bubba_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000000 symbol: bubba_geo diff --git a/assets/ymls/us/actors/bubble.yml b/assets/ymls/us/actors/bubble.yml index 41167915..6fa7a3e7 100644 --- a/assets/ymls/us/actors/bubble.yml +++ b/assets/ymls/us/actors/bubble.yml @@ -22,11 +22,11 @@ mr_i_bubble: seg23: 0x1279B0 bubble_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000000 symbol: bubble_geo purple_marble_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1700001C symbol: purple_marble_geo diff --git a/assets/ymls/us/actors/bullet_bill.yml b/assets/ymls/us/actors/bullet_bill.yml index b6a0de99..e5e07bdb 100644 --- a/assets/ymls/us/actors/bullet_bill.yml +++ b/assets/ymls/us/actors/bullet_bill.yml @@ -22,6 +22,6 @@ bullet_bill_mouth: seg12: 0x132850 bullet_bill_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000264 symbol: bullet_bill_geo diff --git a/assets/ymls/us/actors/bully.yml b/assets/ymls/us/actors/bully.yml index fe833583..0d3885f1 100644 --- a/assets/ymls/us/actors/bully.yml +++ b/assets/ymls/us/actors/bully.yml @@ -40,11 +40,11 @@ bully_right_side: seg12: 0x134A70 bully_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000000 symbol: bully_geo bully_boss_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000120 symbol: bully_boss_geo diff --git a/assets/ymls/us/actors/burn_smoke.yml b/assets/ymls/us/actors/burn_smoke.yml index a8222721..ff37a44e 100644 --- a/assets/ymls/us/actors/burn_smoke.yml +++ b/assets/ymls/us/actors/burn_smoke.yml @@ -13,6 +13,6 @@ burn_smoke: seg23: 0x1279B0 burn_smoke_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000084 symbol: burn_smoke_geo diff --git a/assets/ymls/us/actors/butterfly.yml b/assets/ymls/us/actors/butterfly.yml index 8ed72f4d..022149a6 100644 --- a/assets/ymls/us/actors/butterfly.yml +++ b/assets/ymls/us/actors/butterfly.yml @@ -13,6 +13,6 @@ butterfly_wing: seg22: 0x218DA0 butterfly_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x160000A8 symbol: butterfly_geo diff --git a/assets/ymls/us/actors/cannon_barrel.yml b/assets/ymls/us/actors/cannon_barrel.yml index b969cdf1..b75bd8c6 100644 --- a/assets/ymls/us/actors/cannon_barrel.yml +++ b/assets/ymls/us/actors/cannon_barrel.yml @@ -13,6 +13,6 @@ cannon_barrel: seg15: 0x2008D0 cannon_barrel_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F0001C0 symbol: cannon_barrel_geo \ No newline at end of file diff --git a/assets/ymls/us/actors/cannon_base.yml b/assets/ymls/us/actors/cannon_base.yml index 79949aff..3e2547aa 100644 --- a/assets/ymls/us/actors/cannon_base.yml +++ b/assets/ymls/us/actors/cannon_base.yml @@ -13,6 +13,6 @@ cannon_base: seg15: 0x2008D0 cannon_base_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F0001A8 symbol: cannon_base_geo diff --git a/assets/ymls/us/actors/capswitch.yml b/assets/ymls/us/actors/capswitch.yml index d3bd5582..a63df780 100644 --- a/assets/ymls/us/actors/capswitch.yml +++ b/assets/ymls/us/actors/capswitch.yml @@ -22,6 +22,6 @@ cap_switch_head: seg12: 0x166BD0 cap_switch_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000048 symbol: cap_switch_geo diff --git a/assets/ymls/us/actors/chain_ball.yml b/assets/ymls/us/actors/chain_ball.yml index 932fad25..acebdd01 100644 --- a/assets/ymls/us/actors/chain_ball.yml +++ b/assets/ymls/us/actors/chain_ball.yml @@ -13,6 +13,6 @@ chain_ball: seg13: 0x1D7C90 metallic_ball_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D0005D0 symbol: metallic_ball_geo diff --git a/assets/ymls/us/actors/chain_chomp.yml b/assets/ymls/us/actors/chain_chomp.yml index bd36a9a5..c36d2505 100644 --- a/assets/ymls/us/actors/chain_chomp.yml +++ b/assets/ymls/us/actors/chain_chomp.yml @@ -49,6 +49,6 @@ chain_chomp_tooth: seg13: 0x1D7C90 chain_chomp_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D0005EC symbol: chain_chomp_geo diff --git a/assets/ymls/us/actors/chair.yml b/assets/ymls/us/actors/chair.yml index 4b26af6c..5a06e14d 100644 --- a/assets/ymls/us/actors/chair.yml +++ b/assets/ymls/us/actors/chair.yml @@ -40,6 +40,6 @@ chair_surface_unused: seg12: 0x16D5C0 haunted_chair_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C0000D8 symbol: haunted_chair_geo \ No newline at end of file diff --git a/assets/ymls/us/actors/checkerboard_platform.yml b/assets/ymls/us/actors/checkerboard_platform.yml index f3d980c9..33b305fa 100644 --- a/assets/ymls/us/actors/checkerboard_platform.yml +++ b/assets/ymls/us/actors/checkerboard_platform.yml @@ -22,6 +22,6 @@ checkerboard_platform_side: seg15: 0x2008D0 checkerboard_platform_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F0004E4 symbol: checkerboard_platform_geo diff --git a/assets/ymls/us/actors/chillychief.yml b/assets/ymls/us/actors/chillychief.yml index 28382a10..d0d4abd1 100644 --- a/assets/ymls/us/actors/chillychief.yml +++ b/assets/ymls/us/actors/chillychief.yml @@ -31,13 +31,13 @@ chill_bully_right_side: seg5: 0x1E51F0 chilly_chief_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1E51F0 mio0: 0x3754 symbol: chilly_chief_geo chilly_chief_big_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1E51F0 mio0: 0x3874 symbol: chilly_chief_big_geo diff --git a/assets/ymls/us/actors/chuckya.yml b/assets/ymls/us/actors/chuckya.yml index 1f176ae9..3c47bfc7 100644 --- a/assets/ymls/us/actors/chuckya.yml +++ b/assets/ymls/us/actors/chuckya.yml @@ -40,6 +40,6 @@ chuckya_hand_antenna: seg15: 0x2008D0 chuckya_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F0001D8 symbol: chuckya_geo diff --git a/assets/ymls/us/actors/clam_shell.yml b/assets/ymls/us/actors/clam_shell.yml index 3187cf75..7b6d0874 100644 --- a/assets/ymls/us/actors/clam_shell.yml +++ b/assets/ymls/us/actors/clam_shell.yml @@ -22,6 +22,6 @@ clam_shell_mouth: seg12: 0x145C10 clam_shell_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000000 symbol: clam_shell_geo diff --git a/assets/ymls/us/actors/coin.yml b/assets/ymls/us/actors/coin.yml index de966c91..d44ccf23 100644 --- a/assets/ymls/us/actors/coin.yml +++ b/assets/ymls/us/actors/coin.yml @@ -40,31 +40,31 @@ coin_tilt_right: seg22: 0x218DA0 yellow_coin_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1600013C symbol: yellow_coin_geo yellow_coin_no_shadow_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x160001A0 symbol: yellow_coin_no_shadow_geo blue_coin_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000200 symbol: blue_coin_geo blue_coin_no_shadow_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000264 symbol: blue_coin_no_shadow_geo red_coin_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x160002C4 symbol: red_coin_geo red_coin_no_shadow_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000328 symbol: red_coin_no_shadow_geo diff --git a/assets/ymls/us/actors/cyan_fish.yml b/assets/ymls/us/actors/cyan_fish.yml index 45adc2a0..a9f928ee 100644 --- a/assets/ymls/us/actors/cyan_fish.yml +++ b/assets/ymls/us/actors/cyan_fish.yml @@ -13,6 +13,6 @@ cyan_fish: seg13: 0x1C3DB0 cyan_fish_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000324 symbol: cyan_fish_geo diff --git a/assets/ymls/us/actors/dirt.yml b/assets/ymls/us/actors/dirt.yml index 0bb125c2..ffffdb70 100644 --- a/assets/ymls/us/actors/dirt.yml +++ b/assets/ymls/us/actors/dirt.yml @@ -13,11 +13,11 @@ dirt_particle: seg22: 0x218DA0 dirt_animation_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000ED4 symbol: dirt_animation_geo cartoon_star_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000F24 symbol: cartoon_star_geo diff --git a/assets/ymls/us/actors/door.yml b/assets/ymls/us/actors/door.yml index 1a8513d0..63d1eb22 100644 --- a/assets/ymls/us/actors/door.yml +++ b/assets/ymls/us/actors/door.yml @@ -130,56 +130,56 @@ zero_star_door_sign: seg22: 0x218DA0 castle_door_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x160003A8 symbol: castle_door_geo cabin_door_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1600043C symbol: cabin_door_geo wooden_door_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x160004D0 symbol: wooden_door_geo wooden_door2_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000564 symbol: wooden_door2_geo metal_door_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x160005F8 symbol: metal_door_geo hazy_maze_door_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1600068C symbol: hazy_maze_door_geo haunted_door_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000720 symbol: haunted_door_geo castle_door_0_star_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x160007B4 symbol: castle_door_0_star_geo castle_door_1_star_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000868 symbol: castle_door_1_star_geo castle_door_3_stars_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1600091C symbol: castle_door_3_stars_geo key_door_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x160009D0 symbol: key_door_geo diff --git a/assets/ymls/us/actors/dorrie.yml b/assets/ymls/us/actors/dorrie.yml index 36fc5fa9..14c0d9b0 100644 --- a/assets/ymls/us/actors/dorrie.yml +++ b/assets/ymls/us/actors/dorrie.yml @@ -31,6 +31,6 @@ dorrie_tongue: seg13: 0x1F1B30 dorrie_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000230 symbol: dorrie_geo diff --git a/assets/ymls/us/actors/exclamation_box.yml b/assets/ymls/us/actors/exclamation_box.yml index 70126676..c395a8ca 100644 --- a/assets/ymls/us/actors/exclamation_box.yml +++ b/assets/ymls/us/actors/exclamation_box.yml @@ -76,6 +76,6 @@ wing_cap_box_side: seg15: 0x2008D0 exclamation_box_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F000694 symbol: exclamation_box_geo diff --git a/assets/ymls/us/actors/exclamation_box_outline.yml b/assets/ymls/us/actors/exclamation_box_outline.yml index 8d09a27b..f945b0fd 100644 --- a/assets/ymls/us/actors/exclamation_box_outline.yml +++ b/assets/ymls/us/actors/exclamation_box_outline.yml @@ -22,6 +22,6 @@ exclamation_point: seg15: 0x2008D0 exclamation_box_outline_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F000A58 symbol: exclamation_box_outline_geo diff --git a/assets/ymls/us/actors/explosion.yml b/assets/ymls/us/actors/explosion.yml index 13ab26f3..2f7b80cf 100644 --- a/assets/ymls/us/actors/explosion.yml +++ b/assets/ymls/us/actors/explosion.yml @@ -67,6 +67,6 @@ explosion_6: seg22: 0x218DA0 explosion_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000040 symbol: explosion_geo diff --git a/assets/ymls/us/actors/eyerok.yml b/assets/ymls/us/actors/eyerok.yml index e957a970..2277513b 100644 --- a/assets/ymls/us/actors/eyerok.yml +++ b/assets/ymls/us/actors/eyerok.yml @@ -49,16 +49,16 @@ eyerok_eye_open: seg12: 0x151B70 eyerok_geo_0002AC: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C0002AC symbol: eyerok_geo_0002AC eyerok_left_hand_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C0005A8 symbol: eyerok_left_hand_geo eyerok_right_hand_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C0005E4 symbol: eyerok_right_hand_geo diff --git a/assets/ymls/us/actors/flame.yml b/assets/ymls/us/actors/flame.yml index cf589999..3b900c2a 100644 --- a/assets/ymls/us/actors/flame.yml +++ b/assets/ymls/us/actors/flame.yml @@ -76,16 +76,16 @@ flame_7: seg22: 0x218DA0 red_flame_shadow_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000B10 symbol: red_flame_shadow_geo red_flame_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000B2C symbol: red_flame_geo blue_flame_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000B8C symbol: blue_flame_geo diff --git a/assets/ymls/us/actors/flyguy.yml b/assets/ymls/us/actors/flyguy.yml index e043a469..35f8c00a 100644 --- a/assets/ymls/us/actors/flyguy.yml +++ b/assets/ymls/us/actors/flyguy.yml @@ -31,6 +31,6 @@ flyguy_propeller: seg15: 0x2008D0 flyguy_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F000518 symbol: flyguy_geo diff --git a/assets/ymls/us/actors/fwoosh.yml b/assets/ymls/us/actors/fwoosh.yml index 261da890..74ac252e 100644 --- a/assets/ymls/us/actors/fwoosh.yml +++ b/assets/ymls/us/actors/fwoosh.yml @@ -13,6 +13,6 @@ fwoosh_face: seg12: 0x1602E0 fwoosh_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C00036C symbol: fwoosh_geo diff --git a/assets/ymls/us/actors/goomba.yml b/assets/ymls/us/actors/goomba.yml index 7031a423..bc09d2b3 100644 --- a/assets/ymls/us/actors/goomba.yml +++ b/assets/ymls/us/actors/goomba.yml @@ -31,6 +31,6 @@ goomba_face_blink: seg15: 0x2008D0 goomba_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F0006E4 symbol: goomba_geo diff --git a/assets/ymls/us/actors/haunted_cage.yml b/assets/ymls/us/actors/haunted_cage.yml index b470f79a..2dffe59e 100644 --- a/assets/ymls/us/actors/haunted_cage.yml +++ b/assets/ymls/us/actors/haunted_cage.yml @@ -58,6 +58,6 @@ bbh_cage_wooden_base: seg12: 0x16D5C0 haunted_cage_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000274 symbol: haunted_cage_geo diff --git a/assets/ymls/us/actors/heart.yml b/assets/ymls/us/actors/heart.yml index 231deb41..da8b78b5 100644 --- a/assets/ymls/us/actors/heart.yml +++ b/assets/ymls/us/actors/heart.yml @@ -13,6 +13,6 @@ spinning_heart: seg15: 0x2008D0 heart_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F0004FC symbol: heart_geo diff --git a/assets/ymls/us/actors/heave_ho.yml b/assets/ymls/us/actors/heave_ho.yml index e0d91831..0f659598 100644 --- a/assets/ymls/us/actors/heave_ho.yml +++ b/assets/ymls/us/actors/heave_ho.yml @@ -58,6 +58,6 @@ heave-ho_turnkey: seg12: 0x132850 heave_ho_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C00028C symbol: heave_ho_geo diff --git a/assets/ymls/us/actors/hoot.yml b/assets/ymls/us/actors/hoot.yml index 52245013..ed0fc497 100644 --- a/assets/ymls/us/actors/hoot.yml +++ b/assets/ymls/us/actors/hoot.yml @@ -31,6 +31,6 @@ hoot_wing_tip: seg12: 0x132850 hoot_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000018 symbol: hoot_geo diff --git a/assets/ymls/us/actors/impact_ring.yml b/assets/ymls/us/actors/impact_ring.yml index dec847c4..4e5b00cb 100644 --- a/assets/ymls/us/actors/impact_ring.yml +++ b/assets/ymls/us/actors/impact_ring.yml @@ -22,6 +22,6 @@ impact_ring_right_side: seg13: 0x1B9070 invisible_bowser_accessory_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000090 symbol: invisible_bowser_accessory_geo diff --git a/assets/ymls/us/actors/impact_smoke.yml b/assets/ymls/us/actors/impact_smoke.yml index ca231eea..9d9bafa4 100644 --- a/assets/ymls/us/actors/impact_smoke.yml +++ b/assets/ymls/us/actors/impact_smoke.yml @@ -40,6 +40,6 @@ impact_smoke_3: seg13: 0x1B9070 bowser_impact_smoke_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000BFC symbol: bowser_impact_smoke_geo diff --git a/assets/ymls/us/actors/king_bobomb.yml b/assets/ymls/us/actors/king_bobomb.yml index 592b2f41..5b7497de 100644 --- a/assets/ymls/us/actors/king_bobomb.yml +++ b/assets/ymls/us/actors/king_bobomb.yml @@ -103,6 +103,6 @@ king_bob-omb_right_side: seg12: 0x13B5D0 king_bobomb_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000000 symbol: king_bobomb_geo diff --git a/assets/ymls/us/actors/klepto.yml b/assets/ymls/us/actors/klepto.yml index 42395bd7..d0c8e0dc 100644 --- a/assets/ymls/us/actors/klepto.yml +++ b/assets/ymls/us/actors/klepto.yml @@ -49,6 +49,6 @@ klepto_wing_flap: seg12: 0x151B70 klepto_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000000 symbol: klepto_geo diff --git a/assets/ymls/us/actors/koopa.yml b/assets/ymls/us/actors/koopa.yml index 8de625fe..8677768f 100644 --- a/assets/ymls/us/actors/koopa.yml +++ b/assets/ymls/us/actors/koopa.yml @@ -76,11 +76,11 @@ koopa_shoe: seg13: 0x1D7C90 koopa_without_shell_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D0000D0 symbol: koopa_without_shell_geo koopa_with_shell_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000214 symbol: koopa_with_shell_geo diff --git a/assets/ymls/us/actors/koopa_flag.yml b/assets/ymls/us/actors/koopa_flag.yml index c1e121dd..13c06c0c 100644 --- a/assets/ymls/us/actors/koopa_flag.yml +++ b/assets/ymls/us/actors/koopa_flag.yml @@ -13,6 +13,6 @@ koopa_flag_banner: seg13: 0x1D7C90 koopa_flag_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000000 symbol: koopa_flag_geo diff --git a/assets/ymls/us/actors/koopa_shell.yml b/assets/ymls/us/actors/koopa_shell.yml index 2e851696..14f31627 100644 --- a/assets/ymls/us/actors/koopa_shell.yml +++ b/assets/ymls/us/actors/koopa_shell.yml @@ -22,16 +22,16 @@ koopa_shell_front: seg15: 0x2008D0 koopa_shell_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F000AB0 symbol: koopa_shell_geo koopa_shell2_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F000ADC symbol: koopa_shell2_geo koopa_shell3_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F000B08 symbol: koopa_shell3_geo diff --git a/assets/ymls/us/actors/lakitu_cameraman.yml b/assets/ymls/us/actors/lakitu_cameraman.yml index 25c6ce30..a389a53f 100644 --- a/assets/ymls/us/actors/lakitu_cameraman.yml +++ b/assets/ymls/us/actors/lakitu_cameraman.yml @@ -58,6 +58,6 @@ lakitu_cameraman_shell: seg13: 0x1E4BF0 lakitu_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000000 symbol: lakitu_geo diff --git a/assets/ymls/us/actors/lakitu_enemy.yml b/assets/ymls/us/actors/lakitu_enemy.yml index fbd62b0b..c4c6924a 100644 --- a/assets/ymls/us/actors/lakitu_enemy.yml +++ b/assets/ymls/us/actors/lakitu_enemy.yml @@ -49,6 +49,6 @@ lakitu_enemy_shell: seg12: 0x187FA0 enemy_lakitu_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C0001BC symbol: enemy_lakitu_geo diff --git a/assets/ymls/us/actors/leaves.yml b/assets/ymls/us/actors/leaves.yml index 5c761b5c..889bce0f 100644 --- a/assets/ymls/us/actors/leaves.yml +++ b/assets/ymls/us/actors/leaves.yml @@ -13,6 +13,6 @@ leaf: seg22: 0x218DA0 leaves_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000C8C symbol: leaves_geo diff --git a/assets/ymls/us/actors/mad_piano.yml b/assets/ymls/us/actors/mad_piano.yml index e3a717d6..3c39c8d8 100644 --- a/assets/ymls/us/actors/mad_piano.yml +++ b/assets/ymls/us/actors/mad_piano.yml @@ -58,6 +58,6 @@ mad_piano_tooth: seg12: 0x16D5C0 mad_piano_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C0001B4 symbol: mad_piano_geo diff --git a/assets/ymls/us/actors/manta.yml b/assets/ymls/us/actors/manta.yml index d2dc34b7..8a598273 100644 --- a/assets/ymls/us/actors/manta.yml +++ b/assets/ymls/us/actors/manta.yml @@ -40,7 +40,7 @@ manta_gills: seg5: 0x13B910 manta_seg5_geo_05008D14: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x13B910 mio0: 0x8D14 symbol: manta_seg5_geo_05008D14 diff --git a/assets/ymls/us/actors/mario.yml b/assets/ymls/us/actors/mario.yml index c19d3555..a125c8d3 100644 --- a/assets/ymls/us/actors/mario.yml +++ b/assets/ymls/us/actors/mario.yml @@ -175,246 +175,246 @@ mario_wing_tip: seg23: 0x1279b0 mario_geo_face_and_wings: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x170002E0 symbol: mario_geo_face_and_wings mario_geo_left_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1700041C symbol: mario_geo_left_hand mario_geo_right_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000494 symbol: mario_geo_right_hand mario_geo_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1700053C symbol: mario_geo_body mario_geo_medium_poly_left_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x170006F8 symbol: mario_geo_medium_poly_left_hand mario_geo_medium_poly_right_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000770 symbol: mario_geo_medium_poly_right_hand mario_geo_medium_poly_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000818 symbol: mario_geo_medium_poly_body mario_geo_low_poly_face_and_wings: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x170009D4 symbol: mario_geo_low_poly_face_and_wings mario_geo_low_poly_left_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000B10 symbol: mario_geo_low_poly_left_hand mario_geo_low_poly_right_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000B88 symbol: mario_geo_low_poly_right_hand mario_geo_low_poly_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000C30 symbol: mario_geo_low_poly_body mario_vanish_geo_face_and_wings: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000DEC symbol: mario_vanish_geo_face_and_wings mario_vanish_geo_left_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000F28 symbol: mario_vanish_geo_left_hand mario_vanish_geo_right_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000FA0 symbol: mario_vanish_geo_right_hand mario_vanish_geo_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17001048 symbol: mario_vanish_geo_body mario_vanish_geo_medium_poly_left_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17001204 symbol: mario_vanish_geo_medium_poly_left_hand mario_vanish_geo_medium_poly_right_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1700127C symbol: mario_vanish_geo_medium_poly_right_hand mario_vanish_geo_medium_poly_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17001324 symbol: mario_vanish_geo_medium_poly_body mario_vanish_geo_low_poly_face_and_wings: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x170014E0 symbol: mario_vanish_geo_low_poly_face_and_wings mario_vanish_geo_low_poly_left_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1700161C symbol: mario_vanish_geo_low_poly_left_hand mario_vanish_geo_low_poly_right_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17001694 symbol: mario_vanish_geo_low_poly_right_hand mario_vanish_geo_low_poly_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1700173C symbol: mario_vanish_geo_low_poly_body mario_metal_geo_face_and_wings: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x170018F8 symbol: mario_metal_geo_face_and_wings mario_metal_geo_left_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x170019A4 symbol: mario_metal_geo_left_hand mario_metal_geo_right_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17001A1C symbol: mario_metal_geo_right_hand mario_metal_geo_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17001AC4 symbol: mario_metal_geo_body mario_metal_geo_medium_poly_left_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17001C80 symbol: mario_metal_geo_medium_poly_left_hand mario_metal_geo_medium_poly_right_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17001CF8 symbol: mario_metal_geo_medium_poly_right_hand mario_metal_geo_medium_poly_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17001DA0 symbol: mario_metal_geo_medium_poly_body mario_metal_geo_low_poly_face_and_wings: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17001F5C symbol: mario_metal_geo_low_poly_face_and_wings mario_metal_geo_low_poly_left_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002008 symbol: mario_metal_geo_low_poly_left_hand mario_metal_geo_low_poly_right_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002080 symbol: mario_metal_geo_low_poly_right_hand mario_metal_geo_low_poly_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002128 symbol: mario_metal_geo_low_poly_body mario_metal_vanish_geo_face_and_wings: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x170022E4 symbol: mario_metal_vanish_geo_face_and_wings mario_metal_vanish_geo_left_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002390 symbol: mario_metal_vanish_geo_left_hand mario_metal_vanish_geo_right_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002408 symbol: mario_metal_vanish_geo_right_hand mario_metal_vanish_geo_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x170024B0 symbol: mario_metal_vanish_geo_body mario_metal_vanish_geo_medium_poly_left_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1700266C symbol: mario_metal_vanish_geo_medium_poly_left_hand mario_metal_vanish_geo_medium_poly_right_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x170026E4 symbol: mario_metal_vanish_geo_medium_poly_right_hand mario_metal_vanish_geo_medium_poly_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1700278C symbol: mario_metal_vanish_geo_medium_poly_body mario_metal_vanish_geo_low_poly_face_and_wings: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002958 symbol: mario_metal_vanish_geo_low_poly_face_and_wings mario_metal_vanish_geo_low_poly_left_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002A04 symbol: mario_metal_vanish_geo_low_poly_left_hand mario_metal_vanish_geo_low_poly_right_hand: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002A7C symbol: mario_metal_vanish_geo_low_poly_right_hand mario_metal_vanish_geo_low_poly_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002B24 symbol: mario_metal_vanish_geo_low_poly_body mario_geo_load_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002CE0 symbol: mario_geo_load_body mario_geo_load_medium_poly_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002D14 symbol: mario_geo_load_medium_poly_body mario_geo_load_low_poly_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002D48 symbol: mario_geo_load_low_poly_body mario_geo_render_body: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002D7C symbol: mario_geo_render_body mario_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17002DD4 symbol: mario_geo diff --git a/assets/ymls/us/actors/mario_cap.yml b/assets/ymls/us/actors/mario_cap.yml index 06ce7fa3..02cdbf89 100644 --- a/assets/ymls/us/actors/mario_cap.yml +++ b/assets/ymls/us/actors/mario_cap.yml @@ -58,21 +58,21 @@ mario_cap_wing_tip: seg22: 0x218DA0 marios_cap_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000CA4 symbol: marios_cap_geo marios_metal_cap_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000CF0 symbol: marios_metal_cap_geo marios_wing_cap_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000D3C symbol: marios_wing_cap_geo marios_winged_metal_cap_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000DA8 symbol: marios_winged_metal_cap_geo diff --git a/assets/ymls/us/actors/metal_box.yml b/assets/ymls/us/actors/metal_box.yml index 9a5ca4a0..8ad5a31c 100644 --- a/assets/ymls/us/actors/metal_box.yml +++ b/assets/ymls/us/actors/metal_box.yml @@ -13,6 +13,6 @@ metal_box_side: seg15: 0x2008D0 metal_box_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F000A30 symbol: metal_box_geo diff --git a/assets/ymls/us/actors/mips.yml b/assets/ymls/us/actors/mips.yml index c3afd9b1..9637a3ec 100644 --- a/assets/ymls/us/actors/mips.yml +++ b/assets/ymls/us/actors/mips.yml @@ -13,6 +13,6 @@ mips_eyes: seg13: 0x1E4BF0 mips_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000448 symbol: mips_geo diff --git a/assets/ymls/us/actors/mist.yml b/assets/ymls/us/actors/mist.yml index 8712af8e..64f76912 100644 --- a/assets/ymls/us/actors/mist.yml +++ b/assets/ymls/us/actors/mist.yml @@ -13,11 +13,11 @@ mist: seg22: 0x218DA0 mist_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000000 symbol: mist_geo white_puff_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000020 symbol: white_puff_geo diff --git a/assets/ymls/us/actors/moneybag.yml b/assets/ymls/us/actors/moneybag.yml index 5d14443f..589e2cd6 100644 --- a/assets/ymls/us/actors/moneybag.yml +++ b/assets/ymls/us/actors/moneybag.yml @@ -22,16 +22,16 @@ moneybag_mouth: seg13: 0x1E7D90 moneybag_geo_000000: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000000 symbol: moneybag_geo_000000 moneybag_geo_000078: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000078 symbol: moneybag_geo_000078 moneybag_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D0000F0 symbol: moneybag_geo diff --git a/assets/ymls/us/actors/monty_mole.yml b/assets/ymls/us/actors/monty_mole.yml index 9373bec1..2eb04601 100644 --- a/assets/ymls/us/actors/monty_mole.yml +++ b/assets/ymls/us/actors/monty_mole.yml @@ -49,6 +49,6 @@ monty_mole_tooth: seg12: 0x1602E0 monty_mole_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000000 symbol: monty_mole_geo diff --git a/assets/ymls/us/actors/mr_i_eyeball.yml b/assets/ymls/us/actors/mr_i_eyeball.yml index 9cf4f4e0..a9fd797c 100644 --- a/assets/ymls/us/actors/mr_i_eyeball.yml +++ b/assets/ymls/us/actors/mr_i_eyeball.yml @@ -22,6 +22,6 @@ mr_i_eyeball_right_side: seg13: 0x1F1B30 mr_i_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000000 symbol: mr_i_geo diff --git a/assets/ymls/us/actors/mr_i_iris.yml b/assets/ymls/us/actors/mr_i_iris.yml index 652194c5..67817210 100644 --- a/assets/ymls/us/actors/mr_i_iris.yml +++ b/assets/ymls/us/actors/mr_i_iris.yml @@ -40,6 +40,6 @@ mr_i_iris_open: seg13: 0x1F1B30 mr_i_iris_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D00001C symbol: mr_i_iris_geo diff --git a/assets/ymls/us/actors/mushroom_1up.yml b/assets/ymls/us/actors/mushroom_1up.yml index d9eec08c..4da601fb 100644 --- a/assets/ymls/us/actors/mushroom_1up.yml +++ b/assets/ymls/us/actors/mushroom_1up.yml @@ -13,6 +13,6 @@ seg22: 0x218DA0 mushroom_1up_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000E84 symbol: mushroom_1up_geo diff --git a/assets/ymls/us/actors/number.yml b/assets/ymls/us/actors/number.yml index 884ede7c..2bf24464 100644 --- a/assets/ymls/us/actors/number.yml +++ b/assets/ymls/us/actors/number.yml @@ -3,6 +3,6 @@ seg22: 0x218DA0 number_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000E14 symbol: number_geo diff --git a/assets/ymls/us/actors/peach.yml b/assets/ymls/us/actors/peach.yml index e71aa599..749600ce 100644 --- a/assets/ymls/us/actors/peach.yml +++ b/assets/ymls/us/actors/peach.yml @@ -94,16 +94,16 @@ peach_nostril: seg12: 0x180540 peach_geo_000098: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000098 symbol: peach_geo_000098 peach_geo_000254: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000254 symbol: peach_geo_000254 peach_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000410 symbol: peach_geo diff --git a/assets/ymls/us/actors/penguin.yml b/assets/ymls/us/actors/penguin.yml index a81d425a..25e4d0e9 100644 --- a/assets/ymls/us/actors/penguin.yml +++ b/assets/ymls/us/actors/penguin.yml @@ -58,6 +58,6 @@ penguin_eye_open: seg12: 0x1656E0 penguin_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000104 symbol: penguin_geo diff --git a/assets/ymls/us/actors/piranha_plant.yml b/assets/ymls/us/actors/piranha_plant.yml index 1a600df2..c1843e3f 100644 --- a/assets/ymls/us/actors/piranha_plant.yml +++ b/assets/ymls/us/actors/piranha_plant.yml @@ -58,6 +58,6 @@ piranha_plant_tooth: seg13: 0x1D7C90 piranha_plant_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000358 symbol: piranha_plant_geo diff --git a/assets/ymls/us/actors/pokey.yml b/assets/ymls/us/actors/pokey.yml index fc0d496c..0e450ba5 100644 --- a/assets/ymls/us/actors/pokey.yml +++ b/assets/ymls/us/actors/pokey.yml @@ -31,11 +31,11 @@ pokey_face_blink: seg12: 0x151B70 pokey_head_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000610 symbol: pokey_head_geo pokey_body_part_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000644 symbol: pokey_body_part_geo diff --git a/assets/ymls/us/actors/poundable_pole.yml b/assets/ymls/us/actors/poundable_pole.yml index d4d8ba24..2c4228c8 100644 --- a/assets/ymls/us/actors/poundable_pole.yml +++ b/assets/ymls/us/actors/poundable_pole.yml @@ -22,6 +22,6 @@ poundable_pole_top: seg13: 0x1D7C90 wooden_post_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D0000B8 symbol: wooden_post_geo diff --git a/assets/ymls/us/actors/purple_switch.yml b/assets/ymls/us/actors/purple_switch.yml index e4c10264..90f5da7b 100644 --- a/assets/ymls/us/actors/purple_switch.yml +++ b/assets/ymls/us/actors/purple_switch.yml @@ -22,6 +22,6 @@ purple_switch_exclamation_point: seg15: 0x2008D0 purple_switch_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F0004CC symbol: purple_switch_geo diff --git a/assets/ymls/us/actors/scuttlebug.yml b/assets/ymls/us/actors/scuttlebug.yml index 1aff4bda..f9a68a26 100644 --- a/assets/ymls/us/actors/scuttlebug.yml +++ b/assets/ymls/us/actors/scuttlebug.yml @@ -49,6 +49,6 @@ scuttlebug_right_side: seg13: 0x1F1B30 scuttlebug_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000394 symbol: scuttlebug_geo diff --git a/assets/ymls/us/actors/seaweed.yml b/assets/ymls/us/actors/seaweed.yml index aef58f4e..49a5c01a 100644 --- a/assets/ymls/us/actors/seaweed.yml +++ b/assets/ymls/us/actors/seaweed.yml @@ -40,6 +40,6 @@ seaweed_upper_center: seg13: 0x1C3DB0 seaweed_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000284 symbol: seaweed_geo diff --git a/assets/ymls/us/actors/skeeter.yml b/assets/ymls/us/actors/skeeter.yml index 60c19225..1a718a28 100644 --- a/assets/ymls/us/actors/skeeter.yml +++ b/assets/ymls/us/actors/skeeter.yml @@ -22,6 +22,6 @@ skeeter_iris: seg13: 0x1C3DB0 skeeter_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000000 symbol: skeeter_geo diff --git a/assets/ymls/us/actors/small_key.yml b/assets/ymls/us/actors/small_key.yml index 273890eb..26a01486 100644 --- a/assets/ymls/us/actors/small_key.yml +++ b/assets/ymls/us/actors/small_key.yml @@ -3,6 +3,6 @@ seg12: 0x16D5C0 small_key_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000188 symbol: small_key_geo diff --git a/assets/ymls/us/actors/snowman.yml b/assets/ymls/us/actors/snowman.yml index 650f33eb..5713b9b1 100644 --- a/assets/ymls/us/actors/snowman.yml +++ b/assets/ymls/us/actors/snowman.yml @@ -49,11 +49,11 @@ mr_blizzard_right_side: seg12: 0x1656E0 mr_blizzard_hidden_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C00021C symbol: mr_blizzard_hidden_geo mr_blizzard_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000348 symbol: mr_blizzard_geo diff --git a/assets/ymls/us/actors/snufit.yml b/assets/ymls/us/actors/snufit.yml index e0936da8..d5a12afa 100644 --- a/assets/ymls/us/actors/snufit.yml +++ b/assets/ymls/us/actors/snufit.yml @@ -40,6 +40,6 @@ snufit_mouth: seg13: 0x1F1B30 snufit_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D0001A0 symbol: snufit_geo diff --git a/assets/ymls/us/actors/sparkle.yml b/assets/ymls/us/actors/sparkle.yml index fffc9401..cb94d950 100644 --- a/assets/ymls/us/actors/sparkle.yml +++ b/assets/ymls/us/actors/sparkle.yml @@ -58,6 +58,6 @@ sparkle_5: seg23: 0x1279B0 sparkles_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x170001BC symbol: sparkles_geo diff --git a/assets/ymls/us/actors/sparkle_animation.yml b/assets/ymls/us/actors/sparkle_animation.yml index 163816a6..a190d80a 100644 --- a/assets/ymls/us/actors/sparkle_animation.yml +++ b/assets/ymls/us/actors/sparkle_animation.yml @@ -49,6 +49,6 @@ sparkle_animation_4: seg23: 0x1279B0 sparkles_animation_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000284 symbol: sparkles_animation_geo diff --git a/assets/ymls/us/actors/spindrift.yml b/assets/ymls/us/actors/spindrift.yml index bf9c1c04..8ad276e7 100644 --- a/assets/ymls/us/actors/spindrift.yml +++ b/assets/ymls/us/actors/spindrift.yml @@ -40,6 +40,6 @@ spindrift_petal: seg12: 0x1656E0 spindrift_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000000 symbol: spindrift_geo diff --git a/assets/ymls/us/actors/spiny.yml b/assets/ymls/us/actors/spiny.yml index ff1f89a2..e658fd0b 100644 --- a/assets/ymls/us/actors/spiny.yml +++ b/assets/ymls/us/actors/spiny.yml @@ -3,6 +3,6 @@ seg12: 0x187FA0 spiny_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000328 symbol: spiny_geo diff --git a/assets/ymls/us/actors/spiny_egg.yml b/assets/ymls/us/actors/spiny_egg.yml index 67bbff37..b9f6c164 100644 --- a/assets/ymls/us/actors/spiny_egg.yml +++ b/assets/ymls/us/actors/spiny_egg.yml @@ -3,6 +3,6 @@ seg12: 0x187FA0 spiny_ball_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000290 symbol: spiny_ball_geo diff --git a/assets/ymls/us/actors/springboard.yml b/assets/ymls/us/actors/springboard.yml index 64f69f66..9aba95dd 100644 --- a/assets/ymls/us/actors/springboard.yml +++ b/assets/ymls/us/actors/springboard.yml @@ -22,16 +22,16 @@ springboard_top_unused: seg12: 0x166BD0 springboard_top_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000000 symbol: springboard_top_geo springboard_spring_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000018 symbol: springboard_spring_geo springboard_bottom_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000030 symbol: springboard_bottom_geo diff --git a/assets/ymls/us/actors/star.yml b/assets/ymls/us/actors/star.yml index 8e3d8435..9b577d60 100644 --- a/assets/ymls/us/actors/star.yml +++ b/assets/ymls/us/actors/star.yml @@ -22,6 +22,6 @@ star_surface: seg22: 0x218DA0 star_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000EA0 symbol: star_geo diff --git a/assets/ymls/us/actors/stomp_smoke.yml b/assets/ymls/us/actors/stomp_smoke.yml index c37fccdd..6e5c347f 100644 --- a/assets/ymls/us/actors/stomp_smoke.yml +++ b/assets/ymls/us/actors/stomp_smoke.yml @@ -58,11 +58,11 @@ stomp_smoke_5: seg23: 0x1279B0 small_water_splash_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1700009C symbol: small_water_splash_geo mario_TODO_geo_0000E0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x170000E0 symbol: mario_TODO_geo_0000E0 diff --git a/assets/ymls/us/actors/sushi.yml b/assets/ymls/us/actors/sushi.yml index 779dc556..f773f4cb 100644 --- a/assets/ymls/us/actors/sushi.yml +++ b/assets/ymls/us/actors/sushi.yml @@ -31,6 +31,6 @@ sushi_tooth: seg12: 0x145C10 sushi_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000068 symbol: sushi_geo diff --git a/assets/ymls/us/actors/swoop.yml b/assets/ymls/us/actors/swoop.yml index f1722858..36062693 100644 --- a/assets/ymls/us/actors/swoop.yml +++ b/assets/ymls/us/actors/swoop.yml @@ -40,6 +40,6 @@ swoop_wing: seg13: 0x1F1B30 swoop_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D0000DC symbol: swoop_geo diff --git a/assets/ymls/us/actors/test_platform.yml b/assets/ymls/us/actors/test_platform.yml index 80e2e7fc..bceb02a4 100644 --- a/assets/ymls/us/actors/test_platform.yml +++ b/assets/ymls/us/actors/test_platform.yml @@ -3,6 +3,6 @@ seg15: 0x2008D0 test_platform_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0F000020 symbol: test_platform_geo diff --git a/assets/ymls/us/actors/thwomp.yml b/assets/ymls/us/actors/thwomp.yml index 68928bf6..d0646867 100644 --- a/assets/ymls/us/actors/thwomp.yml +++ b/assets/ymls/us/actors/thwomp.yml @@ -22,6 +22,6 @@ thwomp_surface: seg12: 0x132850 thwomp_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000248 symbol: thwomp_geo diff --git a/assets/ymls/us/actors/toad.yml b/assets/ymls/us/actors/toad.yml index 2f9d81cc..21e1d9f7 100644 --- a/assets/ymls/us/actors/toad.yml +++ b/assets/ymls/us/actors/toad.yml @@ -22,16 +22,16 @@ toad_head: seg13: 0x1E4BF0 toad_geo_000114: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000114 symbol: toad_geo_000114 toad_geo_00027C: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D00027C symbol: toad_geo_00027C toad_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D0003E4 symbol: toad_geo diff --git a/assets/ymls/us/actors/tornado.yml b/assets/ymls/us/actors/tornado.yml index 7b10c642..11edf685 100644 --- a/assets/ymls/us/actors/tornado.yml +++ b/assets/ymls/us/actors/tornado.yml @@ -13,7 +13,7 @@ tornado: seg5: 0x145E90 tweester_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x145E90 mio0: 0x4630 symbol: tweester_geo diff --git a/assets/ymls/us/actors/transparent_star b/assets/ymls/us/actors/transparent_star index 1d5d904d..41096b9a 100644 --- a/assets/ymls/us/actors/transparent_star +++ b/assets/ymls/us/actors/transparent_star @@ -3,6 +3,6 @@ seg22: 0x218DA0 transparent_star_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000F6C symbol: transparent_star_geo diff --git a/assets/ymls/us/actors/treasure_chest.yml b/assets/ymls/us/actors/treasure_chest.yml index 16c4e1d6..d2556d5b 100644 --- a/assets/ymls/us/actors/treasure_chest.yml +++ b/assets/ymls/us/actors/treasure_chest.yml @@ -40,11 +40,11 @@ treasure_chest_side: seg13: 0x1C3DB0 treasure_chest_base_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000450 symbol: treasure_chest_base_geo treasure_chest_lid_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000468 symbol: treasure_chest_lid_geo diff --git a/assets/ymls/us/actors/tree.yml b/assets/ymls/us/actors/tree.yml index 1e90dc76..aeeccbd8 100644 --- a/assets/ymls/us/actors/tree.yml +++ b/assets/ymls/us/actors/tree.yml @@ -49,26 +49,26 @@ tree_right_side: seg22: 0x218DA0 bubbly_tree_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000FE8 symbol: bubbly_tree_geo spiky_tree_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16001000 symbol: spiky_tree_geo snow_tree_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16001018 symbol: snow_tree_geo spiky_tree1_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16001030 symbol: spiky_tree1_geo palm_tree_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16001048 symbol: palm_tree_geo diff --git a/assets/ymls/us/actors/ukiki.yml b/assets/ymls/us/actors/ukiki.yml index 62c39030..bc2dbb88 100644 --- a/assets/ymls/us/actors/ukiki.yml +++ b/assets/ymls/us/actors/ukiki.yml @@ -40,6 +40,6 @@ ukiki_fur: seg12: 0x1602E0 ukiki_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000110 symbol: ukiki_geo diff --git a/assets/ymls/us/actors/unagi.yml b/assets/ymls/us/actors/unagi.yml index ea89db0a..ba14f2ba 100644 --- a/assets/ymls/us/actors/unagi.yml +++ b/assets/ymls/us/actors/unagi.yml @@ -58,6 +58,6 @@ unagi_tooth: seg12: 0x145C10 unagi_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C00010C symbol: unagi_geo diff --git a/assets/ymls/us/actors/walk_smoke.yml b/assets/ymls/us/actors/walk_smoke.yml index bef3cc7c..00c20b33 100644 --- a/assets/ymls/us/actors/walk_smoke.yml +++ b/assets/ymls/us/actors/walk_smoke.yml @@ -67,6 +67,6 @@ walk_smoke_6: seg23: 0x1279B0 smoke_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000038 symbol: smoke_geo diff --git a/assets/ymls/us/actors/warp_pipe.yml b/assets/ymls/us/actors/warp_pipe.yml index e9b33d9c..333d6d04 100644 --- a/assets/ymls/us/actors/warp_pipe.yml +++ b/assets/ymls/us/actors/warp_pipe.yml @@ -22,6 +22,6 @@ warp_pipe_top: seg22: 0x218DA0 warp_pipe_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000388 symbol: warp_pipe_geo diff --git a/assets/ymls/us/actors/water_bubble.yml b/assets/ymls/us/actors/water_bubble.yml index 36ffddf3..84399653 100644 --- a/assets/ymls/us/actors/water_bubble.yml +++ b/assets/ymls/us/actors/water_bubble.yml @@ -13,11 +13,11 @@ water_bubble: seg12: 0x13B5D0 water_bomb_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000308 symbol: water_bomb_geo water_bomb_shadow_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000328 symbol: water_bomb_shadow_geo diff --git a/assets/ymls/us/actors/water_mine.yml b/assets/ymls/us/actors/water_mine.yml index 044bab18..4489f25e 100644 --- a/assets/ymls/us/actors/water_mine.yml +++ b/assets/ymls/us/actors/water_mine.yml @@ -31,6 +31,6 @@ water_mine_spike_unused: seg13: 0x1C3DB0 water_mine_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D0002F4 symbol: water_mine_geo diff --git a/assets/ymls/us/actors/water_ring.yml b/assets/ymls/us/actors/water_ring.yml index c8702c00..6ca35f8a 100644 --- a/assets/ymls/us/actors/water_ring.yml +++ b/assets/ymls/us/actors/water_ring.yml @@ -13,6 +13,6 @@ water_ring: seg13: 0x1C3DB0 water_ring_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000414 symbol: water_ring_geo diff --git a/assets/ymls/us/actors/water_splash.yml b/assets/ymls/us/actors/water_splash.yml index d0b9f89b..1b9a6216 100644 --- a/assets/ymls/us/actors/water_splash.yml +++ b/assets/ymls/us/actors/water_splash.yml @@ -76,6 +76,6 @@ water_splash_7: seg23: 0x1279B0 water_splash_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000230 symbol: water_splash_geo diff --git a/assets/ymls/us/actors/water_wave.yml b/assets/ymls/us/actors/water_wave.yml index 24207cd8..97956659 100644 --- a/assets/ymls/us/actors/water_wave.yml +++ b/assets/ymls/us/actors/water_wave.yml @@ -40,11 +40,11 @@ water_wave_3: seg23: 0x1279B0 idle_water_wave_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000124 symbol: idle_water_wave_geo wave_trail_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x17000168 symbol: wave_trail_geo diff --git a/assets/ymls/us/actors/white_particle.yml b/assets/ymls/us/actors/white_particle.yml index a61fe964..fc2572bc 100644 --- a/assets/ymls/us/actors/white_particle.yml +++ b/assets/ymls/us/actors/white_particle.yml @@ -13,6 +13,6 @@ snow_particle: seg22: 0x218DA0 white_particle_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000F98 symbol: white_particle_geo diff --git a/assets/ymls/us/actors/whomp.yml b/assets/ymls/us/actors/whomp.yml index 6d37ad80..aa29934f 100644 --- a/assets/ymls/us/actors/whomp.yml +++ b/assets/ymls/us/actors/whomp.yml @@ -40,6 +40,6 @@ whomp_surface: seg13: 0x1D7C90 whomp_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D000480 symbol: whomp_geo diff --git a/assets/ymls/us/actors/wiggler_body.yaml b/assets/ymls/us/actors/wiggler_body.yaml index 1f1b6e79..85a8469c 100644 --- a/assets/ymls/us/actors/wiggler_body.yaml +++ b/assets/ymls/us/actors/wiggler_body.yaml @@ -3,7 +3,7 @@ seg5: 0x180BB0 wiggler_body_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x180BB0 mio0: 0xC778 symbol: wiggler_body_geo diff --git a/assets/ymls/us/actors/wiggler_head.yml b/assets/ymls/us/actors/wiggler_head.yml index 3b4e63a8..788510e7 100644 --- a/assets/ymls/us/actors/wiggler_head.yml +++ b/assets/ymls/us/actors/wiggler_head.yml @@ -3,6 +3,6 @@ seg12: 0x187FA0 wiggler_head_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000030 symbol: wiggler_head_geo diff --git a/assets/ymls/us/actors/wooden_signpost.yml b/assets/ymls/us/actors/wooden_signpost.yml index 1bbd53c6..d0b7ff44 100644 --- a/assets/ymls/us/actors/wooden_signpost.yml +++ b/assets/ymls/us/actors/wooden_signpost.yml @@ -22,6 +22,6 @@ wooden_signpost_front: seg22: 0x218DA0 wooden_signpost_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x16000FB4 symbol: wooden_signpost_geo diff --git a/assets/ymls/us/actors/yellow_sphere.yml b/assets/ymls/us/actors/yellow_sphere.yml index 3b926054..8feb2e86 100644 --- a/assets/ymls/us/actors/yellow_sphere.yml +++ b/assets/ymls/us/actors/yellow_sphere.yml @@ -13,6 +13,6 @@ yellow_sphere: seg13: 0x1B9070 bowser_1_yellow_sphere_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0D0000B0 symbol: bowser_1_yellow_sphere_geo diff --git a/assets/ymls/us/actors/yellow_sphere_small.yml b/assets/ymls/us/actors/yellow_sphere_small.yml index a94e0192..6eb47aa7 100644 --- a/assets/ymls/us/actors/yellow_sphere_small.yml +++ b/assets/ymls/us/actors/yellow_sphere_small.yml @@ -13,6 +13,6 @@ small_yellow_sphere: seg12: 0x132850 yellow_sphere_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000000 symbol: yellow_sphere_geo diff --git a/assets/ymls/us/actors/yoshi.yml b/assets/ymls/us/actors/yoshi.yml index 40c82eca..86034ad7 100644 --- a/assets/ymls/us/actors/yoshi.yml +++ b/assets/ymls/us/actors/yoshi.yml @@ -31,6 +31,6 @@ yoshi_nostril: seg12: 0x180540 yoshi_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C000468 symbol: yoshi_geo diff --git a/assets/ymls/us/actors/yoshi_egg.yml b/assets/ymls/us/actors/yoshi_egg.yml index 4a2dfa7d..17566d93 100644 --- a/assets/ymls/us/actors/yoshi_egg.yml +++ b/assets/ymls/us/actors/yoshi_egg.yml @@ -76,6 +76,6 @@ yoshi_egg_7_unused: seg12: 0x132850 yoshi_egg_geo: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0C0001E4 symbol: yoshi_egg_geo diff --git a/assets/ymls/us/levels/bbh.yml b/assets/ymls/us/levels/bbh.yml index 1f407be4..9131e6e8 100644 --- a/assets/ymls/us/levels/bbh.yml +++ b/assets/ymls/us/levels/bbh.yml @@ -67,206 +67,206 @@ seg14: 0x3828C0 geo_bbh_0005B0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005B0 symbol: geo_bbh_0005B0 geo_bbh_0005C8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005C8 symbol: geo_bbh_0005C8 geo_bbh_0005E0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005E0 symbol: geo_bbh_0005E0 geo_bbh_0005F8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005F8 symbol: geo_bbh_0005F8 geo_bbh_000610: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000610 symbol: geo_bbh_000610 geo_bbh_000628: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000628 symbol: geo_bbh_000628 geo_bbh_000640: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000640 symbol: geo_bbh_000640 geo_bbh_000658: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000658 symbol: geo_bbh_000658 geo_bbh_000670: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000670 symbol: geo_bbh_000670 geo_bbh_0006B0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006B0 symbol: geo_bbh_0006B0 geo_bbh_0006E8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006E8 symbol: geo_bbh_0006E8 geo_bbh_000730: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000730 symbol: geo_bbh_000730 geo_bbh_000750: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000750 symbol: geo_bbh_000750 geo_bbh_000768: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000768 symbol: geo_bbh_000768 geo_bbh_0007B0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0007B0 symbol: geo_bbh_0007B0 geo_bbh_0007D0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0007D0 symbol: geo_bbh_0007D0 geo_bbh_000800: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000800 symbol: geo_bbh_000800 geo_bbh_000828: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000828 symbol: geo_bbh_000828 geo_bbh_000860: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000860 symbol: geo_bbh_000860 geo_bbh_000888: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000888 symbol: geo_bbh_000888 geo_bbh_0008B0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0008B0 symbol: geo_bbh_0008B0 geo_bbh_0008E8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0008E8 symbol: geo_bbh_0008E8 geo_bbh_000950: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000950 symbol: geo_bbh_000950 geo_bbh_0009C8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009C8 symbol: geo_bbh_0009C8 geo_bbh_000A18: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A18 symbol: geo_bbh_000A18 geo_bbh_000A60: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A60 symbol: geo_bbh_000A60 geo_bbh_000AD8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000AD8 symbol: geo_bbh_000AD8 geo_bbh_000B28: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B28 symbol: geo_bbh_000B28 geo_bbh_000B88: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B88 symbol: geo_bbh_000B88 geo_bbh_000BF0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000BF0 symbol: geo_bbh_000BF0 geo_bbh_000C38: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000C38 symbol: geo_bbh_000C38 geo_bbh_000C88: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000C88 symbol: geo_bbh_000C88 geo_bbh_000CE8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000CE8 symbol: geo_bbh_000CE8 geo_bbh_000D20: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000D20 symbol: geo_bbh_000D20 geo_bbh_000D68: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000D68 symbol: geo_bbh_000D68 geo_bbh_000DB0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000DB0 symbol: geo_bbh_000DB0 geo_bbh_000DF0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000DF0 symbol: geo_bbh_000DF0 geo_bbh_000E40: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000E40 symbol: geo_bbh_000E40 geo_bbh_000E80: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000E80 symbol: geo_bbh_000E80 geo_bbh_000EB0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000EB0 symbol: geo_bbh_000EB0 geo_bbh_000F00: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000F00 symbol: geo_bbh_000F00 diff --git a/assets/ymls/us/levels/bitdw.yml b/assets/ymls/us/levels/bitdw.yml index 28273797..c0584158 100644 --- a/assets/ymls/us/levels/bitdw.yml +++ b/assets/ymls/us/levels/bitdw.yml @@ -40,131 +40,131 @@ seg14: 0x45BF60 geo_bitdw_0003C0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0003C0 symbol: geo_bitdw_0003C0 geo_bitdw_0003D8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0003D8 symbol: geo_bitdw_0003D8 geo_bitdw_0003F0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0003F0 symbol: geo_bitdw_0003F0 geo_bitdw_000408: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000408 symbol: geo_bitdw_000408 geo_bitdw_000420: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000420 symbol: geo_bitdw_000420 geo_bitdw_000438: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000438 symbol: geo_bitdw_000438 geo_bitdw_000450: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000450 symbol: geo_bitdw_000450 geo_bitdw_000468: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000468 symbol: geo_bitdw_000468 geo_bitdw_000480: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000480 symbol: geo_bitdw_000480 geo_bitdw_000498: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000498 symbol: geo_bitdw_000498 geo_bitdw_0004B0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004B0 symbol: geo_bitdw_0004B0 geo_bitdw_0004C8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004C8 symbol: geo_bitdw_0004C8 geo_bitdw_0004E0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004E0 symbol: geo_bitdw_0004E0 geo_bitdw_0004F8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004F8 symbol: geo_bitdw_0004F8 geo_bitdw_000510: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000510 symbol: geo_bitdw_000510 geo_bitdw_000528: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000528 symbol: geo_bitdw_000528 geo_bitdw_000540: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000540 symbol: geo_bitdw_000540 geo_bitdw_000558: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000558 symbol: geo_bitdw_000558 geo_bitdw_000570: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000570 symbol: geo_bitdw_000570 geo_bitdw_000588: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000588 symbol: geo_bitdw_000588 geo_bitdw_0005A0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005A0 symbol: geo_bitdw_0005A0 geo_bitdw_0005B8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005B8 symbol: geo_bitdw_0005B8 geo_bitdw_0005D0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005D0 symbol: geo_bitdw_0005D0 geo_bitdw_0005E8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005E8 symbol: geo_bitdw_0005E8 geo_bitdw_000600: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000600 symbol: geo_bitdw_000600 geo_bitdw_000618: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000618 symbol: geo_bitdw_000618 diff --git a/assets/ymls/us/levels/bitfs.yml b/assets/ymls/us/levels/bitfs.yml index 562dc9ec..e504028a 100644 --- a/assets/ymls/us/levels/bitfs.yml +++ b/assets/ymls/us/levels/bitfs.yml @@ -31,161 +31,161 @@ seg14: 0x46A840 bitfs_geo_0004B0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004B0 symbol: bitfs_geo_0004B0 bitfs_geo_0004C8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004C8 symbol: bitfs_geo_0004C8 bitfs_geo_0004E0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004E0 symbol: bitfs_geo_0004E0 bitfs_geo_0004F8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004F8 symbol: bitfs_geo_0004F8 bitfs_geo_000510: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000510 symbol: bitfs_geo_000510 bitfs_geo_000528: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000528 symbol: bitfs_geo_000528 bitfs_geo_000540: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000540 symbol: bitfs_geo_000540 bitfs_geo_000558: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000558 symbol: bitfs_geo_000558 bitfs_geo_000570: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000570 symbol: bitfs_geo_000570 bitfs_geo_000588: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000588 symbol: bitfs_geo_000588 bitfs_geo_0005A0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005A0 symbol: bitfs_geo_0005A0 bitfs_geo_0005B8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005B8 symbol: bitfs_geo_0005B8 bitfs_geo_0005D0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005D0 symbol: bitfs_geo_0005D0 bitfs_geo_0005E8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005E8 symbol: bitfs_geo_0005E8 bitfs_geo_000600: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000600 symbol: bitfs_geo_000600 bitfs_geo_000618: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000618 symbol: bitfs_geo_000618 bitfs_geo_000630: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000630 symbol: bitfs_geo_000630 bitfs_geo_000648: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000648 symbol: bitfs_geo_000648 bitfs_geo_000660: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000660 symbol: bitfs_geo_000660 bitfs_geo_000678: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000678 symbol: bitfs_geo_000678 bitfs_geo_000690: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000690 symbol: bitfs_geo_000690 bitfs_geo_0006A8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006A8 symbol: bitfs_geo_0006A8 bitfs_geo_0006C0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006C0 symbol: bitfs_geo_0006C0 bitfs_geo_0006D8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006D8 symbol: bitfs_geo_0006D8 bitfs_geo_0006F0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006F0 symbol: bitfs_geo_0006F0 bitfs_geo_000708: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000708 symbol: bitfs_geo_000708 bitfs_geo_000728: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000728 symbol: bitfs_geo_000728 bitfs_geo_000740: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000740 symbol: bitfs_geo_000740 bitfs_geo_000758: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000758 symbol: bitfs_geo_000758 bitfs_geo_000770: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000770 symbol: bitfs_geo_000770 bitfs_geo_000788: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000788 symbol: bitfs_geo_000788 bitfs_geo_0007A0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0007A0 symbol: bitfs_geo_0007A0 diff --git a/assets/ymls/us/levels/bits.yml b/assets/ymls/us/levels/bits.yml index ca9d4867..c733bf70 100644 --- a/assets/ymls/us/levels/bits.yml +++ b/assets/ymls/us/levels/bits.yml @@ -31,161 +31,161 @@ seg14: 0x477D00 bits_geo_000430: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000430 symbol: bits_geo_000430 bits_geo_000448: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000448 symbol: bits_geo_000448 bits_geo_000460: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000460 symbol: bits_geo_000460 bits_geo_000478: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000478 symbol: bits_geo_000478 bits_geo_000490: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000490 symbol: bits_geo_000490 bits_geo_0004A8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004A8 symbol: bits_geo_0004A8 bits_geo_0004C0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004C0 symbol: bits_geo_0004C0 bits_geo_0004D8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004D8 symbol: bits_geo_0004D8 bits_geo_0004F0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004F0 symbol: bits_geo_0004F0 bits_geo_000508: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000508 symbol: bits_geo_000508 bits_geo_000520: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000520 symbol: bits_geo_000520 bits_geo_000538: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000538 symbol: bits_geo_000538 bits_geo_000550: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000550 symbol: bits_geo_000550 bits_geo_000568: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000568 symbol: bits_geo_000568 bits_geo_000580: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000580 symbol: bits_geo_000580 bits_geo_000598: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000598 symbol: bits_geo_000598 bits_geo_0005B0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005B0 symbol: bits_geo_0005B0 bits_geo_0005C8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005C8 symbol: bits_geo_0005C8 bits_geo_0005E0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005E0 symbol: bits_geo_0005E0 bits_geo_0005F8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005F8 symbol: bits_geo_0005F8 bits_geo_000610: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000610 symbol: bits_geo_000610 bits_geo_000628: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000628 symbol: bits_geo_000628 bits_geo_000640: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000640 symbol: bits_geo_000640 bits_geo_000658: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000658 symbol: bits_geo_000658 bits_geo_000670: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000670 symbol: bits_geo_000670 bits_geo_000688: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000688 symbol: bits_geo_000688 bits_geo_0006A0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006A0 symbol: bits_geo_0006A0 bits_geo_0006B8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006B8 symbol: bits_geo_0006B8 bits_geo_0006D0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006D0 symbol: bits_geo_0006D0 bits_geo_0006E8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006E8 symbol: bits_geo_0006E8 bits_geo_000700: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000700 symbol: bits_geo_000700 bits_geo_000718: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000718 symbol: bits_geo_000718 diff --git a/assets/ymls/us/levels/bob.yml b/assets/ymls/us/levels/bob.yml index d310330a..2dee9653 100644 --- a/assets/ymls/us/levels/bob.yml +++ b/assets/ymls/us/levels/bob.yml @@ -49,21 +49,21 @@ seg14: 0x405A60 bob_geo_000440: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000440 symbol: bob_geo_000440 bob_geo_000458: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000458 symbol: bob_geo_000458 bob_geo_000470: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000470 symbol: bob_geo_000470 bob_geo_000488: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000488 symbol: bob_geo_000488 diff --git a/assets/ymls/us/levels/bowser_1.yml b/assets/ymls/us/levels/bowser_1.yml index 03a18704..e11d07a3 100644 --- a/assets/ymls/us/levels/bowser_1.yml +++ b/assets/ymls/us/levels/bowser_1.yml @@ -31,6 +31,6 @@ seg14: 0x4C41C0 bowser_1_geo_0000D0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0000D0 symbol: bowser_1_geo_0000D0 diff --git a/assets/ymls/us/levels/bowser_2.yml b/assets/ymls/us/levels/bowser_2.yml index 5d69546d..beb90bcf 100644 --- a/assets/ymls/us/levels/bowser_2.yml +++ b/assets/ymls/us/levels/bowser_2.yml @@ -13,11 +13,11 @@ seg14: 0x4CE9F0 bowser_2_geo_000170: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000170 symbol: bowser_2_geo_000170 bowser_2_geo_000188: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000188 symbol: bowser_2_geo_000188 diff --git a/assets/ymls/us/levels/bowser_3.yml b/assets/ymls/us/levels/bowser_3.yml index 922a0b1a..213785cc 100644 --- a/assets/ymls/us/levels/bowser_3.yml +++ b/assets/ymls/us/levels/bowser_3.yml @@ -31,61 +31,61 @@ seg14: 0x4D14F0 bowser_3_geo_000290: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000290 symbol: bowser_3_geo_000290 bowser_3_geo_0002A8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0002A8 symbol: bowser_3_geo_0002A8 bowser_3_geo_0002C0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0002C0 symbol: bowser_3_geo_0002C0 bowser_3_geo_0002D8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0002D8 symbol: bowser_3_geo_0002D8 bowser_3_geo_0002F0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0002F0 symbol: bowser_3_geo_0002F0 bowser_3_geo_000308: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000308 symbol: bowser_3_geo_000308 bowser_3_geo_000320: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000320 symbol: bowser_3_geo_000320 bowser_3_geo_000338: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000338 symbol: bowser_3_geo_000338 bowser_3_geo_000350: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000350 symbol: bowser_3_geo_000350 bowser_3_geo_000368: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000368 symbol: bowser_3_geo_000368 bowser_3_geo_000380: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000380 symbol: bowser_3_geo_000380 bowser_3_geo_000398: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000398 symbol: bowser_3_geo_000398 diff --git a/assets/ymls/us/levels/castle_courtyard.yml b/assets/ymls/us/levels/castle_courtyard.yml index adb271c1..4a74649b 100644 --- a/assets/ymls/us/levels/castle_courtyard.yml +++ b/assets/ymls/us/levels/castle_courtyard.yml @@ -3,11 +3,11 @@ seg14: 0x4AF670 castle_courtyard_geo_000200: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000200 symbol: castle_courtyard_geo_000200 castle_courtyard_geo_000218: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000218 symbol: castle_courtyard_geo_000218 diff --git a/assets/ymls/us/levels/castle_grounds.yml b/assets/ymls/us/levels/castle_grounds.yml index eb5dde5b..09333048 100644 --- a/assets/ymls/us/levels/castle_grounds.yml +++ b/assets/ymls/us/levels/castle_grounds.yml @@ -58,26 +58,26 @@ seg14: 0x4545E0 castle_grounds_geo_000660: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000660 symbol: castle_grounds_geo_000660 castle_grounds_geo_0006F4: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006F4 symbol: castle_grounds_geo_0006F4 castle_grounds_geo_00070C: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E00070C symbol: castle_grounds_geo_00070C castle_grounds_geo_000724: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000724 symbol: castle_grounds_geo_000724 castle_grounds_geo_00073C: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E00073C symbol: castle_grounds_geo_00073C diff --git a/assets/ymls/us/levels/castle_inside.yml b/assets/ymls/us/levels/castle_inside.yml index f6f773f1..c28524ff 100644 --- a/assets/ymls/us/levels/castle_inside.yml +++ b/assets/ymls/us/levels/castle_inside.yml @@ -374,236 +374,236 @@ castle_light: seg14: 0x3CF0D0 castle_geo_000F00: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000F00 symbol: castle_geo_000F00 castle_geo_000F18: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000F18 symbol: castle_geo_000F18 castle_geo_000F30: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000F30 symbol: castle_geo_000F30 castle_geo_000F70: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000F70 symbol: castle_geo_000F70 castle_geo_000F88: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000F88 symbol: castle_geo_000F88 castle_geo_000FA8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000FA8 symbol: castle_geo_000FA8 castle_geo_000FD0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000FD0 symbol: castle_geo_000FD0 castle_geo_001000: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001000 symbol: castle_geo_001000 castle_geo_001038: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001038 symbol: castle_geo_001038 castle_geo_001088: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001088 symbol: castle_geo_001088 castle_geo_0010C8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0010C8 symbol: castle_geo_0010C8 castle_geo_001110: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001110 symbol: castle_geo_001110 castle_geo_001158: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001158 symbol: castle_geo_001158 castle_geo_0011A8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0011A8 symbol: castle_geo_0011A8 castle_geo_001200: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001200 symbol: castle_geo_001200 castle_geo_001260: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001260 symbol: castle_geo_001260 castle_geo_0012C8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0012C8 symbol: castle_geo_0012C8 castle_geo_001348: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001348 symbol: castle_geo_001348 castle_geo_0013B8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0013B8 symbol: castle_geo_0013B8 castle_geo_001400: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001400 symbol: castle_geo_001400 castle_geo_001518: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001518 symbol: castle_geo_001518 castle_geo_001530: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001530 symbol: castle_geo_001530 castle_geo_001548: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001548 symbol: castle_geo_001548 castle_geo_001560: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001560 symbol: castle_geo_001560 castle_geo_001578: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001578 symbol: castle_geo_001578 castle_geo_0015B8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0015B8 symbol: castle_geo_0015B8 castle_geo_0015F8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0015F8 symbol: castle_geo_0015F8 castle_geo_001628: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001628 symbol: castle_geo_001628 castle_geo_001668: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001668 symbol: castle_geo_001668 castle_geo_001690: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001690 symbol: castle_geo_001690 castle_geo_0016D8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0016D8 symbol: castle_geo_0016D8 castle_geo_001740: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001740 symbol: castle_geo_001740 castle_geo_001798: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001798 symbol: castle_geo_001798 castle_geo_001800: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001800 symbol: castle_geo_001800 castle_geo_001858: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001858 symbol: castle_geo_001858 castle_geo_001940: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001940 symbol: castle_geo_001940 castle_geo_001958: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001958 symbol: castle_geo_001958 castle_geo_001980: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001980 symbol: castle_geo_001980 castle_geo_0019C8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0019C8 symbol: castle_geo_0019C8 castle_geo_0019F8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0019F8 symbol: castle_geo_0019F8 castle_geo_001A30: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001A30 symbol: castle_geo_001A30 castle_geo_001A58: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001A58 symbol: castle_geo_001A58 castle_geo_001AB8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001AB8 symbol: castle_geo_001AB8 castle_geo_001AF8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001AF8 symbol: castle_geo_001AF8 castle_geo_001B48: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001B48 symbol: castle_geo_001B48 castle_geo_001BB0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001BB0 symbol: castle_geo_001BB0 castle_geo_001C10: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E001C10 symbol: castle_geo_001C10 \ No newline at end of file diff --git a/assets/ymls/us/levels/ccm.yml b/assets/ymls/us/levels/ccm.yml index 81df90be..3b948a02 100644 --- a/assets/ymls/us/levels/ccm.yml +++ b/assets/ymls/us/levels/ccm.yml @@ -121,51 +121,51 @@ seg14: 0x395C90 ccm_geo_0003D0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0003E0 symbol: ccm_geo_0003D0 ccm_geo_0003F0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000400 symbol: ccm_geo_0003F0 ccm_geo_00040C: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E00041C symbol: ccm_geo_00040C ccm_geo_00042C: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E00043C symbol: ccm_geo_00042C ccm_geo_00045C: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E00046C symbol: ccm_geo_00045C ccm_geo_000494: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004A4 symbol: ccm_geo_000494 ccm_geo_0004BC: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004CC symbol: ccm_geo_0004BC ccm_geo_0004E4: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004F4 symbol: ccm_geo_0004E4 ccm_geo_00051C: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E00052C symbol: ccm_geo_00051C ccm_geo_0005E8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005F8 symbol: ccm_geo_0005E8 diff --git a/assets/ymls/us/levels/cotmc.yml b/assets/ymls/us/levels/cotmc.yml index f0d97cd3..9189dfae 100644 --- a/assets/ymls/us/levels/cotmc.yml +++ b/assets/ymls/us/levels/cotmc.yml @@ -49,6 +49,6 @@ seg14: 0x4BE9E0 cotmc_geo_0001A0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0001A0 symbol: cotmc_geo_0001A0 diff --git a/assets/ymls/us/levels/ddd.yml b/assets/ymls/us/levels/ddd.yml index 05e35671..8b62febd 100644 --- a/assets/ymls/us/levels/ddd.yml +++ b/assets/ymls/us/levels/ddd.yml @@ -49,26 +49,26 @@ seg14: 0x495A60 ddd_geo_000450: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000450 symbol: ddd_geo_000450 ddd_geo_000478: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000478 symbol: ddd_geo_000478 ddd_geo_0004A0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004A0 symbol: ddd_geo_0004A0 ddd_geo_0004C0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0004C0 symbol: ddd_geo_0004C0 ddd_geo_000570: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000570 symbol: ddd_geo_000570 diff --git a/assets/ymls/us/levels/ending.yml b/assets/ymls/us/levels/ending.yml index 64d3672f..93a3f4a4 100644 --- a/assets/ymls/us/levels/ending.yml +++ b/assets/ymls/us/levels/ending.yml @@ -9,6 +9,6 @@ cake: seg14: 0x4AC4B0 ending_geo_000050: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000050 symbol: ending_geo_000050 diff --git a/assets/ymls/us/levels/hmc.yml b/assets/ymls/us/levels/hmc.yml index 4b0c22f0..5d46d2a7 100644 --- a/assets/ymls/us/levels/hmc.yml +++ b/assets/ymls/us/levels/hmc.yml @@ -76,131 +76,131 @@ seg14: 0x3E6A00 hmc_geo_000530: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000530 symbol: hmc_geo_000530 hmc_geo_000548: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000548 symbol: hmc_geo_000548 hmc_geo_000570: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000570 symbol: hmc_geo_000570 hmc_geo_000588: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000588 symbol: hmc_geo_000588 hmc_geo_0005A0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005A0 symbol: hmc_geo_0005A0 hmc_geo_0005B8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005B8 symbol: hmc_geo_0005B8 hmc_geo_0005D0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005D0 symbol: hmc_geo_0005D0 hmc_geo_0005E8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005E8 symbol: hmc_geo_0005E8 hmc_geo_000618: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000618 symbol: hmc_geo_000618 hmc_geo_000658: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000658 symbol: hmc_geo_000658 hmc_geo_0006A8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006A8 symbol: hmc_geo_0006A8 hmc_geo_0006E0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006E0 symbol: hmc_geo_0006E0 hmc_geo_000700: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000700 symbol: hmc_geo_000700 hmc_geo_000748: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000748 symbol: hmc_geo_000748 hmc_geo_000770: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000770 symbol: hmc_geo_000770 hmc_geo_000798: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000798 symbol: hmc_geo_000798 hmc_geo_0007F8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0007F8 symbol: hmc_geo_0007F8 hmc_geo_000850: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000850 symbol: hmc_geo_000850 hmc_geo_0008D0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0008D0 symbol: hmc_geo_0008D0 hmc_geo_000938: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000938 symbol: hmc_geo_000938 hmc_geo_000998: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000998 symbol: hmc_geo_000998 hmc_geo_000A18: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A18 symbol: hmc_geo_000A18 hmc_geo_000A88: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A88 symbol: hmc_geo_000A88 hmc_geo_000AE8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000AE8 symbol: hmc_geo_000AE8 hmc_geo_000B48: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B48 symbol: hmc_geo_000B48 hmc_geo_000B90: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B90 symbol: hmc_geo_000B90 diff --git a/assets/ymls/us/levels/intro.yml b/assets/ymls/us/levels/intro.yml index 7b93325a..caa80a7b 100644 --- a/assets/ymls/us/levels/intro.yml +++ b/assets/ymls/us/levels/intro.yml @@ -40,21 +40,21 @@ seg20: 0x269EA0 intro_geo_0002D0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x140002D0 symbol: intro_geo_0002D0 intro_geo_mario_head_regular: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x1400035C symbol: intro_geo_mario_head_regular intro_geo_mario_head_dizzy: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x140003B8 symbol: intro_geo_mario_head_dizzy intro_geo_000414: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x14000414 symbol: intro_geo_000414 diff --git a/assets/ymls/us/levels/jrb.yml b/assets/ymls/us/levels/jrb.yml index c1211e11..0af0d932 100644 --- a/assets/ymls/us/levels/jrb.yml +++ b/assets/ymls/us/levels/jrb.yml @@ -40,66 +40,66 @@ seg14: 0x423B20 jrb_geo_000900: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000900 symbol: jrb_geo_000900 jrb_geo_000918: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000918 symbol: jrb_geo_000918 jrb_geo_000930: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000930 symbol: jrb_geo_000930 jrb_geo_000948: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000948 symbol: jrb_geo_000948 jrb_geo_000960: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000960 symbol: jrb_geo_000960 jrb_geo_000978: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000978 symbol: jrb_geo_000978 jrb_geo_000990: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000990 symbol: jrb_geo_000990 jrb_geo_0009B0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009B0 symbol: jrb_geo_0009B0 jrb_geo_0009C8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009C8 symbol: jrb_geo_0009C8 jrb_geo_0009E8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009E8 symbol: jrb_geo_0009E8 jrb_geo_000A00: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A00 symbol: jrb_geo_000A00 jrb_geo_000A18: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A18 symbol: jrb_geo_000A18 jrb_geo_000AFC: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000AFC symbol: jrb_geo_000AFC diff --git a/assets/ymls/us/levels/lll.yml b/assets/ymls/us/levels/lll.yml index 07346751..6ecbd8af 100644 --- a/assets/ymls/us/levels/lll.yml +++ b/assets/ymls/us/levels/lll.yml @@ -301,211 +301,211 @@ seg14: 0x48C9B0 lll_geo_0009E0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009E0 symbol: lll_geo_0009E0 lll_geo_0009F8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009F8 symbol: lll_geo_0009F8 lll_geo_000A10: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A10 symbol: lll_geo_000A10 lll_geo_000A28: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A28 symbol: lll_geo_000A28 lll_geo_000A40: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A40 symbol: lll_geo_000A40 lll_geo_000A60: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A60 symbol: lll_geo_000A60 lll_geo_000A78: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A78 symbol: lll_geo_000A78 lll_geo_000A90: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A90 symbol: lll_geo_000A90 lll_geo_000AA8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000AA8 symbol: lll_geo_000AA8 lll_geo_000AC0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000AC0 symbol: lll_geo_000AC0 lll_geo_000AD8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000AD8 symbol: lll_geo_000AD8 lll_geo_000AF0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000AF0 symbol: lll_geo_000AF0 lll_geo_000B08: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B08 symbol: lll_geo_000B08 lll_geo_000B20: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B20 symbol: lll_geo_000B20 lll_geo_000B38: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B38 symbol: lll_geo_000B38 lll_geo_000B50: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B50 symbol: lll_geo_000B50 lll_geo_000B68: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B68 symbol: lll_geo_000B68 lll_geo_000B80: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B80 symbol: lll_geo_000B80 lll_geo_000B98: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B98 symbol: lll_geo_000B98 lll_geo_000BB0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000BB0 symbol: lll_geo_000BB0 lll_geo_000BC8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000BC8 symbol: lll_geo_000BC8 lll_geo_000BE0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000BE0 symbol: lll_geo_000BE0 lll_geo_000BF8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000BF8 symbol: lll_geo_000BF8 lll_geo_000C10: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000C10 symbol: lll_geo_000C10 lll_geo_000C30: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000C30 symbol: lll_geo_000C30 lll_geo_000C50: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000C50 symbol: lll_geo_000C50 lll_geo_000C70: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000C70 symbol: lll_geo_000C70 lll_geo_000C90: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000C90 symbol: lll_geo_000C90 lll_geo_000CB0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000CB0 symbol: lll_geo_000CB0 lll_geo_000CD0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000CD0 symbol: lll_geo_000CD0 lll_geo_000CF0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000CF0 symbol: lll_geo_000CF0 lll_geo_000D10: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000D10 symbol: lll_geo_000D10 lll_geo_000D30: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000D30 symbol: lll_geo_000D30 lll_geo_000D50: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000D50 symbol: lll_geo_000D50 lll_geo_000D70: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000D70 symbol: lll_geo_000D70 lll_geo_000D90: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000D90 symbol: lll_geo_000D90 lll_geo_000DB0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000DB0 symbol: lll_geo_000DB0 lll_geo_000DD0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000DD0 symbol: lll_geo_000DD0 lll_geo_000DE8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000DE8 symbol: lll_geo_000DE8 lll_geo_000E00: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000E00 symbol: lll_geo_000E00 lll_geo_000EA8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000EA8 symbol: lll_geo_000EA8 lll_geo_000EC0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000EC0 symbol: lll_geo_000EC0 diff --git a/assets/ymls/us/levels/menu.yml b/assets/ymls/us/levels/menu.yml index a3ba4383..ef697b4a 100644 --- a/assets/ymls/us/levels/menu.yml +++ b/assets/ymls/us/levels/menu.yml @@ -805,61 +805,61 @@ main_menu_seg7.0B800: seg20: 0x2A6120 geo_menu_mario_save_button: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x140001D0 symbol: geo_menu_mario_save_button geo_menu_mario_save_button_fade: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x14000200 symbol: geo_menu_mario_save_button_fade geo_menu_mario_new_button: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x14000230 symbol: geo_menu_mario_new_button geo_menu_mario_new_button_fade: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x14000260 symbol: geo_menu_mario_new_button_fade geo_menu_erase_button: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x14000290 symbol: geo_menu_erase_button geo_menu_copy_button: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x140002B8 symbol: geo_menu_copy_button geo_menu_file_button: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x140002E0 symbol: geo_menu_file_button geo_menu_score_button: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x14000308 symbol: geo_menu_score_button geo_menu_sound_button: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x14000330 symbol: geo_menu_sound_button geo_menu_generic_button: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x14000358 symbol: geo_menu_generic_button geo_menu_file_select_strings_and_menu_cursor: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x14000380 symbol: geo_menu_file_select_strings_and_menu_cursor geo_menu_act_selector_strings: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x14000408 symbol: geo_menu_act_selector_strings diff --git a/assets/ymls/us/levels/pss.yml b/assets/ymls/us/levels/pss.yml index 9d03cd65..c804418f 100644 --- a/assets/ymls/us/levels/pss.yml +++ b/assets/ymls/us/levels/pss.yml @@ -31,6 +31,6 @@ seg14: 0x4B7F10 pss_geo_000100: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000100 symbol: pss_geo_000100 diff --git a/assets/ymls/us/levels/rr.yml b/assets/ymls/us/levels/rr.yml index 7990bda0..43b496c5 100644 --- a/assets/ymls/us/levels/rr.yml +++ b/assets/ymls/us/levels/rr.yml @@ -31,186 +31,186 @@ quarter_flying_carpet: seg14: 0x44A140 rr_geo_000660: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000660 symbol: rr_geo_000660 rr_geo_000678: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000678 symbol: rr_geo_000678 rr_geo_000690: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000690 symbol: rr_geo_000690 rr_geo_0006A8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006A8 symbol: rr_geo_0006A8 rr_geo_0006C0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006C0 symbol: rr_geo_0006C0 rr_geo_0006D8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006D8 symbol: rr_geo_0006D8 rr_geo_0006F0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006F0 symbol: rr_geo_0006F0 rr_geo_000708: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000708 symbol: rr_geo_000708 rr_geo_000720: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000720 symbol: rr_geo_000720 rr_geo_000738: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000738 symbol: rr_geo_000738 rr_geo_000758: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000758 symbol: rr_geo_000758 rr_geo_000770: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000770 symbol: rr_geo_000770 rr_geo_000788: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000788 symbol: rr_geo_000788 rr_geo_0007A0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0007A0 symbol: rr_geo_0007A0 rr_geo_0007B8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0007B8 symbol: rr_geo_0007B8 rr_geo_0007D0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0007D0 symbol: rr_geo_0007D0 rr_geo_0007E8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0007E8 symbol: rr_geo_0007E8 rr_geo_000800: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000800 symbol: rr_geo_000800 rr_geo_000818: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000818 symbol: rr_geo_000818 rr_geo_000830: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000830 symbol: rr_geo_000830 rr_geo_000848: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000848 symbol: rr_geo_000848 rr_geo_000860: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000860 symbol: rr_geo_000860 rr_geo_000878: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000878 symbol: rr_geo_000878 rr_geo_000890: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000890 symbol: rr_geo_000890 rr_geo_0008A8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0008A8 symbol: rr_geo_0008A8 rr_geo_0008C0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0008C0 symbol: rr_geo_0008C0 rr_geo_0008D8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0008D8 symbol: rr_geo_0008D8 rr_geo_0008F0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0008F0 symbol: rr_geo_0008F0 rr_geo_000908: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000908 symbol: rr_geo_000908 rr_geo_000920: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000920 symbol: rr_geo_000920 rr_geo_000940: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000940 symbol: rr_geo_000940 rr_geo_000958: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000958 symbol: rr_geo_000958 rr_geo_000970: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000970 symbol: rr_geo_000970 rr_geo_000988: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000988 symbol: rr_geo_000988 rr_geo_0009A0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009A0 symbol: rr_geo_0009A0 rr_geo_0009B8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009B8 symbol: rr_geo_0009B8 rr_geo_0009D0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009D0 symbol: rr_geo_0009D0 diff --git a/assets/ymls/us/levels/sa.yml b/assets/ymls/us/levels/sa.yml index 4b573dbf..449dfe4b 100644 --- a/assets/ymls/us/levels/sa.yml +++ b/assets/ymls/us/levels/sa.yml @@ -3,6 +3,6 @@ seg14: 0x46C1A0 sa_geo_000170: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000170 symbol: sa_geo_000170 diff --git a/assets/ymls/us/levels/sl.yml b/assets/ymls/us/levels/sl.yml index 4e949708..555006b0 100644 --- a/assets/ymls/us/levels/sl.yml +++ b/assets/ymls/us/levels/sl.yml @@ -49,26 +49,26 @@ seg14: 0x40E840 sl_geo_000360: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000360 symbol: sl_geo_000360 sl_geo_000378: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000378 symbol: sl_geo_000378 sl_geo_000390: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000390 symbol: sl_geo_000390 sl_geo_0003A8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0003A8 symbol: sl_geo_0003A8 sl_geo_000484: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000484 symbol: sl_geo_000484 diff --git a/assets/ymls/us/levels/ssl.yml b/assets/ymls/us/levels/ssl.yml index 8340bb1e..629e5aaf 100644 --- a/assets/ymls/us/levels/ssl.yml +++ b/assets/ymls/us/levels/ssl.yml @@ -112,56 +112,56 @@ seg14: 0x3FB990 ssl_geo_0005C0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005C0 symbol: ssl_geo_0005C0 ssl_geo_0005D8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005D8 symbol: ssl_geo_0005D8 ssl_geo_000618: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000618 symbol: ssl_geo_000618 ssl_geo_000630: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000630 symbol: ssl_geo_000630 ssl_geo_000648: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000648 symbol: ssl_geo_000648 ssl_geo_000734: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000734 symbol: ssl_geo_000734 ssl_geo_000764: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000764 symbol: ssl_geo_000764 ssl_geo_000794: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000794 symbol: ssl_geo_000794 ssl_geo_0007AC: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0007AC symbol: ssl_geo_0007AC ssl_geo_0007CC: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0007CC symbol: ssl_geo_0007CC ssl_geo_00088C: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E00088C symbol: ssl_geo_00088C diff --git a/assets/ymls/us/levels/thi.yml b/assets/ymls/us/levels/thi.yml index 4895e06f..710f334d 100644 --- a/assets/ymls/us/levels/thi.yml +++ b/assets/ymls/us/levels/thi.yml @@ -22,31 +22,31 @@ seg14: 0x42C6E0 thi_geo_0005B0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005B0 symbol: thi_geo_0005B0 thi_geo_0005C8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005C8 symbol: thi_geo_0005C8 thi_geo_0005F0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005F0 symbol: thi_geo_0005F0 thi_geo_000608: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000608 symbol: thi_geo_000608 thi_geo_0006D4: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0006D4 symbol: thi_geo_0006D4 thi_geo_00079C: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E00079C symbol: thi_geo_00079C diff --git a/assets/ymls/us/levels/totwc.yml b/assets/ymls/us/levels/totwc.yml index 6edc9a4b..a01dd8e3 100644 --- a/assets/ymls/us/levels/totwc.yml +++ b/assets/ymls/us/levels/totwc.yml @@ -40,11 +40,11 @@ seg14: 0x4C2700 totwc_geo_000160: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000160 symbol: totwc_geo_000160 totwc_geo_000188: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000188 symbol: totwc_geo_000188 diff --git a/assets/ymls/us/levels/ttc.yml b/assets/ymls/us/levels/ttc.yml index 818a7260..0d23b628 100644 --- a/assets/ymls/us/levels/ttc.yml +++ b/assets/ymls/us/levels/ttc.yml @@ -31,81 +31,81 @@ seg14: 0x437400 ttc_geo_000240: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000240 symbol: ttc_geo_000240 ttc_geo_000258: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000258 symbol: ttc_geo_000258 ttc_geo_000270: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000270 symbol: ttc_geo_000270 ttc_geo_000288: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000288 symbol: ttc_geo_000288 ttc_geo_0002A8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0002A8 symbol: ttc_geo_0002A8 ttc_geo_0002C8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0002C8 symbol: ttc_geo_0002C8 ttc_geo_0002E0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0002E0 symbol: ttc_geo_0002E0 ttc_geo_0002F8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0002F8 symbol: ttc_geo_0002F8 ttc_geo_000310: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000310 symbol: ttc_geo_000310 ttc_geo_000328: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000328 symbol: ttc_geo_000328 ttc_geo_000340: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000340 symbol: ttc_geo_000340 ttc_geo_000358: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000358 symbol: ttc_geo_000358 ttc_geo_000370: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000370 symbol: ttc_geo_000370 ttc_geo_000388: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000388 symbol: ttc_geo_000388 ttc_geo_0003A0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0003A0 symbol: ttc_geo_0003A0 ttc_geo_0003B8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0003B8 symbol: ttc_geo_0003B8 diff --git a/assets/ymls/us/levels/ttm.yml b/assets/ymls/us/levels/ttm.yml index ac0f17f6..dc524d41 100644 --- a/assets/ymls/us/levels/ttm.yml +++ b/assets/ymls/us/levels/ttm.yml @@ -85,151 +85,151 @@ seg14: 0x4EB1F0 ttm_geo_000710: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000710 symbol: ttm_geo_000710 ttm_geo_000730: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000730 symbol: ttm_geo_000730 ttm_geo_000748: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000748 symbol: ttm_geo_000748 ttm_geo_000778: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000778 symbol: ttm_geo_000778 ttm_geo_0007A8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0007A8 symbol: ttm_geo_0007A8 ttm_geo_0007D8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0007D8 symbol: ttm_geo_0007D8 ttm_geo_000808: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000808 symbol: ttm_geo_000808 ttm_geo_000830: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000830 symbol: ttm_geo_000830 ttm_geo_000858: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000858 symbol: ttm_geo_000858 ttm_geo_000880: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000880 symbol: ttm_geo_000880 ttm_geo_0008A8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0008A8 symbol: ttm_geo_0008A8 ttm_geo_0008D0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0008D0 symbol: ttm_geo_0008D0 ttm_geo_0008F8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0008F8 symbol: ttm_geo_0008F8 ttm_geo_000920: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000920 symbol: ttm_geo_000920 ttm_geo_000948: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000948 symbol: ttm_geo_000948 ttm_geo_000970: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000970 symbol: ttm_geo_000970 ttm_geo_000990: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000990 symbol: ttm_geo_000990 ttm_geo_0009C0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009C0 symbol: ttm_geo_0009C0 ttm_geo_0009F0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009F0 symbol: ttm_geo_0009F0 ttm_geo_000A18: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A18 symbol: ttm_geo_000A18 ttm_geo_000A40: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A40 symbol: ttm_geo_000A40 ttm_geo_000A70: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A70 symbol: ttm_geo_000A70 ttm_geo_000B5C: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B5C symbol: ttm_geo_000B5C ttm_geo_000BEC: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000BEC symbol: ttm_geo_000BEC ttm_geo_000C84: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000C84 symbol: ttm_geo_000C84 ttm_geo_000D14: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000D14 symbol: ttm_geo_000D14 ttm_geo_000D4C: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000D4C symbol: ttm_geo_000D4C ttm_geo_000D84: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000D84 symbol: ttm_geo_000D84 ttm_geo_000DBC: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000DBC symbol: ttm_geo_000DBC ttm_geo_000DF4: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000DF4 symbol: ttm_geo_000DF4 diff --git a/assets/ymls/us/levels/vcutm.yml b/assets/ymls/us/levels/vcutm.yml index 13afbdc2..b2b8888c 100644 --- a/assets/ymls/us/levels/vcutm.yml +++ b/assets/ymls/us/levels/vcutm.yml @@ -40,11 +40,11 @@ seg14: 0x461220 vcutm_geo_0001F0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0001F0 symbol: vcutm_geo_0001F0 vcutm_geo_000208: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000208 symbol: vcutm_geo_000208 diff --git a/assets/ymls/us/levels/wdw.yml b/assets/ymls/us/levels/wdw.yml index 9a5a22cc..ed256701 100644 --- a/assets/ymls/us/levels/wdw.yml +++ b/assets/ymls/us/levels/wdw.yml @@ -49,46 +49,46 @@ seg14: 0x419F90 wdw_geo_000580: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000580 symbol: wdw_geo_000580 wdw_geo_000598: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000598 symbol: wdw_geo_000598 wdw_geo_0005C0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005C0 symbol: wdw_geo_0005C0 wdw_geo_0005E8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0005E8 symbol: wdw_geo_0005E8 wdw_geo_000610: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000610 symbol: wdw_geo_000610 wdw_geo_000628: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000628 symbol: wdw_geo_000628 wdw_geo_000640: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000640 symbol: wdw_geo_000640 wdw_geo_000658: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000658 symbol: wdw_geo_000658 wdw_geo_000724: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000724 symbol: wdw_geo_000724 diff --git a/assets/ymls/us/levels/wf.yml b/assets/ymls/us/levels/wf.yml index 4ae55ed7..8e3063e5 100644 --- a/assets/ymls/us/levels/wf.yml +++ b/assets/ymls/us/levels/wf.yml @@ -58,156 +58,156 @@ seg14: 0x49DA50 wf_geo_0007E0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0007E0 symbol: wf_geo_0007E0 wf_geo_000820: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000820 symbol: wf_geo_000820 wf_geo_000860: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000860 symbol: wf_geo_000860 wf_geo_000878: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000878 symbol: wf_geo_000878 wf_geo_000890: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000890 symbol: wf_geo_000890 wf_geo_0008A8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0008A8 symbol: wf_geo_0008A8 wf_geo_0008E8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0008E8 symbol: wf_geo_0008E8 wf_geo_000900: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000900 symbol: wf_geo_000900 wf_geo_000940: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000940 symbol: wf_geo_000940 wf_geo_000958: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000958 symbol: wf_geo_000958 wf_geo_0009A0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009A0 symbol: wf_geo_0009A0 wf_geo_0009B8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009B8 symbol: wf_geo_0009B8 wf_geo_0009D0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009D0 symbol: wf_geo_0009D0 wf_geo_0009E8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0009E8 symbol: wf_geo_0009E8 wf_geo_000A00: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A00 symbol: wf_geo_000A00 wf_geo_000A40: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A40 symbol: wf_geo_000A40 wf_geo_000A58: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A58 symbol: wf_geo_000A58 wf_geo_000A98: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000A98 symbol: wf_geo_000A98 wf_geo_000AB0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000AB0 symbol: wf_geo_000AB0 wf_geo_000AC8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000AC8 symbol: wf_geo_000AC8 wf_geo_000AE0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000AE0 symbol: wf_geo_000AE0 wf_geo_000AF8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000AF8 symbol: wf_geo_000AF8 wf_geo_000B10: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B10 symbol: wf_geo_000B10 wf_geo_000B38: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B38 symbol: wf_geo_000B38 wf_geo_000B60: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B60 symbol: wf_geo_000B60 wf_geo_000B78: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B78 symbol: wf_geo_000B78 wf_geo_000B90: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000B90 symbol: wf_geo_000B90 wf_geo_000BA8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000BA8 symbol: wf_geo_000BA8 wf_geo_000BC8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000BC8 symbol: wf_geo_000BC8 wf_geo_000BE0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000BE0 symbol: wf_geo_000BE0 wf_geo_000BF8: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E000BF8 symbol: wf_geo_000BF8 diff --git a/assets/ymls/us/levels/wmotr.yml b/assets/ymls/us/levels/wmotr.yml index dfb55ace..0aad6f40 100644 --- a/assets/ymls/us/levels/wmotr.yml +++ b/assets/ymls/us/levels/wmotr.yml @@ -49,6 +49,6 @@ seg14: 0x4CD930 wmotr_geo_0001F0: - type: GEO_LAYOUT + type: SM64:GEO_LAYOUT offset: 0x0E0001F0 symbol: wmotr_geo_0001F0