Compare commits
13 Commits
matcher/SO
...
agent/asm2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
30cb4063b8 | ||
|
|
1802d45758 | ||
|
|
130cc9e88e | ||
|
|
a801d1c5d6 | ||
|
|
8ab07fbb20 | ||
|
|
f68fcc0f9b | ||
|
|
5ad481ae40 | ||
|
|
713951c551 | ||
|
|
b47507aa3f | ||
|
|
01a73b600f | ||
|
|
83b577cf62 | ||
|
|
f67990d237 | ||
|
|
ad85ad1537 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.37% | 87.71% | 62.05% | 92.06% |
|
||||
| 99.37% | 87.72% | 62.05% | 92.06% |
|
||||
|
||||
units 918/1027 complete, functions 12214/12563 matched.
|
||||
units 918/1027 complete, functions 12215/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 -->
|
||||
|
||||
@@ -804,14 +804,14 @@ src/scene/sdChannelSelect/iplSDChannelObj.cpp:
|
||||
.rodata start:0x81610608 end:0x81610918
|
||||
.data start:0x81654B38 end:0x81654F98
|
||||
.sdata2 start:0x81694B18 end:0x81694B60
|
||||
.sdata start:0x81696DD0 end:0x81696E40
|
||||
.sdata start:0x81696DD0 end:0x81696E30
|
||||
|
||||
src/scene/sdChannelTitle/iplSDChannelTitle.cpp:
|
||||
.text start:0x813E4BBC end:0x813E947C
|
||||
.rodata start:0x81610918 end:0x81610948
|
||||
.data start:0x81654F98 end:0x81655638
|
||||
.sdata2 start:0x81694B60 end:0x81694B88
|
||||
.sdata start:0x81696E40 end:0x81696EF0
|
||||
.sdata start:0x81696E30 end:0x81696EF0
|
||||
|
||||
src/scene/sdButton/iplSDButton.cpp:
|
||||
.text start:0x813E947C end:0x813EA88C
|
||||
|
||||
@@ -15940,19 +15940,19 @@ lbl_8164DCDF = .data:0x8164DCDF; // type:object size:0x35
|
||||
jumptable_8164DD14 = .data:0x8164DD14; // type:object size:0x6C scope:local
|
||||
lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37
|
||||
lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD
|
||||
lbl_8164DE64 = .data:0x8164DE64; // type:object size:0x9 data:string
|
||||
lbl_8164DE6D = .data:0x8164DE6D; // type:object size:0x11 data:string
|
||||
scPaneName_N_GCIcon = .data:0x8164DE64; // type:object size:0x9 data:string
|
||||
scPaneName_N_DiscUpdateIcon = .data:0x8164DE6D; // type:object size:0x11 data:string
|
||||
jumptable_8164DE80 = .data:0x8164DE80; // type:object size:0x1C scope:local
|
||||
lbl_8164DE9C = .data:0x8164DE9C; // type:object size:0xB data:string
|
||||
scSE_WSD_SELECT = .data:0x8164DE9C; // type:object size:0xB data:string
|
||||
lbl_8164DEA7 = .data:0x8164DEA7; // type:object size:0x10 data:string
|
||||
lbl_8164DEB7 = .data:0x8164DEB7; // type:object size:0x114
|
||||
lbl_8164DFCB = .data:0x8164DFCB; // type:object size:0x16 data:string
|
||||
lbl_8164DFE1 = .data:0x8164DFE1; // type:object size:0x10 data:string
|
||||
lbl_8164DFF1 = .data:0x8164DFF1; // type:object size:0xF data:string
|
||||
lbl_8164E000 = .data:0x8164E000; // type:object size:0x14 data:string
|
||||
scSE_WIPL_SE_CH_TARGETTING = .data:0x8164DFCB; // type:object size:0x16 data:string
|
||||
scSE_WIPL_SE_CH_HOLD = .data:0x8164DFE1; // type:object size:0x10 data:string
|
||||
scSE_WIPL_SE_CH_SET = .data:0x8164DFF1; // type:object size:0xF data:string
|
||||
scSE_WIPL_SE_CH_NOT_MOVE = .data:0x8164E000; // type:object size:0x14 data:string
|
||||
lbl_8164E014 = .data:0x8164E014; // type:object size:0x10 data:string
|
||||
lbl_8164E024 = .data:0x8164E024; // type:object size:0x14 data:string
|
||||
lbl_8164E038 = .data:0x8164E038; // type:object size:0xF data:string
|
||||
scSE_WIPL_SE_GRAY_BUTTON = .data:0x8164E024; // type:object size:0x14 data:string
|
||||
scSE_WIPL_SE_DECIDE = .data:0x8164E038; // type:object size:0xF data:string
|
||||
__vt__Q33ipl4math29HermiteIntp<Q33ipl4math4VEC3> = .data:0x8164E048; // type:object size:0x20
|
||||
__vt__Q33ipl5scene27CsChanSelSDMenuEventHandler = .data:0x8164E068; // type:object size:0x1C
|
||||
__vt__Q33ipl5scene27CsChanSelButtonEventHandler = .data:0x8164E084; // type:object size:0x1C
|
||||
@@ -18664,7 +18664,7 @@ __vt__Q34nw4r3lyt7Picture = .data:0x816717F4; // type:object size:0x6C
|
||||
@5574 = .data:0x816718E8; // type:object size:0x41 scope:local data:string
|
||||
__vt__Q34nw4r3lyt7TextBox = .data:0x8167192C; // type:object size:0x74
|
||||
flipInfos$7849 = .data:0x816719A0; // type:object size:0x3C scope:local
|
||||
lbl_816719DC = .data:0x816719DC; // type:object size:0x41 data:string
|
||||
scLytFatalMsg = .data:0x816719DC; // type:object size:0x41 data:string
|
||||
__vt__Q34nw4r3lyt6Window = .data:0x81671A20; // type:object size:0x7C
|
||||
__vt__Q34nw4r3lyt8Bounding = .data:0x81671AA0; // type:object size:0x64
|
||||
kColSels$4880 = .data:0x81671B08; // type:object size:0x20 scope:local data:4byte
|
||||
@@ -21025,10 +21025,10 @@ lbl_8169553B = .sdata2:0x8169553B; // type:object size:0x1 data:byte
|
||||
lbl_8169553C = .sdata2:0x8169553C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81695540 = .sdata2:0x81695540; // type:object size:0x8 align:8 data:double
|
||||
lbl_81695548 = .sdata2:0x81695548; // type:object size:0x8 align:8 data:double
|
||||
lbl_81695550 = .sdata2:0x81695550; // type:object size:0x1 data:byte
|
||||
lbl_81695551 = .sdata2:0x81695551; // type:object size:0x1 data:byte
|
||||
lbl_81695552 = .sdata2:0x81695552; // type:object size:0x1 data:byte
|
||||
lbl_81695553 = .sdata2:0x81695553; // type:object size:0x5 data:byte
|
||||
scLytFatalColorR = .sdata2:0x81695550; // type:object size:0x1 data:byte
|
||||
scLytFatalColorG = .sdata2:0x81695551; // type:object size:0x1 data:byte
|
||||
scLytFatalColorB = .sdata2:0x81695552; // type:object size:0x1 data:byte
|
||||
scLytFatalColorA = .sdata2:0x81695553; // type:object size:0x5 data:byte
|
||||
@6184 = .sdata2:0x81695558; // type:object size:0x4 scope:local align:4 data:float
|
||||
@6185 = .sdata2:0x8169555C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@6186 = .sdata2:0x81695560; // type:object size:0x4 scope:local align:4 data:float
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
#include <nw4r/db/assert.h>
|
||||
|
||||
extern "C" const u8 lbl_81695550 = 255;
|
||||
extern "C" const u8 lbl_81695551 = 255;
|
||||
extern "C" const u8 lbl_81695552 = 255;
|
||||
extern "C" const u8 lbl_81695553 = 0;
|
||||
extern "C" char lbl_816719DC[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
extern "C" const u8 scLytFatalColorR = 255;
|
||||
extern "C" const u8 scLytFatalColorG = 255;
|
||||
extern "C" const u8 scLytFatalColorB = 255;
|
||||
extern "C" const u8 scLytFatalColorA = 0;
|
||||
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
|
||||
#undef NW4R_ASSERT
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {*((volatile const u8*)&::lbl_81695550), *((volatile const u8*)&::lbl_81695551), \
|
||||
*((volatile const u8*)&::lbl_81695552), *((volatile const u8*)&::lbl_81695553)}; \
|
||||
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
|
||||
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::lbl_816719DC); \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
|
||||
@@ -457,7 +457,7 @@ void bta_dm_signal_strength(tBTA_DM_MSG *p_data);
|
||||
|
||||
void bta_dm_acl_change(tBTA_DM_MSG *p_data);
|
||||
|
||||
BOOLEAN bta_sys_check_compress(int, UINT8 app_id, BD_ADDR peer_addr);
|
||||
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr);
|
||||
|
||||
void bta_dm_keep_acl(tBTA_DM_MSG *p_data);
|
||||
void bta_dm_immediate_disable(void);
|
||||
|
||||
@@ -151,7 +151,7 @@ UINT8 L2CA_SetTraceLevel(UINT8 new_level);
|
||||
UINT8 L2CA_SetDesireRole(UINT8 new_role);
|
||||
BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority);
|
||||
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
UINT8 wbits, UINT8 direction, UINT8 param_6,
|
||||
UINT8 wbits, UINT8 direction, UINT8 config,
|
||||
UINT8 enable);
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *, signed);
|
||||
UINT8 L2CA_Flush(UINT16 cid);
|
||||
|
||||
@@ -64,7 +64,7 @@ typedef struct CXUncompContextHuffman {
|
||||
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data);
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* param_2);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data);
|
||||
|
||||
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size);
|
||||
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -1376,7 +1376,7 @@ static void bta_dm_link_quality_cback(tBTM_LINK_QUALITY_RESULTS *p_result)
|
||||
}
|
||||
}
|
||||
|
||||
BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
|
||||
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr)
|
||||
{
|
||||
BOOLEAN status = FALSE;
|
||||
int i;
|
||||
@@ -1399,8 +1399,8 @@ BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
|
||||
}
|
||||
|
||||
static BOOLEAN bta_dm_l2cap_server_compress_cback(
|
||||
BD_ADDR peer_addr, int param_2, int param_3, int param_4,
|
||||
int param_5, int param_6, int param_7, UINT8 **p_mem_pool,
|
||||
BD_ADDR peer_addr, int pe_type, int mem_level, int wbits,
|
||||
int direction, int config, int enable, UINT8 **p_mem_pool,
|
||||
UINT32 *mem_pool_size)
|
||||
{
|
||||
BOOLEAN status = FALSE;
|
||||
|
||||
@@ -478,7 +478,7 @@ BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority)
|
||||
}
|
||||
|
||||
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
UINT8 wbits, UINT8 direction, UINT8 param_6,
|
||||
UINT8 wbits, UINT8 direction, UINT8 config,
|
||||
UINT8 enable)
|
||||
{
|
||||
tL2C_LCB *p_lcb;
|
||||
@@ -506,7 +506,7 @@ void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
}
|
||||
}
|
||||
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *param_1, int param_2)
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *p_callback, int unused)
|
||||
{
|
||||
#if 0
|
||||
/* ... */
|
||||
|
||||
@@ -1180,20 +1180,24 @@ s32 PFFAT_GetClusterSpecified(PFFAT_FFD* file, u32 chainIndex,
|
||||
s32 PFFAT_GetClusterAllocated(PFFAT_FFD* file, u32 chainIndex,
|
||||
u32 numClusters, u32* cluster)
|
||||
{
|
||||
u32* start;
|
||||
PF_VOLUME* vol;
|
||||
PFFAT_HINT* hint;
|
||||
u32 fatType;
|
||||
u32 locateStart;
|
||||
u32 locateEnd;
|
||||
s32 error;
|
||||
|
||||
fatType = file->p_vol->bpb.fat_type;
|
||||
start = file->p_start_cluster;
|
||||
vol = file->p_vol;
|
||||
fatType = vol->bpb.fat_type;
|
||||
hint = file->p_hint;
|
||||
if (*file->p_start_cluster == 1) {
|
||||
if (*start == 1) {
|
||||
if (fatType <= FAT_16) {
|
||||
*cluster = -1;
|
||||
return 0;
|
||||
}
|
||||
*file->p_start_cluster = file->p_vol->bpb.root_dir_cluster;
|
||||
*start = vol->bpb.root_dir_cluster;
|
||||
}
|
||||
*cluster = -1;
|
||||
error = find_cluster_in_chain(file, chainIndex, 2, numClusters, 1, cluster);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -9,7 +9,7 @@ extern void CDBLock();
|
||||
extern CDBErr CDBDatabaseAllocate(CDBDatabase* database, u32 flags);
|
||||
extern void CDBUnlock();
|
||||
extern CDBErr CDBDatabaseFree(CDBDatabase* database);
|
||||
extern void CDBRecordCreateAtOnce();
|
||||
extern CDBErr CDBRecordCreateAtOnce(CDBRecord* record, CDBDatabase* database, const char* desc, char* fileType, CDBDate epoch, int gameCode, u16 makerCode, void* buffer, u32 size);
|
||||
extern void CDBRecordInitDescriptor(CDBRecord* record, CDBDatabase* database, CDBRecordKey* key);
|
||||
extern BOOL CDBRecordIsExistFile(CDBRecord* record);
|
||||
extern void CDBRecordOpenReadOnly();
|
||||
@@ -95,7 +95,7 @@ extern CDBErr CDBDatabaseCreateRecordAtOnce();
|
||||
extern CDBErr CDBDatabaseCreateRecordAtOnceEx();
|
||||
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx();
|
||||
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_();
|
||||
extern CDBErr CDBDatabaseCreateRecordImAtOnce_();
|
||||
extern CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize);
|
||||
extern CDBErr CDBDatabaseFindByKey();
|
||||
typedef struct {
|
||||
CDBDate beginDate;
|
||||
@@ -249,61 +249,28 @@ asm CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* recor
|
||||
#endif
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, int year, int month, int day, int hour, int min, int sec) {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x60(r1)
|
||||
mflr r0
|
||||
stw r0, 0x64(r1)
|
||||
addi r11, r1, 0x60
|
||||
bl _savegpr_22
|
||||
lwz r28, 0x68(r1)
|
||||
mr r23, r4
|
||||
li r0, 0x0
|
||||
lwz r12, 0x6c(r1)
|
||||
lwz r11, 0x70(r1)
|
||||
mr r22, r3
|
||||
lwz r4, 0x74(r1)
|
||||
mr r24, r5
|
||||
stw r9, 0x24(r1)
|
||||
mr r25, r6
|
||||
mr r26, r7
|
||||
mr r27, r8
|
||||
stw r10, 0x20(r1)
|
||||
addi r3, r1, 0x10
|
||||
stw r28, 0x1c(r1)
|
||||
stw r12, 0x18(r1)
|
||||
stw r11, 0x14(r1)
|
||||
stw r4, 0x10(r1)
|
||||
stw r0, 0x30(r1)
|
||||
stw r0, 0x34(r1)
|
||||
bl OSCalendarTimeToTicks
|
||||
lhz r30, 0x0(r22)
|
||||
mr r28, r4
|
||||
lwz r31, 0x4(r22)
|
||||
mr r29, r3
|
||||
bl CDBLock
|
||||
stw r26, 0x8(r1)
|
||||
mr r3, r22
|
||||
mr r4, r23
|
||||
mr r5, r24
|
||||
stw r27, 0xc(r1)
|
||||
mr r6, r25
|
||||
mr r8, r28
|
||||
mr r7, r29
|
||||
mr r9, r31
|
||||
mr r10, r30
|
||||
bl CDBDatabaseCreateRecordImAtOnce_
|
||||
mr r30, r3
|
||||
bl CDBUnlock
|
||||
addi r11, r1, 0x60
|
||||
mr r3, r30
|
||||
bl _restgpr_22
|
||||
lwz r0, 0x64(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x60
|
||||
blr
|
||||
#endif
|
||||
CDBErr CDBDatabaseCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, int year, int month, int day, int hour, int min, int sec) {
|
||||
u32 gameCode;
|
||||
u16 makerCode;
|
||||
CDBErr result;
|
||||
OSTime time;
|
||||
OSCalendarTime cal;
|
||||
|
||||
cal.year = year;
|
||||
cal.mon = month;
|
||||
cal.mday = day;
|
||||
cal.hour = hour;
|
||||
cal.min = min;
|
||||
cal.sec = sec;
|
||||
cal.msec = 0;
|
||||
cal.usec = 0;
|
||||
time = OSCalendarTimeToTicks(&cal);
|
||||
makerCode = database->makerCode;
|
||||
gameCode = database->gameCode;
|
||||
CDBLock();
|
||||
result = CDBDatabaseCreateRecordImAtOnce_(database, record, typeStr, fileTypeStr, time, gameCode, makerCode, recordData, recordDataSize);
|
||||
CDBUnlock();
|
||||
return result;
|
||||
}
|
||||
|
||||
CDBErr CDBDatabasePrivateCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, int year, int month, int day, int hour, int min, int sec, u8* recordData, u32 recordDataSize, char* makerCode, char* gameCode) {
|
||||
@@ -396,101 +363,30 @@ asm CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_() {
|
||||
#endif
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseCreateRecordImAtOnce_() {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x40(r1)
|
||||
mflr r0
|
||||
stw r0, 0x44(r1)
|
||||
addi r11, r1, 0x40
|
||||
bl _savegpr_24
|
||||
lwz r11, 0x8(r3)
|
||||
mr r24, r3
|
||||
lwz r30, 0x48(r1)
|
||||
mr r25, r4
|
||||
cmpwi r11, 0x0
|
||||
lwz r31, 0x4c(r1)
|
||||
mr r26, r5
|
||||
mr r27, r6
|
||||
mr r28, r9
|
||||
mr r29, r10
|
||||
bne L_81487974
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148796C
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B550@ha
|
||||
addi r3, r3, lbl_8166B550@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_8148796C:
|
||||
li r3, 0x1b
|
||||
b L_81487A3C
|
||||
L_81487974:
|
||||
addis r3, r11, 0x1
|
||||
lwz r3, -0x3ff0(r3)
|
||||
rlwinm. r0, r3, 0, 30, 30
|
||||
bne L_814879EC
|
||||
cmpwi r3, 0x0
|
||||
bne L_814879BC
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_814879B4
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B550@ha
|
||||
addi r3, r3, lbl_8166B550@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_814879B4:
|
||||
li r3, 0x1b
|
||||
b L_81487A3C
|
||||
L_814879BC:
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_814879E4
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B57C@ha
|
||||
addi r3, r3, lbl_8166B57C@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_814879E4:
|
||||
li r3, 0x1a
|
||||
b L_81487A3C
|
||||
L_814879EC:
|
||||
lis r4, 0x8000
|
||||
mr r3, r7
|
||||
lwz r0, 0xf8(r4)
|
||||
mr r4, r8
|
||||
li r5, 0x0
|
||||
srwi r6, r0, 2
|
||||
bl __div2i
|
||||
stw r4, 0x10(r1)
|
||||
addi r3, r1, 0x10
|
||||
bl CDBClampCDBDate
|
||||
stw r31, 0x8(r1)
|
||||
mr r3, r25
|
||||
mr r4, r24
|
||||
mr r5, r26
|
||||
lwz r7, 0x10(r1)
|
||||
mr r6, r27
|
||||
mr r8, r28
|
||||
mr r9, r29
|
||||
mr r10, r30
|
||||
bl CDBRecordCreateAtOnce
|
||||
L_81487A3C:
|
||||
addi r11, r1, 0x40
|
||||
bl _restgpr_24
|
||||
lwz r0, 0x44(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x40
|
||||
blr
|
||||
#endif
|
||||
CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize) {
|
||||
CDBDatabaseState* instance;
|
||||
int flags;
|
||||
CDBDate date;
|
||||
|
||||
instance = database->instance;
|
||||
if (instance == NULL) {
|
||||
CDBReportError(lbl_8166B550);
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
|
||||
flags = instance->flags;
|
||||
if ((flags & 2) == 0) {
|
||||
if (flags == 0) {
|
||||
CDBReportError(lbl_8166B550);
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
CDBReportError(lbl_8166B57C);
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
|
||||
date = time / (OS_BUS_CLOCK / 4);
|
||||
CDBClampCDBDate(&date);
|
||||
return CDBRecordCreateAtOnce(record, database, typeStr, (char*)fileTypeStr, date, gameCode, makerCode, recordData, recordDataSize);
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordKey* recordKey) {
|
||||
|
||||
@@ -198,10 +198,8 @@ int SOShutdown(int socket, int how) {
|
||||
}
|
||||
|
||||
int SOPoll(SOPollFD* fds, unsigned int count, s64 timeout) {
|
||||
s32 size;
|
||||
s32 bytes;
|
||||
s32 result;
|
||||
s32 rm;
|
||||
s32 result,bytes,size;
|
||||
PollRequest* request;
|
||||
SOPollFD* reply;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
|
||||
@@ -131,15 +131,15 @@ namespace ipl {
|
||||
extern "C" char mscBasePaneNames__Q33ipl5scene13ChannelSelect[];
|
||||
extern "C" char mscClockPaneNames__Q33ipl5scene13ChannelSelect[];
|
||||
extern "C" u32 mscMaskPaneName__Q33ipl5scene13ChannelSelect;
|
||||
extern "C" char lbl_8164DFE1[];
|
||||
extern "C" char lbl_8164DE64[];
|
||||
extern "C" char lbl_8164DE6D[];
|
||||
extern "C" char lbl_8164DE9C[];
|
||||
extern "C" char lbl_8164DFCB[];
|
||||
extern "C" char lbl_8164DFF1[];
|
||||
extern "C" char lbl_8164E000[];
|
||||
extern "C" char lbl_8164E024[];
|
||||
extern "C" char lbl_8164E038[];
|
||||
extern "C" char scSE_WIPL_SE_CH_HOLD[];
|
||||
extern "C" char scPaneName_N_GCIcon[];
|
||||
extern "C" char scPaneName_N_DiscUpdateIcon[];
|
||||
extern "C" char scSE_WSD_SELECT[];
|
||||
extern "C" char scSE_WIPL_SE_CH_TARGETTING[];
|
||||
extern "C" char scSE_WIPL_SE_CH_SET[];
|
||||
extern "C" char scSE_WIPL_SE_CH_NOT_MOVE[];
|
||||
extern "C" char scSE_WIPL_SE_GRAY_BUTTON[];
|
||||
extern "C" char scSE_WIPL_SE_DECIDE[];
|
||||
extern "C" void draw__Q33ipl6layout6ObjectFPQ34nw4r3lyt4Pane();
|
||||
extern "C" void SetVisible__Q34nw4r3lyt4PaneFb();
|
||||
extern "C" void drawChannelThumbnails__Q33ipl5scene13ChannelSelectFv();
|
||||
@@ -855,8 +855,8 @@ namespace ipl {
|
||||
mpDiskInOutLyt->finishBinding();
|
||||
}
|
||||
|
||||
extern "C" char lbl_8164DE64[] = "N_GCIcon";
|
||||
extern "C" char lbl_8164DE6D[] = "N_DiscUpdateIcon";
|
||||
extern "C" char scPaneName_N_GCIcon[] = "N_GCIcon";
|
||||
extern "C" char scPaneName_N_DiscUpdateIcon[] = "N_DiscUpdateIcon";
|
||||
extern "C" void* jumptable_8164DE80[7] = {
|
||||
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x4C),
|
||||
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x21C),
|
||||
@@ -1359,8 +1359,8 @@ namespace ipl {
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
lwz r3, 0x94(r3)
|
||||
lis r29, lbl_8164DE64@ha
|
||||
addi r4, r29, lbl_8164DE64@l
|
||||
lis r29, scPaneName_N_GCIcon@ha
|
||||
addi r4, r29, scPaneName_N_GCIcon@l
|
||||
li r5, 0x1
|
||||
lwz r3, 0x14(r3)
|
||||
lwz r12, 0x0(r3)
|
||||
@@ -1370,8 +1370,8 @@ namespace ipl {
|
||||
li r4, 0x1
|
||||
bl SetVisible__Q34nw4r3lyt4PaneFb
|
||||
lwz r3, 0x94(r31)
|
||||
lis r30, lbl_8164DE6D@ha
|
||||
addi r4, r30, lbl_8164DE6D@l
|
||||
lis r30, scPaneName_N_DiscUpdateIcon@ha
|
||||
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
|
||||
li r5, 0x1
|
||||
lwz r3, 0x14(r3)
|
||||
lwz r12, 0x0(r3)
|
||||
@@ -1419,7 +1419,7 @@ namespace ipl {
|
||||
bne updateDiskState_813AD134
|
||||
lwz r3, 0x84(r28)
|
||||
li r0, 0x0
|
||||
addi r4, r29, lbl_8164DE64@l
|
||||
addi r4, r29, scPaneName_N_GCIcon@l
|
||||
li r5, 0x1
|
||||
stb r0, 0x1b81(r3)
|
||||
lwz r3, 0x94(r31)
|
||||
@@ -1431,7 +1431,7 @@ namespace ipl {
|
||||
li r4, 0x0
|
||||
bl SetVisible__Q34nw4r3lyt4PaneFb
|
||||
lwz r3, 0x94(r31)
|
||||
addi r4, r30, lbl_8164DE6D@l
|
||||
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
|
||||
li r5, 0x1
|
||||
lwz r3, 0x14(r3)
|
||||
lwz r12, 0x0(r3)
|
||||
@@ -2087,10 +2087,11 @@ namespace ipl {
|
||||
mpMoveLytDrop->getAnim()->initAnmFrame();
|
||||
}
|
||||
|
||||
extern "C" char lbl_8164DFCB[] = "WIPL_SE_CH_TARGETTING";
|
||||
extern "C" char lbl_8164DFE1[] = "WIPL_SE_CH_HOLD";
|
||||
extern "C" char lbl_8164DFF1[] = "WIPL_SE_CH_SET";
|
||||
extern "C" char lbl_8164E000[] = "WIPL_SE_CH_NOT_MOVE";
|
||||
extern "C" char scSE_WSD_SELECT[] = "WSD_SELECT";
|
||||
extern "C" char scSE_WIPL_SE_CH_TARGETTING[] = "WIPL_SE_CH_TARGETTING";
|
||||
extern "C" char scSE_WIPL_SE_CH_HOLD[] = "WIPL_SE_CH_HOLD";
|
||||
extern "C" char scSE_WIPL_SE_CH_SET[] = "WIPL_SE_CH_SET";
|
||||
extern "C" char scSE_WIPL_SE_CH_NOT_MOVE[] = "WIPL_SE_CH_NOT_MOVE";
|
||||
|
||||
void ChannelSelect::calcNormalGrab() {
|
||||
Button* button = getButton();
|
||||
@@ -2167,7 +2168,7 @@ namespace ipl {
|
||||
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
|
||||
mpGui->initPane(getChannelBasePane(i));
|
||||
}
|
||||
snd::getSystem()->startSE(lbl_8164DE9C);
|
||||
snd::getSystem()->startSE(scSE_WSD_SELECT);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -2193,7 +2194,7 @@ namespace ipl {
|
||||
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
|
||||
mpGui->initPane(getChannelBasePane(i));
|
||||
}
|
||||
snd::getSystem()->startSE(lbl_8164DE9C);
|
||||
snd::getSystem()->startSE(scSE_WSD_SELECT);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -2357,7 +2358,7 @@ namespace ipl {
|
||||
case ::gui::EventHandler::ON_POINT: {
|
||||
if (isReleasableArea(mCurrentPage, id) || (mCurrentPage == mMoveOldPage && id == mMoveOldIndex)) {
|
||||
searchList(mCurrentPage, id)->onPoint(2);
|
||||
snd::getSystem()->startSE(lbl_8164DFCB);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_CH_TARGETTING);
|
||||
con->rumble(1);
|
||||
break;
|
||||
}
|
||||
@@ -2438,7 +2439,7 @@ namespace ipl {
|
||||
mbModuleSceneChange = true;
|
||||
unk_0x185 = true;
|
||||
|
||||
snd::getSystem()->startSEwithPos(lbl_8164DFE1, mDragPos.x);
|
||||
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_HOLD, mDragPos.x);
|
||||
|
||||
mState = STATE_NORMAL_GRAB;
|
||||
}
|
||||
@@ -2450,13 +2451,13 @@ namespace ipl {
|
||||
mpMoveLytDrop->GetRootPane()->SetTranslate(translate);
|
||||
mpMoveLytDrop->getAnim(0)->play();
|
||||
|
||||
snd::getSystem()->startSEwithPos(lbl_8164DFF1, mDragPos.x);
|
||||
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_SET, mDragPos.x);
|
||||
|
||||
mpMoveLytMask->getAnim(1)->play();
|
||||
|
||||
mState = STATE_NORMAL_MOVE_CHAN_IN;
|
||||
} else {
|
||||
snd::getSystem()->startSEwithPos(lbl_8164E000, mDragPos.x);
|
||||
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_NOT_MOVE, mDragPos.x);
|
||||
|
||||
mState = STATE_NORMAL_RELEASE_WAIT;
|
||||
}
|
||||
@@ -2519,8 +2520,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" char lbl_8164E024[] = "WIPL_SE_GRAY_BUTTON";
|
||||
extern "C" char lbl_8164E038[] = "WIPL_SE_DECIDE";
|
||||
extern "C" char scSE_WIPL_SE_GRAY_BUTTON[] = "WIPL_SE_GRAY_BUTTON";
|
||||
extern "C" char scSE_WIPL_SE_DECIDE[] = "WIPL_SE_DECIDE";
|
||||
|
||||
void ChannelSelectEventHandler::onEvent(u32 compId, u32 event, void* data) {
|
||||
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
|
||||
@@ -2561,7 +2562,7 @@ namespace ipl {
|
||||
case ::gui::EventHandler::ON_POINT: {
|
||||
if (mpInstance->mState == ChannelSelect::STATE_NORMAL && chanObj->isValid()) {
|
||||
chanObj->onPoint(0);
|
||||
snd::getSystem()->startSE(lbl_8164DFCB);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_CH_TARGETTING);
|
||||
con->rumble(1);
|
||||
}
|
||||
break;
|
||||
@@ -2599,13 +2600,13 @@ namespace ipl {
|
||||
if (System::isSafeMode()) {
|
||||
System::getDialog()->callBtn0(MESG_CHAN_SEL_SAFE_MODE, 180);
|
||||
mpInstance->mState = ChannelSelect::STATE_NORMAL_SAFE_MODE_DIALOG;
|
||||
snd::getSystem()->startSE(lbl_8164E024);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_GRAY_BUTTON);
|
||||
} else {
|
||||
mpInstance->setSomething();
|
||||
mpInstance->mState = ChannelSelect::STATE_START_BOARD_SCENE;
|
||||
mpInstance->tryToStartBoardScene();
|
||||
TVRCManager::getHandle()->setEnable(FALSE);
|
||||
snd::getSystem()->startSE(lbl_8164E038);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
|
||||
}
|
||||
} else if (Button::cmpButtonName(paneName, Button::BTN_SETTING) == 0) {
|
||||
button->setEventHandler(NULL);
|
||||
@@ -2615,7 +2616,7 @@ namespace ipl {
|
||||
System::getFader()->fadeOut();
|
||||
TVRCManager::getHandle()->setEnable(FALSE);
|
||||
mpInstance->mState = ChannelSelect::STATE_START_SETTING_SCENE;
|
||||
snd::getSystem()->startSE(lbl_8164E038);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
|
||||
} else if (Button::cmpButtonName(paneName, Button::BTN_ARROW_LEFT) == 0 && mpInstance->mCurrentPage > 0) {
|
||||
button->animation(Button::IDANIM_ARROW_LEFT_SELECT);
|
||||
mpInstance->preparePageScrolling(ChannelSelect::STATE_PREP_LEFT_PAGE_SCROLL);
|
||||
@@ -2650,7 +2651,7 @@ namespace ipl {
|
||||
System::getFader()->fadeOut();
|
||||
TVRCManager::getHandle()->setEnable(FALSE);
|
||||
mpInstance->mState = ChannelSelect::STATE_START_SD_MENU_SCENE;
|
||||
snd::getSystem()->startSE(lbl_8164E038);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -2604,8 +2604,8 @@ namespace ipl {
|
||||
|
||||
wcscpy(limitStr, System::getMessage(MESG_CHAN_SEL_TIME_LIMIT));
|
||||
|
||||
wchar_t local_38[16] = L"";
|
||||
wchar_t local_58[16] = L"";
|
||||
wchar_t hourStr[16] = L"";
|
||||
wchar_t minuteStr[16] = L"";
|
||||
|
||||
if (hour == 0 && minute == 0) {
|
||||
swprintf(limitStr, 65, L"%ls %ls", limitStr, System::getMessage(MESG_CHAN_SEL_LIMIT_UNDER_60));
|
||||
@@ -2616,42 +2616,42 @@ namespace ipl {
|
||||
if (System::getLanguage() == SC_LANG_JAPANESE || System::getLanguage() == SC_LANG_KOREAN ||
|
||||
System::getLanguage() == SC_LANG_GERMAN) {
|
||||
if (hour == 1) {
|
||||
swprintf(local_38, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
swprintf(hourStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
} else if (hour != 0) {
|
||||
swprintf(local_38, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
swprintf(hourStr, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
}
|
||||
|
||||
if (minute == 1) {
|
||||
swprintf(local_58, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
swprintf(minuteStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
} else if (minute != 0) {
|
||||
swprintf(local_58, 16, L"%d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
swprintf(minuteStr, 16, L"%d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
}
|
||||
} else if (System::getLanguage() == SC_LANG_FRENCH || System::getLanguage() == SC_LANG_ITALIAN) {
|
||||
if (hour == 1) {
|
||||
swprintf(local_38, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
swprintf(hourStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
} else if (hour != 0) {
|
||||
swprintf(local_38, 16, L"%02d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
swprintf(hourStr, 16, L"%02d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
}
|
||||
|
||||
if (minute == 1) {
|
||||
swprintf(local_58, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
swprintf(minuteStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
} else if (minute != 0) {
|
||||
swprintf(local_58, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
swprintf(minuteStr, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
}
|
||||
} else {
|
||||
if (hour == 1) {
|
||||
swprintf(local_38, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
swprintf(hourStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
} else if (hour != 0) {
|
||||
swprintf(local_38, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
swprintf(hourStr, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
}
|
||||
|
||||
if (minute == 1) {
|
||||
swprintf(local_58, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
swprintf(minuteStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
} else if (minute != 0) {
|
||||
swprintf(local_58, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
swprintf(minuteStr, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
}
|
||||
}
|
||||
swprintf(limitStr, 65, L"%ls %ls%ls", limitStr, local_38, local_58);
|
||||
swprintf(limitStr, 65, L"%ls %ls%ls", limitStr, hourStr, minuteStr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,10 +86,7 @@ static inline void setMemoryTitleLists(SDMemory* memory, SDMemory::TitleRange sd
|
||||
memory->setTitleLists(sdRange, nandRange);
|
||||
}
|
||||
|
||||
extern "C" char lbl_81696E30[];
|
||||
extern "C" char lbl_81696E37[];
|
||||
|
||||
static const char* sButtonNames[2] = {lbl_81696E30, lbl_81696E37};
|
||||
static const char* sButtonNames[2] = {"B_BtnA", "B_BtnB"};
|
||||
|
||||
static const int sCaptureSizes[2][2] = {{128, 96}, {176, 96}};
|
||||
|
||||
|
||||
@@ -1003,39 +1003,21 @@ namespace ipl {
|
||||
return count - 1;
|
||||
}
|
||||
|
||||
asm int Manager::getAvailableInList(register const ESTitleId* titleIds, register u32 titleCount) {
|
||||
nofralloc
|
||||
li r8, 0
|
||||
li r6, 0
|
||||
li r7, 0xc
|
||||
mtctr r5
|
||||
cmplwi r5, 0
|
||||
ble getAvailableInList_L3
|
||||
getAvailableInList_L1:
|
||||
add r5, r4, r6
|
||||
lwzx r0, r4, r6
|
||||
lwz r5, 4(r5)
|
||||
or. r0, r5, r0
|
||||
bne getAvailableInList_L2
|
||||
divw r5, r8, r7
|
||||
mullw r0, r5, r7
|
||||
mulli r5, r5, 0xc0
|
||||
subf r0, r0, r8
|
||||
add r5, r3, r5
|
||||
slwi r0, r0, 4
|
||||
add r5, r5, r0
|
||||
lbz r0, 0x30(r5)
|
||||
cmplwi r0, 1
|
||||
beq getAvailableInList_L2
|
||||
mr r3, r8
|
||||
blr
|
||||
getAvailableInList_L2:
|
||||
addi r8, r8, 1
|
||||
addi r6, r6, 8
|
||||
bdnz getAvailableInList_L1
|
||||
getAvailableInList_L3:
|
||||
li r3, -1
|
||||
blr
|
||||
int Manager::getAvailableInList(const ESTitleId* titleIds, u32 titleCount) {
|
||||
int dens = 12;
|
||||
u32 i;
|
||||
for (i = 0; i < titleCount; i++) {
|
||||
if (titleIds[i] == 0) {
|
||||
int page = (int)i / dens;
|
||||
int slot = (int)i % dens;
|
||||
u8* p = (u8*)this + page * 0xc0;
|
||||
p += slot * 16;
|
||||
if (*(p + 0x30) != 1) {
|
||||
return (int)i;
|
||||
}
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
asm int Manager::isEqualChannel(register ESTitleId titleId0, register ESTitleId titleId1) {
|
||||
|
||||
Reference in New Issue
Block a user