From f9aecd068eeaa9d308892c7dac0b36fe5ae85773 Mon Sep 17 00:00:00 2001 From: Malkierian Date: Tue, 23 Apr 2024 14:37:45 -0700 Subject: [PATCH] Add all level collision (#38) * BBH collision done. * BitDW collision done. * BitFS collision done. * BitS collision done. * BOB collision done. * Bowser 1, 2, 3 collisions done. * Castle collision done. * JRB collision done. * LLL collision done. * PSS collision done. * RR collision done. * SA collision done. * SL collision done. * SSL collision done. * THI collision done. * TOTWC, VCUTM, WMOTR collision done. * TTC collision done. * TTM collision done. * WDW collision done. * WF collision done. --- assets/ymls/jp/levels/bbh.yml | 39 +++++++++++ assets/ymls/jp/levels/bitdw.yml | 55 +++++++++++++++ assets/ymls/jp/levels/bitfs.yml | 55 +++++++++++++++ assets/ymls/jp/levels/bits.yml | 70 +++++++++++++++++++ assets/ymls/jp/levels/bob.yml | 20 ++++++ assets/ymls/jp/levels/bowser_1.yml | 5 ++ assets/ymls/jp/levels/bowser_2.yml | 10 +++ assets/ymls/jp/levels/bowser_3.yml | 55 +++++++++++++++ assets/ymls/jp/levels/castle_courtyard.yml | 5 ++ assets/ymls/jp/levels/castle_grounds.yml | 15 ++++ assets/ymls/jp/levels/castle_inside.yml | 40 +++++++++++ assets/ymls/jp/levels/jrb.yml | 55 +++++++++++++++ assets/ymls/jp/levels/lll.yml | 80 ++++++++++++++++++++++ assets/ymls/jp/levels/pss.yml | 5 ++ assets/ymls/jp/levels/rr.yml | 80 ++++++++++++++++++++++ assets/ymls/jp/levels/sa.yml | 5 ++ assets/ymls/jp/levels/sl.yml | 20 ++++++ assets/ymls/jp/levels/ssl.yml | 65 ++++++++++++++++++ assets/ymls/jp/levels/thi.yml | 20 ++++++ assets/ymls/jp/levels/totwc.yml | 5 ++ assets/ymls/jp/levels/ttc.yml | 70 +++++++++++++++++++ assets/ymls/jp/levels/ttm.yml | 35 ++++++++++ assets/ymls/jp/levels/vcutm.yml | 10 +++ assets/ymls/jp/levels/wdw.yml | 45 ++++++++++++ assets/ymls/jp/levels/wf.yml | 75 ++++++++++++++++++++ assets/ymls/jp/levels/wmotr.yml | 5 ++ assets/ymls/us/levels/bbh.yml | 39 +++++++++++ assets/ymls/us/levels/bitdw.yml | 55 +++++++++++++++ assets/ymls/us/levels/bitfs.yml | 55 +++++++++++++++ assets/ymls/us/levels/bits.yml | 70 +++++++++++++++++++ assets/ymls/us/levels/bob.yml | 20 ++++++ assets/ymls/us/levels/bowser_1.yml | 5 ++ assets/ymls/us/levels/bowser_2.yml | 10 +++ assets/ymls/us/levels/bowser_3.yml | 55 +++++++++++++++ assets/ymls/us/levels/castle_courtyard.yml | 5 ++ assets/ymls/us/levels/castle_grounds.yml | 15 ++++ assets/ymls/us/levels/castle_inside.yml | 40 +++++++++++ assets/ymls/us/levels/jrb.yml | 55 +++++++++++++++ assets/ymls/us/levels/lll.yml | 80 ++++++++++++++++++++++ assets/ymls/us/levels/pss.yml | 5 ++ assets/ymls/us/levels/rr.yml | 80 ++++++++++++++++++++++ assets/ymls/us/levels/sa.yml | 5 ++ assets/ymls/us/levels/sl.yml | 20 ++++++ assets/ymls/us/levels/ssl.yml | 66 ++++++++++++++++++ assets/ymls/us/levels/thi.yml | 20 ++++++ assets/ymls/us/levels/totwc.yml | 5 ++ assets/ymls/us/levels/ttc.yml | 70 +++++++++++++++++++ assets/ymls/us/levels/ttm.yml | 35 ++++++++++ assets/ymls/us/levels/vcutm.yml | 10 +++ assets/ymls/us/levels/wdw.yml | 45 ++++++++++++ assets/ymls/us/levels/wf.yml | 75 ++++++++++++++++++++ assets/ymls/us/levels/wmotr.yml | 5 ++ 52 files changed, 1889 insertions(+) diff --git a/assets/ymls/jp/levels/bbh.yml b/assets/ymls/jp/levels/bbh.yml index eefff904..060fccd8 100644 --- a/assets/ymls/jp/levels/bbh.yml +++ b/assets/ymls/jp/levels/bbh.yml @@ -3476,3 +3476,42 @@ bbh_seg7_dl_0701FD28: offset: 0x1FD28 symbol: bbh_seg7_dl_0701FD28 +bbh_seg7_collision_level: + type: SM64:COLLISION + offset: 0x207A0 + symbol: bbh_seg7_collision_level + +bbh_seg7_collision_staircase_step: + type: SM64:COLLISION + offset: 0x26A1C + symbol: bbh_seg7_collision_staircase_step + +bbh_seg7_collision_tilt_floor_platform: + type: SM64:COLLISION + offset: 0x26A98 + symbol: bbh_seg7_collision_tilt_floor_platform + +bbh_seg7_collision_07026B1C: + type: SM64:COLLISION + offset: 0x26B1C + symbol: bbh_seg7_collision_07026B1C + +bbh_seg7_collision_haunted_bookshelf: + type: SM64:COLLISION + offset: 0x26B4C + symbol: bbh_seg7_collision_haunted_bookshelf + +bbh_seg7_collision_mesh_elevator: + type: SM64:COLLISION + offset: 0x26B94 + symbol: bbh_seg7_collision_mesh_elevator + +bbh_seg7_collision_merry_go_round: + type: SM64:COLLISION + offset: 0x26C1C + symbol: bbh_seg7_collision_merry_go_round + +bbh_seg7_collision_coffin: + type: SM64:COLLISION + offset: 0x26D18 + symbol: bbh_seg7_collision_coffin diff --git a/assets/ymls/jp/levels/bitdw.yml b/assets/ymls/jp/levels/bitdw.yml index 138102cb..f28adcac 100644 --- a/assets/ymls/jp/levels/bitdw.yml +++ b/assets/ymls/jp/levels/bitdw.yml @@ -1354,3 +1354,58 @@ bitdw_seg7_dl_0700C0E0: offset: 0xC0E0 symbol: bitdw_seg7_dl_0700C0E0 +bitdw_seg7_collision_level: + type: SM64:COLLISION + offset: 0xD460 + symbol: bitdw_seg7_collision_level + +bitdw_seg7_collision_0700F688: + type: SM64:COLLISION + offset: 0xF688 + symbol: bitdw_seg7_collision_0700F688 + +bitdw_seg7_collision_0700F70C: + type: SM64:COLLISION + offset: 0xF70C + symbol: bitdw_seg7_collision_0700F70C + +bitdw_seg7_collision_moving_pyramid: + type: SM64:COLLISION + offset: 0xF790 + symbol: bitdw_seg7_collision_moving_pyramid + +bitdw_seg7_collision_0700F7F0: + type: SM64:COLLISION + offset: 0xF7F0 + symbol: bitdw_seg7_collision_0700F7F0 + +bitdw_seg7_collision_0700F898: + type: SM64:COLLISION + offset: 0xF898 + symbol: bitdw_seg7_collision_0700F898 + +bitdw_seg7_collision_0700F91C: + type: SM64:COLLISION + offset: 0xF91C + symbol: bitdw_seg7_collision_0700F91C + +bitdw_seg7_collision_0700FA3C: + type: SM64:COLLISION + offset: 0xFA3C + symbol: bitdw_seg7_collision_0700FA3C + +bitdw_seg7_collision_0700FB5C: + type: SM64:COLLISION + offset: 0xFB5C + symbol: bitdw_seg7_collision_0700FB5C + +bitdw_seg7_collision_0700FC7C: + type: SM64:COLLISION + offset: 0xFC7C + symbol: bitdw_seg7_collision_0700FC7C + +bitdw_seg7_collision_0700FD9C: + type: SM64:COLLISION + offset: 0xFD9C + symbol: bitdw_seg7_collision_0700FD9C + diff --git a/assets/ymls/jp/levels/bitfs.yml b/assets/ymls/jp/levels/bitfs.yml index 46610762..aa835a44 100644 --- a/assets/ymls/jp/levels/bitfs.yml +++ b/assets/ymls/jp/levels/bitfs.yml @@ -1840,3 +1840,58 @@ bitfs_seg7_dl_07010340: offset: 0x10340 symbol: bitfs_seg7_dl_07010340 +bitfs_seg7_collision_level: + type: SM64:COLLISION + offset: 0x11E98 + symbol: bitfs_seg7_collision_level + +bitfs_seg7_collision_07015124: + type: SM64:COLLISION + offset: 0x15124 + symbol: bitfs_seg7_collision_07015124 + +bitfs_seg7_collision_sinking_cage_platform: + type: SM64:COLLISION + offset: 0x151B4 + symbol: bitfs_seg7_collision_sinking_cage_platform + +bitfs_seg7_collision_inverted_pyramid: + type: SM64:COLLISION + offset: 0x15238 + symbol: bitfs_seg7_collision_inverted_pyramid + +bitfs_seg7_collision_07015288: + type: SM64:COLLISION + offset: 0x15288 + symbol: bitfs_seg7_collision_07015288 + +bitfs_seg7_collision_squishable_platform: + type: SM64:COLLISION + offset: 0x1530C + symbol: bitfs_seg7_collision_squishable_platform + +bitfs_seg7_collision_07015714: + type: SM64:COLLISION + offset: 0x15714 + symbol: bitfs_seg7_collision_07015714 + +bitfs_seg7_collision_07015768: + type: SM64:COLLISION + offset: 0x15768 + symbol: bitfs_seg7_collision_07015768 + +bitfs_seg7_collision_070157E0: + type: SM64:COLLISION + offset: 0x157E0 + symbol: bitfs_seg7_collision_070157E0 + +bitfs_seg7_collision_sinking_platform: + type: SM64:COLLISION + offset: 0x15858 + symbol: bitfs_seg7_collision_sinking_platform + +bitfs_seg7_collision_07015928: + type: SM64:COLLISION + offset: 0x15928 + symbol: bitfs_seg7_collision_07015928 + diff --git a/assets/ymls/jp/levels/bits.yml b/assets/ymls/jp/levels/bits.yml index 7197291e..0c2f8e5e 100644 --- a/assets/ymls/jp/levels/bits.yml +++ b/assets/ymls/jp/levels/bits.yml @@ -2188,3 +2188,73 @@ bits_seg7_dl_07013EF8: offset: 0x13EF8 symbol: bits_seg7_dl_07013EF8 +bits_seg7_collision_level: + type: SM64:COLLISION + offset: 0x16E18 + symbol: bits_seg7_collision_level + +bits_seg7_collision_0701A9A0: + type: SM64:COLLISION + offset: 0x1A9A0 + symbol: bits_seg7_collision_0701A9A0 + +bits_seg7_collision_0701AA0C: + type: SM64:COLLISION + offset: 0x1AA0C + symbol: bits_seg7_collision_0701AA0C + +bits_seg7_collision_0701AA84: + type: SM64:COLLISION + offset: 0x1AA84 + symbol: bits_seg7_collision_0701AA84 + +bits_seg7_collision_0701AC28: + type: SM64:COLLISION + offset: 0x1AC28 + symbol: bits_seg7_collision_0701AC28 + +bits_seg7_collision_0701ACAC: + type: SM64:COLLISION + offset: 0x1ACAC + symbol: bits_seg7_collision_0701ACAC + +bits_seg7_collision_0701AD54: + type: SM64:COLLISION + offset: 0x1AD54 + symbol: bits_seg7_collision_0701AD54 + +bits_seg7_collision_0701ADD8: + type: SM64:COLLISION + offset: 0x1ADD8 + symbol: bits_seg7_collision_0701ADD8 + +bits_seg7_collision_0701AE5C: + type: SM64:COLLISION + offset: 0x1AE5C + symbol: bits_seg7_collision_0701AE5C + +bits_seg7_collision_0701B0D4: + type: SM64:COLLISION + offset: 0x1B0D4 + symbol: bits_seg7_collision_0701B0D4 + +bits_seg7_collision_0701B26C: + type: SM64:COLLISION + offset: 0x1B26C + symbol: bits_seg7_collision_0701B26C + +bits_seg7_collision_0701B404: + type: SM64:COLLISION + offset: 0x1B404 + symbol: bits_seg7_collision_0701B404 + +bits_seg7_collision_0701B59C: + type: SM64:COLLISION + offset: 0x1B59C + symbol: bits_seg7_collision_0701B59C + +bits_seg7_collision_0701B734: + type: SM64:COLLISION + offset: 0x1B734 + symbol: bits_seg7_collision_0701B734 + diff --git a/assets/ymls/jp/levels/bob.yml b/assets/ymls/jp/levels/bob.yml index 0c4bc785..3e720919 100644 --- a/assets/ymls/jp/levels/bob.yml +++ b/assets/ymls/jp/levels/bob.yml @@ -1229,3 +1229,23 @@ bob_seg7_dl_0700E8A0: offset: 0xE8A0 symbol: bob_seg7_dl_0700E8A0 +bob_seg7_collision_level: + type: SM64:COLLISION + offset: 0xE958 + symbol: bob_seg7_collision_level + +bob_seg7_collision_chain_chomp_gate: + type: SM64:COLLISION + offset: 0x113C0 + symbol: bob_seg7_collision_chain_chomp_gate + +bob_seg7_collision_bridge: + type: SM64:COLLISION + offset: 0x113F0 + symbol: bob_seg7_collision_bridge + +bob_seg7_collision_gate: + type: SM64:COLLISION + offset: 0x11474 + symbol: bob_seg7_collision_gate + diff --git a/assets/ymls/jp/levels/bowser_1.yml b/assets/ymls/jp/levels/bowser_1.yml index d4db842d..c8a40ad8 100644 --- a/assets/ymls/jp/levels/bowser_1.yml +++ b/assets/ymls/jp/levels/bowser_1.yml @@ -104,3 +104,8 @@ bowser_1_seg7_dl_07002768: offset: 0x2768 symbol: bowser_1_seg7_dl_07002768 +bowser_1_seg7_collision_level: + type: SM64:COLLISION + offset: 0x2838 + symbol: bowser_1_seg7_collision_level + diff --git a/assets/ymls/jp/levels/bowser_2.yml b/assets/ymls/jp/levels/bowser_2.yml index 5f256f28..702e85f2 100644 --- a/assets/ymls/jp/levels/bowser_2.yml +++ b/assets/ymls/jp/levels/bowser_2.yml @@ -132,3 +132,13 @@ bowser_2_seg7_dl_07001930: offset: 0x1930 symbol: bowser_2_seg7_dl_07001930 +bowser_2_seg7_collision_level: + type: SM64:COLLISION + offset: 0x19F0 + symbol: bowser_2_seg7_collision_level + +bowser_2_seg7_collision_tilting_platform: + type: SM64:COLLISION + offset: 0x1A68 + symbol: bowser_2_seg7_collision_tilting_platform + diff --git a/assets/ymls/jp/levels/bowser_3.yml b/assets/ymls/jp/levels/bowser_3.yml index 9ed6fa27..f2a84dfc 100644 --- a/assets/ymls/jp/levels/bowser_3.yml +++ b/assets/ymls/jp/levels/bowser_3.yml @@ -571,3 +571,58 @@ bowser_3_seg7_dl_070025E0: offset: 0x25E0 symbol: bowser_3_seg7_dl_070025E0 +bowser_3_seg7_collision_level: + type: SM64:COLLISION + offset: 0x49C8 + symbol: bowser_3_seg7_collision_level + +bowser_3_seg7_collision_07004B94: + type: SM64:COLLISION + offset: 0x4B94 + symbol: bowser_3_seg7_collision_07004B94 + +bowser_3_seg7_collision_07004C18: + type: SM64:COLLISION + offset: 0x4C18 + symbol: bowser_3_seg7_collision_07004C18 + +bowser_3_seg7_collision_07004C9C: + type: SM64:COLLISION + offset: 0x4C9C + symbol: bowser_3_seg7_collision_07004C9C + +bowser_3_seg7_collision_07004D20: + type: SM64:COLLISION + offset: 0x4D20 + symbol: bowser_3_seg7_collision_07004D20 + +bowser_3_seg7_collision_07004DA4: + type: SM64:COLLISION + offset: 0x4DA4 + symbol: bowser_3_seg7_collision_07004DA4 + +bowser_3_seg7_collision_07004E28: + type: SM64:COLLISION + offset: 0x4E28 + symbol: bowser_3_seg7_collision_07004E28 + +bowser_3_seg7_collision_07004EAC: + type: SM64:COLLISION + offset: 0x4EAC + symbol: bowser_3_seg7_collision_07004EAC + +bowser_3_seg7_collision_07004F30: + type: SM64:COLLISION + offset: 0x4F30 + symbol: bowser_3_seg7_collision_07004F30 + +bowser_3_seg7_collision_07004FB4: + type: SM64:COLLISION + offset: 0x4FB4 + symbol: bowser_3_seg7_collision_07004FB4 + +bowser_3_seg7_collision_07005038: + type: SM64:COLLISION + offset: 0x5038 + symbol: bowser_3_seg7_collision_07005038 + diff --git a/assets/ymls/jp/levels/castle_courtyard.yml b/assets/ymls/jp/levels/castle_courtyard.yml index aa9cf7a2..8afd5e84 100644 --- a/assets/ymls/jp/levels/castle_courtyard.yml +++ b/assets/ymls/jp/levels/castle_courtyard.yml @@ -565,3 +565,8 @@ castle_courtyard_seg7_dl_07005698: offset: 0x5698 symbol: castle_courtyard_seg7_dl_07005698 +castle_courtyard_seg7_collision_level: + type: SM64:COLLISION + offset: 0x59A8 + symbol: castle_courtyard_seg7_collision_level + diff --git a/assets/ymls/jp/levels/castle_grounds.yml b/assets/ymls/jp/levels/castle_grounds.yml index 9f8ca415..7410c7a1 100644 --- a/assets/ymls/jp/levels/castle_grounds.yml +++ b/assets/ymls/jp/levels/castle_grounds.yml @@ -1247,3 +1247,18 @@ castle_grounds_seg7_dl_0700B1D0: offset: 0xB1D0 symbol: castle_grounds_seg7_dl_0700B1D0 +castle_grounds_seg7_collision_level: + type: SM64:COLLISION + offset: 0xEAE8 + symbol: castle_grounds_seg7_collision_level + +castle_grounds_seg7_moat_grills: + type: SM64:COLLISION + offset: 0x10DB4 + symbol: castle_grounds_seg7_moat_grills + +castle_grounds_seg7_cannon_grill: + type: SM64:COLLISION + offset: 0x10E10 + symbol: castle_grounds_seg7_cannon_grill + diff --git a/assets/ymls/jp/levels/castle_inside.yml b/assets/ymls/jp/levels/castle_inside.yml index 5405dec5..01756351 100644 --- a/assets/ymls/jp/levels/castle_inside.yml +++ b/assets/ymls/jp/levels/castle_inside.yml @@ -7872,3 +7872,43 @@ inside_castle_seg7_dl_07058950: offset: 0x58950 symbol: inside_castle_seg7_dl_07058950 +inside_castle_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0x68B88 + symbol: inside_castle_seg7_area_1_collision + +inside_castle_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0x6E364 + symbol: inside_castle_seg7_area_2_collision + +inside_castle_seg7_area_3_collision: + type: SM64:COLLISION + offset: 0x73AAC + symbol: inside_castle_seg7_area_3_collision + +inside_castle_seg7_collision_ddd_warp: + type: SM64:COLLISION + offset: 0x775B4 + symbol: inside_castle_seg7_collision_ddd_warp + +inside_castle_seg7_collision_ddd_warp_2: + type: SM64:COLLISION + offset: 0x7768C + symbol: inside_castle_seg7_collision_ddd_warp_2 + +inside_castle_seg7_collision_floor_trap: + type: SM64:COLLISION + offset: 0x78DE4 + symbol: inside_castle_seg7_collision_floor_trap + +inside_castle_seg7_collision_star_door: + type: SM64:COLLISION + offset: 0x78E14 + symbol: inside_castle_seg7_collision_star_door + +inside_castle_seg7_collision_water_level_pillar: + type: SM64:COLLISION + offset: 0x78E80 + symbol: inside_castle_seg7_collision_water_level_pillar + diff --git a/assets/ymls/jp/levels/jrb.yml b/assets/ymls/jp/levels/jrb.yml index 960300db..6f8bb6e9 100644 --- a/assets/ymls/jp/levels/jrb.yml +++ b/assets/ymls/jp/levels/jrb.yml @@ -1451,4 +1451,59 @@ jrb_seg7_dl_0700AFB0: type: GFX offset: 0xAFB0 symbol: jrb_seg7_dl_0700AFB0 + +jrb_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0xB058 + symbol: jrb_seg7_area_1_collision + +jrb_seg7_collision_rock_solid: + type: SM64:COLLISION + offset: 0xC758 + symbol: jrb_seg7_collision_rock_solid + +jrb_seg7_collision_floating_platform: + type: SM64:COLLISION + offset: 0xC824 + symbol: jrb_seg7_collision_floating_platform + +jrb_seg7_collision_floating_box: + type: SM64:COLLISION + offset: 0xC8A8 + symbol: jrb_seg7_collision_floating_box + +jrb_seg7_collision_in_sunken_ship_3: + type: SM64:COLLISION + offset: 0xC92C + symbol: jrb_seg7_collision_in_sunken_ship_3 + +jrb_seg7_collision_in_sunken_ship: + type: SM64:COLLISION + offset: 0xCE5C + symbol: jrb_seg7_collision_in_sunken_ship + +jrb_seg7_collision_0700CEF0: + type: SM64:COLLISION + offset: 0xCEF0 + symbol: jrb_seg7_collision_0700CEF0 + +jrb_seg7_collision_in_sunken_ship_2: + type: SM64:COLLISION + offset: 0xCF80 + symbol: jrb_seg7_collision_in_sunken_ship_2 + +jrb_seg7_collision_pillar_base: + type: SM64:COLLISION + offset: 0xD198 + symbol: jrb_seg7_collision_pillar_base + +jrb_seg7_collision_0700D1DC: + type: SM64:COLLISION + offset: 0xD1DC + symbol: jrb_seg7_collision_0700D1DC + +jrb_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0x105B8 + symbol: jrb_seg7_area_2_collision diff --git a/assets/ymls/jp/levels/lll.yml b/assets/ymls/jp/levels/lll.yml index be2e3795..8b616c70 100644 --- a/assets/ymls/jp/levels/lll.yml +++ b/assets/ymls/jp/levels/lll.yml @@ -2512,3 +2512,83 @@ lll_seg7_dl_07018380: offset: 0x18380 symbol: lll_seg7_dl_07018380 +lll_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0x1ADE8 + symbol: lll_seg7_area_1_collision + +lll_seg7_collision_octagonal_moving_platform: + type: SM64:COLLISION + offset: 0x1D018 + symbol: lll_seg7_collision_octagonal_moving_platform + +lll_seg7_collision_drawbridge: + type: SM64:COLLISION + offset: 0x1D108 + symbol: lll_seg7_collision_drawbridge + +lll_seg7_collision_rotating_fire_bars: + type: SM64:COLLISION + offset: 0x1D138 + symbol: lll_seg7_collision_rotating_fire_bars + +lll_seg7_collision_wood_piece: + type: SM64:COLLISION + offset: 0x1D1EC + symbol: lll_seg7_collision_wood_piece + +lll_seg7_collision_0701D21C: + type: SM64:COLLISION + offset: 0x1D21C + symbol: lll_seg7_collision_0701D21C + +lll_seg7_collision_rotating_platform: + type: SM64:COLLISION + offset: 0x1D294 + symbol: lll_seg7_collision_rotating_platform + +lll_seg7_collision_slow_tilting_platform: + type: SM64:COLLISION + offset: 0x1D408 + symbol: lll_seg7_collision_slow_tilting_platform + +lll_seg7_collision_sinking_pyramids: + type: SM64:COLLISION + offset: 0x1D450 + symbol: lll_seg7_collision_sinking_pyramids + +lll_seg7_collision_inverted_pyramid: + type: SM64:COLLISION + offset: 0x1D510 + symbol: lll_seg7_collision_inverted_pyramid + +lll_seg7_collision_puzzle_piece: + type: SM64:COLLISION + offset: 0x1D560 + symbol: lll_seg7_collision_puzzle_piece + +lll_seg7_collision_floating_block: + type: SM64:COLLISION + offset: 0x1D590 + symbol: lll_seg7_collision_floating_block + +lll_seg7_collision_pitoune: + type: SM64:COLLISION + offset: 0x1D608 + symbol: lll_seg7_collision_pitoune + +lll_seg7_collision_hexagonal_platform: + type: SM64:COLLISION + offset: 0x1D71C + symbol: lll_seg7_collision_hexagonal_platform + +lll_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0x25F80 + symbol: lll_seg7_area_2_collision + +lll_seg7_collision_falling_wall: + type: SM64:COLLISION + offset: 0x284DC + symbol: lll_seg7_collision_falling_wall + diff --git a/assets/ymls/jp/levels/pss.yml b/assets/ymls/jp/levels/pss.yml index 09751155..e7527370 100644 --- a/assets/ymls/jp/levels/pss.yml +++ b/assets/ymls/jp/levels/pss.yml @@ -1149,3 +1149,8 @@ pss_seg7_dl_0700DAD8: offset: 0xDAD8 symbol: pss_seg7_dl_0700DAD8 +pss_seg7_collision: + type: SM64:COLLISION + offset: 0xE490 + symbol: pss_seg7_collision + diff --git a/assets/ymls/jp/levels/rr.yml b/assets/ymls/jp/levels/rr.yml index afdb54b8..a84866ef 100644 --- a/assets/ymls/jp/levels/rr.yml +++ b/assets/ymls/jp/levels/rr.yml @@ -3771,3 +3771,83 @@ rr_seg7_dl_0700DBD8: offset: 0xDBD8 symbol: rr_seg7_dl_0700DBD8 +rr_seg7_collision_07029038: + type: SM64:COLLISION + offset: 0x29038 + symbol: rr_seg7_collision_07029038 + +rr_seg7_collision_pendulum: + type: SM64:COLLISION + offset: 0x29154 + symbol: rr_seg7_collision_pendulum + +rr_seg7_collision_rotating_platform_with_fire: + type: SM64:COLLISION + offset: 0x29308 + symbol: rr_seg7_collision_rotating_platform_with_fire + +rr_seg7_collision_07029508: + type: SM64:COLLISION + offset: 0x29508 + symbol: rr_seg7_collision_07029508 + +rr_seg7_collision_070295F8: + type: SM64:COLLISION + offset: 0x295F8 + symbol: rr_seg7_collision_070295F8 + +rr_seg7_collision_0702967C: + type: SM64:COLLISION + offset: 0x2967C + symbol: rr_seg7_collision_0702967C + +rr_seg7_collision_elevator_platform: + type: SM64:COLLISION + offset: 0x296CC + symbol: rr_seg7_collision_elevator_platform + +rr_seg7_collision_07029750: + type: SM64:COLLISION + offset: 0x29750 + symbol: rr_seg7_collision_07029750 + +rr_seg7_collision_donut_platform: + type: SM64:COLLISION + offset: 0x297D4 + symbol: rr_seg7_collision_donut_platform + +rr_seg7_collision_07029858: + type: SM64:COLLISION + offset: 0x29858 + symbol: rr_seg7_collision_07029858 + +rr_seg7_collision_07029924: + type: SM64:COLLISION + offset: 0x29924 + symbol: rr_seg7_collision_07029924 + +rr_seg7_collision_07029C1C: + type: SM64:COLLISION + offset: 0x29C1C + symbol: rr_seg7_collision_07029C1C + +rr_seg7_collision_07029FA4: + type: SM64:COLLISION + offset: 0x29FA4 + symbol: rr_seg7_collision_07029FA4 + +rr_seg7_collision_0702A32C: + type: SM64:COLLISION + offset: 0x2A32C + symbol: rr_seg7_collision_0702A32C + +rr_seg7_collision_0702A6B4: + type: SM64:COLLISION + offset: 0x2A6B4 + symbol: rr_seg7_collision_0702A6B4 + +rr_seg7_collision_level: + type: SM64:COLLISION + offset: 0x2A9A8 + symbol: rr_seg7_collision_level + diff --git a/assets/ymls/jp/levels/sa.yml b/assets/ymls/jp/levels/sa.yml index d749e8d8..2adf33f7 100644 --- a/assets/ymls/jp/levels/sa.yml +++ b/assets/ymls/jp/levels/sa.yml @@ -275,3 +275,8 @@ sa_seg7_dl_07002FD0: offset: 0x2FD0 symbol: sa_seg7_dl_07002FD0 +sa_seg7_collision: + type: SM64:COLLISION + offset: 0x3000 + symbol: bbh_seg7_collision + diff --git a/assets/ymls/jp/levels/sl.yml b/assets/ymls/jp/levels/sl.yml index ec211e8b..b75934e7 100644 --- a/assets/ymls/jp/levels/sl.yml +++ b/assets/ymls/jp/levels/sl.yml @@ -1179,3 +1179,23 @@ sl_seg7_dl_0700A890: offset: 0xA890 symbol: sl_seg7_dl_0700A890 +sl_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0xCBD8 + symbol: sl_seg7_area_1_collision + +sl_seg7_collision_sliding_snow_mound: + type: SM64:COLLISION + offset: 0xEF6C + symbol: sl_seg7_collision_sliding_snow_mound + +sl_seg7_collision_pound_explodes: + type: SM64:COLLISION + offset: 0xEFC0 + symbol: sl_seg7_collision_pound_explodes + +sl_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0xEFFC + symbol: sl_seg7_area_2_collision + diff --git a/assets/ymls/jp/levels/ssl.yml b/assets/ymls/jp/levels/ssl.yml index 9256b839..76b70923 100644 --- a/assets/ymls/jp/levels/ssl.yml +++ b/assets/ymls/jp/levels/ssl.yml @@ -2511,3 +2511,68 @@ ssl_seg7_dl_0700FCE0: offset: 0xFCE0 symbol: ssl_seg7_dl_0700FCE0 +ssl_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0xFD80 + symbol: ssl_seg7_area_1_collision + +ssl_seg7_collision_pyramid_top: + type: SM64:COLLISION + offset: 0x125F4 + symbol: ssl_seg7_collision_pyramid_top + +ssl_seg7_collision_tox_box: + type: SM64:COLLISION + offset: 0x12644 + symbol: ssl_seg7_collision_tox_box + +ssl_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0x23678 + symbol: ssl_seg7_area_2_collision + +ssl_seg7_area_3_collision: + type: SM64:COLLISION + offset: 0x275BC + symbol: ssl_seg7_area_3_collision + +ssl_seg7_collision_grindel: + type: SM64:COLLISION + offset: 0x27ED0 + symbol: ssl_seg7_collision_grindel + +ssl_seg7_collision_spindel: + type: SM64:COLLISION + offset: 0x27F54 + symbol: ssl_seg7_collision_spindel + +ssl_seg7_collision_0702808C: + type: SM64:COLLISION + offset: 0x2808C + symbol: ssl_seg7_collision_0702808C + +ssl_seg7_collision_pyramid_elevator: + type: SM64:COLLISION + offset: 0x28110 + symbol: ssl_seg7_collision_pyramid_elevator + +ssl_seg7_collision_07028274: + type: SM64:COLLISION + offset: 0x28274 + symbol: ssl_seg7_collision_07028274 + +ssl_seg7_collision_070282F8: + type: SM64:COLLISION + offset: 0x282F8 + symbol: ssl_seg7_collision_070282F8 + +ssl_seg7_collision_07028370: + type: SM64:COLLISION + offset: 0x28370 + symbol: ssl_seg7_collision_07028370 + +ssl_seg7_collision_070284B0: + type: SM64:COLLISION + offset: 0x284B0 + symbol: ssl_seg7_collision_070284B0 + diff --git a/assets/ymls/jp/levels/thi.yml b/assets/ymls/jp/levels/thi.yml index 0efc66bc..84536bae 100644 --- a/assets/ymls/jp/levels/thi.yml +++ b/assets/ymls/jp/levels/thi.yml @@ -1109,3 +1109,23 @@ thi_seg7_dl_07007538: offset: 0x7538 symbol: thi_seg7_dl_07007538 +thi_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0x9FC8 + symbol: thi_seg7_area_1_collision + +thi_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0xBD60 + symbol: thi_seg7_area_2_collision + +thi_seg7_area_3_collision: + type: SM64:COLLISION + offset: 0xD444 + symbol: thi_seg7_area_3_collision + +thi_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0xE228 + symbol: thi_seg7_area_1_collision + diff --git a/assets/ymls/jp/levels/totwc.yml b/assets/ymls/jp/levels/totwc.yml index 49c6339e..12abc165 100644 --- a/assets/ymls/jp/levels/totwc.yml +++ b/assets/ymls/jp/levels/totwc.yml @@ -494,3 +494,8 @@ totwc_seg7_dl_070079A8: offset: 0x79A8 symbol: totwc_seg7_dl_070079A8 +totwc_seg7_collision: + type: SM64:COLLISION + offset: 0x7A18 + symbol: totwc_seg7_collision + diff --git a/assets/ymls/jp/levels/ttc.yml b/assets/ymls/jp/levels/ttc.yml index 2cf03fcf..a442949f 100644 --- a/assets/ymls/jp/levels/ttc.yml +++ b/assets/ymls/jp/levels/ttc.yml @@ -1858,3 +1858,73 @@ ttc_seg7_dl_0700EFE0: offset: 0xEFE0 symbol: ttc_seg7_dl_0700EFE0 +ttc_seg7_collision_level: + type: SM64:COLLISION + offset: 0x12330 + symbol: ttc_seg7_collision_level + +ttc_seg7_collision_07014F70: + type: SM64:COLLISION + offset: 0x14F70 + symbol: ttc_seg7_collision_07014F70 + +ttc_seg7_collision_07015008: + type: SM64:COLLISION + offset: 0x15008 + symbol: ttc_seg7_collision_07015008 + +ttc_seg7_collision_clock_pendulum: + type: SM64:COLLISION + offset: 0x1508C + symbol: ttc_seg7_collision_clock_pendulum + +ttc_seg7_collision_070152B4: + type: SM64:COLLISION + offset: 0x152B4 + symbol: ttc_seg7_collision_070152B4 + +ttc_seg7_collision_070153E0: + type: SM64:COLLISION + offset: 0x153E0 + symbol: ttc_seg7_collision_070153E0 + +ttc_seg7_collision_sliding_surface: + type: SM64:COLLISION + offset: 0x1550C + symbol: ttc_seg7_collision_sliding_surface + +ttc_seg7_collision_07015584: + type: SM64:COLLISION + offset: 0x15584 + symbol: ttc_seg7_collision_07015584 + +ttc_seg7_collision_07015650: + type: SM64:COLLISION + offset: 0x15650 + symbol: ttc_seg7_collision_07015650 + +ttc_seg7_collision_07015754: + type: SM64:COLLISION + offset: 0x15754 + symbol: ttc_seg7_collision_07015754 + +ttc_seg7_collision_070157D8: + type: SM64:COLLISION + offset: 0x157D8 + symbol: ttc_seg7_collision_070157D8 + +ttc_seg7_collision_clock_platform: + type: SM64:COLLISION + offset: 0x1585C + symbol: ttc_seg7_collision_clock_platform + +ttc_seg7_collision_clock_main_rotation: + type: SM64:COLLISION + offset: 0x158E0 + symbol: ttc_seg7_collision_clock_main_rotation + +ttc_seg7_collision_rotating_clock_platform2: + type: SM64:COLLISION + offset: 0x159D0 + symbol: ttc_seg7_collision_rotating_clock_platform2 + diff --git a/assets/ymls/jp/levels/ttm.yml b/assets/ymls/jp/levels/ttm.yml index ec448ba3..98126bcf 100644 --- a/assets/ymls/jp/levels/ttm.yml +++ b/assets/ymls/jp/levels/ttm.yml @@ -4167,3 +4167,38 @@ ttm_seg7_dl_07013430: offset: 0x13430 symbol: ttm_seg7_dl_07013430 +ttm_seg7_collision_pitoune_2: + type: SM64:COLLISION + offset: 0x13678 + symbol: ttm_seg7_collision_pitoune_2 + +ttm_seg7_collision_ukiki_cage: + type: SM64:COLLISION + offset: 0x13790 + symbol: ttm_seg7_collision_ukiki_cage + +ttm_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0x13814 + symbol: ttm_seg7_area_1_collision + +ttm_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0x2BBD0 + symbol: ttm_seg7_area_2_collision + +ttm_seg7_area_3_collision: + type: SM64:COLLISION + offset: 0x2D5EC + symbol: ttm_seg7_area_3_collision + +ttm_seg7_area_4_collision: + type: SM64:COLLISION + offset: 0x2F0F8 + symbol: ttm_seg7_area_4_collision + +ttm_seg7_collision_podium_warp: + type: SM64:COLLISION + offset: 0x3013C + symbol: ttm_seg7_collision_podium_warp + diff --git a/assets/ymls/jp/levels/vcutm.yml b/assets/ymls/jp/levels/vcutm.yml index 1e3ea210..6e685601 100644 --- a/assets/ymls/jp/levels/vcutm.yml +++ b/assets/ymls/jp/levels/vcutm.yml @@ -669,3 +669,13 @@ vcutm_seg7_dl_070080D0: offset: 0x80D0 symbol: vcutm_seg7_dl_070080D0 +vcutm_seg7_collision: + type: SM64:COLLISION + offset: 0x9750 + symbol: vcutm_seg7_collision + +vcutm_seg7_collision_0700AC44: + type: SM64:COLLISION + offset: 0xAC44 + symbol: vcutm_seg7_collision_0700AC44 + diff --git a/assets/ymls/jp/levels/wdw.yml b/assets/ymls/jp/levels/wdw.yml index e27195f3..3ce7edef 100644 --- a/assets/ymls/jp/levels/wdw.yml +++ b/assets/ymls/jp/levels/wdw.yml @@ -1898,3 +1898,48 @@ wdw_seg7_dl_07013B70: offset: 0x13B70 symbol: wdw_seg7_dl_07013B70 +wdw_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0x14150 + symbol: wdw_seg7_area_1_collision + +wdw_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0x1633C + symbol: wdw_seg7_area_2_collision + +wdw_seg7_collision_square_floating_platform: + type: SM64:COLLISION + offset: 0x183C0 + symbol: wdw_seg7_collision_square_floating_platform + +wdw_seg7_collision_arrow_lift: + type: SM64:COLLISION + offset: 0x18444 + symbol: wdw_seg7_collision_arrow_lift + +wdw_seg7_collision_070184C8: + type: SM64:COLLISION + offset: 0x184C8 + symbol: wdw_seg7_070184C8 + +wdw_seg7_collision_07018528: + type: SM64:COLLISION + offset: 0x18528 + symbol: wdw_seg7_07018528 + +wdw_seg7_collision_express_elevator_platform: + type: SM64:COLLISION + offset: 0x185AC + symbol: wdw_seg7_express_elevator_platform + +wdw_seg7_collision_rect_floating_platform: + type: SM64:COLLISION + offset: 0x18630 + symbol: wdw_seg7_rect_floating_platform + +wdw_seg7_collision_070186B4: + type: SM64:COLLISION + offset: 0x186B4 + symbol: wdw_seg7_070186B4 + diff --git a/assets/ymls/jp/levels/wf.yml b/assets/ymls/jp/levels/wf.yml index e7e2ab18..e1e95dd6 100644 --- a/assets/ymls/jp/levels/wf.yml +++ b/assets/ymls/jp/levels/wf.yml @@ -1934,3 +1934,78 @@ wf_seg7_dl_0700D708: offset: 0xD708 symbol: wf_seg7_dl_0700D708 +wf_seg7_collision_small_bomp: + type: SM64:COLLISION + offset: 0xF868 + symbol: wf_seg7_collision_small_bomp + +wf_seg7_collision_large_bomp: + type: SM64:COLLISION + offset: 0xF934 + symbol: wf_seg7_collision_large_bomp + +wf_seg7_collision_clocklike_rotation: + type: SM64:COLLISION + offset: 0xFA00 + symbol: wf_seg7_collision_clocklike_rotation + +wf_seg7_collision_sliding_brick_platform: + type: SM64:COLLISION + offset: 0xFAA4 + symbol: wf_seg7_collision_sliding_brick_platform + +wf_seg7_collision_tumbling_bridge: + type: SM64:COLLISION + offset: 0xFAEC + symbol: wf_seg7_collision_tumbling_bridge + +wf_seg7_collision_trapezoid: + type: SM64:COLLISION + offset: 0xFB1C + symbol: wf_seg7_collision_trapezoid + +wf_seg7_collision_platform: + type: SM64:COLLISION + offset: 0xFB94 + symbol: wf_seg7_collision_platform + +wf_seg7_collision_breakable_wall: + type: SM64:COLLISION + offset: 0xFC0C + symbol: wf_seg7_collision_breakable_wall + +wf_seg7_collision_breakable_wall_2: + type: SM64:COLLISION + offset: 0xFC44 + symbol: wf_seg7_collision_breakable_wall_2 + +wf_seg7_collision_kickable_board: + type: SM64:COLLISION + offset: 0xFC7C + symbol: wf_seg7_collision_kickable_board + +wf_seg7_collision_tower_door: + type: SM64:COLLISION + offset: 0xFD00 + symbol: wf_seg7_collision_tower_door + +wf_seg7_collision_rotating_platform: + type: SM64:COLLISION + offset: 0xFD30 + symbol: wf_seg7_collision_rotating_platform + +wf_seg7_collision_tower: + type: SM64:COLLISION + offset: 0xFE14 + symbol: wf_seg7_collision_tower + +wf_seg7_collision_bullet_bill_cannon: + type: SM64:COLLISION + offset: 0x10260 + symbol: wf_seg7_collision_bullet_bill_cannon + +wf_seg7_collision_070102D8: + type: SM64:COLLISION + offset: 0x102D8 + symbol: wf_seg7_collision_070102D8 + diff --git a/assets/ymls/jp/levels/wmotr.yml b/assets/ymls/jp/levels/wmotr.yml index b41a52c7..d026b23d 100644 --- a/assets/ymls/jp/levels/wmotr.yml +++ b/assets/ymls/jp/levels/wmotr.yml @@ -1165,3 +1165,8 @@ wmotr_seg7_dl_07010608: offset: 0x10608 symbol: wmotr_seg7_dl_07010608 +wmotr_seg7_collision: + type: SM64:COLLISION + offset: 0x10688 + symbol: wmotr_seg7_collision + diff --git a/assets/ymls/us/levels/bbh.yml b/assets/ymls/us/levels/bbh.yml index 72ea7cd0..e393079d 100644 --- a/assets/ymls/us/levels/bbh.yml +++ b/assets/ymls/us/levels/bbh.yml @@ -3475,3 +3475,42 @@ bbh_seg7_dl_0701FD28: offset: 0x1FD28 symbol: bbh_seg7_dl_0701FD28 +bbh_seg7_collision_level: + type: SM64:COLLISION + offset: 0x207A0 + symbol: bbh_seg7_collision_level + +bbh_seg7_collision_staircase_step: + type: SM64:COLLISION + offset: 0x26A1C + symbol: bbh_seg7_collision_staircase_step + +bbh_seg7_collision_tilt_floor_platform: + type: SM64:COLLISION + offset: 0x26A98 + symbol: bbh_seg7_collision_tilt_floor_platform + +bbh_seg7_collision_07026B1C: + type: SM64:COLLISION + offset: 0x26B1C + symbol: bbh_seg7_collision_07026B1C + +bbh_seg7_collision_haunted_bookshelf: + type: SM64:COLLISION + offset: 0x26B4C + symbol: bbh_seg7_collision_haunted_bookshelf + +bbh_seg7_collision_mesh_elevator: + type: SM64:COLLISION + offset: 0x26B94 + symbol: bbh_seg7_collision_mesh_elevator + +bbh_seg7_collision_merry_go_round: + type: SM64:COLLISION + offset: 0x26C1C + symbol: bbh_seg7_collision_merry_go_round + +bbh_seg7_collision_coffin: + type: SM64:COLLISION + offset: 0x26D18 + symbol: bbh_seg7_collision_coffin diff --git a/assets/ymls/us/levels/bitdw.yml b/assets/ymls/us/levels/bitdw.yml index c05bee9c..4e65ce94 100644 --- a/assets/ymls/us/levels/bitdw.yml +++ b/assets/ymls/us/levels/bitdw.yml @@ -1353,3 +1353,58 @@ bitdw_seg7_dl_0700C0E0: offset: 0xC0E0 symbol: bitdw_seg7_dl_0700C0E0 +bitdw_seg7_collision_level: + type: SM64:COLLISION + offset: 0xD460 + symbol: bitdw_seg7_collision_level + +bitdw_seg7_collision_0700F688: + type: SM64:COLLISION + offset: 0xF688 + symbol: bitdw_seg7_collision_0700F688 + +bitdw_seg7_collision_0700F70C: + type: SM64:COLLISION + offset: 0xF70C + symbol: bitdw_seg7_collision_0700F70C + +bitdw_seg7_collision_moving_pyramid: + type: SM64:COLLISION + offset: 0xF790 + symbol: bitdw_seg7_collision_moving_pyramid + +bitdw_seg7_collision_0700F7F0: + type: SM64:COLLISION + offset: 0xF7F0 + symbol: bitdw_seg7_collision_0700F7F0 + +bitdw_seg7_collision_0700F898: + type: SM64:COLLISION + offset: 0xF898 + symbol: bitdw_seg7_collision_0700F898 + +bitdw_seg7_collision_0700F91C: + type: SM64:COLLISION + offset: 0xF91C + symbol: bitdw_seg7_collision_0700F91C + +bitdw_seg7_collision_0700FA3C: + type: SM64:COLLISION + offset: 0xFA3C + symbol: bitdw_seg7_collision_0700FA3C + +bitdw_seg7_collision_0700FB5C: + type: SM64:COLLISION + offset: 0xFB5C + symbol: bitdw_seg7_collision_0700FB5C + +bitdw_seg7_collision_0700FC7C: + type: SM64:COLLISION + offset: 0xFC7C + symbol: bitdw_seg7_collision_0700FC7C + +bitdw_seg7_collision_0700FD9C: + type: SM64:COLLISION + offset: 0xFD9C + symbol: bitdw_seg7_collision_0700FD9C + diff --git a/assets/ymls/us/levels/bitfs.yml b/assets/ymls/us/levels/bitfs.yml index 0a093486..ffda1675 100644 --- a/assets/ymls/us/levels/bitfs.yml +++ b/assets/ymls/us/levels/bitfs.yml @@ -1839,3 +1839,58 @@ bitfs_seg7_dl_07010340: offset: 0x10340 symbol: bitfs_seg7_dl_07010340 +bitfs_seg7_collision_level: + type: SM64:COLLISION + offset: 0x11E98 + symbol: bitfs_seg7_collision_level + +bitfs_seg7_collision_07015124: + type: SM64:COLLISION + offset: 0x15124 + symbol: bitfs_seg7_collision_07015124 + +bitfs_seg7_collision_sinking_cage_platform: + type: SM64:COLLISION + offset: 0x151B4 + symbol: bitfs_seg7_collision_sinking_cage_platform + +bitfs_seg7_collision_inverted_pyramid: + type: SM64:COLLISION + offset: 0x15238 + symbol: bitfs_seg7_collision_inverted_pyramid + +bitfs_seg7_collision_07015288: + type: SM64:COLLISION + offset: 0x15288 + symbol: bitfs_seg7_collision_07015288 + +bitfs_seg7_collision_squishable_platform: + type: SM64:COLLISION + offset: 0x1530C + symbol: bitfs_seg7_collision_squishable_platform + +bitfs_seg7_collision_07015714: + type: SM64:COLLISION + offset: 0x15714 + symbol: bitfs_seg7_collision_07015714 + +bitfs_seg7_collision_07015768: + type: SM64:COLLISION + offset: 0x15768 + symbol: bitfs_seg7_collision_07015768 + +bitfs_seg7_collision_070157E0: + type: SM64:COLLISION + offset: 0x157E0 + symbol: bitfs_seg7_collision_070157E0 + +bitfs_seg7_collision_sinking_platform: + type: SM64:COLLISION + offset: 0x15858 + symbol: bitfs_seg7_collision_sinking_platform + +bitfs_seg7_collision_07015928: + type: SM64:COLLISION + offset: 0x15928 + symbol: bitfs_seg7_collision_07015928 + diff --git a/assets/ymls/us/levels/bits.yml b/assets/ymls/us/levels/bits.yml index c3e8761b..ba596fc8 100644 --- a/assets/ymls/us/levels/bits.yml +++ b/assets/ymls/us/levels/bits.yml @@ -2187,3 +2187,73 @@ bits_seg7_dl_07013EF8: offset: 0x13EF8 symbol: bits_seg7_dl_07013EF8 +bits_seg7_collision_level: + type: SM64:COLLISION + offset: 0x16E18 + symbol: bits_seg7_collision_level + +bits_seg7_collision_0701A9A0: + type: SM64:COLLISION + offset: 0x1A9A0 + symbol: bits_seg7_collision_0701A9A0 + +bits_seg7_collision_0701AA0C: + type: SM64:COLLISION + offset: 0x1AA0C + symbol: bits_seg7_collision_0701AA0C + +bits_seg7_collision_0701AA84: + type: SM64:COLLISION + offset: 0x1AA84 + symbol: bits_seg7_collision_0701AA84 + +bits_seg7_collision_0701AC28: + type: SM64:COLLISION + offset: 0x1AC28 + symbol: bits_seg7_collision_0701AC28 + +bits_seg7_collision_0701ACAC: + type: SM64:COLLISION + offset: 0x1ACAC + symbol: bits_seg7_collision_0701ACAC + +bits_seg7_collision_0701AD54: + type: SM64:COLLISION + offset: 0x1AD54 + symbol: bits_seg7_collision_0701AD54 + +bits_seg7_collision_0701ADD8: + type: SM64:COLLISION + offset: 0x1ADD8 + symbol: bits_seg7_collision_0701ADD8 + +bits_seg7_collision_0701AE5C: + type: SM64:COLLISION + offset: 0x1AE5C + symbol: bits_seg7_collision_0701AE5C + +bits_seg7_collision_0701B0D4: + type: SM64:COLLISION + offset: 0x1B0D4 + symbol: bits_seg7_collision_0701B0D4 + +bits_seg7_collision_0701B26C: + type: SM64:COLLISION + offset: 0x1B26C + symbol: bits_seg7_collision_0701B26C + +bits_seg7_collision_0701B404: + type: SM64:COLLISION + offset: 0x1B404 + symbol: bits_seg7_collision_0701B404 + +bits_seg7_collision_0701B59C: + type: SM64:COLLISION + offset: 0x1B59C + symbol: bits_seg7_collision_0701B59C + +bits_seg7_collision_0701B734: + type: SM64:COLLISION + offset: 0x1B734 + symbol: bits_seg7_collision_0701B734 + diff --git a/assets/ymls/us/levels/bob.yml b/assets/ymls/us/levels/bob.yml index 360c2fb7..6b643e85 100644 --- a/assets/ymls/us/levels/bob.yml +++ b/assets/ymls/us/levels/bob.yml @@ -1228,3 +1228,23 @@ bob_seg7_dl_0700E8A0: offset: 0xE8A0 symbol: bob_seg7_dl_0700E8A0 +bob_seg7_collision_level: + type: SM64:COLLISION + offset: 0xE958 + symbol: bob_seg7_collision_level + +bob_seg7_collision_chain_chomp_gate: + type: SM64:COLLISION + offset: 0x113C0 + symbol: bob_seg7_collision_chain_chomp_gate + +bob_seg7_collision_bridge: + type: SM64:COLLISION + offset: 0x113F0 + symbol: bob_seg7_collision_bridge + +bob_seg7_collision_gate: + type: SM64:COLLISION + offset: 0x11474 + symbol: bob_seg7_collision_gate + diff --git a/assets/ymls/us/levels/bowser_1.yml b/assets/ymls/us/levels/bowser_1.yml index cd191ec9..d8658120 100644 --- a/assets/ymls/us/levels/bowser_1.yml +++ b/assets/ymls/us/levels/bowser_1.yml @@ -103,3 +103,8 @@ bowser_1_seg7_dl_07002768: offset: 0x2768 symbol: bowser_1_seg7_dl_07002768 +bowser_1_seg7_collision_level: + type: SM64:COLLISION + offset: 0x2838 + symbol: bowser_1_seg7_collision_level + diff --git a/assets/ymls/us/levels/bowser_2.yml b/assets/ymls/us/levels/bowser_2.yml index 7735c564..2dd2ef8b 100644 --- a/assets/ymls/us/levels/bowser_2.yml +++ b/assets/ymls/us/levels/bowser_2.yml @@ -131,3 +131,13 @@ bowser_2_seg7_dl_07001930: offset: 0x1930 symbol: bowser_2_seg7_dl_07001930 +bowser_2_seg7_collision_level: + type: SM64:COLLISION + offset: 0x19F0 + symbol: bowser_2_seg7_collision_level + +bowser_2_seg7_collision_tilting_platform: + type: SM64:COLLISION + offset: 0x1A68 + symbol: bowser_2_seg7_collision_tilting_platform + diff --git a/assets/ymls/us/levels/bowser_3.yml b/assets/ymls/us/levels/bowser_3.yml index 95148638..7d2650cf 100644 --- a/assets/ymls/us/levels/bowser_3.yml +++ b/assets/ymls/us/levels/bowser_3.yml @@ -570,3 +570,58 @@ bowser_3_seg7_dl_070025E0: offset: 0x25E0 symbol: bowser_3_seg7_dl_070025E0 +bowser_3_seg7_collision_level: + type: SM64:COLLISION + offset: 0x49C8 + symbol: bowser_3_seg7_collision_level + +bowser_3_seg7_collision_07004B94: + type: SM64:COLLISION + offset: 0x4B94 + symbol: bowser_3_seg7_collision_07004B94 + +bowser_3_seg7_collision_07004C18: + type: SM64:COLLISION + offset: 0x4C18 + symbol: bowser_3_seg7_collision_07004C18 + +bowser_3_seg7_collision_07004C9C: + type: SM64:COLLISION + offset: 0x4C9C + symbol: bowser_3_seg7_collision_07004C9C + +bowser_3_seg7_collision_07004D20: + type: SM64:COLLISION + offset: 0x4D20 + symbol: bowser_3_seg7_collision_07004D20 + +bowser_3_seg7_collision_07004DA4: + type: SM64:COLLISION + offset: 0x4DA4 + symbol: bowser_3_seg7_collision_07004DA4 + +bowser_3_seg7_collision_07004E28: + type: SM64:COLLISION + offset: 0x4E28 + symbol: bowser_3_seg7_collision_07004E28 + +bowser_3_seg7_collision_07004EAC: + type: SM64:COLLISION + offset: 0x4EAC + symbol: bowser_3_seg7_collision_07004EAC + +bowser_3_seg7_collision_07004F30: + type: SM64:COLLISION + offset: 0x4F30 + symbol: bowser_3_seg7_collision_07004F30 + +bowser_3_seg7_collision_07004FB4: + type: SM64:COLLISION + offset: 0x4FB4 + symbol: bowser_3_seg7_collision_07004FB4 + +bowser_3_seg7_collision_07005038: + type: SM64:COLLISION + offset: 0x5038 + symbol: bowser_3_seg7_collision_07005038 + diff --git a/assets/ymls/us/levels/castle_courtyard.yml b/assets/ymls/us/levels/castle_courtyard.yml index ccef5d84..8a93bb05 100644 --- a/assets/ymls/us/levels/castle_courtyard.yml +++ b/assets/ymls/us/levels/castle_courtyard.yml @@ -565,3 +565,8 @@ castle_courtyard_seg7_dl_07005698: offset: 0x5698 symbol: castle_courtyard_seg7_dl_07005698 +castle_courtyard_seg7_collision_level: + type: SM64:COLLISION + offset: 0x59A8 + symbol: castle_courtyard_seg7_collision_level + diff --git a/assets/ymls/us/levels/castle_grounds.yml b/assets/ymls/us/levels/castle_grounds.yml index 1f810866..1f9f3162 100644 --- a/assets/ymls/us/levels/castle_grounds.yml +++ b/assets/ymls/us/levels/castle_grounds.yml @@ -1259,3 +1259,18 @@ castle_grounds_seg7_dl_0700B1D0: offset: 0xB1D0 symbol: castle_grounds_seg7_dl_0700B1D0 +castle_grounds_seg7_collision_level: + type: SM64:COLLISION + offset: 0xF3A0 + symbol: castle_grounds_seg7_collision_level + +castle_grounds_seg7_moat_grills: + type: SM64:COLLISION + offset: 0x1166C + symbol: castle_grounds_seg7_moat_grills + +castle_grounds_seg7_cannon_grill: + type: SM64:COLLISION + offset: 0x116C8 + symbol: castle_grounds_seg7_cannon_grill + diff --git a/assets/ymls/us/levels/castle_inside.yml b/assets/ymls/us/levels/castle_inside.yml index 4938e32b..89a4a6a0 100644 --- a/assets/ymls/us/levels/castle_inside.yml +++ b/assets/ymls/us/levels/castle_inside.yml @@ -7931,3 +7931,43 @@ inside_castle_seg7_dl_07068B10: offset: 0x68B10 symbol: inside_castle_seg7_dl_07068B10 +inside_castle_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0x68B88 + symbol: inside_castle_seg7_area_1_collision + +inside_castle_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0x6E364 + symbol: inside_castle_seg7_area_2_collision + +inside_castle_seg7_area_3_collision: + type: SM64:COLLISION + offset: 0x73AAC + symbol: inside_castle_seg7_area_3_collision + +inside_castle_seg7_collision_ddd_warp: + type: SM64:COLLISION + offset: 0x775B4 + symbol: inside_castle_seg7_collision_ddd_warp + +inside_castle_seg7_collision_ddd_warp_2: + type: SM64:COLLISION + offset: 0x7768C + symbol: inside_castle_seg7_collision_ddd_warp_2 + +inside_castle_seg7_collision_floor_trap: + type: SM64:COLLISION + offset: 0x78DE4 + symbol: inside_castle_seg7_collision_floor_trap + +inside_castle_seg7_collision_star_door: + type: SM64:COLLISION + offset: 0x78E14 + symbol: inside_castle_seg7_collision_star_door + +inside_castle_seg7_collision_water_level_pillar: + type: SM64:COLLISION + offset: 0x78E80 + symbol: inside_castle_seg7_collision_water_level_pillar + diff --git a/assets/ymls/us/levels/jrb.yml b/assets/ymls/us/levels/jrb.yml index 693713ab..b636a8ec 100644 --- a/assets/ymls/us/levels/jrb.yml +++ b/assets/ymls/us/levels/jrb.yml @@ -1451,3 +1451,58 @@ jrb_seg7_dl_0700AFB0: offset: 0xAFB0 symbol: jrb_seg7_dl_0700AFB0 +jrb_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0xB058 + symbol: jrb_seg7_area_1_collision + +jrb_seg7_collision_rock_solid: + type: SM64:COLLISION + offset: 0xC758 + symbol: jrb_seg7_collision_rock_solid + +jrb_seg7_collision_floating_platform: + type: SM64:COLLISION + offset: 0xC824 + symbol: jrb_seg7_collision_floating_platform + +jrb_seg7_collision_floating_box: + type: SM64:COLLISION + offset: 0xC8A8 + symbol: jrb_seg7_collision_floating_box + +jrb_seg7_collision_in_sunken_ship_3: + type: SM64:COLLISION + offset: 0xC92C + symbol: jrb_seg7_collision_in_sunken_ship_3 + +jrb_seg7_collision_in_sunken_ship: + type: SM64:COLLISION + offset: 0xCE5C + symbol: jrb_seg7_collision_in_sunken_ship + +jrb_seg7_collision_0700CEF0: + type: SM64:COLLISION + offset: 0xCEF0 + symbol: jrb_seg7_collision_0700CEF0 + +jrb_seg7_collision_in_sunken_ship_2: + type: SM64:COLLISION + offset: 0xCF80 + symbol: jrb_seg7_collision_in_sunken_ship_2 + +jrb_seg7_collision_pillar_base: + type: SM64:COLLISION + offset: 0xD198 + symbol: jrb_seg7_collision_pillar_base + +jrb_seg7_collision_0700D1DC: + type: SM64:COLLISION + offset: 0xD1DC + symbol: jrb_seg7_collision_0700D1DC + +jrb_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0x105B8 + symbol: jrb_seg7_area_2_collision + diff --git a/assets/ymls/us/levels/lll.yml b/assets/ymls/us/levels/lll.yml index fff63533..8024ccd7 100644 --- a/assets/ymls/us/levels/lll.yml +++ b/assets/ymls/us/levels/lll.yml @@ -2511,3 +2511,83 @@ lll_seg7_dl_07018380: offset: 0x18380 symbol: lll_seg7_dl_07018380 +lll_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0x1ADE8 + symbol: lll_seg7_area_1_collision + +lll_seg7_collision_octagonal_moving_platform: + type: SM64:COLLISION + offset: 0x1CF88 + symbol: lll_seg7_collision_octagonal_moving_platform + +lll_seg7_collision_drawbridge: + type: SM64:COLLISION + offset: 0x1D078 + symbol: lll_seg7_collision_drawbridge + +lll_seg7_collision_rotating_fire_bars: + type: SM64:COLLISION + offset: 0x1D0A8 + symbol: lll_seg7_collision_rotating_fire_bars + +lll_seg7_collision_wood_piece: + type: SM64:COLLISION + offset: 0x1D15C + symbol: lll_seg7_collision_wood_piece + +lll_seg7_collision_0701D21C: + type: SM64:COLLISION + offset: 0x1D18C + symbol: lll_seg7_collision_0701D21C + +lll_seg7_collision_rotating_platform: + type: SM64:COLLISION + offset: 0x1D204 + symbol: lll_seg7_collision_rotating_platform + +lll_seg7_collision_slow_tilting_platform: + type: SM64:COLLISION + offset: 0x1D378 + symbol: lll_seg7_collision_slow_tilting_platform + +lll_seg7_collision_sinking_pyramids: + type: SM64:COLLISION + offset: 0x1D3C0 + symbol: lll_seg7_collision_sinking_pyramids + +lll_seg7_collision_inverted_pyramid: + type: SM64:COLLISION + offset: 0x1D480 + symbol: lll_seg7_collision_inverted_pyramid + +lll_seg7_collision_puzzle_piece: + type: SM64:COLLISION + offset: 0x1D4D0 + symbol: lll_seg7_collision_puzzle_piece + +lll_seg7_collision_floating_block: + type: SM64:COLLISION + offset: 0x1D500 + symbol: lll_seg7_collision_floating_block + +lll_seg7_collision_pitoune: + type: SM64:COLLISION + offset: 0x1D578 + symbol: lll_seg7_collision_pitoune + +lll_seg7_collision_hexagonal_platform: + type: SM64:COLLISION + offset: 0x1D68C + symbol: lll_seg7_collision_hexagonal_platform + +lll_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0x25EF0 + symbol: lll_seg7_area_2_collision + +lll_seg7_collision_falling_wall: + type: SM64:COLLISION + offset: 0x2844C + symbol: lll_seg7_collision_falling_wall + diff --git a/assets/ymls/us/levels/pss.yml b/assets/ymls/us/levels/pss.yml index 4fd926b9..487f8a23 100644 --- a/assets/ymls/us/levels/pss.yml +++ b/assets/ymls/us/levels/pss.yml @@ -1147,3 +1147,8 @@ pss_seg7_dl_0700DAD8: offset: 0xDAD8 symbol: pss_seg7_dl_0700DAD8 +pss_seg7_collision: + type: SM64:COLLISION + offset: 0xE490 + symbol: pss_seg7_collision + diff --git a/assets/ymls/us/levels/rr.yml b/assets/ymls/us/levels/rr.yml index 946e5c48..3d7e91fa 100644 --- a/assets/ymls/us/levels/rr.yml +++ b/assets/ymls/us/levels/rr.yml @@ -3982,3 +3982,83 @@ rr_seg7_dl_07028FA8: # offset: 0xDBD8 # symbol: rr_seg7_dl_0700DBD8 +rr_seg7_collision_07029038: + type: SM64:COLLISION + offset: 0x28e50 + symbol: rr_seg7_collision_07029038 + +rr_seg7_collision_pendulum: + type: SM64:COLLISION + offset: 0x28F6C + symbol: rr_seg7_collision_pendulum + +rr_seg7_collision_rotating_platform_with_fire: + type: SM64:COLLISION + offset: 0x29120 + symbol: rr_seg7_collision_rotating_platform_with_fire + +rr_seg7_collision_07029508: + type: SM64:COLLISION + offset: 0x29320 + symbol: rr_seg7_collision_07029508 + +rr_seg7_collision_070295F8: + type: SM64:COLLISION + offset: 0x29410 + symbol: rr_seg7_collision_070295F8 + +rr_seg7_collision_0702967C: + type: SM64:COLLISION + offset: 0x29494 + symbol: rr_seg7_collision_0702967C + +rr_seg7_collision_elevator_platform: + type: SM64:COLLISION + offset: 0x294E4 + symbol: rr_seg7_collision_elevator_platform + +rr_seg7_collision_07029750: + type: SM64:COLLISION + offset: 0x29568 + symbol: rr_seg7_collision_07029750 + +rr_seg7_collision_donut_platform: + type: SM64:COLLISION + offset: 0x295EC + symbol: rr_seg7_collision_donut_platform + +rr_seg7_collision_07029858: + type: SM64:COLLISION + offset: 0x29670 + symbol: rr_seg7_collision_07029858 + +rr_seg7_collision_07029924: + type: SM64:COLLISION + offset: 0x2973C + symbol: rr_seg7_collision_07029924 + +rr_seg7_collision_07029C1C: + type: SM64:COLLISION + offset: 0x29A34 + symbol: rr_seg7_collision_07029C1C + +rr_seg7_collision_07029FA4: + type: SM64:COLLISION + offset: 0x29DBC + symbol: rr_seg7_collision_07029FA4 + +rr_seg7_collision_0702A32C: + type: SM64:COLLISION + offset: 0x2A144 + symbol: rr_seg7_collision_0702A32C + +rr_seg7_collision_0702A6B4: + type: SM64:COLLISION + offset: 0x2A4CC + symbol: rr_seg7_collision_0702A6B4 + +rr_seg7_collision_level: + type: SM64:COLLISION + offset: 0x2A7C0 + symbol: rr_seg7_collision_level + diff --git a/assets/ymls/us/levels/sa.yml b/assets/ymls/us/levels/sa.yml index a0cbff27..90c08e78 100644 --- a/assets/ymls/us/levels/sa.yml +++ b/assets/ymls/us/levels/sa.yml @@ -275,3 +275,8 @@ sa_seg7_dl_07002FD0: offset: 0x2FD0 symbol: sa_seg7_dl_07002FD0 +sa_seg7_collision: + type: SM64:COLLISION + offset: 0x3000 + symbol: bbh_seg7_collision + diff --git a/assets/ymls/us/levels/sl.yml b/assets/ymls/us/levels/sl.yml index 731078cf..fa18c9ce 100644 --- a/assets/ymls/us/levels/sl.yml +++ b/assets/ymls/us/levels/sl.yml @@ -1178,3 +1178,23 @@ sl_seg7_dl_0700A890: offset: 0xA890 symbol: sl_seg7_dl_0700A890 +sl_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0xCBD8 + symbol: sl_seg7_area_1_collision + +sl_seg7_collision_sliding_snow_mound: + type: SM64:COLLISION + offset: 0xEF6C + symbol: sl_seg7_collision_sliding_snow_mound + +sl_seg7_collision_pound_explodes: + type: SM64:COLLISION + offset: 0xEFC0 + symbol: sl_seg7_collision_pound_explodes + +sl_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0xEFFC + symbol: sl_seg7_area_2_collision + diff --git a/assets/ymls/us/levels/ssl.yml b/assets/ymls/us/levels/ssl.yml index f80cf382..c9eaed37 100644 --- a/assets/ymls/us/levels/ssl.yml +++ b/assets/ymls/us/levels/ssl.yml @@ -2511,3 +2511,69 @@ ssl_seg7_dl_0700FCE0: offset: 0xFCE0 symbol: ssl_seg7_dl_0700FCE0 +ssl_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0xFD80 + symbol: ssl_seg7_area_1_collision + +ssl_seg7_collision_pyramid_top: + type: SM64:COLLISION + offset: 0x125F4 + symbol: ssl_seg7_collision_pyramid_top + +ssl_seg7_collision_tox_box: + type: SM64:COLLISION + offset: 0x12644 + symbol: ssl_seg7_collision_tox_box + +ssl_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0x23678 + symbol: ssl_seg7_area_2_collision + +ssl_seg7_area_3_collision: + type: SM64:COLLISION + offset: 0x275BC + symbol: ssl_seg7_area_3_collision + +ssl_seg7_collision_grindel: + type: SM64:COLLISION + offset: 0x27ED0 + symbol: ssl_seg7_collision_grindel + +ssl_seg7_collision_spindel: + type: SM64:COLLISION + offset: 0x27F54 + symbol: ssl_seg7_collision_spindel + +ssl_seg7_collision_0702808C: + type: SM64:COLLISION + offset: 0x2808C + symbol: ssl_seg7_collision_0702808C + +ssl_seg7_collision_pyramid_elevator: + type: SM64:COLLISION + offset: 0x28110 + symbol: ssl_seg7_collision_pyramid_elevator + +ssl_seg7_collision_07028274: + type: SM64:COLLISION + offset: 0x28274 + symbol: ssl_seg7_collision_07028274 + +ssl_seg7_collision_070282F8: + type: SM64:COLLISION + offset: 0x282F8 + symbol: ssl_seg7_collision_070282F8 + +ssl_seg7_collision_07028370: + type: SM64:COLLISION + offset: 0x28370 + symbol: ssl_seg7_collision_07028370 + +ssl_seg7_collision_070284B0: + type: SM64:COLLISION + offset: 0x284B0 + symbol: ssl_seg7_collision_070284B0 + + diff --git a/assets/ymls/us/levels/thi.yml b/assets/ymls/us/levels/thi.yml index 33b02d39..3101775b 100644 --- a/assets/ymls/us/levels/thi.yml +++ b/assets/ymls/us/levels/thi.yml @@ -1108,3 +1108,23 @@ thi_seg7_dl_07007538: offset: 0x7538 symbol: thi_seg7_dl_07007538 +thi_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0x9FC8 + symbol: thi_seg7_area_1_collision + +thi_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0xBD60 + symbol: thi_seg7_area_2_collision + +thi_seg7_area_3_collision: + type: SM64:COLLISION + offset: 0xD444 + symbol: thi_seg7_area_3_collision + +thi_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0xE228 + symbol: thi_seg7_area_1_collision + diff --git a/assets/ymls/us/levels/totwc.yml b/assets/ymls/us/levels/totwc.yml index 4cdc3a73..65187c00 100644 --- a/assets/ymls/us/levels/totwc.yml +++ b/assets/ymls/us/levels/totwc.yml @@ -493,3 +493,8 @@ totwc_seg7_dl_070079A8: offset: 0x79A8 symbol: totwc_seg7_dl_070079A8 +totwc_seg7_collision: + type: SM64:COLLISION + offset: 0x7A18 + symbol: totwc_seg7_collision + diff --git a/assets/ymls/us/levels/ttc.yml b/assets/ymls/us/levels/ttc.yml index 27583c55..8d9b55dd 100644 --- a/assets/ymls/us/levels/ttc.yml +++ b/assets/ymls/us/levels/ttc.yml @@ -1857,3 +1857,73 @@ ttc_seg7_dl_0700EFE0: offset: 0xEFE0 symbol: ttc_seg7_dl_0700EFE0 +ttc_seg7_collision_level: + type: SM64:COLLISION + offset: 0x12330 + symbol: ttc_seg7_collision_level + +ttc_seg7_collision_07014F70: + type: SM64:COLLISION + offset: 0x14F70 + symbol: ttc_seg7_collision_07014F70 + +ttc_seg7_collision_07015008: + type: SM64:COLLISION + offset: 0x15008 + symbol: ttc_seg7_collision_07015008 + +ttc_seg7_collision_clock_pendulum: + type: SM64:COLLISION + offset: 0x1508C + symbol: ttc_seg7_collision_clock_pendulum + +ttc_seg7_collision_070152B4: + type: SM64:COLLISION + offset: 0x152B4 + symbol: ttc_seg7_collision_070152B4 + +ttc_seg7_collision_070153E0: + type: SM64:COLLISION + offset: 0x153E0 + symbol: ttc_seg7_collision_070153E0 + +ttc_seg7_collision_sliding_surface: + type: SM64:COLLISION + offset: 0x1550C + symbol: ttc_seg7_collision_sliding_surface + +ttc_seg7_collision_07015584: + type: SM64:COLLISION + offset: 0x15584 + symbol: ttc_seg7_collision_07015584 + +ttc_seg7_collision_07015650: + type: SM64:COLLISION + offset: 0x15650 + symbol: ttc_seg7_collision_07015650 + +ttc_seg7_collision_07015754: + type: SM64:COLLISION + offset: 0x15754 + symbol: ttc_seg7_collision_07015754 + +ttc_seg7_collision_070157D8: + type: SM64:COLLISION + offset: 0x157D8 + symbol: ttc_seg7_collision_070157D8 + +ttc_seg7_collision_clock_platform: + type: SM64:COLLISION + offset: 0x1585C + symbol: ttc_seg7_collision_clock_platform + +ttc_seg7_collision_clock_main_rotation: + type: SM64:COLLISION + offset: 0x158E0 + symbol: ttc_seg7_collision_clock_main_rotation + +ttc_seg7_collision_rotating_clock_platform2: + type: SM64:COLLISION + offset: 0x159D0 + symbol: ttc_seg7_collision_rotating_clock_platform2 + diff --git a/assets/ymls/us/levels/ttm.yml b/assets/ymls/us/levels/ttm.yml index 732cb8ed..5740d00b 100644 --- a/assets/ymls/us/levels/ttm.yml +++ b/assets/ymls/us/levels/ttm.yml @@ -4166,3 +4166,38 @@ ttm_seg7_dl_07013430: offset: 0x13430 symbol: ttm_seg7_dl_07013430 +ttm_seg7_collision_pitoune_2: + type: SM64:COLLISION + offset: 0x13678 + symbol: ttm_seg7_collision_pitoune_2 + +ttm_seg7_collision_ukiki_cage: + type: SM64:COLLISION + offset: 0x13790 + symbol: ttm_seg7_collision_ukiki_cage + +ttm_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0x13814 + symbol: ttm_seg7_area_1_collision + +ttm_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0x2BBD0 + symbol: ttm_seg7_area_2_collision + +ttm_seg7_area_3_collision: + type: SM64:COLLISION + offset: 0x2D5EC + symbol: ttm_seg7_area_3_collision + +ttm_seg7_area_4_collision: + type: SM64:COLLISION + offset: 0x2F0F8 + symbol: ttm_seg7_area_4_collision + +ttm_seg7_collision_podium_warp: + type: SM64:COLLISION + offset: 0x3013C + symbol: ttm_seg7_collision_podium_warp + diff --git a/assets/ymls/us/levels/vcutm.yml b/assets/ymls/us/levels/vcutm.yml index 573b7d26..0708e5c0 100644 --- a/assets/ymls/us/levels/vcutm.yml +++ b/assets/ymls/us/levels/vcutm.yml @@ -668,3 +668,13 @@ vcutm_seg7_dl_070080D0: offset: 0x80D0 symbol: vcutm_seg7_dl_070080D0 +vcutm_seg7_collision: + type: SM64:COLLISION + offset: 0x9750 + symbol: vcutm_seg7_collision + +vcutm_seg7_collision_0700AC44: + type: SM64:COLLISION + offset: 0xAC44 + symbol: vcutm_seg7_collision_0700AC44 + diff --git a/assets/ymls/us/levels/wdw.yml b/assets/ymls/us/levels/wdw.yml index ef2107d6..ef5d4a08 100644 --- a/assets/ymls/us/levels/wdw.yml +++ b/assets/ymls/us/levels/wdw.yml @@ -1897,3 +1897,48 @@ wdw_seg7_dl_07013B70: offset: 0x13B70 symbol: wdw_seg7_dl_07013B70 +wdw_seg7_area_1_collision: + type: SM64:COLLISION + offset: 0x14150 + symbol: wdw_seg7_area_1_collision + +wdw_seg7_area_2_collision: + type: SM64:COLLISION + offset: 0x1633C + symbol: wdw_seg7_area_2_collision + +wdw_seg7_collision_square_floating_platform: + type: SM64:COLLISION + offset: 0x183C0 + symbol: wdw_seg7_collision_square_floating_platform + +wdw_seg7_collision_arrow_lift: + type: SM64:COLLISION + offset: 0x18444 + symbol: wdw_seg7_collision_arrow_lift + +wdw_seg7_collision_070184C8: + type: SM64:COLLISION + offset: 0x184C8 + symbol: wdw_seg7_070184C8 + +wdw_seg7_collision_07018528: + type: SM64:COLLISION + offset: 0x18528 + symbol: wdw_seg7_07018528 + +wdw_seg7_collision_express_elevator_platform: + type: SM64:COLLISION + offset: 0x185AC + symbol: wdw_seg7_express_elevator_platform + +wdw_seg7_collision_rect_floating_platform: + type: SM64:COLLISION + offset: 0x18630 + symbol: wdw_seg7_rect_floating_platform + +wdw_seg7_collision_070186B4: + type: SM64:COLLISION + offset: 0x186B4 + symbol: wdw_seg7_070186B4 + diff --git a/assets/ymls/us/levels/wf.yml b/assets/ymls/us/levels/wf.yml index 285bde93..4e63e604 100644 --- a/assets/ymls/us/levels/wf.yml +++ b/assets/ymls/us/levels/wf.yml @@ -1949,3 +1949,78 @@ wf_seg7_dl_0700AFB8: offset: 0xAFB8 symbol: wf_seg7_dl_0700AFB8 +wf_seg7_collision_small_bomp: + type: SM64:COLLISION + offset: 0xF868 + symbol: wf_seg7_collision_small_bomp + +wf_seg7_collision_large_bomp: + type: SM64:COLLISION + offset: 0xF934 + symbol: wf_seg7_collision_large_bomp + +wf_seg7_collision_clocklike_rotation: + type: SM64:COLLISION + offset: 0xFA00 + symbol: wf_seg7_collision_clocklike_rotation + +wf_seg7_collision_sliding_brick_platform: + type: SM64:COLLISION + offset: 0xFAA4 + symbol: wf_seg7_collision_sliding_brick_platform + +wf_seg7_collision_tumbling_bridge: + type: SM64:COLLISION + offset: 0xFAEC + symbol: wf_seg7_collision_tumbling_bridge + +wf_seg7_collision_trapezoid: + type: SM64:COLLISION + offset: 0xFB1C + symbol: wf_seg7_collision_trapezoid + +wf_seg7_collision_platform: + type: SM64:COLLISION + offset: 0xFB94 + symbol: wf_seg7_collision_platform + +wf_seg7_collision_breakable_wall: + type: SM64:COLLISION + offset: 0xFC0C + symbol: wf_seg7_collision_breakable_wall + +wf_seg7_collision_breakable_wall_2: + type: SM64:COLLISION + offset: 0xFC44 + symbol: wf_seg7_collision_breakable_wall_2 + +wf_seg7_collision_kickable_board: + type: SM64:COLLISION + offset: 0xFC7C + symbol: wf_seg7_collision_kickable_board + +wf_seg7_collision_tower_door: + type: SM64:COLLISION + offset: 0xFD00 + symbol: wf_seg7_collision_tower_door + +wf_seg7_collision_rotating_platform: + type: SM64:COLLISION + offset: 0xFD30 + symbol: wf_seg7_collision_rotating_platform + +wf_seg7_collision_tower: + type: SM64:COLLISION + offset: 0xFE14 + symbol: wf_seg7_collision_tower + +wf_seg7_collision_bullet_bill_cannon: + type: SM64:COLLISION + offset: 0x10260 + symbol: wf_seg7_collision_bullet_bill_cannon + +wf_seg7_collision_070102D8: + type: SM64:COLLISION + offset: 0x102D8 + symbol: wf_seg7_collision_070102D8 + diff --git a/assets/ymls/us/levels/wmotr.yml b/assets/ymls/us/levels/wmotr.yml index 5965c95e..ea63271c 100644 --- a/assets/ymls/us/levels/wmotr.yml +++ b/assets/ymls/us/levels/wmotr.yml @@ -1164,3 +1164,8 @@ wmotr_seg7_dl_07010608: offset: 0x10608 symbol: wmotr_seg7_dl_07010608 +wmotr_seg7_collision: + type: SM64:COLLISION + offset: 0x10688 + symbol: wmotr_seg7_collision +