Match filesel.c

This commit is contained in:
gamemasterplc 2024-04-21 15:26:36 -05:00
parent 0ccc55e70f
commit ce98a67771
6 changed files with 265 additions and 271 deletions

View file

@ -115,67 +115,67 @@ lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 data:float
lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 data:float
lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 data:float
lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 data:float
lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 data:float
lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 data:float
lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 data:float
lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 data:float
lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 data:float
lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 data:float
lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 data:float
lbl_1_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 data:float
lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 data:float
lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 data:float
lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 data:float
lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x8 data:double
lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x8 data:double
lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 data:float
lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x8 data:double
lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x4 data:float
lbl_1_rodata_204 = .rodata:0x00000204; // type:object size:0x4 data:float
lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x4 data:float
lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 data:double
lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x8 data:double
lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x8 data:double
lbl_1_rodata_228 = .rodata:0x00000228; // type:object size:0x4 data:float
lbl_1_rodata_22C = .rodata:0x0000022C; // type:object size:0x4 data:float
lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x8 data:double
lbl_1_rodata_238 = .rodata:0x00000238; // type:object size:0x8 data:double
lbl_1_rodata_240 = .rodata:0x00000240; // type:object size:0x4 data:float
lbl_1_rodata_244 = .rodata:0x00000244; // type:object size:0x4 data:float
lbl_1_rodata_248 = .rodata:0x00000248; // type:object size:0x8 data:double
lbl_1_rodata_250 = .rodata:0x00000250; // type:object size:0x8 data:double
lbl_1_rodata_258 = .rodata:0x00000258; // type:object size:0x8 data:double
lbl_1_rodata_260 = .rodata:0x00000260; // type:object size:0x8 data:double
lbl_1_rodata_268 = .rodata:0x00000268; // type:object size:0x8 data:double
lbl_1_rodata_270 = .rodata:0x00000270; // type:object size:0x4 data:float
lbl_1_rodata_278 = .rodata:0x00000278; // type:object size:0x8 data:double
lbl_1_rodata_280 = .rodata:0x00000280; // type:object size:0x4 data:float
lbl_1_rodata_284 = .rodata:0x00000284; // type:object size:0x4 data:float
lbl_1_rodata_288 = .rodata:0x00000288; // type:object size:0x4 data:float
lbl_1_rodata_28C = .rodata:0x0000028C; // type:object size:0x4 data:float
lbl_1_rodata_290 = .rodata:0x00000290; // type:object size:0x4 data:float
lbl_1_rodata_298 = .rodata:0x00000298; // type:object size:0x8 data:double
lbl_1_rodata_2A0 = .rodata:0x000002A0; // type:object size:0x8 data:double
lbl_1_rodata_2A8 = .rodata:0x000002A8; // type:object size:0x8 data:double
lbl_1_rodata_2B0 = .rodata:0x000002B0; // type:object size:0x4 data:float
lbl_1_rodata_2B4 = .rodata:0x000002B4; // type:object size:0x4 data:float
lbl_1_rodata_2B8 = .rodata:0x000002B8; // type:object size:0x4 data:float
lbl_1_rodata_2C0 = .rodata:0x000002C0; // type:object size:0x8 data:double
lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x8 data:double
lbl_1_rodata_2D0 = .rodata:0x000002D0; // type:object size:0x4 data:float
lbl_1_rodata_2D4 = .rodata:0x000002D4; // type:object size:0x4 data:float
lbl_1_rodata_2D8 = .rodata:0x000002D8; // type:object size:0x4 data:float
lbl_1_rodata_2DC = .rodata:0x000002DC; // type:object size:0x4 data:float
lbl_1_rodata_2E0 = .rodata:0x000002E0; // type:object size:0x4 data:float
lbl_1_rodata_2E4 = .rodata:0x000002E4; // type:object size:0x4 data:float
lbl_1_rodata_2E8 = .rodata:0x000002E8; // type:object size:0x4 data:float
lbl_1_rodata_2EC = .rodata:0x000002EC; // type:object size:0x4 data:float
lbl_1_rodata_2F0 = .rodata:0x000002F0; // type:object size:0x8 data:double
lbl_1_rodata_2F8 = .rodata:0x000002F8; // type:object size:0x8 data:double
lbl_1_rodata_300 = .rodata:0x00000300; // type:object size:0x8 data:double
lbl_1_rodata_308 = .rodata:0x00000308; // type:object size:0x4 data:float
lbl_1_rodata_30C = .rodata:0x0000030C; // type:object size:0x4 data:float
lbl_1_rodata_310 = .rodata:0x00000310; // type:object size:0x8 data:byte
lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x4 scope:local data:float
lbl_1_rodata_204 = .rodata:0x00000204; // type:object size:0x4 scope:local data:float
lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x4 scope:local data:float
lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 scope:local data:double
lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x8 scope:local data:double
lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x8 scope:local data:double
lbl_1_rodata_228 = .rodata:0x00000228; // type:object size:0x4 scope:local data:float
lbl_1_rodata_22C = .rodata:0x0000022C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x8 scope:local data:double
lbl_1_rodata_238 = .rodata:0x00000238; // type:object size:0x8 scope:local data:double
lbl_1_rodata_240 = .rodata:0x00000240; // type:object size:0x4 scope:local data:float
lbl_1_rodata_244 = .rodata:0x00000244; // type:object size:0x4 scope:local data:float
lbl_1_rodata_248 = .rodata:0x00000248; // type:object size:0x8 scope:local data:double
lbl_1_rodata_250 = .rodata:0x00000250; // type:object size:0x8 scope:local data:double
lbl_1_rodata_258 = .rodata:0x00000258; // type:object size:0x8 scope:local data:double
lbl_1_rodata_260 = .rodata:0x00000260; // type:object size:0x8 scope:local data:double
lbl_1_rodata_268 = .rodata:0x00000268; // type:object size:0x8 scope:local data:double
lbl_1_rodata_270 = .rodata:0x00000270; // type:object size:0x4 scope:local data:float
lbl_1_rodata_278 = .rodata:0x00000278; // type:object size:0x8 scope:local data:double
lbl_1_rodata_280 = .rodata:0x00000280; // type:object size:0x4 scope:local data:float
lbl_1_rodata_284 = .rodata:0x00000284; // type:object size:0x4 scope:local data:float
lbl_1_rodata_288 = .rodata:0x00000288; // type:object size:0x4 scope:local data:float
lbl_1_rodata_28C = .rodata:0x0000028C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_290 = .rodata:0x00000290; // type:object size:0x4 scope:local data:float
lbl_1_rodata_298 = .rodata:0x00000298; // type:object size:0x8 scope:local data:double
lbl_1_rodata_2A0 = .rodata:0x000002A0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_2A8 = .rodata:0x000002A8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_2B0 = .rodata:0x000002B0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2B4 = .rodata:0x000002B4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2B8 = .rodata:0x000002B8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2C0 = .rodata:0x000002C0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_2D0 = .rodata:0x000002D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2D4 = .rodata:0x000002D4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2D8 = .rodata:0x000002D8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2DC = .rodata:0x000002DC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2E0 = .rodata:0x000002E0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2E4 = .rodata:0x000002E4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2E8 = .rodata:0x000002E8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2EC = .rodata:0x000002EC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2F0 = .rodata:0x000002F0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_2F8 = .rodata:0x000002F8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_300 = .rodata:0x00000300; // type:object size:0x8 scope:local data:double
lbl_1_rodata_308 = .rodata:0x00000308; // type:object size:0x4 scope:local data:float
lbl_1_rodata_30C = .rodata:0x0000030C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_310 = .rodata:0x00000310; // type:object size:0x8 scope:local data:byte
lbl_1_rodata_318 = .rodata:0x00000318; // type:object size:0x4 scope:local data:float
lbl_1_rodata_320 = .rodata:0x00000320; // type:object size:0x8 scope:local data:double
lbl_1_data_0 = .data:0x00000000; // type:object size:0x38
@ -194,35 +194,35 @@ lbl_1_data_F1 = .data:0x000000F1; // type:object size:0xF
lbl_1_data_100 = .data:0x00000100; // type:object size:0x2 data:2byte
lbl_1_data_104 = .data:0x00000104; // type:object size:0x118 data:float
lbl_1_data_21C = .data:0x0000021C; // type:object size:0x48 data:4byte
lbl_1_data_264 = .data:0x00000264; // type:object size:0x3
lbl_1_data_267 = .data:0x00000267; // type:object size:0x3
lbl_1_data_264 = .data:0x00000264; // type:object size:0x3 scope:local
lbl_1_data_267 = .data:0x00000267; // type:object size:0x3 scope:local
lbl_1_data_26C = .data:0x0000026C; // type:object size:0x8
lbl_1_data_274 = .data:0x00000274; // type:object size:0x2 data:string
lbl_1_data_276 = .data:0x00000276; // type:object size:0x2 data:string
lbl_1_data_274 = .data:0x00000274; // type:object size:0x2 scope:local data:string
lbl_1_data_276 = .data:0x00000276; // type:object size:0x2 scope:local data:string
lbl_1_data_278 = .data:0x00000278; // type:object size:0x8
lbl_1_data_280 = .data:0x00000280; // type:object size:0x2 data:string
lbl_1_data_282 = .data:0x00000282; // type:object size:0x2 data:string
lbl_1_data_284 = .data:0x00000284; // type:object size:0x4
lbl_1_data_280 = .data:0x00000280; // type:object size:0x2 scope:local data:string
lbl_1_data_282 = .data:0x00000282; // type:object size:0x2 scope:local data:string
lbl_1_data_284 = .data:0x00000284; // type:object size:0x4 scope:local
lbl_1_data_288 = .data:0x00000288; // type:object size:0xC
lbl_1_data_294 = .data:0x00000294; // type:object size:0x19 data:string
lbl_1_data_2AD = .data:0x000002AD; // type:object size:0x23 data:string
lbl_1_data_2D0 = .data:0x000002D0; // type:object size:0x1B data:string
lbl_1_data_2EB = .data:0x000002EB; // type:object size:0x19 data:string
lbl_1_data_304 = .data:0x00000304; // type:object size:0x19 data:string
lbl_1_data_31D = .data:0x0000031D; // type:object size:0x20 data:string
lbl_1_data_33D = .data:0x0000033D; // type:object size:0x1B data:string
lbl_1_data_358 = .data:0x00000358; // type:object size:0x1B data:string
lbl_1_data_373 = .data:0x00000373; // type:object size:0x22 data:string
lbl_1_data_395 = .data:0x00000395; // type:object size:0x5 data:string
lbl_1_data_39A = .data:0x0000039A; // type:object size:0x15 data:string
lbl_1_data_3AF = .data:0x000003AF; // type:object size:0x15 data:string
lbl_1_data_3C4 = .data:0x000003C4; // type:object size:0x1F data:string
lbl_1_data_3E3 = .data:0x000003E3; // type:object size:0x10 data:string
lbl_1_data_3F3 = .data:0x000003F3; // type:object size:0xD data:string
lbl_1_data_294 = .data:0x00000294; // type:object size:0x19 scope:local data:string
lbl_1_data_2AD = .data:0x000002AD; // type:object size:0x23 scope:local data:string
lbl_1_data_2D0 = .data:0x000002D0; // type:object size:0x1B scope:local data:string
lbl_1_data_2EB = .data:0x000002EB; // type:object size:0x19 scope:local data:string
lbl_1_data_304 = .data:0x00000304; // type:object size:0x19 scope:local data:string
lbl_1_data_31D = .data:0x0000031D; // type:object size:0x20 scope:local data:string
lbl_1_data_33D = .data:0x0000033D; // type:object size:0x1B scope:local data:string
lbl_1_data_358 = .data:0x00000358; // type:object size:0x1B scope:local data:string
lbl_1_data_373 = .data:0x00000373; // type:object size:0x22 scope:local data:string
lbl_1_data_395 = .data:0x00000395; // type:object size:0x5 scope:local data:string
lbl_1_data_39A = .data:0x0000039A; // type:object size:0x15 scope:local data:string
lbl_1_data_3AF = .data:0x000003AF; // type:object size:0x15 scope:local data:string
lbl_1_data_3C4 = .data:0x000003C4; // type:object size:0x1F scope:local data:string
lbl_1_data_3E3 = .data:0x000003E3; // type:object size:0x10 scope:local data:string
lbl_1_data_3F3 = .data:0x000003F3; // type:object size:0xD scope:local data:string
lbl_1_data_400 = .data:0x00000400; // type:object size:0x16
lbl_1_data_416 = .data:0x00000416; // type:object size:0x6 data:string
lbl_1_data_416 = .data:0x00000416; // type:object size:0x6 scope:local data:string
lbl_1_data_41C = .data:0x0000041C; // type:object size:0x2 data:2byte
lbl_1_data_41E = .data:0x0000041E; // type:object size:0xA
lbl_1_data_41E = .data:0x0000041E; // type:object size:0xA scope:local
lbl_1_data_428 = .data:0x00000428; // type:object size:0x514
lbl_1_data_93C = .data:0x0000093C; // type:object size:0xF0
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte

View file

@ -1133,7 +1133,7 @@ config.libs = [
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/modeseldll/main.c"),
Object(NonMatching, "REL/modeseldll/modesel.c"),
Object(NonMatching, "REL/modeseldll/filesel.c"),
Object(Matching, "REL/modeseldll/filesel.c"),
Object(Matching, "REL/modeseldll/datalist.c"),
}
),

View file

@ -27,7 +27,6 @@ typedef struct datalist_sprite {
GXColor color;
} DataListSprite;
void fn_1_1EC0(s16 view);
s32 fn_1_2490(void);
s32 fn_1_37DC(void);

View file

@ -51,7 +51,7 @@ s32 SLLoad(void);
void SLLoadGameStat(void);
void SLLoadBoard(void);
void SLLoadBoardStory(void);
void SLSerialNoGet(void);
s32 SLSerialNoGet(void);
BOOL SLSerialNoCheck(void);
BOOL SLCheckSumCheck(void);
u16 SLCheckSumGet(void);

View file

@ -171,8 +171,6 @@ s32 fn_1_5C38(void);
void fn_1_B8CC(u32 arg0);
void fn_1_BA20(void);
//Various temporary register errors
//Scratch: https://decomp.me/scratch/BDhfa
s32 fn_1_3AAC(void)
{
s16 temp_r31;
@ -197,7 +195,6 @@ s32 fn_1_3AAC(void)
lbl_1_bss_146 = HuWinExCreateStyled(-10000.0f, 316.0f, sp8[0], sp8[1], -1, 0);
HuWinBGTPLvlSet(lbl_1_bss_146, 0);
HuWinMesSpeedSet(lbl_1_bss_146, 0);
while (1) {
repeat:
sp28.x = 188;
sp28.y = 250;
@ -362,13 +359,11 @@ s32 fn_1_3AAC(void)
temp_r29 = 0;
}
HuCardClose(&sp34);
break;
} else {
if(temp_r28 != -3) {
if(temp_r28 == -3) {
goto repeat;
}
temp_r29 = 1;
break;
}
}
}
temp_r27 = HuCardSectorSizeGet(curSlotNo);
if(temp_r27 > 0 && temp_r27 != 8192) {
@ -425,7 +420,7 @@ s32 fn_1_3AAC(void)
Hu3DModelPosSetV(lbl_1_bss_19A[temp_r31], &sp1C);
lbl_1_bss_108[temp_r31] *= cos(M_PI*(90.0f*temp_f31)/180.0);
lbl_1_bss_100[temp_r31] = 1.0-temp_f31;
temp_f31 = 1.0+(0.3*cos(M_PI*(180.0f*temp_f31)/180.0));
temp_f31 = 1.0+(0.3*cos(M_PI*(90.0f*temp_f31)/180.0));
Hu3DModelScaleSet(lbl_1_bss_19A[temp_r31], temp_f31, temp_f31, temp_f31);
}
}
@ -553,7 +548,7 @@ s32 fn_1_3AAC(void)
Hu3DModelPosSetV(lbl_1_bss_19A[temp_r31], &sp1C);
lbl_1_bss_108[temp_r31] *= cos(M_PI*(90.0f*temp_f31)/180.0);
lbl_1_bss_100[temp_r31] = 1.0-temp_f31;
temp_f31 = 1.0+(0.3*cos(M_PI*(180.0f*temp_f31)/180.0));
temp_f31 = 1.0+(0.5*cos(M_PI*(90.0f*temp_f31)/180.0));
Hu3DModelScaleSet(lbl_1_bss_19A[temp_r31], temp_f31, temp_f31, temp_f31);
}
HuPrcVSleep();
@ -2016,9 +2011,9 @@ void fn_1_BA80(s16 boxno)
HuWinInsertMesSet(lbl_1_bss_148, 0x100011, 0);
HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(mesDummy), 1);
HuWinInsertMesSet(lbl_1_bss_148, 0x100012+lbl_1_bss_9E[boxno], 2);
sprintf(mesMaxTurn, "%d", lbl_1_bss_98[boxno]);
sprintf(mesMaxTurn, "%2d", lbl_1_bss_98[boxno]);
HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(mesMaxTurn), 3);
sprintf(mesTurn, "%d", lbl_1_bss_92[boxno]);
sprintf(mesTurn, "%2d", lbl_1_bss_92[boxno]);
HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(mesTurn), 4);
HuWinMesSet(lbl_1_bss_148, 0x100042);
} else {
@ -2038,9 +2033,9 @@ void fn_1_BA80(s16 boxno)
HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(mesDummy), 1);
}
HuWinInsertMesSet(lbl_1_bss_148, 0x100012+lbl_1_bss_9E[boxno], 2);
sprintf(mesMaxTurn, "%d", lbl_1_bss_98[boxno]);
sprintf(mesMaxTurn, "%2d", lbl_1_bss_98[boxno]);
HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(mesMaxTurn), 3);
sprintf(mesTurn, "%d", lbl_1_bss_92[boxno]);
sprintf(mesTurn, "%2d", lbl_1_bss_92[boxno]);
HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(mesTurn), 4);
HuWinMesSet(lbl_1_bss_148, 0x100042);
}

View file

@ -484,8 +484,8 @@ void SLLoadBoardStory(void) {
}
}
void SLSerialNoGet(void) {
CARDGetSerialNo(curSlotNo, &SLSerialNo);
s32 SLSerialNoGet(void) {
return CARDGetSerialNo(curSlotNo, &SLSerialNo);
}
BOOL SLSerialNoCheck(void) {