diff --git a/src/code_801B3C0.c b/src/code_801B3C0.c
index 026666979..588030b1f 100644
--- a/src/code_801B3C0.c
+++ b/src/code_801B3C0.c
@@ -253,7 +253,7 @@ void sub_801B590(void)
 
 u32 sub_801B60C(u32 r0, u8 itemIndex, u8 numItems)
 {
-    gUnknown_203B234 = MemoryAlloc(0x154, 8);
+    gUnknown_203B234 = MemoryAlloc(sizeof(struct unkStruct_203B234), 8);
     gUnknown_203B234->unkC8 = 0;
     gUnknown_203B234->unk0 = r0;
     gUnknown_203B234->unk10.itemIndex = itemIndex;
diff --git a/src/friend_rescue_1.c b/src/friend_rescue_1.c
index 34c0ebf07..a49164fd4 100644
--- a/src/friend_rescue_1.c
+++ b/src/friend_rescue_1.c
@@ -414,11 +414,11 @@ void PrintFriendRescueError(u32 status)
 
 void sub_80339C8(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
         gUnknown_203B33C->speciesNum = -1;
-        switch(temp)
+        switch(menuAction)
         {
             case 0:
                 SetFriendRescueMenuState(3);
@@ -438,11 +438,11 @@ void sub_80339C8(void)
 
 void sub_8033A2C(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
         gUnknown_203B33C->unk40 = 8;
-        switch(temp)
+        switch(menuAction)
         {
             case 0x11:
                 gUnknown_203B33C->unk40 = 2;
@@ -498,10 +498,10 @@ void sub_8033A2C(void)
 
 void sub_8033B8C(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
                 case 0xB:
                 case 0xC:
@@ -549,10 +549,10 @@ void sub_8033B8C(void)
 
 void sub_8033C54(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 6:
                 switch(gUnknown_203B33C->unk528)
@@ -753,10 +753,10 @@ void sub_8033DBC(void)
 
 void sub_8033F64(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 6:
                 switch(gUnknown_203B33C->unk528)
@@ -824,13 +824,13 @@ void sub_8033FE4(void)
 
 void sub_8034074(void)
 {
-    s32 temp;
+    s32 menuAction;
 
-    temp = -1;
+    menuAction = -1;
     sub_8030768(0);
     if(!sub_8012FD8(&gUnknown_203B33C->unk30C))
-        sub_8013114(&gUnknown_203B33C->unk30C, &temp);
-    switch(temp)
+        sub_8013114(&gUnknown_203B33C->unk30C, &menuAction);
+    switch(menuAction)
     {
         case 9:
             sub_803084C();
@@ -907,13 +907,13 @@ void sub_803418C(void)
 
 void sub_8034254(void)
 {
-    s32 temp;
-    temp = -1;
+    s32 menuAction;
+    menuAction = -1;
 
     sub_8023A94(0);
     if(!sub_8012FD8(&gUnknown_203B33C->unk30C))
-        sub_8013114(&gUnknown_203B33C->unk30C, &temp);
-    switch(temp)
+        sub_8013114(&gUnknown_203B33C->unk30C, &menuAction);
+    switch(menuAction)
     {
         case 9:
             sub_8023C60();
@@ -964,10 +964,10 @@ void sub_8034310(void)
 
 void sub_8034378(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 0x10:
                 if(gUnknown_203B33C->unk524 == 0xE)
@@ -986,10 +986,10 @@ void sub_8034378(void)
 
 void sub_80343C4(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 6:
                 SetFriendRescueMenuState(0x5);
@@ -1008,10 +1008,10 @@ void sub_80343C4(void)
 
 void sub_8034404(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 0xF:
                 if(sub_8024108(3))
@@ -1102,13 +1102,13 @@ void sub_8034500(void)
 
 void sub_8034590(void)
 {
-    s32 temp;
-    temp = -1;
+    s32 menuAction;
+    menuAction = -1;
 
     sub_8030768(0);
     if(!sub_8012FD8(&gUnknown_203B33C->unk30C))
-        sub_8013114(&gUnknown_203B33C->unk30C, &temp);
-    switch(temp)
+        sub_8013114(&gUnknown_203B33C->unk30C, &menuAction);
+    switch(menuAction)
     {
         case 9:
             sub_803084C();
@@ -1156,10 +1156,10 @@ void sub_803464C(void)
 
 void sub_80346A8(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 6:
                 SetFriendRescueMenuState(0xE);
@@ -1225,10 +1225,10 @@ void sub_803473C(void)
 
 void sub_803477C(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 6:
                 SetFriendRescueMenuState(0xE);
@@ -1385,10 +1385,10 @@ void sub_8034970(void)
 
 void sub_80349B0(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 6:
                 SetFriendRescueMenuState(0x52);
@@ -1427,13 +1427,13 @@ void sub_80349E0(void)
 
 void sub_8034A70(void)
 {
-    s32 temp;
+    s32 menuAction;
 
-    temp = -1;
+    menuAction = -1;
     sub_8030768(0);
     if(!sub_8012FD8(&gUnknown_203B33C->unk30C))
-        sub_8013114(&gUnknown_203B33C->unk30C, &temp);
-    switch(temp)
+        sub_8013114(&gUnknown_203B33C->unk30C, &menuAction);
+    switch(menuAction)
     {
         case 9:
             sub_803084C();
@@ -1532,13 +1532,13 @@ void sub_8034C38(void)
 
 void sub_8034C98(void)
 {
-    s32 temp;
+    s32 menuAction;
 
-    temp = -1;
+    menuAction = -1;
     sub_801CA08(0);
     if(!sub_8012FD8(&gUnknown_203B33C->unk30C))
-        sub_8013114(&gUnknown_203B33C->unk30C, &temp);
-    switch(temp)
+        sub_8013114(&gUnknown_203B33C->unk30C, &menuAction);
+    switch(menuAction)
     {
         case 9:
             sub_801CBB8();
@@ -1688,12 +1688,12 @@ void sub_8034F58(void)
 
 void sub_8034F88(void)
 {
-    s32 temp;
+    s32 menuAction;
     struct unkStruct_203B480 *mail;
 
-    if(sub_80144A4(&temp) == 0)
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 6:
                 mail = sub_8095228(gUnknown_203B33C->unk218);
@@ -1753,11 +1753,11 @@ void sub_8035038(void)
 
 void sub_8035094(void)
 {
-    s32 temp;
+    s32 menuAction;
 
-    if(sub_80144A4(&temp) == 0)
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 0x16:
                 // Dumb cast to get unsigned switch
@@ -1788,11 +1788,11 @@ void sub_8035094(void)
 
 void sub_80350F4(void)
 {
-    s32 temp;
+    s32 menuAction;
 
-    if(sub_80144A4(&temp) == 0)
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 0x15:
                 if(sub_801CF14(0) != 0)
@@ -1829,11 +1829,11 @@ void sub_80350F4(void)
 
 void sub_803517C(void)
 {
-    s32 temp;
+    s32 menuAction;
 
-    if(sub_80144A4(&temp) == 0)
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 6:
                 // Dumb cast to get unsigned switch
@@ -1864,11 +1864,11 @@ void sub_803517C(void)
 
 void sub_80351E0(void)
 {
-    s32 temp;
+    s32 menuAction;
 
-    if(sub_80144A4(&temp) == 0)
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 6:
                 SetFriendRescueMenuState(0x72);
@@ -1884,13 +1884,13 @@ void sub_80351E0(void)
 
 void sub_8035210(void)
 {
-    s32 temp;
+    s32 menuAction;
     struct unkStruct_203B480 *mail;
 
-    if(sub_80144A4(&temp) == 0)
+    if(sub_80144A4(&menuAction) == 0)
     {
         // NOTE: this is why unk524 can't be changed to u32..
-        gUnknown_203B33C->unk524 = temp;
+        gUnknown_203B33C->unk524 = menuAction;
         switch(gUnknown_203B33C->unk524)
         {
             case 0xB:
@@ -1953,10 +1953,10 @@ void sub_80352A4(void)
 
 void sub_8035300(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) != 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) != 0)
         return;
-    switch(temp)
+    switch(menuAction)
     {
         case 0x19:
             SetFriendRescueMenuState(1);
@@ -1969,7 +1969,7 @@ void sub_8035300(void)
             break;
         case 0x1A:
         case 0x1D:
-            gUnknown_203B33C->unk564 = temp;
+            gUnknown_203B33C->unk564 = menuAction;
             SetFriendRescueMenuState(0x79);
             break;
     }
@@ -1977,10 +1977,10 @@ void sub_8035300(void)
 
 void sub_8035374(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) != 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) != 0)
         return;
-    switch(temp)
+    switch(menuAction)
     {
         case 0x19:
             SetFriendRescueMenuState(0x78);
@@ -1990,7 +1990,7 @@ void sub_8035374(void)
         case 0x20:
         case 0x21:
         case 0x22:
-            gUnknown_203B33C->unk564 = temp;
+            gUnknown_203B33C->unk564 = menuAction;
             SetFriendRescueMenuState(0x7B);
             break;
     }
@@ -1998,10 +1998,10 @@ void sub_8035374(void)
 
 void sub_80353BC(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) != 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) != 0)
         return;
-    switch(temp)
+    switch(menuAction)
     {
         case 0x19:
             SetFriendRescueMenuState(0x78);
@@ -2010,7 +2010,7 @@ void sub_80353BC(void)
         case 0x24:
         case 0x25:
         case 0x26:
-            gUnknown_203B33C->unk564 = temp;
+            gUnknown_203B33C->unk564 = menuAction;
             SetFriendRescueMenuState(0x7D);
             break;
     }
diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c
index a942b37c6..f5dc404a4 100644
--- a/src/thank_you_wonder_mail.c
+++ b/src/thank_you_wonder_mail.c
@@ -510,7 +510,7 @@ void DisplayThankYouMailCommsOutcome(void)
   gUnknown_203B2C4->unk41C.itemIndex = ITEM_ID_NOTHING;
   gUnknown_203B2C4->unk41C.numItems = 1;
   gUnknown_203B2C4->unk41C.itemFlags = 0;
-  if (gUnknown_203B2C4->linkError == 0) {
+  if (gUnknown_203B2C4->linkError == COMMS_GOOD) {
       switch(gUnknown_203B2C4->unk40)
         {
             case 6:
@@ -546,7 +546,6 @@ void sub_802A050(void)
 {
     switch(sub_8031DCC())
     {
-
         case 3:
         case 2:
             sub_8031E10();
@@ -564,10 +563,10 @@ void sub_802A050(void)
 
 void sub_802A090(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 7:
                 SetThankYouMailMenuState(SELECT_THANK_YOU_MAIL_COMMS);
@@ -818,16 +817,16 @@ void AdvanceToThankYouPasswordProcessing(void)
 void HandleThankYouMailPasswordMenu(void)
 {
   u8 uVar1;
-  struct unkStruct_203B480 *puVar5;
+  struct unkStruct_203B480 *mail;
   u32 return_var;
-  struct unkStruct_203B480 temp;
+  struct unkStruct_203B480 mail1;
 
   return_var = sub_80154F0();
-  MemoryFill8((u8 *)&temp, 0, sizeof(struct unkStruct_203B480));
+  MemoryFill8((u8 *)&mail1, 0, sizeof(struct unkStruct_203B480));
   switch(return_var)
   {
     case 3:
-        switch(sub_8039068(PASSWORD_ENTRY_THANK_YOU_MAIL_MODE,gUnknown_203B2C4->passwordBuffer,&temp))
+        switch(sub_8039068(PASSWORD_ENTRY_THANK_YOU_MAIL_MODE,gUnknown_203B2C4->passwordBuffer,&mail1))
         {
             case PASSWORD_ENTRY_INCORRECT_PASSWORD:
                 sub_8014248(gUnknown_80DF1C0, 0, 7, gUnknown_80DEE44, 0, 4, 0, &gUnknown_203B2C4->faceFile, 0xc);
@@ -842,11 +841,11 @@ void HandleThankYouMailPasswordMenu(void)
                 SetThankYouMailMenuState(PRINT_THANK_YOU_ERROR);
                 break;
             case PASSWORD_ENTRY_THANK_YOU_MAIL_SUCCESS:
-                uVar1 = sub_809539C(4,temp.unk10);
-                puVar5 = sub_8095228(uVar1);
-                *puVar5 = temp;
-                puVar5->mailType = 6;
-                gUnknown_203B2C4->unk430 = temp.unk10;
+                uVar1 = sub_809539C(4,mail1.unk10);
+                mail = sub_8095228(uVar1);
+                *mail = mail1;
+                mail->mailType = 6;
+                gUnknown_203B2C4->unk430 = mail1.unk10;
                 SetThankYouMailMenuState(THANK_YOU_PASSWORD_SUCCESS);
                 break;
             default:
@@ -928,10 +927,10 @@ void sub_802A740(void)
 
 void sub_802A75C(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 7:
                 // NOTE: if statement is needed to match
@@ -949,11 +948,11 @@ void sub_802A75C(void)
 
 void HandleConfirmItemtoSendMenu(void)
 {
-    s32 temp;
+    s32 menuAction;
     struct unkStruct_203B480 *mail;
-    if(sub_80144A4(&temp) == 0)
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 7:
                 mail = sub_8095228(gUnknown_203B2C4->mailIndex);
@@ -1018,10 +1017,10 @@ void sub_802A8A0(void)
 
 void sub_802A8BC(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 0xA:
                 switch(gUnknown_203B2C4->wonderMailMethod)
@@ -1044,10 +1043,10 @@ void sub_802A8BC(void)
 
 void sub_802A910(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 9:
                 if(sub_801CF14(0) != 0)
@@ -1089,10 +1088,10 @@ void sub_802A98C(void)
 
 void sub_802A9A8(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 0x7:
                 switch(gUnknown_203B2C4->wonderMailMethod)
@@ -1115,10 +1114,10 @@ void sub_802A9A8(void)
 
 void sub_802A9FC(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 0x7:
                 SetThankYouMailMenuState(PROMPT_THANK_YOU_PASSWORD);
@@ -1132,16 +1131,16 @@ void sub_802A9FC(void)
 
 void HandleMailCommunicationMenu(void)
 {
-    s32 temp;
+    s32 menuAction;
     struct unkStruct_203B480 *mail;
-    if(sub_80144A4(&temp) == 0)
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case WONDER_MAIL_GAME_LINK:
             case 4:
             case WONDER_MAIL_PASSWORD:
-                gUnknown_203B2C4->wonderMailMethod = temp;
+                gUnknown_203B2C4->wonderMailMethod = menuAction;
                 switch(gUnknown_203B2C4->wonderMailMode)
                 {
                     case WONDER_MAIL_MODE_SEND:
@@ -1194,10 +1193,10 @@ void sub_802AAC8(void)
 
 void HandleThankYouMailPelipperMainMenu(void)
 {
-    s32 temp;
-    if(sub_80144A4(&temp) == 0)
+    s32 menuAction;
+    if(sub_80144A4(&menuAction) == 0)
     {
-        switch(temp)
+        switch(menuAction)
         {
             case 1:
                 gUnknown_203B2C4->unk40 = 6;
@@ -1268,8 +1267,8 @@ void UpdateThankYouMailText(void)
 {
   u8 itemIndex;
   char *monName;
-  u8 auStack180 [80];
-  u8 auStack100 [80];
+  u8 buffer1 [80];
+  u8 buffer2 [80];
   u8 uVar2;
   struct PokemonStruct *pokeStruct;
   struct PokemonStruct *pokeStruct2;
@@ -1279,8 +1278,8 @@ void UpdateThankYouMailText(void)
   switch(gUnknown_203B2C4->state) {
     case 5:
         pokeStruct = GetPlayerPokemonStruct();
-        sub_80922B4(auStack180,pokeStruct->name, POKEMON_NAME_LENGTH);
-        sprintf_2(gUnknown_203B2C4->formattedString,gUnknown_80DF250,auStack180);
+        sub_80922B4(buffer1,pokeStruct->name, POKEMON_NAME_LENGTH);
+        sprintf_2(gUnknown_203B2C4->formattedString,gUnknown_80DF250,buffer1);
         sub_80141B4(gUnknown_203B2C4->formattedString,0,&gUnknown_203B2C4->faceFile,0x10d);
         break;
     case 0xe:
@@ -1438,8 +1437,8 @@ void UpdateThankYouMailText(void)
         break;
     case THANK_YOU_MAIL_COMMS_CLEANUP:
         pokeStruct2 = GetPlayerPokemonStruct();
-        sub_80922B4(auStack100, pokeStruct2->name, POKEMON_NAME_LENGTH);
-        sprintf_2(gUnknown_203B2C4->formattedString,gUnknown_80DF63C,auStack100);
+        sub_80922B4(buffer2, pokeStruct2->name, POKEMON_NAME_LENGTH);
+        sprintf_2(gUnknown_203B2C4->formattedString,gUnknown_80DF63C,buffer2);
         sub_80141B4(gUnknown_203B2C4->formattedString,0,&gUnknown_203B2C4->faceFile,0x10d);
         break;
     case CONFIRM_ITEM_TO_SEND:
diff --git a/src/wonder_mail_main_menu.c b/src/wonder_mail_main_menu.c
index aafad3457..7a528c147 100644
--- a/src/wonder_mail_main_menu.c
+++ b/src/wonder_mail_main_menu.c
@@ -115,7 +115,7 @@ struct unkStruct_203B3E8
     u8 *unk48C;
     s32 wonderMailMethod;
     u32 wonderMailMode;
-    u8 unk498;
+    bool8 wonderMailAccepted;
 };
 
 EWRAM_DATA struct unkStruct_203B3E8 *gUnknown_203B3E8;
@@ -195,7 +195,7 @@ bool8 CreateWonderMailMenu(void)
 
   gUnknown_203B3E8->wonderMailMethod = WONDER_MAIL_GAME_LINK;
   gUnknown_203B3E8->wonderMailMode = WONDER_MAIL_MODE_RECEIVE;
-  gUnknown_203B3E8->unk498 = 1;
+  gUnknown_203B3E8->wonderMailAccepted = TRUE;
   gUnknown_203B3E8->wonderMailMethod = WONDER_MAIL_PASSWORD; // ??? Why?
   SetWonderMailMainMenuState(PROMPT_PASSWORD_ENTRY); // -> Display "Enter Wonder Mail Password"
   return 1;
@@ -431,7 +431,7 @@ void HandlePasswordEntryScreen(void)
         // Copy the decoded data to another buffer?
         gUnknown_203B3E8->unk3C0.unk0 = gUnknown_203B3E8->UNK38.decodedMail;
 
-        gUnknown_203B3E8->unk498 = 1;
+        gUnknown_203B3E8->wonderMailAccepted = TRUE;
         SetWonderMailMainMenuState(PASSWORD_SUCCESS);
       }
       break;
@@ -456,9 +456,9 @@ void AdvanceToPasswordEntryScreen(void)
 void HandlePasswordSuccess(void)
 {
   if (sub_802D0E0() == 3) {
-    gUnknown_203B3E8->unk498 = sub_802D178();
+    gUnknown_203B3E8->wonderMailAccepted = sub_802D178();
     sub_802D184();
-    if (gUnknown_203B3E8->unk498 != 0) {
+    if (gUnknown_203B3E8->wonderMailAccepted) {
         SetWonderMailMainMenuState(PREPARE_SAVE);
     }
     else {
@@ -566,7 +566,7 @@ void WonderMailMainMenuCallback(void)
         sub_802D098(&gUnknown_203B3E8->unk474);
         break;
     case PREPARE_SAVE:
-        if(gUnknown_203B3E8->unk498 != 0)
+        if(gUnknown_203B3E8->wonderMailAccepted)
         {
             switch(gUnknown_203B3E8->wonderMailMethod)
             {
@@ -585,7 +585,7 @@ void WonderMailMainMenuCallback(void)
         sub_80141B4(gUnknown_80E7B68,0,0,0x101);
         break;
     case WONDER_MAIL_ADDED:
-        if (gUnknown_203B3E8->unk498 != '\0') {
+        if (gUnknown_203B3E8->wonderMailAccepted) {
             sub_80141B4(gUnknown_80E7B88,0,0,0x101);
         }
         else {