Compare commits
10 Commits
cleanup/da
...
cleanup/ti
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f0829ff810 | ||
|
|
ffdd7b58e0 | ||
|
|
1a0f83a156 | ||
|
|
a3d088e4d3 | ||
|
|
3b90bd66c6 | ||
|
|
b395269be6 | ||
|
|
60bc67e097 | ||
|
|
4e8223f3d4 | ||
|
|
3f36d5f4cc | ||
|
|
1f0dc64062 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.37% | 87.79% | 62.05% | 92.06% |
|
||||
| 99.37% | 87.84% | 62.33% | 92.06% |
|
||||
|
||||
units 918/1027 complete, functions 12216/12563 matched.
|
||||
units 919/1027 complete, functions 12220/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 -->
|
||||
|
||||
@@ -17491,14 +17491,14 @@ __vt__Q29textinput4Base = .data:0x8165D228; // type:object size:0x30
|
||||
__vt__Q39textinput4util9Animation = .data:0x8165D258; // type:object size:0x24
|
||||
lbl_8165D258 = .data:0x8165D27C; // type:object size:0xD data:string
|
||||
@STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl = .data:0x8165D28C; // type:object size:0x44
|
||||
lbl_8165D2D0 = .data:0x8165D2D0; // type:object size:0xF data:string
|
||||
lbl_8165D2E0 = .data:0x8165D2E0; // type:object size:0x11 data:string
|
||||
lbl_8165D2F8 = .data:0x8165D2F8; // type:object size:0x68C
|
||||
lbl_8165D984 = .data:0x8165D984; // type:object size:0x84
|
||||
lbl_8165DA08 = .data:0x8165DA08; // type:object size:0x10 data:string
|
||||
lbl_8165DA18 = .data:0x8165DA18; // type:object size:0xF data:string
|
||||
lbl_8165DA28 = .data:0x8165DA28; // type:object size:0xD data:string
|
||||
lbl_8165DA38 = .data:0x8165DA38; // type:object size:0xD data:string
|
||||
scT_prdc_Text_00 = .data:0x8165D2D0; // type:object size:0xF data:string
|
||||
scP_prdc_scrl_Left = .data:0x8165D2E0; // type:object size:0x11 data:string
|
||||
scCandidatePaneData = .data:0x8165D2F8; // type:object size:0x68C
|
||||
scPaneNameTable = .data:0x8165D984; // type:object size:0x84
|
||||
scW_predictWindow = .data:0x8165DA08; // type:object size:0x10 data:string
|
||||
scN_predictInput = .data:0x8165DA18; // type:object size:0xF data:string
|
||||
scW_OnOff_Area = .data:0x8165DA28; // type:object size:0xD data:string
|
||||
scN_prdc_Texts = .data:0x8165DA38; // type:object size:0xD data:string
|
||||
jumptable_8165DA48 = .data:0x8165DA48; // type:object size:0x1C scope:local
|
||||
lbl_8165DA64 = .data:0x8165DA64; // type:object size:0xF data:string
|
||||
lbl_8165DA74 = .data:0x8165DA74; // type:object size:0xF 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
|
||||
lbl_816946A4 = .sdata2:0x816946A4; // type:object size:0x4 align:4 data:float
|
||||
scSoundZeroF = .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
|
||||
@@ -22281,11 +22281,11 @@ sbCompatibleFilterEnabled__Q39textinput9inputform13DeadKeyStream = .sdata:0x8169
|
||||
mbHyphen__Q29textinput9inputform = .sdata:0x816973B3; // type:object size:0x1 data:byte
|
||||
lbl_816973B4 = .sdata:0x816973B4; // type:object size:0x4
|
||||
lbl_816973B8 = .sdata:0x816973B8; // type:object size:0x8 data:string
|
||||
lbl_816973C0 = .sdata:0x816973C0; // type:object size:0x4 data:4byte
|
||||
lbl_816973C4 = .sdata:0x816973C4; // type:object size:0x4 data:4byte
|
||||
lbl_816973C8 = .sdata:0x816973C8; // type:object size:0x8
|
||||
lbl_816973D0 = .sdata:0x816973D0; // type:object size:0x8 data:string
|
||||
lbl_816973D8 = .sdata:0x816973D8; // type:object size:0x8 data:string
|
||||
scCommonTextAnimName = .sdata:0x816973C0; // type:object size:0x4 data:4byte
|
||||
scCommonScrollAnimName = .sdata:0x816973C4; // type:object size:0x4 data:4byte
|
||||
scEmptyWChars = .sdata:0x816973C8; // type:object size:0x8
|
||||
scP_OnBtn = .sdata:0x816973D0; // type:object size:0x8 data:string
|
||||
scB_OnBtn = .sdata:0x816973D8; // type:object size:0x8 data:string
|
||||
COMMON_BUTTON_ANIM__Q29textinput7toolbar = .sdata:0x816973E0; // type:object size:0x4 scope:local data:4byte
|
||||
COMMON_CHG_ANIM__Q29textinput7toolbar = .sdata:0x816973E4; // type:object size:0x4 scope:local data:4byte
|
||||
@6901 = .sdata:0x816973E8; // type:object size:0x5 scope:local data:string
|
||||
|
||||
@@ -68,7 +68,7 @@ void KPADInit();
|
||||
s32 KPADRead(s32 chan, KPADStatus* status, u32 length);
|
||||
|
||||
void KPADSetSensorHeight(s32 chan, f32 sensorHeight);
|
||||
void KPADGetProjectionPos(Vec2* dest, Vec2* src, const Rect* param_3, f32 param_4);
|
||||
void KPADGetProjectionPos(Vec2* dest, Vec2* src, const Rect* rect, f32 scale);
|
||||
|
||||
void KPADSetPosParam(s32 chan, f32 x, f32 y);
|
||||
void KPADSetBtnRepeat(s32 chan, f32, f32);
|
||||
|
||||
@@ -80,11 +80,11 @@ typedef struct {
|
||||
typedef void (*WADProcessCallback)(u32 completed, u32 total, BOOL done);
|
||||
|
||||
s32 WADGetTitleVersionEx(char* path, ESTitleId* titleId, u16* titleVersion, WADLocation location, u32 offset);
|
||||
s32 WADBackupEx(u64 titleId, u32 param_2, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 param_7,
|
||||
WADProcessCallback processCB);
|
||||
s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 offset,
|
||||
WADProcessCallback processCallback);
|
||||
|
||||
s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 param_5, WADBlocks* blocks, u32* param_7);
|
||||
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 param_4, u32 param_5, WADProcessCallback processCB);
|
||||
s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags, WADBlocks* blocks, u32* fileListOut);
|
||||
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags, WADProcessCallback processCallback);
|
||||
|
||||
s32 WADGetInstalledVersion(ESTitleId titleID, u16* version);
|
||||
|
||||
|
||||
@@ -249,61 +249,28 @@ asm CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* recor
|
||||
#endif
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, int year, int month, int day, int hour, int min, int sec) {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x60(r1)
|
||||
mflr r0
|
||||
stw r0, 0x64(r1)
|
||||
addi r11, r1, 0x60
|
||||
bl _savegpr_22
|
||||
lwz r28, 0x68(r1)
|
||||
mr r23, r4
|
||||
li r0, 0x0
|
||||
lwz r12, 0x6c(r1)
|
||||
lwz r11, 0x70(r1)
|
||||
mr r22, r3
|
||||
lwz r4, 0x74(r1)
|
||||
mr r24, r5
|
||||
stw r9, 0x24(r1)
|
||||
mr r25, r6
|
||||
mr r26, r7
|
||||
mr r27, r8
|
||||
stw r10, 0x20(r1)
|
||||
addi r3, r1, 0x10
|
||||
stw r28, 0x1c(r1)
|
||||
stw r12, 0x18(r1)
|
||||
stw r11, 0x14(r1)
|
||||
stw r4, 0x10(r1)
|
||||
stw r0, 0x30(r1)
|
||||
stw r0, 0x34(r1)
|
||||
bl OSCalendarTimeToTicks
|
||||
lhz r30, 0x0(r22)
|
||||
mr r28, r4
|
||||
lwz r31, 0x4(r22)
|
||||
mr r29, r3
|
||||
bl CDBLock
|
||||
stw r26, 0x8(r1)
|
||||
mr r3, r22
|
||||
mr r4, r23
|
||||
mr r5, r24
|
||||
stw r27, 0xc(r1)
|
||||
mr r6, r25
|
||||
mr r8, r28
|
||||
mr r7, r29
|
||||
mr r9, r31
|
||||
mr r10, r30
|
||||
bl CDBDatabaseCreateRecordImAtOnce_
|
||||
mr r30, r3
|
||||
bl CDBUnlock
|
||||
addi r11, r1, 0x60
|
||||
mr r3, r30
|
||||
bl _restgpr_22
|
||||
lwz r0, 0x64(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x60
|
||||
blr
|
||||
#endif
|
||||
CDBErr CDBDatabaseCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, int year, int month, int day, int hour, int min, int sec) {
|
||||
u32 gameCode;
|
||||
u16 makerCode;
|
||||
CDBErr result;
|
||||
OSTime time;
|
||||
OSCalendarTime cal;
|
||||
|
||||
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);
|
||||
makerCode = database->makerCode;
|
||||
gameCode = database->gameCode;
|
||||
CDBLock();
|
||||
result = CDBDatabaseCreateRecordImAtOnce_(database, record, typeStr, fileTypeStr, time, gameCode, makerCode, recordData, recordDataSize);
|
||||
CDBUnlock();
|
||||
return result;
|
||||
}
|
||||
|
||||
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) {
|
||||
|
||||
@@ -55,7 +55,13 @@ static s32 ConnectionStarted(NHTTPConnectionInfo* handle) {
|
||||
void* system=NHTTPi_GetSystemInfoP();
|
||||
void* mutex=NHTTPi_GetMutexInfoP(system);
|
||||
NHTTPConnectionInfo* connection=NHTTPi_GetConnection(mutex,handle);
|
||||
return connection ? connection->started : -1;
|
||||
s32 started;
|
||||
if (connection == NULL) {
|
||||
started = -1;
|
||||
} else {
|
||||
started = connection->started;
|
||||
}
|
||||
return started;
|
||||
}
|
||||
|
||||
static s32 ConnectionState(NHTTPConnectionInfo* handle) {
|
||||
|
||||
@@ -21,22 +21,22 @@ namespace textinput {
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8165D2D0[15] = "T_prdc_Text_00";
|
||||
extern "C" const char lbl_8165D2E0[17] = "P_prdc_scrl_Left";
|
||||
extern "C" const char scT_prdc_Text_00[15] = "T_prdc_Text_00";
|
||||
extern "C" const char scP_prdc_scrl_Left[17] = "P_prdc_scrl_Left";
|
||||
#pragma pop
|
||||
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata"
|
||||
extern "C" const char* lbl_816973C0 = lbl_8165D2D0;
|
||||
extern "C" const char* lbl_816973C4 = lbl_8165D2E0;
|
||||
extern "C" const wchar_t lbl_816973C8[4] = {0, 0, 0, 1};
|
||||
extern "C" const char lbl_816973D0[8] = "P_OnBtn";
|
||||
extern "C" const char lbl_816973D8[8] = "B_OnBtn";
|
||||
extern "C" const char* scCommonTextAnimName = scT_prdc_Text_00;
|
||||
extern "C" const char* scCommonScrollAnimName = scP_prdc_scrl_Left;
|
||||
extern "C" const wchar_t scEmptyWChars[4] = {0, 0, 0, 1};
|
||||
extern "C" const char scP_OnBtn[8] = "P_OnBtn";
|
||||
extern "C" const char scB_OnBtn[8] = "B_OnBtn";
|
||||
#pragma pop
|
||||
|
||||
|
||||
#define COMMON_TEXT_ANIM lbl_816973C0
|
||||
#define COMMON_SCROLL_ANIM lbl_816973C4
|
||||
#define COMMON_TEXT_ANIM scCommonTextAnimName
|
||||
#define COMMON_SCROLL_ANIM scCommonScrollAnimName
|
||||
|
||||
// name made up, no dwarf (?)
|
||||
struct AnimationFile {
|
||||
@@ -77,7 +77,7 @@ namespace textinput {
|
||||
char tail[12];
|
||||
};
|
||||
|
||||
extern "C" const CandidatePaneData lbl_8165D2F8 __attribute__((aligned(8))) = {{
|
||||
extern "C" const CandidatePaneData scCandidatePaneData __attribute__((aligned(8))) = {{
|
||||
{KT_CandidateText, "N_predictInput", 1, NULL, {&csAninationFile[0]}},
|
||||
{KT_ScrollButton,
|
||||
"P_prdc_scrl_Left",
|
||||
@@ -212,7 +212,7 @@ namespace textinput {
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8165D984[132] =
|
||||
extern "C" const char scPaneNameTable[132] =
|
||||
"B_OffBtn\0\0\0"
|
||||
"P_JPOffBtn\0"
|
||||
"P_CNOffBtn\0"
|
||||
@@ -222,10 +222,10 @@ namespace textinput {
|
||||
"B_prdc_scrl_Rght\0\0\0"
|
||||
"P_prdc_scrl_Rght\0\0\0"
|
||||
"\0\0\0";
|
||||
extern "C" char lbl_8165DA08[16] = "W_predictWindow";
|
||||
extern "C" const char lbl_8165DA18[15] = "N_predictInput";
|
||||
extern "C" const char lbl_8165DA28[13] = "W_OnOff_Area";
|
||||
extern "C" const char lbl_8165DA38[13] = "N_prdc_Texts";
|
||||
extern "C" char scW_predictWindow[16] = "W_predictWindow";
|
||||
extern "C" const char scN_predictInput[15] = "N_predictInput";
|
||||
extern "C" const char scW_OnOff_Area[13] = "W_OnOff_Area";
|
||||
extern "C" const char scN_prdc_Texts[13] = "N_prdc_Texts";
|
||||
#pragma pop
|
||||
|
||||
void CandidateBoxCaller::Candidates::addCandidate(const wchar_t* wcString) {
|
||||
@@ -398,20 +398,20 @@ namespace textinput {
|
||||
mTextArea.Init();
|
||||
mOnOffButton.Create(this);
|
||||
mOnOffButton.Init();
|
||||
const char* paneNames = lbl_8165D984;
|
||||
const char* paneNames = scPaneNameTable;
|
||||
mLeftScroll.Create(this, paneNames + 68, paneNames + 48);
|
||||
mRightScroll.Create(this, paneNames + 108, paneNames + 88);
|
||||
mLeftScroll.Init();
|
||||
mRightScroll.Init();
|
||||
mTextWindow.Create(this, lbl_8165DA08);
|
||||
mTextWindow.Create(this, scW_predictWindow);
|
||||
init();
|
||||
}
|
||||
|
||||
void LayoutByNW4R::createAnmPane_(MEMAllocator* allocator) {
|
||||
CandidateTextAnmPane* pane;
|
||||
for (u16 i = 0; i < ARRAY_LENGTH(lbl_8165D2F8.panes); i++) {
|
||||
for (u16 i = 0; i < ARRAY_LENGTH(scCandidatePaneData.panes); i++) {
|
||||
pane = NULL;
|
||||
const PaneToAnimation& p = lbl_8165D2F8.panes[i];
|
||||
const PaneToAnimation& p = scCandidatePaneData.panes[i];
|
||||
switch (p.type) {
|
||||
case KT_ScrollButton: {
|
||||
void* pBtnBuf = MEMAllocFromAllocator(allocator, sizeof(CandidateScrollAnmPane));
|
||||
@@ -454,7 +454,7 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::init() {
|
||||
searchAnmPane(lbl_8165DA18)->changeAnimation(ANM_Normal);
|
||||
searchAnmPane(scN_predictInput)->changeAnimation(ANM_Normal);
|
||||
Base::setInvalid(false);
|
||||
setActive(true);
|
||||
setOnOff(false);
|
||||
@@ -467,7 +467,7 @@ namespace textinput {
|
||||
mpLayout->CalculateMtx(mDrawInfo);
|
||||
if (meLanguage == KR) {
|
||||
mTextWindow.SetVisible(false);
|
||||
getPane(lbl_8165DA28)->SetVisible(false);
|
||||
getPane(scW_OnOff_Area)->SetVisible(false);
|
||||
} else if (meLanguage == CN) {
|
||||
setOnOff(true);
|
||||
mTextWindow.SetVisible(true);
|
||||
@@ -477,16 +477,16 @@ namespace textinput {
|
||||
} else {
|
||||
mTextWindow.ChangeAnimation(ANM_Normal);
|
||||
}
|
||||
getPane(lbl_8165DA28)->SetVisible(false);
|
||||
getPane(scW_OnOff_Area)->SetVisible(false);
|
||||
} else {
|
||||
getPane(lbl_8165DA28)->SetVisible(true);
|
||||
getPane(scW_OnOff_Area)->SetVisible(true);
|
||||
}
|
||||
}
|
||||
|
||||
void LayoutByNW4R::draw() {
|
||||
getPane(lbl_8165DA38)->SetVisible(false);
|
||||
getPane(scN_prdc_Texts)->SetVisible(false);
|
||||
nw4rmanager::Layout::draw();
|
||||
getPane(lbl_8165DA38)->SetVisible(true);
|
||||
getPane(scN_prdc_Texts)->SetVisible(true);
|
||||
if (!isInvalid()) {
|
||||
mTextArea.Draw(mDrawInfo);
|
||||
}
|
||||
@@ -496,8 +496,8 @@ namespace textinput {
|
||||
nw4rmanager::Layout::calc();
|
||||
mTextArea.Calc();
|
||||
if (mbAnimOn) {
|
||||
getPane(lbl_8165DA38)->Animate(0);
|
||||
getPane(lbl_8165DA38)->CalculateMtx(mDrawInfo);
|
||||
getPane(scN_prdc_Texts)->Animate(0);
|
||||
getPane(scN_prdc_Texts)->CalculateMtx(mDrawInfo);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -505,7 +505,7 @@ namespace textinput {
|
||||
Base::setLanguage(language);
|
||||
init();
|
||||
// Maybe inlines, maybe not
|
||||
nw4r::math::VEC3 pos = searchAnmPane(lbl_8165DA08)->getPane()->GetTranslate();
|
||||
nw4r::math::VEC3 pos = searchAnmPane(scW_predictWindow)->getPane()->GetTranslate();
|
||||
if (meLanguage == CN || meLanguage == KR) {
|
||||
Base::checkValidation();
|
||||
// Potentially an inline
|
||||
@@ -520,7 +520,7 @@ namespace textinput {
|
||||
pos.x = 202.0f;
|
||||
}
|
||||
|
||||
searchAnmPane(lbl_8165DA08)->getPane()->SetTranslate(pos);
|
||||
searchAnmPane(scW_predictWindow)->getPane()->SetTranslate(pos);
|
||||
if (meLanguage == CN) {
|
||||
mTextArea.ApplyFontScale(1.2f);
|
||||
} else if (meLanguage == KR) {
|
||||
@@ -531,10 +531,10 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::onOnOffButton(bool arg) {
|
||||
const char* base = lbl_8165D2D0;
|
||||
const char* base = scT_prdc_Text_00;
|
||||
mTextWindow.TurnOnOff(!isOn());
|
||||
if (isOn()) {
|
||||
searchAnmPane(lbl_816973D0)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
|
||||
searchAnmPane(scP_OnBtn)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
|
||||
if (arg) {
|
||||
mpEventObserver->onSE(sound::SE_PREDICT_OFF);
|
||||
}
|
||||
@@ -588,7 +588,7 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::startTurnOn(bool on) {
|
||||
const char* base = lbl_8165D2D0;
|
||||
const char* base = scT_prdc_Text_00;
|
||||
if (isInScroll()) {
|
||||
return;
|
||||
}
|
||||
@@ -596,7 +596,7 @@ namespace textinput {
|
||||
mTextWindow.TurnOnOff(on);
|
||||
|
||||
if (!on) {
|
||||
searchAnmPane(lbl_816973D0)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
|
||||
searchAnmPane(scP_OnBtn)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
|
||||
mpEventObserver->onSE(sound::SE_PREDICT_OFF);
|
||||
} else {
|
||||
searchAnmPane(base + 0x6a8)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
|
||||
@@ -637,7 +637,7 @@ namespace textinput {
|
||||
current = reinterpret_cast<CandidateBoxCaller::Candidates*>(reinterpret_cast<u8*>(current) + sizeof(current->szwcPredicted[0]));
|
||||
}
|
||||
}
|
||||
gui::PaneComponent* p = mpPaneManager->searchPaneComponent(isOn() ? lbl_816973D8 : lbl_8165D984);
|
||||
gui::PaneComponent* p = mpPaneManager->searchPaneComponent(isOn() ? scB_OnBtn : scPaneNameTable);
|
||||
if (p != NULL) {
|
||||
p->lockInitialize(true);
|
||||
}
|
||||
@@ -706,8 +706,8 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::cancelStateFocusIn() {
|
||||
const PaneToAnimation* pane = lbl_8165D2F8.panes;
|
||||
for (int i = 0; i < ARRAY_LENGTH(lbl_8165D2F8.panes); i++) {
|
||||
const PaneToAnimation* pane = scCandidatePaneData.panes;
|
||||
for (int i = 0; i < ARRAY_LENGTH(scCandidatePaneData.panes); i++) {
|
||||
CandidateTextAnmPane* p = static_cast<CandidateTextAnmPane*>(searchAnmPane(pane->paneName));
|
||||
if (p != NULL) {
|
||||
switch (p->getKeyType()) {
|
||||
@@ -765,7 +765,7 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::onEvent(UIObj* obj, u32 id, void* data) {
|
||||
const char* base = lbl_8165D2D0;
|
||||
const char* base = scT_prdc_Text_00;
|
||||
int tmp;
|
||||
|
||||
switch (id) {
|
||||
@@ -996,7 +996,7 @@ namespace textinput {
|
||||
void UITextArea::Create(nw4rmanager::Layout* layout) {
|
||||
// These could have been static...
|
||||
const char* textPanes[NUM_PANES] = {
|
||||
lbl_8165D2D0, "T_prdc_Text_01", "T_prdc_Text_02", "T_prdc_Text_03", "T_prdc_Text_04", "T_prdc_Text_05", "T_prdc_Text_06",
|
||||
scT_prdc_Text_00, "T_prdc_Text_01", "T_prdc_Text_02", "T_prdc_Text_03", "T_prdc_Text_04", "T_prdc_Text_05", "T_prdc_Text_06",
|
||||
"T_prdc_Text_07", "T_prdc_Text_08", "T_prdc_Text_09", "T_prdc_Text_10", "T_prdc_Text_11", "T_prdc_Text_12", "T_prdc_Text_13",
|
||||
"T_prdc_Text_14", "T_prdc_Text_15", "T_prdc_Text_16", "T_prdc_Text_17", "T_prdc_Text_18", "T_prdc_Text_19",
|
||||
};
|
||||
@@ -1015,7 +1015,7 @@ namespace textinput {
|
||||
mpBoundingPane[i]->setListener(this);
|
||||
}
|
||||
mpTextAreaPane = mgr->searchPaneComponent("N_prdcTextArea");
|
||||
mpTextsPane = mgr->searchPaneComponent(lbl_8165DA38);
|
||||
mpTextsPane = mgr->searchPaneComponent(scN_prdc_Texts);
|
||||
mSize = mpTextBoxPane[0]->getTextPane()->GetFontSize();
|
||||
mpTextAreaPane->setListener(this);
|
||||
}
|
||||
@@ -1023,7 +1023,7 @@ namespace textinput {
|
||||
|
||||
void UITextArea::Init() {
|
||||
for (u32 i = 0; i < NUM_PANES; i++) {
|
||||
mpTextBoxPane[i]->getTextPane()->SetString(const_cast<const wchar_t*>(lbl_816973C8), 0);
|
||||
mpTextBoxPane[i]->getTextPane()->SetString(const_cast<const wchar_t*>(scEmptyWChars), 0);
|
||||
mpBoundingPane[i]->setTriggerTarget(true);
|
||||
}
|
||||
mfTextWidth = 0.0f;
|
||||
@@ -1210,7 +1210,7 @@ namespace textinput {
|
||||
|
||||
void UITextArea::Clear() {
|
||||
for (u32 i = 0; i < NUM_PANES; i++) {
|
||||
mpTextBoxPane[i]->getTextPane()->SetString(const_cast<const wchar_t*>(lbl_816973C8), 0);
|
||||
mpTextBoxPane[i]->getTextPane()->SetString(const_cast<const wchar_t*>(scEmptyWChars), 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1493,7 +1493,7 @@ namespace textinput {
|
||||
if (mgr()->isInScroll() && event != 1 && event != 0) {
|
||||
return;
|
||||
}
|
||||
if (!mgr()->searchAnmPane(lbl_8165DA08)->isInAnimation() || event == 1) {
|
||||
if (!mgr()->searchAnmPane(scW_predictWindow)->isInAnimation() || event == 1) {
|
||||
if (!mgr()->isInvalid()) {
|
||||
switch (event) {
|
||||
case 4:
|
||||
@@ -1645,7 +1645,7 @@ namespace textinput {
|
||||
if (mgr()->isInScroll() && event != 1 && event != 0) {
|
||||
return;
|
||||
}
|
||||
if (!mgr()->searchAnmPane(lbl_8165DA08)->isInAnimation() || event == 1) {
|
||||
if (!mgr()->searchAnmPane(scW_predictWindow)->isInAnimation() || event == 1) {
|
||||
if (!mgr()->isInvalid()) {
|
||||
switch (event) {
|
||||
case 4:
|
||||
@@ -1691,15 +1691,15 @@ namespace textinput {
|
||||
mpOnPictPane = mgr->searchPaneComponent("P_OnBtn");
|
||||
mpOnBoundPane = mgr->searchPaneComponent("B_OnBtn");
|
||||
mpOnAnmPane = static_cast<OnOffAnmPane*>(layout->searchAnmPane("P_OnBtn"));
|
||||
mpOffPictPane = mgr->searchPaneComponent(lbl_8165D2F8.tail);
|
||||
mpOffBoundPane = mgr->searchPaneComponent(lbl_8165D984);
|
||||
mpOffAnmPane = static_cast<OnOffAnmPane*>(layout->searchAnmPane(lbl_8165D2F8.tail));
|
||||
mpOffPictPane = mgr->searchPaneComponent(scCandidatePaneData.tail);
|
||||
mpOffBoundPane = mgr->searchPaneComponent(scPaneNameTable);
|
||||
mpOffAnmPane = static_cast<OnOffAnmPane*>(layout->searchAnmPane(scCandidatePaneData.tail));
|
||||
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_8165D2F8.tail)->GetMaterial()->GetTexture(&mOffTexDefault, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_8165D984 + 12)->GetMaterial()->GetTexture(&mOffTexJP, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_8165D984 + 24)->GetMaterial()->GetTexture(&mOffTexCN, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_816973D0)->GetMaterial()->GetTexture(&mOnTexDefault, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_8165D984 + 36)->GetMaterial()->GetTexture(&mOnTexCN, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(scCandidatePaneData.tail)->GetMaterial()->GetTexture(&mOffTexDefault, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(scPaneNameTable + 12)->GetMaterial()->GetTexture(&mOffTexJP, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(scPaneNameTable + 24)->GetMaterial()->GetTexture(&mOffTexCN, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(scP_OnBtn)->GetMaterial()->GetTexture(&mOnTexDefault, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(scPaneNameTable + 36)->GetMaterial()->GetTexture(&mOnTexCN, 0);
|
||||
|
||||
mpOffBoundPane->setListener(this);
|
||||
mpOnBoundPane->setListener(this);
|
||||
@@ -1756,7 +1756,7 @@ namespace textinput {
|
||||
if (mgr()->isInScroll() && event != 1 && event != 0) {
|
||||
return;
|
||||
}
|
||||
if (!mgr()->searchAnmPane(lbl_8165DA08)->isInAnimation() || event == 1) {
|
||||
if (!mgr()->searchAnmPane(scW_predictWindow)->isInAnimation() || event == 1) {
|
||||
OnOffAnmPane* p;
|
||||
if (&component == mpOnBoundPane) {
|
||||
p = mpOnAnmPane;
|
||||
|
||||
@@ -640,23 +640,23 @@ namespace ipl {
|
||||
const char* langGroup = scLangGroups[lang];
|
||||
char langCodeBuf[40] = "";
|
||||
|
||||
bool bVar4 = false;
|
||||
bool foundLangGroup = false;
|
||||
|
||||
for (nw4r::lyt::GroupList::Iterator it = layout->GetGroupList().GetBeginIter(); it != layout->GetGroupList().GetEndIter(); it++) {
|
||||
if (strcmp(it->GetName(), langGroup) == 0) {
|
||||
bVar4 = true;
|
||||
foundLangGroup = true;
|
||||
} else {
|
||||
bool bVar3 = true;
|
||||
bool isNonRsoGroup = true;
|
||||
for (int i = 0; i < channel::MAX_ANIMS; i++) {
|
||||
char name[6];
|
||||
sprintf(name, "Rso%d", i);
|
||||
if (strncmp(it->GetName(), name, 5) == 0) {
|
||||
bVar3 = false;
|
||||
isNonRsoGroup = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (bVar3) {
|
||||
if (isNonRsoGroup) {
|
||||
for (nw4r::lyt::PaneLinkList::Iterator it2 = it->GetPaneList().GetBeginIter(); it2 != it->GetPaneList().GetEndIter(); it2++) {
|
||||
it2->mTarget->SetVisible(false);
|
||||
}
|
||||
@@ -672,7 +672,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
if (bVar4) {
|
||||
if (foundLangGroup) {
|
||||
nw4r::lyt::Group* group = layout->FindGroupByName(langGroup);
|
||||
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter(); it++) {
|
||||
it->mTarget->SetVisible(true);
|
||||
@@ -730,7 +730,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void ChannelObj::createThumbnail() {
|
||||
bool bVar1 = false;
|
||||
bool shouldAdjustHeap = false;
|
||||
|
||||
if (mpBalloonLayout == NULL && System::getChannelManager()->isLoaded(mChanPage, mChanIndex)) {
|
||||
initBalloon();
|
||||
@@ -746,12 +746,12 @@ namespace ipl {
|
||||
frame = createWadThumbnail();
|
||||
} else {
|
||||
frame = createWrongThumbnail();
|
||||
bVar1 = true;
|
||||
shouldAdjustHeap = true;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
frame = createEmptyThumbnail();
|
||||
bVar1 = true;
|
||||
shouldAdjustHeap = true;
|
||||
}
|
||||
|
||||
calcNormal();
|
||||
@@ -764,7 +764,7 @@ namespace ipl {
|
||||
mpThumbAnim->setCurrentFrame(frame);
|
||||
}
|
||||
|
||||
if (bVar1) {
|
||||
if (shouldAdjustHeap) {
|
||||
mpThumbLayout->adjustHeap();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ extern "C" {
|
||||
}
|
||||
extern "C" void _seBlk__Q23ipl3snd();
|
||||
extern "C" nw4r::snd::SoundHandle* _mainBGMHandle__Q23ipl3snd;
|
||||
extern "C" const f32 lbl_816946A4;
|
||||
extern "C" const f32 scSoundZeroF;
|
||||
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, lbl_816946A4
|
||||
lfs f1, scSoundZeroF
|
||||
li r4, 0
|
||||
bl SetMasterVolume__Q44nw4r3snd6detail9AxManagerFfi
|
||||
lfs f1, lbl_816946A4
|
||||
lfs f1, scSoundZeroF
|
||||
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 lbl_816946A4 = 0.0f;
|
||||
extern "C" const f32 scSoundZeroF = 0.0f;
|
||||
|
||||
void System::stopBannerSound(int unk) {
|
||||
sBannerSoundPlayer.stop(unk);
|
||||
|
||||
Reference in New Issue
Block a user