diff --git a/include/z64.h b/include/z64.h
index 72e4dbb331..85af0ae5b8 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -928,18 +928,15 @@ typedef struct {
     /* 0x11F0A */ u8 unk11F0A;
     /* 0x11F0B */ UNK_TYPE1 pad11F0B[0x5];
     /* 0x11F10 */ s32 unk11F10;
-    /* 0x11F11 */ UNK_TYPE1 pad11F11[0xD];
+    /* 0x11F14 */ UNK_TYPE1 pad11F14[0xE];
     /* 0x11F22 */ u8 unk11F22;
-    /* 0x11F23 */ u8 unk11F23;
-    /* 0x11F24 */ UNK_TYPE1 pad11F24[0xFC];
-    /* 0x12020 */ u8 unk12020;
-    /* 0x12021 */ u8 unk12021;
-    /* 0x12022 */ u8 choiceIndex;
-    /* 0x12023 */ UNK_TYPE1 unk12023;
-    /* 0x12024 */ s8 unk12024;
-    /* 0x12025 */ UNK_TYPE1 unk12025[0x6];
+    /* 0x11F23 */ UNK_TYPE1 pad11F23[0xFE];
+    /* 0x12021 */ u8 choiceIndex;
+    /* 0x12022 */ UNK_TYPE1 unk12022;
+    /* 0x12023 */ s8 unk12023;
+    /* 0x12024 */ UNK_TYPE1 unk12024[0x6];
     /* 0x1202A */ u16 unk1202A;
-    /* 0x1202C */ UNK_TYPE1 pad1202B[0x18];
+    /* 0x1202C */ UNK_TYPE1 pad1202C[0x18];
     /* 0x12044 */ s16 unk12044;
     /* 0x12046 */ UNK_TYPE1 pad12046[0x24];
     /* 0x1206A */ s16 unk1206A;
diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
index eac90b2806..22e702baff 100644
--- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
+++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
@@ -234,7 +234,7 @@ void EnGinkoMan_DepositDialogue(EnGinkoMan* this, GlobalContext* globalCtx) {
             this->curTextId = 0x464; // Hey, relax! It doesn't leave any marks
             break;
         case 0x464: // Hey, relax! It doesn't leave any marks
-            globalCtx->msgCtx.unk11F23 = 0x44;
+            globalCtx->msgCtx.unk11F22 = 0x44;
             EnGinkoMan_SetupStamp(this); // stamp player
             break;
         case 0x465: // "There! Now I'll know you when I see you!"
diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
index b1fd5367c1..3469868ae4 100644
--- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
+++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
@@ -493,7 +493,7 @@ void EnWeatherTag_Update(Actor* thisx, GlobalContext* globalCtx) {
     u16 oldTime;
 
     this->actionFunc(this, globalCtx);
-    if ((globalCtx->actorCtx.unk5 & 2) && (globalCtx->msgCtx.unk11F23 != 0) &&
+    if ((globalCtx->actorCtx.unk5 & 2) && (globalCtx->msgCtx.unk11F22 != 0) &&
         (globalCtx->msgCtx.unk11F04 == 0x5E6) && (!FrameAdvance_IsEnabled(globalCtx)) && (globalCtx->unk18875 == 0) &&
         (ActorCutscene_GetCurrentIndex() == -1) && (globalCtx->csCtx.state == 0)) {
 
diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c
index df7619abf1..9b23336819 100644
--- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c
+++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c
@@ -101,8 +101,8 @@ void func_80B3C4E0(ObjGhaka* this, GlobalContext* globalCtx) {
 
     if (temp_v0 == 5) {
         if (func_80147624(globalCtx)) {
-            globalCtx->msgCtx.unk11F23 = 0x43;
-            globalCtx->msgCtx.unk12024 = 4;
+            globalCtx->msgCtx.unk11F22 = 0x43;
+            globalCtx->msgCtx.unk12023 = 4;
             func_80B3C260(this);
         }
         // Could be fake, but helps match
@@ -121,8 +121,8 @@ void func_80B3C4E0(ObjGhaka* this, GlobalContext* globalCtx) {
                     break;
                 case 2:
                     func_8019F230();
-                    globalCtx->msgCtx.unk11F23 = 0x43;
-                    globalCtx->msgCtx.unk12024 = 4;
+                    globalCtx->msgCtx.unk11F22 = 0x43;
+                    globalCtx->msgCtx.unk12023 = 4;
                     func_80B3C260(this);
             }
         }