Fix oob read/write caused to sync_object_init_field (#1117)

src/game/behaviors/activated_bf_plat.inc.c

@@ -57,19 +57,19 @@ void bhv_activated_back_and_forth_platform_init(void) {
     o->oActivatedBackAndForthPlatformStartYaw = o->oFaceAngleYaw;
 
     sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-    sync_object_init_field(o, &o->oPosX);
-    sync_object_init_field(o, &o->oPosY);
-    sync_object_init_field(o, &o->oPosZ);
-    sync_object_init_field(o, &o->oVelX);
-    sync_object_init_field(o, &o->oVelY);
-    sync_object_init_field(o, &o->oVelZ);
-    sync_object_init_field(o, &o->oActivatedBackAndForthPlatformMaxOffset);
-    sync_object_init_field(o, &o->oActivatedBackAndForthPlatformOffset);
-    sync_object_init_field(o, &o->oActivatedBackAndForthPlatformVel);
-    sync_object_init_field(o, &o->oActivatedBackAndForthPlatformCountdown);
-    sync_object_init_field(o, &o->oActivatedBackAndForthPlatformStartYaw);
-    sync_object_init_field(o, &o->oActivatedBackAndForthPlatformVertical);
-    sync_object_init_field(o, &o->oActivatedBackAndForthPlatformFlipRotation);
+    sync_object_init_field(o, o->oPosX);
+    sync_object_init_field(o, o->oPosY);
+    sync_object_init_field(o, o->oPosZ);
+    sync_object_init_field(o, o->oVelX);
+    sync_object_init_field(o, o->oVelY);
+    sync_object_init_field(o, o->oVelZ);
+    sync_object_init_field(o, o->oActivatedBackAndForthPlatformMaxOffset);
+    sync_object_init_field(o, o->oActivatedBackAndForthPlatformOffset);
+    sync_object_init_field(o, o->oActivatedBackAndForthPlatformVel);
+    sync_object_init_field(o, o->oActivatedBackAndForthPlatformCountdown);
+    sync_object_init_field(o, o->oActivatedBackAndForthPlatformStartYaw);
+    sync_object_init_field(o, o->oActivatedBackAndForthPlatformVertical);
+    sync_object_init_field(o, o->oActivatedBackAndForthPlatformFlipRotation);
 }
 
 /**

src/game/behaviors/amp.inc.c

@@ -207,14 +207,14 @@ void bhv_homing_amp_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, 4000.0f);
         if (so) {
-            sync_object_init_field(o, &o->oAmpYPhase);
-            sync_object_init_field(o, &o->oAnimState);
-            sync_object_init_field(o, &o->oFaceAnglePitch);
-            sync_object_init_field(o, &o->oFaceAngleYaw);
-            sync_object_init_field(o, &o->oForwardVel);
-            sync_object_init_field(o, &o->oFriction);
-            sync_object_init_field(o, &o->oHomingAmpAvgY);
-            sync_object_init_field(o, &o->oHomingAmpLockedOn);
+            sync_object_init_field(o, o->oAmpYPhase);
+            sync_object_init_field(o, o->oAnimState);
+            sync_object_init_field(o, o->oFaceAnglePitch);
+            sync_object_init_field(o, o->oFaceAngleYaw);
+            sync_object_init_field(o, o->oForwardVel);
+            sync_object_init_field(o, o->oFriction);
+            sync_object_init_field(o, o->oHomingAmpAvgY);
+            sync_object_init_field(o, o->oHomingAmpLockedOn);
         }
     }
 
@@ -354,12 +354,12 @@ void bhv_circling_amp_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, 4000.0f);
         if (so) {
-            sync_object_init_field(o, &o->oAmpYPhase);
-            sync_object_init_field(o, &o->oAnimState);
-            sync_object_init_field(o, &o->oFaceAnglePitch);
-            sync_object_init_field(o, &o->oFaceAngleYaw);
-            sync_object_init_field(o, &o->oForwardVel);
-            sync_object_init_field(o, &o->oFriction);
+            sync_object_init_field(o, o->oAmpYPhase);
+            sync_object_init_field(o, o->oAnimState);
+            sync_object_init_field(o, o->oFaceAnglePitch);
+            sync_object_init_field(o, o->oFaceAngleYaw);
+            sync_object_init_field(o, o->oForwardVel);
+            sync_object_init_field(o, o->oFriction);
         }
     }
 

src/game/behaviors/arrow_lift.inc.c

@@ -62,9 +62,9 @@ void bhv_arrow_lift_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
-            sync_object_init_field(o, &o->oTimer);
-            sync_object_init_field(o, &o->oPrevAction);
-            sync_object_init_field(o, &o->oAction);
+            sync_object_init_field(o, o->oTimer);
+            sync_object_init_field(o, o->oPrevAction);
+            sync_object_init_field(o, o->oAction);
         }
     }
 

src/game/behaviors/bbh_haunted_bookshelf.inc.c

@@ -10,10 +10,10 @@
 void bhv_haunted_bookshelf_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oTimer);
-        sync_object_init_field(o, &o->oPosX);
-        sync_object_init_field(o, &o->oHauntedBookshelfShouldOpen);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oTimer);
+        sync_object_init_field(o, o->oPosX);
+        sync_object_init_field(o, o->oHauntedBookshelfShouldOpen);
     }
 
     // oDistanceToMario is unused by this object.

src/game/behaviors/bbh_tilting_trap.inc.c

@@ -12,8 +12,8 @@ void bhv_bbh_tilting_trap_platform_loop(void) {
 
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 1000.0f);
-        sync_object_init_field(o, &o->oAngleVelPitch);
-        sync_object_init_field(o, &o->oFaceAnglePitch);
+        sync_object_init_field(o, o->oAngleVelPitch);
+        sync_object_init_field(o, o->oFaceAnglePitch);
     }
 
     f32 x = 0;

src/game/behaviors/blue_coin.inc.c

@@ -120,12 +120,12 @@ void bhv_blue_coin_switch_init(void) {
 void bhv_blue_coin_switch_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oVelY);
-        sync_object_init_field(o, &o->oGravity);
-        sync_object_init_field(o, &o->oTimer);
-        sync_object_init_field(o, &o->oPosY);
-        sync_object_init_field(o, &o->oHomeY);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oVelY);
+        sync_object_init_field(o, o->oGravity);
+        sync_object_init_field(o, o->oTimer);
+        sync_object_init_field(o, o->oPosY);
+        sync_object_init_field(o, o->oHomeY);
     }
 
     // The switch's model is 1/3 size.

src/game/behaviors/bobomb.inc.c

@@ -300,9 +300,9 @@ void bhv_bobomb_buddy_init(void) {
 
     if (o->oBobombBuddyRole == BOBOMB_BUDDY_ROLE_CANNON) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oBobombBuddyHasTalkedToMario);
-        sync_object_init_field(o, &o->oBobombBuddyCannonStatus);
-        sync_object_init_field(o, &forceCannonOpen);
+        sync_object_init_field(o, o->oBobombBuddyHasTalkedToMario);
+        sync_object_init_field(o, o->oBobombBuddyCannonStatus);
+        sync_object_init_field(o, forceCannonOpen);
     }
 }
 

src/game/behaviors/boo.inc.c

@@ -27,20 +27,20 @@ struct SyncObject* boo_sync_object_init(void) {
     struct SyncObject *so = sync_object_init(o, 4000.0f);
     if (so == NULL) { return NULL; }
     so->ignore_if_true = boo_ignore_update;
-    sync_object_init_field(o, &o->oBooBaseScale);
-    sync_object_init_field(o, &o->oBooNegatedAggressiveness);
-    sync_object_init_field(o, &o->oBooOscillationTimer);
-    sync_object_init_field(o, &o->oBooTargetOpacity);
-    sync_object_init_field(o, &o->oBooTurningSpeed);
-    sync_object_init_field(o, &o->oFaceAngleRoll);
-    sync_object_init_field(o, &o->oFaceAngleYaw);
-    sync_object_init_field(o, &o->oFlags);
-    sync_object_init_field(o, &o->oForwardVel);
-    sync_object_init_field(o, &o->oHealth);
-    sync_object_init_field(o, &o->oInteractStatus);
-    sync_object_init_field(o, &o->oInteractType);
-    sync_object_init_field(o, &o->oOpacity);
-    sync_object_init_field(o, &o->oRoom);
+    sync_object_init_field(o, o->oBooBaseScale);
+    sync_object_init_field(o, o->oBooNegatedAggressiveness);
+    sync_object_init_field(o, o->oBooOscillationTimer);
+    sync_object_init_field(o, o->oBooTargetOpacity);
+    sync_object_init_field(o, o->oBooTurningSpeed);
+    sync_object_init_field(o, o->oFaceAngleRoll);
+    sync_object_init_field(o, o->oFaceAngleYaw);
+    sync_object_init_field(o, o->oFlags);
+    sync_object_init_field(o, o->oForwardVel);
+    sync_object_init_field(o, o->oHealth);
+    sync_object_init_field(o, o->oInteractStatus);
+    sync_object_init_field(o, o->oInteractType);
+    sync_object_init_field(o, o->oOpacity);
+    sync_object_init_field(o, o->oRoom);
     return so;
 }
 
@@ -862,8 +862,8 @@ void bhv_boo_with_cage_loop(void) {
 void bhv_merry_go_round_boo_manager_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oMerryGoRoundBooManagerNumBoosSpawned);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oMerryGoRoundBooManagerNumBoosSpawned);
     }
 
     struct Object* player = nearest_player_to_object(o);

src/game/behaviors/boo_cage.inc.c

@@ -32,13 +32,13 @@ void bhv_boo_cage_init(void) {
     struct SyncObject* so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
     if (so == NULL) { return; }
     so->on_received_post = bhv_boo_cage_on_received_post;
-    sync_object_init_field(o, &o->oAction);
-    sync_object_init_field(o, &o->oPosX);
-    sync_object_init_field(o, &o->oPosY);
-    sync_object_init_field(o, &o->oPosZ);
-    sync_object_init_field(o, &o->oVelX);
-    sync_object_init_field(o, &o->oVelY);
-    sync_object_init_field(o, &o->oVelZ);
+    sync_object_init_field(o, o->oAction);
+    sync_object_init_field(o, o->oPosX);
+    sync_object_init_field(o, o->oPosY);
+    sync_object_init_field(o, o->oPosZ);
+    sync_object_init_field(o, o->oVelX);
+    sync_object_init_field(o, o->oVelY);
+    sync_object_init_field(o, o->oVelZ);
 }
 
 /**

src/game/behaviors/boulder.inc.c

@@ -53,7 +53,7 @@ void bhv_big_boulder_loop(void) {
 void bhv_big_boulder_generator_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oTimer);
+        sync_object_init_field(o, o->oTimer);
     }
 
     struct Object *sp1C;

src/game/behaviors/bowser.inc.c

@@ -50,14 +50,14 @@ s16 D_8032F520[][3] = { { 1, 10, 40 },   { 0, 0, 74 },    { -1, -10, 114 },  { 1
 
 void bhv_bowser_tail_anchor_init(void) {
     if (!o->parentObj) { mark_obj_for_deletion(o); return; }
-    sync_object_init_field(o->parentObj, &o->oAction);
-    sync_object_init_field(o->parentObj, &o->oPrevAction);
-    sync_object_init_field(o->parentObj, &o->oTimer);
-    sync_object_init_field(o->parentObj, &o->oIntangibleTimer);
-    sync_object_init_field(o->parentObj, &o->oInteractStatus);
-    sync_object_init_field(o->parentObj, &o->header.gfx.scale[0]);
-    sync_object_init_field(o->parentObj, &o->header.gfx.scale[1]);
-    sync_object_init_field(o->parentObj, &o->header.gfx.scale[2]);
+    sync_object_init_field(o->parentObj, o->oAction);
+    sync_object_init_field(o->parentObj, o->oPrevAction);
+    sync_object_init_field(o->parentObj, o->oTimer);
+    sync_object_init_field(o->parentObj, o->oIntangibleTimer);
+    sync_object_init_field(o->parentObj, o->oInteractStatus);
+    sync_object_init_field(o->parentObj, o->header.gfx.scale[0]);
+    sync_object_init_field(o->parentObj, o->header.gfx.scale[1]);
+    sync_object_init_field(o->parentObj, o->header.gfx.scale[2]);
 }
 
 void bhv_bowser_tail_anchor_loop(void) {
@@ -112,10 +112,10 @@ void bhv_bowser_flame_spawn_loop(void) {
 
 void bhv_bowser_body_anchor_init(void) {
     if (!o->parentObj) { mark_obj_for_deletion(o); return; }
-    sync_object_init_field(o->parentObj, &o->oInteractType);
-    sync_object_init_field(o->parentObj, &o->oInteractStatus);
-    sync_object_init_field(o->parentObj, &o->oIntangibleTimer);
-    sync_object_init_field(o->parentObj, &o->oDamageOrCoinValue);
+    sync_object_init_field(o->parentObj, o->oInteractType);
+    sync_object_init_field(o->parentObj, o->oInteractStatus);
+    sync_object_init_field(o->parentObj, o->oIntangibleTimer);
+    sync_object_init_field(o->parentObj, o->oDamageOrCoinValue);
 }
 
 void bhv_bowser_body_anchor_loop(void) {
@@ -1077,12 +1077,12 @@ void bowser_act_dead(void) {
 
 void bhv_tilting_bowser_lava_platform_init(void) {
     sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-    sync_object_init_field(o, &o->oAngleVelPitch);
-    sync_object_init_field(o, &o->oAngleVelRoll);
-    sync_object_init_field(o, &o->oFaceAnglePitch);
-    sync_object_init_field(o, &o->oFaceAngleRoll);
-    sync_object_init_field(o, &o->oMoveAnglePitch);
-    sync_object_init_field(o, &o->oMoveAngleRoll);
+    sync_object_init_field(o, o->oAngleVelPitch);
+    sync_object_init_field(o, o->oAngleVelRoll);
+    sync_object_init_field(o, o->oFaceAnglePitch);
+    sync_object_init_field(o, o->oFaceAngleRoll);
+    sync_object_init_field(o, o->oMoveAnglePitch);
+    sync_object_init_field(o, o->oMoveAngleRoll);
 }
 
 void bowser_tilt_platform(struct Object* platform, s16 a1) {
@@ -1445,13 +1445,13 @@ void bhv_bowser_init(void) {
             so->ignore_if_true = bhv_bowser_ignore_if_true;
             so->on_received_post = bhv_bowser_on_received_post;
             so->fullObjectSync = TRUE;
-            sync_object_init_field_with_size(o, &o->header.gfx.node.flags, 16);
-            sync_object_init_field_with_size(o, &o->header.gfx.animInfo.animFrame, 16);
-            sync_object_init_field_with_size(o, &bowserCutsceneGlobalIndex, 8);
-            sync_object_init_field(o, &networkBowserAnimationIndex);
-            sync_object_init_field(o, &o->header.gfx.scale[0]);
-            sync_object_init_field(o, &o->header.gfx.scale[1]);
-            sync_object_init_field(o, &o->header.gfx.scale[2]);
+            sync_object_init_field(o, o->header.gfx.node.flags);
+            sync_object_init_field(o, o->header.gfx.animInfo.animFrame);
+            sync_object_init_field(o, bowserCutsceneGlobalIndex);
+            sync_object_init_field(o, networkBowserAnimationIndex);
+            sync_object_init_field(o, o->header.gfx.scale[0]);
+            sync_object_init_field(o, o->header.gfx.scale[1]);
+            sync_object_init_field(o, o->header.gfx.scale[2]);
         }
     }
 }
@@ -1692,9 +1692,9 @@ void bhv_falling_bowser_platform_loop(void) {
         struct SyncObject* so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
             so->ignore_if_true = bhv_falling_bowser_platform_ignore_if_true;
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oPrevAction);
-            sync_object_init_field(o, &o->oTimer);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oPrevAction);
+            sync_object_init_field(o, o->oTimer);
         }
     }
 

src/game/behaviors/bowser_bomb.inc.c

@@ -33,7 +33,7 @@ void bhv_bowser_bomb_loop(void) {
         struct SyncObject* so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
             so->syncDeathEvent = FALSE;
-            sync_object_init_field(o, &networkBowserBombHit);
+            sync_object_init_field(o, networkBowserBombHit);
         }
     }
 

src/game/behaviors/bowser_puzzle_piece.inc.c

@@ -132,9 +132,9 @@ void bhv_lll_bowser_puzzle_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oPrevAction);
-            sync_object_init_field(o, &o->oBowserPuzzleCompletionFlags);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oPrevAction);
+            sync_object_init_field(o, o->oBowserPuzzleCompletionFlags);
         }
     }
 

src/game/behaviors/breakable_box_small.inc.c

@@ -21,10 +21,10 @@ void bhv_breakable_box_small_init(void) {
     o->oAnimState = 1;
     o->activeFlags |= ACTIVE_FLAG_UNK9;
     sync_object_init(o, 1000.0f);
-    sync_object_init_field(o, &o->oBreakableBoxSmallReleased);
-    sync_object_init_field(o, &o->oBreakableBoxSmallFramesSinceReleased);
-    sync_object_init_field(o, &o->oAnimState);
-    sync_object_init_field(o, &o->oFlags);
+    sync_object_init_field(o, o->oBreakableBoxSmallReleased);
+    sync_object_init_field(o, o->oBreakableBoxSmallFramesSinceReleased);
+    sync_object_init_field(o, o->oAnimState);
+    sync_object_init_field(o, o->oFlags);
 }
 
 void small_breakable_box_spawn_dust(void) {

src/game/behaviors/breakable_wall.inc.c

@@ -3,7 +3,7 @@
 void bhv_wf_breakable_wall_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oBreakableWallForce);
+        sync_object_init_field(o, o->oBreakableWallForce);
     }
 
     if (o->oBreakableWallForce || gMarioStates[0].action == ACT_SHOT_FROM_CANNON) {

src/game/behaviors/bub.inc.c

@@ -121,11 +121,11 @@ void bhv_bub_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, 4000.0f);
         if (so) {
-            sync_object_init_field(o, &o->oCheepCheepUnkF4);
-            sync_object_init_field(o, &o->oCheepCheepUnkF8);
-            sync_object_init_field(o, &o->oCheepCheepUnkFC);
-            sync_object_init_field(o, &o->oCheepCheepUnk104);
-            sync_object_init_field(o, &o->oCheepCheepUnk108);
+            sync_object_init_field(o, o->oCheepCheepUnkF4);
+            sync_object_init_field(o, o->oCheepCheepUnkF8);
+            sync_object_init_field(o, o->oCheepCheepUnkFC);
+            sync_object_init_field(o, o->oCheepCheepUnk104);
+            sync_object_init_field(o, o->oCheepCheepUnk108);
         }
     }
 

src/game/behaviors/bubba.inc.c

@@ -111,17 +111,17 @@ void bubba_act_1(void) {
 void bhv_bubba_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oBubbaUnkF4);
-        sync_object_init_field(o, &o->oBubbaUnkF8);
-        sync_object_init_field(o, &o->oBubbaUnkFC);
-        sync_object_init_field(o, &o->oBubbaUnk100);
-        sync_object_init_field(o, &o->oBubbaUnk104);
-        sync_object_init_field(o, &o->oBubbaUnk108);
-        sync_object_init_field(o, &o->oBubbaUnk10C);
-        sync_object_init_field(o, &o->oBubbaUnk1AC);
-        sync_object_init_field(o, &o->oBubbaUnk1B0);
-        sync_object_init_field(o, &o->oAnimState);
-        sync_object_init_field(o, &o->oMoveAnglePitch);
+        sync_object_init_field(o, o->oBubbaUnkF4);
+        sync_object_init_field(o, o->oBubbaUnkF8);
+        sync_object_init_field(o, o->oBubbaUnkFC);
+        sync_object_init_field(o, o->oBubbaUnk100);
+        sync_object_init_field(o, o->oBubbaUnk104);
+        sync_object_init_field(o, o->oBubbaUnk108);
+        sync_object_init_field(o, o->oBubbaUnk10C);
+        sync_object_init_field(o, o->oBubbaUnk1AC);
+        sync_object_init_field(o, o->oBubbaUnk1B0);
+        sync_object_init_field(o, o->oAnimState);
+        sync_object_init_field(o, o->oMoveAnglePitch);
     }
 
     struct MarioState* marioState = nearest_mario_state_to_object(o);

src/game/behaviors/bullet_bill.inc.c

@@ -9,9 +9,9 @@ void bhv_bullet_bill_init(void) {
     o->oBulletBillInitialMoveYaw = o->oMoveAngleYaw;
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oFaceAnglePitch);
-        sync_object_init_field(o, &o->oFaceAngleRoll);
-        sync_object_init_field(o, &o->oForwardVel);
+        sync_object_init_field(o, o->oFaceAnglePitch);
+        sync_object_init_field(o, o->oFaceAngleRoll);
+        sync_object_init_field(o, o->oForwardVel);
     }
 }
 

src/game/behaviors/bully.inc.c

@@ -40,14 +40,14 @@ static void bhv_bully_override_ownership(u8* shouldOverride, u8* shouldOwn) {
 static void bhv_bully_network_init(void) {
     struct SyncObject* so = sync_object_init(o, 4000.0f);
     if (so) {
-        sync_object_init_field(o, &o->oFlags);
-        sync_object_init_field(o, &o->oBullyKBTimerAndMinionKOCounter);
-        sync_object_init_field(o, &o->oForwardVel);
-        sync_object_init_field(o, &o->oBullyPrevX);
-        sync_object_init_field(o, &o->oBullyPrevY);
-        sync_object_init_field(o, &o->oBullyPrevZ);
-        sync_object_init_field(o, &o->oBullyMarioCollisionAngle);
-        sync_object_init_field(o, &o->oBullyLastNetworkPlayerIndex);
+        sync_object_init_field(o, o->oFlags);
+        sync_object_init_field(o, o->oBullyKBTimerAndMinionKOCounter);
+        sync_object_init_field(o, o->oForwardVel);
+        sync_object_init_field(o, o->oBullyPrevX);
+        sync_object_init_field(o, o->oBullyPrevY);
+        sync_object_init_field(o, o->oBullyPrevZ);
+        sync_object_init_field(o, o->oBullyMarioCollisionAngle);
+        sync_object_init_field(o, o->oBullyLastNetworkPlayerIndex);
         so->syncDeathEvent = FALSE;
         so->ignore_if_true = bhv_bully_ignore_if_true;
         so->override_ownership = bhv_bully_override_ownership;

src/game/behaviors/camera_lakitu.inc.c

@@ -45,15 +45,15 @@ void bhv_camera_lakitu_init(void) {
             so->ignore_if_true = bhv_camera_lakitu_ignore_if_true;
             so->override_ownership = bhv_camera_lakitu_override_ownership;
             so->on_received_post = bhv_camera_lakitu_on_received_post;
-            sync_object_init_field(o, &o->oAngleVelPitch);
-            sync_object_init_field(o, &o->oFaceAnglePitch);
-            sync_object_init_field(o, &o->oCameraLakituBlinkTimer);
-            sync_object_init_field(o, &o->oCameraLakituSpeed);
-            sync_object_init_field(o, &o->oCameraLakituCircleRadius);
-            sync_object_init_field(o, &o->oCameraLakituFinishedDialog);
-            sync_object_init_field(o, &o->oCameraLakituPitchVel);
+            sync_object_init_field(o, o->oAngleVelPitch);
+            sync_object_init_field(o, o->oFaceAnglePitch);
+            sync_object_init_field(o, o->oCameraLakituBlinkTimer);
+            sync_object_init_field(o, o->oCameraLakituSpeed);
+            sync_object_init_field(o, o->oCameraLakituCircleRadius);
+            sync_object_init_field(o, o->oCameraLakituFinishedDialog);
+            sync_object_init_field(o, o->oCameraLakituPitchVel);
 #ifndef VERSION_JP
-            sync_object_init_field(o, &o->oCameraLakituUnk104);
+            sync_object_init_field(o, o->oCameraLakituUnk104);
 #endif
         }
     }

src/game/behaviors/cannon.inc.c

@@ -218,16 +218,16 @@ void bhv_cannon_base_loop(void) {
         if (so) {
             so->on_received_post = cannon_on_received_post;
             so->override_ownership = bhv_cannon_override_ownership;
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oPrevAction);
-            sync_object_init_field(o, &o->oTimer);
-            sync_object_init_field(o, &o->oPosX);
-            sync_object_init_field(o, &o->oPosY);
-            sync_object_init_field(o, &o->oPosZ);
-            sync_object_init_field(o, &o->oCannonUnk10C);
-            sync_object_init_field(o, &o->oCannonUnk10C);
-            sync_object_init_field(o, &o->oCannonUnkF8);
-            sync_object_init_field(o, &o->oCannonUnkF4);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oPrevAction);
+            sync_object_init_field(o, o->oTimer);
+            sync_object_init_field(o, o->oPosX);
+            sync_object_init_field(o, o->oPosY);
+            sync_object_init_field(o, o->oPosZ);
+            sync_object_init_field(o, o->oCannonUnk10C);
+            sync_object_init_field(o, o->oCannonUnk10C);
+            sync_object_init_field(o, o->oCannonUnkF8);
+            sync_object_init_field(o, o->oCannonUnkF4);
         }
     }
 

src/game/behaviors/capswitch.inc.c

@@ -62,7 +62,7 @@ void (*sCapSwitchActions[])(void) = { cap_switch_act_0, cap_switch_act_1,
 void bhv_cap_switch_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &capSwitchForcePress);
+        sync_object_init_field(o, capSwitchForcePress);
     }
 
     CUR_OBJ_CALL_ACTION_FUNCTION(sCapSwitchActions);

src/game/behaviors/chain_chomp.inc.c

@@ -482,8 +482,8 @@ void bhv_chain_chomp_update(void) {
         struct SyncObject* so = sync_object_init(o, 1000.0f);
         if (so) {
             so->syncDeathEvent = FALSE;
-            sync_object_init_field(o, &o->oChainChompUnk104);
-            sync_object_init_field_with_size(o, &o->header.gfx.animInfo.animFrame, 16);
+            sync_object_init_field(o, o->oChainChompUnk104);
+            sync_object_init_field(o, o->header.gfx.animInfo.animFrame);
         }
     }
 
@@ -506,12 +506,12 @@ void bhv_chain_chomp_update(void) {
 void bhv_wooden_post_update(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oBehParams);
-        sync_object_init_field(o, &o->oWoodenPostMarioPounding);
-        sync_object_init_field(o, &o->oWoodenPostOffsetY);
-        sync_object_init_field(o, &o->oWoodenPostSpeedY);
-        sync_object_init_field(o, &o->oWoodenPostTotalMarioAngle);
-        sync_object_init_field(o, &o->oTimer);
+        sync_object_init_field(o, o->oBehParams);
+        sync_object_init_field(o, o->oWoodenPostMarioPounding);
+        sync_object_init_field(o, o->oWoodenPostOffsetY);
+        sync_object_init_field(o, o->oWoodenPostSpeedY);
+        sync_object_init_field(o, o->oWoodenPostTotalMarioAngle);
+        sync_object_init_field(o, o->oTimer);
     }
 
     // When ground pounded by mario, drop by -45 + -20

src/game/behaviors/chuckya.inc.c

@@ -227,11 +227,11 @@ void bhv_chuckya_loop(void) {
         if (so != NULL) {
             so->override_ownership = bhv_chuckya_override_ownership;
             so->ignore_if_true = bhv_chuckya_ignore_if_true;
-            sync_object_init_field(o, &o->oChuckyaUnk88);
-            sync_object_init_field(o, &o->oChuckyaUnkF8);
-            sync_object_init_field(o, &o->oChuckyaUnkFC);
-            sync_object_init_field(o, &o->oChuckyaUnk100);
-            sync_object_init_field(o, &o->oFaceAnglePitch);
+            sync_object_init_field(o, o->oChuckyaUnk88);
+            sync_object_init_field(o, o->oChuckyaUnkF8);
+            sync_object_init_field(o, o->oChuckyaUnkFC);
+            sync_object_init_field(o, o->oChuckyaUnk100);
+            sync_object_init_field(o, o->oFaceAnglePitch);
         }
     }
 

src/game/behaviors/clam.inc.c

@@ -58,9 +58,9 @@ void clam_act_1(void) {
 void bhv_clam_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oTimer);
-        sync_object_init_field(o, &o->oClamUnkF4);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oTimer);
+        sync_object_init_field(o, o->oClamUnkF4);
     }
     o->header.gfx.scale[1] = 1.5f;
 

src/game/behaviors/cloud.inc.c

@@ -58,12 +58,12 @@ static void cloud_act_fwoosh_hidden(void) {
 static void cloud_fwoosh_update(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->header.gfx.scale[0]);
-        sync_object_init_field(o, &o->oCloudCenterX);
-        sync_object_init_field(o, &o->oCloudCenterY);
-        sync_object_init_field(o, &o->oCloudBlowing);
-        sync_object_init_field(o, &o->oCloudGrowSpeed);
-        sync_object_init_field(o, &o->oCloudFwooshMovementRadius);
+        sync_object_init_field(o, o->header.gfx.scale[0]);
+        sync_object_init_field(o, o->oCloudCenterX);
+        sync_object_init_field(o, o->oCloudCenterY);
+        sync_object_init_field(o, o->oCloudBlowing);
+        sync_object_init_field(o, o->oCloudGrowSpeed);
+        sync_object_init_field(o, o->oCloudFwooshMovementRadius);
     }
 
     struct Object* player = nearest_player_to_object(o);

src/game/behaviors/controllable_platform.inc.c

@@ -85,30 +85,30 @@ void bhv_controllable_platform_init(void) {
     struct SyncObject* so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
     if (so != NULL) {
         so->on_received_post = bhv_controllable_platform_on_received_post;
-        sync_object_init_field(o, &o->oPosX);
-        sync_object_init_field(o, &o->oPosY);
-        sync_object_init_field(o, &o->oPosZ);
-        sync_object_init_field(o, &o->oVelX);
-        sync_object_init_field(o, &o->oVelY);
-        sync_object_init_field(o, &o->oVelZ);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oPrevAction);
-        sync_object_init_field(o, &o->oTimer);
-        sync_object_init_field_with_size(o, &o->activeFlags, 16);
-        sync_object_init_field_with_size(o, &D_80331694, 8);
-        sync_object_init_field_with_size(o, &o->header.gfx.node.flags, 16);
+        sync_object_init_field(o, o->oPosX);
+        sync_object_init_field(o, o->oPosY);
+        sync_object_init_field(o, o->oPosZ);
+        sync_object_init_field(o, o->oVelX);
+        sync_object_init_field(o, o->oVelY);
+        sync_object_init_field(o, o->oVelZ);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oPrevAction);
+        sync_object_init_field(o, o->oTimer);
+        sync_object_init_field(o, o->activeFlags);
+        sync_object_init_field(o, D_80331694);
+        sync_object_init_field(o, o->header.gfx.node.flags);
 
-        sync_object_init_field(o, &o->oControllablePlatformUnkF8);
-        sync_object_init_field(o, &o->oControllablePlatformUnkFC);
-        sync_object_init_field(o, &o->oControllablePlatformUnk100);
-        sync_object_init_field(o, &o->oFaceAnglePitch);
-        sync_object_init_field(o, &o->oFaceAngleRoll);
+        sync_object_init_field(o, o->oControllablePlatformUnkF8);
+        sync_object_init_field(o, o->oControllablePlatformUnkFC);
+        sync_object_init_field(o, o->oControllablePlatformUnk100);
+        sync_object_init_field(o, o->oFaceAnglePitch);
+        sync_object_init_field(o, o->oFaceAngleRoll);
         for (s32 i = 0; i < 4; i++) {
             if (controllablePlatformSubs[i] == NULL) { continue; }
-            sync_object_init_field(o, &controllablePlatformSubs[i]->oAction);
-            sync_object_init_field(o, &controllablePlatformSubs[i]->oPrevAction);
-            sync_object_init_field(o, &controllablePlatformSubs[i]->oTimer);
-            sync_object_init_field(o, &controllablePlatformSubs[i]->oParentRelativePosY);
+            sync_object_init_field(o, controllablePlatformSubs[i]->oAction);
+            sync_object_init_field(o, controllablePlatformSubs[i]->oPrevAction);
+            sync_object_init_field(o, controllablePlatformSubs[i]->oTimer);
+            sync_object_init_field(o, controllablePlatformSubs[i]->oParentRelativePosY);
         }
     }
 }

src/game/behaviors/donut_platform.inc.c

@@ -31,8 +31,8 @@ void bhv_donut_platform_spawner_update(void) {
 void bhv_donut_platform_update(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oGravity);
-        sync_object_init_field(o, &o->oIntangibleTimer);
+        sync_object_init_field(o, o->oGravity);
+        sync_object_init_field(o, o->oIntangibleTimer);
     }
 
     struct Object* player = nearest_player_to_object(o);

src/game/behaviors/dorrie.inc.c

@@ -167,12 +167,12 @@ void bhv_dorrie_update(void) {
         struct SyncObject* so = sync_object_init(o, 4000.0f);
         if (so) {
             so->ignore_if_true = bhv_dorrie_ignore_if_true;
-            sync_object_init_field(o, &o->oDorrieOffsetY);
-            sync_object_init_field(o, &o->oDorrieVelY);
-            sync_object_init_field(o, &o->oDorrieYawVel);
-            sync_object_init_field(o, &o->oDorrieLiftingMario);
-            sync_object_init_field(o, &o->oDorrieNeckAngle);
-            sync_object_init_field(o, &o->oAngleVelYaw);
+            sync_object_init_field(o, o->oDorrieOffsetY);
+            sync_object_init_field(o, o->oDorrieVelY);
+            sync_object_init_field(o, o->oDorrieYawVel);
+            sync_object_init_field(o, o->oDorrieLiftingMario);
+            sync_object_init_field(o, o->oDorrieNeckAngle);
+            sync_object_init_field(o, o->oAngleVelYaw);
         }
     }
 

src/game/behaviors/drawbridge.inc.c

@@ -21,10 +21,10 @@ void bhv_lll_drawbridge_spawner_init(void) {
         sync_object_init(o, 3000.0f);
         for (s32 i = 0; i < 2; i++) {
             if (drawbridge[i] == NULL) { continue; }
-            sync_object_init_field(o, &drawbridge[i]->oFaceAngleRoll);
-            sync_object_init_field(o, &drawbridge[i]->oAction);
-            sync_object_init_field(o, &drawbridge[i]->oPrevAction);
-            sync_object_init_field(o, &drawbridge[i]->oTimer);
+            sync_object_init_field(o, drawbridge[i]->oFaceAngleRoll);
+            sync_object_init_field(o, drawbridge[i]->oAction);
+            sync_object_init_field(o, drawbridge[i]->oPrevAction);
+            sync_object_init_field(o, drawbridge[i]->oTimer);
         }
     }
 

src/game/behaviors/elevator.inc.c

@@ -136,9 +136,9 @@ void bhv_elevator_init(void) {
     }
 
     sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-    sync_object_init_field(o, &o->oAction);
-    sync_object_init_field(o, &o->oPosY);
-    sync_object_init_field(o, &o->oVelY);
+    sync_object_init_field(o, o->oAction);
+    sync_object_init_field(o, o->oPosY);
+    sync_object_init_field(o, o->oVelY);
 }
 
 void (*sElevatorActions[])(void) = { elevator_act_0, elevator_act_1, elevator_act_2, elevator_act_3,

src/game/behaviors/enemy_lakitu.inc.c

@@ -245,9 +245,9 @@ void bhv_enemy_lakitu_update(void) {
     // PARTIAL_UPDATE
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oEnemyLakituBlinkTimer);
-        sync_object_init_field(o, &o->oEnemyLakituSpinyCooldown);
-        sync_object_init_field(o, &o->oEnemyLakituFaceForwardCountdown);
+        sync_object_init_field(o, o->oEnemyLakituBlinkTimer);
+        sync_object_init_field(o, o->oEnemyLakituSpinyCooldown);
+        sync_object_init_field(o, o->oEnemyLakituFaceForwardCountdown);
     }
 
     treat_far_home_as_mario(2000.0f, NULL, NULL);

src/game/behaviors/exclamation_box.inc.c

@@ -187,8 +187,8 @@ void bhv_exclamation_box_init(void) {
     struct SyncObject* so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
     if (so) {
         so->syncDeathEvent = FALSE;
-        sync_object_init_field(o, &o->oExclamationBoxForce);
-        sync_object_init_field(o, &o->areaTimer);
+        sync_object_init_field(o, o->oExclamationBoxForce);
+        sync_object_init_field(o, o->areaTimer);
     }
 
     o->areaTimerType = AREA_TIMER_TYPE_MAXIMUM;

src/game/behaviors/express_elevator.inc.c

@@ -3,11 +3,11 @@
 void bhv_wdw_express_elevator_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oPrevAction);
-        sync_object_init_field(o, &o->oTimer);
-        sync_object_init_field(o, &o->oVelY);
-        sync_object_init_field(o, &o->oPosY);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oPrevAction);
+        sync_object_init_field(o, o->oTimer);
+        sync_object_init_field(o, o->oVelY);
+        sync_object_init_field(o, o->oPosY);
     }
 
     o->oVelY = 0.0f;

src/game/behaviors/eyerok.inc.c

@@ -79,34 +79,34 @@ void bhv_eyerok_boss_init(void) {
     so->minUpdateRate = 1.0f;
     so->maxUpdateRate = 1.0f;
     so->syncDeathEvent = FALSE;
-    sync_object_init_field(o, &o->oEyerokBossNumHands);
-    sync_object_init_field(o, &o->oEyerokBossUnkFC);
-    sync_object_init_field(o, &o->oEyerokBossActiveHand);
-    sync_object_init_field(o, &o->oEyerokBossUnk104);
-    sync_object_init_field(o, &o->oEyerokBossUnk108);
-    sync_object_init_field(o, &o->oEyerokBossUnk10C);
-    sync_object_init_field(o, &o->oEyerokBossUnk110);
-    sync_object_init_field(o, &o->oEyerokBossUnk1AC);
+    sync_object_init_field(o, o->oEyerokBossNumHands);
+    sync_object_init_field(o, o->oEyerokBossUnkFC);
+    sync_object_init_field(o, o->oEyerokBossActiveHand);
+    sync_object_init_field(o, o->oEyerokBossUnk104);
+    sync_object_init_field(o, o->oEyerokBossUnk108);
+    sync_object_init_field(o, o->oEyerokBossUnk10C);
+    sync_object_init_field(o, o->oEyerokBossUnk110);
+    sync_object_init_field(o, o->oEyerokBossUnk1AC);
     for (s32 i = 0; i < 2; i++) {
-        sync_object_init_field(o, &hands[i]->oPosX);
-        sync_object_init_field(o, &hands[i]->oPosY);
-        sync_object_init_field(o, &hands[i]->oPosZ);
-        sync_object_init_field(o, &hands[i]->oVelX);
-        sync_object_init_field(o, &hands[i]->oVelY);
-        sync_object_init_field(o, &hands[i]->oVelZ);
-        sync_object_init_field(o, &hands[i]->oForwardVel);
-        sync_object_init_field(o, &hands[i]->oAction);
-        sync_object_init_field(o, &hands[i]->oPrevAction);
-        sync_object_init_field(o, &hands[i]->oTimer);
-        sync_object_init_field(o, &hands[i]->oHealth);
-        sync_object_init_field(o, &hands[i]->oEyerokHandWakeUpTimer);
-        sync_object_init_field(o, &hands[i]->oEyerokReceivedAttack);
-        sync_object_init_field(o, &hands[i]->oEyerokHandUnkFC);
-        sync_object_init_field(o, &hands[i]->oEyerokHandUnk100);
-        sync_object_init_field(o, &hands[i]->oFaceAngleYaw);
-        sync_object_init_field(o, &hands[i]->oMoveAngleYaw);
-        sync_object_init_field(o, &hands[i]->oGravity);
-        sync_object_init_field(o, &hands[i]->oAnimState);
+        sync_object_init_field(o, hands[i]->oPosX);
+        sync_object_init_field(o, hands[i]->oPosY);
+        sync_object_init_field(o, hands[i]->oPosZ);
+        sync_object_init_field(o, hands[i]->oVelX);
+        sync_object_init_field(o, hands[i]->oVelY);
+        sync_object_init_field(o, hands[i]->oVelZ);
+        sync_object_init_field(o, hands[i]->oForwardVel);
+        sync_object_init_field(o, hands[i]->oAction);
+        sync_object_init_field(o, hands[i]->oPrevAction);
+        sync_object_init_field(o, hands[i]->oTimer);
+        sync_object_init_field(o, hands[i]->oHealth);
+        sync_object_init_field(o, hands[i]->oEyerokHandWakeUpTimer);
+        sync_object_init_field(o, hands[i]->oEyerokReceivedAttack);
+        sync_object_init_field(o, hands[i]->oEyerokHandUnkFC);
+        sync_object_init_field(o, hands[i]->oEyerokHandUnk100);
+        sync_object_init_field(o, hands[i]->oFaceAngleYaw);
+        sync_object_init_field(o, hands[i]->oMoveAngleYaw);
+        sync_object_init_field(o, hands[i]->oGravity);
+        sync_object_init_field(o, hands[i]->oAnimState);
     }
 }
 

src/game/behaviors/falling_rising_platform.inc.c

@@ -5,8 +5,8 @@ void bhv_squishable_platform_loop(void) {
         struct SyncObject* so = sync_object_init(o, 4000.0f);
         if (so) {
             so->minUpdateRate = 5.0f;
-            sync_object_init_field(o, &o->oPlatformTimer);
-            sync_object_init_field(o, &o->header.gfx.scale[1]);
+            sync_object_init_field(o, o->oPlatformTimer);
+            sync_object_init_field(o, o->header.gfx.scale[1]);
         }
     }
 
@@ -23,7 +23,7 @@ void bhv_bitfs_sinking_platform_loop(void) {
         struct SyncObject* so = sync_object_init(o, 4000.0f);
         if (so) {
             so->minUpdateRate = 5.0f;
-            sync_object_init_field(o, &o->oPlatformTimer);
+            sync_object_init_field(o, o->oPlatformTimer);
         }
     }
 
@@ -43,7 +43,7 @@ void bhv_bitfs_sinking_cage_platform_loop(void) {
         struct SyncObject* so = sync_object_init(o, 4000.0f);
         if (so) {
             so->minUpdateRate = 5.0f;
-            sync_object_init_field(o, &o->oPlatformTimer);
+            sync_object_init_field(o, o->oPlatformTimer);
         }
     }
 

src/game/behaviors/ferris_wheel.inc.c

@@ -52,7 +52,7 @@ void bhv_ferris_wheel_axle_init(void) {
     if (so) {
         so->hasStandardFields = FALSE;
         so->maxUpdateRate = 5.0f;
-        sync_object_init_field(o, &o->oFaceAngleRoll);
+        sync_object_init_field(o, o->oFaceAngleRoll);
     }
 }
 
@@ -61,9 +61,9 @@ void bhv_ferris_wheel_platform_init(void) {
     if (so) {
         so->hasStandardFields = FALSE;
         so->maxUpdateRate = 5.0f;
-        sync_object_init_field(o, &o->oPosX);
-        sync_object_init_field(o, &o->oPosY);
-        sync_object_init_field(o, &o->oPosZ);
+        sync_object_init_field(o, o->oPosX);
+        sync_object_init_field(o, o->oPosY);
+        sync_object_init_field(o, o->oPosZ);
     }
 }
 

src/game/behaviors/fire_piranha_plant.inc.c

@@ -46,8 +46,8 @@ void bhv_fire_piranha_plant_init(void) {
     sNumActiveFirePiranhaPlants = sNumKilledFirePiranhaPlants = 0;
 
     sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-    sync_object_init_field(o, &sNumActiveFirePiranhaPlants);
-    sync_object_init_field(o, &sNumKilledFirePiranhaPlants);
+    sync_object_init_field(o, sNumActiveFirePiranhaPlants);
+    sync_object_init_field(o, sNumKilledFirePiranhaPlants);
 }
 
 static void fire_piranha_plant_act_hide(void) {

src/game/behaviors/fire_spitter.inc.c

@@ -49,13 +49,13 @@ void bhv_fire_spitter_update(void) {
         struct SyncObject* so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
             so->on_received_post = bhv_fire_spitter_on_received_post;
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oPrevAction);
-            sync_object_init_field(o, &o->oTimer);
-            sync_object_init_field(o, &o->oFireSpitterScaleVel);
-            sync_object_init_field(o, &o->header.gfx.scale[0]);
-            sync_object_init_field(o, &o->header.gfx.scale[1]);
-            sync_object_init_field(o, &o->header.gfx.scale[2]);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oPrevAction);
+            sync_object_init_field(o, o->oTimer);
+            sync_object_init_field(o, o->oFireSpitterScaleVel);
+            sync_object_init_field(o, o->header.gfx.scale[0]);
+            sync_object_init_field(o, o->header.gfx.scale[1]);
+            sync_object_init_field(o, o->header.gfx.scale[2]);
         }
     }
 

src/game/behaviors/flamethrower.inc.c

@@ -36,9 +36,9 @@ void bhv_flamethrower_flame_loop(void) {
 void bhv_flamethrower_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oTimer);
-        sync_object_init_field(o, &o->oFlameThowerUnk110);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oTimer);
+        sync_object_init_field(o, o->oFlameThowerUnk110);
     }
     struct MarioState* marioState = nearest_mario_state_to_object(o);
     struct Object* player = marioState ? marioState->marioObj : NULL;

src/game/behaviors/fly_guy.inc.c

@@ -207,11 +207,11 @@ void bhv_fly_guy_update(void) {
 
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oFlyGuyOscTimer);
-        sync_object_init_field(o, &o->oFlyGuyLungeYDecel);
-        sync_object_init_field(o, &o->oFlyGuyLungeTargetPitch);
-        sync_object_init_field(o, &o->oFlyGuyTargetRoll);
-        sync_object_init_field(o, &o->oFlyGuyLungeTargetPitch);
+        sync_object_init_field(o, o->oFlyGuyOscTimer);
+        sync_object_init_field(o, o->oFlyGuyLungeYDecel);
+        sync_object_init_field(o, o->oFlyGuyLungeTargetPitch);
+        sync_object_init_field(o, o->oFlyGuyTargetRoll);
+        sync_object_init_field(o, o->oFlyGuyLungeTargetPitch);
     }
 
     if (!(o->activeFlags & ACTIVE_FLAG_IN_DIFFERENT_ROOM)) {

src/game/behaviors/flying_bookend_switch.inc.c

@@ -279,13 +279,13 @@ void bhv_haunted_bookshelf_manager_loop(void) {
             so->syncDeathEvent = FALSE;
             so->override_ownership = bhv_haunted_bookshelf_manager_override_ownership;
             so->ignore_if_true = bhv_haunted_bookshelf_manager_ignore_if_true;
-            sync_object_init_field_with_size(o, &o->activeFlags, 16);
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oBookSwitchManagerUnkF8);
-            sync_object_init_field(o, &o->oBookSwitchManagerUnkF4);
-            sync_object_init_field(o, &o->oTimer);
-            sync_object_init_field(o, &o->oPosX);
-            sync_object_init_field(o, &o->oForwardVel);
+            sync_object_init_field(o, o->activeFlags);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oBookSwitchManagerUnkF8);
+            sync_object_init_field(o, o->oBookSwitchManagerUnkF4);
+            sync_object_init_field(o, o->oTimer);
+            sync_object_init_field(o, o->oPosX);
+            sync_object_init_field(o, o->oForwardVel);
         }
     }
 
@@ -315,12 +315,12 @@ void bhv_book_switch_loop(void) {
             so->override_ownership = bhv_haunted_bookshelf_manager_override_ownership;
             so->ignore_if_true = bhv_haunted_bookshelf_manager_ignore_if_true;
 
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oBookSwitchUnkF4);
-            sync_object_init_field(o, &o->oIntangibleTimer);
-            sync_object_init_field(o, &o->oPosX);
-            sync_object_init_field(o, &o->oPosZ);
-            sync_object_init_field(o, &o->oTimer);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oBookSwitchUnkF4);
+            sync_object_init_field(o, o->oIntangibleTimer);
+            sync_object_init_field(o, o->oPosX);
+            sync_object_init_field(o, o->oPosZ);
+            sync_object_init_field(o, o->oTimer);
         }
     }
 

src/game/behaviors/goomba.inc.c

@@ -117,8 +117,8 @@ void bhv_goomba_init(void) {
     o->oGravity = -8.0f / 3.0f * o->oGoombaScale;
 
     sync_object_init(o, 4000.0f);
-    sync_object_init_field(o, &o->oGoombaTargetYaw);
-    sync_object_init_field(o, &o->oGoombaWalkTimer);
+    sync_object_init_field(o, o->oGoombaTargetYaw);
+    sync_object_init_field(o, o->oGoombaWalkTimer);
 }
 
 /**

src/game/behaviors/grand_star.inc.c

@@ -26,27 +26,27 @@ void bhv_grand_star_init(void) {
         if (!sync_object_is_initialized(o->oSyncID)) {
             struct SyncObject *so = sync_object_init(o, 4000.0f);
             if (so) {
-                sync_object_init_field(o, &o->header.gfx.scale[0]);
-                sync_object_init_field(o, &o->header.gfx.scale[1]);
-                sync_object_init_field(o, &o->header.gfx.scale[2]);
-                sync_object_init_field(o, &o->oPrevAction);
-                sync_object_init_field(o, &o->oAction);
-                sync_object_init_field(o, &o->oSubAction);
-                sync_object_init_field(o, &o->oInteractStatus);
-                sync_object_init_field(o, &o->oTimer);
-                sync_object_init_field(o, &o->oHomeX);
-                sync_object_init_field(o, &o->oHomeY);
-                sync_object_init_field(o, &o->oHomeZ);
-                sync_object_init_field(o, &o->oPosX);
-                sync_object_init_field(o, &o->oPosY);
-                sync_object_init_field(o, &o->oPosZ);
-                sync_object_init_field(o, &o->oGravity);
-                sync_object_init_field(o, &o->oVelY);
-                sync_object_init_field(o, &o->oForwardVel);
-                sync_object_init_field(o, &o->oAngleVelYaw);
-                sync_object_init_field(o, &o->oMoveAngleYaw);
-                sync_object_init_field(o, &o->oFaceAngleYaw);
-                sync_object_init_field(o, &o->oGraphYOffset);
+                sync_object_init_field(o, o->header.gfx.scale[0]);
+                sync_object_init_field(o, o->header.gfx.scale[1]);
+                sync_object_init_field(o, o->header.gfx.scale[2]);
+                sync_object_init_field(o, o->oPrevAction);
+                sync_object_init_field(o, o->oAction);
+                sync_object_init_field(o, o->oSubAction);
+                sync_object_init_field(o, o->oInteractStatus);
+                sync_object_init_field(o, o->oTimer);
+                sync_object_init_field(o, o->oHomeX);
+                sync_object_init_field(o, o->oHomeY);
+                sync_object_init_field(o, o->oHomeZ);
+                sync_object_init_field(o, o->oPosX);
+                sync_object_init_field(o, o->oPosY);
+                sync_object_init_field(o, o->oPosZ);
+                sync_object_init_field(o, o->oGravity);
+                sync_object_init_field(o, o->oVelY);
+                sync_object_init_field(o, o->oForwardVel);
+                sync_object_init_field(o, o->oAngleVelYaw);
+                sync_object_init_field(o, o->oMoveAngleYaw);
+                sync_object_init_field(o, o->oFaceAngleYaw);
+                sync_object_init_field(o, o->oGraphYOffset);
             }
         }
         return; 

src/game/behaviors/haunted_chair.inc.c

@@ -24,15 +24,15 @@ void bhv_haunted_chair_init(void) {
     }
 
     sync_object_init(o, 4000.0f);
-    sync_object_init_field(o, &o->oFaceAnglePitch);
-    sync_object_init_field(o, &o->oFaceAngleRoll);
-    sync_object_init_field(o, &o->oFaceAngleYaw);
-    sync_object_init_field(o, &o->oHauntedChairUnk104);
-    sync_object_init_field(o, &o->oHauntedChairUnkF4);
-    sync_object_init_field(o, &o->oHauntedChairUnkF8);
-    sync_object_init_field(o, &o->oHauntedChairUnkFC);
-    sync_object_init_field(o, &o->oMoveAnglePitch);
-    sync_object_init_field(o, &o->oMoveAngleYaw);
+    sync_object_init_field(o, o->oFaceAnglePitch);
+    sync_object_init_field(o, o->oFaceAngleRoll);
+    sync_object_init_field(o, o->oFaceAngleYaw);
+    sync_object_init_field(o, o->oHauntedChairUnk104);
+    sync_object_init_field(o, o->oHauntedChairUnkF4);
+    sync_object_init_field(o, o->oHauntedChairUnkF8);
+    sync_object_init_field(o, o->oHauntedChairUnkFC);
+    sync_object_init_field(o, o->oMoveAnglePitch);
+    sync_object_init_field(o, o->oMoveAngleYaw);
 }
 
 void haunted_chair_act_0(void) {

src/game/behaviors/heave_ho.inc.c

@@ -136,11 +136,11 @@ void bhv_heave_ho_loop(void) {
         if (so != NULL) {
             so->override_ownership = bhv_heave_ho_override_ownership;
             so->ignore_if_true = bhv_heave_ho_ignore_if_true;
-            sync_object_init_field(o, &o->oHeaveHoUnk88);
-            sync_object_init_field(o, &o->oHeaveHoUnkF4);
-            sync_object_init_field(o, &o->oInteractStatus);
-            sync_object_init_field(o, &o->oGraphYOffset);
-            sync_object_init_field(o, &o->oFaceAngleYaw);
+            sync_object_init_field(o, o->oHeaveHoUnk88);
+            sync_object_init_field(o, o->oHeaveHoUnkF4);
+            sync_object_init_field(o, o->oInteractStatus);
+            sync_object_init_field(o, o->oGraphYOffset);
+            sync_object_init_field(o, o->oFaceAngleYaw);
         }
     }
 

src/game/behaviors/hidden_star.inc.c

@@ -23,12 +23,12 @@ void bhv_hidden_star_init(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oHiddenStarTriggerCounter);
-            sync_object_init_field(o, &o->oPosX);
-            sync_object_init_field(o, &o->oPosY);
-            sync_object_init_field(o, &o->oPosZ);
-            sync_object_init_field(o, &o->oTimer);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oHiddenStarTriggerCounter);
+            sync_object_init_field(o, o->oPosX);
+            sync_object_init_field(o, o->oPosY);
+            sync_object_init_field(o, o->oPosZ);
+            sync_object_init_field(o, o->oTimer);
         }
     }
 }

src/game/behaviors/hoot.inc.c

@@ -20,9 +20,9 @@ void bhv_hoot_init(void) {
     struct SyncObject* so = sync_object_init(o, 4000.0f);
     if (so) {
         so->ignore_if_true = bhv_hoot_ignore_if_true;
-        sync_object_init_field(o, &o->oHootAvailability);
-        sync_object_init_field(o, &o->oMoveAnglePitch);
-        sync_object_init_field_with_size(o, &o->header.gfx.animInfo.animFrame, 16);
+        sync_object_init_field(o, o->oHootAvailability);
+        sync_object_init_field(o, o->oMoveAnglePitch);
+        sync_object_init_field(o, o->header.gfx.animInfo.animFrame);
     }
 }
 

src/game/behaviors/horizontal_grindel.inc.c

@@ -3,12 +3,12 @@ void bhv_horizontal_grindel_init(void) {
     o->oHorizontalGrindelTargetYaw = o->oMoveAngleYaw;
 
     sync_object_init(o, 4000.0f);
-    sync_object_init_field(o, &o->oHorizontalGrindelOnGround);
-    sync_object_init_field(o, &o->oHorizontalGrindelTargetYaw);
-    sync_object_init_field(o, &o->oHorizontalGrindelDistToHome);
-    sync_object_init_field(o, &o->oMoveFlags);
-    sync_object_init_field(o, &o->oForwardVel);
-    sync_object_init_field(o, &o->oGravity);
+    sync_object_init_field(o, o->oHorizontalGrindelOnGround);
+    sync_object_init_field(o, o->oHorizontalGrindelTargetYaw);
+    sync_object_init_field(o, o->oHorizontalGrindelDistToHome);
+    sync_object_init_field(o, o->oMoveFlags);
+    sync_object_init_field(o, o->oForwardVel);
+    sync_object_init_field(o, o->oGravity);
 }
 
 void bhv_horizontal_grindel_update(void) {

src/game/behaviors/jrb_ship.inc.c

@@ -25,9 +25,9 @@ void bhv_ship_part_3_loop(void) {
         struct SyncObject* so = sync_object_init(o, 4000.0f);
         if (so) {
             so->maxUpdateRate = 5.0f;
-            sync_object_init_field(o, &o->oFaceAnglePitch);
-            sync_object_init_field(o, &o->oFaceAngleRoll);
-            sync_object_init_field(o, &o->oShipPart3UnkF4);
+            sync_object_init_field(o, o->oFaceAnglePitch);
+            sync_object_init_field(o, o->oFaceAngleRoll);
+            sync_object_init_field(o, o->oShipPart3UnkF4);
         }
     }
 
@@ -49,13 +49,13 @@ void bhv_jrb_sliding_box_loop(void) {
         struct SyncObject* so = sync_object_init(o, 4000.0f);
         if (so) {
             so->maxUpdateRate = 5.0f;
-            sync_object_init_field(o, &o->oFaceAnglePitch);
-            sync_object_init_field(o, &o->oFaceAngleRoll);
-            sync_object_init_field(o, &o->oJrbSlidingBoxUnkF8);
-            sync_object_init_field(o, &o->oJrbSlidingBoxUnkFC);
-            sync_object_init_field(o, &o->oParentRelativePosX);
-            sync_object_init_field(o, &o->oParentRelativePosY);
-            sync_object_init_field(o, &o->oParentRelativePosZ);
+            sync_object_init_field(o, o->oFaceAnglePitch);
+            sync_object_init_field(o, o->oFaceAngleRoll);
+            sync_object_init_field(o, o->oJrbSlidingBoxUnkF8);
+            sync_object_init_field(o, o->oJrbSlidingBoxUnkFC);
+            sync_object_init_field(o, o->oParentRelativePosX);
+            sync_object_init_field(o, o->oParentRelativePosY);
+            sync_object_init_field(o, o->oParentRelativePosZ);
         }
     }
 

src/game/behaviors/jumping_box.inc.c

@@ -47,7 +47,7 @@ void jumping_box_free_update(void) {
 void bhv_jumping_box_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 500.0f);
-        sync_object_init_field(o, &o->oJumpingBoxUnkF4);
+        sync_object_init_field(o, o->oJumpingBoxUnkF4);
     }
 
     switch (o->oHeldState) {

src/game/behaviors/kickable_board.inc.c

@@ -29,14 +29,14 @@ void bhv_kickable_board_loop(void) {
     struct MarioState* marioState = nearest_mario_state_to_object(o);
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oAngleVelPitch);
-        sync_object_init_field(o, &o->oFaceAnglePitch);
-        sync_object_init_field(o, &o->oKickableBoardF4);
-        sync_object_init_field(o, &o->oKickableBoardF8);
-        sync_object_init_field(o, &o->oMoveAngleYaw);
-        sync_object_init_field(o, &o->oPosY);
-        sync_object_init_field(o, &o->oTimer);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oAngleVelPitch);
+        sync_object_init_field(o, o->oFaceAnglePitch);
+        sync_object_init_field(o, o->oKickableBoardF4);
+        sync_object_init_field(o, o->oKickableBoardF8);
+        sync_object_init_field(o, o->oMoveAngleYaw);
+        sync_object_init_field(o, o->oPosY);
+        sync_object_init_field(o, o->oTimer);
     }
     s32 sp24;
     switch (o->oAction) {

src/game/behaviors/king_bobomb.inc.c

@@ -391,10 +391,10 @@ void bhv_king_bobomb_loop(void) {
         if (so) {
             so->override_ownership = bhv_king_bobomb_override_ownership;
             so->ignore_if_true = bhv_king_bobomb_ignore_if_true;
-            sync_object_init_field(o, &o->oKingBobombUnk88);
-            sync_object_init_field(o, &o->oFlags);
-            sync_object_init_field(o, &o->oHealth);
-            sync_object_init_field(o, &o->oInteractStatus);
+            sync_object_init_field(o, o->oKingBobombUnk88);
+            sync_object_init_field(o, o->oFlags);
+            sync_object_init_field(o, o->oHealth);
+            sync_object_init_field(o, o->oInteractStatus);
         }
     }
 

src/game/behaviors/klepto.inc.c

@@ -108,22 +108,22 @@ void bhv_klepto_init(void) {
     if (so) {
         so->on_received_pre = bhv_klepto_on_received_pre;
         so->on_received_post = bhv_klepto_on_received_post;
-        sync_object_init_field(o, &o->oAnimState);
-        sync_object_init_field(o, &o->oFlags);
-        sync_object_init_field(o, &o->oKleptoDistanceToTarget);
-        sync_object_init_field(o, &o->oKleptoUnkF8);
-        sync_object_init_field(o, &o->oKleptoUnkFC);
-        sync_object_init_field(o, &o->oKleptoSpeed);
-        sync_object_init_field(o, &o->oKleptoTimeUntilTargetChange);
-        sync_object_init_field(o, &o->oKleptoTargetNumber);
-        sync_object_init_field(o, &o->oKleptoUnk1B0);
-        sync_object_init_field(o, &o->oSoundStateID);
-        sync_object_init_field(o, &o->oHomeX);
-        sync_object_init_field(o, &o->oHomeY);
-        sync_object_init_field(o, &o->oHomeZ);
-        sync_object_init_field(o, &o->oMoveAnglePitch);
-        sync_object_init_field(o, &o->oGravity);
-        sync_object_init_field_with_size(o, &o->globalPlayerIndex, 8);
+        sync_object_init_field(o, o->oAnimState);
+        sync_object_init_field(o, o->oFlags);
+        sync_object_init_field(o, o->oKleptoDistanceToTarget);
+        sync_object_init_field(o, o->oKleptoUnkF8);
+        sync_object_init_field(o, o->oKleptoUnkFC);
+        sync_object_init_field(o, o->oKleptoSpeed);
+        sync_object_init_field(o, o->oKleptoTimeUntilTargetChange);
+        sync_object_init_field(o, o->oKleptoTargetNumber);
+        sync_object_init_field(o, o->oKleptoUnk1B0);
+        sync_object_init_field(o, o->oSoundStateID);
+        sync_object_init_field(o, o->oHomeX);
+        sync_object_init_field(o, o->oHomeY);
+        sync_object_init_field(o, o->oHomeZ);
+        sync_object_init_field(o, o->oMoveAnglePitch);
+        sync_object_init_field(o, o->oGravity);
+        sync_object_init_field(o, o->globalPlayerIndex);
     }
 }
 

src/game/behaviors/koopa.inc.c

@@ -126,28 +126,28 @@ void bhv_koopa_init(void) {
             so->on_received_post   = bhv_koopa_the_quick_on_received_post;
             so->on_sent_pre        = bhv_koopa_the_quick_on_sent_pre;
             so->override_ownership = bhv_koopa_the_quick_override_ownership;
-            sync_object_init_field(o, &koopaPathedStartWaypoint);
-            sync_object_init_field(o, &koopaPathedPrevWaypoint);
-            sync_object_init_field(o, &koopaShotFromCannon);
-            sync_object_init_field(o, &o->oPathedPrevWaypointFlags);
-            sync_object_init_field(o, &o->oPathedTargetPitch);
-            sync_object_init_field(o, &o->oPathedTargetYaw);
-            sync_object_init_field(o, &o->oPosX);
-            sync_object_init_field(o, &o->oPosY);
-            sync_object_init_field(o, &o->oPosZ);
-            sync_object_init_field(o, &o->oVelX);
-            sync_object_init_field(o, &o->oVelY);
-            sync_object_init_field(o, &o->oVelZ);
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oPrevAction);
-            sync_object_init_field(o, &o->oSubAction);
-            sync_object_init_field(o, &o->oTimer);
-            sync_object_init_field(o, &o->oKoopaAgility);
-            sync_object_init_field(o, &o->parentObj->oKoopaRaceEndpointRaceBegun);
-            sync_object_init_field(o, &o->parentObj->oKoopaRaceEndpointRaceStatus);
-            sync_object_init_field(o, &o->oForwardVel);
-            sync_object_init_field(o, &o->oMoveAngleYaw);
-            sync_object_init_field(o, &o->areaTimer);
+            sync_object_init_field(o, koopaPathedStartWaypoint);
+            sync_object_init_field(o, koopaPathedPrevWaypoint);
+            sync_object_init_field(o, koopaShotFromCannon);
+            sync_object_init_field(o, o->oPathedPrevWaypointFlags);
+            sync_object_init_field(o, o->oPathedTargetPitch);
+            sync_object_init_field(o, o->oPathedTargetYaw);
+            sync_object_init_field(o, o->oPosX);
+            sync_object_init_field(o, o->oPosY);
+            sync_object_init_field(o, o->oPosZ);
+            sync_object_init_field(o, o->oVelX);
+            sync_object_init_field(o, o->oVelY);
+            sync_object_init_field(o, o->oVelZ);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oPrevAction);
+            sync_object_init_field(o, o->oSubAction);
+            sync_object_init_field(o, o->oTimer);
+            sync_object_init_field(o, o->oKoopaAgility);
+            sync_object_init_field(o, o->parentObj->oKoopaRaceEndpointRaceBegun);
+            sync_object_init_field(o, o->parentObj->oKoopaRaceEndpointRaceStatus);
+            sync_object_init_field(o, o->oForwardVel);
+            sync_object_init_field(o, o->oMoveAngleYaw);
+            sync_object_init_field(o, o->areaTimer);
         }
         o->areaTimerType = AREA_TIMER_TYPE_MAXIMUM;
         o->areaTimer = 0;
@@ -156,10 +156,10 @@ void bhv_koopa_init(void) {
     } else {
         // normal koopa
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oKoopaTargetYaw);
-        sync_object_init_field(o, &o->oKoopaCountdown);
-        sync_object_init_field(o, &o->oKoopaMovementType);
-        sync_object_init_field(o, &o->oKoopaUnshelledTimeUntilTurn);
+        sync_object_init_field(o, o->oKoopaTargetYaw);
+        sync_object_init_field(o, o->oKoopaCountdown);
+        sync_object_init_field(o, o->oKoopaMovementType);
+        sync_object_init_field(o, o->oKoopaUnshelledTimeUntilTurn);
     }
 }
 

src/game/behaviors/lll_floating_wood_piece.inc.c

@@ -3,7 +3,7 @@
 void bhv_lll_wood_piece_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 1000.0f);
-        sync_object_init_field(o, &o->oLllWoodPieceOscillationTimer);
+        sync_object_init_field(o, o->oLllWoodPieceOscillationTimer);
     }
 
     if (o->oTimer == 0)

src/game/behaviors/lll_hexagonal_ring.inc.c

@@ -19,7 +19,7 @@ void hexagonal_ring_spawn_flames(void) {
 void bhv_lll_rotating_hexagonal_ring_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oAngleVelYaw);
+        sync_object_init_field(o, o->oAngleVelYaw);
     }
     UNUSED s32 unused;
     o->oCollisionDistance = 4000.0f;

src/game/behaviors/lll_octagonal_rotating_mesh.inc.c

@@ -63,10 +63,10 @@ s32 lll_octagonal_mesh_find_y_offset(s32 *a0, f32 *a1, s32 a2, s32 a3) {
 void bhv_lll_moving_octagonal_mesh_platform_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oHorizontalMovementUnkF8);
-        sync_object_init_field(o, &o->oHorizontalMovementUnkF4);
-        sync_object_init_field(o, &o->oHorizontalMovementUnk100);
-        sync_object_init_field(o, &o->oForwardVel);
+        sync_object_init_field(o, o->oHorizontalMovementUnkF8);
+        sync_object_init_field(o, o->oHorizontalMovementUnkF4);
+        sync_object_init_field(o, o->oHorizontalMovementUnk100);
+        sync_object_init_field(o, o->oForwardVel);
     }
     if (o->oAction == 0) {
         o->oHorizontalMovementUnkF8 = 0;

src/game/behaviors/lll_rotating_hex_flame.inc.c

@@ -63,7 +63,7 @@ void (*sRotatingCwFireBarsActions[])(void) = { fire_bar_act_0, fire_bar_act_1,
 void bhv_lll_rotating_block_fire_bars_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oAngleVelYaw);
+        sync_object_init_field(o, o->oAngleVelYaw);
     }
     CUR_OBJ_CALL_ACTION_FUNCTION(sRotatingCwFireBarsActions);
     if (o->oBehParams2ndByte == 0)

src/game/behaviors/lll_sinking_rectangle.inc.c

@@ -17,8 +17,8 @@ void sinking_rectangular_plat_actions(f32 a0, s32 a1) {
 void bhv_lll_sinking_rectangular_platform_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 1000.0f);
-        sync_object_init_field(o, &o->oLllWoodPieceOscillationTimer);
-        sync_object_init_field(o, &o->oFaceAnglePitch);
+        sync_object_init_field(o, o->oLllWoodPieceOscillationTimer);
+        sync_object_init_field(o, o->oFaceAnglePitch);
     }
     f32 sp1C = 0.4f;
     s32 sp18 = 0x100;
@@ -33,7 +33,7 @@ void bhv_lll_sinking_rectangular_platform_loop(void) {
 void bhv_lll_sinking_square_platforms_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 1000.0f);
-        sync_object_init_field(o, &o->oLllWoodPieceOscillationTimer);
+        sync_object_init_field(o, o->oLllWoodPieceOscillationTimer);
     }
     f32 sp1C = 0.5f;
     s32 sp18 = 0x100;

src/game/behaviors/lll_sinking_rock_block.inc.c

@@ -3,8 +3,8 @@
 void bhv_lll_sinking_rock_block_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 1000.0f);
-        sync_object_init_field(o, &o->oSinkWhenSteppedOnUnk104);
-        sync_object_init_field(o, &o->oGraphYOffset);
+        sync_object_init_field(o, o->oSinkWhenSteppedOnUnk104);
+        sync_object_init_field(o, o->oGraphYOffset);
     }
     lll_octagonal_mesh_find_y_offset(&o->oSinkWhenSteppedOnUnk104, &o->oSinkWhenSteppedOnUnk108, 124, -110);
     o->oGraphYOffset = 0.0f;

src/game/behaviors/manta_ray.inc.c

@@ -42,13 +42,13 @@ void bhv_manta_ray_init(void) {
     cur_obj_scale(2.5f);
 
     sync_object_init(o, 4000.0f);
-    sync_object_init_field(o, &o->oMantaTargetPitch);
-    sync_object_init_field(o, &o->oMantaTargetYaw);
-    sync_object_init_field(o, &o->oWaterRingSpawnerRingsCollected);
-    sync_object_init_field(o, &o->oMoveAnglePitch);
-    sync_object_init_field(o, &o->oMoveAngleRoll);
+    sync_object_init_field(o, o->oMantaTargetPitch);
+    sync_object_init_field(o, o->oMantaTargetYaw);
+    sync_object_init_field(o, o->oWaterRingSpawnerRingsCollected);
+    sync_object_init_field(o, o->oMoveAnglePitch);
+    sync_object_init_field(o, o->oMoveAngleRoll);
     if (ringManager != NULL) {
-        sync_object_init_field(o, &ringManager->oWaterRingMgrNextRingIndex);
+        sync_object_init_field(o, ringManager->oWaterRingMgrNextRingIndex);
     }
 }
 

src/game/behaviors/metal_box.inc.c

@@ -28,7 +28,7 @@ s32 check_if_moving_over_floor(f32 a0, f32 a1) {
 void bhv_pushable_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 1000.0f);
-        sync_object_init_field(o, &o->oMoveAngleYaw);
+        sync_object_init_field(o, o->oMoveAngleYaw);
     }
 
     struct MarioState* marioState = nearest_mario_state_to_object(o);

src/game/behaviors/mips.inc.c

@@ -69,12 +69,12 @@ void bhv_mips_init(void) {
 
     struct SyncObject* so = sync_object_init(o, 4000.0f);
     if (so) {
-        sync_object_init_field(o, &o->oMipsStartWaypointIndex);
-        sync_object_init_field(o, &o->oForwardVel);
-        sync_object_init_field(o, &o->oMipsStarStatus);
-        sync_object_init_field(o, &o->oBehParams2ndByte);
-        sync_object_init_field(o, &o->oHeldState);
-        sync_object_init_field(o, &o->oFlags);
+        sync_object_init_field(o, o->oMipsStartWaypointIndex);
+        sync_object_init_field(o, o->oForwardVel);
+        sync_object_init_field(o, o->oMipsStarStatus);
+        sync_object_init_field(o, o->oBehParams2ndByte);
+        sync_object_init_field(o, o->oHeldState);
+        sync_object_init_field(o, o->oFlags);
         so->on_received_pre = bhv_mips_on_received_pre;
         so->on_received_post = bhv_mips_on_received_post;
     }

src/game/behaviors/moneybag.inc.c

@@ -32,11 +32,11 @@ void bhv_moneybag_init(void) {
     o->oOpacity = 0;
 
     sync_object_init(o, 4000.0f);
-    sync_object_init_field(o, &o->oHomeX);
-    sync_object_init_field(o, &o->oHomeY);
-    sync_object_init_field(o, &o->oHomeZ);
-    sync_object_init_field(o, &o->oMoneybagJumpState);
-    sync_object_init_field(o, &o->oOpacity);
+    sync_object_init_field(o, o->oHomeX);
+    sync_object_init_field(o, o->oHomeY);
+    sync_object_init_field(o, o->oHomeZ);
+    sync_object_init_field(o, o->oMoneybagJumpState);
+    sync_object_init_field(o, o->oOpacity);
 }
 
 void moneybag_check_mario_collision(void) {
@@ -228,9 +228,9 @@ void bhv_moneybag_hidden_loop(void) {
 
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oPrevAction);
-        sync_object_init_field(o, &o->oTimer);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oPrevAction);
+        sync_object_init_field(o, o->oTimer);
     }
 
     switch (o->oAction) {

src/game/behaviors/monty_mole.inc.c

@@ -175,15 +175,15 @@ void bhv_monty_mole_init(void) {
     struct SyncObject* so = sync_object_init(o, 4000.0f);
     if (so) {
         so->on_received_post = bhv_monty_mole_on_received_post;
-        sync_object_init_field(o, &o->oMontyMoleHeightRelativeToFloor);
-        sync_object_init_field(o, &o->oMontyMoleHoleX);
-        sync_object_init_field(o, &o->oMontyMoleHoleY);
-        sync_object_init_field(o, &o->oMontyMoleHoleZ);
-        sync_object_init_field(o, &o->oFaceAnglePitch);
-        sync_object_init_field(o, &o->oGravity);
-        sync_object_init_field(o, &o->oIntangibleTimer);
-        sync_object_init_field(o, &o->oFaceAnglePitch);
-        sync_object_init_field_with_size(o, &o->header.gfx.node.flags, 16);
+        sync_object_init_field(o, o->oMontyMoleHeightRelativeToFloor);
+        sync_object_init_field(o, o->oMontyMoleHoleX);
+        sync_object_init_field(o, o->oMontyMoleHoleY);
+        sync_object_init_field(o, o->oMontyMoleHoleZ);
+        sync_object_init_field(o, o->oFaceAnglePitch);
+        sync_object_init_field(o, o->oGravity);
+        sync_object_init_field(o, o->oIntangibleTimer);
+        sync_object_init_field(o, o->oFaceAnglePitch);
+        sync_object_init_field(o, o->header.gfx.node.flags);
     }
 }
 

src/game/behaviors/mr_blizzard.inc.c

@@ -49,14 +49,14 @@ void bhv_mr_blizzard_init(void) {
         o->oMrBlizzardTargetMoveYaw = o->oMoveAngleYaw;
 
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oMrBlizzardTargetMoveYaw);
-        sync_object_init_field(o, &o->oMrBlizzardTimer);
-        sync_object_init_field(o, &o->oMrBlizzardDistFromHome);
-        sync_object_init_field(o, &o->oForwardVel);
-        sync_object_init_field(o, &o->oVelY);
-        sync_object_init_field(o, &o->oPosX);
-        sync_object_init_field(o, &o->oPosY);
-        sync_object_init_field(o, &o->oPosZ);
+        sync_object_init_field(o, o->oMrBlizzardTargetMoveYaw);
+        sync_object_init_field(o, o->oMrBlizzardTimer);
+        sync_object_init_field(o, o->oMrBlizzardDistFromHome);
+        sync_object_init_field(o, o->oForwardVel);
+        sync_object_init_field(o, o->oVelY);
+        sync_object_init_field(o, o->oPosX);
+        sync_object_init_field(o, o->oPosY);
+        sync_object_init_field(o, o->oPosZ);
     } else {
         if (o->oBehParams2ndByte != MR_BLIZZARD_STYPE_NO_CAP) {
             // Cap wearing Mr. Blizzard from SL.
@@ -70,10 +70,10 @@ void bhv_mr_blizzard_init(void) {
         o->oMrBlizzardHeldObj = NULL;
 
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oMrBlizzardTargetMoveYaw);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oMrBlizzardGraphYOffset);
-        sync_object_init_field(o, &o->oMoveAngleYaw);
+        sync_object_init_field(o, o->oMrBlizzardTargetMoveYaw);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oMrBlizzardGraphYOffset);
+        sync_object_init_field(o, o->oMoveAngleYaw);
     }
 }
 

src/game/behaviors/mushroom_1up.inc.c

@@ -231,18 +231,18 @@ void bhv_1up_jump_on_approach_loop(void) {
 void bhv_1up_hidden_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oPosX);
-        sync_object_init_field(o, &o->oPosY);
-        sync_object_init_field(o, &o->oPosZ);
-        sync_object_init_field(o, &o->oVelX);
-        sync_object_init_field(o, &o->oVelY);
-        sync_object_init_field(o, &o->oVelZ);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oForwardVel);
-        sync_object_init_field(o, &o->o1UpHiddenUnkF4);
-        sync_object_init_field(o, &o->oIntangibleTimer);
-        sync_object_init_field_with_size(o, &o->activeFlags, 16);
-        sync_object_init_field_with_size(o, &o->header.gfx.node.flags, 16);
+        sync_object_init_field(o, o->oPosX);
+        sync_object_init_field(o, o->oPosY);
+        sync_object_init_field(o, o->oPosZ);
+        sync_object_init_field(o, o->oVelX);
+        sync_object_init_field(o, o->oVelY);
+        sync_object_init_field(o, o->oVelZ);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oForwardVel);
+        sync_object_init_field(o, o->o1UpHiddenUnkF4);
+        sync_object_init_field(o, o->oIntangibleTimer);
+        sync_object_init_field(o, o->activeFlags);
+        sync_object_init_field(o, o->header.gfx.node.flags);
     }
 
     s16 sp26;
@@ -294,7 +294,7 @@ void bhv_1up_hidden_loop(void) {
 void bhv_1up_hidden_trigger_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field_with_size(o, &o->activeFlags, 16);
+        sync_object_init_field(o, o->activeFlags);
     }
 
     struct Object* player = nearest_player_to_object(o);
@@ -312,15 +312,15 @@ void bhv_1up_hidden_trigger_loop(void) {
 void bhv_1up_hidden_in_pole_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oVelX);
-        sync_object_init_field(o, &o->oVelY);
-        sync_object_init_field(o, &o->oVelZ);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oForwardVel);
-        sync_object_init_field(o, &o->o1UpHiddenUnkF4);
-        sync_object_init_field(o, &o->oIntangibleTimer);
-        sync_object_init_field_with_size(o, &o->activeFlags, 16);
-        sync_object_init_field_with_size(o, &o->header.gfx.node.flags, 16);
+        sync_object_init_field(o, o->oVelX);
+        sync_object_init_field(o, o->oVelY);
+        sync_object_init_field(o, o->oVelZ);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oForwardVel);
+        sync_object_init_field(o, o->o1UpHiddenUnkF4);
+        sync_object_init_field(o, o->oIntangibleTimer);
+        sync_object_init_field(o, o->activeFlags);
+        sync_object_init_field(o, o->header.gfx.node.flags);
     }
 
     UNUSED s16 sp26;
@@ -365,7 +365,7 @@ void bhv_1up_hidden_in_pole_loop(void) {
 void bhv_1up_hidden_in_pole_trigger_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field_with_size(o, &o->activeFlags, 16);
+        sync_object_init_field(o, o->activeFlags);
     }
 
     struct Object* player = nearest_player_to_object(o);
@@ -383,7 +383,7 @@ void bhv_1up_hidden_in_pole_trigger_loop(void) {
 void bhv_1up_hidden_in_pole_spawner_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field_with_size(o, &o->activeFlags, 16);
+        sync_object_init_field(o, o->activeFlags);
     }
 
     if (gNetworkAreaSyncing || !gNetworkAreaLoaded) {

src/game/behaviors/piranha_plant.inc.c

@@ -363,13 +363,13 @@ void (*TablePiranhaPlantActions[])(void) = {
 void bhv_piranha_plant_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 2000.0f);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oInteractStatus);
-        sync_object_init_field(o, &o->oInteractType);
-        sync_object_init_field(o, &o->oMoveAngleYaw);
-        sync_object_init_field(o, &o->oPiranhaPlantScale);
-        sync_object_init_field(o, &o->oPiranhaPlantSleepMusicState);
-        sync_object_init_field(o, &o->oTimer);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oInteractStatus);
+        sync_object_init_field(o, o->oInteractType);
+        sync_object_init_field(o, o->oMoveAngleYaw);
+        sync_object_init_field(o, o->oPiranhaPlantScale);
+        sync_object_init_field(o, o->oPiranhaPlantSleepMusicState);
+        sync_object_init_field(o, o->oTimer);
     }
 
     CUR_OBJ_CALL_ACTION_FUNCTION(TablePiranhaPlantActions);

src/game/behaviors/platform_on_track.inc.c

@@ -76,14 +76,14 @@ void bhv_platform_on_track_init(void) {
             so->on_sent_pre = bhv_platform_track_on_sent_pre;
             so->on_received_post = bhv_platform_track_on_received_post;
             so->maxUpdateRate = 5.0f;
-            sync_object_init_field(o, &platformTrackPathedPrevWaypoint);
-            sync_object_init_field(o, &o->oPlatformOnTrackBaseBallIndex);
-            sync_object_init_field(o, &o->oPlatformOnTrackDistMovedSinceLastBall);
-            sync_object_init_field(o, &o->oPlatformOnTrackSkiLiftRollVel);
-            sync_object_init_field(o, &o->oPlatformOnTrackPrevWaypointFlags);
-            sync_object_init_field(o, &o->oPlatformOnTrackPitch);
-            sync_object_init_field(o, &o->oPlatformOnTrackYaw);
-            sync_object_init_field(o, &o->oPlatformOnTrackOffsetY);
+            sync_object_init_field(o, platformTrackPathedPrevWaypoint);
+            sync_object_init_field(o, o->oPlatformOnTrackBaseBallIndex);
+            sync_object_init_field(o, o->oPlatformOnTrackDistMovedSinceLastBall);
+            sync_object_init_field(o, o->oPlatformOnTrackSkiLiftRollVel);
+            sync_object_init_field(o, o->oPlatformOnTrackPrevWaypointFlags);
+            sync_object_init_field(o, o->oPlatformOnTrackPitch);
+            sync_object_init_field(o, o->oPlatformOnTrackYaw);
+            sync_object_init_field(o, o->oPlatformOnTrackOffsetY);
         }
     }
 

src/game/behaviors/pokey.inc.c

@@ -197,12 +197,12 @@ static void pokey_act_uninitialized(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject* so = sync_object_init(o, 4000.0f);
         if (so) {
-            sync_object_init_field(o, &o->oPokeyAliveBodyPartFlags);
-            sync_object_init_field(o, &o->oPokeyNumAliveBodyParts);
-            sync_object_init_field(o, &o->oPokeyHeadWasKilled);
-            sync_object_init_field(o, &o->oPokeyTargetYaw);
-            sync_object_init_field(o, &o->oPokeyChangeTargetTimer);
-            sync_object_init_field(o, &o->oPokeyTurningAwayFromWall);
+            sync_object_init_field(o, o->oPokeyAliveBodyPartFlags);
+            sync_object_init_field(o, o->oPokeyNumAliveBodyParts);
+            sync_object_init_field(o, o->oPokeyHeadWasKilled);
+            sync_object_init_field(o, o->oPokeyTargetYaw);
+            sync_object_init_field(o, o->oPokeyChangeTargetTimer);
+            sync_object_init_field(o, o->oPokeyTurningAwayFromWall);
             so->on_received_pre = pokey_on_received_pre;
             so->on_received_post = pokey_on_received_post;
         }

src/game/behaviors/purple_switch.inc.c

@@ -9,8 +9,8 @@
 void bhv_purple_switch_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oTimer);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oTimer);
     }
 
     u8 anyPlayerOnPlatform = FALSE;

src/game/behaviors/pyramid_elevator.inc.c

@@ -19,11 +19,11 @@ void bhv_pyramid_elevator_init(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject* so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
-            sync_object_init_field(o, &o->oPrevAction);
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oTimer);
-            sync_object_init_field(o, &o->oPosY);
-            sync_object_init_field(o, &o->oVelY);
+            sync_object_init_field(o, o->oPrevAction);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oTimer);
+            sync_object_init_field(o, o->oPosY);
+            sync_object_init_field(o, o->oVelY);
         }
     }
 }

src/game/behaviors/pyramid_top.inc.c

@@ -91,10 +91,10 @@ void bhv_pyramid_top_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
-            sync_object_init_field_with_size(o, &o->activeFlags, 16);
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oPrevAction);
-            sync_object_init_field(o, &o->oTimer);
+            sync_object_init_field(o, o->activeFlags);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oPrevAction);
+            sync_object_init_field(o, o->oTimer);
         }
     }
     

src/game/behaviors/racing_penguin.inc.c

@@ -56,27 +56,27 @@ void bhv_racing_penguin_init(void) {
         so->on_received_post   = bhv_racing_penguin_the_quick_on_received_post;
         so->on_sent_pre        = bhv_racing_penguin_the_quick_on_sent_pre;
         so->override_ownership = bhv_racing_penguin_the_quick_override_ownership;
-        sync_object_init_field(o, &penguinPathedStartWaypoint);
-        sync_object_init_field(o, &penguinPathedPrevWaypoint);
-        sync_object_init_field(o, &o->oPathedPrevWaypointFlags);
-        sync_object_init_field(o, &o->oPathedTargetPitch);
-        sync_object_init_field(o, &o->oPathedTargetYaw);
-        sync_object_init_field(o, &o->oPosX);
-        sync_object_init_field(o, &o->oPosY);
-        sync_object_init_field(o, &o->oPosZ);
-        sync_object_init_field(o, &o->oVelX);
-        sync_object_init_field(o, &o->oVelY);
-        sync_object_init_field(o, &o->oVelZ);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oPrevAction);
-        sync_object_init_field(o, &o->oSubAction);
-        sync_object_init_field(o, &o->oTimer);
-        sync_object_init_field(o, &o->oForwardVel);
-        sync_object_init_field(o, &o->oMoveAngleYaw);
-        sync_object_init_field(o, &o->oRacingPenguinWeightedNewTargetSpeed);
-        sync_object_init_field(o, &o->oRacingPenguinMarioWon);
-        sync_object_init_field(o, &o->oRacingPenguinReachedBottom);
-        sync_object_init_field(o, &o->areaTimer);
+        sync_object_init_field(o, penguinPathedStartWaypoint);
+        sync_object_init_field(o, penguinPathedPrevWaypoint);
+        sync_object_init_field(o, o->oPathedPrevWaypointFlags);
+        sync_object_init_field(o, o->oPathedTargetPitch);
+        sync_object_init_field(o, o->oPathedTargetYaw);
+        sync_object_init_field(o, o->oPosX);
+        sync_object_init_field(o, o->oPosY);
+        sync_object_init_field(o, o->oPosZ);
+        sync_object_init_field(o, o->oVelX);
+        sync_object_init_field(o, o->oVelY);
+        sync_object_init_field(o, o->oVelZ);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oPrevAction);
+        sync_object_init_field(o, o->oSubAction);
+        sync_object_init_field(o, o->oTimer);
+        sync_object_init_field(o, o->oForwardVel);
+        sync_object_init_field(o, o->oMoveAngleYaw);
+        sync_object_init_field(o, o->oRacingPenguinWeightedNewTargetSpeed);
+        sync_object_init_field(o, o->oRacingPenguinMarioWon);
+        sync_object_init_field(o, o->oRacingPenguinReachedBottom);
+        sync_object_init_field(o, o->areaTimer);
     }
     o->areaTimerType = AREA_TIMER_TYPE_MAXIMUM;
     o->areaTimer = 0;

src/game/behaviors/rolling_log.inc.c

@@ -10,13 +10,13 @@ static void bhv_rolling_log_network_init(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, 4000.0f);
         if (so) {
-            sync_object_init_field(o, &o->oAngleVelPitch);
-            sync_object_init_field(o, &o->oFaceAnglePitch);
-            sync_object_init_field(o, &o->oMoveAnglePitch);
-            sync_object_init_field(o, &o->oPitouneUnkF4);
-            sync_object_init_field(o, &o->oPitouneUnkF8);
-            sync_object_init_field(o, &o->oPitouneUnkFC);
-            sync_object_init_field(o, &o->oForwardVel);
+            sync_object_init_field(o, o->oAngleVelPitch);
+            sync_object_init_field(o, o->oFaceAnglePitch);
+            sync_object_init_field(o, o->oMoveAnglePitch);
+            sync_object_init_field(o, o->oPitouneUnkF4);
+            sync_object_init_field(o, o->oPitouneUnkF8);
+            sync_object_init_field(o, o->oPitouneUnkFC);
+            sync_object_init_field(o, o->oForwardVel);
         }
     }
 }
@@ -149,9 +149,9 @@ void bhv_volcano_trap_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, 2000.0f);
         if (so) {
-            sync_object_init_field(o, &o->oRollingLogUnkF4);
-            sync_object_init_field(o, &o->oAngleVelPitch);
-            sync_object_init_field(o, &o->oFaceAnglePitch);
+            sync_object_init_field(o, o->oRollingLogUnkF4);
+            sync_object_init_field(o, o->oAngleVelPitch);
+            sync_object_init_field(o, o->oFaceAnglePitch);
         }
     }
 

src/game/behaviors/scuttlebug.inc.c

@@ -28,13 +28,13 @@ void bhv_scuttlebug_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, 4000.0f);
         if (so) {
-            sync_object_init_field(o, &o->oFlags);
-            sync_object_init_field(o, &o->oForwardVel);
-            sync_object_init_field(o, &o->oHomeX);
-            sync_object_init_field(o, &o->oHomeY);
-            sync_object_init_field(o, &o->oHomeZ);
-            sync_object_init_field(o, &o->oInteractStatus);
-            sync_object_init_field(o, &o->oScuttlebugUnkF4);
+            sync_object_init_field(o, o->oFlags);
+            sync_object_init_field(o, o->oForwardVel);
+            sync_object_init_field(o, o->oHomeX);
+            sync_object_init_field(o, o->oHomeY);
+            sync_object_init_field(o, o->oHomeZ);
+            sync_object_init_field(o, o->oInteractStatus);
+            sync_object_init_field(o, o->oScuttlebugUnkF4);
         }
     }
 
@@ -141,10 +141,10 @@ void bhv_scuttlebug_spawn_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oTimer);
-            sync_object_init_field(o, &o->oScuttlebugSpawnerUnkF4);
-            sync_object_init_field(o, &o->oScuttlebugSpawnerUnk88);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oTimer);
+            sync_object_init_field(o, o->oScuttlebugSpawnerUnkF4);
+            sync_object_init_field(o, o->oScuttlebugSpawnerUnk88);
         }
     }
 

src/game/behaviors/seesaw_platform.inc.c

@@ -29,8 +29,8 @@ void bhv_seesaw_platform_init(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, 1000.0f);
         if (so) {
-            sync_object_init_field(o, &o->oSeesawPlatformPitchVel);
-            sync_object_init_field(o, &o->oFaceAnglePitch);
+            sync_object_init_field(o, o->oSeesawPlatformPitchVel);
+            sync_object_init_field(o, o->oFaceAnglePitch);
         }
     }
 }

src/game/behaviors/skeeter.inc.c

@@ -143,14 +143,14 @@ static void skeeter_act_walk(void) {
 void bhv_skeeter_update(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oSkeeterTargetAngle);
-        sync_object_init_field(o, &o->oSkeeterUnkF8);
-        sync_object_init_field(o, &o->oSkeeterUnkFC);
-        sync_object_init_field(o, &o->oSkeeterWaitTime);
-        sync_object_init_field(o, &o->oSkeeterUnk1AC);
-        sync_object_init_field(o, &o->oMoveAngleYaw);
-        sync_object_init_field(o, &o->oFaceAngleYaw);
-        sync_object_init_field(o, &o->oFlags);
+        sync_object_init_field(o, o->oSkeeterTargetAngle);
+        sync_object_init_field(o, o->oSkeeterUnkF8);
+        sync_object_init_field(o, o->oSkeeterUnkFC);
+        sync_object_init_field(o, o->oSkeeterWaitTime);
+        sync_object_init_field(o, o->oSkeeterUnk1AC);
+        sync_object_init_field(o, o->oMoveAngleYaw);
+        sync_object_init_field(o, o->oFaceAngleYaw);
+        sync_object_init_field(o, o->oFlags);
     }
 
     o->oDeathSound = SOUND_OBJ_SNUFIT_SKEETER_DEATH;

src/game/behaviors/sl_snowman_wind.inc.c

@@ -6,10 +6,10 @@ void bhv_sl_snowman_wind_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oPrevAction);
-            sync_object_init_field(o, &o->oTimer);
-            sync_object_init_field(o, &o->oSubAction);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oPrevAction);
+            sync_object_init_field(o, o->oTimer);
+            sync_object_init_field(o, o->oSubAction);
         }
     }
 

src/game/behaviors/sl_walking_penguin.inc.c

@@ -40,13 +40,13 @@ void bhv_sl_walking_penguin_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, 4000.0f);
         if (so) {
-            sync_object_init_field(o, &o->oTimer);
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oPrevAction);
-            sync_object_init_field(o, &o->oSLWalkingPenguinCurStep);
-            sync_object_init_field(o, &o->oSLWalkingPenguinCurStepTimer);
-            sync_object_init_field(o, &o->oSLWalkingPenguinWindCollisionXPos);
-            sync_object_init_field(o, &o->oSLWalkingPenguinWindCollisionZPos);
+            sync_object_init_field(o, o->oTimer);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oPrevAction);
+            sync_object_init_field(o, o->oSLWalkingPenguinCurStep);
+            sync_object_init_field(o, o->oSLWalkingPenguinCurStepTimer);
+            sync_object_init_field(o, o->oSLWalkingPenguinWindCollisionXPos);
+            sync_object_init_field(o, o->oSLWalkingPenguinWindCollisionZPos);
         }
     }
 

src/game/behaviors/sliding_platform_2.inc.c

@@ -38,10 +38,10 @@ void bhv_sliding_plat_2_loop(void) {
         struct SyncObject* so = sync_object_init(o, 4000.0f);
         if (so) {
             so->minUpdateRate = 5.0f;
-            sync_object_init_field(o, &o->oBackAndForthPlatformDirection);
-            sync_object_init_field(o, &o->oBackAndForthPlatformPathLength);
-            sync_object_init_field(o, &o->oBackAndForthPlatformDistance);
-            sync_object_init_field(o, &o->oBackAndForthPlatformVel);
+            sync_object_init_field(o, o->oBackAndForthPlatformDirection);
+            sync_object_init_field(o, o->oBackAndForthPlatformPathLength);
+            sync_object_init_field(o, o->oBackAndForthPlatformDistance);
+            sync_object_init_field(o, o->oBackAndForthPlatformVel);
         }
     }
 

src/game/behaviors/snow_mound.inc.c

@@ -37,9 +37,9 @@ void bhv_snow_mound_spawn_loop(void) {
         struct SyncObject* so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
             so->override_ownership = bhv_snow_mound_spawn_override_ownership;
-            sync_object_init_field(o, &o->oTimer);
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oPrevAction);
+            sync_object_init_field(o, o->oTimer);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oPrevAction);
         }
     }
 

src/game/behaviors/snowman.inc.c

@@ -34,8 +34,8 @@ void bhv_snowmans_bottom_init(void) {
     spawn_object_abs_with_rot(o, 0, MODEL_NONE, bhvSnowmansBodyCheckpoint, -402, 461, -2898, 0, 0, 0);
 
     sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-    sync_object_init_field(o, &o->oAction);
-    sync_object_init_field(o, &o->oForwardVel);
+    sync_object_init_field(o, o->oAction);
+    sync_object_init_field(o, o->oForwardVel);
 }
 
 void set_rolling_sphere_hitbox(void) {
@@ -198,7 +198,7 @@ void bhv_snowmans_head_init(void) {
     }
 
     sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-    sync_object_init_field(o, &o->oAction);
+    sync_object_init_field(o, o->oAction);
 }
 
 static u8 bhv_snowmans_head_action_0_continue_dialog(void) {

src/game/behaviors/snufit.inc.c

@@ -134,16 +134,16 @@ void snufit_act_shoot(void) {
 void bhv_snufit_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oSnufitBullets);
-        sync_object_init_field(o, &o->oSnufitRecoil);
-        sync_object_init_field(o, &o->oSnufitYOffset);
-        sync_object_init_field(o, &o->oSnufitZOffset);
-        sync_object_init_field(o, &o->oSnufitScale);
-        sync_object_init_field(o, &o->oSnufitBodyScale);
-        sync_object_init_field(o, &o->oMoveAnglePitch);
-        sync_object_init_field(o, &o->oFaceAnglePitch);
-        sync_object_init_field(o, &o->oGravity);
-        sync_object_init_field(o, &o->oDeathSound);
+        sync_object_init_field(o, o->oSnufitBullets);
+        sync_object_init_field(o, o->oSnufitRecoil);
+        sync_object_init_field(o, o->oSnufitYOffset);
+        sync_object_init_field(o, o->oSnufitZOffset);
+        sync_object_init_field(o, o->oSnufitScale);
+        sync_object_init_field(o, o->oSnufitBodyScale);
+        sync_object_init_field(o, o->oMoveAnglePitch);
+        sync_object_init_field(o, o->oFaceAnglePitch);
+        sync_object_init_field(o, o->oGravity);
+        sync_object_init_field(o, o->oDeathSound);
     }
 
     struct MarioState* marioState = nearest_mario_state_to_object(o);

src/game/behaviors/sparkle_spawn_star.inc.c

@@ -84,9 +84,9 @@ void slow_star_rotation(void) {
 void bhv_spawned_star_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000);
-        sync_object_init_field(o, &o->oBehParams);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oStarSpawnExtCutsceneFlags);
+        sync_object_init_field(o, o->oBehParams);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oStarSpawnExtCutsceneFlags);
     }
 
     if (o->oAction == 0) {

src/game/behaviors/spawn_star.inc.c

@@ -108,9 +108,9 @@ void bhv_star_spawn_init(void) {
 void bhv_star_spawn_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000);
-        sync_object_init_field(o, &o->oBehParams);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oStarSpawnExtCutsceneFlags);
+        sync_object_init_field(o, o->oBehParams);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oStarSpawnExtCutsceneFlags);
     }
 
     switch (o->oAction) {
@@ -320,11 +320,11 @@ void bhv_hidden_red_coin_star_init(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oHiddenStarTriggerCounter);
-            sync_object_init_field(o, &o->oPosX);
-            sync_object_init_field(o, &o->oPosY);
-            sync_object_init_field(o, &o->oPosZ);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oHiddenStarTriggerCounter);
+            sync_object_init_field(o, o->oPosX);
+            sync_object_init_field(o, o->oPosY);
+            sync_object_init_field(o, o->oPosZ);
         }
     }
 }

src/game/behaviors/spindel.inc.c

@@ -6,10 +6,10 @@ void bhv_spindel_init(void) {
     o->oSpindelUnkF8 = 0;
 
     sync_object_init(o, 4000.0f);
-    sync_object_init_field(o, &o->oSpindelUnkF4);
-    sync_object_init_field(o, &o->oSpindelUnkF8);
-    sync_object_init_field(o, &o->oAngleVelPitch);
-    sync_object_init_field(o, &o->oMoveAnglePitch);
+    sync_object_init_field(o, o->oSpindelUnkF4);
+    sync_object_init_field(o, o->oSpindelUnkF8);
+    sync_object_init_field(o, o->oAngleVelPitch);
+    sync_object_init_field(o, o->oMoveAnglePitch);
 }
 
 void bhv_spindel_loop(void) {

src/game/behaviors/spindrift.inc.c

@@ -15,7 +15,7 @@ struct ObjectHitbox sSpindriftHitbox = {
 void bhv_spindrift_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oFlags);
+        sync_object_init_field(o, o->oFlags);
     }
 
     struct Object* player = nearest_player_to_object(o);

src/game/behaviors/spiny.inc.c

@@ -241,15 +241,15 @@ void bhv_spiny_update(void) {
             so->on_sent_pre = bhv_spiny_on_sent_pre;
             so->override_ownership = bhv_spiny_override_ownership;
 
-            sync_object_init_field(o, &o->oGraphYOffset);
-            sync_object_init_field(o, &o->oFaceAngleYaw);
-            sync_object_init_field(o, &o->oSpinyTimeUntilTurn);
-            sync_object_init_field(o, &o->oSpinyTargetYaw);
-            sync_object_init_field(o, &o->oSpinyTurningAwayFromWall);
-            sync_object_init_field(o, &o->oMoveFlags);
-            sync_object_init_field(o, &o->oInteractType);
-            sync_object_init_field(o, &o->oFaceAnglePitch);
-            sync_object_init_field(o, &spinyAnimCache);
+            sync_object_init_field(o, o->oGraphYOffset);
+            sync_object_init_field(o, o->oFaceAngleYaw);
+            sync_object_init_field(o, o->oSpinyTimeUntilTurn);
+            sync_object_init_field(o, o->oSpinyTargetYaw);
+            sync_object_init_field(o, o->oSpinyTurningAwayFromWall);
+            sync_object_init_field(o, o->oMoveFlags);
+            sync_object_init_field(o, o->oInteractType);
+            sync_object_init_field(o, o->oFaceAnglePitch);
+            sync_object_init_field(o, spinyAnimCache);
         }
 
 

src/game/behaviors/square_platform_cycle.inc.c

@@ -23,17 +23,17 @@ void bhv_squarish_path_parent_init(void) {
         square->oPosY = o->oPosY;
         square->oPosZ = o->oPosZ + offset;
         square->oAction = action;
-        sync_object_init_field(o, &square->oMoveAngleYaw);
-        sync_object_init_field(o, &square->oForwardVel);
-        sync_object_init_field(o, &square->oPosX);
-        sync_object_init_field(o, &square->oPosY);
-        sync_object_init_field(o, &square->oPosZ);
-        sync_object_init_field(o, &square->oVelX);
-        sync_object_init_field(o, &square->oVelY);
-        sync_object_init_field(o, &square->oVelZ);
-        sync_object_init_field(o, &square->oAction);
-        sync_object_init_field(o, &square->oPrevAction);
-        sync_object_init_field(o, &square->oTimer);
+        sync_object_init_field(o, square->oMoveAngleYaw);
+        sync_object_init_field(o, square->oForwardVel);
+        sync_object_init_field(o, square->oPosX);
+        sync_object_init_field(o, square->oPosY);
+        sync_object_init_field(o, square->oPosZ);
+        sync_object_init_field(o, square->oVelX);
+        sync_object_init_field(o, square->oVelY);
+        sync_object_init_field(o, square->oVelZ);
+        sync_object_init_field(o, square->oAction);
+        sync_object_init_field(o, square->oPrevAction);
+        sync_object_init_field(o, square->oTimer);
     }
 }
 

src/game/behaviors/sushi.inc.c

@@ -6,7 +6,7 @@ void bhv_sushi_shark_collision_loop(void) {
 void bhv_sushi_shark_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oSushiSharkUnkF4);
+        sync_object_init_field(o, o->oSushiSharkUnkF4);
     }
 
     struct Object* player = nearest_player_to_object(o);

src/game/behaviors/swing_platform.inc.c

@@ -5,10 +5,10 @@ void bhv_swing_platform_init(void) {
     struct SyncObject* so = sync_object_init(o, 4000.0f);
     if (so) {
         so->minUpdateRate = 5.0f;
-        sync_object_init_field(o, &o->oSwingPlatformAngle);
-        sync_object_init_field(o, &o->oFaceAngleRoll);
-        sync_object_init_field(o, &o->oSwingPlatformSpeed);
-        sync_object_init_field(o, &o->oAngleVelRoll);
+        sync_object_init_field(o, o->oSwingPlatformAngle);
+        sync_object_init_field(o, o->oFaceAngleRoll);
+        sync_object_init_field(o, o->oSwingPlatformSpeed);
+        sync_object_init_field(o, o->oAngleVelRoll);
     }
 }
 

src/game/behaviors/swoop.inc.c

@@ -107,12 +107,12 @@ static void swoop_act_move(void) {
 void bhv_swoop_update(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, 4000.0f);
-        sync_object_init_field(o, &o->oFaceAngleRoll);
-        sync_object_init_field(o, &o->header.gfx.scale[0]);
-        sync_object_init_field(o, &o->oSwoopBonkCountdown);
-        sync_object_init_field(o, &o->oSwoopTargetPitch);
-        sync_object_init_field(o, &o->oSwoopTargetYaw);
-        sync_object_init_field(o, &o->oDeathSound);
+        sync_object_init_field(o, o->oFaceAngleRoll);
+        sync_object_init_field(o, o->header.gfx.scale[0]);
+        sync_object_init_field(o, o->oSwoopBonkCountdown);
+        sync_object_init_field(o, o->oSwoopTargetPitch);
+        sync_object_init_field(o, o->oSwoopTargetYaw);
+        sync_object_init_field(o, o->oDeathSound);
     }
 
     // No partial update (only appears in roomed levels)

src/game/behaviors/thi_top.inc.c

@@ -19,10 +19,10 @@ void bhv_thi_huge_island_top_loop(void) {
 void bhv_thi_tiny_island_top_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oPrevAction);
-        sync_object_init_field(o, &o->oTimer);
-        sync_object_init_field_with_size(o, &o->header.gfx.node.flags, 16);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oPrevAction);
+        sync_object_init_field(o, o->oTimer);
+        sync_object_init_field(o, o->header.gfx.node.flags);
     }
 
     struct MarioState* marioState = nearest_mario_state_to_object(o);

src/game/behaviors/thwomp.inc.c

@@ -57,11 +57,11 @@ void (*sGrindelThwompActions[])(void) = { grindel_thwomp_act_0, grindel_thwomp_a
 void bhv_grindel_thwomp_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oPosY);
-        sync_object_init_field(o, &o->oThwompRandomTimer);
-        sync_object_init_field(o, &o->oTimer);
-        sync_object_init_field(o, &o->oVelY);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oPosY);
+        sync_object_init_field(o, o->oThwompRandomTimer);
+        sync_object_init_field(o, o->oTimer);
+        sync_object_init_field(o, o->oVelY);
     }
     CUR_OBJ_CALL_ACTION_FUNCTION(sGrindelThwompActions);
 }

src/game/behaviors/tower_platform.inc.c

@@ -14,9 +14,9 @@ void bhv_wf_solid_tower_platform_loop(void) {
 void bhv_wf_elevator_tower_platform_loop(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
-        sync_object_init_field(o, &o->oAction);
-        sync_object_init_field(o, &o->oPosY);
-        sync_object_init_field(o, &o->oTimer);
+        sync_object_init_field(o, o->oAction);
+        sync_object_init_field(o, o->oPosY);
+        sync_object_init_field(o, o->oTimer);
     }
 
     switch (o->oAction) {

src/game/behaviors/tox_box.inc.c

@@ -83,11 +83,11 @@ void bhv_tox_box_loop(void) {
         struct SyncObject* so = sync_object_init(o, 3000.0f);
         if (so) {
             so->maxUpdateRate = 10.0f;
-            sync_object_init_field(o, &o->oForwardVel);
-            sync_object_init_field(o, &o->oUnkC0);
-            sync_object_init_field(o, &o->oFaceAnglePitch);
-            sync_object_init_field(o, &o->oFaceAngleRoll);
-            sync_object_init_field(o, &o->oToxBoxMovementStep);
+            sync_object_init_field(o, o->oForwardVel);
+            sync_object_init_field(o, o->oUnkC0);
+            sync_object_init_field(o, o->oFaceAnglePitch);
+            sync_object_init_field(o, o->oFaceAngleRoll);
+            sync_object_init_field(o, o->oToxBoxMovementStep);
         }
     }
     CUR_OBJ_CALL_ACTION_FUNCTION(sToxBoxActions);

src/game/behaviors/treasure_chest.inc.c

@@ -153,20 +153,20 @@ void bhv_treasure_chest_ship_init(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oPrevAction);
-            sync_object_init_field(o, &o->oTimer);
-            sync_object_init_field(o, &o->oTreasureChestCurrentAnswer);
-            sync_object_init_field(o, &o->oTreasureChestIsLastInteractionIncorrect);
-            sync_object_init_field(o, &o->oTreasureChestIsAboveWater);
-            sync_object_init_field(o, &o->oTreasureChestSound);
-            sync_object_init_field(o, &o->oTreasureChestLastNetworkPlayerIndex);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oPrevAction);
+            sync_object_init_field(o, o->oTimer);
+            sync_object_init_field(o, o->oTreasureChestCurrentAnswer);
+            sync_object_init_field(o, o->oTreasureChestIsLastInteractionIncorrect);
+            sync_object_init_field(o, o->oTreasureChestIsAboveWater);
+            sync_object_init_field(o, o->oTreasureChestSound);
+            sync_object_init_field(o, o->oTreasureChestLastNetworkPlayerIndex);
             for (s32 i = 0; i < 4; i++) {
                 struct Object *chest = chests[i];
-                sync_object_init_field(o, &chest->oAction);
-                sync_object_init_field(o, &chest->oPrevAction);
-                sync_object_init_field(o, &chest->oTimer);
-                sync_object_init_field(o, &chest->oIntangibleTimer);
+                sync_object_init_field(o, chest->oAction);
+                sync_object_init_field(o, chest->oPrevAction);
+                sync_object_init_field(o, chest->oTimer);
+                sync_object_init_field(o, chest->oIntangibleTimer);
             }
         }
     }
@@ -223,20 +223,20 @@ void bhv_treasure_chest_jrb_init(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oPrevAction);
-            sync_object_init_field(o, &o->oTimer);
-            sync_object_init_field(o, &o->oTreasureChestCurrentAnswer);
-            sync_object_init_field(o, &o->oTreasureChestIsLastInteractionIncorrect);
-            sync_object_init_field(o, &o->oTreasureChestIsAboveWater);
-            sync_object_init_field(o, &o->oTreasureChestSound);
-            sync_object_init_field(o, &o->oTreasureChestLastNetworkPlayerIndex);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oPrevAction);
+            sync_object_init_field(o, o->oTimer);
+            sync_object_init_field(o, o->oTreasureChestCurrentAnswer);
+            sync_object_init_field(o, o->oTreasureChestIsLastInteractionIncorrect);
+            sync_object_init_field(o, o->oTreasureChestIsAboveWater);
+            sync_object_init_field(o, o->oTreasureChestSound);
+            sync_object_init_field(o, o->oTreasureChestLastNetworkPlayerIndex);
             for (s32 i = 0; i < 4; i++) {
                 struct Object *chest = chests[i];
-                sync_object_init_field(o, &chest->oAction);
-                sync_object_init_field(o, &chest->oPrevAction);
-                sync_object_init_field(o, &chest->oTimer);
-                sync_object_init_field(o, &chest->oIntangibleTimer);
+                sync_object_init_field(o, chest->oAction);
+                sync_object_init_field(o, chest->oPrevAction);
+                sync_object_init_field(o, chest->oTimer);
+                sync_object_init_field(o, chest->oIntangibleTimer);
             }
         }
     }
@@ -291,20 +291,20 @@ void bhv_treasure_chest_init(void) {
     if (!sync_object_is_initialized(o->oSyncID)) {
         struct SyncObject *so = sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
         if (so) {
-            sync_object_init_field(o, &o->oAction);
-            sync_object_init_field(o, &o->oPrevAction);
-            sync_object_init_field(o, &o->oTimer);
-            sync_object_init_field(o, &o->oTreasureChestCurrentAnswer);
-            sync_object_init_field(o, &o->oTreasureChestIsLastInteractionIncorrect);
-            sync_object_init_field(o, &o->oTreasureChestIsAboveWater);
-            sync_object_init_field(o, &o->oTreasureChestSound);
-            sync_object_init_field(o, &o->oTreasureChestLastNetworkPlayerIndex);
+            sync_object_init_field(o, o->oAction);
+            sync_object_init_field(o, o->oPrevAction);
+            sync_object_init_field(o, o->oTimer);
+            sync_object_init_field(o, o->oTreasureChestCurrentAnswer);
+            sync_object_init_field(o, o->oTreasureChestIsLastInteractionIncorrect);
+            sync_object_init_field(o, o->oTreasureChestIsAboveWater);
+            sync_object_init_field(o, o->oTreasureChestSound);
+            sync_object_init_field(o, o->oTreasureChestLastNetworkPlayerIndex);
             for (s32 i = 0; i < 4; i++) {
                 struct Object *chest = chests[i];
-                sync_object_init_field(o, &chest->oAction);
-                sync_object_init_field(o, &chest->oPrevAction);
-                sync_object_init_field(o, &chest->oTimer);
-                sync_object_init_field(o, &chest->oIntangibleTimer);
+                sync_object_init_field(o, chest->oAction);
+                sync_object_init_field(o, chest->oPrevAction);
+                sync_object_init_field(o, chest->oTimer);
+                sync_object_init_field(o, chest->oIntangibleTimer);
             }
         }
     }

src/game/behaviors/ttc_2d_rotator.inc.c

@@ -45,12 +45,12 @@ void bhv_ttc_2d_rotator_init(void) {
     struct SyncObject* so = sync_object_init(o, 4000.0f);
     if (so) {
         so->minUpdateRate = 5.0f;
-        sync_object_init_field(o, &o->oTTC2DRotatorMinTimeUntilNextTurn);
-        sync_object_init_field(o, &o->oTTC2DRotatorTargetYaw);
-        sync_object_init_field(o, &o->oTTC2DRotatorIncrement);
-        sync_object_init_field(o, &o->oTTC2DRotatorRandomDirTimer);
-        sync_object_init_field(o, &o->oFaceAngleYaw);
-        sync_object_init_field(o, &o->oAngleVelYaw);
+        sync_object_init_field(o, o->oTTC2DRotatorMinTimeUntilNextTurn);
+        sync_object_init_field(o, o->oTTC2DRotatorTargetYaw);
+        sync_object_init_field(o, o->oTTC2DRotatorIncrement);
+        sync_object_init_field(o, o->oTTC2DRotatorRandomDirTimer);
+        sync_object_init_field(o, o->oFaceAngleYaw);
+        sync_object_init_field(o, o->oAngleVelYaw);
     }
 }