diff --git a/include/message_data_fmt_nes.h b/include/message_data_fmt_nes.h
index 949cf94658..91941a4a8c 100644
--- a/include/message_data_fmt_nes.h
+++ b/include/message_data_fmt_nes.h
@@ -123,8 +123,8 @@
     { __VA_ARGS__ END }
 
 // Not a control command, used to define the data that begins every message
-#define HEADER(unk11F08, itemId, nextTextId, unk1206C, unk12070, unk12074) \
-    ARG2(unk11F08) ARG1(itemId) ARG2(nextTextId) ARG2(unk1206C) ARG2(unk12070) ARG2(unk12074)
+#define HEADER(textBoxProperties, itemId, nextTextId, firstChoiceValue, secondChoiceValue, unk12074) \
+    ARG2(textBoxProperties) ARG1(itemId) ARG2(nextTextId) ARG2(firstChoiceValue) ARG2(secondChoiceValue) ARG2(unk12074)
 
 #define COLOR_DEFAULT CTRL_BASE(COLOR_DEFAULT)
 #define COLOR_RED CTRL_BASE(COLOR_RED)
diff --git a/include/z64message.h b/include/z64message.h
index 76494b8551..9b24dd245c 100644
--- a/include/z64message.h
+++ b/include/z64message.h
@@ -186,7 +186,7 @@ typedef struct MessageContext {
     /* 0x11F00 */ struct OcarinaStaff* ocarinaStaff;
     /* 0x11F04 */ u16 currentTextId;
     /* 0x11F06 */ u16 choiceTextId; // s16?
-    /* 0x11F08 */ u16 unk11F08;
+    /* 0x11F08 */ u16 textBoxProperties;
     /* 0x11F0A */ u8 textBoxType;
     /* 0x11F0B */ u8 textBoxPos;
     /* 0x11F0C */ u8 unk11F0C;
@@ -249,12 +249,12 @@ typedef struct MessageContext {
     /* 0x12046 */ s16 blockSunsSong;
     /* 0x12048 */ u8 ocarinaButtonIndex;
     /* 0x1204A */ s16 ocarinaButtonsPosY[5];
-    /* 0x12054 */ s16 unk12054[6]; // First, second and third digits in lottery code guess
+    /* 0x12054 */ s16 codeGuessDigits[6]; // First, second and third digits in lottery code guess
     /* 0x1205A */ UNK_TYPE1 unk12060[0x8];
     /* 0x12068 */ s16 textboxX;
     /* 0x1206A */ s16 textboxY;
-    /* 0x1206C */ s32 unk1206C;
-    /* 0x12070 */ s32 unk12070;
+    /* 0x1206C */ s32 firstChoiceValue;
+    /* 0x12070 */ s32 secondChoiceValue;
     /* 0x12074 */ s32 unk12074;
     /* 0x12078 */ s32 rupeesSelected; // Used for bank and doggy racetrack bet
     /* 0x1207C */ s32 rupeesTotal; // Used for bank and doggy racetrack bet
@@ -290,7 +290,7 @@ typedef struct MessageContext {
     /* 0x120D2 */ s16 unk120D2;
     /* 0x120D4 */ s16 unk120D4;
     /* 0x120D6 */ s16 unk120D6;
-    /* 0x120D8 */ s16 unk120D8;
+    /* 0x120D8 */ s16 numLines;
     /* 0x120DA */ UNK_TYPE1 unk_120DA[0x6];
 } MessageContext; // size = 0x120E0
 
diff --git a/src/code/z_inventory.c b/src/code/z_inventory.c
index f4d821b47f..07226c4953 100644
--- a/src/code/z_inventory.c
+++ b/src/code/z_inventory.c
@@ -730,9 +730,9 @@ s16 Inventory_GetSkullTokenCount(s16 sceneIndex) {
 void Inventory_SaveLotteryCodeGuess(PlayState* play) {
     u16 lotteryCodeGuess;
 
-    lotteryCodeGuess = ((play->msgCtx.unk12054[0] & 0xF) << 8);  // First Digit
-    lotteryCodeGuess |= ((play->msgCtx.unk12054[1] & 0xF) << 4); // Second Digit
-    lotteryCodeGuess |= (play->msgCtx.unk12054[2] & 0xF);        // Third Digit
+    lotteryCodeGuess = ((play->msgCtx.codeGuessDigits[0] & 0xF) << 8);  // First Digit
+    lotteryCodeGuess |= ((play->msgCtx.codeGuessDigits[1] & 0xF) << 4); // Second Digit
+    lotteryCodeGuess |= (play->msgCtx.codeGuessDigits[2] & 0xF);        // Third Digit
     HS_SET_LOTTERY_CODE_GUESS(lotteryCodeGuess);
 }
 
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 20ce6279e9..363855cb20 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -610,20 +610,22 @@ void func_801491DC(PlayState* play) {
     MessageContext* msgCtx = &play->msgCtx;
 
     if (msgCtx->stickAdjY <= -30) {
-        msgCtx->unk12054[msgCtx->unk120C2]--;
-        if (msgCtx->unk12054[msgCtx->unk120C2] <= 0) {
-            msgCtx->unk12054[msgCtx->unk120C2] = 5;
+        msgCtx->codeGuessDigits[msgCtx->unk120C2]--;
+        if (msgCtx->codeGuessDigits[msgCtx->unk120C2] <= 0) {
+            msgCtx->codeGuessDigits[msgCtx->unk120C2] = 5;
         }
-        msgCtx->decodedBuffer.schar[msgCtx->unk120C0 + msgCtx->unk120C2] = msgCtx->unk12054[msgCtx->unk120C2] + '0';
+        msgCtx->decodedBuffer.schar[msgCtx->unk120C0 + msgCtx->unk120C2] =
+            msgCtx->codeGuessDigits[msgCtx->unk120C2] + '0';
         Font_LoadCharNES(play, msgCtx->decodedBuffer.schar[msgCtx->unk120C0 + msgCtx->unk120C2],
                          msgCtx->unk120C4 + (msgCtx->unk120C2 << 7));
         Audio_PlaySfx(NA_SE_SY_RUPY_COUNT);
     } else if (msgCtx->stickAdjY >= 30) {
-        msgCtx->unk12054[msgCtx->unk120C2]++;
-        if (msgCtx->unk12054[msgCtx->unk120C2] > 5) {
-            msgCtx->unk12054[msgCtx->unk120C2] = 1;
+        msgCtx->codeGuessDigits[msgCtx->unk120C2]++;
+        if (msgCtx->codeGuessDigits[msgCtx->unk120C2] > 5) {
+            msgCtx->codeGuessDigits[msgCtx->unk120C2] = 1;
         }
-        msgCtx->decodedBuffer.schar[msgCtx->unk120C0 + msgCtx->unk120C2] = msgCtx->unk12054[msgCtx->unk120C2] + '0';
+        msgCtx->decodedBuffer.schar[msgCtx->unk120C0 + msgCtx->unk120C2] =
+            msgCtx->codeGuessDigits[msgCtx->unk120C2] + '0';
         Font_LoadCharNES(play, msgCtx->decodedBuffer.schar[msgCtx->unk120C0 + msgCtx->unk120C2],
                          msgCtx->unk120C4 + (msgCtx->unk120C2 << 7));
         Audio_PlaySfx(NA_SE_SY_RUPY_COUNT);
@@ -653,20 +655,22 @@ void func_80149454(PlayState* play) {
     MessageContext* msgCtx = &play->msgCtx;
 
     if (msgCtx->stickAdjY <= -30) {
-        msgCtx->unk12054[msgCtx->unk120C2]--;
-        if (msgCtx->unk12054[msgCtx->unk120C2] < 0) {
-            msgCtx->unk12054[msgCtx->unk120C2] = 9;
+        msgCtx->codeGuessDigits[msgCtx->unk120C2]--;
+        if (msgCtx->codeGuessDigits[msgCtx->unk120C2] < 0) {
+            msgCtx->codeGuessDigits[msgCtx->unk120C2] = 9;
         }
-        msgCtx->decodedBuffer.schar[msgCtx->unk120C0 + msgCtx->unk120C2] = msgCtx->unk12054[msgCtx->unk120C2] + '0';
+        msgCtx->decodedBuffer.schar[msgCtx->unk120C0 + msgCtx->unk120C2] =
+            msgCtx->codeGuessDigits[msgCtx->unk120C2] + '0';
         Font_LoadCharNES(play, msgCtx->decodedBuffer.schar[msgCtx->unk120C0 + msgCtx->unk120C2],
                          msgCtx->unk120C4 + (msgCtx->unk120C2 << 7));
         Audio_PlaySfx(NA_SE_SY_RUPY_COUNT);
     } else if (msgCtx->stickAdjY >= 30) {
-        msgCtx->unk12054[msgCtx->unk120C2]++;
-        if (msgCtx->unk12054[msgCtx->unk120C2] > 9) {
-            msgCtx->unk12054[msgCtx->unk120C2] = 0;
+        msgCtx->codeGuessDigits[msgCtx->unk120C2]++;
+        if (msgCtx->codeGuessDigits[msgCtx->unk120C2] > 9) {
+            msgCtx->codeGuessDigits[msgCtx->unk120C2] = 0;
         }
-        msgCtx->decodedBuffer.schar[msgCtx->unk120C0 + msgCtx->unk120C2] = msgCtx->unk12054[msgCtx->unk120C2] + '0';
+        msgCtx->decodedBuffer.schar[msgCtx->unk120C0 + msgCtx->unk120C2] =
+            msgCtx->codeGuessDigits[msgCtx->unk120C2] + '0';
         Font_LoadCharNES(play, msgCtx->decodedBuffer.schar[msgCtx->unk120C0 + msgCtx->unk120C2],
                          msgCtx->unk120C4 + (msgCtx->unk120C2 << 7));
         Audio_PlaySfx(NA_SE_SY_RUPY_COUNT);
@@ -696,20 +700,22 @@ void func_801496C8(PlayState* play) {
     MessageContext* msgCtx = &play->msgCtx;
 
     if (play->msgCtx.stickAdjY <= -30) {
-        msgCtx->unk12054[msgCtx->unk120C2]--;
-        if (msgCtx->unk12054[msgCtx->unk120C2] < 0) {
-            msgCtx->unk12054[msgCtx->unk120C2] = 3;
+        msgCtx->codeGuessDigits[msgCtx->unk120C2]--;
+        if (msgCtx->codeGuessDigits[msgCtx->unk120C2] < 0) {
+            msgCtx->codeGuessDigits[msgCtx->unk120C2] = 3;
         }
-        msgCtx->decodedBuffer.wchar[msgCtx->unk120C0 + msgCtx->unk120C2] = msgCtx->unk12054[msgCtx->unk120C2] + '０';
+        msgCtx->decodedBuffer.wchar[msgCtx->unk120C0 + msgCtx->unk120C2] =
+            msgCtx->codeGuessDigits[msgCtx->unk120C2] + '０';
         Font_LoadChar(play, msgCtx->decodedBuffer.wchar[msgCtx->unk120C0 + msgCtx->unk120C2],
                       msgCtx->unk120C4 + (msgCtx->unk120C2 << 7));
         Audio_PlaySfx(NA_SE_SY_RUPY_COUNT);
     } else if (msgCtx->stickAdjY >= 30) {
-        msgCtx->unk12054[msgCtx->unk120C2]++;
-        if (msgCtx->unk12054[msgCtx->unk120C2] >= 4) {
-            msgCtx->unk12054[msgCtx->unk120C2] = 0;
+        msgCtx->codeGuessDigits[msgCtx->unk120C2]++;
+        if (msgCtx->codeGuessDigits[msgCtx->unk120C2] >= 4) {
+            msgCtx->codeGuessDigits[msgCtx->unk120C2] = 0;
         }
-        msgCtx->decodedBuffer.wchar[msgCtx->unk120C0 + msgCtx->unk120C2] = msgCtx->unk12054[msgCtx->unk120C2] + '０';
+        msgCtx->decodedBuffer.wchar[msgCtx->unk120C0 + msgCtx->unk120C2] =
+            msgCtx->codeGuessDigits[msgCtx->unk120C2] + '０';
         Font_LoadChar(play, msgCtx->decodedBuffer.wchar[msgCtx->unk120C0 + msgCtx->unk120C2],
                       msgCtx->unk120C4 + (msgCtx->unk120C2 << 7));
         Audio_PlaySfx(NA_SE_SY_RUPY_COUNT);
@@ -2002,11 +2008,11 @@ void Message_DecodeHeader(PlayState* play) {
         msgCtx->nextTextId = font->msgBuf.schar[++msgCtx->msgBufPos] << 8;
         msgCtx->nextTextId |= font->msgBuf.schar[++msgCtx->msgBufPos];
 
-        msgCtx->unk1206C = font->msgBuf.schar[++msgCtx->msgBufPos] << 8;
-        msgCtx->unk1206C |= font->msgBuf.schar[++msgCtx->msgBufPos];
+        msgCtx->firstChoiceValue = font->msgBuf.schar[++msgCtx->msgBufPos] << 8;
+        msgCtx->firstChoiceValue |= font->msgBuf.schar[++msgCtx->msgBufPos];
 
-        msgCtx->unk12070 = font->msgBuf.schar[++msgCtx->msgBufPos] << 8;
-        msgCtx->unk12070 |= font->msgBuf.schar[++msgCtx->msgBufPos];
+        msgCtx->secondChoiceValue = font->msgBuf.schar[++msgCtx->msgBufPos] << 8;
+        msgCtx->secondChoiceValue |= font->msgBuf.schar[++msgCtx->msgBufPos];
 
         msgCtx->unk12074 = font->msgBuf.schar[++msgCtx->msgBufPos] << 8;
         msgCtx->unk12074 |= font->msgBuf.schar[++msgCtx->msgBufPos];
@@ -2583,7 +2589,7 @@ void Message_Decode(PlayState* play) {
                 msgCtx->unk120C4 = charTexIndex;
 
                 for (i = 0; i < 5; i++) {
-                    msgCtx->unk12054[i] = 1;
+                    msgCtx->codeGuessDigits[i] = 1;
                     Message_LoadChar(play, '１', &charTexIndex, &spC0, decodedBufPos);
                     decodedBufPos++;
                 }
@@ -2616,7 +2622,7 @@ void Message_Decode(PlayState* play) {
                 msgCtx->unk120C4 = charTexIndex;
 
                 for (i = 0; i < 3; i++) {
-                    msgCtx->unk12054[i] = 1;
+                    msgCtx->codeGuessDigits[i] = 1;
                     Font_LoadChar(play, '１', charTexIndex);
                     charTexIndex += FONT_CHAR_TEX_SIZE;
                     msgCtx->decodedBuffer.wchar[decodedBufPos] = '１';
@@ -3207,13 +3213,13 @@ void Message_OpenText(PlayState* play, u16 textId) {
     msgCtx->msgBufPos = 0;
     msgCtx->decodedTextLen = 0;
 
-    msgCtx->unk11F08 = font->msgBuf.schar[msgCtx->msgBufPos] << 8;
-    msgCtx->unk11F08 |= font->msgBuf.schar[msgCtx->msgBufPos + 1];
+    msgCtx->textBoxProperties = font->msgBuf.schar[msgCtx->msgBufPos] << 8;
+    msgCtx->textBoxProperties |= font->msgBuf.schar[msgCtx->msgBufPos + 1];
 
-    msgCtx->unk11F18 = (msgCtx->unk11F08 & 0xF000) >> 0xC;
-    msgCtx->textBoxType = (msgCtx->unk11F08 & 0xF00) >> 8;
-    msgCtx->textBoxPos = (msgCtx->unk11F08 & 0xF0) >> 4;
-    msgCtx->unk11F0C = msgCtx->unk11F08 & 0xF;
+    msgCtx->unk11F18 = (msgCtx->textBoxProperties & 0xF000) >> 0xC;
+    msgCtx->textBoxType = (msgCtx->textBoxProperties & 0xF00) >> 8;
+    msgCtx->textBoxPos = (msgCtx->textBoxProperties & 0xF0) >> 4;
+    msgCtx->unk11F0C = msgCtx->textBoxProperties & 0xF;
 
     if ((msgCtx->unk11F0C == 1) || (msgCtx->unk11F0C == 3)) {
         msgCtx->textUnskippable = true;
@@ -3299,11 +3305,11 @@ void func_801514B0(PlayState* play, u16 arg1, u8 arg2) {
     msgCtx->textDrawPos = 0;
     msgCtx->msgBufPos = 0;
     msgCtx->decodedTextLen = 0;
-    msgCtx->unk11F08 = font->msgBuf.wchar[msgCtx->msgBufPos];
-    msgCtx->unk11F18 = (msgCtx->unk11F08 & 0xF000) >> 0xC;
+    msgCtx->textBoxProperties = font->msgBuf.wchar[msgCtx->msgBufPos];
+    msgCtx->unk11F18 = (msgCtx->textBoxProperties & 0xF000) >> 0xC;
     msgCtx->textBoxType = TEXTBOX_TYPE_9;
     msgCtx->textBoxPos = arg2;
-    msgCtx->unk11F0C = msgCtx->unk11F08 & 0xF;
+    msgCtx->unk11F0C = msgCtx->textBoxProperties & 0xF;
     msgCtx->textUnskippable = true;
     DmaMgr_RequestSync(msgCtx->textboxSegment, SEGMENT_ROM_START(message_static) + (D_801CFC78[0] * 0x1000), 0x1000);
     msgCtx->textboxColorRed = 0;
diff --git a/src/code/z_message_nes.c b/src/code/z_message_nes.c
index eeea224953..f6b43080f0 100644
--- a/src/code/z_message_nes.c
+++ b/src/code/z_message_nes.c
@@ -549,7 +549,7 @@ void Message_DrawTextNES(PlayState* play, Gfx** gfxP, u16 textDrawPos) {
                         msgCtx->textPosX += 50;
                     }
                 } else if (msgCtx->choiceNum == 2) {
-                    if (msgCtx->unk120D8 != 3) {
+                    if (msgCtx->numLines != 3) {
                         if (!play->pauseCtx.bombersNotebookOpen) {
                             msgCtx->textPosX += 10;
                         } else {
@@ -746,7 +746,7 @@ void Message_DrawTextNES(PlayState* play, Gfx** gfxP, u16 textDrawPos) {
                     msgCtx->choiceTextId = msgCtx->currentTextId;
                     msgCtx->stateTimer = 4;
                     Font_LoadMessageBoxEndIcon(font, 2);
-                    if (msgCtx->unk120D8 != 3) {
+                    if (msgCtx->numLines != 3) {
                         msgCtx->unk11FFE[0] = (s16)(msgCtx->textboxYTarget + 14);
                         msgCtx->unk11FFE[1] = (s16)(msgCtx->textboxYTarget + 26);
                         msgCtx->unk11FFE[2] = (s16)(msgCtx->textboxYTarget + 38);
@@ -761,7 +761,7 @@ void Message_DrawTextNES(PlayState* play, Gfx** gfxP, u16 textDrawPos) {
                     msgCtx->choiceTextId = msgCtx->currentTextId;
                     msgCtx->stateTimer = 4;
                     Font_LoadMessageBoxEndIcon(font, 2);
-                    if (msgCtx->unk120D8 != 3) {
+                    if (msgCtx->numLines != 3) {
                         msgCtx->unk11FFE[0] = (s16)(msgCtx->textboxYTarget + 14);
                         msgCtx->unk11FFE[1] = (s16)(msgCtx->textboxYTarget + 26);
                         msgCtx->unk11FFE[2] = (s16)(msgCtx->textboxYTarget + 38);
@@ -1100,7 +1100,7 @@ void Message_DecodeNES(PlayState* play) {
             }
 
             msgCtx->decodedTextLen = decodedBufPos;
-            msgCtx->unk120D8 = numLines;
+            msgCtx->numLines = numLines;
             if (msgCtx->textboxSkipped || (msgCtx->textBoxType == TEXTBOX_TYPE_1) ||
                 (msgCtx->textBoxType == TEXTBOX_TYPE_3) || (msgCtx->textBoxType == TEXTBOX_TYPE_6) ||
                 (msgCtx->textBoxType == TEXTBOX_TYPE_8) || (msgCtx->textBoxType == TEXTBOX_TYPE_9) ||
diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.c b/src/overlays/actors/ovl_En_Bal/z_en_bal.c
index 1b0feb3099..c22396abb4 100644
--- a/src/overlays/actors/ovl_En_Bal/z_en_bal.c
+++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.c
@@ -821,9 +821,9 @@ void EnBal_TryPurchaseMap(EnBal* this, PlayState* play) {
         if (play->msgCtx.choiceIndex != TINGLE_MAPCHOICE_CANCEL) {
             // Get price depending on which map player wants to buy
             if (play->msgCtx.choiceIndex == TINGLE_MAPCHOICE_PROXIMAL) {
-                price = play->msgCtx.unk1206C;
+                price = play->msgCtx.firstChoiceValue;
             } else {
-                price = play->msgCtx.unk12070;
+                price = play->msgCtx.secondChoiceValue;
             }
 
             if (gSaveContext.save.saveInfo.playerData.rupees < price) {
diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c
index 17ebd7c177..6671ad84be 100644
--- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c
+++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c
@@ -246,7 +246,7 @@ void func_80C04D8C(EnBombers2* this, PlayState* play) {
 
             for (i = 0; i < ARRAY_COUNT(this->correctDigitSlots); i++) {
                 if (!(this->correctDigitSlots[i]) &&
-                    (play->msgCtx.unk12054[i] == gSaveContext.save.saveInfo.bomberCode[i])) {
+                    (play->msgCtx.codeGuessDigits[i] == gSaveContext.save.saveInfo.bomberCode[i])) {
                     this->correctDigitSlots[i] = true;
                 }
             }
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 267620abcf..a126814adb 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
@@ -313,7 +313,7 @@ void EnGinkoMan_DepositDialogue(EnGinkoMan* this, PlayState* play) {
         case 0x477:
             Message_StartTextbox(play, 0x471, &this->actor);
             this->curTextId = 0x471;
-            this->serviceFee = play->msgCtx.unk1206C;
+            this->serviceFee = play->msgCtx.firstChoiceValue;
             break;
 
         case 0x479:
diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
index 7673633b39..7532b8a108 100644
--- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
+++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
@@ -186,7 +186,7 @@ s32 EnGirlA_CanBuyPotionRed(PlayState* play, EnGirlA* this) {
     if (!Inventory_HasEmptyBottle()) {
         return CANBUY_RESULT_NEED_EMPTY_BOTTLE;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_2;
@@ -196,7 +196,7 @@ s32 EnGirlA_CanBuyPotionGreen(PlayState* play, EnGirlA* this) {
     if (!Inventory_HasEmptyBottle()) {
         return CANBUY_RESULT_NEED_EMPTY_BOTTLE;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_2;
@@ -212,7 +212,7 @@ s32 EnGirlA_CanBuyPotionBlue(PlayState* play, EnGirlA* this) {
     if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FREE_BLUE_POTION)) {
         return CANBUY_RESULT_SUCCESS_2;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_2;
@@ -225,7 +225,7 @@ s32 EnGirlA_CanBuyArrows(PlayState* play, EnGirlA* this) {
     if (AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) {
         return CANBUY_RESULT_NO_ROOM_2;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_2;
@@ -235,7 +235,7 @@ s32 EnGirlA_CanBuyNuts(PlayState* play, EnGirlA* this) {
     if ((CUR_CAPACITY(UPG_DEKU_NUTS) != 0) && (CUR_CAPACITY(UPG_DEKU_NUTS) <= AMMO(ITEM_DEKU_NUT))) {
         return CANBUY_RESULT_NO_ROOM;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     if (Item_CheckObtainability(ITEM_DEKU_NUT) == ITEM_NONE) {
@@ -248,7 +248,7 @@ s32 EnGirlA_CanBuyShieldHero(PlayState* play, EnGirlA* this) {
     if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) != EQUIP_VALUE_SHIELD_NONE) {
         return CANBUY_RESULT_NO_ROOM;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_1;
@@ -258,7 +258,7 @@ s32 EnGirlA_CanBuyStick(PlayState* play, EnGirlA* this) {
     if ((CUR_CAPACITY(UPG_DEKU_STICKS) != 0) && (AMMO(ITEM_DEKU_STICK) >= CUR_CAPACITY(UPG_DEKU_STICKS))) {
         return CANBUY_RESULT_NO_ROOM;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     if (Item_CheckObtainability(ITEM_DEKU_STICK) == ITEM_NONE) {
@@ -268,7 +268,7 @@ s32 EnGirlA_CanBuyStick(PlayState* play, EnGirlA* this) {
 }
 
 s32 EnGirlA_CanBuyMaskAllNight(PlayState* play, EnGirlA* this) {
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_2;
@@ -278,7 +278,7 @@ s32 EnGirlA_CanBuyBombBagCuriosityShop(PlayState* play, EnGirlA* this) {
     if (GET_CUR_UPG_VALUE(UPG_BOMB_BAG) >= 2) {
         return CANBUY_RESULT_CANNOT_GET_NOW;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_2;
@@ -291,7 +291,7 @@ s32 EnGirlA_CanBuyBombBag20BombShop(PlayState* play, EnGirlA* this) {
     if (GET_CUR_UPG_VALUE(UPG_BOMB_BAG) >= 2) {
         return CANBUY_RESULT_HAVE_BETTER;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_1;
@@ -304,7 +304,7 @@ s32 EnGirlA_CanBuyBombBag30BombShop(PlayState* play, EnGirlA* this) {
     if (GET_CUR_UPG_VALUE(UPG_BOMB_BAG) == 3) {
         return CANBUY_RESULT_HAVE_BETTER;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_1;
@@ -317,7 +317,7 @@ s32 EnGirlA_CanBuyBombchus(PlayState* play, EnGirlA* this) {
     if (AMMO(ITEM_BOMBCHU) >= CUR_CAPACITY(UPG_BOMB_BAG)) {
         return CANBUY_RESULT_NO_ROOM;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     if (Item_CheckObtainability(ITEM_BOMBCHU) == ITEM_NONE) {
@@ -333,21 +333,21 @@ s32 EnGirlA_CanBuyBombs(PlayState* play, EnGirlA* this) {
     if (AMMO(ITEM_BOMB) >= CUR_CAPACITY(UPG_BOMB_BAG)) {
         return CANBUY_RESULT_NO_ROOM;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_2;
 }
 
 s32 EnGirlA_CanBuyBottleStolen(PlayState* play, EnGirlA* this) {
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_1;
 }
 
 s32 EnGirlA_CanBuySword(PlayState* play, EnGirlA* this) {
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_1;
@@ -357,7 +357,7 @@ s32 EnGirlA_CanBuyShieldMirror(PlayState* play, EnGirlA* this) {
     if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) != EQUIP_VALUE_SHIELD_NONE) {
         return CANBUY_RESULT_NO_ROOM;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_1;
@@ -367,7 +367,7 @@ s32 EnGirlA_CanBuyFairy(PlayState* play, EnGirlA* this) {
     if (!Inventory_HasEmptyBottle()) {
         return CANBUY_RESULT_NEED_EMPTY_BOTTLE;
     }
-    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
     return CANBUY_RESULT_SUCCESS_2;
@@ -402,12 +402,12 @@ void EnGirlA_BuyBottleItem(PlayState* play, EnGirlA* this) {
         default:
             break;
     }
-    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
 }
 
 void EnGirlA_BuyArrows(PlayState* play, EnGirlA* this) {
     Inventory_ChangeAmmo(ITEM_BOW, this->itemParams);
-    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
 }
 
 void EnGirlA_BuyNuts(PlayState* play, EnGirlA* this) {
@@ -423,22 +423,22 @@ void EnGirlA_BuyNuts(PlayState* play, EnGirlA* this) {
         default:
             break;
     }
-    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
 }
 
 void EnGirlA_BuyShieldHero(PlayState* play, EnGirlA* this) {
     Item_Give(play, ITEM_SHIELD_HERO);
-    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
 }
 
 void EnGirlA_BuyStick(PlayState* play, EnGirlA* this) {
     Item_Give(play, ITEM_DEKU_STICK);
-    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
 }
 
 void EnGirlA_BuyMaskAllNight(PlayState* play, EnGirlA* this) {
     Item_Give(play, ITEM_MASK_ALL_NIGHT);
-    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
 }
 
 void EnGirlA_BuyBombBag(PlayState* play, EnGirlA* this) {
@@ -459,14 +459,14 @@ void EnGirlA_BuyBombBag(PlayState* play, EnGirlA* this) {
         default:
             break;
     }
-    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
 }
 
 void EnGirlA_BuyBombchus(PlayState* play, EnGirlA* this) {
     if (this->itemParams == 10) {
         Item_Give(play, ITEM_BOMBCHUS_10);
     }
-    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
 }
 
 void EnGirlA_BuyBombs(PlayState* play, EnGirlA* this) {
@@ -490,12 +490,12 @@ void EnGirlA_BuyBombs(PlayState* play, EnGirlA* this) {
         default:
             break;
     }
-    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
 }
 
 void EnGirlA_BuyBottle(PlayState* play, EnGirlA* this) {
     Item_Give(play, ITEM_BOTTLE);
-    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
 }
 
 void EnGirlA_BuySword(PlayState* play, EnGirlA* this) {
@@ -519,17 +519,17 @@ void EnGirlA_BuySword(PlayState* play, EnGirlA* this) {
         default:
             break;
     }
-    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
 }
 
 void EnGirlA_BuyShieldMirror(PlayState* play, EnGirlA* this) {
     Item_Give(play, ITEM_SHIELD_MIRROR);
-    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
 }
 
 // Fanfare is handled by the shopkeeper
 void EnGirlA_BuyFanfare(PlayState* play, EnGirlA* this) {
-    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
 }
 
 void EnGirlA_DoNothing(EnGirlA* this, PlayState* play) {
diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c
index 8c6a8432db..785b91d47b 100644
--- a/src/overlays/actors/ovl_En_In/z_en_in.c
+++ b/src/overlays/actors/ovl_En_In/z_en_in.c
@@ -600,8 +600,8 @@ s32 func_808F4150(PlayState* play, EnIn* this, s32 arg2, MessageContext* msgCtx)
 
     if (msgCtx->choiceIndex == 0) {
         Audio_PlaySfx_MessageDecide();
-        if (gSaveContext.save.saveInfo.playerData.rupees >= play->msgCtx.unk1206C) {
-            Rupees_ChangeBy(-play->msgCtx.unk1206C);
+        if (gSaveContext.save.saveInfo.playerData.rupees >= play->msgCtx.firstChoiceValue) {
+            Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
             if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_57_01)) {
                 func_808F4108(this, play, 0x3474);
             } else if (this->unk4AC & 8) {
@@ -622,7 +622,7 @@ s32 func_808F4150(PlayState* play, EnIn* this, s32 arg2, MessageContext* msgCtx)
 
 s32 func_808F4270(PlayState* play, EnIn* this, s32 arg2, MessageContext* msgCtx, s32 arg4) {
     s32 pad;
-    s32 fee = (play->msgCtx.unk1206C != 0xFFFF) ? play->msgCtx.unk1206C : 10;
+    s32 fee = (play->msgCtx.firstChoiceValue != 0xFFFF) ? play->msgCtx.firstChoiceValue : 10;
 
     if (msgCtx->choiceIndex == 0) {
         Audio_PlaySfx_MessageDecide();
@@ -795,11 +795,11 @@ s32 func_808F4414(PlayState* play, EnIn* this, s32 arg2) {
                 case 0x3466:
                     if (msgCtx->choiceIndex == 0) {
                         Audio_PlaySfx_MessageDecide();
-                        if (gSaveContext.save.saveInfo.playerData.rupees >= play->msgCtx.unk1206C) {
+                        if (gSaveContext.save.saveInfo.playerData.rupees >= play->msgCtx.firstChoiceValue) {
                             if (Inventory_HasEmptyBottle()) {
                                 this->actionFunc = func_808F3C40;
                                 Actor_OfferGetItem(&this->actor, play, GI_MILK, 500.0f, 100.0f);
-                                Rupees_ChangeBy(-play->msgCtx.unk1206C);
+                                Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
                                 ret = true;
                             } else {
                                 Actor_ContinueText(play, &this->actor, 0x3469);
@@ -1098,11 +1098,11 @@ s32 func_808F4414(PlayState* play, EnIn* this, s32 arg2) {
                 case 0x3490:
                     if (msgCtx->choiceIndex == 0) {
                         Audio_PlaySfx_MessageDecide();
-                        if (gSaveContext.save.saveInfo.playerData.rupees >= play->msgCtx.unk1206C) {
+                        if (gSaveContext.save.saveInfo.playerData.rupees >= play->msgCtx.firstChoiceValue) {
                             if (Inventory_HasEmptyBottle()) {
                                 this->actionFunc = func_808F3C40;
                                 Actor_OfferGetItem(&this->actor, play, GI_MILK, 500.0f, 100.0f);
-                                Rupees_ChangeBy(-play->msgCtx.unk1206C);
+                                Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
                                 ret = true;
                             } else {
                                 Actor_ContinueText(play, &this->actor, 0x3469);
diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c
index 53c3b823fe..db21121d39 100644
--- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c
+++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c
@@ -231,13 +231,13 @@ void func_80B26758(EnKendoJs* this, PlayState* play) {
                     Message_StartTextbox(play, 0x272C, &this->actor);
                     this->unk_288 = 0x272C;
                     Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, ENKENDOJS_ANIM_2);
-                } else if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+                } else if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
                     Audio_PlaySfx(NA_SE_SY_ERROR);
                     Message_StartTextbox(play, 0x2718, &this->actor);
                     this->unk_288 = 0x2718;
                 } else {
                     Audio_PlaySfx_MessageDecide();
-                    Rupees_ChangeBy(-play->msgCtx.unk1206C);
+                    Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
                     Message_StartTextbox(play, 0x2719, &this->actor);
                     this->unk_288 = 0x2719;
                 }
@@ -249,13 +249,13 @@ void func_80B26758(EnKendoJs* this, PlayState* play) {
                     Message_StartTextbox(play, 0x272C, &this->actor);
                     this->unk_288 = 0x272C;
                     Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, ENKENDOJS_ANIM_2);
-                } else if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk12070) {
+                } else if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.secondChoiceValue) {
                     Audio_PlaySfx(NA_SE_SY_ERROR);
                     Message_StartTextbox(play, 0x2718, &this->actor);
                     this->unk_288 = 0x2718;
                 } else {
                     Audio_PlaySfx_MessageDecide();
-                    Rupees_ChangeBy(-play->msgCtx.unk12070);
+                    Rupees_ChangeBy(-play->msgCtx.secondChoiceValue);
                     Message_StartTextbox(play, 0x273A, &this->actor);
                     this->unk_288 = 0x273A;
                 }
diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
index 4648f2ad78..798abeb40e 100644
--- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
+++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
@@ -651,13 +651,13 @@ void func_80B41E18(EnKgy* this, PlayState* play) {
                         case 0xC3B:
                             switch (play->msgCtx.choiceIndex) {
                                 case 0:
-                                    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+                                    if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
                                         Audio_PlaySfx(NA_SE_SY_ERROR);
                                         func_80B40E74(this, play, 0xC3F);
                                     } else {
                                         Audio_PlaySfx_MessageDecide();
                                         func_80B40E74(this, play, 0xC42);
-                                        Rupees_ChangeBy(-play->msgCtx.unk1206C);
+                                        Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
                                     }
                                     break;
 
@@ -789,7 +789,7 @@ void func_80B41E18(EnKgy* this, PlayState* play) {
                             func_80B41368(this, play, 4);
                             if (this->unk_29C & 0x10) {
                                 this->actor.textId = 0xC56;
-                                Rupees_ChangeBy(play->msgCtx.unk1206C);
+                                Rupees_ChangeBy(play->msgCtx.firstChoiceValue);
                             } else {
                                 this->actor.textId = 0xC42;
                             }
diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c
index eeb66d904f..b993f183b2 100644
--- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c
+++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c
@@ -214,7 +214,7 @@ void EnKitan_Talk(EnKitan* this, PlayState* play) {
                 break;
             }
 
-            if ((play->msgCtx.choiceIndex + 1) == play->msgCtx.unk1206C) {
+            if ((play->msgCtx.choiceIndex + 1) == play->msgCtx.firstChoiceValue) {
                 // Correct answer, continue quiz or end if enough questions have been answered correctly
                 Audio_PlaySfx(NA_SE_SY_QUIZ_CORRECT);
 
diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c
index f2821516a1..22e1ddcd05 100644
--- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c
+++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c
@@ -157,11 +157,11 @@ void func_80A6F3B4(EnMm3* this, PlayState* play) {
             case 0x278E:
                 if (play->msgCtx.choiceIndex == 0) {
                     if (this->unk_2B2 & 0x20) {
-                        if (gSaveContext.save.saveInfo.playerData.rupees >= play->msgCtx.unk1206C) {
+                        if (gSaveContext.save.saveInfo.playerData.rupees >= play->msgCtx.firstChoiceValue) {
                             Audio_PlaySfx_MessageDecide();
                             Message_StartTextbox(play, 0x2790, &this->actor);
                             this->unk_2B4 = 0x2790;
-                            Rupees_ChangeBy(-play->msgCtx.unk1206C);
+                            Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
                         } else {
                             Audio_PlaySfx(NA_SE_SY_ERROR);
                             Message_StartTextbox(play, 0x279C, &this->actor);
@@ -183,11 +183,11 @@ void func_80A6F3B4(EnMm3* this, PlayState* play) {
 
             case 0x279A:
                 if (play->msgCtx.choiceIndex == 0) {
-                    if (gSaveContext.save.saveInfo.playerData.rupees >= play->msgCtx.unk1206C) {
+                    if (gSaveContext.save.saveInfo.playerData.rupees >= play->msgCtx.firstChoiceValue) {
                         Audio_PlaySfx_MessageDecide();
                         Message_StartTextbox(play, 0x2790, &this->actor);
                         this->unk_2B4 = 0x2790;
-                        Rupees_ChangeBy(-play->msgCtx.unk1206C);
+                        Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
                     } else {
                         Audio_PlaySfx(NA_SE_SY_ERROR);
                         Message_StartTextbox(play, 0x279C, &this->actor);
diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c
index d74ef7df95..5b3f021116 100644
--- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c
+++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c
@@ -679,7 +679,7 @@ u16 EnSGoro_BombshopGoron_NextTextId(EnSGoro* this, PlayState* play) {
                     Audio_PlaySfx(NA_SE_SY_ERROR);
                     return 0x673;
                 }
-                this->powderKegPrice = play->msgCtx.unk1206C;
+                this->powderKegPrice = play->msgCtx.firstChoiceValue;
                 if (gSaveContext.save.saveInfo.playerData.rupees < this->powderKegPrice) {
                     this->actionFlags |= EN_S_GORO_ACTIONFLAG_LASTMESSAGE;
                     this->actionFlags |= EN_S_GORO_ACTIONFLAG_TIRED;
diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c
index 732e03e857..f8ff32f567 100644
--- a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c
+++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c
@@ -234,7 +234,7 @@ void EnTakaraya_Talk(EnTakaraya* this, PlayState* play) {
         }
     } else if ((talkState == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) {
         if (play->msgCtx.choiceIndex == 0) {
-            if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
+            if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.firstChoiceValue) {
                 this->actor.textId = 0x77B;
                 if (this->skelAnime.animation == &object_bg_Anim_009890) {
                     Animation_MorphToPlayOnce(&this->skelAnime, &object_bg_Anim_000968, 5.0f);
@@ -242,7 +242,7 @@ void EnTakaraya_Talk(EnTakaraya* this, PlayState* play) {
                 Audio_PlaySfx(NA_SE_SY_ERROR);
             } else {
                 Audio_PlaySfx_MessageDecide();
-                Rupees_ChangeBy(-play->msgCtx.unk1206C);
+                Rupees_ChangeBy(-play->msgCtx.firstChoiceValue);
                 EnTakaraya_SpawnWalls(this, play);
                 this->actor.textId = 0x778;
                 if (this->skelAnime.animation != &object_bg_Anim_009890) {