diff --git a/wafel_layout/sm64_macro_defns.json b/wafel_layout/sm64_macro_defns.json
index 1d0d23e2..12499382 100644
--- a/wafel_layout/sm64_macro_defns.json
+++ b/wafel_layout/sm64_macro_defns.json
@@ -15436,6 +15436,12 @@
         26
       ]
     },
+    "oAnimations": {
+      "array": "asAnims",
+      "indices": [
+        38
+      ]
+    },
     "oArrowLiftDisplacement": {
       "array": "asF32",
       "indices": [
@@ -15544,6 +15550,12 @@
         27
       ]
     },
+    "oBitSPlatformBowser": {
+      "array": "asObject",
+      "indices": [
+        28
+      ]
+    },
     "oBitSPlatformTimer": {
       "array": "asS32",
       "indices": [
@@ -15706,6 +15718,12 @@
         29
       ]
     },
+    "oBooParentBigBoo": {
+      "array": "asObject",
+      "indices": [
+        32
+      ]
+    },
     "oBooTargetOpacity": {
       "array": "asS32",
       "indices": [
@@ -15847,12 +15865,24 @@
         27
       ]
     },
+    "oBowserPuzzlePieceActionList": {
+      "array": "asVoidPtr",
+      "indices": [
+        33
+      ]
+    },
     "oBowserPuzzlePieceContinuePerformingAction": {
       "array": "asS32",
       "indices": [
         32
       ]
     },
+    "oBowserPuzzlePieceNextAction": {
+      "array": "asVoidPtr",
+      "indices": [
+        34
+      ]
+    },
     "oBowserPuzzlePieceOffsetX": {
       "array": "asF32",
       "indices": [
@@ -16180,6 +16210,12 @@
         32
       ]
     },
+    "oChainChompSegments": {
+      "array": "asChainSegment",
+      "indices": [
+        27
+      ]
+    },
     "oChainChompTargetPitch": {
       "array": "asS32",
       "indices": [
@@ -16769,6 +16805,12 @@
         1
       ]
     },
+    "oFlameBowser": {
+      "array": "asObject",
+      "indices": [
+        30
+      ]
+    },
     "oFlameScale": {
       "array": "asF32",
       "indices": [
@@ -16823,6 +16865,12 @@
         29
       ]
     },
+    "oFloor": {
+      "array": "asSurface",
+      "indices": [
+        78
+      ]
+    },
     "oFloorHeight": {
       "array": "asF32",
       "indices": [
@@ -16999,6 +17047,12 @@
         0
       ]
     },
+    "oHauntedChairUnk100": {
+      "array": "asS32P",
+      "indices": [
+        30
+      ]
+    },
     "oHauntedChairUnk104": {
       "array": "asS32",
       "indices": [
@@ -17053,6 +17107,18 @@
         27
       ]
     },
+    "oHiddenBlueCoinSwitch": {
+      "array": "asObject",
+      "indices": [
+        28
+      ]
+    },
+    "oHiddenObjectPurpleSwitch": {
+      "array": "asObject",
+      "indices": [
+        27
+      ]
+    },
     "oHiddenStarTriggerCounter": {
       "array": "asS32",
       "indices": [
@@ -17173,6 +17239,12 @@
         66
       ]
     },
+    "oIntroLakituCloud": {
+      "array": "asObject",
+      "indices": [
+        73
+      ]
+    },
     "oIntroLakituSplineSegment": {
       "array": "asF32",
       "indices": [
@@ -17233,6 +17305,12 @@
         32
       ]
     },
+    "oJRBSlidingBoxUnkF4": {
+      "array": "asObject",
+      "indices": [
+        27
+      ]
+    },
     "oJRBSlidingBoxUnkF8": {
       "array": "asS32",
       "indices": [
@@ -17744,6 +17822,12 @@
         27
       ]
     },
+    "oMontyMoleCurrentHole": {
+      "array": "asObject",
+      "indices": [
+        27
+      ]
+    },
     "oMontyMoleHeightRelativeToFloor": {
       "array": "asF32",
       "indices": [
@@ -17816,6 +17900,12 @@
         29
       ]
     },
+    "oMrBlizzardHeldObj": {
+      "array": "asObject",
+      "indices": [
+        28
+      ]
+    },
     "oMrBlizzardScale": {
       "array": "asF32",
       "indices": [
@@ -17888,6 +17978,12 @@
         61
       ]
     },
+    "oOpenableGrillPurpleSwitch": {
+      "array": "asObject",
+      "indices": [
+        27
+      ]
+    },
     "oOpenableGrillUnk88": {
       "array": "asS32",
       "indices": [
@@ -17912,12 +18008,24 @@
         46
       ]
     },
+    "oPathedPrevWaypoint": {
+      "array": "asWaypoint",
+      "indices": [
+        30
+      ]
+    },
     "oPathedPrevWaypointFlags": {
       "array": "asS32",
       "indices": [
         31
       ]
     },
+    "oPathedStartWaypoint": {
+      "array": "asWaypoint",
+      "indices": [
+        29
+      ]
+    },
     "oPathedTargetPitch": {
       "array": "asS32",
       "indices": [
@@ -17998,6 +18106,12 @@
         32
       ]
     },
+    "oPlatformOnTrackPrevWaypoint": {
+      "array": "asWaypoint",
+      "indices": [
+        30
+      ]
+    },
     "oPlatformOnTrackPrevWaypointFlags": {
       "array": "asS32",
       "indices": [
@@ -18010,6 +18124,12 @@
         28
       ]
     },
+    "oPlatformOnTrackStartWaypoint": {
+      "array": "asWaypoint",
+      "indices": [
+        29
+      ]
+    },
     "oPlatformOnTrackType": {
       "array": "asS16",
       "indices": [
@@ -18220,6 +18340,12 @@
         34
       ]
     },
+    "oRespawnerBehaviorToRespawn": {
+      "array": "asConstVoidPtr",
+      "indices": [
+        29
+      ]
+    },
     "oRespawnerMinSpawnDist": {
       "array": "asF32",
       "indices": [
@@ -18615,6 +18741,12 @@
         29
       ]
     },
+    "oStrongWindParticlePenguinObj": {
+      "array": "asObject",
+      "indices": [
+        27
+      ]
+    },
     "oSubAction": {
       "array": "asS32",
       "indices": [
@@ -18849,6 +18981,18 @@
         27
       ]
     },
+    "oTTCTreadmillBigSurface": {
+      "array": "asS16P",
+      "indices": [
+        27
+      ]
+    },
+    "oTTCTreadmillSmallSurface": {
+      "array": "asS16P",
+      "indices": [
+        28
+      ]
+    },
     "oTTCTreadmillSpeed": {
       "array": "asF32",
       "indices": [
@@ -18921,6 +19065,12 @@
         74
       ]
     },
+    "oToxBoxActionTable": {
+      "array": "asVoidPtr",
+      "indices": [
+        73
+      ]
+    },
     "oTreasureChestUnkF4": {
       "array": "asS32",
       "indices": [
@@ -19415,6 +19565,12 @@
         27
       ]
     },
+    "oWigglerSegments": {
+      "array": "asChainSegment",
+      "indices": [
+        28
+      ]
+    },
     "oWigglerSquishSpeed": {
       "array": "asF32",
       "indices": [