More work on f_op_msg_mng (#965)

* More work on f_op_msg_mng

* Fix a regalloc issue affecting all tag_* functions in f_op_msg_mng

1 files changed, 265 insertions, 544 deletions

diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp
index 29bbcf89..031d8b5d 100644
--- a/src/f_op/f_op_msg_mng.cpp
+++ b/src/f_op/f_op_msg_mng.cpp
@@ -210,7 +210,7 @@ bool fopMsgM_hyrule_language_check(u32 msgNo) {
 /* 8002AE28-8002AED4       .text fopMsgM_setStageLayer__FPv */
 s32 fopMsgM_setStageLayer(void* proc) {
     scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID());
-    JUT_ASSERT(0x189, stageProc != NULL);
+    JUT_ASSERT(VERSION_SELECT(0x15C, 0x15C, 0x189, 0x189), stageProc != NULL);
     u32 layer = fpcM_LayerID(stageProc);
     return fpcM_ChangeLayerID(proc, layer);
 }
@@ -606,7 +606,6 @@ char* fopMsgM_messageGet(char* dst, u32 msgNo) {
                 if(
                     dComIfGs_getPalLanguage() == 1 &&
                     (
-
 #if VERSION == VERSION_PAL
     // Version is PAL
                         msgNo == 0xC8B || msgNo == 0x1D21 || msgNo == 0x31D7
@@ -687,7 +686,6 @@ char* fopMsgM_passwordGet(char* dst, u32 msgNo) {
                 if(
                     dComIfGs_getPalLanguage() == 1 &&
                     (
-
 #if VERSION == VERSION_PAL
     // Version is PAL
                         msgNo == 0xC8B || msgNo == 0x1D21 || msgNo == 0x31D7
@@ -1548,13 +1546,13 @@ const char* fopMsgM_itemMsgGet_c::getMessage(mesg_header* msg) {
 
         mMsgIdx = i;
         if (mMsgNo == info->mEntries[i].mMsgNo) {
-            mesg_entry* entry = &info->mEntries[i];
-            mResMsgNo = entry->mMsgNo;
-            return &data[entry->mDataOffs];
+            break;
         }
     }
 
-    return NULL;
+    const char* result = &data[info->mEntries[mMsgIdx].mDataOffs];
+    mResMsgNo = info->mEntries[mMsgIdx].mMsgNo;
+    return result;
 }
 
 /* 8002E7DC-8002E95C       .text dataInit__21fopMsgM_msgDataProc_cFv */
@@ -2391,8 +2389,16 @@ u32 fopMsgM_getColorTable(u16 param_1) {
 void fopMsgM_int_to_char(char* dst, int num, bool param_3) {
     int temp = 10000;
     bool temp2 = false;
+#if VERSION > VERSION_JPN
     char buf[2];
     buf[1] = '\0';
+#else
+    char buf[3];
+    // The JPN version uses shift-jis digits instead of ascii ones- this is the
+    // high byte for those digits
+    buf[0] = '\x82';
+    buf[2] = '\0';
+#endif
 
     if(!param_3) {
         strcpy(dst, "");
@@ -2400,7 +2406,11 @@ void fopMsgM_int_to_char(char* dst, int num, bool param_3) {
 
     for(int i = 0; i < 5; i++) {
         if(num / temp != 0 || temp2 || temp == 1) {
+#if VERSION > VERSION_JPN
             buf[0] = (num / temp) + '0';
+#else
+            buf[1] = (num / temp) + '\x4F';
+#endif
             strcat(dst, buf);
             if(!temp2) {
                 temp2 = true;
@@ -2433,18 +2443,16 @@ void fopMsgM_msgDataProc_c::getString(char* dst, u32 msgNo) {
     msgGet.mGroupID = 0;
     msgGet.mMsgNo = 0;
     msgGet.mResMsgNo = 0;
-#if VERSION > VERSION_DEMO
+#if VERSION > VERSION_JPN
     static const char* name = "no name";
-#endif
 
-#if VERSION > VERSION_DEMO
     s32 curOffset = 0;
     s32 numRead = 0;
 #endif
 
     mesg_header* header;
     const char* src;
-#if VERSION > VERSION_DEMO
+#if VERSION > VERSION_JPN
     if(msgNo == 0) {
         src = name;
     }
@@ -2455,7 +2463,7 @@ void fopMsgM_msgDataProc_c::getString(char* dst, u32 msgNo) {
         src = msgGet.getMessage(header);
     }
 
-#if VERSION == VERSION_DEMO
+#if VERSION <= VERSION_JPN
     s32 curOffset = 0;
     s32 numRead = 0;
 #endif
@@ -2466,16 +2474,20 @@ void fopMsgM_msgDataProc_c::getString(char* dst, u32 msgNo) {
         if(*cursor == 0x1A) {
             int codeLen = cursor[1];
             if(cursor[2] == 0 && cursor[3] == 0 && cursor[4] == 0) {
-#if VERSION == VERSION_DEMO
-                const char* str = dComIfGs_getPlayerName();
-#else
+#if VERSION > VERSION_JPN
                 char str[24];
                 strcpy(str, dComIfGs_getPlayerName());
                 if(
-#if VERSION > VERSION_JPN
                     dComIfGs_getPalLanguage() == 1 &&
+                    (
+#if VERSION == VERSION_PAL
+    // Version is PAL
+                        msgNo == 0xC8B || msgNo == 0x1D21 || msgNo == 0x31D7
+#else
+    // Version is USA, we know it's not DEMO or JPN because of the outer #if
+                        msgNo == 0x33B || msgNo == 0xC8B || msgNo == 0x1D21 || msgNo == 0x31D7 || msgNo == 0x37DD || msgNo == 0x37DE
 #endif
-                    (msgNo == 0x33B || msgNo == 0xC8B || msgNo == 0x1D21 || msgNo == 0x31D7 || msgNo == 0x37DD || msgNo == 0x37DE)
+                    )
                 ) {
                     s32 bufLen = strlen(str);
                     current = (str)[bufLen - 1];
@@ -2486,6 +2498,8 @@ void fopMsgM_msgDataProc_c::getString(char* dst, u32 msgNo) {
                         strcat(str, "s");
                     }
                 }
+#else
+                const char* str = dComIfGs_getPlayerName();
 #endif
 
                 for(i = 0; str[i] != '\0'; i++) {
@@ -2652,14 +2666,10 @@ void fopMsgM_msgDataProc_c::tag_len_kaisen_game(int* param_1, f32* param_2, int*
     strcat(buf, "");
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -2675,7 +2685,6 @@ void fopMsgM_msgDataProc_c::tag_len_kaisen_game(int* param_1, f32* param_2, int*
 
 /* 80035E40-80035F68       .text tag_len_rupee__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_rupee(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching */
     char buf[24];
 
     s16 num = dComIfGp_getMessageCountNumber();
@@ -2713,14 +2722,10 @@ void fopMsgM_msgDataProc_c::tag_len_rupee(int* param_1, f32* param_2, int* param
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -2758,14 +2763,10 @@ void fopMsgM_msgDataProc_c::tag_len_num_input(int* param_1, f32* param_2, int* p
     strcpy(buf, "000 Rupee(s)");
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -2781,8 +2782,6 @@ void fopMsgM_msgDataProc_c::tag_len_num_input(int* param_1, f32* param_2, int* p
 
 /* 80036068-80036190       .text tag_len_sword_game__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_sword_game(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[24];
 
     s16 num = dComIfGp_getMessageCountNumber();
@@ -2820,14 +2819,10 @@ void fopMsgM_msgDataProc_c::tag_len_sword_game(int* param_1, f32* param_2, int*
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -2847,14 +2842,10 @@ void fopMsgM_msgDataProc_c::tag_len_letter_game(int* param_1, f32* param_2, int*
 
     fopMsgM_int_to_char(buf, dComIfGp_getMiniGameRupee(), false);
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -2870,19 +2861,13 @@ void fopMsgM_msgDataProc_c::tag_len_letter_game(int* param_1, f32* param_2, int*
 
 /* 80036280-80036384       .text tag_len_letter_game_max__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_letter_game_max(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching */
-
     char buf[24];
     fopMsgM_int_to_char(buf, dComIfGs_getEventReg(dSv_event_flag_c::UNK_8AFF), false);
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -2898,19 +2883,13 @@ void fopMsgM_msgDataProc_c::tag_len_letter_game_max(int* param_1, f32* param_2,
 
 /* 80036384-80036474       .text tag_len_fish__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_fish(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching */
-
     char buf[24];
     fopMsgM_int_to_char(buf, dComIfGp_getMessageCountNumber(), false);
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -2926,8 +2905,6 @@ void fopMsgM_msgDataProc_c::tag_len_fish(int* param_1, f32* param_2, int* param_
 
 /* 80036474-800365A0       .text tag_len_fish_rupee__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_fish_rupee(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[24];
 
     int num = dComIfGp_getMessageCountNumber() * 10;
@@ -2965,14 +2942,10 @@ void fopMsgM_msgDataProc_c::tag_len_fish_rupee(int* param_1, f32* param_2, int*
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -2988,8 +2961,6 @@ void fopMsgM_msgDataProc_c::tag_len_fish_rupee(int* param_1, f32* param_2, int*
 
 /* 800365A0-800366C8       .text tag_len_letter__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_letter(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[24];
 
     int num = dComIfGp_getMessageCountNumber();
@@ -3039,14 +3010,10 @@ void fopMsgM_msgDataProc_c::tag_len_letter(int* param_1, f32* param_2, int* para
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -3062,8 +3029,6 @@ void fopMsgM_msgDataProc_c::tag_len_letter(int* param_1, f32* param_2, int* para
 
 /* 800366C8-800367CC       .text tag_len_rescue__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_rescue(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[24];
     int num = dComIfGp_getMessageCountNumber();
     fopMsgM_int_to_char(buf, num, false);
@@ -3088,14 +3053,10 @@ void fopMsgM_msgDataProc_c::tag_len_rescue(int* param_1, f32* param_2, int* para
     strcat(buf, "");
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -3111,8 +3072,6 @@ void fopMsgM_msgDataProc_c::tag_len_rescue(int* param_1, f32* param_2, int* para
 
 /* 800367CC-8003693C       .text tag_len_forest_timer__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_forest_timer(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
 #if VERSION == VERSION_PAL
     char buf[32];
 #else
@@ -3210,14 +3169,10 @@ void fopMsgM_msgDataProc_c::tag_len_forest_timer(int* param_1, f32* param_2, int
     strcat(buf, "");
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -3233,8 +3188,6 @@ void fopMsgM_msgDataProc_c::tag_len_forest_timer(int* param_1, f32* param_2, int
 
 /* 8003693C-80036A64       .text tag_len_birdman__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_birdman(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[24];
 
     int num = dComIfGp_getMessageCountNumber();
@@ -3277,14 +3230,10 @@ void fopMsgM_msgDataProc_c::tag_len_birdman(int* param_1, f32* param_2, int* par
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -3300,8 +3249,6 @@ void fopMsgM_msgDataProc_c::tag_len_birdman(int* param_1, f32* param_2, int* par
 
 /* 80036A64-80036B9C       .text tag_len_point__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_point(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[24];
 
     int num = dComIfGs_getEventReg(dSv_event_flag_c::UNK_86FF);
@@ -3348,14 +3295,10 @@ void fopMsgM_msgDataProc_c::tag_len_point(int* param_1, f32* param_2, int* param
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -3371,8 +3314,6 @@ void fopMsgM_msgDataProc_c::tag_len_point(int* param_1, f32* param_2, int* param
 
 /* 80036B9C-80036CC4       .text tag_len_get_pendant__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_get_pendant(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching */
-
     char buf[28];
 
     int num = (u8)dComIfGs_getBeastNum(7);
@@ -3419,14 +3360,10 @@ void fopMsgM_msgDataProc_c::tag_len_get_pendant(int* param_1, f32* param_2, int*
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -3442,8 +3379,6 @@ void fopMsgM_msgDataProc_c::tag_len_get_pendant(int* param_1, f32* param_2, int*
 
 /* 80036CC4-80036E18       .text tag_len_rev_pendant__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_rev_pendant(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching */
-
     char buf[28];
 
     int num = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C0FF);
@@ -3490,12 +3425,10 @@ void fopMsgM_msgDataProc_c::tag_len_rev_pendant(int* param_1, f32* param_2, int*
     }
 #endif
 
-    char* p1 = buf;
-    u8* p2 = (u8*)p1;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -3511,8 +3444,6 @@ void fopMsgM_msgDataProc_c::tag_len_rev_pendant(int* param_1, f32* param_2, int*
 
 /* 80036E18-80036F74       .text tag_len_pig_timer__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_pig_timer(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
 #if VERSION == VERSION_PAL
     char buf[32];
 #else
@@ -3610,12 +3541,10 @@ void fopMsgM_msgDataProc_c::tag_len_pig_timer(int* param_1, f32* param_2, int* p
     strcat(buf, "");
 #endif
 
-    char* p1 = buf;
-    u8* p2 = (u8*)p1;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -3631,8 +3560,6 @@ void fopMsgM_msgDataProc_c::tag_len_pig_timer(int* param_1, f32* param_2, int* p
 
 /* 80036F74-8003709C       .text tag_len_get_bomb__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_get_bomb(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching */
-
     char buf[24];
 
     int num = dComIfGs_getBombMax();
@@ -3667,14 +3594,10 @@ void fopMsgM_msgDataProc_c::tag_len_get_bomb(int* param_1, f32* param_2, int* pa
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -3690,8 +3613,6 @@ void fopMsgM_msgDataProc_c::tag_len_get_bomb(int* param_1, f32* param_2, int* pa
 
 /* 8003709C-800371C4       .text tag_len_get_arrow__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_get_arrow(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[24];
 
     int num = dComIfGs_getArrowMax();
@@ -3726,14 +3647,10 @@ void fopMsgM_msgDataProc_c::tag_len_get_arrow(int* param_1, f32* param_2, int* p
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -3749,8 +3666,6 @@ void fopMsgM_msgDataProc_c::tag_len_get_arrow(int* param_1, f32* param_2, int* p
 
 /* 800371C4-800372E4       .text tag_len_stock_bokobaba__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_stock_bokobaba(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[28];
 
     int num = daNpc_Bs1_c::getBuyItem();
@@ -3789,14 +3704,10 @@ void fopMsgM_msgDataProc_c::tag_len_stock_bokobaba(int* param_1, f32* param_2, i
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -3812,8 +3723,6 @@ void fopMsgM_msgDataProc_c::tag_len_stock_bokobaba(int* param_1, f32* param_2, i
 
 /* 800372E4-80037404       .text tag_len_stock_dokuro__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_stock_dokuro(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[28];
 
     int num = daNpc_Bs1_c::getBuyItem();
@@ -3856,14 +3765,10 @@ void fopMsgM_msgDataProc_c::tag_len_stock_dokuro(int* param_1, f32* param_2, int
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -3879,8 +3784,6 @@ void fopMsgM_msgDataProc_c::tag_len_stock_dokuro(int* param_1, f32* param_2, int
 
 /* 80037404-80037500       .text tag_len_stock_chuchu__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_stock_chuchu(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[28];
 
     int num = daNpc_Bs1_c::getBuyItem();
@@ -3914,14 +3817,10 @@ void fopMsgM_msgDataProc_c::tag_len_stock_chuchu(int* param_1, f32* param_2, int
     strcat(buf, "");
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -3937,8 +3836,6 @@ void fopMsgM_msgDataProc_c::tag_len_stock_chuchu(int* param_1, f32* param_2, int
 
 /* 80037500-80037620       .text tag_len_stock_pendant__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_stock_pendant(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[28];
 
     int num = daNpc_Bs1_c::getBuyItem();
@@ -3981,14 +3878,10 @@ void fopMsgM_msgDataProc_c::tag_len_stock_pendant(int* param_1, f32* param_2, in
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -4004,8 +3897,6 @@ void fopMsgM_msgDataProc_c::tag_len_stock_pendant(int* param_1, f32* param_2, in
 
 /* 80037620-80037740       .text tag_len_stock_hane__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_stock_hane(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[28];
 
     int num = daNpc_Bs1_c::getBuyItem();
@@ -4048,14 +3939,10 @@ void fopMsgM_msgDataProc_c::tag_len_stock_hane(int* param_1, f32* param_2, int*
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -4071,8 +3958,6 @@ void fopMsgM_msgDataProc_c::tag_len_stock_hane(int* param_1, f32* param_2, int*
 
 /* 80037740-80037860       .text tag_len_stock_kenshi__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_stock_kenshi(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[28];
 
     int num = daNpc_Bs1_c::getBuyItem();
@@ -4111,14 +3996,10 @@ void fopMsgM_msgDataProc_c::tag_len_stock_kenshi(int* param_1, f32* param_2, int
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -4134,8 +4015,6 @@ void fopMsgM_msgDataProc_c::tag_len_stock_kenshi(int* param_1, f32* param_2, int
 
 /* 80037860-80037980       .text tag_len_terry_rupee__21fopMsgM_msgDataProc_cFPiPfPiPiPi */
 void fopMsgM_msgDataProc_c::tag_len_terry_rupee(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
-    /* Nonmatching - regalloc */
-
     char buf[24];
 
     int num = daNpc_Bs1_c::getPayRupee();
@@ -4173,14 +4052,10 @@ void fopMsgM_msgDataProc_c::tag_len_terry_rupee(int* param_1, f32* param_2, int*
     }
 #endif
 
-    char* p1;
-    u8 *p2; 
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(*param_1 == 0) {
             *param_2 = charLength(*param_4, c, true);
         }
@@ -4466,21 +4341,15 @@ void fopMsgM_msgDataProc_c::tag_len_input_kenshi(int* param_1, f32* param_2, int
 
 /* 80037F80-80038178       .text tag_kaisen_game__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_kaisen_game() {
-    /* Nonmatching */
     char buf[12];
 
     int num = dComIfGs_getEventReg(dSv_event_flag_c::UNK_BEFF);
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -4491,7 +4360,7 @@ void fopMsgM_msgDataProc_c::tag_kaisen_game() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -4529,7 +4398,6 @@ void fopMsgM_msgDataProc_c::tag_kaisen_game() {
 
 /* 80038178-80038330       .text tag_rupee__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_rupee() {
-    /* Nonmatching */
     char buf[20];
 
     int num = dComIfGp_getMessageCountNumber();
@@ -4568,14 +4436,10 @@ void fopMsgM_msgDataProc_c::tag_rupee() {
     }
 #endif
 
-    char* p1;
-    u8* p2;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -4586,7 +4450,7 @@ void fopMsgM_msgDataProc_c::tag_rupee() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p1);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -4601,7 +4465,6 @@ void fopMsgM_msgDataProc_c::tag_rupee() {
 
 /* 80038330-80038538       .text tag_num_input__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_num_input() {
-    /* Nonmatching */
     char buf[8];
     char buf2[16];
 
@@ -4631,12 +4494,10 @@ void fopMsgM_msgDataProc_c::tag_num_input() {
     strcpy(buf, " Rupee(s)");
 #endif
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -4647,7 +4508,7 @@ void fopMsgM_msgDataProc_c::tag_num_input() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p1);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -4662,21 +4523,15 @@ void fopMsgM_msgDataProc_c::tag_num_input() {
 
 /* 80038538-8003872C       .text tag_sword_game__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_sword_game() {
-    /* Nonmatching */
     char buf[16];
 
     int num = dComIfGp_getMessageCountNumber();
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -4687,7 +4542,7 @@ void fopMsgM_msgDataProc_c::tag_sword_game() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -4738,21 +4593,15 @@ void fopMsgM_msgDataProc_c::tag_sword_game() {
 
 /* 8003872C-800388AC       .text tag_letter_game__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_letter_game() {
-    /* Nonmatching */
     char buf[24];
 
     int num = dComIfGp_getMiniGameRupee();
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -4763,7 +4612,7 @@ void fopMsgM_msgDataProc_c::tag_letter_game() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -4778,21 +4627,15 @@ void fopMsgM_msgDataProc_c::tag_letter_game() {
 
 /* 800388AC-80038A40       .text tag_letter_game_max__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_letter_game_max() {
-    /* Nonmatching */
     char buf[24];
 
     int num = dComIfGs_getEventReg(dSv_event_flag_c::UNK_8AFF);
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -4803,7 +4646,7 @@ void fopMsgM_msgDataProc_c::tag_letter_game_max() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -4818,21 +4661,15 @@ void fopMsgM_msgDataProc_c::tag_letter_game_max() {
 
 /* 80038A40-80038BC0       .text tag_fish__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_fish() {
-    /* Nonmatching */
     char buf[24];
 
     int num = dComIfGp_getMessageCountNumber();
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -4843,7 +4680,7 @@ void fopMsgM_msgDataProc_c::tag_fish() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -4858,7 +4695,6 @@ void fopMsgM_msgDataProc_c::tag_fish() {
 
 /* 80038BC0-80038D7C       .text tag_fish_rupee__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_fish_rupee() {
-    /* Nonmatching */
     char buf[24];
 
     int num = dComIfGp_getMessageCountNumber() * 10;
@@ -4897,15 +4733,10 @@ void fopMsgM_msgDataProc_c::tag_fish_rupee() {
     }
 #endif
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -4916,7 +4747,7 @@ void fopMsgM_msgDataProc_c::tag_fish_rupee() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -4931,21 +4762,15 @@ void fopMsgM_msgDataProc_c::tag_fish_rupee() {
 
 /* 80038D7C-80038F70       .text tag_letter__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_letter() {
-    /* Nonmatching */
     char buf[16];
 
     int num = dComIfGp_getMessageCountNumber();
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -4956,7 +4781,7 @@ void fopMsgM_msgDataProc_c::tag_letter() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -5019,21 +4844,15 @@ void fopMsgM_msgDataProc_c::tag_letter() {
 
 /* 80038F70-8003912C       .text tag_rescue__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_rescue() {
-    /* Nonmatching */
     char buf[20];
 
     int num = dComIfGp_getMessageCountNumber();
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5044,7 +4863,7 @@ void fopMsgM_msgDataProc_c::tag_rescue() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -5083,21 +4902,16 @@ void fopMsgM_msgDataProc_c::tag_rescue() {
 
 /* 8003912C-800394B4       .text tag_forest_timer__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_forest_timer() {
-    /* Nonmatching */
     char buf[16];
     char buf2[4];
 
     int minutes = dComIfGs_getFwaterTimer() / 1800;
     fopMsgM_int_to_char(buf, minutes, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5126,15 +4940,10 @@ void fopMsgM_msgDataProc_c::tag_forest_timer() {
     }
     fopMsgM_int_to_char2(buf, seconds);
 
-    p1 = buf;
-    p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5145,7 +4954,7 @@ void fopMsgM_msgDataProc_c::tag_forest_timer() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -5161,7 +4970,6 @@ void fopMsgM_msgDataProc_c::tag_forest_timer() {
 
 /* 800394B4-8003966C       .text tag_birdman__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_birdman() {
-    /* Nonmatching */
     char buf[24];
 
     int num = dComIfGp_getMessageCountNumber();
@@ -5204,15 +5012,10 @@ void fopMsgM_msgDataProc_c::tag_birdman() {
     }
 #endif
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5223,7 +5026,7 @@ void fopMsgM_msgDataProc_c::tag_birdman() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -5238,7 +5041,6 @@ void fopMsgM_msgDataProc_c::tag_birdman() {
 
 /* 8003966C-80039834       .text tag_point__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_point() {
-    /* Nonmatching */
     char buf[24];
 
     int num = dComIfGs_getEventReg(dSv_event_flag_c::UNK_86FF);
@@ -5285,15 +5087,10 @@ void fopMsgM_msgDataProc_c::tag_point() {
     }
 #endif
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5304,7 +5101,7 @@ void fopMsgM_msgDataProc_c::tag_point() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -5319,21 +5116,15 @@ void fopMsgM_msgDataProc_c::tag_point() {
 
 /* 80039834-80039A28       .text tag_get_pendant__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_get_pendant() {
-    /* Nonmatching */
     char buf[20];
 
     int num = (u8)dComIfGs_getBeastNum(7);
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5344,7 +5135,7 @@ void fopMsgM_msgDataProc_c::tag_get_pendant() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -5405,21 +5196,15 @@ void fopMsgM_msgDataProc_c::tag_get_pendant() {
 
 /* 80039A28-80039C2C       .text tag_rev_pendant__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_rev_pendant() {
-    /* Nonmatching */
     char buf[20];
 
     int num = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C0FF);
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5430,7 +5215,7 @@ void fopMsgM_msgDataProc_c::tag_rev_pendant() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -5491,21 +5276,16 @@ void fopMsgM_msgDataProc_c::tag_rev_pendant() {
 
 /* 80039C2C-80039FA0       .text tag_pig_timer__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_pig_timer() {
-    /* Nonmatching */
     char buf[16];
     char buf2[4];
 
     int minutes = dComIfGp_getItemTimer() / 1800;
     fopMsgM_int_to_char(buf, minutes, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5534,15 +5314,10 @@ void fopMsgM_msgDataProc_c::tag_pig_timer() {
     }
     fopMsgM_int_to_char2(buf, seconds);
 
-    p1 = buf;
-    p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5553,7 +5328,7 @@ void fopMsgM_msgDataProc_c::tag_pig_timer() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -5569,21 +5344,15 @@ void fopMsgM_msgDataProc_c::tag_pig_timer() {
 
 /* 80039FA0-8003A194       .text tag_get_bomb__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_get_bomb() {
-    /* Nonmatching */
     char buf[16];
 
     int num = dComIfGs_getBombMax();
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5594,7 +5363,7 @@ void fopMsgM_msgDataProc_c::tag_get_bomb() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -5641,21 +5410,15 @@ void fopMsgM_msgDataProc_c::tag_get_bomb() {
 
 /* 8003A194-8003A388       .text tag_get_arrow__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_get_arrow() {
-    /* Nonmatching */
     char buf[16];
 
     int num = dComIfGs_getArrowMax();
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5666,7 +5429,7 @@ void fopMsgM_msgDataProc_c::tag_get_arrow() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -5713,21 +5476,15 @@ void fopMsgM_msgDataProc_c::tag_get_arrow() {
 
 /* 8003A388-8003A574       .text tag_stock_bokobaba__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_stock_bokobaba() {
-    /* Nonmatching */
     char buf[20];
 
     int num = daNpc_Bs1_c::getBuyItem();
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5738,7 +5495,7 @@ void fopMsgM_msgDataProc_c::tag_stock_bokobaba() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -5792,21 +5549,15 @@ void fopMsgM_msgDataProc_c::tag_stock_bokobaba() {
 
 /* 8003A574-8003A760       .text tag_stock_dokuro__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_stock_dokuro() {
-    /* Nonmatching */
     char buf[20];
 
     int num = daNpc_Bs1_c::getBuyItem();
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5817,7 +5568,7 @@ void fopMsgM_msgDataProc_c::tag_stock_dokuro() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -5874,21 +5625,15 @@ void fopMsgM_msgDataProc_c::tag_stock_dokuro() {
 
 /* 8003A760-8003A914       .text tag_stock_chuchu__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_stock_chuchu() {
-    /* Nonmatching */
     char buf[20];
 
     int num = daNpc_Bs1_c::getBuyItem();
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5899,7 +5644,7 @@ void fopMsgM_msgDataProc_c::tag_stock_chuchu() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -5945,21 +5690,15 @@ void fopMsgM_msgDataProc_c::tag_stock_chuchu() {
 
 /* 8003A914-8003AB00       .text tag_stock_pendant__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_stock_pendant() {
-    /* Nonmatching */
     char buf[20];
 
     int num = daNpc_Bs1_c::getBuyItem();
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -5970,7 +5709,7 @@ void fopMsgM_msgDataProc_c::tag_stock_pendant() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -6027,21 +5766,15 @@ void fopMsgM_msgDataProc_c::tag_stock_pendant() {
 
 /* 8003AB00-8003ACEC       .text tag_stock_hane__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_stock_hane() {
-    /* Nonmatching */
     char buf[20];
 
     int num = daNpc_Bs1_c::getBuyItem();
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -6052,7 +5785,7 @@ void fopMsgM_msgDataProc_c::tag_stock_hane() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -6109,21 +5842,15 @@ void fopMsgM_msgDataProc_c::tag_stock_hane() {
 
 /* 8003ACEC-8003AED8       .text tag_stock_kenshi__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_stock_kenshi() {
-    /* Nonmatching */
     char buf[16];
 
     int num = daNpc_Bs1_c::getBuyItem();
     fopMsgM_int_to_char(buf, num, false);
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -6134,7 +5861,7 @@ void fopMsgM_msgDataProc_c::tag_stock_kenshi() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -6185,7 +5912,6 @@ void fopMsgM_msgDataProc_c::tag_stock_kenshi() {
 
 /* 8003AED8-8003B088       .text tag_terry_rupee__21fopMsgM_msgDataProc_cFv */
 void fopMsgM_msgDataProc_c::tag_terry_rupee() {
-    /* Nonmatching */
     char buf[24];
 
     int num = daNpc_Bs1_c::getPayRupee();
@@ -6224,15 +5950,10 @@ void fopMsgM_msgDataProc_c::tag_terry_rupee() {
     }
 #endif
 
-    char* p1 = buf;
-    u8* p2 = (u8*)buf;
-    char* p3 = buf;
-    p2 = (u8*)buf;
-    p1 = buf;
-    while(*p1 != '\0') {
-        u8 c = *p2;
-        p1++;
-        p2++;
+    int i = 0;
+    while(buf[i] != '\0') {
+        u8 c = ((u8*) buf)[i];
+        i++;
         if(field_0x150 == 0) {
             field_0x14 = charLength(field_0x148, c, true);
         }
@@ -6243,7 +5964,7 @@ void fopMsgM_msgDataProc_c::tag_terry_rupee() {
         field_0x150 += 1;
     }
 
-    strcat(field_0x60, p3);
+    strcat(field_0x60, buf);
     strcat(field_0x68, buf);
 
     if(field_0x294 != 1) {
@@ -6589,7 +6310,7 @@ void fopMsgM_setPaneData(fopMsgM_pane_alpha_class* i_this, J2DScreen* scrn, u32
         i_this->pane = pane;
         fopMsgM_pane_parts_set(i_this);
     } else {
-        JUT_ASSERT(0x398d, FALSE);
+        JUT_ASSERT(VERSION_SELECT(0x22F9, 0x22F9, 0x398D, 0x3A73), FALSE);
     }
 }