From 96d48b98fc47d812b1e0bfc73091624eddd3f4fc Mon Sep 17 00:00:00 2001
From: inspectredc <78732756+inspectredc@users.noreply.github.com>
Date: Thu, 13 Jun 2024 15:52:45 +0100
Subject: [PATCH] Format Macros and Trajectories (#55)

---
 assets/ymls/jp/levels/bbh.yml            |  9 +++---
 assets/ymls/jp/levels/bitdw.yml          | 10 +++----
 assets/ymls/jp/levels/bitfs.yml          | 10 +++----
 assets/ymls/jp/levels/bits.yml           | 10 +++----
 assets/ymls/jp/levels/bob.yml            | 10 +++----
 assets/ymls/jp/levels/castle_grounds.yml | 10 +++----
 assets/ymls/jp/levels/castle_inside.yml  | 29 ++++++++++---------
 assets/ymls/jp/levels/ccm.yml            | 37 ++++++++++++------------
 assets/ymls/jp/levels/ddd.yml            | 19 ++++++------
 assets/ymls/jp/levels/hmc.yml            |  9 +++---
 assets/ymls/jp/levels/jrb.yml            | 30 +++++++++----------
 assets/ymls/jp/levels/lll.yml            | 19 ++++++------
 assets/ymls/jp/levels/rr.yml             |  9 +++---
 assets/ymls/jp/levels/sl.yml             | 10 +++----
 assets/ymls/jp/levels/ssl.yml            | 29 ++++++++++---------
 assets/ymls/jp/levels/thi.yml            | 21 +++++++-------
 assets/ymls/jp/levels/ttc.yml            |  9 +++---
 assets/ymls/jp/levels/ttm.yml            | 20 ++++++-------
 assets/ymls/jp/levels/vcutm.yml          |  9 +++---
 assets/ymls/jp/levels/wdw.yml            | 19 ++++++------
 assets/ymls/us/levels/bbh.yml            |  9 +++---
 assets/ymls/us/levels/bitdw.yml          |  9 +++---
 assets/ymls/us/levels/bitfs.yml          | 10 +++----
 assets/ymls/us/levels/bits.yml           | 10 +++----
 assets/ymls/us/levels/bob.yml            | 10 +++----
 assets/ymls/us/levels/castle_grounds.yml | 10 +++----
 assets/ymls/us/levels/castle_inside.yml  | 29 ++++++++++---------
 assets/ymls/us/levels/ccm.yml            | 37 ++++++++++++------------
 assets/ymls/us/levels/ddd.yml            | 19 ++++++------
 assets/ymls/us/levels/hmc.yml            | 11 +++----
 assets/ymls/us/levels/jrb.yml            | 30 +++++++++----------
 assets/ymls/us/levels/lll.yml            | 19 ++++++------
 assets/ymls/us/levels/rr.yml             |  9 +++---
 assets/ymls/us/levels/sl.yml             | 10 +++----
 assets/ymls/us/levels/ssl.yml            | 29 ++++++++++---------
 assets/ymls/us/levels/thi.yml            | 21 +++++++-------
 assets/ymls/us/levels/ttc.yml            |  9 +++---
 assets/ymls/us/levels/ttm.yml            | 20 ++++++-------
 assets/ymls/us/levels/vcutm.yml          |  9 +++---
 assets/ymls/us/levels/wdw.yml            | 19 ++++++------
 40 files changed, 341 insertions(+), 316 deletions(-)

diff --git a/assets/ymls/jp/levels/bbh.yml b/assets/ymls/jp/levels/bbh.yml
index 48b8f3d9..69143da0 100644
--- a/assets/ymls/jp/levels/bbh.yml
+++ b/assets/ymls/jp/levels/bbh.yml
@@ -3487,6 +3487,11 @@ bbh_seg7_collision_level:
   offset: 0x207A0
   symbol: bbh_seg7_collision_level
 
+bbh_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x268C4
+  symbol: bbh_seg7_macro_objs
+
 bbh_seg7_collision_staircase_step:
   type: SM64:COLLISION
   offset: 0x26A1C
@@ -3522,7 +3527,3 @@ bbh_seg7_collision_coffin:
   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 a8767639..d4978a55 100644
--- a/assets/ymls/jp/levels/bitdw.yml
+++ b/assets/ymls/jp/levels/bitdw.yml
@@ -1362,6 +1362,11 @@ bitdw_seg7_collision_level:
   offset: 0xD460
   symbol: bitdw_seg7_collision_level
 
+bitdw_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0xF438
+  symbol: bitdw_seg7_macro_objs
+
 bitdw_seg7_collision_0700F688:
   type: SM64:COLLISION
   offset: 0xF688
@@ -1412,8 +1417,3 @@ 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 0b60d9b0..3318c272 100644
--- a/assets/ymls/jp/levels/bitfs.yml
+++ b/assets/ymls/jp/levels/bitfs.yml
@@ -1847,6 +1847,11 @@ bitfs_seg7_collision_level:
   offset: 0x11E98
   symbol: bitfs_seg7_collision_level
 
+bitfs_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x14F90
+  symbol: bitfs_seg7_macro_objs
+
 bitfs_seg7_collision_07015124:
   type: SM64:COLLISION
   offset: 0x15124
@@ -1902,8 +1907,3 @@ bitfs_seg7_trajectory_070159AC:
   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 96ae1c91..291c323f 100644
--- a/assets/ymls/jp/levels/bits.yml
+++ b/assets/ymls/jp/levels/bits.yml
@@ -2195,6 +2195,11 @@ bits_seg7_collision_level:
   offset: 0x16E18
   symbol: bits_seg7_collision_level
 
+bits_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x1A76C
+  symbol: bits_seg7_macro_objs
+
 bits_seg7_collision_0701A9A0:
   type: SM64:COLLISION
   offset: 0x1A9A0
@@ -2260,8 +2265,3 @@ 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 d61653b2..861db495 100644
--- a/assets/ymls/jp/levels/bob.yml
+++ b/assets/ymls/jp/levels/bob.yml
@@ -1238,6 +1238,11 @@ bob_seg7_collision_level:
   offset: 0xE958
   symbol: bob_seg7_collision_level
 
+bob_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x1104C
+  symbol: bob_seg7_macro_objs
+
 bob_seg7_collision_chain_chomp_gate:
   type: SM64:COLLISION
   offset: 0x113C0
@@ -1268,8 +1273,3 @@ bob_seg7_trajectory_koopa:
   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_grounds.yml b/assets/ymls/jp/levels/castle_grounds.yml
index b874a82b..07e5cdc1 100644
--- a/assets/ymls/jp/levels/castle_grounds.yml
+++ b/assets/ymls/jp/levels/castle_grounds.yml
@@ -1256,6 +1256,11 @@ castle_grounds_seg7_collision_level:
   offset: 0xEAE8
   symbol: castle_grounds_seg7_collision_level
 
+castle_grounds_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x10D08
+  symbol: castle_grounds_seg7_macro_objs
+
 castle_grounds_seg7_moat_grills:
   type: SM64:COLLISION
   offset: 0x10DB4
@@ -1266,8 +1271,3 @@ 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 6fa018a7..c9774412 100644
--- a/assets/ymls/jp/levels/castle_inside.yml
+++ b/assets/ymls/jp/levels/castle_inside.yml
@@ -8106,6 +8106,21 @@ inside_castle_seg7_collision_ddd_warp_2:
   offset: 0x7768C
   symbol: inside_castle_seg7_collision_ddd_warp_2
 
+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
+
 inside_castle_seg7_collision_floor_trap:
   type: SM64:COLLISION
   offset: 0x78DE4
@@ -8179,17 +8194,3 @@ inside_castle_seg7_trajectory_mips:
   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 2c095c75..e8e00e8b 100644
--- a/assets/ymls/jp/levels/ccm.yml
+++ b/assets/ymls/jp/levels/ccm.yml
@@ -1756,11 +1756,26 @@ ccm_seg7_area_1_collision:
   offset: 0x138E8
   symbol: ccm_seg7_area_1_collision
 
+ccm_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0x16284
+  symbol: ccm_seg7_area_1_macro_objs
+
 ccm_seg7_collision_070163F8:
   type: SM64:COLLISION
   offset: 0x163F8
   symbol: ccm_seg7_collision_070163F8
 
+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_lights_07016718:
   type: LIGHTS
   size: 24
@@ -2693,27 +2708,13 @@ 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_area_2_macro_objs:
+  type: SM64:MACRO
+  offset: 0x23468
+  symbol: ccm_seg7_area_2_macro_objs
 
 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/ddd.yml b/assets/ymls/jp/levels/ddd.yml
index f3350a30..f34a8e9d 100644
--- a/assets/ymls/jp/levels/ddd.yml
+++ b/assets/ymls/jp/levels/ddd.yml
@@ -1179,6 +1179,16 @@ ddd_seg7_area_2_collision:
   offset: 0xDE70
   symbol: ddd_seg7_area_2_collision
 
+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
+
 ddd_seg7_collision_submarine:
   type: SM64:COLLISION
   offset: 0xF17C
@@ -1189,12 +1199,3 @@ 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 4fa279f1..d28ac411 100644
--- a/assets/ymls/jp/levels/hmc.yml
+++ b/assets/ymls/jp/levels/hmc.yml
@@ -3266,6 +3266,11 @@ hmc_seg7_collision_level:
   offset: 0x25594
   symbol: hmc_seg7_collision_level
 
+hmc_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x2AA78
+  symbol: hmc_seg7_macro_objs
+
 hmc_seg7_collision_elevator:
   type: SM64:COLLISION
   offset: 0x2B5E4
@@ -3291,7 +3296,3 @@ hmc_seg7_trajectory_0702B86C:
   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 e87abecc..61b6c48e 100644
--- a/assets/ymls/jp/levels/jrb.yml
+++ b/assets/ymls/jp/levels/jrb.yml
@@ -1122,6 +1122,11 @@ jrb_seg7_area_1_collision:
   offset: 0xB058
   symbol: jrb_seg7_area_1_collision
 
+jrb_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0xC4E8
+  symbol: jrb_seg7_area_1_macro_objs
+
 jrb_seg7_collision_rock_solid:
   type: SM64:COLLISION
   offset: 0xC758
@@ -1167,6 +1172,16 @@ jrb_seg7_collision_0700D1DC:
   offset: 0xD1DC
   symbol: jrb_seg7_collision_0700D1DC
 
+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_lights_0700D318:
   type: LIGHTS
   size: 24
@@ -1510,21 +1525,6 @@ 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
diff --git a/assets/ymls/jp/levels/lll.yml b/assets/ymls/jp/levels/lll.yml
index 9ea896bd..0cccc149 100644
--- a/assets/ymls/jp/levels/lll.yml
+++ b/assets/ymls/jp/levels/lll.yml
@@ -1802,6 +1802,11 @@ lll_seg7_area_1_collision:
   offset: 0x1ADE8
   symbol: lll_seg7_area_1_collision
 
+lll_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0x1CE18
+  symbol: lll_seg7_area_1_macro_objs
+
 lll_seg7_collision_octagonal_moving_platform:
   type: SM64:COLLISION
   offset: 0x1D018
@@ -2619,6 +2624,11 @@ lll_seg7_area_2_collision:
   offset: 0x25F80
   symbol: lll_seg7_area_2_collision
 
+lll_seg7_area_2_macro_objs:
+  type: SM64:MACRO
+  offset: 0x283D4
+  symbol: lll_seg7_area_2_macro_objs
+
 lll_seg7_collision_falling_wall:
   type: SM64:COLLISION
   offset: 0x284DC
@@ -2634,12 +2644,3 @@ lll_seg7_trajectory_07028660:
   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/rr.yml b/assets/ymls/jp/levels/rr.yml
index 6b654566..7bc07bc8 100644
--- a/assets/ymls/jp/levels/rr.yml
+++ b/assets/ymls/jp/levels/rr.yml
@@ -3853,6 +3853,11 @@ rr_seg7_collision_level:
   offset: 0x2A9A8
   symbol: rr_seg7_collision_level
 
+rr_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x2E9D8
+  symbol: rr_seg7_macro_objs
+
 rr_seg7_trajectory_0702EC3C:
   type: SM64:TRAJECTORY
   offset: 0x2EC3C
@@ -3873,7 +3878,3 @@ rr_seg7_trajectory_0702EEE0:
   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/sl.yml b/assets/ymls/jp/levels/sl.yml
index 3dd34202..42ea17f3 100644
--- a/assets/ymls/jp/levels/sl.yml
+++ b/assets/ymls/jp/levels/sl.yml
@@ -1188,6 +1188,11 @@ sl_seg7_area_1_collision:
   offset: 0xCBD8
   symbol: sl_seg7_area_1_collision
 
+sl_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0xED94
+  symbol: sl_seg7_area_1_macro_objs
+
 sl_seg7_collision_sliding_snow_mound:
   type: SM64:COLLISION
   offset: 0xEF6C
@@ -1203,11 +1208,6 @@ 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
diff --git a/assets/ymls/jp/levels/ssl.yml b/assets/ymls/jp/levels/ssl.yml
index 9a0148e4..6cbdd3c2 100644
--- a/assets/ymls/jp/levels/ssl.yml
+++ b/assets/ymls/jp/levels/ssl.yml
@@ -935,6 +935,11 @@ ssl_seg7_area_1_collision:
   offset: 0xFD80
   symbol: ssl_seg7_area_1_collision
 
+ssl_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0x12424
+  symbol: ssl_seg7_area_1_macro_objs
+
 ssl_seg7_collision_pyramid_top:
   type: SM64:COLLISION
   offset: 0x125F4
@@ -2547,6 +2552,16 @@ ssl_seg7_area_3_collision:
   offset: 0x275BC
   symbol: ssl_seg7_area_3_collision
 
+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
+
 ssl_seg7_collision_grindel:
   type: SM64:COLLISION
   offset: 0x27ED0
@@ -2587,17 +2602,3 @@ 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 225412ed..97ea4108 100644
--- a/assets/ymls/jp/levels/thi.yml
+++ b/assets/ymls/jp/levels/thi.yml
@@ -1125,16 +1125,6 @@ thi_seg7_area_3_collision:
   offset: 0xD444
   symbol: thi_seg7_area_3_collision
 
-thi_seg7_collision_top_trap:
-  type: SM64:COLLISION
-  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
@@ -1149,3 +1139,14 @@ thi_seg7_area_3_macro_objs:
   type: SM64:MACRO
   offset: 0xE190
   symbol: thi_seg7_area_3_macro_objs
+
+thi_seg7_collision_top_trap:
+  type: SM64:COLLISION
+  offset: 0xE228
+  symbol: thi_seg7_collision_top_trap
+
+thi_seg7_trajectory_koopa:
+  type: SM64:TRAJECTORY
+  offset: 0xE258
+  symbol: thi_seg7_trajectory_koopa
+
diff --git a/assets/ymls/jp/levels/ttc.yml b/assets/ymls/jp/levels/ttc.yml
index d9e4197b..759bc384 100644
--- a/assets/ymls/jp/levels/ttc.yml
+++ b/assets/ymls/jp/levels/ttc.yml
@@ -1921,6 +1921,11 @@ ttc_seg7_collision_rotating_clock_platform2:
   offset: 0x159D0
   symbol: ttc_seg7_collision_rotating_clock_platform2
 
+ttc_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x15B24
+  symbol: ttc_seg7_macro_objs
+
 2:
   type: TEXTURE
   size: 2048
@@ -1930,7 +1935,3 @@ 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 62a5e202..af88566c 100644
--- a/assets/ymls/jp/levels/ttm.yml
+++ b/assets/ymls/jp/levels/ttm.yml
@@ -2096,6 +2096,16 @@ ttm_seg7_area_1_collision:
   offset: 0x13814
   symbol: ttm_seg7_area_1_collision
 
+ttm_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0x16F18
+  symbol: ttm_seg7_area_1_macro_objs
+
+ttm_seg7_trajectory_070170A0:
+  type: SM64:TRAJECTORY
+  offset: 0x170A0
+  symbol: ttm_seg7_trajectory_070170A0
+
 ttm_seg7_lights_070172D8:
   type: LIGHTS
   size: 24
@@ -4252,16 +4262,6 @@ 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
diff --git a/assets/ymls/jp/levels/vcutm.yml b/assets/ymls/jp/levels/vcutm.yml
index fb9772ee..7b244cb4 100644
--- a/assets/ymls/jp/levels/vcutm.yml
+++ b/assets/ymls/jp/levels/vcutm.yml
@@ -677,12 +677,13 @@ vcutm_seg7_collision:
   offset: 0x9750
   symbol: vcutm_seg7_collision
 
+vcutm_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0xAB0C
+  symbol: vcutm_seg7_macro_objs
+
 vcutm_seg7_collision_0700AC44:
   type: SM64:COLLISION
   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 f2b7c0fa..1a7ead39 100644
--- a/assets/ymls/jp/levels/wdw.yml
+++ b/assets/ymls/jp/levels/wdw.yml
@@ -1907,11 +1907,21 @@ wdw_seg7_area_1_collision:
   offset: 0x14150
   symbol: wdw_seg7_area_1_collision
 
+wdw_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0x160D8
+  symbol: wdw_seg7_area_1_macro_objs
+
 wdw_seg7_area_2_collision:
   type: SM64:COLLISION
   offset: 0x1633C
   symbol: wdw_seg7_area_2_collision
 
+wdw_seg7_area_2_macro_objs:
+  type: SM64:MACRO
+  offset: 0x18224
+  symbol: wdw_seg7_area_2_macro_objs
+
 wdw_seg7_collision_square_floating_platform:
   type: SM64:COLLISION
   offset: 0x183C0
@@ -1947,12 +1957,3 @@ 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/bbh.yml b/assets/ymls/us/levels/bbh.yml
index 4172bead..4c57309c 100644
--- a/assets/ymls/us/levels/bbh.yml
+++ b/assets/ymls/us/levels/bbh.yml
@@ -3487,6 +3487,11 @@ bbh_seg7_collision_level:
   offset: 0x207A0
   symbol: bbh_seg7_collision_level
 
+bbh_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x268C4
+  symbol: bbh_seg7_macro_objs
+
 bbh_seg7_collision_staircase_step:
   type: SM64:COLLISION
   offset: 0x26A1C
@@ -3522,7 +3527,3 @@ bbh_seg7_collision_coffin:
   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 007618a2..9cfd3b21 100644
--- a/assets/ymls/us/levels/bitdw.yml
+++ b/assets/ymls/us/levels/bitdw.yml
@@ -1362,6 +1362,11 @@ bitdw_seg7_collision_level:
   offset: 0xD460
   symbol: bitdw_seg7_collision_level
 
+bitdw_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0xF438
+  symbol: bitdw_seg7_macro_objs
+
 bitdw_seg7_collision_0700F688:
   type: SM64:COLLISION
   offset: 0xF688
@@ -1412,7 +1417,3 @@ 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 dcd45d66..2b217d3c 100644
--- a/assets/ymls/us/levels/bitfs.yml
+++ b/assets/ymls/us/levels/bitfs.yml
@@ -1847,6 +1847,11 @@ bitfs_seg7_collision_level:
   offset: 0x11E98
   symbol: bitfs_seg7_collision_level
 
+bitfs_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x14F90
+  symbol: bitfs_seg7_macro_objs
+
 bitfs_seg7_collision_07015124:
   type: SM64:COLLISION
   offset: 0x15124
@@ -1902,8 +1907,3 @@ bitfs_seg7_trajectory_070159AC:
   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 446d03a5..53304b15 100644
--- a/assets/ymls/us/levels/bits.yml
+++ b/assets/ymls/us/levels/bits.yml
@@ -2195,6 +2195,11 @@ bits_seg7_collision_level:
   offset: 0x16E18
   symbol: bits_seg7_collision_level
 
+bits_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x1A76C
+  symbol: bits_seg7_macro_objs
+
 bits_seg7_collision_0701A9A0:
   type: SM64:COLLISION
   offset: 0x1A9A0
@@ -2260,8 +2265,3 @@ 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 ddf59655..9166df76 100644
--- a/assets/ymls/us/levels/bob.yml
+++ b/assets/ymls/us/levels/bob.yml
@@ -1238,6 +1238,11 @@ bob_seg7_collision_level:
   offset: 0xE958
   symbol: bob_seg7_collision_level
 
+bob_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x1104C
+  symbol: bob_seg7_macro_objs
+
 bob_seg7_collision_chain_chomp_gate:
   type: SM64:COLLISION
   offset: 0x113C0
@@ -1268,8 +1273,3 @@ bob_seg7_trajectory_koopa:
   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_grounds.yml b/assets/ymls/us/levels/castle_grounds.yml
index b65cc296..56144ffd 100644
--- a/assets/ymls/us/levels/castle_grounds.yml
+++ b/assets/ymls/us/levels/castle_grounds.yml
@@ -1270,6 +1270,11 @@ castle_grounds_seg7_collision_level:
   offset: 0xF3A0
   symbol: castle_grounds_seg7_collision_level
 
+castle_grounds_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x115C0
+  symbol: castle_grounds_seg7_macro_objs
+
 castle_grounds_seg7_moat_grills:
   type: SM64:COLLISION
   offset: 0x1166C
@@ -1280,8 +1285,3 @@ 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 b9f40000..5523f236 100644
--- a/assets/ymls/us/levels/castle_inside.yml
+++ b/assets/ymls/us/levels/castle_inside.yml
@@ -8110,6 +8110,21 @@ inside_castle_seg7_collision_ddd_warp_2:
   offset: 0x7768C
   symbol: inside_castle_seg7_collision_ddd_warp_2
 
+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
+
 inside_castle_seg7_collision_floor_trap:
   type: SM64:COLLISION
   offset: 0x78DE4
@@ -8183,17 +8198,3 @@ inside_castle_seg7_trajectory_mips:
   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 46e41eb9..cc8353ce 100644
--- a/assets/ymls/us/levels/ccm.yml
+++ b/assets/ymls/us/levels/ccm.yml
@@ -1756,11 +1756,26 @@ ccm_seg7_area_1_collision:
   offset: 0x138E8
   symbol: ccm_seg7_area_1_collision
 
+ccm_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0x16284
+  symbol: ccm_seg7_area_1_macro_objs
+
 ccm_seg7_collision_070163F8:
   type: SM64:COLLISION
   offset: 0x163F8
   symbol: ccm_seg7_collision_070163F8
 
+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_lights_07016718:
   type: LIGHTS
   size: 24
@@ -2693,27 +2708,13 @@ 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_area_2_macro_objs:
+  type: SM64:MACRO
+  offset: 0x23468
+  symbol: ccm_seg7_area_2_macro_objs
 
 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/ddd.yml b/assets/ymls/us/levels/ddd.yml
index 6eb9427d..fa91135f 100644
--- a/assets/ymls/us/levels/ddd.yml
+++ b/assets/ymls/us/levels/ddd.yml
@@ -1179,6 +1179,16 @@ ddd_seg7_area_2_collision:
   offset: 0xDE70
   symbol: ddd_seg7_area_2_collision
 
+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
+
 ddd_seg7_collision_submarine:
   type: SM64:COLLISION
   offset: 0xF17C
@@ -1189,12 +1199,3 @@ 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 839a20a7..807dfac7 100644
--- a/assets/ymls/us/levels/hmc.yml
+++ b/assets/ymls/us/levels/hmc.yml
@@ -3260,12 +3260,17 @@ 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_macro_objs:
+  type: SM64:MACRO
+  offset: 0x2AA78
+  symbol: hmc_seg7_macro_objs
+
 hmc_seg7_collision_elevator:
   type: SM64:COLLISION
   offset: 0x2B5E4
@@ -3291,7 +3296,3 @@ hmc_seg7_trajectory_0702B86C:
   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 2bbf3268..ac46e882 100644
--- a/assets/ymls/us/levels/jrb.yml
+++ b/assets/ymls/us/levels/jrb.yml
@@ -1122,6 +1122,11 @@ jrb_seg7_area_1_collision:
   offset: 0xB058
   symbol: jrb_seg7_area_1_collision
 
+jrb_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0xC4E8
+  symbol: jrb_seg7_area_1_macro_objs
+
 jrb_seg7_collision_rock_solid:
   type: SM64:COLLISION
   offset: 0xC758
@@ -1167,6 +1172,16 @@ jrb_seg7_collision_0700D1DC:
   offset: 0xD1DC
   symbol: jrb_seg7_collision_0700D1DC
 
+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_lights_0700D318:
   type: LIGHTS
   size: 24
@@ -1510,21 +1525,6 @@ 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
diff --git a/assets/ymls/us/levels/lll.yml b/assets/ymls/us/levels/lll.yml
index 50bdea2f..55f4537f 100644
--- a/assets/ymls/us/levels/lll.yml
+++ b/assets/ymls/us/levels/lll.yml
@@ -1802,6 +1802,11 @@ lll_seg7_area_1_collision:
   offset: 0x1ADE8
   symbol: lll_seg7_area_1_collision
 
+lll_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0x1CD88
+  symbol: lll_seg7_area_1_macro_objs
+
 lll_seg7_collision_octagonal_moving_platform:
   type: SM64:COLLISION
   offset: 0x1CF88
@@ -2619,6 +2624,11 @@ lll_seg7_area_2_collision:
   offset: 0x25EF0
   symbol: lll_seg7_area_2_collision
 
+lll_seg7_area_2_macro_objs:
+  type: SM64:MACRO
+  offset: 0x28344
+  symbol: lll_seg7_area_2_macro_objs
+
 lll_seg7_collision_falling_wall:
   type: SM64:COLLISION
   offset: 0x2844C
@@ -2633,13 +2643,4 @@ 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/rr.yml b/assets/ymls/us/levels/rr.yml
index 6dbc8a28..14732f5b 100644
--- a/assets/ymls/us/levels/rr.yml
+++ b/assets/ymls/us/levels/rr.yml
@@ -4025,6 +4025,11 @@ rr_seg7_collision_level:
   offset: 0x2A7C0
   symbol: rr_seg7_collision_level
 
+rr_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x2E81C
+  symbol: rr_seg7_macro_objs
+
 rr_seg7_trajectory_0702EC3C:
   type: SM64:TRAJECTORY
   offset: 0x2EA80
@@ -4045,7 +4050,3 @@ rr_seg7_trajectory_0702EEE0:
   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/sl.yml b/assets/ymls/us/levels/sl.yml
index 0d382158..0619f673 100644
--- a/assets/ymls/us/levels/sl.yml
+++ b/assets/ymls/us/levels/sl.yml
@@ -1188,6 +1188,11 @@ sl_seg7_area_1_collision:
   offset: 0xCBD8
   symbol: sl_seg7_area_1_collision
 
+sl_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0xED94
+  symbol: sl_seg7_area_1_macro_objs
+
 sl_seg7_collision_sliding_snow_mound:
   type: SM64:COLLISION
   offset: 0xEF6C
@@ -1203,11 +1208,6 @@ 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
diff --git a/assets/ymls/us/levels/ssl.yml b/assets/ymls/us/levels/ssl.yml
index 94d100c7..b3c04dd2 100644
--- a/assets/ymls/us/levels/ssl.yml
+++ b/assets/ymls/us/levels/ssl.yml
@@ -935,6 +935,11 @@ ssl_seg7_area_1_collision:
   offset: 0xFD80
   symbol: ssl_seg7_area_1_collision
 
+ssl_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0x12424
+  symbol: ssl_seg7_area_1_macro_objs
+
 ssl_seg7_collision_pyramid_top:
   type: SM64:COLLISION
   offset: 0x125F4
@@ -2547,6 +2552,16 @@ ssl_seg7_area_3_collision:
   offset: 0x275BC
   symbol: ssl_seg7_area_3_collision
 
+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
+
 ssl_seg7_collision_grindel:
   type: SM64:COLLISION
   offset: 0x27ED0
@@ -2587,17 +2602,3 @@ 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 09484120..0469d5b8 100644
--- a/assets/ymls/us/levels/thi.yml
+++ b/assets/ymls/us/levels/thi.yml
@@ -1125,16 +1125,6 @@ thi_seg7_area_3_collision:
   offset: 0xD444
   symbol: thi_seg7_area_3_collision
 
-thi_seg7_collision_top_trap:
-  type: SM64:COLLISION
-  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
@@ -1149,3 +1139,14 @@ thi_seg7_area_3_macro_objs:
   type: SM64:MACRO
   offset: 0xE190
   symbol: thi_seg7_area_3_macro_objs
+
+thi_seg7_collision_top_trap:
+  type: SM64:COLLISION
+  offset: 0xE228
+  symbol: thi_seg7_collision_top_trap
+
+thi_seg7_trajectory_koopa:
+  type: SM64:TRAJECTORY
+  offset: 0xE258
+  symbol: thi_seg7_trajectory_koopa
+
diff --git a/assets/ymls/us/levels/ttc.yml b/assets/ymls/us/levels/ttc.yml
index 4146386b..784dc270 100644
--- a/assets/ymls/us/levels/ttc.yml
+++ b/assets/ymls/us/levels/ttc.yml
@@ -1921,6 +1921,11 @@ ttc_seg7_collision_rotating_clock_platform2:
   offset: 0x159D0
   symbol: ttc_seg7_collision_rotating_clock_platform2
 
+ttc_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0x15B24
+  symbol: ttc_seg7_macro_objs
+
 2:
   type: TEXTURE
   size: 2048
@@ -1930,7 +1935,3 @@ 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/us/levels/ttm.yml b/assets/ymls/us/levels/ttm.yml
index 0311dea4..d03437a2 100644
--- a/assets/ymls/us/levels/ttm.yml
+++ b/assets/ymls/us/levels/ttm.yml
@@ -2087,6 +2087,16 @@ ttm_seg7_area_1_collision:
   offset: 0x13814
   symbol: ttm_seg7_area_1_collision
 
+ttm_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0x16F18
+  symbol: ttm_seg7_area_1_macro_objs
+
+ttm_seg7_trajectory_070170A0:
+  type: SM64:TRAJECTORY
+  offset: 0x170A0
+  symbol: ttm_seg7_trajectory_070170A0
+
 ttm_seg7_lights_070172D8:
   type: LIGHTS
   size: 24
@@ -4252,16 +4262,6 @@ 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
diff --git a/assets/ymls/us/levels/vcutm.yml b/assets/ymls/us/levels/vcutm.yml
index ab505ced..b4e7a98b 100644
--- a/assets/ymls/us/levels/vcutm.yml
+++ b/assets/ymls/us/levels/vcutm.yml
@@ -677,12 +677,13 @@ vcutm_seg7_collision:
   offset: 0x9750
   symbol: vcutm_seg7_collision
 
+vcutm_seg7_macro_objs:
+  type: SM64:MACRO
+  offset: 0xAB0C
+  symbol: vcutm_seg7_macro_objs
+
 vcutm_seg7_collision_0700AC44:
   type: SM64:COLLISION
   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 7a9d0c99..fcb20791 100644
--- a/assets/ymls/us/levels/wdw.yml
+++ b/assets/ymls/us/levels/wdw.yml
@@ -1907,11 +1907,21 @@ wdw_seg7_area_1_collision:
   offset: 0x14150
   symbol: wdw_seg7_area_1_collision
 
+wdw_seg7_area_1_macro_objs:
+  type: SM64:MACRO
+  offset: 0x160D8
+  symbol: wdw_seg7_area_1_macro_objs
+
 wdw_seg7_area_2_collision:
   type: SM64:COLLISION
   offset: 0x1633C
   symbol: wdw_seg7_area_2_collision
 
+wdw_seg7_area_2_macro_objs:
+  type: SM64:MACRO
+  offset: 0x18224
+  symbol: wdw_seg7_area_2_macro_objs
+
 wdw_seg7_collision_square_floating_platform:
   type: SM64:COLLISION
   offset: 0x183C0
@@ -1947,12 +1957,3 @@ 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