Compare commits
7 Commits
agent/data
...
cleanup/sd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
124e2346da | ||
|
|
37724c57d6 | ||
|
|
1a32db7bdc | ||
|
|
2aab31c1f9 | ||
|
|
24c84f5bfc | ||
|
|
73de5786da | ||
|
|
3abcd34252 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.37% | 87.69% | 61.93% | 91.37% |
|
||||
| 99.37% | 87.71% | 61.93% | 92.05% |
|
||||
|
||||
units 917/1027 complete, functions 12211/12563 matched.
|
||||
units 917/1027 complete, functions 12213/12563 matched.
|
||||
|
||||
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
|
||||
<!-- progress:end -->
|
||||
|
||||
@@ -1761,7 +1761,7 @@ update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E30; // ty
|
||||
read_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E44; // type:function size:0x14
|
||||
check_for_sd_app_to_nand_async__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker13AppBlocksInfoPQ33ipl12NandSDWorker13AppBlocksInfo = .text:0x81348E58; // type:function size:0x30
|
||||
check_backup_fits_async__Q23ipl12NandSDWorkerFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x81348E88; // type:function size:0x20
|
||||
iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C
|
||||
check_sd_app_titles_async__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C
|
||||
get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348ED4; // type:function size:0x18
|
||||
get_nand_app_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348EEC; // type:function size:0x18
|
||||
delete_nand_save_async__Q23ipl12NandSDWorkerFUx = .text:0x81348F04; // type:function size:0x18
|
||||
@@ -1823,7 +1823,7 @@ do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134BC60; // type:func
|
||||
do_check_for_sd_app_to_nand__Q23ipl12NandSDWorkerFv = .text:0x8134BED0; // type:function size:0x3C8
|
||||
check_backup_fits__Q23ipl12NandSDWorkerFv = .text:0x8134C298; // type:function size:0x3D8
|
||||
do_list_nand_apps_usage__Q23ipl12NandSDWorkerFv = .text:0x8134C670; // type:function size:0x1C8
|
||||
do_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134C838; // type:function size:0x2D0
|
||||
do_check_sd_app_titles__Q23ipl12NandSDWorkerFv = .text:0x8134C838; // type:function size:0x2D0
|
||||
do_get_nand_save_size__Q23ipl12NandSDWorkerFv = .text:0x8134CB08; // type:function size:0x260
|
||||
do_get_nand_app_size__Q23ipl12NandSDWorkerFv = .text:0x8134CD68; // type:function size:0x1F4
|
||||
get_sd_save_size__Q23ipl12NandSDWorkerFUl = .text:0x8134CF5C; // type:function size:0x140
|
||||
@@ -15655,15 +15655,15 @@ lbl_8164C424 = .data:0x8164C424; // type:object size:0xB data:string
|
||||
lbl_8164C42F = .data:0x8164C42F; // type:object size:0xD data:string
|
||||
lbl_8164C43C = .data:0x8164C43C; // type:object size:0xD data:string
|
||||
lbl_8164C449 = .data:0x8164C449; // type:object size:0xD data:string
|
||||
lbl_8164C458 = .data:0x8164C458; // type:object size:0xC data:4byte
|
||||
scPaneName_T_CalMonth = .data:0x8164C458; // type:object size:0xC data:4byte
|
||||
lbl_8164C464 = .data:0x8164C464; // type:object size:0x9 data:string
|
||||
lbl_8164C46D = .data:0x8164C46D; // type:object size:0x9 data:string
|
||||
lbl_8164C476 = .data:0x8164C476; // type:object size:0x9 data:string
|
||||
lbl_8164C480 = .data:0x8164C480; // type:object size:0xC
|
||||
scPaneName_N_Cal = .data:0x8164C480; // type:object size:0xC
|
||||
lbl_8164C48C = .data:0x8164C48C; // type:object size:0xB data:string
|
||||
lbl_8164C497 = .data:0x8164C497; // type:object size:0xB data:string
|
||||
lbl_8164C4A2 = .data:0x8164C4A2; // type:object size:0xB data:string
|
||||
lbl_8164C4B0 = .data:0x8164C4B0; // type:object size:0xC
|
||||
scPaneName_N_CalPos = .data:0x8164C4B0; // type:object size:0xC
|
||||
lbl_8164C4BC = .data:0x8164C4BC; // type:object size:0x43
|
||||
lbl_8164C4FF = .data:0x8164C4FF; // type:object size:0xF data:string
|
||||
lbl_8164C50E = .data:0x8164C50E; // type:object size:0x14 data:string
|
||||
|
||||
@@ -35,8 +35,8 @@ namespace ext_ead {
|
||||
|
||||
class SurfaceManager {
|
||||
public:
|
||||
static void CreateManager(int rectW0, int rectH0, int rectW1, int rectH1, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* param_10);
|
||||
static void CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* arcPath);
|
||||
static void DisposeManager();
|
||||
|
||||
static void RegisterArcFile(void* fileBuf);
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace ipl {
|
||||
void read_sd_app_location_async(ESTitleId32* titleIds);
|
||||
void check_for_sd_app_to_nand_async(ESTitleId titleId, AppBlocksInfo* usedBlocks, AppBlocksInfo* freeBlocks);
|
||||
void check_backup_fits_async(TitleIdList* newTitles, TitleIdList* replacingTitles);
|
||||
void iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC);
|
||||
void check_sd_app_titles_async(void* ptrA, void* ptrB, void* ptrC);
|
||||
|
||||
void list_nand_apps_usage_async(void* ptrA, void* ptr);
|
||||
|
||||
@@ -514,7 +514,7 @@ namespace ipl {
|
||||
void do_check_for_sd_app_to_nand();
|
||||
void check_backup_fits();
|
||||
void do_list_nand_apps_usage();
|
||||
void do_unk_8134C838();
|
||||
void do_check_sd_app_titles();
|
||||
|
||||
void do_move_nand_app_to_sd();
|
||||
void do_move_sd_app_to_nand();
|
||||
|
||||
@@ -40,7 +40,7 @@ ISD_Error ISD_ProbeCard(u32 slot);
|
||||
ISD_Error ISD_MountCard(u32 slot, SDDev** dev);
|
||||
ISD_Error ISD_UnmountCard(SDDev* dev);
|
||||
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) NO_INLINE;
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) NO_INLINE;
|
||||
|
||||
ISD_Error ISD_ReadBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
ISD_Error ISD_WriteBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
|
||||
@@ -55,17 +55,17 @@ enum {
|
||||
|
||||
static IOSFd sduOpenFD(u32 slot);
|
||||
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg);
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg);
|
||||
|
||||
static ISD_Error sduDatabuswidth(SDDev* dev, u32 buswidth);
|
||||
static ISD_Error sduGetSCR(SDDev* dev, u32* data) NO_INLINE;
|
||||
static ISD_Error sduGetOCR(SDDev* dev, u32* data);
|
||||
extern ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6);
|
||||
extern ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6);
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4);
|
||||
extern ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg);
|
||||
extern ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg);
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSectorSize);
|
||||
|
||||
IOSError __sdCb(s32 result, void* arg) {
|
||||
__sdCbArg* data = (__sdCbArg*)arg;
|
||||
@@ -106,33 +106,33 @@ IOSError __sdCb(s32 result, void* arg) {
|
||||
return result;
|
||||
}
|
||||
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) {
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) {
|
||||
IOSError ret;
|
||||
|
||||
if (__sdHeapId[0] < 0) {
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
|
||||
__sdReg[0] = param_2;
|
||||
__sdReg[3] = param_4;
|
||||
__sdReg[0] = reg;
|
||||
__sdReg[3] = size;
|
||||
__sdReg[4] = 0;
|
||||
|
||||
if (param_3 != NULL) {
|
||||
if (outValue != NULL) {
|
||||
ret = IOS_Ioctl(dev->SDDevFd, SD_IOCTL_2, __sdReg, 0x18, __sdCmdBuffer, 4);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
*param_3 = *__sdCmdBuffer;
|
||||
*outValue = *__sdCmdBuffer;
|
||||
return ret;
|
||||
}
|
||||
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
|
||||
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* status) {
|
||||
IOSError ret = SD_ERROR_FATAL;
|
||||
|
||||
if (__sdHeapId[0] >= 0 && param_2 != NULL) {
|
||||
if (__sdHeapId[0] >= 0 && status != NULL) {
|
||||
OSLockMutex(&__reqMutex);
|
||||
|
||||
if (__sdReq != 0) {
|
||||
@@ -145,7 +145,7 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
} else {
|
||||
*param_2 = *__sdCmdBuffer;
|
||||
*status = *__sdCmdBuffer;
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -154,13 +154,13 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg) {
|
||||
IOSError ret;
|
||||
u32 readCount, writeCount;
|
||||
u32* sdCmd;
|
||||
|
||||
if (param_9 != 0) {
|
||||
if (dma != 0) {
|
||||
readCount = 2;
|
||||
writeCount = 1;
|
||||
} else {
|
||||
@@ -216,7 +216,7 @@ static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg) {
|
||||
ISD_Error ret;
|
||||
u32* sdCmd;
|
||||
@@ -232,7 +232,7 @@ static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
|
||||
sdCmd[6] = buffer;
|
||||
sdCmd[4] = blockCount;
|
||||
sdCmd[5] = sectorSize;
|
||||
sdCmd[7] = param_9;
|
||||
sdCmd[7] = dma;
|
||||
|
||||
if (resp != NULL) {
|
||||
if (cb != NULL) {
|
||||
@@ -365,7 +365,7 @@ ISD_Error ISD_WriteMultiBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSi
|
||||
return ISD_WriteMultiBlockAsync(dev, offset, cmdResp, cmdRespSize, 0, 0);
|
||||
}
|
||||
|
||||
ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
|
||||
ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg) {
|
||||
ISD_Error ret;
|
||||
u32 status;
|
||||
|
||||
@@ -435,12 +435,12 @@ ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRe
|
||||
|
||||
DCInvalidateRange(cmdResp, cmdRespSize << 9);
|
||||
|
||||
ret = sduCommandv(dev->SDDevFd, 0x12, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
|
||||
ret = sduCommandv(dev->SDDevFd, 0x12, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)callback, (void*)callbackArg);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
|
||||
if (param_5 == 0) {
|
||||
if (callback == 0) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -449,7 +449,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
|
||||
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg) {
|
||||
ISD_Error ret;
|
||||
u32 status;
|
||||
|
||||
@@ -519,12 +519,12 @@ ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdR
|
||||
|
||||
DCFlushRange(cmdResp, cmdRespSize << 9);
|
||||
|
||||
ret = sduCommand(dev->SDDevFd, 0x19, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
|
||||
ret = sduCommand(dev->SDDevFd, 0x19, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)callback, (void*)callbackArg);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
|
||||
if (param_5 == 0) {
|
||||
if (callback == 0) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -782,7 +782,7 @@ static ISD_Error sduGetOCR(SDDev* dev, u32* data) {
|
||||
}
|
||||
|
||||
#ifdef __MWERKS__
|
||||
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* param_2, register u32* param_3, register u32* param_4) {
|
||||
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* outSize, register u32* outSize2, register u32* outSectorSize) {
|
||||
nofralloc
|
||||
|
||||
stwu r1, -0x30(r1)
|
||||
@@ -859,13 +859,13 @@ ISD_GetCardSize_store:
|
||||
stw r5, 0x18(r28)
|
||||
stw r0, 0x1c(r28)
|
||||
stw r3, 0x20(r28)
|
||||
beq ISD_GetCardSize_no_param2
|
||||
beq ISD_GetCardSize_no_outSize
|
||||
stw r3, 0(r29)
|
||||
ISD_GetCardSize_no_param2:
|
||||
ISD_GetCardSize_no_outSize:
|
||||
cmpwi r30, 0
|
||||
beq ISD_GetCardSize_no_param3
|
||||
beq ISD_GetCardSize_no_outSize2
|
||||
stw r3, 0(r30)
|
||||
ISD_GetCardSize_no_param3:
|
||||
ISD_GetCardSize_no_outSize2:
|
||||
cmpwi r31, 0
|
||||
beq ISD_GetCardSize_success_return
|
||||
li r0, 0x200
|
||||
@@ -884,7 +884,7 @@ ISD_GetCardSize_return:
|
||||
blr
|
||||
}
|
||||
#else
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4) {
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSectorSize) {
|
||||
ISD_Error ret;
|
||||
u32 out0;
|
||||
u32 out1;
|
||||
@@ -915,14 +915,14 @@ ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4)
|
||||
dev->SDSectorNum = out1;
|
||||
dev->SDDevSize = out2;
|
||||
|
||||
if (param_2 != NULL) {
|
||||
*param_2 = out2;
|
||||
if (outSize != NULL) {
|
||||
*outSize = out2;
|
||||
}
|
||||
if (param_3 != NULL) {
|
||||
*param_3 = out2;
|
||||
if (outSize2 != NULL) {
|
||||
*outSize2 = out2;
|
||||
}
|
||||
if (param_4 != NULL) {
|
||||
*param_4 = 512;
|
||||
if (outSectorSize != NULL) {
|
||||
*outSectorSize = 512;
|
||||
}
|
||||
|
||||
return SD_ERROR_SUCCESS;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <private/nhttp.h>
|
||||
|
||||
const char NHTTPi_strMultipartBound[24] = STR_POSTBOUND;
|
||||
const char NHTTPi_strMultipartBound[] = STR_POSTBOUND;
|
||||
|
||||
void* NHTTPi_alloc(u32 size, int align);
|
||||
void NHTTPi_free(void* ptr);
|
||||
|
||||
@@ -371,9 +371,9 @@ static BOOL NHTTPi_RecvProxyConnectHeader(NHTTPThreadContext* context)
|
||||
response->httpStatus = NHTTPi_strToInt(header + 9, 3);
|
||||
if (NHTTPi_strnicmp(header, "HTTP/", 5) == 0 && header[8] == ' '
|
||||
&& response->httpStatus == 200) accepted = TRUE;
|
||||
ended = FALSE;
|
||||
cursor = header;
|
||||
index = 0;
|
||||
ended = FALSE;
|
||||
while (index < used)
|
||||
{
|
||||
if (index > 1 && cursor[-1] == '\r' && *cursor == '\r') ended = TRUE;
|
||||
|
||||
@@ -215,19 +215,19 @@ namespace ipl {
|
||||
MESG_CALENDAR_DEC,
|
||||
};
|
||||
|
||||
static const char* lbl_8164C458[] = {
|
||||
static const char* scPaneName_T_CalMonth[] = {
|
||||
"T_CalMonth_a",
|
||||
"T_CalMonth_b",
|
||||
"T_CalMonth_c",
|
||||
};
|
||||
|
||||
static const char* lbl_8164C480[] = {
|
||||
static const char* scPaneName_N_Cal[] = {
|
||||
"N_Cal_a1",
|
||||
"N_Cal_b1",
|
||||
"N_Cal_c1",
|
||||
};
|
||||
|
||||
static const char* lbl_8164C4B0[] = {
|
||||
static const char* scPaneName_N_CalPos[] = {
|
||||
"N_CalPos_a",
|
||||
"N_CalPos_b",
|
||||
"N_CalPos_c",
|
||||
@@ -661,9 +661,9 @@ namespace ipl {
|
||||
utility::Calendar::getLastMonth(*mpBoardDate, &last);
|
||||
utility::Calendar::getNextMonth(*mpBoardDate, &next);
|
||||
|
||||
set_textbox_month(lbl_8164C458[0], last);
|
||||
set_textbox_month(lbl_8164C458[1], *mpBoardDate);
|
||||
set_textbox_month(lbl_8164C458[2], next);
|
||||
set_textbox_month(scPaneName_T_CalMonth[0], last);
|
||||
set_textbox_month(scPaneName_T_CalMonth[1], *mpBoardDate);
|
||||
set_textbox_month(scPaneName_T_CalMonth[2], next);
|
||||
}
|
||||
|
||||
void Calendar::set_textbox_month(const char* paneName, const utility::Date& date) {
|
||||
@@ -714,31 +714,31 @@ namespace ipl {
|
||||
|
||||
OSCalendarTime curTime = System::getCurrentTime();
|
||||
|
||||
utility::Date local_64(curTime.year, curTime.mon + 1, curTime.mday);
|
||||
utility::Date local_70;
|
||||
utility::Date local_7c;
|
||||
utility::Date todayDate(curTime.year, curTime.mon + 1, curTime.mday);
|
||||
utility::Date lastMonth;
|
||||
utility::Date nextMonth;
|
||||
|
||||
utility::Calendar::getLastMonth(date, &local_70);
|
||||
utility::Calendar::getNextMonth(date, &local_7c);
|
||||
utility::Calendar::getLastMonth(date, &lastMonth);
|
||||
utility::Calendar::getNextMonth(date, &nextMonth);
|
||||
|
||||
int dateIndex;
|
||||
int iVar10;
|
||||
int weekOffset;
|
||||
if (mbAsian || mbUSA) {
|
||||
iVar10 = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
|
||||
weekOffset = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
|
||||
} else {
|
||||
week--;
|
||||
if (week < 0) {
|
||||
week = 6;
|
||||
}
|
||||
iVar10 = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
|
||||
if (iVar10 >= 7) {
|
||||
iVar10 = 0;
|
||||
weekOffset = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
|
||||
if (weekOffset >= 7) {
|
||||
weekOffset = 0;
|
||||
}
|
||||
}
|
||||
|
||||
dateIndex = unk == 1 ? 0 : DATE_COUNT;
|
||||
|
||||
utility::Date local_88;
|
||||
utility::Date cellDate;
|
||||
|
||||
u32 attr;
|
||||
int val2;
|
||||
@@ -750,25 +750,25 @@ namespace ipl {
|
||||
|
||||
val = (maxDays + week);
|
||||
attr = 0;
|
||||
val2 = (iVar10 + val);
|
||||
val2 = (weekOffset + val);
|
||||
if ((week - i) > 0) {
|
||||
local_88.year = local_70.year;
|
||||
local_88.month = local_70.month;
|
||||
local_88.day = i + (local_70.day - week) + 1;
|
||||
cellDate.year = lastMonth.year;
|
||||
cellDate.month = lastMonth.month;
|
||||
cellDate.day = i + (lastMonth.day - week) + 1;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if ((val - i) > 0) {
|
||||
local_88.year = date.year;
|
||||
local_88.month = date.month;
|
||||
local_88.day = (i - week) + 1;
|
||||
cellDate.year = date.year;
|
||||
cellDate.month = date.month;
|
||||
cellDate.day = (i - week) + 1;
|
||||
attr |= 2;
|
||||
|
||||
if (local_88 == local_64) {
|
||||
if (cellDate == todayDate) {
|
||||
attr |= 1;
|
||||
}
|
||||
|
||||
switch (utility::Calendar::getWeek(local_88.year, local_88.month, local_88.day)) {
|
||||
switch (utility::Calendar::getWeek(cellDate.year, cellDate.month, cellDate.day)) {
|
||||
case 6: {
|
||||
attr |= 8;
|
||||
break;
|
||||
@@ -782,9 +782,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if ((val2 - i) > 0) {
|
||||
local_88.year = local_7c.year;
|
||||
local_88.month = local_7c.month;
|
||||
local_88.day = ((i - maxDays) - week) + 1;
|
||||
cellDate.year = nextMonth.year;
|
||||
cellDate.month = nextMonth.month;
|
||||
cellDate.day = ((i - maxDays) - week) + 1;
|
||||
goto out;
|
||||
} else {
|
||||
dateScn->setVisible(false);
|
||||
@@ -792,14 +792,14 @@ namespace ipl {
|
||||
}
|
||||
|
||||
out:
|
||||
dateScn->setDate(local_88);
|
||||
dateScn->setDate(cellDate);
|
||||
dateScn->setAttribute(attr);
|
||||
}
|
||||
}
|
||||
|
||||
void Calendar::set_date_pos(int unk) {
|
||||
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(lbl_8164C480[unk]);
|
||||
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(lbl_8164C4B0[unk]);
|
||||
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(scPaneName_N_Cal[unk]);
|
||||
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(scPaneName_N_CalPos[unk]);
|
||||
|
||||
int dateIndex = unk == 1 ? 0 : DATE_COUNT;
|
||||
|
||||
@@ -807,14 +807,14 @@ namespace ipl {
|
||||
Date* dateScn = ((Date*)nw4r::ut::List_GetNth(&mDateList, dateIndex));
|
||||
dateIndex++;
|
||||
|
||||
nw4r::math::VEC3 local_68;
|
||||
local_68.x = ((u16)i % 7) * 0x46;
|
||||
local_68.y = ((u16)i / 7) * -0x30;
|
||||
local_68.z = 0.0f;
|
||||
nw4r::math::VEC3 cellPos;
|
||||
cellPos.x = ((u16)i % 7) * 0x46;
|
||||
cellPos.y = ((u16)i / 7) * -0x30;
|
||||
cellPos.z = 0.0f;
|
||||
|
||||
MTXMultVec(pane2->GetGlobalMtx(), local_68, local_68);
|
||||
MTXMultVec(pane2->GetGlobalMtx(), cellPos, cellPos);
|
||||
|
||||
dateScn->setTranslate(local_68);
|
||||
dateScn->setTranslate(cellPos);
|
||||
dateScn->setRotate(pane1->GetRotate());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -571,7 +571,7 @@ namespace ipl {
|
||||
mWorkerCommand = 11;
|
||||
break;
|
||||
case 12:
|
||||
mpSDWorker->iplNandSD_81348EA8(
|
||||
mpSDWorker->check_sd_app_titles_async(
|
||||
command.arguments.pointers[0], command.arguments.pointers[1],
|
||||
command.arguments.pointers[2]);
|
||||
mWorkerCommand = 12;
|
||||
|
||||
@@ -389,7 +389,7 @@ namespace ipl {
|
||||
send_work(MESSAGE_CHECK_BACKUP_FITS);
|
||||
}
|
||||
|
||||
void NandSDWorker::iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC) {
|
||||
void NandSDWorker::check_sd_app_titles_async(void* ptrA, void* ptrB, void* ptrC) {
|
||||
myWork->paramA = ptrA;
|
||||
myWork->paramB = ptrB;
|
||||
myWork->paramC = ptrC;
|
||||
@@ -797,7 +797,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case MESSAGE_UNK_49: {
|
||||
do_unk_8134C838();
|
||||
do_check_sd_app_titles();
|
||||
break;
|
||||
}
|
||||
case MESSAGE_GET_NAND_SAVE_SIZE: {
|
||||
@@ -2179,7 +2179,7 @@ namespace ipl {
|
||||
MEMFreeToExpHeap(myWork->mainHeap, titleIds);
|
||||
}
|
||||
|
||||
void NandSDWorker::do_unk_8134C838() {
|
||||
void NandSDWorker::do_check_sd_app_titles() {
|
||||
SDAppBanner* sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppBanner));
|
||||
|
||||
/* i guess */
|
||||
|
||||
Reference in New Issue
Block a user