Compare commits
2 Commits
cleanup/so
...
cleanup/cd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
201c182666 | ||
|
|
22dd088277 |
@@ -18235,13 +18235,13 @@ jumptable_8166B3D0 = .data:0x8166B3D0; // type:object size:0x30 scope:local
|
||||
@1137 = .data:0x8166B450; // type:object size:0x22 scope:local data:string
|
||||
jumptable_8166B478 = .data:0x8166B478; // type:object size:0x30 scope:local
|
||||
lbl_8166B4B8 = .data:0x8166B4B8; // type:object size:0x70
|
||||
lbl_8166B528 = .data:0x8166B528; // type:object size:0x25 data:string
|
||||
lbl_8166B550 = .data:0x8166B550; // type:object size:0x29 data:string
|
||||
lbl_8166B57C = .data:0x8166B57C; // type:object size:0x2B data:string
|
||||
lbl_8166B5A8 = .data:0x8166B5A8; // type:object size:0xD data:string
|
||||
lbl_8166B5B8 = .data:0x8166B5B8; // type:object size:0x15 data:string
|
||||
lbl_8166B5D0 = .data:0x8166B5D0; // type:object size:0x46 data:string
|
||||
lbl_8166B618 = .data:0x8166B618; // type:object size:0x48 data:string
|
||||
scCdbMsg_DatabaseClosed = .data:0x8166B528; // type:object size:0x25 data:string
|
||||
scCdbMsg_CantCreateRecordClosed = .data:0x8166B550; // type:object size:0x29 data:string
|
||||
scCdbMsg_CantCreateRecordReadonly = .data:0x8166B57C; // type:object size:0x2B data:string
|
||||
scCdbMsg_InvalidKey = .data:0x8166B5A8; // type:object size:0xD data:string
|
||||
scCdbMsg_FileNotFound = .data:0x8166B5B8; // type:object size:0x15 data:string
|
||||
scCdbMsg_CantCleanupDirsClosed = .data:0x8166B5D0; // type:object size:0x46 data:string
|
||||
scCdbMsg_CantCleanupDirsReadonly = .data:0x8166B618; // type:object size:0x48 data:string
|
||||
@1360 = .data:0x8166B660; // type:object size:0x12 scope:local data:string
|
||||
...data.0 = .data:0x8166B660; // type:label scope:local
|
||||
@1362 = .data:0x8166B674; // type:object size:0x1C scope:local data:string
|
||||
@@ -20243,7 +20243,7 @@ lbl_81694654 = .sdata2:0x81694654; // type:object size:0x4 align:4 data:float
|
||||
@10043 = .sdata2:0x81694698; // type:object size:0x4 scope:local align:4 data:float
|
||||
@10044 = .sdata2:0x8169469C; // type:object size:0x4 scope:local align:4 data:float
|
||||
lbl_816946A0 = .sdata2:0x816946A0; // type:object size:0x4 align:4 data:float
|
||||
scSoundZeroF = .sdata2:0x816946A4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946A4 = .sdata2:0x816946A4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946A8 = .sdata2:0x816946A8; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946AC = .sdata2:0x816946AC; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946B0 = .sdata2:0x816946B0; // type:object size:0x4 align:4 data:float
|
||||
|
||||
@@ -79,13 +79,13 @@ typedef struct {
|
||||
} CDBSearchWork;
|
||||
|
||||
extern CDBSearchWork* CDBDatabaseWorkBuf;
|
||||
extern char lbl_8166B528[];
|
||||
extern char lbl_8166B550[];
|
||||
extern char lbl_8166B57C[];
|
||||
extern char lbl_8166B5A8[];
|
||||
extern char lbl_8166B5B8[];
|
||||
extern char lbl_8166B5D0[];
|
||||
extern char lbl_8166B618[];
|
||||
extern char scCdbMsg_DatabaseClosed[];
|
||||
extern char scCdbMsg_CantCreateRecordClosed[];
|
||||
extern char scCdbMsg_CantCreateRecordReadonly[];
|
||||
extern char scCdbMsg_InvalidKey[];
|
||||
extern char scCdbMsg_FileNotFound[];
|
||||
extern char scCdbMsg_CantCleanupDirsClosed[];
|
||||
extern char scCdbMsg_CantCleanupDirsReadonly[];
|
||||
|
||||
extern CDBErr CDBDatabaseInit();
|
||||
extern CDBErr CDBDatabaseOpen();
|
||||
@@ -165,7 +165,7 @@ CDBErr CDBDatabaseClose(CDBDatabase* database) {
|
||||
CDBLock();
|
||||
instance = database->instance;
|
||||
if (instance == NULL || instance->flags == 0) {
|
||||
CDBReportError(lbl_8166B528);
|
||||
CDBReportError(scCdbMsg_DatabaseClosed);
|
||||
result = CDB_ERROR_27;
|
||||
} else {
|
||||
status = CDBDatabaseFree(database);
|
||||
@@ -403,17 +403,17 @@ CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record
|
||||
|
||||
instance = database->instance;
|
||||
if (instance == NULL) {
|
||||
CDBReportError(lbl_8166B550);
|
||||
CDBReportError(scCdbMsg_CantCreateRecordClosed);
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
|
||||
flags = instance->flags;
|
||||
if ((flags & 2) == 0) {
|
||||
if (flags == 0) {
|
||||
CDBReportError(lbl_8166B550);
|
||||
CDBReportError(scCdbMsg_CantCreateRecordClosed);
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
CDBReportError(lbl_8166B57C);
|
||||
CDBReportError(scCdbMsg_CantCreateRecordReadonly);
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
|
||||
@@ -427,12 +427,12 @@ CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordK
|
||||
|
||||
CDBLock();
|
||||
if (!CDBRecordKeyIsValid(recordKey)) {
|
||||
CDBReportError(lbl_8166B5A8);
|
||||
CDBReportError(scCdbMsg_InvalidKey);
|
||||
result = CDB_ERROR_5;
|
||||
} else {
|
||||
CDBRecordInitDescriptor(record, database, recordKey);
|
||||
if (!CDBRecordIsExistFile(record)) {
|
||||
CDBReportError(lbl_8166B5B8, recordKey->keyString);
|
||||
CDBReportError(scCdbMsg_FileNotFound, recordKey->keyString);
|
||||
result = CDB_ERROR_CANNOT_OPEN_FILE;
|
||||
} else {
|
||||
result = CDB_ERROR_OK;
|
||||
@@ -2608,11 +2608,11 @@ CDBErr CDBDatabaseCleanUpEmptyDirectories(CDBDatabase* database, CDBRecordLocati
|
||||
CDBUnlock();
|
||||
|
||||
if (flags == 0) {
|
||||
CDBReportError(lbl_8166B5D0);
|
||||
CDBReportError(scCdbMsg_CantCleanupDirsClosed);
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if (flags == 1) {
|
||||
CDBReportError(lbl_8166B618);
|
||||
CDBReportError(scCdbMsg_CantCleanupDirsReadonly);
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
|
||||
@@ -2663,16 +2663,16 @@ CDBErr CDBDatabaseCleanUpEmptyDirectories(CDBDatabase* database, CDBRecordLocati
|
||||
|
||||
#pragma section data_type ".data"
|
||||
#pragma align 8
|
||||
extern char lbl_8166B528[] = "CDBDatabaseClose database is closed\n";
|
||||
extern char scCdbMsg_DatabaseClosed[] = "CDBDatabaseClose database is closed\n";
|
||||
#pragma align 8
|
||||
extern char lbl_8166B550[] = "can't create record; database is closed\n";
|
||||
extern char scCdbMsg_CantCreateRecordClosed[] = "can't create record; database is closed\n";
|
||||
#pragma align 8
|
||||
extern char lbl_8166B57C[] = "can't create record; database is readonly\n";
|
||||
extern char scCdbMsg_CantCreateRecordReadonly[] = "can't create record; database is readonly\n";
|
||||
#pragma align 8
|
||||
extern char lbl_8166B5A8[] = "invalid key\n";
|
||||
extern char scCdbMsg_InvalidKey[] = "invalid key\n";
|
||||
#pragma align 8
|
||||
extern char lbl_8166B5B8[] = "file not found : %s\n";
|
||||
extern char scCdbMsg_FileNotFound[] = "file not found : %s\n";
|
||||
#pragma align 8
|
||||
extern char lbl_8166B5D0[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is closed\n";
|
||||
extern char scCdbMsg_CantCleanupDirsClosed[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is closed\n";
|
||||
#pragma align 8
|
||||
extern char lbl_8166B618[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is readonly\n";
|
||||
extern char scCdbMsg_CantCleanupDirsReadonly[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is readonly\n";
|
||||
|
||||
@@ -198,8 +198,10 @@ 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) {
|
||||
|
||||
@@ -19,7 +19,7 @@ extern "C" {
|
||||
}
|
||||
extern "C" void _seBlk__Q23ipl3snd();
|
||||
extern "C" nw4r::snd::SoundHandle* _mainBGMHandle__Q23ipl3snd;
|
||||
extern "C" const f32 scSoundZeroF;
|
||||
extern "C" const f32 lbl_816946A4;
|
||||
extern "C" const f32 lbl_816946AC;
|
||||
extern "C" const f32 lbl_816946A8;
|
||||
extern "C" const f32 lbl_816946B0;
|
||||
@@ -265,10 +265,10 @@ namespace ipl {
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
lfs f1, scSoundZeroF
|
||||
lfs f1, lbl_816946A4
|
||||
li r4, 0
|
||||
bl SetMasterVolume__Q44nw4r3snd6detail9AxManagerFfi
|
||||
lfs f1, scSoundZeroF
|
||||
lfs f1, lbl_816946A4
|
||||
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
|
||||
bl setMasterVolume__17BannerSoundPlayerFf
|
||||
addi r11, r1, 0x20
|
||||
@@ -315,7 +315,7 @@ namespace ipl {
|
||||
sBannerSoundPlayer.setMasterVolume(0.9f);
|
||||
}
|
||||
|
||||
extern "C" const f32 scSoundZeroF = 0.0f;
|
||||
extern "C" const f32 lbl_816946A4 = 0.0f;
|
||||
|
||||
void System::stopBannerSound(int unk) {
|
||||
sBannerSoundPlayer.stop(unk);
|
||||
|
||||
Reference in New Issue
Block a user