Compare commits
1 Commits
agent/asm2
...
cleanup/cn
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
74bb9a189d |
@@ -20050,8 +20050,8 @@ lbl_816932D0 = .data:0x816932D0; // type:object size:0x48 data:string
|
||||
lbl_81693318 = .data:0x81693318; // type:object size:0xA data:string
|
||||
lbl_81693324 = .data:0x81693324; // type:object size:0x15 data:string
|
||||
@466 = .data:0x81693340; // type:object size:0xD scope:local data:string
|
||||
lbl_81693350 = .data:0x81693350; // type:object size:0xD0
|
||||
lbl_81693420 = .data:0x81693420; // type:object size:0x16 data:string
|
||||
scCntCacheStrs = .data:0x81693350; // type:object size:0xD0
|
||||
scCntCacheTitleDataFmt = .data:0x81693420; // type:object size:0x16 data:string
|
||||
__vt__Q23EGG9Allocator = .data:0x81693438; // type:object size:0x14
|
||||
__vt__Q23EGG9ArcPlayer = .data:0x81693450; // type:object size:0x54
|
||||
__vt__Q23EGG20SimpleAudioMgrWithFx = .data:0x816934A8; // type:object size:0x78
|
||||
@@ -23109,7 +23109,7 @@ lbl_816983EC = .sdata:0x816983EC; // type:object size:0x6 data:string
|
||||
__KBDVersion = .sdata:0x816985C8; // type:object size:0x4 data:4byte
|
||||
__KPRVersion = .sdata:0x816985D0; // type:object size:0x4 data:4byte
|
||||
__CNTCACHEVersion = .sdata:0x816985D8; // type:object size:0x4 data:4byte
|
||||
lbl_816985DC = .sdata:0x816985DC; // type:object size:0x3 data:string
|
||||
scCntCacheSpaceNl = .sdata:0x816985DC; // type:object size:0x3 data:string
|
||||
@428 = .sdata:0x816985E0; // type:object size:0x4 scope:local data:string
|
||||
@429 = .sdata:0x816985E4; // type:object size:0x3 scope:local data:string
|
||||
@442 = .sdata:0x816985E7; // type:object size:0x8 scope:local data:string
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
char lbl_81693350[0xd0] = {
|
||||
char scCntCacheStrs[0xd0] = {
|
||||
0x3c, 0x3c, 0x20, 0x52, 0x56, 0x4c, 0x5f, 0x53, 0x44, 0x4b, 0x20, 0x2d, 0x20, 0x43, 0x4e, 0x54,
|
||||
0x43, 0x41, 0x43, 0x48, 0x45, 0x20, 0x09, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x62,
|
||||
0x75, 0x69, 0x6c, 0x64, 0x3a, 0x20, 0x41, 0x70, 0x72, 0x20, 0x32, 0x30, 0x20, 0x32, 0x30, 0x31,
|
||||
@@ -22,12 +22,12 @@ char lbl_81693350[0xd0] = {
|
||||
0x74, 0x20, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00,
|
||||
0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x00
|
||||
};
|
||||
char lbl_81693420[0x16] = {
|
||||
char scCntCacheTitleDataFmt[0x16] = {
|
||||
0x2f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x2f, 0x25, 0x30, 0x38, 0x78, 0x2f, 0x25, 0x30, 0x38, 0x78,
|
||||
0x2f, 0x64, 0x61, 0x74, 0x61, 0x00,
|
||||
};
|
||||
const char* __CNTCACHEVersion = lbl_81693350;
|
||||
char lbl_816985DC[3] = {0x20, 0x0a, 0x00};
|
||||
const char* __CNTCACHEVersion = scCntCacheStrs;
|
||||
char scCntCacheSpaceNl[3] = {0x20, 0x0a, 0x00};
|
||||
|
||||
extern void _savegpr_23();
|
||||
extern void _restgpr_23();
|
||||
@@ -72,9 +72,9 @@ asm void CNTCACHEClear() {
|
||||
mr r11, r12
|
||||
stw r0, 4(r12)
|
||||
bl _savegpr_23
|
||||
lis r30, lbl_81693350@ha
|
||||
lis r30, scCntCacheStrs@ha
|
||||
lis r3, _CNTCACHEMutex@ha
|
||||
addi r30, r30, lbl_81693350@l
|
||||
addi r30, r30, scCntCacheStrs@l
|
||||
li r29, 0
|
||||
addi r3, r3, _CNTCACHEMutex@l
|
||||
bl OSLockMutex
|
||||
@@ -146,7 +146,7 @@ L_184:
|
||||
stb r31, 0(r4)
|
||||
subf r23, r24, r4
|
||||
mr r3, r24
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
cmpwi r3, 0
|
||||
mr r29, r3
|
||||
@@ -246,7 +246,7 @@ asm void _CNTCACHEDeleteTitle() {
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
stw r0, 0x24(r1)
|
||||
stw r31, 0x1c(r1)
|
||||
stw r30, 0x18(r1)
|
||||
@@ -284,7 +284,7 @@ L_350:
|
||||
bl ES_DeleteTitleContent
|
||||
L_364:
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
L_370:
|
||||
cmpwi r3, 0
|
||||
@@ -305,10 +305,10 @@ asm int _CNTCACHEIsTitleRemovable(ESTitleId titleId) {
|
||||
subfic r11, r11, -0x2100
|
||||
stwux r1, r1, r11
|
||||
mflr r0
|
||||
lis r5, lbl_81693420@ha
|
||||
lis r5, scCntCacheTitleDataFmt@ha
|
||||
stw r0, 4(r12)
|
||||
li r0, 1
|
||||
addi r5, r5, lbl_81693420@l
|
||||
addi r5, r5, scCntCacheTitleDataFmt@l
|
||||
stw r31, -4(r12)
|
||||
stw r30, -8(r12)
|
||||
mr r30, r3
|
||||
@@ -403,7 +403,7 @@ asm void _CNTCACHEDeleteContent() {
|
||||
stw r0, 4(r12)
|
||||
bl _savegpr_26
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
li r31, 0
|
||||
li r4, 0
|
||||
@@ -441,10 +441,10 @@ asm void _CNTCACHEDeleteContent() {
|
||||
rlwinm. r0, r3, 0, 0x1b, 0x1b
|
||||
beq L_6f0
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
li r26, 1
|
||||
lis r27, lbl_81693420@ha
|
||||
lis r27, scCntCacheTitleDataFmt@ha
|
||||
b L_6e8
|
||||
L_5b0:
|
||||
stw r31, errno(r0)
|
||||
@@ -488,7 +488,7 @@ L_5e8:
|
||||
li r0, -1
|
||||
stw r26, 0x20(r1)
|
||||
addi r3, r1, 0x40
|
||||
addi r5, r27, lbl_81693420@l
|
||||
addi r5, r27, scCntCacheTitleDataFmt@l
|
||||
stw r26, 0x24(r1)
|
||||
and r6, r30, r0
|
||||
and r7, r29, r0
|
||||
@@ -529,7 +529,7 @@ L_6d4:
|
||||
bdnz L_5e8
|
||||
L_6dc:
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
L_6e8:
|
||||
cmpwi r3, 0
|
||||
|
||||
@@ -117,9 +117,9 @@ extern CDBErr CDBDatabaseSearchMinuteLayer();
|
||||
extern CDBErr CDBDatabaseSearchHourLayer();
|
||||
extern CDBErr CDBDatabaseSearchDayLayer();
|
||||
extern CDBErr CDBDatabaseSearchMonthLayer();
|
||||
extern CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions* conditions, CDBRecordLocation recordLocation);
|
||||
extern CDBErr CDBDatabaseSearchYearLayer();
|
||||
extern CDBErr CDBDatabaseSearch();
|
||||
extern CDBErr CDBDatabaseSearch_(CDBDatabase* database, CDBDate beginDate, CDBDate endDate, CDBSearchDirection searchDirection, char* makerCodeStr, char* gameCodeStr, char* type, CDBRecordLocation recordLocation, BOOL openRecord, CDBSearchRecordCB searchRecordCB, void* searchRecordArg, u64* wiiId);
|
||||
extern CDBErr CDBDatabaseSearch_();
|
||||
typedef struct {
|
||||
u32 used;
|
||||
u8 state[0xC00C];
|
||||
@@ -2176,7 +2176,7 @@ asm CDBErr CDBDatabaseSearchMonthLayer() {
|
||||
#endif
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions* conditions, CDBRecordLocation recordLocation) {
|
||||
asm CDBErr CDBDatabaseSearchYearLayer() {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x90(r1)
|
||||
@@ -2432,38 +2432,74 @@ asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions
|
||||
CDBErr CDBDatabaseSearch(CDBDatabase* database, CDBDate beginDate, CDBDate endDate, CDBSearchDirection searchDirection, char* makerCode, char* gameCode, int unk7, CDBRecordLocation recordLocation, int unk9, CDBSearchRecordCB searchRecordCB, void* searchRecordArg) {
|
||||
CDBErr result;
|
||||
CDBLock();
|
||||
result = CDBDatabaseSearch_(database, beginDate, endDate, searchDirection, makerCode, gameCode, (char*)unk7, recordLocation, unk9, searchRecordCB, searchRecordArg, NULL);
|
||||
result = CDBDatabaseSearch_(database, beginDate, endDate, searchDirection, makerCode, gameCode, unk7, recordLocation, unk9, searchRecordCB, searchRecordArg, NULL);
|
||||
CDBUnlock();
|
||||
return result;
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseSearch_(CDBDatabase* database, CDBDate beginDate, CDBDate endDate, CDBSearchDirection searchDirection, char* makerCodeStr, char* gameCodeStr, char* type, CDBRecordLocation recordLocation, BOOL openRecord, CDBSearchRecordCB searchRecordCB, void* searchRecordArg, u64* wiiId) {
|
||||
CDBSearchConditions conditions;
|
||||
|
||||
if (beginDate < endDate) {
|
||||
conditions.beginDate = beginDate;
|
||||
conditions.endDate = endDate;
|
||||
} else {
|
||||
conditions.beginDate = endDate;
|
||||
conditions.endDate = beginDate;
|
||||
}
|
||||
conditions.direction = searchDirection;
|
||||
CDBConvMCStrToMCValue(makerCodeStr, &conditions.makerCode);
|
||||
CDBConvGCStrToGCValue(gameCodeStr, &conditions.gameCode);
|
||||
conditions.type = type;
|
||||
conditions.callback = searchRecordCB;
|
||||
conditions.callbackArg = searchRecordArg;
|
||||
conditions.keepSearching = TRUE;
|
||||
conditions.openRecord = openRecord;
|
||||
if (wiiId == NULL) {
|
||||
conditions.wiiId = 0;
|
||||
} else {
|
||||
conditions.wiiId = *wiiId;
|
||||
}
|
||||
return CDBDatabaseSearchYearLayer(database, &conditions, recordLocation);
|
||||
asm CDBErr CDBDatabaseSearch_() {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x60(r1)
|
||||
mflr r0
|
||||
stw r0, 0x64(r1)
|
||||
addi r11, r1, 0x60
|
||||
bl _savegpr_24
|
||||
cmplw r4, r5
|
||||
lwz r28, 0x68(r1)
|
||||
lwz r29, 0x6c(r1)
|
||||
mr r24, r3
|
||||
lwz r30, 0x70(r1)
|
||||
mr r25, r8
|
||||
lwz r31, 0x74(r1)
|
||||
mr r26, r9
|
||||
mr r27, r10
|
||||
bge L_81489764
|
||||
stw r4, 0x8(r1)
|
||||
stw r5, 0xc(r1)
|
||||
b L_8148976C
|
||||
L_81489764:
|
||||
stw r5, 0x8(r1)
|
||||
stw r4, 0xc(r1)
|
||||
L_8148976C:
|
||||
stw r6, 0x1c(r1)
|
||||
mr r3, r7
|
||||
addi r4, r1, 0x10
|
||||
bl CDBConvMCStrToMCValue
|
||||
mr r3, r25
|
||||
addi r4, r1, 0x14
|
||||
bl CDBConvGCStrToGCValue
|
||||
li r0, 0x1
|
||||
cmpwi r31, 0x0
|
||||
stw r26, 0x18(r1)
|
||||
stw r29, 0x20(r1)
|
||||
stw r30, 0x24(r1)
|
||||
stw r0, 0x28(r1)
|
||||
stw r28, 0x2c(r1)
|
||||
bne L_814897B8
|
||||
li r0, 0x0
|
||||
stw r0, 0x34(r1)
|
||||
stw r0, 0x30(r1)
|
||||
b L_814897C8
|
||||
L_814897B8:
|
||||
lwz r0, 0x0(r31)
|
||||
lwz r3, 0x4(r31)
|
||||
stw r3, 0x34(r1)
|
||||
stw r0, 0x30(r1)
|
||||
L_814897C8:
|
||||
mr r3, r24
|
||||
mr r5, r27
|
||||
addi r4, r1, 0x8
|
||||
bl CDBDatabaseSearchYearLayer
|
||||
addi r11, r1, 0x60
|
||||
bl _restgpr_24
|
||||
lwz r0, 0x64(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x60
|
||||
blr
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
void CDBDatabaseInstanceInit(CDBDatabaseState* instance, u32 flags, CDBDatabase* database) {
|
||||
instance->used = 1;
|
||||
instance->flags = flags;
|
||||
|
||||
Reference in New Issue
Block a user