Compare commits
7 Commits
agent/link
...
agent/asm2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ecc304fe5 | ||
|
|
1802d45758 | ||
|
|
130cc9e88e | ||
|
|
a801d1c5d6 | ||
|
|
8ab07fbb20 | ||
|
|
f68fcc0f9b | ||
|
|
5ad481ae40 |
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -247,7 +247,7 @@ config.asflags = [
|
||||
"-I include",
|
||||
f"-I build/{config.version}/include",
|
||||
f"--defsym BUILD_VERSION={version_num}",
|
||||
f"--defsym VERSION_{config.version}=1",
|
||||
f"--defsym VERSION_{config.version}",
|
||||
]
|
||||
config.ldflags = [
|
||||
"-fp hardware",
|
||||
@@ -928,7 +928,7 @@ config.libs = [
|
||||
Object(Matching, "keyboard/tiLanguageIndependentData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiInputForm.cpp", source="keyboard/MyTiInputForm.s", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
|
||||
|
||||
@@ -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); \
|
||||
} \
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -94,7 +94,7 @@ extern CDBErr CDBDatabasePrivateCreateRecordAtOnce();
|
||||
extern CDBErr CDBDatabaseCreateRecordAtOnce();
|
||||
extern CDBErr CDBDatabaseCreateRecordAtOnceEx();
|
||||
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx();
|
||||
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_();
|
||||
extern 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);
|
||||
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 {
|
||||
@@ -314,86 +314,38 @@ CDBErr CDBDatabasePrivateCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord*
|
||||
return result;
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_() {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x80(r1)
|
||||
mflr r0
|
||||
stw r0, 0x84(r1)
|
||||
addi r11, r1, 0x80
|
||||
bl _savegpr_18
|
||||
lwz r24, 0x9c(r1)
|
||||
mr r28, r3
|
||||
lwz r27, 0x88(r1)
|
||||
mr r29, r4
|
||||
lwz r26, 0x8c(r1)
|
||||
mr r30, r5
|
||||
lwz r22, 0x90(r1)
|
||||
mr r31, r6
|
||||
lwz r23, 0x94(r1)
|
||||
mr r18, r7
|
||||
lwz r25, 0x98(r1)
|
||||
mr r19, r8
|
||||
mr r20, r9
|
||||
mr r21, r10
|
||||
mr r3, r24
|
||||
bl CDBIsGameCodeStr
|
||||
cmpwi r3, 0x0
|
||||
bne L_81487844
|
||||
li r3, 0x4
|
||||
b L_814878EC
|
||||
L_81487844:
|
||||
mr r3, r25
|
||||
bl CDBIsMakerCodeStr
|
||||
cmpwi r3, 0x0
|
||||
bne L_8148785C
|
||||
li r3, 0x3
|
||||
b L_814878EC
|
||||
L_8148785C:
|
||||
mr r3, r25
|
||||
addi r4, r1, 0x10
|
||||
bl CDBConvMCStrToMCValue
|
||||
mr r3, r24
|
||||
addi r4, r1, 0x14
|
||||
bl CDBConvGCStrToGCValue
|
||||
li r0, 0x0
|
||||
stw r18, 0x2c(r1)
|
||||
addi r3, r1, 0x18
|
||||
stw r19, 0x28(r1)
|
||||
stw r20, 0x24(r1)
|
||||
stw r21, 0x20(r1)
|
||||
stw r27, 0x1c(r1)
|
||||
stw r26, 0x18(r1)
|
||||
stw r0, 0x38(r1)
|
||||
stw r0, 0x3c(r1)
|
||||
bl OSCalendarTimeToTicks
|
||||
lhz r26, 0x10(r1)
|
||||
mr r24, r4
|
||||
lwz r27, 0x14(r1)
|
||||
mr r25, r3
|
||||
bl CDBLock
|
||||
stw r22, 0x8(r1)
|
||||
mr r3, r28
|
||||
mr r4, r29
|
||||
mr r5, r30
|
||||
stw r23, 0xc(r1)
|
||||
mr r6, r31
|
||||
mr r8, r24
|
||||
mr r7, r25
|
||||
mr r9, r27
|
||||
mr r10, r26
|
||||
bl CDBDatabaseCreateRecordImAtOnce_
|
||||
mr r26, r3
|
||||
bl CDBUnlock
|
||||
mr r3, r26
|
||||
L_814878EC:
|
||||
addi r11, r1, 0x80
|
||||
bl _restgpr_18
|
||||
lwz r0, 0x84(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x80
|
||||
blr
|
||||
#endif
|
||||
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) {
|
||||
u32 gameCodeVal;
|
||||
u32 gameValue;
|
||||
u16 makerCodeVal;
|
||||
u16 makerValue;
|
||||
CDBErr result;
|
||||
OSTime time;
|
||||
OSCalendarTime cal;
|
||||
|
||||
if (!CDBIsGameCodeStr(gameCode)) {
|
||||
return CDB_ERROR_4;
|
||||
}
|
||||
if (!CDBIsMakerCodeStr(makerCode)) {
|
||||
return CDB_ERROR_3;
|
||||
}
|
||||
CDBConvMCStrToMCValue(makerCode, &makerValue);
|
||||
CDBConvGCStrToGCValue(gameCode, &gameValue);
|
||||
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);
|
||||
makerCodeVal = makerValue;
|
||||
gameCodeVal = gameValue;
|
||||
CDBLock();
|
||||
result = CDBDatabaseCreateRecordImAtOnce_(database, record, typeStr, fileTypeStr, time, gameCodeVal, makerCodeVal, recordData, recordDataSize);
|
||||
CDBUnlock();
|
||||
return result;
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize) {
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
// Matching build uses MyTiInputForm.s (C++ Matching breaks DOL SHA1).
|
||||
#define MYTIINPUTFORM_IMPLEMENTATION
|
||||
#include "keyboard/MyTiInputForm.h"
|
||||
#include "keyboard/tiUtil.h"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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