Compare commits
4 Commits
cleanup/ch
...
cleanup/ti
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dda2484afb | ||
|
|
dd3cd80d9b | ||
|
|
3cbe527d23 | ||
|
|
3ab6d87c3d |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.37% | 87.84% | 62.33% | 92.06% |
|
||||
| 99.37% | 87.87% | 62.36% | 92.06% |
|
||||
|
||||
units 919/1027 complete, functions 12220/12563 matched.
|
||||
units 920/1027 complete, functions 12221/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 -->
|
||||
|
||||
@@ -17456,19 +17456,19 @@ __vt__Q49textinput8keyboard13cellphonetype23CellPhoneControlAnmPane = .data:0x81
|
||||
__vt__Q49textinput8keyboard13cellphonetype16CellPhoneAnmPane = .data:0x8165C730; // type:object size:0x28
|
||||
__vt__Q49textinput8keyboard13cellphonetype12EventHandler = .data:0x8165C758; // type:object size:0x20
|
||||
__vt__Q49textinput8keyboard13cellphonetype4Base = .data:0x8165C778; // type:object size:0xA8
|
||||
lbl_8165C820 = .data:0x8165C820; // type:object size:0xE data:string
|
||||
lbl_8165C830 = .data:0x8165C830; // type:object size:0x10 data:string
|
||||
scP_txtScrll_UP = .data:0x8165C820; // type:object size:0xE data:string
|
||||
scP_txtScrll_DOWN = .data:0x8165C830; // type:object size:0x10 data:string
|
||||
lbl_8165C840 = .data:0x8165C840; // type:object size:0x80
|
||||
lbl_8165C8C0 = .data:0x8165C8C0; // type:object size:0xC data:string
|
||||
lbl_8165C8CC = .data:0x8165C8CC; // type:object size:0x11 data:string
|
||||
lbl_8165C8E0 = .data:0x8165C8E0; // type:object size:0xD data:string
|
||||
lbl_8165C8F0 = .data:0x8165C8F0; // type:object size:0x10 data:string
|
||||
lbl_8165C900 = .data:0x8165C900; // type:object size:0x11 data:string
|
||||
lbl_8165C918 = .data:0x8165C918; // type:object size:0x10 data:string
|
||||
lbl_8165C928 = .data:0x8165C928; // type:object size:0x10 data:string
|
||||
lbl_8165C938 = .data:0x8165C938; // type:object size:0x11 data:string
|
||||
lbl_8165C950 = .data:0x8165C950; // type:object size:0x10 data:string
|
||||
lbl_8165C960 = .data:0x8165C960; // type:object size:0x10 data:string
|
||||
scN_JPNUSAEUR = .data:0x8165C8C0; // type:object size:0xC data:string
|
||||
scN_separateBarAll = .data:0x8165C8CC; // type:object size:0x11 data:string
|
||||
scT_2l_TextBox = .data:0x8165C8E0; // type:object size:0xD data:string
|
||||
scT_title_textJPN = .data:0x8165C8F0; // type:object size:0x10 data:string
|
||||
scN_separateBarKOR = .data:0x8165C900; // type:object size:0x11 data:string
|
||||
scT_2l_TextBoxKOR = .data:0x8165C918; // type:object size:0x10 data:string
|
||||
scT_title_textKOR = .data:0x8165C928; // type:object size:0x10 data:string
|
||||
scN_separateBarCHN = .data:0x8165C938; // type:object size:0x11 data:string
|
||||
scT_2l_TextBoxCHN = .data:0x8165C950; // type:object size:0x10 data:string
|
||||
scT_title_textCHN = .data:0x8165C960; // type:object size:0x10 data:string
|
||||
lbl_8165C970 = .data:0x8165C970; // type:object size:0x20 data:2byte
|
||||
jumptable_8165C990 = .data:0x8165C990; // type:object size:0xA0 scope:local
|
||||
jumptable_8165CA30 = .data:0x8165CA30; // type:object size:0x28 scope:local
|
||||
|
||||
@@ -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 {
|
||||
@@ -281,86 +281,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) {
|
||||
|
||||
@@ -139,18 +139,18 @@ extern "C" asm void draw__Q39textinput11nw4rmanager6LayoutFv();
|
||||
extern "C" asm void searchPaneComponent__Q39textinput3gui11PaneManagerFPCc();
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8165C820[];
|
||||
extern "C" const char lbl_8165C830[];
|
||||
extern "C" const char lbl_8165C8C0[];
|
||||
extern "C" const char lbl_8165C8CC[];
|
||||
extern "C" const char lbl_8165C8E0[];
|
||||
extern "C" const char lbl_8165C8F0[];
|
||||
extern "C" const char lbl_8165C900[];
|
||||
extern "C" const char lbl_8165C918[];
|
||||
extern "C" const char lbl_8165C928[];
|
||||
extern "C" const char lbl_8165C938[];
|
||||
extern "C" const char lbl_8165C950[];
|
||||
extern "C" const char lbl_8165C960[];
|
||||
extern "C" const char scP_txtScrll_UP[];
|
||||
extern "C" const char scP_txtScrll_DOWN[];
|
||||
extern "C" const char scN_JPNUSAEUR[];
|
||||
extern "C" const char scN_separateBarAll[];
|
||||
extern "C" const char scT_2l_TextBox[];
|
||||
extern "C" const char scT_title_textJPN[];
|
||||
extern "C" const char scN_separateBarKOR[];
|
||||
extern "C" const char scT_2l_TextBoxKOR[];
|
||||
extern "C" const char scT_title_textKOR[];
|
||||
extern "C" const char scN_separateBarCHN[];
|
||||
extern "C" const char scT_2l_TextBoxCHN[];
|
||||
extern "C" const char scT_title_textCHN[];
|
||||
extern "C" const char lbl_816973A4[];
|
||||
extern "C" const char lbl_816973AC[];
|
||||
#pragma pop
|
||||
@@ -314,7 +314,7 @@ void Base::resetContextPredict_() {
|
||||
|
||||
static GXColor kanaBackground = {128, 255, 128, 255};
|
||||
static GXColor candidateBackground = {255, 210, 12, 255};
|
||||
const char* csScrollButtonAnimationTarget = lbl_8165C820;
|
||||
const char* csScrollButtonAnimationTarget = scP_txtScrll_UP;
|
||||
|
||||
struct InputFormAnimationFile {
|
||||
u32 id;
|
||||
@@ -337,14 +337,14 @@ extern "C" const InputFormAnimationFile csAninationFile__Q29textinput9inputform[
|
||||
#pragma section data_type ".rodata"
|
||||
extern "C" const VisiblePanes csVisiblePaneUEJ__Q29textinput9inputform = {
|
||||
1, 2,
|
||||
{lbl_8165C8C0, NULL, NULL, NULL},
|
||||
{scN_JPNUSAEUR, NULL, NULL, NULL},
|
||||
{"N_KOR", "N_CHN", NULL, NULL},
|
||||
};
|
||||
|
||||
extern "C" const VisiblePanes csVisiblePaneKOR__Q29textinput9inputform = {
|
||||
1, 2,
|
||||
{"N_KOR", NULL, NULL, NULL},
|
||||
{"N_CHN", lbl_8165C8C0, NULL, NULL},
|
||||
{"N_CHN", scN_JPNUSAEUR, NULL, NULL},
|
||||
};
|
||||
|
||||
extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
|
||||
@@ -354,7 +354,7 @@ extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
|
||||
0,
|
||||
0,
|
||||
"N_KOR",
|
||||
lbl_8165C8C0,
|
||||
scN_JPNUSAEUR,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
@@ -362,23 +362,23 @@ extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
|
||||
|
||||
extern "C" const LanguagePaneData csLanguageDependencyDataUEJ__Q29textinput9inputform = {
|
||||
&csVisiblePaneUEJ__Q29textinput9inputform,
|
||||
lbl_8165C8CC,
|
||||
lbl_8165C8E0,
|
||||
lbl_8165C8F0,
|
||||
scN_separateBarAll,
|
||||
scT_2l_TextBox,
|
||||
scT_title_textJPN,
|
||||
};
|
||||
|
||||
extern "C" const LanguagePaneData csLanguageDependencyDataKOR__Q29textinput9inputform = {
|
||||
&csVisiblePaneKOR__Q29textinput9inputform,
|
||||
lbl_8165C900,
|
||||
lbl_8165C918,
|
||||
lbl_8165C928,
|
||||
scN_separateBarKOR,
|
||||
scT_2l_TextBoxKOR,
|
||||
scT_title_textKOR,
|
||||
};
|
||||
|
||||
extern "C" const LanguagePaneData csLanguageDependencyDataCHN__Q29textinput9inputform = {
|
||||
reinterpret_cast<const VisiblePanes*>(csVisiblePaneCHN__Q29textinput9inputform),
|
||||
lbl_8165C938,
|
||||
lbl_8165C950,
|
||||
lbl_8165C960,
|
||||
scN_separateBarCHN,
|
||||
scT_2l_TextBoxCHN,
|
||||
scT_title_textCHN,
|
||||
};
|
||||
#pragma section data_type ".data"
|
||||
|
||||
@@ -417,8 +417,8 @@ bool mbHyphen = true;
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8165C820[] = "P_txtScrll_UP";
|
||||
extern "C" const char lbl_8165C830[] = "P_txtScrll_DOWN";
|
||||
extern "C" const char scP_txtScrll_UP[] = "P_txtScrll_UP";
|
||||
extern "C" const char scP_txtScrll_DOWN[] = "P_txtScrll_DOWN";
|
||||
struct ButtonAnimations {
|
||||
KeyType type;
|
||||
const char* paneName;
|
||||
@@ -428,27 +428,27 @@ struct ButtonAnimations {
|
||||
};
|
||||
|
||||
const ButtonAnimations csButtonAnimations[] = {
|
||||
{KT_NormalButton, lbl_8165C820, 8, NULL, {
|
||||
{KT_NormalButton, scP_txtScrll_UP, 8, NULL, {
|
||||
&csAninationFile__Q29textinput9inputform[0], &csAninationFile__Q29textinput9inputform[1],
|
||||
&csAninationFile__Q29textinput9inputform[2], &csAninationFile__Q29textinput9inputform[3],
|
||||
&csAninationFile__Q29textinput9inputform[4], &csAninationFile__Q29textinput9inputform[5],
|
||||
&csAninationFile__Q29textinput9inputform[6], &csAninationFile__Q29textinput9inputform[7]}},
|
||||
{KT_NormalButton, lbl_8165C830, 8, csScrollButtonAnimationTarget, {
|
||||
{KT_NormalButton, scP_txtScrll_DOWN, 8, csScrollButtonAnimationTarget, {
|
||||
&csAninationFile__Q29textinput9inputform[0], &csAninationFile__Q29textinput9inputform[1],
|
||||
&csAninationFile__Q29textinput9inputform[2], &csAninationFile__Q29textinput9inputform[3],
|
||||
&csAninationFile__Q29textinput9inputform[4], &csAninationFile__Q29textinput9inputform[5],
|
||||
&csAninationFile__Q29textinput9inputform[6], &csAninationFile__Q29textinput9inputform[7]}}
|
||||
};
|
||||
extern "C" const char lbl_8165C8C0[] = "N_JPNUSAEUR";
|
||||
extern "C" const char lbl_8165C8CC[] = "N_separateBarAll";
|
||||
extern "C" const char lbl_8165C8E0[] = "T_2l_TextBox";
|
||||
extern "C" const char lbl_8165C8F0[] = "T_title_textJPN";
|
||||
extern "C" const char lbl_8165C900[] = "N_separateBarKOR";
|
||||
extern "C" const char lbl_8165C918[] = "T_2l_TextBoxKOR";
|
||||
extern "C" const char lbl_8165C928[] = "T_title_textKOR";
|
||||
extern "C" const char lbl_8165C938[] = "N_separateBarCHN";
|
||||
extern "C" const char lbl_8165C950[] = "T_2l_TextBoxCHN";
|
||||
extern "C" const char lbl_8165C960[] = "T_title_textCHN";
|
||||
extern "C" const char scN_JPNUSAEUR[] = "N_JPNUSAEUR";
|
||||
extern "C" const char scN_separateBarAll[] = "N_separateBarAll";
|
||||
extern "C" const char scT_2l_TextBox[] = "T_2l_TextBox";
|
||||
extern "C" const char scT_title_textJPN[] = "T_title_textJPN";
|
||||
extern "C" const char scN_separateBarKOR[] = "N_separateBarKOR";
|
||||
extern "C" const char scT_2l_TextBoxKOR[] = "T_2l_TextBoxKOR";
|
||||
extern "C" const char scT_title_textKOR[] = "T_title_textKOR";
|
||||
extern "C" const char scN_separateBarCHN[] = "N_separateBarCHN";
|
||||
extern "C" const char scT_2l_TextBoxCHN[] = "T_2l_TextBoxCHN";
|
||||
extern "C" const char scT_title_textCHN[] = "T_title_textCHN";
|
||||
bool DeadKeyStream::sbCompatibleFilterEnabled = true;
|
||||
|
||||
inline bool DeadKeyStream::isCompatible(wchar_t character) {
|
||||
|
||||
Reference in New Issue
Block a user