menu/p3mc: match functions

- _P3MC_ASC2SJIS
- _P3MC_SetBrowsInfo

Author: polybiusproxy

config/p3.jul12.symbol_addrs.txt

@@ -1593,6 +1593,10 @@ _P3MC_dataCheckFunc                 = 0x0013ac78; // type:func
 _P3MC_CheckUserData                 = 0x0013ac80; // type:func
 _P3MC_CheckUserDataHead             = 0x0013acc0; // type:func
 
+sjisASCII0                          = 0x0018dd90;
+sjisASCII1                          = 0x0018ddd8;
+sjisASCII2                          = 0x0018dde8;
+
 D_00396190                          = 0x00396190; // type:asciz
 
 HedderID                            = 0x00399830; // size:0x4

configure.py

@@ -184,6 +184,7 @@ def write_permuter_settings():
 EUCJP_FILES = {
     Path("src/main/wipe.c"),
     Path("src/menu/menudata.c"),
+    Path("src/menu/p3mc.c"),
     Path("src/menu/pksprite.c"),
 }
 

src/main/subt.c

@@ -90,14 +90,12 @@ static void euc2sjis(unsigned char *c1, unsigned char *c2) {
 }
 
 void SubtMsgPrint(u_char* msg_pp, int xp, int yp, int jap_flag, int mline) {
-    u_char* tmp_pp;
-    int line_num;
-    int i, j, k;
-    int hsize;
-    int cnt_all;
-    u_char dat0, dat1;
-    int posx, posy;
-    
+    u_char *tmp_pp;
+    int     line_num;
+    int     i, j, k;
+    int     hsize;
+    int     cnt_all;
+
     cnt_all = 0;    
     SubtMcodeSet(jap_flag);
 
@@ -108,22 +106,22 @@ void SubtMsgPrint(u_char* msg_pp, int xp, int yp, int jap_flag, int mline) {
     WorkClear(&subt_code, sizeof(subt_code));
 
     line_num = 0;
-    hsize = 13;
-    tmp_pp = msg_pp;
+    hsize    = 13;
+    tmp_pp   = msg_pp;
 
     while (1) {
         if (hsize == 13) {
             hsize = 13;
         }
-        
+
         if (*tmp_pp == '\0') {
             line_num++;
             break;
         }
 
         if (jap_flag) {
-            dat0 = tmp_pp[0];
-            dat1 = tmp_pp[1];
+            u_char dat0 = tmp_pp[0];
+            u_char dat1 = tmp_pp[1];
 
             if (dat0 == '@') {
                 line_num++;
@@ -156,18 +154,17 @@ void SubtMsgPrint(u_char* msg_pp, int xp, int yp, int jap_flag, int mline) {
         tmp_pp++;
     }
 
-
     if (mline != 0 && mline < line_num) {
         line_num = mline;
     }
 
     for (i = 0, k = 0; i < line_num; i++) {
-        posx = xp - (subt_code[i].wsize / 2);
-        posy = yp + (hsize * i);
+        int posx = xp - (subt_code[i].wsize / 2);
+        int posy = yp + (hsize * i);
 
         for (j = 0; j < subt_code[i].cnt; j++) {
             MCODE_DAT *mcode_pp = mcode_dat_pp[k++];
-            
+
             sceGifPkAddGsAD(&subtPkSpr, SCE_GS_PRIM, SCE_GS_SET_PRIM(SCE_GS_PRIM_SPRITE, 0, 1, 0, 1, 0, 1, 0, 0));
 
             sceGifPkAddGsAD(&subtPkSpr, SCE_GS_UV,
@@ -283,7 +280,7 @@ u_char* SubtMsgDataPos(u_char *msg_pp, int jap_flag, int pos) {
     }
 
     tmp_pp = msg_pp;
-    
+
     while (1) {
         if (ret == pos) {
             return tmp_pp;
@@ -350,17 +347,17 @@ void SubtCtrlPrintBoxyWipe(JIMAKU_STR *jstr_pp, int line, int time, int lang, vo
         if ((time >= jstr_tmp_pp->jimaku_dat_pp[i].starTime) &&
             (time <  jstr_tmp_pp->jimaku_dat_pp[i].endTime)) {
             SubtInit();
-            
+
             kanjiset_tmp_pp = SubtKanjiSet(code_pp);
 
             lang_f = (lang == LANG_JAPANESE);
             if (lang_f) {
                 lang_f = 2;
             }
-            
+
             SubtClear();
             SubtMsgPrint(jstr_tmp_pp->jimaku_dat_pp[i].txtData[lang], 2048, 2122, lang_f, 0);
-            
+
             SubtFlash();
             SubtKanjiSet(kanjiset_tmp_pp);
             return;

src/menu/p3mc.c

@@ -3,6 +3,7 @@
 #include "main/cdctrl.h"
 
 #include "menu/memc.h"
+#include "menu/menudata.h"
 #include "menu/menufont.h"
 
 #include <libcdvd.h>
@@ -194,14 +195,120 @@ static void _P3MC_EUC2SJIS(char *des, char *src) {
     *des = '\0';
 }
 
-INCLUDE_ASM("asm/nonmatchings/menu/p3mc", _P3MC_ASC2SJIS);
+static void _P3MC_ASC2SJIS(char *des, char *src) {
+    /* static */ extern char sjisASCII0[65]; // = "！”＃＄％＆’（）＊＋，−．／０１２３４５６７８９：；＜＝＞？＠";
+    /* static */ extern char sjisASCII1[13]; // = "［￥］＾＿’";
+    /* static */ extern char sjisASCII2[11]; // = "｛｜｝〜　";
+
+    char    *des0;
+    u_char   c;
+    int      n;
+
+    des0 = des;
+
+    for (; (c = *src) != '\0'; src++, des += 2) {
+        if (c <= ' ') {
+            n = 0xa1a1; /* Space */
+        } else if (c <= '@') {
+            c = (c - '!');
+            n = ((u_short*)sjisASCII0)[c];
+        } else if (c <= 'Z') {
+            c = (c - 'A');
+            n = (c << 8) + 0xc1a3 /* A */;
+        } else if (c <= '`') {
+            c = (c - '[');
+            n = ((u_short*)sjisASCII1)[c];
+        } else if (c <= 'z') {
+            c = (c - 'a');
+            n = (c << 8) + 0xe1a3 /* a */;
+        } else if (c <= '~') {
+            c = (c - '{');
+            n = ((u_short*)sjisASCII2)[c];
+        } else {
+            n = 0xa1a1; /* Space */
+        }
+
+        *(u_short*)des = n;
+    }
+
+    *des = '\0';
+    _P3MC_EUC2SJIS(des0, des0);
+}
 
 static void _P3MC_UserName_ASC2SJIS(char *des, char *src) {
     MenuFont_ASC2EUC(des, src);
     _P3MC_EUC2SJIS(des, des);
 }
 
-INCLUDE_ASM("asm/nonmatchings/menu/p3mc", _P3MC_SetBrowsInfo);
+static void _P3MC_SetBrowsInfo(int mode, int fileNo, char *name, int stageNo, int roundNo, int isVs, int ParaCol) {
+    char  tname[256];
+    int   s;
+    char  tmps[30];
+    int   r;
+    int   size;
+    void *ptr;
+    int   iconNo;
+
+    if (name == NULL) {
+        return;
+    }
+
+    _P3MC_EUC2SJIS(tname, "ＰＡＲＡＰＰＡ２");
+
+    if (mode == 1) {
+        sprintf(tmps, "/SYS-%02d", fileNo + 1);
+    } else {
+        sprintf(tmps, "/REP-%02d", fileNo + 1);
+    }
+
+    s = strlen(tname);
+    _P3MC_ASC2SJIS(tname + s, tmps);
+    s = strlen(tname);
+
+    switch (mode) {
+    case 2:
+        if (!isVs) {
+            sprintf(tmps, "%s-ST%1d", name, stageNo);
+        } else {
+            sprintf(tmps, "%s-VS_ST%1d", name, stageNo);
+        }
+        break;
+
+    default:
+    case 1:
+        if (roundNo == 0) {
+            sprintf(tmps, "%s(ST%1d)", name, stageNo);
+        } else {
+            r = roundNo + 1;
+            if (r > 99) r = 99;
+            sprintf(tmps, "%s(C%2d)", name, r);
+        }
+        break;
+    }
+
+    _P3MC_UserName_ASC2SJIS(tname + s, tmps);
+
+    memc_setSaveTitle(tname, s);
+
+    if (mode == 1) {
+        iconNo = ParaCol + 1;
+
+        if (iconNo > 4) {
+            iconNo = 4;
+        }
+
+        ptr = MenuDataGetIconSysHed(0, iconNo, &size);
+    } else {
+        iconNo = stageNo;
+        ptr = MenuDataGetIconSysHed(1, iconNo, &size);
+    }
+
+    memc_setIconSysHed(ptr, size);
+
+    memc_setSaveIcon(0, P3MC_GetIconPtr(mode, iconNo), P3MC_GetIconSize(mode));
+    memc_setSaveIcon(1, NULL, 0);
+    memc_setSaveIcon(2, NULL, 0);
+}
 
 INCLUDE_ASM("asm/nonmatchings/menu/p3mc", _P3MC_mainfile_chk);