Compare commits
17 Commits
cleanup/ip
...
agent/bitt
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a371d4842f | ||
|
|
7a24a5c17e | ||
|
|
37c7c21953 | ||
|
|
a81b7c36fe | ||
|
|
d17ab22bf0 | ||
|
|
17407ed1cb | ||
|
|
199883f758 | ||
|
|
edfb253724 | ||
|
|
c8bb9f44da | ||
|
|
0d75b24a96 | ||
|
|
262996a0de | ||
|
|
f095c9ea12 | ||
|
|
f410332140 | ||
|
|
fed31b69b6 | ||
|
|
5ac1f65c4a | ||
|
|
d9fbf88fb8 | ||
|
|
a77ce293ce |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.38% | 88.00% | 62.37% | 92.07% |
|
||||
| 99.38% | 88.05% | 62.52% | 92.07% |
|
||||
|
||||
units 920/1027 complete, functions 12226/12563 matched.
|
||||
units 921/1027 complete, functions 12229/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 -->
|
||||
|
||||
@@ -688,13 +688,13 @@ src/scene/memoryCard/iplMemoryCard.cpp:
|
||||
.text start:0x813C9DCC end:0x813CC1FC
|
||||
.rodata start:0x81610368 end:0x81610480
|
||||
.data start:0x81651D30 end:0x81652640
|
||||
.sdata2 start:0x81694A68 end:0x81694A80
|
||||
.sdata2 start:0x81694A68 end:0x81694A78
|
||||
.sdata start:0x81696C78 end:0x81696CA0
|
||||
|
||||
src/scene/memoryCard/iplMemoryCardBase.cpp:
|
||||
.text start:0x813CC1FC end:0x813CD034
|
||||
.data start:0x81652640 end:0x816526D0
|
||||
.sdata2 start:0x81694A80 end:0x81694A88
|
||||
.sdata2 start:0x81694A78 end:0x81694A88
|
||||
|
||||
src/scene/memoryCard/iplMemoryCardManager.cpp:
|
||||
.text start:0x813CD034 end:0x813CE548
|
||||
|
||||
@@ -22275,8 +22275,8 @@ lbl_81697394 = .sdata:0x81697394; // type:object size:0x4 data:wstring
|
||||
lbl_81697398 = .sdata:0x81697398; // type:object size:0x4
|
||||
lbl_8169739C = .sdata:0x8169739C; // type:object size:0x4
|
||||
lbl_816973A0 = .sdata:0x816973A0; // type:object size:0x4 data:4byte
|
||||
lbl_816973A4 = .sdata:0x816973A4; // type:object size:0x6 data:string
|
||||
lbl_816973AC = .sdata:0x816973AC; // type:object size:0x6 data:string
|
||||
scN_KOR = .sdata:0x816973A4; // type:object size:0x6 data:string
|
||||
scN_CHN = .sdata:0x816973AC; // type:object size:0x6 data:string
|
||||
sbCompatibleFilterEnabled__Q39textinput9inputform13DeadKeyStream = .sdata:0x816973B2; // type:object size:0x1 data:byte
|
||||
mbHyphen__Q29textinput9inputform = .sdata:0x816973B3; // type:object size:0x1 data:byte
|
||||
lbl_816973B4 = .sdata:0x816973B4; // type:object size:0x4
|
||||
|
||||
@@ -934,7 +934,7 @@ config.libs = [
|
||||
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiHKBManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiHwKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiHwKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiLayout.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiLayoutGather.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiKoreanInput.cpp", extra_cflags=["-O4,p"]), # for 4.3K
|
||||
|
||||
@@ -162,14 +162,14 @@ namespace ipl {
|
||||
class {
|
||||
public:
|
||||
void init() {
|
||||
unk_0x0C = -1;
|
||||
mAngleIdx = -1;
|
||||
pos.x = 0.0f;
|
||||
pos.y = 0.0f;
|
||||
}
|
||||
|
||||
math::VEC2 pos; // pos
|
||||
int unk_0x08;
|
||||
int unk_0x0C;
|
||||
int mStep;
|
||||
int mAngleIdx;
|
||||
} mStandData; // 0xE4
|
||||
|
||||
picture mPicture; // 0xF4
|
||||
|
||||
@@ -309,8 +309,8 @@ namespace ipl {
|
||||
return mbArrowVisible[i];
|
||||
}
|
||||
|
||||
void setUnk_0x105(bool flag) {
|
||||
unk_0x105 = flag;
|
||||
void setSuppressNewMailAnm(bool flag) {
|
||||
mbSuppressNewMailAnm = flag;
|
||||
}
|
||||
|
||||
protected:
|
||||
@@ -354,7 +354,7 @@ namespace ipl {
|
||||
ANIM_MAX,
|
||||
};
|
||||
|
||||
int unk_0x54;
|
||||
int mAnimWait;
|
||||
|
||||
layout::Object* mpLayout; // 0x58
|
||||
nand::LayoutFile* mpLayoutFile; // 0x5C
|
||||
@@ -373,8 +373,8 @@ namespace ipl {
|
||||
|
||||
BOOL mbHovered[BTN_MAX]; // 0xD8
|
||||
|
||||
bool unk_0x104;
|
||||
bool unk_0x105;
|
||||
bool mbNewMailAnm;
|
||||
bool mbSuppressNewMailAnm;
|
||||
|
||||
utility::timer mTimer; // 0x108
|
||||
bool mbEnabled; // 0x110
|
||||
|
||||
@@ -95,9 +95,9 @@ namespace ipl {
|
||||
|
||||
public:
|
||||
nw4r::ut::List mDateList; // 0x84
|
||||
nw4r::ut::List unk_0x90;
|
||||
nw4r::ut::List mDrawList;
|
||||
bool mbScrolling; // 0x9C
|
||||
vBOOL unk_0xA0;
|
||||
vBOOL mbSearchTaskRunning;
|
||||
BOOL mbTaskCanceled; // 0xA4
|
||||
vBOOL mbBackToBoardAlt; // 0xA8
|
||||
bool mbAsian; // 0xAC
|
||||
|
||||
@@ -68,8 +68,8 @@ namespace ipl {
|
||||
vBOOL mbAppearMsg; // 0x0C
|
||||
|
||||
private:
|
||||
u32 unk_0x10;
|
||||
int unk_0x14;
|
||||
u32 mFocusState;
|
||||
int mPendingFocusCmd;
|
||||
layout::Object* mpLayout; // 0x18
|
||||
gui::PaneManager* mpGui; // 0x1C
|
||||
layout::PaneAnimator* mpCurrentPaneAnim; // 0x20
|
||||
@@ -77,7 +77,7 @@ namespace ipl {
|
||||
|
||||
public:
|
||||
utility::Date* mpDate; // 0x38
|
||||
u32 unk_0x3C;
|
||||
u32 mPointCount;
|
||||
|
||||
static const char* mscAnimPanes[ANIM_PANE_MAX];
|
||||
|
||||
|
||||
@@ -152,7 +152,7 @@ namespace ipl {
|
||||
BOOL is_working();
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
void requestCancel() { unk_0x04 = true; }
|
||||
void requestCancel() { mbCancel = true; }
|
||||
#endif
|
||||
|
||||
WIISaveBannerFile* get_cached_nand_save_banner(ESTitleId titleId);
|
||||
@@ -531,7 +531,7 @@ namespace ipl {
|
||||
static void wad_backup_progress_callback(u32 completed, u32 total, BOOL done);
|
||||
|
||||
Work* myWork; // 0x00
|
||||
bool unk_0x04; // 0x04
|
||||
bool mbCancel; // 0x04
|
||||
|
||||
static const char* c_banner_file_name;
|
||||
static const char* c_nocopy_folder_name;
|
||||
|
||||
@@ -215,9 +215,9 @@ struct __zi8_work_data_s {
|
||||
ziU32 unk_0x0C;
|
||||
ziU32 unk_0x10;
|
||||
ziU16 unk_0x14;
|
||||
ziU8 unk_0x16;
|
||||
ziU8 cangjieEnabled; // 0x16
|
||||
ziU8 unk_0x17;
|
||||
ziU8 unk_0x18;
|
||||
ziU8 subLanguage; // 0x18
|
||||
ziU8 unk_0x19;
|
||||
ziU16 unk_0x1A;
|
||||
ziU8 unk_0x1C[3];
|
||||
@@ -258,7 +258,7 @@ struct __zi8_work_data_s {
|
||||
ziU8 unk_0x330[8];
|
||||
ziU32 unk_0x338;
|
||||
ziU8 unk_0x33C[0x1FC];
|
||||
ziU8 unk_0x538;
|
||||
ziU8 language; // 0x538
|
||||
ziU8 unk_0x539;
|
||||
ziU8 unk_0x53A[0x40];
|
||||
ziWChar unk_0x57A[0x641];
|
||||
|
||||
@@ -55,7 +55,7 @@ ziU32 Zi8GetTableData(ziU8 lang, ziU8 tableIdx, ziU8 memberId ZI_NEED_WORK) {
|
||||
if (langIdx-- != 0) {
|
||||
tableData = ZI_WORK->langEntries[langIdx].tableData;
|
||||
if ((lang == ZI8_LANG_ZH) && (tableData[3] >= 4) &&
|
||||
((ZI_WORK->unk_0x18 == 1) || (ZI_WORK->unk_0x18 == 0x80) || (ZI_WORK->unk_0x18 == 0x40))) {
|
||||
((ZI_WORK->subLanguage == 1) || (ZI_WORK->subLanguage == 0x80) || (ZI_WORK->subLanguage == 0x40))) {
|
||||
offset = ((tableData[0x8B] << 0x10) + (tableData[0x8C] << 8) + tableData[0x8D]);
|
||||
if (offset != 0) {
|
||||
tableData += offset;
|
||||
|
||||
@@ -430,7 +430,7 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
|
||||
if (getMode != 7 && getMode != 10 && getMode != 8 && getMode != 9) {
|
||||
Zi8PrepareMatch(request, &match, 0, work);
|
||||
} else {
|
||||
if (!((struct __zi8_work_data_s*)work)->unk_0x16 || request->elementCount > 6) {
|
||||
if (!((struct __zi8_work_data_s*)work)->cangjieEnabled || request->elementCount > 6) {
|
||||
resultFallback = 0;
|
||||
goto engine_finish;
|
||||
}
|
||||
@@ -1151,7 +1151,7 @@ context_word_lookup:
|
||||
if (ordinalIndex == 0xFFFF) goto context_results_done;
|
||||
record = records + ordinalIndex * 12;
|
||||
phoneticGroups = phraseTable + ((record[9] & 15) << 16 | (record[11] | record[10] << 8));
|
||||
if (((struct __zi8_work_data_s*)work)->unk_0x16) {
|
||||
if (((struct __zi8_work_data_s*)work)->cangjieEnabled) {
|
||||
switch (phoneticGroups[0] & 7) {
|
||||
case 2: phoneticGroups += 2; break;
|
||||
case 3: case 4: phoneticGroups += 3; break;
|
||||
@@ -1965,7 +1965,7 @@ component_retry:
|
||||
((ZiChineseWork*)work)->duplicateOrdinals[((ZiChineseWork*)work)->duplicateIndex] = ordinalIndex;
|
||||
relatedRecord = records + ordinalIndex * 12;
|
||||
phoneticGroups = phraseTable + ((relatedRecord[9] & 15) << 16 | (relatedRecord[11] | relatedRecord[10] << 8));
|
||||
if (((struct __zi8_work_data_s*)work)->unk_0x16) {
|
||||
if (((struct __zi8_work_data_s*)work)->cangjieEnabled) {
|
||||
switch (phoneticGroups[0] & 7) {
|
||||
case 2: phoneticGroups += 2; break;
|
||||
case 3: case 4: phoneticGroups += 3; break;
|
||||
|
||||
@@ -164,7 +164,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
||||
parameters->letters = length;
|
||||
if ((parameters->getOptions & 0x80) == 0) {
|
||||
ZI_WORK->unk_0x538 = parameters->language;
|
||||
ZI_WORK->language = parameters->language;
|
||||
parameters->candidates[0] = 0xfff0;
|
||||
output = (ziWChar*)&ZI_WORK->unk_0x338;
|
||||
}
|
||||
@@ -490,8 +490,8 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
ZI_WORK->unk_0x00 = '\0';
|
||||
}
|
||||
}
|
||||
ZI_WORK->unk_0x18 = parameters->subLanguage;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1,ZI_WORK) & 2;
|
||||
ZI_WORK->subLanguage = parameters->subLanguage;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1,ZI_WORK) & 2;
|
||||
options->maxCount = ZI_WORK->unk_0x10;
|
||||
options->maxWordLength = ZI_WORK->unk_0x0A;
|
||||
ZI_WORK->unk_0x0A = -1;
|
||||
@@ -558,7 +558,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
}
|
||||
else if ((parameters->language == 1) &&
|
||||
((((parameters->getMode == 7 || (parameters->getMode == 8)) || (parameters->getMode == 10)) || (parameters->getMode == 9)))) {
|
||||
if (ZI_WORK->unk_0x16 != '\0') {
|
||||
if (ZI_WORK->cangjieEnabled != '\0') {
|
||||
candidateCount = Zi8GetChineseCandidates(parameters,options,ZI_WORK);
|
||||
} else {
|
||||
error = 0x708;
|
||||
@@ -582,7 +582,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
}
|
||||
}
|
||||
else {
|
||||
ZI_WORK->unk_0x538 = parameters->language;
|
||||
ZI_WORK->language = parameters->language;
|
||||
if ((parameters->getOptions & 0x80) == 0) {
|
||||
saved.restoreCandidates = 1;
|
||||
saved.savedOptions = parameters->getOptions;
|
||||
|
||||
@@ -42,13 +42,13 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
return 0;
|
||||
}
|
||||
ZI_WORK->unk_0x1874 = 0x2D;
|
||||
ZI_WORK->unk_0x538 = 0;
|
||||
ZI_WORK->language = 0;
|
||||
ZI_WORK->unk_0x1C[3] = 0;
|
||||
ZI_WORK->unk_0x141A = 0x100;
|
||||
Zi8SetLatinSearchOrder(0, 0, ZI_WORK);
|
||||
ZADP_Zi8SetPDremoveOpt(1, ZI_WORK);
|
||||
ZI_WORK->unk_0x17 = 5;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, ZI_WORK) & 2;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, ZI_WORK) & 2;
|
||||
ZI_WORK->unk_0x1B28.bits.msb = 1;
|
||||
ZI_WORK->unk_0x1B2C.bits.msb = 1;
|
||||
zyFuzzy = ZI_WORK->unk_0x1B2C.word;
|
||||
|
||||
@@ -24,17 +24,17 @@ ziU8 Zi8GetZHCharSet(ziPtr workData) {
|
||||
return 0;
|
||||
}
|
||||
if (Zi8GetTableCount(1, 10, workData) != 0) {
|
||||
bak = ((struct __zi8_work_data_s*)workData)->unk_0x18;
|
||||
((struct __zi8_work_data_s*)workData)->unk_0x18 = 1;
|
||||
bak = ((struct __zi8_work_data_s*)workData)->subLanguage;
|
||||
((struct __zi8_work_data_s*)workData)->subLanguage = 1;
|
||||
addr = Zi8GetTableAddress(1, 10, workData);
|
||||
p = (ziU8*)addr;
|
||||
v0 = (ziU16)((ziU16)p[0] | ((ziU16)p[1] << 8));
|
||||
((struct __zi8_work_data_s*)workData)->unk_0x18 = 0;
|
||||
((struct __zi8_work_data_s*)workData)->subLanguage = 0;
|
||||
addr = Zi8GetTableAddress(1, 10, workData);
|
||||
p = (ziU8*)addr;
|
||||
v1 = (ziU16)((ziU16)p[2] | ((ziU16)p[3] << 8));
|
||||
v2 = (ziU16)((ziU16)p[4] | ((ziU16)p[5] << 8));
|
||||
((struct __zi8_work_data_s*)workData)->unk_0x18 = bak;
|
||||
((struct __zi8_work_data_s*)workData)->subLanguage = bak;
|
||||
if (v0 != 0) {
|
||||
if (v0 > 0x4E20) {
|
||||
charSet |= 8;
|
||||
|
||||
@@ -139,7 +139,7 @@ ziU32 Zi8SecMatchChar(ziPtr nodeAddress, ziU8* dictionaryAddress, ziMatchParam*
|
||||
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, ZI_WORK);
|
||||
data += ((ziU8*)nodeAddress)[0xB] + (((ziU8*)nodeAddress)[0xA] << 8) + ((((ziU8*)nodeAddress)[9] & 0xF) << 16);
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
if (ZI_WORK->cangjieEnabled != 0) {
|
||||
switch (data[0] & 7) {
|
||||
case 2:
|
||||
data += 2;
|
||||
@@ -346,7 +346,7 @@ match_code:
|
||||
traversal.soundIndex = initialCode;
|
||||
}
|
||||
sound = (ziU8*)(tableAddress + ((node[9] & 0xF) * 0x10000 + (node[0xB] + node[0xA] * 0x100)));
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
if (ZI_WORK->cangjieEnabled != 0) {
|
||||
switch (sound[0] & 7) {
|
||||
case 2:
|
||||
sound += 2;
|
||||
|
||||
@@ -37,7 +37,7 @@ ziU16 Zi8Uni2Ptr(ziU16 ch, ziE12* buf ZI_NEED_WORK) {
|
||||
p = (ziU8*)(table2 +
|
||||
(((e[9] & 0xF) << 16) |
|
||||
(e[0xB] | (e[0xA] << 8))));
|
||||
if (WORKP->unk_0x16 != 0) {
|
||||
if (WORKP->cangjieEnabled != 0) {
|
||||
switch (p[0] & 7) {
|
||||
case 2:
|
||||
p += 2;
|
||||
@@ -65,7 +65,7 @@ ziU16 Zi8Uni2Ptr(ziU16 ch, ziE12* buf ZI_NEED_WORK) {
|
||||
}
|
||||
}
|
||||
e = (ziU8*)table;
|
||||
if (WORKP->unk_0x1B18 != ZI8_NULL && WORKP->unk_0x1B24 == WORKP->unk_0x18) {
|
||||
if (WORKP->unk_0x1B18 != ZI8_NULL && WORKP->unk_0x1B24 == WORKP->subLanguage) {
|
||||
if ((ziU16)ch >= WORKP->unk_0x1B1C && (ziU16)ch <= WORKP->unk_0x1B1E) {
|
||||
i = (ziU16)(ch - WORKP->unk_0x1B1C);
|
||||
goto map;
|
||||
|
||||
@@ -103,10 +103,10 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
if (length == 1) return 1;
|
||||
count = --length;
|
||||
ordinals[count] |= 0x8000;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
|
||||
entry = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data) + ordinals[0];
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
if (ZI_WORK->cangjieEnabled != 0) {
|
||||
switch (*data & 7) {
|
||||
case 2:
|
||||
offset = 2;
|
||||
|
||||
@@ -19,7 +19,7 @@ typedef struct CXUncompContextRL {
|
||||
u8* outData; // 0x00
|
||||
int outDataLen; // 0x04
|
||||
u32 size; // 0x08
|
||||
u16 unk_0x0C; // 0x0C
|
||||
u16 length; // 0x0C
|
||||
u8 unk_0x0e; // 0x0E
|
||||
u8 unk_0x0f; // 0x0F
|
||||
} CXUncompContextRL;
|
||||
@@ -28,7 +28,7 @@ typedef struct CXUncompContextLZ {
|
||||
u8* outData; // 0x00
|
||||
int outDataLen; // 0x04
|
||||
u32 size; // 0x08
|
||||
int unk_0x0C; // 0x0C
|
||||
int length; // 0x0C
|
||||
u8 unk_0x10; // 0x10
|
||||
u8 unk_0x11; // 0x11
|
||||
u8 unk_0x12; // 0x12
|
||||
|
||||
@@ -8,7 +8,7 @@ void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
|
||||
context->outData = data;
|
||||
context->outDataLen = 0;
|
||||
context->unk_0x0e = 0;
|
||||
context->unk_0x0C = 0;
|
||||
context->length = 0;
|
||||
context->unk_0x0f = 8;
|
||||
context->size = 0;
|
||||
}
|
||||
@@ -18,7 +18,7 @@ void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data) {
|
||||
context->outDataLen = 0;
|
||||
context->unk_0x11 = 0;
|
||||
context->unk_0x12 = 0;
|
||||
context->unk_0x0C = 0;
|
||||
context->length = 0;
|
||||
context->unk_0x10 = 3;
|
||||
context->unk_0x13 = 8;
|
||||
context->unk_0x14 = 0;
|
||||
@@ -66,10 +66,10 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
|
||||
while (context->outDataLen > 0) {
|
||||
if (!(context->unk_0x0e & 0x80)) {
|
||||
while (context->unk_0x0C) {
|
||||
while (context->length) {
|
||||
*context->outData++ = *pSrc++;
|
||||
|
||||
context->unk_0x0C--;
|
||||
context->length--;
|
||||
context->outDataLen--;
|
||||
size--;
|
||||
|
||||
@@ -77,14 +77,14 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
return context->outDataLen;
|
||||
}
|
||||
}
|
||||
} else if (context->unk_0x0C) {
|
||||
} else if (context->length) {
|
||||
u8 b = *pSrc++;
|
||||
size--;
|
||||
|
||||
while (context->unk_0x0C) {
|
||||
while (context->length) {
|
||||
*context->outData++ = b;
|
||||
|
||||
context->unk_0x0C--;
|
||||
context->length--;
|
||||
context->outDataLen--;
|
||||
}
|
||||
|
||||
@@ -95,20 +95,20 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
|
||||
context->unk_0x0e = *pSrc++;
|
||||
size--;
|
||||
context->unk_0x0C = context->unk_0x0e & 0x7f;
|
||||
context->length = context->unk_0x0e & 0x7f;
|
||||
|
||||
if (context->unk_0x0e & 0x80) {
|
||||
context->unk_0x0C += 3;
|
||||
context->length += 3;
|
||||
} else {
|
||||
context->unk_0x0C += 1;
|
||||
context->length += 1;
|
||||
}
|
||||
|
||||
if (context->unk_0x0C > context->outDataLen) {
|
||||
if (context->length > context->outDataLen) {
|
||||
if (!context->size) {
|
||||
return CX_STREAMING_ERR_BAD_FILE_SIZE;
|
||||
}
|
||||
|
||||
context->unk_0x0C = context->outDataLen;
|
||||
context->length = context->outDataLen;
|
||||
}
|
||||
|
||||
if (size) {
|
||||
@@ -205,34 +205,34 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
|
||||
context->unk_0x10--;
|
||||
|
||||
if (!context->unk_0x14) {
|
||||
context->unk_0x0C = *pSrc++;
|
||||
context->unk_0x0C += 0x30;
|
||||
context->length = *pSrc++;
|
||||
context->length += 0x30;
|
||||
context->unk_0x10 = 0;
|
||||
} else {
|
||||
switch (context->unk_0x10) {
|
||||
case 2: {
|
||||
context->unk_0x0C = *pSrc++;
|
||||
context->length = *pSrc++;
|
||||
|
||||
if (context->unk_0x0C >> 4 == 1) {
|
||||
context->unk_0x0C = (context->unk_0x0C & 0x0F) << 16;
|
||||
context->unk_0x0C += 0x1110;
|
||||
} else if (context->unk_0x0C >> 4 == 0) {
|
||||
context->unk_0x0C = (context->unk_0x0C & 0x0F) << 8;
|
||||
context->unk_0x0C += 0x110;
|
||||
if (context->length >> 4 == 1) {
|
||||
context->length = (context->length & 0x0F) << 16;
|
||||
context->length += 0x1110;
|
||||
} else if (context->length >> 4 == 0) {
|
||||
context->length = (context->length & 0x0F) << 8;
|
||||
context->length += 0x110;
|
||||
context->unk_0x10 = 1;
|
||||
} else {
|
||||
context->unk_0x0C += 0x10;
|
||||
context->length += 0x10;
|
||||
context->unk_0x10 = 0;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
context->unk_0x0C += *pSrc++ << 8;
|
||||
context->length += *pSrc++ << 8;
|
||||
break;
|
||||
}
|
||||
case 0: {
|
||||
context->unk_0x0C += *pSrc++;
|
||||
context->length += *pSrc++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -244,26 +244,26 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
|
||||
}
|
||||
}
|
||||
|
||||
a = (context->unk_0x0C & 0x0F) << 8;
|
||||
context->unk_0x0C >>= 4;
|
||||
a = (context->length & 0x0F) << 8;
|
||||
context->length >>= 4;
|
||||
|
||||
a = (a | *pSrc++) + 1;
|
||||
size--;
|
||||
context->unk_0x10 = 3;
|
||||
|
||||
if (context->unk_0x0C > context->outDataLen) {
|
||||
if (context->length > context->outDataLen) {
|
||||
if (!context->size) {
|
||||
return CX_STREAMING_ERR_BAD_FILE_SIZE;
|
||||
}
|
||||
|
||||
context->unk_0x0C = context->outDataLen;
|
||||
context->length = context->outDataLen;
|
||||
}
|
||||
|
||||
while (context->unk_0x0C > 0) {
|
||||
while (context->length > 0) {
|
||||
*context->outData = context->outData[-a];
|
||||
context->outData++;
|
||||
context->outDataLen--;
|
||||
context->unk_0x0C--;
|
||||
context->length--;
|
||||
}
|
||||
|
||||
there:
|
||||
|
||||
@@ -44,8 +44,8 @@ typedef struct NWC24MsgObjPrivate {
|
||||
#else
|
||||
NWC24UserId fromId; // 0x20
|
||||
#endif
|
||||
u32 unk_0x28;
|
||||
u32 unk_0x2C;
|
||||
u32 date; // 0x28
|
||||
u32 receivedDate; // 0x2C
|
||||
NWC24Data unk_0x30;
|
||||
NWC24Data unk_0x38;
|
||||
NWC24Data subject; // 0x40
|
||||
|
||||
@@ -783,7 +783,7 @@ static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* ms
|
||||
continue;
|
||||
}
|
||||
if (msg->unk_0x1C != 0 && entry->crc == msg->unk_0x1C && entry->type == msg->type && entry->length == msg->length &&
|
||||
entry->flags == msg->unk_0x10 && (s32)entry->date == (s32)msg->unk_0x28) {
|
||||
entry->flags == msg->unk_0x10 && (s32)entry->date == (s32)msg->date) {
|
||||
duplicateId = entry->msgId;
|
||||
duplicateOffset = offset;
|
||||
continue;
|
||||
@@ -962,8 +962,8 @@ static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entr
|
||||
entry->crc = msg->unk_0x1C;
|
||||
entry->fromIdHigh = msg->fromIdHigh;
|
||||
entry->fromIdLow = msg->fromIdLow;
|
||||
entry->date = msg->unk_0x28;
|
||||
entry->receivedDate = msg->unk_0x2C;
|
||||
entry->date = msg->date;
|
||||
entry->receivedDate = msg->receivedDate;
|
||||
entry->numTo = msg->numTo;
|
||||
entry->numAttached = msg->numAttached;
|
||||
entry->groupId = msg->groupId;
|
||||
@@ -1009,8 +1009,8 @@ static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* ms
|
||||
msg->unk_0x1C = entry->crc;
|
||||
msg->fromIdHigh = entry->fromIdHigh;
|
||||
msg->fromIdLow = entry->fromIdLow;
|
||||
msg->unk_0x28 = entry->date;
|
||||
msg->unk_0x2C = entry->receivedDate;
|
||||
msg->date = entry->date;
|
||||
msg->receivedDate = entry->receivedDate;
|
||||
msg->numTo = entry->numTo;
|
||||
msg->numAttached = entry->numAttached;
|
||||
msg->groupId = entry->groupId;
|
||||
|
||||
@@ -158,7 +158,7 @@ static inline NWC24Err WriteMessageIdField(NWC24MsgObjPrivate* msg) {
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_strcpy(buffer, "Message-Id: <");
|
||||
Mail_memset(idText, 0, 32);
|
||||
Mail_sprintf(idText, "%05X%08X%08X%08X", msg->msgId, (u32)(myId >> 32), (u32)myId, msg->unk_0x28);
|
||||
Mail_sprintf(idText, "%05X%08X%08X%08X", msg->msgId, (u32)(myId >> 32), (u32)myId, msg->date);
|
||||
Mail_strcat(buffer, idText);
|
||||
Mail_strcat(buffer, domain);
|
||||
Mail_strcat(buffer, ">\r\n");
|
||||
@@ -312,7 +312,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
}
|
||||
CHECK_WRITE(WriteExtraFields(msg));
|
||||
Mail_memset(MultiPartDivider, 0, 40);
|
||||
Mail_sprintf(MultiPartDivider, "Boundary-NWC24-%08X%05X", msg->unk_0x28, msg->msgId);
|
||||
Mail_sprintf(MultiPartDivider, "Boundary-NWC24-%08X%05X", msg->date, msg->msgId);
|
||||
buffer = NWC24WorkP->stringWork;
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_strcpy(buffer, "MIME-Version: 1.0\r\n");
|
||||
@@ -654,9 +654,9 @@ static NWC24Err WriteDateField(NWC24MsgObjPrivate* msg) {
|
||||
date.sec = calendar.sec;
|
||||
if (date.month > 12)
|
||||
return NWC24_ERR_FORMAT;
|
||||
NWC24iDateToMinutes(&msg->unk_0x28, &date);
|
||||
NWC24iDateToMinutes(&msg->date, &date);
|
||||
if (msg->type & 0x1000000)
|
||||
NWC24iMinutesToDate(&date, msg->unk_0x2C);
|
||||
NWC24iMinutesToDate(&date, msg->receivedDate);
|
||||
buffer = NWC24WorkP->stringWork;
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_sprintf(buffer, "Date: %02d %s %d %02d:%02d:%02d -0000\r\n", date.day, months[date.month - 1], date.year, date.hour, date.min, date.sec);
|
||||
|
||||
@@ -46,9 +46,9 @@ NWC24Err NWC24InitMsgObj(NWC24MsgObj* msg, NWC24MsgType type) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
|
||||
msgObj->unk_0x28 = 0;
|
||||
msgObj->date = 0;
|
||||
msgObj->type |= 0x200000;
|
||||
msgObj->unk_0x2C = 0;
|
||||
msgObj->receivedDate = 0;
|
||||
|
||||
NWC24GetMyUserId(&msgObj->fromId);
|
||||
msgObj->numTo = 0;
|
||||
@@ -477,7 +477,7 @@ NWC24Err NWC24GetMsgFromId(const NWC24MsgObj* msg, NWC24UserId* fromId) {
|
||||
NWC24Err NWC24GetMsgDate(const NWC24MsgObj* msg, OSCalendarTime* msgDate) {
|
||||
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
|
||||
|
||||
NWC24iMinutesToOSCalendarTime(msgDate, msgObj->unk_0x28);
|
||||
NWC24iMinutesToOSCalendarTime(msgDate, msgObj->date);
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
|
||||
@@ -258,11 +258,17 @@ char* SOInetNtoA(SOInAddr address) {
|
||||
|
||||
int SOInetPtoN(int family, const char* text, void* address) {
|
||||
s32 rm;
|
||||
int temporary,result,size,bytes;
|
||||
int temporary;
|
||||
int size;
|
||||
int result;
|
||||
int bytes;
|
||||
InetRequest* request;
|
||||
if((result=SOiPrepareTempRm(NULL,&rm,&temporary))==0) {
|
||||
bytes=0;
|
||||
if(family==2) bytes=4;
|
||||
switch (family) {
|
||||
case 2: bytes=4; break;
|
||||
default: break;
|
||||
}
|
||||
if(!bytes) result=-5;
|
||||
else if(!text) result=-28;
|
||||
else {
|
||||
|
||||
@@ -111,6 +111,55 @@ namespace textinput {
|
||||
extern "C" bool updateTriggerKey___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
|
||||
extern "C" bool updateTappingShift___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
|
||||
extern "C" void updateShift__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
|
||||
HWKeyboard::HWKeyboard(Manager* manager) : mpManager(manager), field_0x14(0), field_0x15(0), field_0x16(0) {
|
||||
}
|
||||
|
||||
struct NavigationCommand { u32 command; u32 modifiers; };
|
||||
struct KeyInputData {
|
||||
wchar_t character;
|
||||
u16 flags;
|
||||
u32 modifier;
|
||||
u8 direct;
|
||||
u8 repeated;
|
||||
u16 reserved;
|
||||
u32 data;
|
||||
};
|
||||
extern const u8 controlKeys[];
|
||||
void HWKeyboard::init() {
|
||||
LayoutGather::Singleton::getInstance().setHWPressedShift(false);
|
||||
|
||||
u32 state = input::HKBManager::getInstance().GetModifierState();
|
||||
input::HKBManager::getInstance().SetModifierState(state | 0x100, 0x700);
|
||||
field_0x15 = 0;
|
||||
field_0x16 = 0;
|
||||
}
|
||||
|
||||
void HWKeyboard::updateShift(input::HKBManager& hkbManager) {
|
||||
LayoutGather &gather = LayoutGather::Singleton::getInstance();
|
||||
|
||||
u32 state = hkbManager.GetModifierState();
|
||||
|
||||
if (!mgr()->getToolBar()->isQwerty() && !mgr()->getToolBar()->isEnableKeytopChange()) {
|
||||
return;
|
||||
}
|
||||
|
||||
bool previousShift = gather.isHoldingShift();
|
||||
|
||||
if (state & 0x2) {
|
||||
gather.setHWPressedShift(true);
|
||||
if (!previousShift) {
|
||||
mgr()->getPCKeyboard()->onPressedShift(true);
|
||||
}
|
||||
} else {
|
||||
gather.setHWPressedShift(false);
|
||||
if (previousShift) {
|
||||
if (!gather.isHoldingShift()) {
|
||||
mgr()->getPCKeyboard()->onReleasedShift();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" asm bool updateInput__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager() {
|
||||
nofralloc
|
||||
stwu r1, -0x40(r1)
|
||||
@@ -246,17 +295,6 @@ namespace textinput {
|
||||
blr
|
||||
}
|
||||
|
||||
struct NavigationCommand { u32 command; u32 modifiers; };
|
||||
struct KeyInputData {
|
||||
wchar_t character;
|
||||
u16 flags;
|
||||
u32 modifier;
|
||||
u8 direct;
|
||||
u8 repeated;
|
||||
u16 reserved;
|
||||
u32 data;
|
||||
};
|
||||
extern const u8 controlKeys[];
|
||||
bool HWKeyboard::updateRepeatKey_(input::HKBManager& hkbManager) {
|
||||
u32 modifierState = hkbManager.GetModifierState();
|
||||
input::HKBManager::KeySet currentKeySet;
|
||||
@@ -575,50 +613,12 @@ extern const u8 controlKeys[];
|
||||
return false;
|
||||
}
|
||||
|
||||
HWKeyboard::HWKeyboard(Manager* manager) : mpManager(manager), field_0x14(0), field_0x15(0), field_0x16(0) {
|
||||
}
|
||||
|
||||
void HWKeyboard::init() {
|
||||
LayoutGather::Singleton::getInstance().setHWPressedShift(false);
|
||||
|
||||
u32 state = input::HKBManager::getInstance().GetModifierState();
|
||||
input::HKBManager::getInstance().SetModifierState(state | 0x100, 0x700);
|
||||
field_0x15 = 0;
|
||||
field_0x16 = 0;
|
||||
}
|
||||
|
||||
void HWKeyboard::updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) {
|
||||
if (trig != 0) {
|
||||
field_0x14 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void HWKeyboard::updateShift(input::HKBManager& hkbManager) {
|
||||
LayoutGather &gather = LayoutGather::Singleton::getInstance();
|
||||
|
||||
u32 state = hkbManager.GetModifierState();
|
||||
|
||||
if (!mgr()->getToolBar()->isQwerty() && !mgr()->getToolBar()->isEnableKeytopChange()) {
|
||||
return;
|
||||
}
|
||||
|
||||
bool previousShift = gather.isHoldingShift();
|
||||
|
||||
if (state & 0x2) {
|
||||
gather.setHWPressedShift(true);
|
||||
if (!previousShift) {
|
||||
mgr()->getPCKeyboard()->onPressedShift(true);
|
||||
}
|
||||
} else {
|
||||
gather.setHWPressedShift(false);
|
||||
if (previousShift) {
|
||||
if (!gather.isHoldingShift()) {
|
||||
mgr()->getPCKeyboard()->onReleasedShift();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
|
||||
@@ -637,25 +637,6 @@ const u8 controlKeys[] = {
|
||||
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
|
||||
extern "C" asm void setLanguage__Q49textinput8keyboard5hwkey10HWKeyboardFQ29textinput11DestinationQ29textinput8Language() {
|
||||
nofralloc
|
||||
cmpwi r4, 2
|
||||
bne setLanguage_L1
|
||||
lis r4, scCountryMap_EU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, scCountryMap_EU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
setLanguage_L1:
|
||||
lis r4, scCountryMap_NonEU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, scCountryMap_NonEU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
}
|
||||
|
||||
extern "C" asm void convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw() {
|
||||
nofralloc
|
||||
stwu r1, -0x10(r1)
|
||||
@@ -815,6 +796,25 @@ const u8 controlKeys[] = {
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
}
|
||||
|
||||
extern "C" asm void setLanguage__Q49textinput8keyboard5hwkey10HWKeyboardFQ29textinput11DestinationQ29textinput8Language() {
|
||||
nofralloc
|
||||
cmpwi r4, 2
|
||||
bne setLanguage_L1
|
||||
lis r4, scCountryMap_EU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, scCountryMap_EU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
setLanguage_L1:
|
||||
lis r4, scCountryMap_NonEU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, scCountryMap_NonEU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
}
|
||||
} // namespace hwkey
|
||||
|
||||
} // namespace keyboard
|
||||
|
||||
@@ -151,8 +151,8 @@ 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[];
|
||||
extern "C" const char scN_KOR[];
|
||||
extern "C" const char scN_CHN[];
|
||||
#pragma pop
|
||||
extern "C" const f32 scInputFormZeroF;
|
||||
extern "C" void _savegpr_20();
|
||||
|
||||
@@ -485,16 +485,16 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void BoardObject::stt_stand() {
|
||||
f32 degrees = mStandData.unk_0x0C * 30.0f + 30.0f;
|
||||
f32 degrees = mStandData.mAngleIdx * 30.0f + 30.0f;
|
||||
f32 cosF = nw4r::math::CosFIdx(degrees * 0.7111111f);
|
||||
degrees = mStandData.unk_0x0C * 30.0f + 30.0f;
|
||||
degrees = mStandData.mAngleIdx * 30.0f + 30.0f;
|
||||
f32 sinF = nw4r::math::SinFIdx(degrees * 0.7111111f);
|
||||
|
||||
math::VEC2 standPos;
|
||||
__ct__Q33ipl4math4VEC2Fff(&standPos, sinF * 160.0f, cosF * 160.0f);
|
||||
mBoardPos = (((mStandData.pos * (f32)(10 - mStandData.unk_0x08)) + (standPos * mStandData.unk_0x08)) / 10.0f);
|
||||
mBoardPos = (((mStandData.pos * (f32)(10 - mStandData.mStep)) + (standPos * mStandData.mStep)) / 10.0f);
|
||||
|
||||
if ((mStandData.unk_0x08 += 1) > 10) {
|
||||
if ((mStandData.mStep += 1) > 10) {
|
||||
mStandData.init();
|
||||
mState = STATE_NORMAL;
|
||||
}
|
||||
|
||||
@@ -185,7 +185,7 @@ namespace ipl {
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
Button::Button(EGG::Heap* heap) : Base(heap), unk_0x54(0), mOptOutBtn(), mSdMenuBtn(), unk_0x104(false), unk_0x105(false), mReservedCmd() {
|
||||
Button::Button(EGG::Heap* heap) : Base(heap), mAnimWait(0), mOptOutBtn(), mSdMenuBtn(), mbNewMailAnm(false), mbSuppressNewMailAnm(false), mReservedCmd() {
|
||||
for (int i = 0; i < ARROW_BTN_MAX; i++) {
|
||||
mbArrowVisible[i] = true;
|
||||
}
|
||||
@@ -293,7 +293,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Button::calc() {
|
||||
switch (unk_0x54) {
|
||||
switch (mAnimWait) {
|
||||
case 0: {
|
||||
if (mReservedCmd.get_current_index() != 0) {
|
||||
Command popped = mReservedCmd.get_popped_item();
|
||||
@@ -312,7 +312,7 @@ namespace ipl {
|
||||
if (!mpButtonAnim[ANIM_SCENE_CHANGE]->isPlaying() && !mpButtonAnim[ANIM_CALENDAR_EXIT]->isPlaying() &&
|
||||
!mpButtonAnim[ANIM_COMMON_BUTTON]->isPlaying() && !mpButtonAnim[ANIM_TRASH_DELETE]->isPlaying() &&
|
||||
!mOptOutBtn.mpLayout->isPlaying()) {
|
||||
unk_0x54 = 0;
|
||||
mAnimWait = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -335,7 +335,7 @@ namespace ipl {
|
||||
mpBalloons[i]->calc();
|
||||
}
|
||||
|
||||
if (unk_0x104 && !unk_0x105 && mTimer()) {
|
||||
if (mbNewMailAnm && !mbSuppressNewMailAnm && mTimer()) {
|
||||
startNewMailAnm_();
|
||||
}
|
||||
}
|
||||
@@ -457,7 +457,7 @@ namespace ipl {
|
||||
|
||||
bool Button::isActive() const {
|
||||
bool result = false;
|
||||
if (isSceneCreated() && unk_0x54 != 1) {
|
||||
if (isSceneCreated() && mAnimWait != 1) {
|
||||
result = true;
|
||||
}
|
||||
return result;
|
||||
@@ -668,7 +668,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
unk_0x54 = 1;
|
||||
mAnimWait = 1;
|
||||
}
|
||||
|
||||
void Button::initArrowAppearance(int arrowType, bool bAppear) {
|
||||
@@ -752,8 +752,8 @@ namespace ipl {
|
||||
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setMinFrame(scLoopAnmFrame.start);
|
||||
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setMaxFrame(scLoopAnmFrame.end);
|
||||
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setSpeed(1.0f);
|
||||
unk_0x104 = true;
|
||||
if (!unk_0x105) {
|
||||
mbNewMailAnm = true;
|
||||
if (!mbSuppressNewMailAnm) {
|
||||
startNewMailAnm_();
|
||||
}
|
||||
}
|
||||
@@ -773,7 +773,7 @@ namespace ipl {
|
||||
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setMaxFrame(1.0f);
|
||||
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setSpeed(0.0f);
|
||||
mpButtonAnim[ANIM_BOARD_BBS_NEW]->play();
|
||||
unk_0x104 = false;
|
||||
mbNewMailAnm = false;
|
||||
}
|
||||
|
||||
void Button::enableBtn() {
|
||||
|
||||
@@ -236,10 +236,10 @@ namespace ipl {
|
||||
|
||||
Calendar::Calendar(EGG::Heap* heap)
|
||||
: FaderSceneBase(heap), ButtonEventHandlerBase(), mState(STATE_NORMAL), mPrevState(STATE_NORMAL), mpLayout(NULL), mpLayoutFile(NULL),
|
||||
mpGroupAnim(NULL), mpInitAnim(NULL), mpBoardDate(NULL), mpSelectDate(NULL), mbScrolling(false), unk_0xA0(FALSE), mbTaskCanceled(FALSE),
|
||||
mpGroupAnim(NULL), mpInitAnim(NULL), mpBoardDate(NULL), mpSelectDate(NULL), mbScrolling(false), mbSearchTaskRunning(FALSE), mbTaskCanceled(FALSE),
|
||||
mbBackToBoardAlt(FALSE) {
|
||||
nw4r::ut::List_Init(&mDateList, offsetof(Date, mNode1));
|
||||
nw4r::ut::List_Init(&unk_0x90, offsetof(Date, mNode2));
|
||||
nw4r::ut::List_Init(&mDrawList, offsetof(Date, mNode2));
|
||||
|
||||
mbAsian = System::getRegion() == SC_PRODUCT_AREA_JPN || (u32)System::getRegion() == SC_PRODUCT_AREA_KOR ||
|
||||
(u32)System::getRegion() == SC_PRODUCT_AREA_CHN;
|
||||
@@ -262,7 +262,7 @@ namespace ipl {
|
||||
for (int i = 0; i < (DATE_COUNT * 2); i++) {
|
||||
Date* date = new Date(getSceneHeap(), mpLayoutFile, "arc", "my_IplTop_f.brlyt");
|
||||
if (i < DATE_COUNT) {
|
||||
nw4r::ut::List_Append(&unk_0x90, date);
|
||||
nw4r::ut::List_Append(&mDrawList, date);
|
||||
}
|
||||
nw4r::ut::List_Append(&mDateList, date);
|
||||
}
|
||||
@@ -382,10 +382,10 @@ namespace ipl {
|
||||
}
|
||||
} else {
|
||||
for (u32 i = 0; i < DATE_COUNT; i++) {
|
||||
((Date*)nw4r::ut::List_GetNth(&unk_0x90, i))->draw(false);
|
||||
((Date*)nw4r::ut::List_GetNth(&mDrawList, i))->draw(false);
|
||||
}
|
||||
for (u32 i = 0; i < DATE_COUNT; i++) {
|
||||
((Date*)nw4r::ut::List_GetNth(&unk_0x90, i))->draw(true);
|
||||
((Date*)nw4r::ut::List_GetNth(&mDrawList, i))->draw(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -425,8 +425,8 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Calendar::onPointDate(Date* date) {
|
||||
nw4r::ut::List_Remove(&unk_0x90, date);
|
||||
nw4r::ut::List_Append(&unk_0x90, date);
|
||||
nw4r::ut::List_Remove(&mDrawList, date);
|
||||
nw4r::ut::List_Append(&mDrawList, date);
|
||||
}
|
||||
|
||||
void Calendar::onTrigDate(Date* date) {
|
||||
@@ -503,7 +503,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Calendar::on_wait_task() {
|
||||
if (unk_0xA0 == FALSE) {
|
||||
if (mbSearchTaskRunning == FALSE) {
|
||||
switch (mPrevState) {
|
||||
case STATE_SCROLL_RIGHT: {
|
||||
do_scroll_r();
|
||||
@@ -535,7 +535,7 @@ namespace ipl {
|
||||
|
||||
mPrevState = mState;
|
||||
mState = STATE_SCROLL_RIGHT;
|
||||
if (unk_0xA0 == TRUE) {
|
||||
if (mbSearchTaskRunning == TRUE) {
|
||||
mbTaskCanceled = TRUE;
|
||||
mPrevState = STATE_SCROLL_RIGHT;
|
||||
mState = STATE_WAIT_TASK;
|
||||
@@ -577,7 +577,7 @@ namespace ipl {
|
||||
|
||||
mPrevState = mState;
|
||||
mState = STATE_SCROLL_LEFT;
|
||||
if (unk_0xA0) {
|
||||
if (mbSearchTaskRunning) {
|
||||
mbTaskCanceled = TRUE;
|
||||
mPrevState = STATE_SCROLL_LEFT;
|
||||
mState = STATE_WAIT_TASK;
|
||||
@@ -616,7 +616,7 @@ namespace ipl {
|
||||
mPrevState = mState;
|
||||
mState = STATE_DONE;
|
||||
|
||||
if (unk_0xA0 == TRUE) {
|
||||
if (mbSearchTaskRunning == TRUE) {
|
||||
OSReport("検索タスク終了要求\n"); // "Search task termination requested"
|
||||
mbTaskCanceled = TRUE;
|
||||
mPrevState = mState;
|
||||
@@ -863,14 +863,14 @@ namespace ipl {
|
||||
|
||||
OSReport("タスク終了\n"); // Task end
|
||||
|
||||
calendar->unk_0xA0 = FALSE;
|
||||
calendar->mbSearchTaskRunning = FALSE;
|
||||
calendar->mbTaskCanceled = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
void Calendar::exec_search_task() {
|
||||
OSReport("検索開始\n"); // Start search
|
||||
unk_0xA0 = TRUE;
|
||||
mbSearchTaskRunning = TRUE;
|
||||
System::getTask1()->requestJam(search_task_, this, NULL);
|
||||
}
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@ namespace ipl {
|
||||
DECOMP_FORCE_ACTIVE(iplDate_cpp, padding);
|
||||
|
||||
Date::Date(EGG::Heap* heap, nand::LayoutFile* file, const char* layoutFolder, const char* layoutFileName)
|
||||
: ::gui::EventHandler(), mbAppearMsg(0), unk_0x10(0), unk_0x14(0), mpLayout(NULL), mpCurrentPaneAnim(0), unk_0x3C(0) {
|
||||
: ::gui::EventHandler(), mbAppearMsg(0), mFocusState(0), mPendingFocusCmd(0), mpLayout(NULL), mpCurrentPaneAnim(0), mPointCount(0) {
|
||||
// Layout
|
||||
mpLayout = new layout::Object(heap, file, layoutFolder, layoutFileName);
|
||||
|
||||
@@ -103,16 +103,16 @@ namespace ipl {
|
||||
onCmdRecv(3);
|
||||
}
|
||||
|
||||
onCmdRecv(unk_0x14);
|
||||
onCmdRecv(mPendingFocusCmd);
|
||||
}
|
||||
|
||||
void Date::draw(bool unk) {
|
||||
if (unk) {
|
||||
if (unk_0x3C != 0) {
|
||||
if (mPointCount != 0) {
|
||||
mpLayout->draw();
|
||||
}
|
||||
} else {
|
||||
if (unk_0x3C == 0) {
|
||||
if (mPointCount == 0) {
|
||||
mpLayout->draw();
|
||||
}
|
||||
}
|
||||
@@ -210,7 +210,7 @@ namespace ipl {
|
||||
|
||||
void Date::start_point_event(const char* paneName, controller::Interface* con) {
|
||||
if (strcmp(paneName, scB_Cal) == 0) {
|
||||
if (unk_0x3C == 0) {
|
||||
if (mPointCount == 0) {
|
||||
static_cast<Calendar*>(System::getScene(SCENE_CALENDAR))->onPointDate(this);
|
||||
onCmdRecv(1);
|
||||
|
||||
@@ -221,16 +221,16 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
}
|
||||
unk_0x3C++;
|
||||
mPointCount++;
|
||||
}
|
||||
}
|
||||
|
||||
void Date::start_left_event(const char* paneName) {
|
||||
if (strcmp(paneName, scB_Cal) == 0) {
|
||||
if (unk_0x3C == 1) {
|
||||
if (mPointCount == 1) {
|
||||
onCmdRecv(2);
|
||||
}
|
||||
unk_0x3C--;
|
||||
mPointCount--;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -268,35 +268,35 @@ namespace ipl {
|
||||
|
||||
void Date::onCmdRecv(int cmd) {
|
||||
if (cmd == 1 || cmd == 2) {
|
||||
unk_0x14 = cmd;
|
||||
mPendingFocusCmd = cmd;
|
||||
}
|
||||
|
||||
switch (unk_0x10) {
|
||||
switch (mFocusState) {
|
||||
case 0: {
|
||||
if (cmd == 1) {
|
||||
mpCurrentPaneAnim = doAnim(IDANIM_FOCUS_IN);
|
||||
unk_0x10 = 1;
|
||||
mFocusState = 1;
|
||||
} else if (cmd == 2) {
|
||||
mpCurrentPaneAnim = doAnim(IDANIM_FOCUS_OUT);
|
||||
unk_0x10 = 2;
|
||||
mFocusState = 2;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
if (cmd == 3) {
|
||||
if (unk_0x14 == 1) {
|
||||
unk_0x14 = 0;
|
||||
if (mPendingFocusCmd == 1) {
|
||||
mPendingFocusCmd = 0;
|
||||
}
|
||||
unk_0x10 = 0;
|
||||
mFocusState = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
if (cmd == 3) {
|
||||
if (unk_0x14 == 2) {
|
||||
unk_0x14 = 0;
|
||||
if (mPendingFocusCmd == 2) {
|
||||
mPendingFocusCmd = 0;
|
||||
}
|
||||
unk_0x10 = 0;
|
||||
mFocusState = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -306,7 +306,7 @@ namespace ipl {
|
||||
void Date::initEvent() {
|
||||
mpGui->init();
|
||||
mpPaneAnims[ANIM_PANE_BTN_HOVER]->initAnmFrame(0.0f);
|
||||
unk_0x3C = 0;
|
||||
mPointCount = 0;
|
||||
onCmdRecv(3);
|
||||
}
|
||||
|
||||
|
||||
@@ -449,7 +449,7 @@ namespace ipl {
|
||||
|
||||
mpRsoExpHeaps[0] = EGG::ExpHeap::create(0x80000, System::getMem2App(), MEM_HEAP_OPT_THREAD_SAFE | MEM_HEAP_OPT_DEBUG_FILL);
|
||||
mpRsoExpHeaps[1] = EGG::ExpHeap::create(0x80000, System::getMem2App(), MEM_HEAP_OPT_THREAD_SAFE | MEM_HEAP_OPT_DEBUG_FILL);
|
||||
getButton()->setUnk_0x105(true);
|
||||
getButton()->setSuppressNewMailAnm(true);
|
||||
}
|
||||
|
||||
void ChannelTitle::calcCommon() {
|
||||
@@ -931,7 +931,7 @@ namespace ipl {
|
||||
|
||||
System::getChannelManager()->resetChJumpLoad();
|
||||
|
||||
getButton()->setUnk_0x105(false);
|
||||
getButton()->setSuppressNewMailAnm(false);
|
||||
}
|
||||
|
||||
BOOL ChannelTitle::isResetAcceptable() const {
|
||||
|
||||
@@ -150,7 +150,7 @@ namespace ipl {
|
||||
myWork->sdWriteProtected = FALSE;
|
||||
myWork->prevAsyncResult = RESULT_WORKING;
|
||||
|
||||
unk_0x04 = false;
|
||||
mbCancel = false;
|
||||
|
||||
OSResumeThread(&myWork->thread);
|
||||
}
|
||||
@@ -1235,7 +1235,7 @@ namespace ipl {
|
||||
int result;
|
||||
OSReport("NandSDWorker: cleaning partial nand app...\n");
|
||||
for (int i = 0; i < titleIdCount; i++) {
|
||||
if (unk_0x04 != false) {
|
||||
if (mbCancel != false) {
|
||||
return RESULT_UNK_18;
|
||||
}
|
||||
|
||||
@@ -4877,7 +4877,7 @@ namespace ipl {
|
||||
strncat(fmtStr, fileName, NAND_MAX_PATH);
|
||||
|
||||
while (faErr == FA_ERR_SUCCESS) {
|
||||
if (unk_0x04 != false) {
|
||||
if (mbCancel != false) {
|
||||
return RESULT_UNK_18;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user