m_clip OK (#154)

* m_clip OK

* format and added offsets

* format

11 files changed, 90 insertions, 80 deletions

diff --git a/src/code/m_actor.c b/src/code/m_actor.c
index 83ccf30..e8297ae 100644
--- a/src/code/m_actor.c
+++ b/src/code/m_actor.c
@@ -102,7 +102,7 @@ s32 Actor_data_bank_dma_end_check(Actor* actor, Game_Play* game_play) {
     switch (ACTOR_FGNAME_GET_F000(actor->fgName)) {
         case FGNAME_F000_D:
         case FGNAME_F000_E:
-            var_v1 = common_data.unk_1004C->unk_F4(game_play->objectExchangeBank.status, actor);
+            var_v1 = common_data.clip.unk_040->unk_F4(game_play->objectExchangeBank.status, actor);
             break;
 
         default:
@@ -148,7 +148,7 @@ void Actor_ct(Actor* actor, Game_Play* game_play) {
     s32 pad[2] UNUSED;
     ObjectStatus* temp;
     Npc* npc;
-    CommonData_unk_1004C_unk_14_arg0 sp34;
+    Clip_unk_040_unk_14_arg0 sp34;
     ObjectExchangeBank* temp_a0;
 
     temp_a0 = &game_play->objectExchangeBank;
@@ -160,7 +160,7 @@ void Actor_ct(Actor* actor, Game_Play* game_play) {
     if (actor->part == ACTOR_PART_NPC) {
         npc = (Npc*)actor;
 
-        common_data.unk_1004C->unk_14(&sp34, npc->actor.fgName);
+        common_data.clip.unk_040->unk_14(&sp34, npc->actor.fgName);
         npc->unk_708 = mSc_bank_regist_check(temp_a0, sp34.unk_02);
         temp_a0->status[npc->unk_708].unk50++;
     }
@@ -227,7 +227,7 @@ void Actor_dt(Actor* actor, Game_Play* game_play) {
     switch ((actor->fgName & 0xF000) >> 0xC) {
         case 0xD:
         case 0xE:
-            common_data.unk_1004C->unk_F0(temp_v0_6, actor);
+            common_data.clip.unk_040->unk_F0(temp_v0_6, actor);
             break;
 
         default:
@@ -599,11 +599,11 @@ void actor_free_check(ActorOverlay* overlayEntry, u16 fgName) {
         switch (ACTOR_FGNAME_GET_F000(fgName)) {
             case FGNAME_F000_D:
             case FGNAME_F000_E:
-                common_data.unk_1004C->unk_08();
+                common_data.clip.unk_040->unk_08();
                 break;
 
             case FGNAME_F000_5:
-                common_data.unk_10098->unk_08();
+                common_data.clip.unk_08C->unk_08();
                 break;
 
             default:
@@ -630,16 +630,16 @@ s32 func_80057940_jp(ActorProfile** profileP, ActorOverlay* overlayEntry, const
             switch (ACTOR_FGNAME_GET_F000(fgName)) {
                 case FGNAME_F000_D:
                 case FGNAME_F000_E:
-                    if (common_data.unk_1004C != NULL) {
-                        common_data.unk_1004C->unk_04(overlayEntry, arg2, overlaySize, fgName);
+                    if (common_data.clip.unk_040 != NULL) {
+                        common_data.clip.unk_040->unk_04(overlayEntry, arg2, overlaySize, fgName);
                     } else {
                         overlayEntry->loadedRamAddr = NULL;
                     }
                     break;
 
                 case FGNAME_F000_5:
-                    if (common_data.unk_10098 != NULL) {
-                        common_data.unk_10098->unk_4(overlayEntry, overlaySize);
+                    if (common_data.clip.unk_08C != NULL) {
+                        common_data.clip.unk_08C->unk_4(overlayEntry, overlaySize);
                     }
                     break;
 
@@ -679,9 +679,9 @@ s32 func_80057A8C_jp(s32* arg0, ActorProfile* profile UNUSED, ActorOverlay* over
     ret = 1;
 
     {
-        CommonData_unk_1004C_unk_14_arg0 sp24;
+        Clip_unk_040_unk_14_arg0 sp24;
 
-        common_data.unk_1004C->unk_14(&sp24, fgName);
+        common_data.clip.unk_040->unk_14(&sp24, fgName);
 
         sp92 = sp24.unk_00;
         sp90 = sp24.unk_02;
@@ -697,7 +697,7 @@ s32 func_80057A8C_jp(s32* arg0, ActorProfile* profile UNUSED, ActorOverlay* over
         if (temp_v0 >= 0) {
             sp90 = 0;
         }
-        common_data.unk_1004C->unk_EC(game_play->objectExchangeBank.status, sp92, sp90);
+        common_data.clip.unk_040->unk_EC(game_play->objectExchangeBank.status, sp92, sp90);
         actor_free_check(overlayEntry, fgName);
         ret = 0;
     }
@@ -735,21 +735,21 @@ s32 Actor_data_bank_regist_check(s32* arg0, ActorProfile* profile, ActorOverlay*
 
 s32 Actor_malloc_actor_class(Actor** actorP, ActorProfile* profile, ActorOverlay* overlayEntry,
                              const struct_801161E8_jp* arg3, u16 fgName) {
-    CommonData_unk_1004C_unk_14_arg0 sp24;
+    Clip_unk_040_unk_14_arg0 sp24;
 
     switch (ACTOR_FGNAME_GET_F000(fgName)) {
         case FGNAME_F000_D:
         case FGNAME_F000_E:
-            *actorP = common_data.unk_1004C->unk_0C(profile->instanceSize, arg3, 1);
+            *actorP = common_data.clip.unk_040->unk_0C(profile->instanceSize, arg3, 1);
 
             //! FAKE
             if ((profile != NULL) && (profile != NULL) && (profile != NULL)) {}
 
-            common_data.unk_1004C->unk_14(&sp24, fgName);
+            common_data.clip.unk_040->unk_14(&sp24, fgName);
             break;
 
         case FGNAME_F000_5:
-            *actorP = common_data.unk_10098->unk_0C();
+            *actorP = common_data.clip.unk_08C->unk_0C();
             break;
 
         default:
@@ -956,11 +956,11 @@ Actor* Actor_info_delete(ActorInfo* actorInfo, Actor* actor, Game_Play* game_pla
     switch (ACTOR_FGNAME_GET_F000(fgName)) {
         case FGNAME_F000_D:
         case FGNAME_F000_E:
-            common_data.unk_1004C->unk_10(actor);
+            common_data.clip.unk_040->unk_10(actor);
             break;
 
         case FGNAME_F000_5:
-            common_data.unk_10098->unk_10(actor);
+            common_data.clip.unk_08C->unk_10(actor);
             break;
 
         default:
diff --git a/src/code/m_clip.c b/src/code/m_clip.c
new file mode 100644
index 0000000..cd86232
--- /dev/null
+++ b/src/code/m_clip.c
@@ -0,0 +1,11 @@
+#include "m_clip.h"
+#include "m_common_data.h"
+
+void clip_clear(void) {
+    s32 i;
+    void** clip = (void**)&common_data.clip;
+
+    for (i = 0; i < sizeof(Clip) / sizeof(void*); i++) {
+        *clip++ = NULL;
+    }
+}
diff --git a/src/code/m_common_data.c b/src/code/m_common_data.c
index 5fec9cd..2be5388 100644
--- a/src/code/m_common_data.c
+++ b/src/code/m_common_data.c
@@ -1,7 +1,6 @@
 #include "global.h"
 #include "m_common_data.h"
 #include "m_flashrom.h"
-#include "68AAF0.h"
 
 CommonData common_data;
 
diff --git a/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.c b/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.c
index 5de6bfb..208b2fc 100644
--- a/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.c
+++ b/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.c
@@ -33,46 +33,46 @@ struct_809AEFA4 aKM0_ct_data = {
 };
 
 void aKM0_actor_ct(Actor* thisx, Game_Play* game_play) {
-    if (common_data.unk_1004C->unk_BC(thisx, game_play) == 1) {
-        common_data.unk_1004C->unk_C0(thisx, game_play, &aKM0_ct_data);
-        common_data.unk_1004C->unk_118(thisx);
+    if (common_data.clip.unk_040->unk_BC(thisx, game_play) == 1) {
+        common_data.clip.unk_040->unk_C0(thisx, game_play, &aKM0_ct_data);
+        common_data.clip.unk_040->unk_118(thisx);
     }
 }
 
 void aKM0_actor_save(Actor* thisx, Game_Play* game_play) {
-    common_data.unk_1004C->unk_C8(thisx, game_play);
+    common_data.clip.unk_040->unk_C8(thisx, game_play);
 }
 
 void aKM0_actor_dt(Actor* thisx, Game_Play* game_play) {
-    common_data.unk_1004C->unk_C4(thisx, game_play);
+    common_data.clip.unk_040->unk_C4(thisx, game_play);
 }
 
 void aKM0_actor_init(Actor* thisx, Game_Play* game_play) {
-    common_data.unk_1004C->unk_CC(thisx, game_play);
+    common_data.clip.unk_040->unk_CC(thisx, game_play);
 }
 
 void aKM0_talk_request(UNK_TYPE arg0, UNK_TYPE arg1 UNUSED) {
-    common_data.unk_10078->unk_00(arg0);
+    common_data.clip.unk_06C->unk_00(arg0);
 }
 
 void aKM0_talk_init(UNK_TYPE arg0, UNK_TYPE arg1 UNUSED) {
-    common_data.unk_10078->unk_04(arg0);
+    common_data.clip.unk_06C->unk_04(arg0);
 }
 
 s32 aKM0_talk_end_chk(UNK_TYPE arg0, UNK_TYPE arg1 UNUSED) {
     s32 var_v1;
 
     var_v1 = false;
-    if (common_data.unk_10078->unk_08(arg0) == 1) {
+    if (common_data.clip.unk_06C->unk_08(arg0) == 1) {
         var_v1 = true;
     }
     return var_v1;
 }
 
 void aKM0_actor_move(void) {
-    common_data.unk_1004C->unk_D0();
+    common_data.clip.unk_040->unk_D0();
 }
 
 void aKM0_actor_draw(void) {
-    common_data.unk_1004C->unk_E4();
+    common_data.clip.unk_040->unk_E4();
 }
diff --git a/src/overlays/actors/ovl_Koinobori/ac_koinobori.c b/src/overlays/actors/ovl_Koinobori/ac_koinobori.c
index d7ccda6..11bad7a 100644
--- a/src/overlays/actors/ovl_Koinobori/ac_koinobori.c
+++ b/src/overlays/actors/ovl_Koinobori/ac_koinobori.c
@@ -44,7 +44,7 @@ ShadowData aKOI_shadow_data = { 8, aKOI_shadow_vtx_fix_flg_table, 60.0f, obj_e_k
 void aKOI_actor_ct(Actor* thisx, Game_Play* game_play UNUSED) {
     Koinobori* this = THIS;
 
-    gSegments[6] = OS_K0_TO_PHYSICAL(common_data.unk_10098->unk_AC(0x27));
+    gSegments[6] = OS_K0_TO_PHYSICAL(common_data.clip.unk_08C->unk_AC(0x27));
     cKF_SkeletonInfo_R_ct(&this->skeletonInfo, &cKF_bs_r_obj_e_koinobori, 0, this->jointTable, this->morphTable);
     aKOI_set_bgOffset(this, 1);
     aKOI_setup_action(this, 0);
@@ -54,9 +54,9 @@ void aKOI_actor_ct(Actor* thisx, Game_Play* game_play UNUSED) {
 void aKOI_actor_dt(Actor* thisx, Game_Play* game_play UNUSED) {
     Koinobori* this = THIS;
 
-    common_data.unk_10098->unk_A8(&common_data.unk_10098->unk_B0, 8, 0x27, &this->actor);
-    common_data.unk_10098->unk_A8(&common_data.unk_10098->unk_454, 9, 0x50, &this->actor);
-    common_data.unk_10098->unk_A8(&common_data.unk_10098->unk_86C, 8, 0x27, &this->actor);
+    common_data.clip.unk_08C->unk_A8(&common_data.clip.unk_08C->unk_B0, 8, 0x27, &this->actor);
+    common_data.clip.unk_08C->unk_A8(&common_data.clip.unk_08C->unk_454, 9, 0x50, &this->actor);
+    common_data.clip.unk_08C->unk_A8(&common_data.clip.unk_08C->unk_86C, 8, 0x27, &this->actor);
     cKF_SkeletonInfo_R_dt(&this->skeletonInfo);
 }
 
@@ -94,7 +94,7 @@ void aKOI_actor_move(Actor* thisx, Game_Play* game_play) {
         return;
     }
 
-    gSegments[6] = OS_K0_TO_PHYSICAL(common_data.unk_10098->unk_AC(0x27));
+    gSegments[6] = OS_K0_TO_PHYSICAL(common_data.clip.unk_08C->unk_AC(0x27));
     cKF_SkeletonInfo_R_play(&this->skeletonInfo);
     this->unk2A0(this, game_play);
     sAdo_OngenPos((u32)this, 0x35, &this->actor.world.pos);
@@ -135,8 +135,8 @@ void aKOI_actor_draw(Actor* thisx, Game_Play* game_play) {
 
     mtx = GRAPH_ALLOC_NO_ALIGN(gfxCtx, this->skeletonInfo.skeleton->unk01 * sizeof(Mtx));
     if (mtx != NULL) {
-        object = common_data.unk_10098->unk_AC(0x27);
-        palette = common_data.unk_10098->unk_450(0x50);
+        object = common_data.clip.unk_08C->unk_AC(0x27);
+        palette = common_data.clip.unk_08C->unk_450(0x50);
         _texture_z_light_fog_prim_npc(gfxCtx);
         OPEN_DISPS(gfxCtx);
         OPEN_POLY_OPA_DISPS();
@@ -148,6 +148,6 @@ void aKOI_actor_draw(Actor* thisx, Game_Play* game_play) {
         CLOSE_POLY_OPA_DISPS();
         CLOSE_DISPS(gfxCtx);
         cKF_Si3_draw_R_SV(game_play, &this->skeletonInfo, mtx, NULL, NULL, this);
-        common_data.unk_10080->unk_04(game_play, &aKOI_shadow_data, 0x27);
+        common_data.clip.unk_074->unk_04(game_play, &aKOI_shadow_data, 0x27);
     }
 }
diff --git a/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.c b/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.c
index 8cbb358..14ce8a3 100644
--- a/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.c
+++ b/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.c
@@ -30,27 +30,27 @@ struct_809AEFA4 aNOR_ct_data = {
 };
 
 void aNOR_actor_ct(Actor* thisx, Game_Play* game_play) {
-    if (common_data.unk_1004C->unk_BC(thisx, game_play) == 1) {
-        common_data.unk_1004C->unk_C0(thisx, game_play, &aNOR_ct_data);
+    if (common_data.clip.unk_040->unk_BC(thisx, game_play) == 1) {
+        common_data.clip.unk_040->unk_C0(thisx, game_play, &aNOR_ct_data);
     }
 }
 
 void aNOR_actor_dt(Actor* thisx, Game_Play* game_play) {
-    common_data.unk_1004C->unk_C4(thisx, game_play);
+    common_data.clip.unk_040->unk_C4(thisx, game_play);
 }
 
 void aNOR_actor_save(Actor* thisx, Game_Play* game_play) {
-    common_data.unk_1004C->unk_C8(thisx, game_play);
+    common_data.clip.unk_040->unk_C8(thisx, game_play);
 }
 
 void aNOR_actor_init(Actor* thisx, Game_Play* game_play) {
-    common_data.unk_1004C->unk_CC(thisx, game_play);
+    common_data.clip.unk_040->unk_CC(thisx, game_play);
 }
 
 void aNOR_actor_move(void) {
-    common_data.unk_1004C->unk_D0();
+    common_data.clip.unk_040->unk_D0();
 }
 
 void aNOR_actor_draw(void) {
-    common_data.unk_1004C->unk_E4();
+    common_data.clip.unk_040->unk_E4();
 }
diff --git a/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.c b/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.c
index 211b680..1b49410 100644
--- a/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.c
+++ b/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.c
@@ -33,9 +33,9 @@ struct_809AEFA4 aNEG_ct_data = {
 void aNEG_actor_ct(Actor* thisx, Game_Play* game_play) {
     Npc_Engineer* this = (Npc_Engineer*)thisx;
 
-    if (common_data.unk_1004C->unk_BC(thisx, game_play) == 1) {
+    if (common_data.clip.unk_040->unk_BC(thisx, game_play) == 1) {
         this->unk7C0 = none_proc1;
-        common_data.unk_1004C->unk_C0(thisx, game_play, &aNEG_ct_data);
+        common_data.clip.unk_040->unk_C0(thisx, game_play, &aNEG_ct_data);
         this->unk80C = -1;
         this->unk7FD = 0;
         this->unk8AC = -1;
@@ -50,21 +50,21 @@ void aNEG_actor_ct(Actor* thisx, Game_Play* game_play) {
 }
 
 void aNEG_actor_save(Actor* thisx, Game_Play* game_play) {
-    common_data.unk_1004C->unk_C8(thisx, game_play);
+    common_data.clip.unk_040->unk_C8(thisx, game_play);
 }
 
 void aNEG_actor_dt(Actor* thisx, Game_Play* game_play) {
-    common_data.unk_1004C->unk_C4(thisx, game_play);
+    common_data.clip.unk_040->unk_C4(thisx, game_play);
 }
 
 void aNEG_actor_init(Actor* thisx, Game_Play* game_play) {
-    common_data.unk_1004C->unk_CC(thisx, game_play);
+    common_data.clip.unk_040->unk_CC(thisx, game_play);
 }
 
 void aNEG_actor_move(void) {
-    common_data.unk_1004C->unk_D0();
+    common_data.clip.unk_040->unk_D0();
 }
 
 void aNEG_actor_draw(void) {
-    common_data.unk_1004C->unk_E4();
+    common_data.clip.unk_040->unk_E4();
 }
diff --git a/src/overlays/actors/ovl_Tools/ac_tools.c b/src/overlays/actors/ovl_Tools/ac_tools.c
index 0a639a8..4e11d32 100644
--- a/src/overlays/actors/ovl_Tools/ac_tools.c
+++ b/src/overlays/actors/ovl_Tools/ac_tools.c
@@ -45,8 +45,8 @@ s32 aTOL_check_data_bank(ObjectExchangeBank* objectExchangeBank, ToolName toolNa
     s32 ret = -1;
 
     if ((toolActor->actor.part == ACTOR_PART_PLAYER) && (toolName <= TOOL_UMBRELLA32) &&
-        (common_data.toolClip->umbrellaObjectIndex != -1)) {
-        ObjectStatus* objectStatus = &objectExchangeBank->status[common_data.toolClip->umbrellaObjectIndex];
+        (common_data.clip.toolClip->umbrellaObjectIndex != -1)) {
+        ObjectStatus* objectStatus = &objectExchangeBank->status[common_data.clip.toolClip->umbrellaObjectIndex];
         Actor* temp_a0;
 
         if (ABS(objectStatus->id) != objectIndex) {
@@ -55,7 +55,7 @@ s32 aTOL_check_data_bank(ObjectExchangeBank* objectExchangeBank, ToolName toolNa
             if (objectSize <= 0xC00) {
                 temp_a0 = toolActor->actor.child;
 
-                if ((temp_a0 != NULL) && (temp_a0->unk_026 == common_data.toolClip->umbrellaObjectIndex)) {
+                if ((temp_a0 != NULL) && (temp_a0->unk_026 == common_data.clip.toolClip->umbrellaObjectIndex)) {
                     Actor_delete(temp_a0);
                 }
 
@@ -67,7 +67,7 @@ s32 aTOL_check_data_bank(ObjectExchangeBank* objectExchangeBank, ToolName toolNa
                 objectStatus->unk14 = 0;
             }
         } else {
-            ret = common_data.toolClip->umbrellaObjectIndex;
+            ret = common_data.clip.toolClip->umbrellaObjectIndex;
         }
     } else {
         s32 temp_v0_2 = mSc_bank_regist_check(objectExchangeBank, objectIndex);
@@ -142,24 +142,24 @@ void aTOL_secure_pl_umbrella_bank_area(Game_Play* game_play) {
     s32 sp18 = game_play->objectExchangeBank.num;
 
     if (mSc_secure_exchange_keep_bank(&game_play->objectExchangeBank, 0, 0xC00)) {
-        common_data.toolClip->umbrellaObjectIndex = sp18;
+        common_data.clip.toolClip->umbrellaObjectIndex = sp18;
 
     } else {
-        common_data.toolClip->umbrellaObjectIndex = -1;
+        common_data.clip.toolClip->umbrellaObjectIndex = -1;
     }
 }
 
 void aTOL_init_clip_area(Game_Play* game_play) {
-    if (common_data.toolClip == NULL) {
-        common_data.toolClip = &aTOL_clip;
-        common_data.toolClip->aTOL_birth_proc = &aTOL_birth_proc;
-        common_data.toolClip->aTOL_chg_request_mode_proc = &aTOL_chg_request_mode_proc;
+    if (common_data.clip.toolClip == NULL) {
+        common_data.clip.toolClip = &aTOL_clip;
+        common_data.clip.toolClip->aTOL_birth_proc = &aTOL_birth_proc;
+        common_data.clip.toolClip->aTOL_chg_request_mode_proc = &aTOL_chg_request_mode_proc;
         aTOL_secure_pl_umbrella_bank_area(game_play);
     }
 }
 
 void aTOL_free_clip_area(void) {
-    if (common_data.toolClip) {
-        common_data.toolClip = NULL;
+    if (common_data.clip.toolClip) {
+        common_data.clip.toolClip = NULL;
     }
 }
diff --git a/src/overlays/actors/ovl_Toudai/ac_toudai.c b/src/overlays/actors/ovl_Toudai/ac_toudai.c
index 25821f9..c128db3 100644
--- a/src/overlays/actors/ovl_Toudai/ac_toudai.c
+++ b/src/overlays/actors/ovl_Toudai/ac_toudai.c
@@ -51,7 +51,7 @@ void aTOU_actor_ct(Actor* thisx, Game_Play* game_play UNUSED) {
     static BaseSkeletonR* skl[] = { &cKF_bs_r_obj_s_toudai, &cKF_bs_r_obj_w_toudai };
     s32 type = (common_data.time.season == WINTER);
 
-    gSegments[6] = OS_K0_TO_PHYSICAL(common_data.unk_10098->unk_AC(45));
+    gSegments[6] = OS_K0_TO_PHYSICAL(common_data.clip.unk_08C->unk_AC(45));
     cKF_SkeletonInfo_R_ct(&this->skeletonInfo, skl[type], NULL, this->jointTable, this->morphTable);
     aTOU_set_bgOffset(this, 1);
     aTOU_setup_action(this, 0);
@@ -63,9 +63,9 @@ void aTOU_actor_ct(Actor* thisx, Game_Play* game_play UNUSED) {
 void aTOU_actor_dt(Actor* thisx, Game_Play* game_play UNUSED) {
     Toudai* this = THIS;
 
-    common_data.unk_10098->unk_A8(&common_data.unk_10098->unk_B0, 8, 45, thisx);
-    common_data.unk_10098->unk_A8(&common_data.unk_10098->unk_454, 9, 90, thisx);
-    common_data.unk_10098->unk_A8(&common_data.unk_10098->unk_86C, 8, 45, thisx);
+    common_data.clip.unk_08C->unk_A8(&common_data.clip.unk_08C->unk_B0, 8, 45, thisx);
+    common_data.clip.unk_08C->unk_A8(&common_data.clip.unk_08C->unk_454, 9, 90, thisx);
+    common_data.clip.unk_08C->unk_A8(&common_data.clip.unk_08C->unk_86C, 8, 45, thisx);
     cKF_SkeletonInfo_R_dt(&this->skeletonInfo);
     thisx->world.pos.x += 20.0f;
     thisx->world.pos.z += 20.0f;
@@ -180,7 +180,7 @@ void aTOU_setup_action(Toudai* this, s32 processIndex) {
 void aTOU_actor_move(Actor* thisx, Game_Play* game_play) {
     Toudai* this = THIS;
 
-    gSegments[6] = OS_K0_TO_PHYSICAL(common_data.unk_10098->unk_AC(45));
+    gSegments[6] = OS_K0_TO_PHYSICAL(common_data.clip.unk_08C->unk_AC(45));
     this->unk174 = cKF_SkeletonInfo_R_play(&this->skeletonInfo);
     this->unk1E8 = this->skeletonInfo.frameControl.currentFrame;
     this->unk2A0(this, game_play);
@@ -261,8 +261,8 @@ s32 aTOU_actor_draw_after(Game_Play* game_play, SkeletonInfoR* skeletonInfo UNUS
         mtx = _Matrix_to_Mtx_new(gfxCtx);
         if (mtx != NULL) {
             type = common_data.time.season == 3;
-            object = common_data.unk_10098->unk_AC(0x2D);
-            palette = common_data.unk_10098->unk_450(0x5A);
+            object = common_data.clip.unk_08C->unk_AC(0x2D);
+            palette = common_data.clip.unk_08C->unk_450(0x5A);
             _texture_z_light_fog_prim_light(gfxCtx);
             OPEN_DISPS(gfxCtx);
             OPEN_LIGHT_DISPS();
@@ -299,8 +299,8 @@ void aTOU_actor_draw(Actor* thisx, Game_Play* game_play) {
     mtx = GRAPH_ALLOC_NO_ALIGN(gfxCtx, numberOfDisplayLists * sizeof(Mtx));
 
     if (mtx != NULL) {
-        object = common_data.unk_10098->unk_AC(0x2D);
-        palette = common_data.unk_10098->unk_450(0x5A);
+        object = common_data.clip.unk_08C->unk_AC(0x2D);
+        palette = common_data.clip.unk_08C->unk_450(0x5A);
 
         _texture_z_light_fog_prim_npc(gfxCtx);
         OPEN_DISPS(gfxCtx);
@@ -320,6 +320,6 @@ void aTOU_actor_draw(Actor* thisx, Game_Play* game_play) {
         Setpos_HiliteReflect_init(worldPosition, game_play);
         Setpos_HiliteReflect_xlu_init(worldPosition, game_play);
         cKF_Si3_draw_R_SV(game_play, &this->skeletonInfo, mtx, aTOU_actor_draw_before, aTOU_actor_draw_after, this);
-        common_data.unk_10080->unk_04(game_play, &aTOU_shadow_data, 0x2D);
+        common_data.clip.unk_074->unk_04(game_play, &aTOU_shadow_data, 0x2D);
     }
 }
diff --git a/src/overlays/furniture/ovl_sum_hal_chest02/ac_sum_hal_chest02.c b/src/overlays/furniture/ovl_sum_hal_chest02/ac_sum_hal_chest02.c
index f5758dc..9449156 100644
--- a/src/overlays/furniture/ovl_sum_hal_chest02/ac_sum_hal_chest02.c
+++ b/src/overlays/furniture/ovl_sum_hal_chest02/ac_sum_hal_chest02.c
@@ -50,8 +50,8 @@ void aSumHalChest02_ct(FurnitureActor* this, u8* data UNUSED) {
 }
 
 void aSumHalChest02_mv(FurnitureActor* this, Actor* myRoomActor, Game_Play* game_play, u8* data UNUSED) {
-    if (common_data.unk_1008C != NULL) {
-        common_data.unk_1008C->unk_34(this, myRoomActor, game_play, 1.0f, 16.0f);
+    if (common_data.clip.unk_080 != NULL) {
+        common_data.clip.unk_080->unk_34(this, myRoomActor, game_play, 1.0f, 16.0f);
     }
 }
 
diff --git a/src/overlays/gamestates/ovl_play/m_play.c b/src/overlays/gamestates/ovl_play/m_play.c
index 08cf02c..008300c 100644
--- a/src/overlays/gamestates/ovl_play/m_play.c
+++ b/src/overlays/gamestates/ovl_play/m_play.c
@@ -271,9 +271,9 @@ void Game_play_fbdemo_wipe_move(Game_Play* game_play) {
                     break;
 
                 case 8:
-                    if (common_data.unk_100E4 != NULL) {
-                        if (common_data.unk_100E4->unk_00 != NULL) {
-                            common_data.unk_100E4->unk_00(game_play);
+                    if (common_data.clip.unk_0D8 != NULL) {
+                        if (common_data.clip.unk_0D8->unk_00 != NULL) {
+                            common_data.clip.unk_0D8->unk_00(game_play);
                             Game_play_change_scene_move_end(game_play);
                         }
                     }