4 files changed, 12 insertions, 11 deletions
diff --git a/src/code/m_actor.c b/src/code/m_actor.c
index 2fe38e2..0ed22bb 100644
--- a/src/code/m_actor.c
+++ b/src/code/m_actor.c
@@ -599,7 +599,7 @@ void actor_free_check(ActorOverlay* overlayEntry, u16 fgName) {
                 break;
 
             case FGNAME_F000_5:
-                common_data.clip.unk_08C->unk_08();
+                common_data.clip.structureClip->freeOverlayAreaProc(overlayEntry);
                 break;
 
             default:
@@ -634,8 +634,8 @@ s32 func_80057940_jp(ActorProfile** profileP, ActorOverlay* overlayEntry, const
                     break;
 
                 case FGNAME_F000_5:
-                    if (common_data.clip.unk_08C != NULL) {
-                        common_data.clip.unk_08C->unk_4(overlayEntry, overlaySize);
+                    if (common_data.clip.structureClip != NULL) {
+                        common_data.clip.structureClip->getOverlayAreaProc(overlayEntry, overlaySize);
                     }
                     break;
 
@@ -745,7 +745,7 @@ s32 Actor_malloc_actor_class(Actor** actorP, ActorProfile* profile, ActorOverlay
             break;
 
         case FGNAME_F000_5:
-            *actorP = common_data.clip.unk_08C->unk_0C();
+            *actorP = common_data.clip.structureClip->getActorAreaProc();
             break;
 
         default:
@@ -957,7 +957,7 @@ Actor* Actor_info_delete(ActorInfo* actorInfo, Actor* actor, Game_Play* game_pla
             break;
 
         case FGNAME_F000_5:
-            common_data.clip.unk_08C->unk_10(actor);
+            common_data.clip.structureClip->freeActorAreaProc(actor);
             break;
 
         default:
diff --git a/src/code/m_npc_walk.c b/src/code/m_npc_walk.c
index e784332..40ee911 100644
--- a/src/code/m_npc_walk.c
+++ b/src/code/m_npc_walk.c
@@ -1,3 +1,4 @@
+#include "prevent_bss_reordering.h"
 #include "m_npc_walk.h"
 #include "m_common_data.h"
 #include "m_npc.h"
diff --git a/src/code/m_scene.c b/src/code/m_scene.c
index 3f27d44..d3be1c9 100644
--- a/src/code/m_scene.c
+++ b/src/code/m_scene.c
@@ -385,9 +385,9 @@ void mSc_dmacopy_all_exchange_bank(ObjectExchangeBank* exchange) {
         bank++;
     }
 
-    if (common_data.clip.unk_08C != NULL) {
-        if (common_data.clip.unk_08C->unk_A4 != NULL) {
-            common_data.clip.unk_08C->unk_A4(exchange);
+    if (common_data.clip.structureClip != NULL) {
+        if (common_data.clip.structureClip->unk_A4 != NULL) {
+            common_data.clip.structureClip->unk_A4(exchange);
         }
     }
     if (common_data.clip.unk_040 != NULL) {
diff --git a/src/code/m_start_data_init.c b/src/code/m_start_data_init.c
index b936e89..9709b55 100644
--- a/src/code/m_start_data_init.c
+++ b/src/code/m_start_data_init.c
@@ -240,9 +240,9 @@ s32 mSDI_StartInitNew(Game* game2, s32 playerNumber, s32 mallocFlag) {
     lbRTC_TimeCopy(&common_data.unk_0F8A4, &mTM_rtcTime_clear_code);
 
     for (i = 0; i < PLAYER_NUM; i++) {
-        common_data.homes[i].unk_022 &= (u16)~0xC0;
-        common_data.homes[i].unk_022 &= 0xCF;
-        common_data.homes[i].unk_022 &= 0xF7;
+        common_data.homes[i].unk_022.unk_22_0 = 0;
+        common_data.homes[i].unk_022.unk_22_2 = 0;
+        common_data.homes[i].unk_022.unk_22_4 = 0;
         common_data.homes[i].unk_024 = i;
     }