From 6a05a30da4a4964412085acb74a0b1b47734914f Mon Sep 17 00:00:00 2001 From: Malkierian Date: Sat, 8 Jun 2024 21:31:41 -0700 Subject: [PATCH] HMC collision, macros, and trajectories added. --- assets/ymls/jp/levels/bbh.yml | 5 ++ assets/ymls/jp/levels/bitdw.yml | 5 ++ assets/ymls/jp/levels/bitfs.yml | 10 +++ assets/ymls/jp/levels/bits.yml | 5 ++ assets/ymls/jp/levels/bob.yml | 20 ++++++ assets/ymls/jp/levels/castle_courtyard.yml | 5 ++ assets/ymls/jp/levels/castle_grounds.yml | 5 ++ assets/ymls/jp/levels/castle_inside.yml | 72 ++++++++++++++++++++ assets/ymls/jp/levels/ccm.yml | 24 +++++++ assets/ymls/jp/levels/cotmc.yml | 4 ++ assets/ymls/jp/levels/ddd.yml | 9 +++ assets/ymls/jp/levels/hmc.yml | 35 ++++++++++ assets/ymls/jp/levels/jrb.yml | 19 ++++++ assets/ymls/jp/levels/lll.yml | 19 ++++++ assets/ymls/jp/levels/pss.yml | 4 ++ assets/ymls/jp/levels/rr.yml | 24 +++++++ assets/ymls/jp/levels/sa.yml | 4 ++ assets/ymls/jp/levels/sl.yml | 9 +++ assets/ymls/jp/levels/ssl.yml | 14 ++++ assets/ymls/jp/levels/thi.yml | 19 ++++++ assets/ymls/jp/levels/totwc.yml | 4 ++ assets/ymls/jp/levels/ttc.yml | 4 ++ assets/ymls/jp/levels/ttm.yml | 24 +++++++ assets/ymls/jp/levels/vcutm.yml | 4 ++ assets/ymls/jp/levels/wdw.yml | 9 +++ assets/ymls/jp/levels/wf.yml | 4 ++ assets/ymls/jp/levels/wmotr.yml | 4 ++ assets/ymls/us/levels/bbh.yml | 5 ++ assets/ymls/us/levels/bitdw.yml | 4 ++ assets/ymls/us/levels/bitfs.yml | 10 +++ assets/ymls/us/levels/bits.yml | 5 ++ assets/ymls/us/levels/bob.yml | 20 ++++++ assets/ymls/us/levels/castle_courtyard.yml | 5 ++ assets/ymls/us/levels/castle_grounds.yml | 5 ++ assets/ymls/us/levels/castle_inside.yml | 76 ++++++++++++++++++++++ assets/ymls/us/levels/ccm.yml | 24 +++++++ assets/ymls/us/levels/cotmc.yml | 4 ++ assets/ymls/us/levels/ddd.yml | 9 +++ assets/ymls/us/levels/hmc.yml | 34 ++++++++++ assets/ymls/us/levels/jrb.yml | 19 ++++++ assets/ymls/us/levels/lll.yml | 19 ++++++ assets/ymls/us/levels/pss.yml | 4 ++ assets/ymls/us/levels/rr.yml | 24 +++++++ assets/ymls/us/levels/sa.yml | 4 ++ assets/ymls/us/levels/sl.yml | 9 +++ assets/ymls/us/levels/ssl.yml | 14 ++++ assets/ymls/us/levels/thi.yml | 19 ++++++ assets/ymls/us/levels/totwc.yml | 4 ++ assets/ymls/us/levels/ttc.yml | 5 ++ assets/ymls/us/levels/ttm.yml | 24 +++++++ assets/ymls/us/levels/vcutm.yml | 4 ++ assets/ymls/us/levels/wdw.yml | 9 +++ assets/ymls/us/levels/wf.yml | 4 ++ assets/ymls/us/levels/wmotr.yml | 4 ++ 54 files changed, 731 insertions(+) diff --git a/assets/ymls/jp/levels/bbh.yml b/assets/ymls/jp/levels/bbh.yml index 8570974d..48b8f3d9 100644 --- a/assets/ymls/jp/levels/bbh.yml +++ b/assets/ymls/jp/levels/bbh.yml @@ -3521,3 +3521,8 @@ bbh_seg7_collision_coffin: type: SM64:COLLISION offset: 0x26D18 symbol: bbh_seg7_collision_coffin + +bbh_seg7_macro_objs: + type: SM64:MACRO + offset: 0x268C4 + symbol: bbh_seg7_macro_objs diff --git a/assets/ymls/jp/levels/bitdw.yml b/assets/ymls/jp/levels/bitdw.yml index afd71634..a8767639 100644 --- a/assets/ymls/jp/levels/bitdw.yml +++ b/assets/ymls/jp/levels/bitdw.yml @@ -1412,3 +1412,8 @@ bitdw_seg7_collision_0700FD9C: offset: 0xFD9C symbol: bitdw_seg7_collision_0700FD9C +bitdw_seg7_macro_objs: + type: SM64:MACRO + offset: 0xF438 + symbol: bitdw_seg7_macro_objs + diff --git a/assets/ymls/jp/levels/bitfs.yml b/assets/ymls/jp/levels/bitfs.yml index 6b69e2b9..0b60d9b0 100644 --- a/assets/ymls/jp/levels/bitfs.yml +++ b/assets/ymls/jp/levels/bitfs.yml @@ -1897,3 +1897,13 @@ bitfs_seg7_collision_07015928: offset: 0x15928 symbol: bitfs_seg7_collision_07015928 +bitfs_seg7_trajectory_070159AC: + type: SM64:TRAJECTORY + offset: 0x159AC + symbol: bitfs_seg7_trajectory_070159AC + +bitfs_seg7_macro_objs: + type: SM64:MACRO + offset: 0x14F90 + symbol: bitfs_seg7_macro_objs + diff --git a/assets/ymls/jp/levels/bits.yml b/assets/ymls/jp/levels/bits.yml index 83486a93..96ae1c91 100644 --- a/assets/ymls/jp/levels/bits.yml +++ b/assets/ymls/jp/levels/bits.yml @@ -2260,3 +2260,8 @@ bits_seg7_collision_0701B734: offset: 0x1B734 symbol: bits_seg7_collision_0701B734 +bits_seg7_macro_objs: + type: SM64:MACRO + offset: 0x1A76C + symbol: bits_seg7_macro_objs + diff --git a/assets/ymls/jp/levels/bob.yml b/assets/ymls/jp/levels/bob.yml index 198cb6d9..d61653b2 100644 --- a/assets/ymls/jp/levels/bob.yml +++ b/assets/ymls/jp/levels/bob.yml @@ -1253,3 +1253,23 @@ bob_seg7_collision_gate: offset: 0x11474 symbol: bob_seg7_collision_gate +bob_seg7_metal_ball_path0: + type: SM64:TRAJECTORY + offset: 0x11530 + symbol: bob_seg7_metal_ball_path0 + +bob_seg7_metal_ball_path1: + type: SM64:TRAJECTORY + offset: 0x115C4 + symbol: bob_seg7_metal_ball_path1 + +bob_seg7_trajectory_koopa: + type: SM64:TRAJECTORY + offset: 0x116A0 + symbol: bob_seg7_trajectory_koopa + +bob_seg7_macro_objs: + type: SM64:MACRO + offset: 0x1104C + symbol: bob_seg7_macro_objs + diff --git a/assets/ymls/jp/levels/castle_courtyard.yml b/assets/ymls/jp/levels/castle_courtyard.yml index aaec83c1..67af8b5c 100644 --- a/assets/ymls/jp/levels/castle_courtyard.yml +++ b/assets/ymls/jp/levels/castle_courtyard.yml @@ -570,3 +570,8 @@ castle_courtyard_seg7_collision_level: offset: 0x59A8 symbol: castle_courtyard_seg7_collision_level +castle_courtyard_seg7_macro_objs: + type: SM64:MACRO + offset: 0x6E20 + symbol: castle_courtyard_seg7_macro_objs + diff --git a/assets/ymls/jp/levels/castle_grounds.yml b/assets/ymls/jp/levels/castle_grounds.yml index 1561a72a..b874a82b 100644 --- a/assets/ymls/jp/levels/castle_grounds.yml +++ b/assets/ymls/jp/levels/castle_grounds.yml @@ -1266,3 +1266,8 @@ castle_grounds_seg7_cannon_grill: offset: 0x10E10 symbol: castle_grounds_seg7_cannon_grill +castle_grounds_seg7_macro_objs: + type: SM64:MACRO + offset: 0x10D08 + symbol: castle_grounds_seg7_macro_objs + diff --git a/assets/ymls/jp/levels/castle_inside.yml b/assets/ymls/jp/levels/castle_inside.yml index 2f853e2b..6fa018a7 100644 --- a/assets/ymls/jp/levels/castle_inside.yml +++ b/assets/ymls/jp/levels/castle_inside.yml @@ -8121,3 +8121,75 @@ inside_castle_seg7_collision_water_level_pillar: offset: 0x78E80 symbol: inside_castle_seg7_collision_water_level_pillar +inside_castle_seg7_trajectory_mips_0: + type: SM64:TRAJECTORY + offset: 0x78EF8 + symbol: inside_castle_seg7_trajectory_mips_0 + +inside_castle_seg7_trajectory_mips_1: + type: SM64:TRAJECTORY + offset: 0x78F2C + symbol: inside_castle_seg7_trajectory_mips_1 + +inside_castle_seg7_trajectory_mips_2: + type: SM64:TRAJECTORY + offset: 0x78F68 + symbol: inside_castle_seg7_trajectory_mips_2 + +inside_castle_seg7_trajectory_mips_3: + type: SM64:TRAJECTORY + offset: 0x78F7C + symbol: inside_castle_seg7_trajectory_mips_3 + +inside_castle_seg7_trajectory_mips_4: + type: SM64:TRAJECTORY + offset: 0x78FA8 + symbol: inside_castle_seg7_trajectory_mips_4 + +inside_castle_seg7_trajectory_mips_5: + type: SM64:TRAJECTORY + offset: 0x78FD4 + symbol: inside_castle_seg7_trajectory_mips_5 + +inside_castle_seg7_trajectory_mips_6: + type: SM64:TRAJECTORY + offset: 0x78FE8 + symbol: inside_castle_seg7_trajectory_mips_6 + +inside_castle_seg7_trajectory_mips_7: + type: SM64:TRAJECTORY + offset: 0x79004 + symbol: inside_castle_seg7_trajectory_mips_7 + +inside_castle_seg7_trajectory_mips_8: + type: SM64:TRAJECTORY + offset: 0x79020 + symbol: inside_castle_seg7_trajectory_mips_8 + +inside_castle_seg7_trajectory_mips_9: + type: SM64:TRAJECTORY + offset: 0x79044 + symbol: inside_castle_seg7_trajectory_mips_9 + +inside_castle_seg7_trajectory_mips: + type: ASSET_ARRAY + assetType: Trajectory + factoryType: SM64:TRAJECTORY + count: 10 + offset: 0x79068 + symbol: inside_castle_seg7_trajectory_mips + +inside_castle_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0x77764 + symbol: inside_castle_seg7_area_1_macro_objs + +inside_castle_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x777E0 + symbol: inside_castle_seg7_area_2_macro_objs + +inside_castle_seg7_area_3_macro_objs: + type: SM64:MACRO + offset: 0x777EC + symbol: inside_castle_seg7_area_3_macro_objs diff --git a/assets/ymls/jp/levels/ccm.yml b/assets/ymls/jp/levels/ccm.yml index ee4c946d..2c095c75 100644 --- a/assets/ymls/jp/levels/ccm.yml +++ b/assets/ymls/jp/levels/ccm.yml @@ -2693,3 +2693,27 @@ ccm_seg7_area_2_collision: offset: 0x20880 symbol: ccm_seg7_area_2_collision +ccm_seg7_trajectory_snowman: + type: SM64:TRAJECTORY + offset: 0x165A8 + symbol: ccm_seg7_trajectory_snowman + +ccm_seg7_trajectory_0701669C: + type: SM64:TRAJECTORY + offset: 0x1669C + symbol: ccm_seg7_trajectory_0701669C + +ccm_seg7_trajectory_penguin_race: + type: SM64:TRAJECTORY + offset: 0x23604 + symbol: ccm_seg7_trajectory_penguin_race + +ccm_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0x16284 + symbol: ccm_seg7_area_1_macro_objs + +ccm_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x23468 + symbol: ccm_seg7_area_2_macro_objs diff --git a/assets/ymls/jp/levels/cotmc.yml b/assets/ymls/jp/levels/cotmc.yml index b239b5b4..79bb3d3e 100644 --- a/assets/ymls/jp/levels/cotmc.yml +++ b/assets/ymls/jp/levels/cotmc.yml @@ -755,3 +755,7 @@ cotmc_seg7_collision_level: offset: 0xA508 symbol: cotmc_seg7_collision_level +cotmc_seg7_macro_objs: + type: SM64:MACRO + offset: 0xBD38 + symbol: cotmc_seg7_macro_objs diff --git a/assets/ymls/jp/levels/ddd.yml b/assets/ymls/jp/levels/ddd.yml index efc91277..f3350a30 100644 --- a/assets/ymls/jp/levels/ddd.yml +++ b/assets/ymls/jp/levels/ddd.yml @@ -1189,3 +1189,12 @@ ddd_seg7_collision_bowser_sub_door: offset: 0xFC48 symbol: ddd_seg7_collision_bowser_sub_door +ddd_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0xEEF4 + symbol: ddd_seg7_area_1_macro_objs + +ddd_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0xEFAC + symbol: ddd_seg7_area_2_macro_objs diff --git a/assets/ymls/jp/levels/hmc.yml b/assets/ymls/jp/levels/hmc.yml index ff67803b..4fa279f1 100644 --- a/assets/ymls/jp/levels/hmc.yml +++ b/assets/ymls/jp/levels/hmc.yml @@ -3260,3 +3260,38 @@ hmc_seg7_painting_dl_070254E0: type: GFX offset: 0x254E0 symbol: hmc_seg7_painting_dl_070254E0 + +hmc_seg7_collision_level: + type: SM64:COLLISION + offset: 0x25594 + symbol: hmc_seg7_collision_level + +hmc_seg7_collision_elevator: + type: SM64:COLLISION + offset: 0x2B5E4 + symbol: hmc_seg7_collision_elevator + +hmc_seg7_collision_0702B65C: + type: SM64:COLLISION + offset: 0x2B65C + symbol: hmc_seg7_collision_0702B65C + +hmc_seg7_collision_controllable_platform: + type: SM64:COLLISION + offset: 0x2B6E0 + symbol: hmc_seg7_collision_controllable_platform + +hmc_seg7_collision_controllable_platform_sub: + type: SM64:COLLISION + offset: 0x2B7F4 + symbol: hmc_seg7_collision_controllable_platform_sub + +hmc_seg7_trajectory_0702B86C: + type: SM64:TRAJECTORY + offset: 0x2B86C + symbol: hmc_seg7_trajectory_0702B86C + +hmc_seg7_macro_objs: + type: SM64:MACRO + offset: 0x2AA78 + symbol: hmc_seg7_macro_objs diff --git a/assets/ymls/jp/levels/jrb.yml b/assets/ymls/jp/levels/jrb.yml index fdf17ee8..e87abecc 100644 --- a/assets/ymls/jp/levels/jrb.yml +++ b/assets/ymls/jp/levels/jrb.yml @@ -1510,3 +1510,22 @@ jrb_seg7_area_2_collision: offset: 0x105B8 symbol: jrb_seg7_area_2_collision +jrb_seg7_trajectory_unagi_1: + type: SM64:TRAJECTORY + offset: 0xD20C + symbol: jrb_seg7_trajectory_unagi_1 + +jrb_seg7_trajectory_unagi_2: + type: SM64:TRAJECTORY + offset: 0xD240 + symbol: jrb_seg7_trajectory_unagi_2 + +jrb_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0xC4E8 + symbol: jrb_seg7_area_1_macro_objs + +jrb_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x11370 + symbol: jrb_seg7_area_2_macro_objs diff --git a/assets/ymls/jp/levels/lll.yml b/assets/ymls/jp/levels/lll.yml index 12104532..9ea896bd 100644 --- a/assets/ymls/jp/levels/lll.yml +++ b/assets/ymls/jp/levels/lll.yml @@ -2624,3 +2624,22 @@ lll_seg7_collision_falling_wall: offset: 0x284DC symbol: lll_seg7_collision_falling_wall +lll_seg7_trajectory_0702856C: + type: SM64:TRAJECTORY + offset: 0x2856C + symbol: lll_seg7_trajectory_0702856C + +lll_seg7_trajectory_07028660: + type: SM64:TRAJECTORY + offset: 0x28660 + symbol: lll_seg7_trajectory_07028660 + +lll_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0x1CE18 + symbol: lll_seg7_area_1_macro_objs + +lll_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x283D4 + symbol: lll_seg7_area_2_macro_objs diff --git a/assets/ymls/jp/levels/pss.yml b/assets/ymls/jp/levels/pss.yml index f4c0bcdc..ac47baf3 100644 --- a/assets/ymls/jp/levels/pss.yml +++ b/assets/ymls/jp/levels/pss.yml @@ -1155,3 +1155,7 @@ pss_seg7_collision: offset: 0xE490 symbol: pss_seg7_collision +pss_seg7_macro_objs: + type: SM64:MACRO + offset: 0x10F00 + symbol: pss_seg7_macro_objs diff --git a/assets/ymls/jp/levels/rr.yml b/assets/ymls/jp/levels/rr.yml index a7467df3..6b654566 100644 --- a/assets/ymls/jp/levels/rr.yml +++ b/assets/ymls/jp/levels/rr.yml @@ -3853,3 +3853,27 @@ rr_seg7_collision_level: offset: 0x2A9A8 symbol: rr_seg7_collision_level +rr_seg7_trajectory_0702EC3C: + type: SM64:TRAJECTORY + offset: 0x2EC3C + symbol: rr_seg7_trajectory_0702EC3C + +rr_seg7_trajectory_0702ECC0: + type: SM64:TRAJECTORY + offset: 0x2ECC0 + symbol: rr_seg7_trajectory_0702ECC0 + +rr_seg7_trajectory_0702ED9C: + type: SM64:TRAJECTORY + offset: 0x2ED9C + symbol: rr_seg7_trajectory_0702ED9C + +rr_seg7_trajectory_0702EEE0: + type: SM64:TRAJECTORY + offset: 0x2EEE0 + symbol: rr_seg7_trajectory_0702EEE0 + +rr_seg7_macro_objs: + type: SM64:MACRO + offset: 0x2E9D8 + symbol: rr_seg7_macro_objs diff --git a/assets/ymls/jp/levels/sa.yml b/assets/ymls/jp/levels/sa.yml index 2adf33f7..fe27d0ee 100644 --- a/assets/ymls/jp/levels/sa.yml +++ b/assets/ymls/jp/levels/sa.yml @@ -280,3 +280,7 @@ sa_seg7_collision: offset: 0x3000 symbol: bbh_seg7_collision +sa_seg7_macro_objs: + type: SM64:MACRO + offset: 0x3284 + symbol: sa_seg7_macro_objs diff --git a/assets/ymls/jp/levels/sl.yml b/assets/ymls/jp/levels/sl.yml index 6ffd2a87..3dd34202 100644 --- a/assets/ymls/jp/levels/sl.yml +++ b/assets/ymls/jp/levels/sl.yml @@ -1203,3 +1203,12 @@ sl_seg7_area_2_collision: offset: 0xEFFC symbol: sl_seg7_area_2_collision +sl_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0xED94 + symbol: sl_seg7_area_1_macro_objs + +sl_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0xF978 + symbol: sl_seg7_area_2_macro_objs diff --git a/assets/ymls/jp/levels/ssl.yml b/assets/ymls/jp/levels/ssl.yml index 16a8a0b9..9a0148e4 100644 --- a/assets/ymls/jp/levels/ssl.yml +++ b/assets/ymls/jp/levels/ssl.yml @@ -2587,3 +2587,17 @@ ssl_seg7_collision_070284B0: offset: 0x284B0 symbol: ssl_seg7_collision_070284B0 +ssl_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0x12424 + symbol: ssl_seg7_area_1_macro_objs + +ssl_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x27CD4 + symbol: ssl_seg7_area_2_macro_objs + +ssl_seg7_area_3_macro_objs: + type: SM64:MACRO + offset: 0x27ECC + symbol: ssl_seg7_area_3_macro_objs diff --git a/assets/ymls/jp/levels/thi.yml b/assets/ymls/jp/levels/thi.yml index 5ca22d9c..225412ed 100644 --- a/assets/ymls/jp/levels/thi.yml +++ b/assets/ymls/jp/levels/thi.yml @@ -1130,3 +1130,22 @@ thi_seg7_collision_top_trap: offset: 0xE228 symbol: thi_seg7_collision_top_trap +thi_seg7_trajectory_koopa: + type: SM64:TRAJECTORY + offset: 0xE258 + symbol: thi_seg7_trajectory_koopa + +thi_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0xDD50 + symbol: thi_seg7_area_1_macro_objs + +thi_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0xDEE4 + symbol: thi_seg7_area_2_macro_objs + +thi_seg7_area_3_macro_objs: + type: SM64:MACRO + offset: 0xE190 + symbol: thi_seg7_area_3_macro_objs diff --git a/assets/ymls/jp/levels/totwc.yml b/assets/ymls/jp/levels/totwc.yml index 08f9bde2..867e0a76 100644 --- a/assets/ymls/jp/levels/totwc.yml +++ b/assets/ymls/jp/levels/totwc.yml @@ -502,3 +502,7 @@ totwc_seg7_collision: offset: 0x7A18 symbol: totwc_seg7_collision +totwc_seg7_macro_objs: + type: SM64:MACRO + offset: 0x88AC + symbol: totwc_seg7_macro_objs diff --git a/assets/ymls/jp/levels/ttc.yml b/assets/ymls/jp/levels/ttc.yml index 1142c7cd..d9e4197b 100644 --- a/assets/ymls/jp/levels/ttc.yml +++ b/assets/ymls/jp/levels/ttc.yml @@ -1930,3 +1930,7 @@ ttc_seg7_collision_rotating_clock_platform2: format: RGBA16 symbol: ttc_yellow_triangle +ttc_seg7_macro_objs: + type: SM64:MACRO + offset: 0x15B24 + symbol: ttc_seg7_macro_objs diff --git a/assets/ymls/jp/levels/ttm.yml b/assets/ymls/jp/levels/ttm.yml index a7d14669..62a5e202 100644 --- a/assets/ymls/jp/levels/ttm.yml +++ b/assets/ymls/jp/levels/ttm.yml @@ -4252,3 +4252,27 @@ ttm_seg7_collision_podium_warp: offset: 0x3013C symbol: ttm_seg7_collision_podium_warp +ttm_seg7_trajectory_070170A0: + type: SM64:TRAJECTORY + offset: 0x170A0 + symbol: ttm_seg7_trajectory_070170A0 + +ttm_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0x16F18 + symbol: ttm_seg7_area_1_macro_objs + +ttm_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x302C8 + symbol: ttm_seg7_area_2_macro_objs + +ttm_seg7_area_3_macro_objs: + type: SM64:MACRO + offset: 0x30338 + symbol: ttm_seg7_area_3_macro_objs + +ttm_seg7_area_4_macro_objs: + type: SM64:MACRO + offset: 0x30418 + symbol: ttm_seg7_area_4_macro_objs diff --git a/assets/ymls/jp/levels/vcutm.yml b/assets/ymls/jp/levels/vcutm.yml index 51ffa6c1..fb9772ee 100644 --- a/assets/ymls/jp/levels/vcutm.yml +++ b/assets/ymls/jp/levels/vcutm.yml @@ -682,3 +682,7 @@ vcutm_seg7_collision_0700AC44: offset: 0xAC44 symbol: vcutm_seg7_collision_0700AC44 +vcutm_seg7_macro_objs: + type: SM64:MACRO + offset: 0xAB0C + symbol: vcutm_seg7_macro_objs diff --git a/assets/ymls/jp/levels/wdw.yml b/assets/ymls/jp/levels/wdw.yml index 064f120d..f2b7c0fa 100644 --- a/assets/ymls/jp/levels/wdw.yml +++ b/assets/ymls/jp/levels/wdw.yml @@ -1947,3 +1947,12 @@ wdw_seg7_collision_070186B4: offset: 0x186B4 symbol: wdw_seg7_070186B4 +wdw_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0x160D8 + symbol: wdw_seg7_area_1_macro_objs + +wdw_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x18224 + symbol: wdw_seg7_area_2_macro_objs diff --git a/assets/ymls/jp/levels/wf.yml b/assets/ymls/jp/levels/wf.yml index c7cbe776..55a8aa75 100644 --- a/assets/ymls/jp/levels/wf.yml +++ b/assets/ymls/jp/levels/wf.yml @@ -2030,3 +2030,7 @@ wf_seg7_collision_070102D8: offset: 0x102D8 symbol: wf_seg7_collision_070102D8 +wf_seg7_macro_objs: + type: SM64:MACRO + offset: 0x11C38 + symbol: wf_seg7_macro_objs diff --git a/assets/ymls/jp/levels/wmotr.yml b/assets/ymls/jp/levels/wmotr.yml index 3b2f44e7..460c0e21 100644 --- a/assets/ymls/jp/levels/wmotr.yml +++ b/assets/ymls/jp/levels/wmotr.yml @@ -1174,3 +1174,7 @@ wmotr_seg7_collision: offset: 0x10688 symbol: wmotr_seg7_collision +wmotr_seg7_macro_objs: + type: SM64:MACRO + offset: 0x136A8 + symbol: wmotr_seg7_macro_objs diff --git a/assets/ymls/us/levels/bbh.yml b/assets/ymls/us/levels/bbh.yml index fe79d424..4172bead 100644 --- a/assets/ymls/us/levels/bbh.yml +++ b/assets/ymls/us/levels/bbh.yml @@ -3521,3 +3521,8 @@ bbh_seg7_collision_coffin: type: SM64:COLLISION offset: 0x26D18 symbol: bbh_seg7_collision_coffin + +bbh_seg7_macro_objs: + type: SM64:MACRO + offset: 0x268C4 + symbol: bbh_seg7_macro_objs diff --git a/assets/ymls/us/levels/bitdw.yml b/assets/ymls/us/levels/bitdw.yml index e01c6141..007618a2 100644 --- a/assets/ymls/us/levels/bitdw.yml +++ b/assets/ymls/us/levels/bitdw.yml @@ -1412,3 +1412,7 @@ bitdw_seg7_collision_0700FD9C: offset: 0xFD9C symbol: bitdw_seg7_collision_0700FD9C +bitdw_seg7_macro_objs: + type: SM64:MACRO + offset: 0xF438 + symbol: bitdw_seg7_macro_objs diff --git a/assets/ymls/us/levels/bitfs.yml b/assets/ymls/us/levels/bitfs.yml index c9744097..dcd45d66 100644 --- a/assets/ymls/us/levels/bitfs.yml +++ b/assets/ymls/us/levels/bitfs.yml @@ -1897,3 +1897,13 @@ bitfs_seg7_collision_07015928: offset: 0x15928 symbol: bitfs_seg7_collision_07015928 +bitfs_seg7_trajectory_070159AC: + type: SM64:TRAJECTORY + offset: 0x159AC + symbol: bitfs_seg7_trajectory_070159AC + +bitfs_seg7_macro_objs: + type: SM64:MACRO + offset: 0x14F90 + symbol: bitfs_seg7_macro_objs + diff --git a/assets/ymls/us/levels/bits.yml b/assets/ymls/us/levels/bits.yml index d07bbc26..446d03a5 100644 --- a/assets/ymls/us/levels/bits.yml +++ b/assets/ymls/us/levels/bits.yml @@ -2260,3 +2260,8 @@ bits_seg7_collision_0701B734: offset: 0x1B734 symbol: bits_seg7_collision_0701B734 +bits_seg7_macro_objs: + type: SM64:MACRO + offset: 0x1A76C + symbol: bits_seg7_macro_objs + diff --git a/assets/ymls/us/levels/bob.yml b/assets/ymls/us/levels/bob.yml index edbf44a5..ddf59655 100644 --- a/assets/ymls/us/levels/bob.yml +++ b/assets/ymls/us/levels/bob.yml @@ -1253,3 +1253,23 @@ bob_seg7_collision_gate: offset: 0x11474 symbol: bob_seg7_collision_gate +bob_seg7_metal_ball_path0: + type: SM64:TRAJECTORY + offset: 0x11530 + symbol: bob_seg7_metal_ball_path0 + +bob_seg7_metal_ball_path1: + type: SM64:TRAJECTORY + offset: 0x115C4 + symbol: bob_seg7_metal_ball_path1 + +bob_seg7_trajectory_koopa: + type: SM64:TRAJECTORY + offset: 0x116A0 + symbol: bob_seg7_trajectory_koopa + +bob_seg7_macro_objs: + type: SM64:MACRO + offset: 0x1104C + symbol: bob_seg7_macro_objs + diff --git a/assets/ymls/us/levels/castle_courtyard.yml b/assets/ymls/us/levels/castle_courtyard.yml index 48be3733..afb7fa0c 100644 --- a/assets/ymls/us/levels/castle_courtyard.yml +++ b/assets/ymls/us/levels/castle_courtyard.yml @@ -570,3 +570,8 @@ castle_courtyard_seg7_collision_level: offset: 0x59A8 symbol: castle_courtyard_seg7_collision_level +castle_courtyard_seg7_macro_objs: + type: SM64:MACRO + offset: 0x6E20 + symbol: castle_courtyard_seg7_macro_objs + diff --git a/assets/ymls/us/levels/castle_grounds.yml b/assets/ymls/us/levels/castle_grounds.yml index 122e300e..b65cc296 100644 --- a/assets/ymls/us/levels/castle_grounds.yml +++ b/assets/ymls/us/levels/castle_grounds.yml @@ -1280,3 +1280,8 @@ castle_grounds_seg7_cannon_grill: offset: 0x116C8 symbol: castle_grounds_seg7_cannon_grill +castle_grounds_seg7_macro_objs: + type: SM64:MACRO + offset: 0x115C0 + symbol: castle_grounds_seg7_macro_objs + diff --git a/assets/ymls/us/levels/castle_inside.yml b/assets/ymls/us/levels/castle_inside.yml index 74853a89..b9f40000 100644 --- a/assets/ymls/us/levels/castle_inside.yml +++ b/assets/ymls/us/levels/castle_inside.yml @@ -4,6 +4,10 @@ offset: 0x396340 segments: - [0x07, 0x396340] + tables: + inside_castle_seg7_trajectory_mips: + range: [0x7079068, 0x7079090] + mode: REFERENCE castle_light: type: TEXTURE @@ -8121,3 +8125,75 @@ inside_castle_seg7_collision_water_level_pillar: offset: 0x78E80 symbol: inside_castle_seg7_collision_water_level_pillar +inside_castle_seg7_trajectory_mips_0: + type: SM64:TRAJECTORY + offset: 0x78EF8 + symbol: inside_castle_seg7_trajectory_mips_0 + +inside_castle_seg7_trajectory_mips_1: + type: SM64:TRAJECTORY + offset: 0x78F2C + symbol: inside_castle_seg7_trajectory_mips_1 + +inside_castle_seg7_trajectory_mips_2: + type: SM64:TRAJECTORY + offset: 0x78F68 + symbol: inside_castle_seg7_trajectory_mips_2 + +inside_castle_seg7_trajectory_mips_3: + type: SM64:TRAJECTORY + offset: 0x78F7C + symbol: inside_castle_seg7_trajectory_mips_3 + +inside_castle_seg7_trajectory_mips_4: + type: SM64:TRAJECTORY + offset: 0x78FA8 + symbol: inside_castle_seg7_trajectory_mips_4 + +inside_castle_seg7_trajectory_mips_5: + type: SM64:TRAJECTORY + offset: 0x78FD4 + symbol: inside_castle_seg7_trajectory_mips_5 + +inside_castle_seg7_trajectory_mips_6: + type: SM64:TRAJECTORY + offset: 0x78FE8 + symbol: inside_castle_seg7_trajectory_mips_6 + +inside_castle_seg7_trajectory_mips_7: + type: SM64:TRAJECTORY + offset: 0x79004 + symbol: inside_castle_seg7_trajectory_mips_7 + +inside_castle_seg7_trajectory_mips_8: + type: SM64:TRAJECTORY + offset: 0x79020 + symbol: inside_castle_seg7_trajectory_mips_8 + +inside_castle_seg7_trajectory_mips_9: + type: SM64:TRAJECTORY + offset: 0x79044 + symbol: inside_castle_seg7_trajectory_mips_9 + +inside_castle_seg7_trajectory_mips: + type: ASSET_ARRAY + assetType: Trajectory + factoryType: SM64:TRAJECTORY + count: 10 + offset: 0x79068 + symbol: inside_castle_seg7_trajectory_mips + +inside_castle_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0x77764 + symbol: inside_castle_seg7_area_1_macro_objs + +inside_castle_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x777E0 + symbol: inside_castle_seg7_area_2_macro_objs + +inside_castle_seg7_area_3_macro_objs: + type: SM64:MACRO + offset: 0x777EC + symbol: inside_castle_seg7_area_3_macro_objs diff --git a/assets/ymls/us/levels/ccm.yml b/assets/ymls/us/levels/ccm.yml index 12f2e23a..46e41eb9 100644 --- a/assets/ymls/us/levels/ccm.yml +++ b/assets/ymls/us/levels/ccm.yml @@ -2693,3 +2693,27 @@ ccm_seg7_area_2_collision: offset: 0x20880 symbol: ccm_seg7_area_2_collision +ccm_seg7_trajectory_snowman: + type: SM64:TRAJECTORY + offset: 0x165A8 + symbol: ccm_seg7_trajectory_snowman + +ccm_seg7_trajectory_0701669C: + type: SM64:TRAJECTORY + offset: 0x1669C + symbol: ccm_seg7_trajectory_0701669C + +ccm_seg7_trajectory_penguin_race: + type: SM64:TRAJECTORY + offset: 0x23604 + symbol: ccm_seg7_trajectory_penguin_race + +ccm_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0x16284 + symbol: ccm_seg7_area_1_macro_objs + +ccm_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x23468 + symbol: ccm_seg7_area_2_macro_objs diff --git a/assets/ymls/us/levels/cotmc.yml b/assets/ymls/us/levels/cotmc.yml index d81afbec..8e626be8 100644 --- a/assets/ymls/us/levels/cotmc.yml +++ b/assets/ymls/us/levels/cotmc.yml @@ -755,3 +755,7 @@ cotmc_seg7_collision_level: offset: 0xA508 symbol: cotmc_seg7_collision_level +cotmc_seg7_macro_objs: + type: SM64:MACRO + offset: 0xBD38 + symbol: cotmc_seg7_macro_objs diff --git a/assets/ymls/us/levels/ddd.yml b/assets/ymls/us/levels/ddd.yml index 57b01588..6eb9427d 100644 --- a/assets/ymls/us/levels/ddd.yml +++ b/assets/ymls/us/levels/ddd.yml @@ -1189,3 +1189,12 @@ ddd_seg7_collision_bowser_sub_door: offset: 0xFC48 symbol: ddd_seg7_collision_bowser_sub_door +ddd_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0xEEF4 + symbol: ddd_seg7_area_1_macro_objs + +ddd_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0xEFAC + symbol: ddd_seg7_area_2_macro_objs diff --git a/assets/ymls/us/levels/hmc.yml b/assets/ymls/us/levels/hmc.yml index 4866a187..839a20a7 100644 --- a/assets/ymls/us/levels/hmc.yml +++ b/assets/ymls/us/levels/hmc.yml @@ -3260,4 +3260,38 @@ hmc_seg7_painting_dl_070254E0: type: GFX offset: 0x254E0 symbol: hmc_seg7_painting_dl_070254E0 + +hmc_seg7_collision_level: + type: SM64:COLLISION + offset: 0x25594 + symbol: hmc_seg7_collision_level +hmc_seg7_collision_elevator: + type: SM64:COLLISION + offset: 0x2B5E4 + symbol: hmc_seg7_collision_elevator + +hmc_seg7_collision_0702B65C: + type: SM64:COLLISION + offset: 0x2B65C + symbol: hmc_seg7_collision_0702B65C + +hmc_seg7_collision_controllable_platform: + type: SM64:COLLISION + offset: 0x2B6E0 + symbol: hmc_seg7_collision_controllable_platform + +hmc_seg7_collision_controllable_platform_sub: + type: SM64:COLLISION + offset: 0x2B7F4 + symbol: hmc_seg7_collision_controllable_platform_sub + +hmc_seg7_trajectory_0702B86C: + type: SM64:TRAJECTORY + offset: 0x2B86C + symbol: hmc_seg7_trajectory_0702B86C + +hmc_seg7_macro_objs: + type: SM64:MACRO + offset: 0x2AA78 + symbol: hmc_seg7_macro_objs diff --git a/assets/ymls/us/levels/jrb.yml b/assets/ymls/us/levels/jrb.yml index f3937f15..2bbf3268 100644 --- a/assets/ymls/us/levels/jrb.yml +++ b/assets/ymls/us/levels/jrb.yml @@ -1510,3 +1510,22 @@ jrb_seg7_area_2_collision: offset: 0x105B8 symbol: jrb_seg7_area_2_collision +jrb_seg7_trajectory_unagi_1: + type: SM64:TRAJECTORY + offset: 0xD20C + symbol: jrb_seg7_trajectory_unagi_1 + +jrb_seg7_trajectory_unagi_2: + type: SM64:TRAJECTORY + offset: 0xD240 + symbol: jrb_seg7_trajectory_unagi_2 + +jrb_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0xC4E8 + symbol: jrb_seg7_area_1_macro_objs + +jrb_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x11370 + symbol: jrb_seg7_area_2_macro_objs diff --git a/assets/ymls/us/levels/lll.yml b/assets/ymls/us/levels/lll.yml index 0df9824a..50bdea2f 100644 --- a/assets/ymls/us/levels/lll.yml +++ b/assets/ymls/us/levels/lll.yml @@ -2624,3 +2624,22 @@ lll_seg7_collision_falling_wall: offset: 0x2844C symbol: lll_seg7_collision_falling_wall +lll_seg7_trajectory_0702856C: + type: SM64:TRAJECTORY + offset: 0x284DC + symbol: lll_seg7_trajectory_0702856C + +lll_seg7_trajectory_07028660: + type: SM64:TRAJECTORY + offset: 0x285D0 + symbol: lll_seg7_trajectory_07028660 + +lll_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0x1CD88 + symbol: lll_seg7_area_1_macro_objs + +lll_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x28344 + symbol: lll_seg7_area_2_macro_objs diff --git a/assets/ymls/us/levels/pss.yml b/assets/ymls/us/levels/pss.yml index e5734333..f32c25bd 100644 --- a/assets/ymls/us/levels/pss.yml +++ b/assets/ymls/us/levels/pss.yml @@ -1155,3 +1155,7 @@ pss_seg7_collision: offset: 0xE490 symbol: pss_seg7_collision +pss_seg7_macro_objs: + type: SM64:MACRO + offset: 0x10F00 + symbol: pss_seg7_macro_objs diff --git a/assets/ymls/us/levels/rr.yml b/assets/ymls/us/levels/rr.yml index 2c3c4e0e..6dbc8a28 100644 --- a/assets/ymls/us/levels/rr.yml +++ b/assets/ymls/us/levels/rr.yml @@ -4025,3 +4025,27 @@ rr_seg7_collision_level: offset: 0x2A7C0 symbol: rr_seg7_collision_level +rr_seg7_trajectory_0702EC3C: + type: SM64:TRAJECTORY + offset: 0x2EA80 + symbol: rr_seg7_trajectory_0702EC3C + +rr_seg7_trajectory_0702ECC0: + type: SM64:TRAJECTORY + offset: 0x2EB04 + symbol: rr_seg7_trajectory_0702ECC0 + +rr_seg7_trajectory_0702ED9C: + type: SM64:TRAJECTORY + offset: 0x2EBE0 + symbol: rr_seg7_trajectory_0702ED9C + +rr_seg7_trajectory_0702EEE0: + type: SM64:TRAJECTORY + offset: 0x2ED24 + symbol: rr_seg7_trajectory_0702EEE0 + +rr_seg7_macro_objs: + type: SM64:MACRO + offset: 0x2E81C + symbol: rr_seg7_macro_objs diff --git a/assets/ymls/us/levels/sa.yml b/assets/ymls/us/levels/sa.yml index 90c08e78..5aa576b2 100644 --- a/assets/ymls/us/levels/sa.yml +++ b/assets/ymls/us/levels/sa.yml @@ -280,3 +280,7 @@ sa_seg7_collision: offset: 0x3000 symbol: bbh_seg7_collision +sa_seg7_macro_objs: + type: SM64:MACRO + offset: 0x3284 + symbol: sa_seg7_macro_objs diff --git a/assets/ymls/us/levels/sl.yml b/assets/ymls/us/levels/sl.yml index b206237f..0d382158 100644 --- a/assets/ymls/us/levels/sl.yml +++ b/assets/ymls/us/levels/sl.yml @@ -1203,3 +1203,12 @@ sl_seg7_area_2_collision: offset: 0xEFFC symbol: sl_seg7_area_2_collision +sl_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0xED94 + symbol: sl_seg7_area_1_macro_objs + +sl_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0xF978 + symbol: sl_seg7_area_2_macro_objs diff --git a/assets/ymls/us/levels/ssl.yml b/assets/ymls/us/levels/ssl.yml index 47925f22..94d100c7 100644 --- a/assets/ymls/us/levels/ssl.yml +++ b/assets/ymls/us/levels/ssl.yml @@ -2587,3 +2587,17 @@ ssl_seg7_collision_070284B0: offset: 0x284B0 symbol: ssl_seg7_collision_070284B0 +ssl_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0x12424 + symbol: ssl_seg7_area_1_macro_objs + +ssl_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x27CD4 + symbol: ssl_seg7_area_2_macro_objs + +ssl_seg7_area_3_macro_objs: + type: SM64:MACRO + offset: 0x27ECC + symbol: ssl_seg7_area_3_macro_objs diff --git a/assets/ymls/us/levels/thi.yml b/assets/ymls/us/levels/thi.yml index 5558c4a3..09484120 100644 --- a/assets/ymls/us/levels/thi.yml +++ b/assets/ymls/us/levels/thi.yml @@ -1130,3 +1130,22 @@ thi_seg7_collision_top_trap: offset: 0xE228 symbol: thi_seg7_collision_top_trap +thi_seg7_trajectory_koopa: + type: SM64:TRAJECTORY + offset: 0xE258 + symbol: thi_seg7_trajectory_koopa + +thi_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0xDD50 + symbol: thi_seg7_area_1_macro_objs + +thi_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0xDEE4 + symbol: thi_seg7_area_2_macro_objs + +thi_seg7_area_3_macro_objs: + type: SM64:MACRO + offset: 0xE190 + symbol: thi_seg7_area_3_macro_objs diff --git a/assets/ymls/us/levels/totwc.yml b/assets/ymls/us/levels/totwc.yml index 065afbfc..ea9041c5 100644 --- a/assets/ymls/us/levels/totwc.yml +++ b/assets/ymls/us/levels/totwc.yml @@ -502,3 +502,7 @@ totwc_seg7_collision: offset: 0x7A18 symbol: totwc_seg7_collision +totwc_seg7_macro_objs: + type: SM64:MACRO + offset: 0x88AC + symbol: totwc_seg7_macro_objs diff --git a/assets/ymls/us/levels/ttc.yml b/assets/ymls/us/levels/ttc.yml index a50b4148..4146386b 100644 --- a/assets/ymls/us/levels/ttc.yml +++ b/assets/ymls/us/levels/ttc.yml @@ -1929,3 +1929,8 @@ ttc_seg7_collision_rotating_clock_platform2: offset: 0x15F90 format: RGBA16 symbol: ttc_yellow_triangle + +ttc_seg7_macro_objs: + type: SM64:MACRO + offset: 0x15B24 + symbol: ttc_seg7_macro_objs diff --git a/assets/ymls/us/levels/ttm.yml b/assets/ymls/us/levels/ttm.yml index 7c12e71b..0311dea4 100644 --- a/assets/ymls/us/levels/ttm.yml +++ b/assets/ymls/us/levels/ttm.yml @@ -4252,3 +4252,27 @@ ttm_seg7_collision_podium_warp: offset: 0x3013C symbol: ttm_seg7_collision_podium_warp +ttm_seg7_trajectory_070170A0: + type: SM64:TRAJECTORY + offset: 0x170A0 + symbol: ttm_seg7_trajectory_070170A0 + +ttm_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0x16F18 + symbol: ttm_seg7_area_1_macro_objs + +ttm_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x302C8 + symbol: ttm_seg7_area_2_macro_objs + +ttm_seg7_area_3_macro_objs: + type: SM64:MACRO + offset: 0x30338 + symbol: ttm_seg7_area_3_macro_objs + +ttm_seg7_area_4_macro_objs: + type: SM64:MACRO + offset: 0x30418 + symbol: ttm_seg7_area_4_macro_objs diff --git a/assets/ymls/us/levels/vcutm.yml b/assets/ymls/us/levels/vcutm.yml index 0c44b48d..ab505ced 100644 --- a/assets/ymls/us/levels/vcutm.yml +++ b/assets/ymls/us/levels/vcutm.yml @@ -682,3 +682,7 @@ vcutm_seg7_collision_0700AC44: offset: 0xAC44 symbol: vcutm_seg7_collision_0700AC44 +vcutm_seg7_macro_objs: + type: SM64:MACRO + offset: 0xAB0C + symbol: vcutm_seg7_macro_objs diff --git a/assets/ymls/us/levels/wdw.yml b/assets/ymls/us/levels/wdw.yml index 36807c85..7a9d0c99 100644 --- a/assets/ymls/us/levels/wdw.yml +++ b/assets/ymls/us/levels/wdw.yml @@ -1947,3 +1947,12 @@ wdw_seg7_collision_070186B4: offset: 0x186B4 symbol: wdw_seg7_070186B4 +wdw_seg7_area_1_macro_objs: + type: SM64:MACRO + offset: 0x160D8 + symbol: wdw_seg7_area_1_macro_objs + +wdw_seg7_area_2_macro_objs: + type: SM64:MACRO + offset: 0x18224 + symbol: wdw_seg7_area_2_macro_objs diff --git a/assets/ymls/us/levels/wf.yml b/assets/ymls/us/levels/wf.yml index 884497fa..6292b2f9 100644 --- a/assets/ymls/us/levels/wf.yml +++ b/assets/ymls/us/levels/wf.yml @@ -2030,3 +2030,7 @@ wf_seg7_collision_070102D8: offset: 0x102D8 symbol: wf_seg7_collision_070102D8 +wf_seg7_macro_objs: + type: SM64:MACRO + offset: 0x11C38 + symbol: wf_seg7_macro_objs diff --git a/assets/ymls/us/levels/wmotr.yml b/assets/ymls/us/levels/wmotr.yml index 68f23227..25bb0904 100644 --- a/assets/ymls/us/levels/wmotr.yml +++ b/assets/ymls/us/levels/wmotr.yml @@ -1174,3 +1174,7 @@ wmotr_seg7_collision: offset: 0x10688 symbol: wmotr_seg7_collision +wmotr_seg7_macro_objs: + type: SM64:MACRO + offset: 0x136A8 + symbol: wmotr_seg7_macro_objs