main/scrctrl: match .data, .sbss, .bss

Author: polybiusproxy

config/p3.jul12.slinky.yaml

@@ -277,7 +277,8 @@ segments:
 
       - { path: src/main/cdctrl.c.o }
       - { path: asm/data/main/stdat.data.s.o }
-      - { path: asm/data/main/scrctrl.data.s.o }
+      #- { path: asm/data/main/scrctrl.data.s.o }
+      - { path: src/main/scrctrl.c.o }
       - { path: src/main/sprite.c.o }
       - { path: src/main/fadectrl.c.o }
       - { path: asm/data/main/subt.data.s.o }
@@ -849,7 +850,7 @@ segments:
 
       - { path: src/main/cdctrl.c.o }
       - { path: src/main/stdat.c.o }
-      - { path: asm/data/main/scrctrl.sbss.s.o }
+      - { path: src/main/scrctrl.c.o }
       - { path: src/main/sprite.c.o }
       - { path: src/main/fadectrl.c.o }
       - { path: src/main/subt.c.o }
@@ -961,7 +962,7 @@ segments:
 
       - { path: asm/data/main/cdctrl.bss.s.o }
       - { path: src/main/stdat.c.o }
-      - { path: asm/data/main/scrctrl.bss.s.o }
+      - { path: src/main/scrctrl.c.o }
       - { path: src/main/sprite.c.o }
       - { path: src/main/fadectrl.c.o }
       - { path: src/main/subt.c.o }

config/p3.jul12.yaml

@@ -196,7 +196,7 @@ segments:
         - [0x808D8, .data, os/tim2]
 
         - [0x808F0,  data, main/stdat]
-        - [0x83258,  data, main/scrctrl]
+        - [0x83258, .data, main/scrctrl]
         - [0x84B88, .data, main/fadectrl]
         - [0x84BA0,  data, main/subt]
         - [0x85478,  data, main/drawctrl]
@@ -406,7 +406,7 @@ segments:
         - { type: .sbss, vram: 0x00399a2c, name: os/usrmem            }
 
         - { type: .sbss, vram: 0x00399a34, name: main/cdctrl          }
-        - { type: sbss,  vram: 0x00399a38, name: main/scrctrl         }
+        - { type: .sbss, vram: 0x00399a38, name: main/scrctrl         }
         - { type: .sbss, vram: 0x00399a44, name: main/sprite          }
         - { type: .sbss, vram: 0x00399a48, name: main/subt            }
         - { type: sbss,  vram: 0x00399a4c, name: main/drawctrl        }
@@ -446,7 +446,7 @@ segments:
         - { type: .bss,  vram: 0x01c5d380, name: os/tim2              }
 
         - { type: bss,   vram: 0x01c5e000, name: main/cdctrl          }
-        - { type: bss,   vram: 0x01c5f030, name: main/scrctrl         }
+        - { type: .bss,  vram: 0x01c5f030, name: main/scrctrl         }
         - { type: .bss,  vram: 0x01c65b80, name: main/sprite          }
         - { type: .bss,  vram: 0x01c6db90, name: main/fadectrl        }
         - { type: .bss,  vram: 0x01c6dba0, name: main/subt            }

include/main/etc.h

@@ -143,7 +143,7 @@ typedef enum {
     DTBL_ENUM_VS_2_ABATTLE2_1 = 47,
     DTBL_ENUM_VS_2_ABATTLE2_2 = 48,
     DTBL_ENUM_MAX_CNT = 49,
-    DTBL_ENUM_VS_TOP = 0
+    DTBL_ENUM_VS_TOP = 0,
 } DRAW_TBL_ENUM;
 
 typedef enum {

include/main/scrctrl.h

@@ -656,6 +656,11 @@ typedef struct { // 0x20
     /* 0x0c */ u_char map[10][2];
 } BN_NUM_TYPE;
 
+enum {
+    BN_KANJI_TXT = 0,
+    BN_SUUJI_TXT = 1
+};
+
 int GetCurrentTblNumber(void);
 
 DISP_LEVEL RANK_LEVEL2DISP_LEVEL(RANK_LEVEL lvl);

src/main/drawctrl.c

@@ -1429,7 +1429,7 @@ void Cl2MixTrans(int now_T, int max_T, u_char *cl2_0_pp, u_char *cl2_1_pp) {
     };
 
     sceGsSetDefLoadImage(&l_image, trTbp0, trTbw, typemode[trType0], 0, 0, trW, trH);
-    FlushCache(0);
+    FlushCache(WRITEBACK_DCACHE);
 
     sceGsExecLoadImage(&l_image, (u_long128*)dat_pp);
     sceGsSyncPath(0, 0);
@@ -1633,7 +1633,7 @@ int DrawVramLocalCopy(void *para_pp, int frame, int first_f, int useDisp, int dr
     dbp = DrawGetTbpPos(drDisp);
 
     GGsSetLocalMoveImage(&mi, dbp, 10, SCE_GS_PSMCT32, 0, 0, sbp, 10, SCE_GS_PSMCT32, 0, 0, 640, 224, 0);
-    FlushCache(0);
+    FlushCache(WRITEBACK_DCACHE);
 
     GGsExecLocalMoveImage(&mi);
     sceGsSyncPath(0, 0);
@@ -1658,7 +1658,7 @@ int DrawVramLocalCopy2(void *para_pp, int frame, int first_f, int useDisp, int d
     dbp = DrawGetTbpPos(drDisp);
 
     GGsSetLocalMoveImage(&mi, dbp, 10, SCE_GS_PSMCT32, 0, 0, sbp, 10, SCE_GS_PSMCT32, 0, 0, 640, 224, 0);
-    FlushCache(0);
+    FlushCache(WRITEBACK_DCACHE);
 
     GGsExecLocalMoveImage(&mi);
     sceGsSyncPath(0, 0);

src/main/etc.c

@@ -191,7 +191,7 @@ void GlobalPlySet(GLOBAL_DATA *gl_pp, PLAY_STEP stp, int stage_num) {
 
     switch (stp) {
     case PSTEP_SERIAL:
-        global_data.draw_tbl_top = 0;
+        global_data.draw_tbl_top = DTBL_ENUM_SERIAL_TOP;
 
         gply_pp = &global_data.global_ply[3];
         gply_pp->player_code = PCODE_NONE;
@@ -202,7 +202,7 @@ void GlobalPlySet(GLOBAL_DATA *gl_pp, PLAY_STEP stp, int stage_num) {
         gply_pp->tap_lvl_tmp = 0;
         break;
     case PSTEP_XTR:
-        global_data.draw_tbl_top = 0;
+        global_data.draw_tbl_top = DTBL_ENUM_SERIAL_TOP;
 
         gply_pp = &global_data.global_ply[3];
         gply_pp->player_code = PCODE_NONE;
@@ -278,7 +278,7 @@ void GlobalPlySet(GLOBAL_DATA *gl_pp, PLAY_STEP stp, int stage_num) {
         ExamDispPlySet(gply_pp, 0);
         break;
     case PSTEP_BONUS:
-        global_data.draw_tbl_top = 0;
+        global_data.draw_tbl_top = DTBL_ENUM_BN_TOP;
 
         gply_pp = &global_data.global_ply[1];
         gply_pp->player_code = PCODE_TEACHER;
@@ -298,7 +298,7 @@ void GlobalPlySet(GLOBAL_DATA *gl_pp, PLAY_STEP stp, int stage_num) {
         ExamDispPlySet(gply_pp, 0);
         break;
     case PSTEP_VS:
-        global_data.draw_tbl_top = 0;
+        global_data.draw_tbl_top = DTBL_ENUM_VS_TOP;
 
         gply_pp = &global_data.global_ply[2];
         gply_pp->player_code = PCODE_BOXY;
@@ -659,8 +659,8 @@ HKLV_SNDREC_ENUM inCmnHookMaxLinePknum(int stg, int line) {
 
 int inCmnHookSet(int stg) {
     int cnt, ret;
-    
-    ret = 0;
+
+    ret = DTBL_ENUM_HOOK_TOP;
     cnt = inCmnHookMaxLineCnt(stg);
 
     if (cnt == 0) {

src/main/mbar.c

@@ -135,7 +135,7 @@ static void clrColorBuffer(int id) {
     cbp = PR_TEX0(tim2_dat_pp).CBP;
 
     sceGsSetDefLoadImage(&tp_tmp_72, cbp, 1, cpsm, 0, 0, 8, 2);
-    FlushCache(0);
+    FlushCache(WRITEBACK_DCACHE);
 
     sceGsExecLoadImage(&tp_tmp_72, (u_long128*)tr_adr);
     sceGsSyncPath(0, 0);