Compare commits
1 Commits
cleanup/ip
...
cleanup/se
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c403d9edcc |
@@ -62,17 +62,17 @@ namespace ipl {
|
||||
void start_left_event(const char* paneName);
|
||||
void start_trig_event(const char* paneName);
|
||||
|
||||
typedef struct Unk {
|
||||
typedef struct CmdEntry {
|
||||
int command; // 0x00
|
||||
u32 msgID; // 0x04
|
||||
} Unk;
|
||||
} CmdEntry;
|
||||
|
||||
Unk unk_0x64[64];
|
||||
CmdEntry mCmdQueue[64];
|
||||
|
||||
int unk_0x264;
|
||||
int unk_0x268;
|
||||
int unk_0x26C;
|
||||
int unk_0x270;
|
||||
int mCmdCapacity;
|
||||
int mCmdCount;
|
||||
int mCmdReadIdx;
|
||||
int mCmdWriteIdx;
|
||||
|
||||
int mSettingArg; // 0x274
|
||||
|
||||
|
||||
@@ -185,8 +185,8 @@ namespace ipl {
|
||||
gui::PaneManager* mpGui; // 0x74
|
||||
|
||||
BOOL mbHovered[BTN_MAX]; // 0x78
|
||||
u32 mPendingSceneId;
|
||||
u32 mExitSeqStep;
|
||||
u32 unk_0x90;
|
||||
u32 unk_0x94;
|
||||
|
||||
static const char* smButtonName[BTN_MAX];
|
||||
};
|
||||
|
||||
@@ -89,10 +89,10 @@ namespace ipl {
|
||||
|
||||
int mIPLState; // 0x04
|
||||
volatile BS2State mState; // 0x08
|
||||
bool mbTickEnabled; // 0x0C
|
||||
bool mbUpdateRequested; // 0x0D
|
||||
bool mbAbortRequested; // 0x0E
|
||||
bool mbRestartRequested; // 0x0F
|
||||
bool unk_0x0C;
|
||||
bool unk_0x0D;
|
||||
bool unk_0x0E;
|
||||
bool unk_0x0F;
|
||||
bool mbIsDiagDisc; // 0x10
|
||||
bool mbIncludesSeatTitles; // 0x11
|
||||
u8* mpBannerBuffer; // 0x14
|
||||
|
||||
@@ -63,7 +63,7 @@ typedef struct {
|
||||
u8 mcuYRem; // 0x0F
|
||||
u16 mcuYCount; // 0x10
|
||||
u16 mcuXCount2; // 0x12
|
||||
u32 mcuTotal; // 0x14
|
||||
u32 unk_0x14;
|
||||
u8 remX; // 0x18
|
||||
u8 remY; // 0x19
|
||||
u8 compCount; // 0x1A
|
||||
@@ -142,7 +142,7 @@ struct TMCCJPEGDecWork_t {
|
||||
u8 mcuYRem; // 0x17FF
|
||||
u16 mcuYCount; // 0x1800
|
||||
u16 mcuXCount2; // 0x1802
|
||||
u32 mcuTotal; // 0x1804
|
||||
u32 unk_0x1804;
|
||||
u8 remX; // 0x1808
|
||||
u8 remY; // 0x1809
|
||||
u8 compCount; // 0x180A
|
||||
|
||||
@@ -51,7 +51,7 @@ s32 TMCJPEGDEC_Setsize(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
|
||||
state->componentCount = work->componentCount;
|
||||
state->result = work->mcuTotal;
|
||||
state->result = work->unk_0x1804;
|
||||
state->maxX = work->mcuYCount;
|
||||
state->maxY = work->mcuXCount2;
|
||||
|
||||
|
||||
@@ -567,7 +567,7 @@ s32 TMCJPEGDEC_scan_varinit(TMCCJPEGDecWork* work) {
|
||||
|
||||
p->mcuYCount = p->mcuYCount + ((u8)remX != 0 ? 1 : 0);
|
||||
p->mcuXCount2 = p->mcuXCount2 + ((u8)remY != 0 ? 1 : 0);
|
||||
p->mcuTotal = (u32)p->mcuYCount * (u32)p->mcuXCount2;
|
||||
p->unk_0x14 = (u32)p->mcuYCount * (u32)p->mcuXCount2;
|
||||
|
||||
for (idx = 0; idx < (s32)p->scanCompCount; idx++) {
|
||||
u8 compId;
|
||||
@@ -1929,7 +1929,7 @@ static s32 TMCJPEGDEC_parse_sof(TMCCJPEGDecWork* work) {
|
||||
mcuCountY += yr;
|
||||
frameInfo->mcuYCount = mcuCountX;
|
||||
frameInfo->mcuXCount2 = mcuCountY;
|
||||
work->mcuTotal = (u32)mcuCountX * (u32)mcuCountY;
|
||||
work->unk_0x1804 = (u32)mcuCountX * (u32)mcuCountY;
|
||||
}
|
||||
|
||||
compCount2 = frameInfo->compCount;
|
||||
|
||||
@@ -205,7 +205,7 @@ typedef struct _ziUwdNode {
|
||||
|
||||
struct __zi8_work_data_s {
|
||||
ziU8 unk_0x00;
|
||||
ziU8 countOnly; // 0x01
|
||||
ziU8 unk_0x01;
|
||||
ziU8 unk_0x02[2];
|
||||
ziLanguageEntry* langEntries; // 0x04
|
||||
ziU8 unk_0x08;
|
||||
@@ -265,7 +265,7 @@ struct __zi8_work_data_s {
|
||||
ziPtr unk_0x11FC;
|
||||
ziPtr userKeys[0x83]; // 0x1200
|
||||
ziU8 unk_0x140C[4];
|
||||
ziU32 formats; // 0x1410
|
||||
ziU32 unk_0x1410;
|
||||
ziU8 unk_0x1414[4];
|
||||
ziU8 unk_0x1418;
|
||||
ziU8 unk_0x1419;
|
||||
@@ -273,7 +273,7 @@ struct __zi8_work_data_s {
|
||||
ziU8 unk_0x141C;
|
||||
ziU8 unk_0x141D;
|
||||
ziU8 unk_0x141E;
|
||||
ziU8 maxCnt; // 0x141F
|
||||
ziU8 unk_0x141F;
|
||||
ziU8 unk_0x1420[4];
|
||||
zi8DawgCtx dawgCtx; // 0x1424
|
||||
ziU8 unk_0x1760[4]; // 0x1760
|
||||
@@ -283,7 +283,7 @@ struct __zi8_work_data_s {
|
||||
ziU16 unk_0x17EA;
|
||||
ziU8 unk_0x17EC;
|
||||
ziU8 unk_0x17ED[3];
|
||||
ziU8* dawgGroup; // 0x17F0
|
||||
ziU8* unk_0x17F0;
|
||||
ziWChar unk_0x17F4[0x40]; // 0x17F4..0x1874
|
||||
ziU16 unk_0x1874;
|
||||
ziU8 unk_0x1876;
|
||||
|
||||
@@ -136,7 +136,7 @@ descend:
|
||||
records[context->cnt].node = ZiDAWGGetChild(records[context->cnt - 1].node);
|
||||
if (records[context->cnt].node == (ziU8*)0) goto next_sibling;
|
||||
context->cnt++;
|
||||
if (ZI_WORK->maxCnt < context->cnt) ZI_WORK->maxCnt = context->cnt;
|
||||
if (ZI_WORK->unk_0x141F < context->cnt) ZI_WORK->unk_0x141F = context->cnt;
|
||||
goto update_current;
|
||||
next_sibling:
|
||||
while (context->cnt != 0) {
|
||||
@@ -238,7 +238,7 @@ unsigned int Zi8MatchROMdata2(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
}
|
||||
}
|
||||
search_segment:
|
||||
ZI_WORK->maxCnt = 1;
|
||||
ZI_WORK->unk_0x141F = 1;
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA,
|
||||
count - ZI_WORK->unk_0x17EA, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
@@ -262,8 +262,8 @@ search_segment:
|
||||
if (elements[index] == 0xeff1) goto finish_segments;
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->maxCnt > capacity) goto finish_segments;
|
||||
for (index = ZI_WORK->maxCnt; index != 0; index--) {
|
||||
if (ZI_WORK->unk_0x141F > capacity) goto finish_segments;
|
||||
for (index = ZI_WORK->unk_0x141F; index != 0; index--) {
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA, index, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
1, 0, ZI_WORK->unk_0x1768, (char*)group,
|
||||
@@ -306,7 +306,7 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
} else {
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x17EC = 0;
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
} else if (ZI_WORK->unk_0x17EC != 0) {
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
goto finish_match;
|
||||
@@ -316,30 +316,30 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, 0, acceptPrefix, ZI_WORK);
|
||||
} else {
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) break;
|
||||
status = 0;
|
||||
if (count <= 1 && language == 0x36) break;
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
}
|
||||
}
|
||||
if ((ziU8)result == 0 && status == 0 && mode == 1 && count == 1 && capacity >= 1) {
|
||||
mode = 0;
|
||||
ZI_WORK->unk_0x17EC = 1;
|
||||
if (tableSize != 0) {
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
acceptPrefix, ZI_WORK) != 0) {
|
||||
*output = *elements;
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
}
|
||||
} else {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
|
||||
@@ -50,10 +50,10 @@ ziBool Zi8ZHsetZYfuzzyPairs(ziFuzzyZYPairs pairs ZI_NEED_WORK) {
|
||||
|
||||
ziBool Zi8SetLatinSearchOrder(ziU8* searchArray, ziU8 searchSize ZI_NEED_WORK) {
|
||||
if (searchArray == 0 || *searchArray == 0) {
|
||||
ZI_WORK->formats = (ziU32)Zi8SOdefaultArray;
|
||||
ZI_WORK->unk_0x1410 = (ziU32)Zi8SOdefaultArray;
|
||||
ZI_WORK->unk_0x1418 = 9;
|
||||
} else {
|
||||
ZI_WORK->formats = (ziU32)searchArray;
|
||||
ZI_WORK->unk_0x1410 = (ziU32)searchArray;
|
||||
ZI_WORK->unk_0x1418 = searchSize;
|
||||
}
|
||||
return 1;
|
||||
@@ -339,11 +339,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
if ((parameters->elementCount == 1) && (parameters->firstCandidate == 0)) {
|
||||
switch (parameters->language) {
|
||||
case 1:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEF04) {
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
@@ -400,11 +400,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
break;
|
||||
case 0x11:
|
||||
default:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEFF2) {
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -45,7 +45,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
ziWChar* cursor;
|
||||
ziU8* data;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziU32 savedFormats = ZI_WORK->formats;
|
||||
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||
ziSearchState search = {0};
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
@@ -73,7 +73,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
request.candidates = ordinals;
|
||||
request.maxCandidates = 1;
|
||||
request.firstCandidate = 0;
|
||||
ZI_WORK->formats = (ziU32)formats;
|
||||
ZI_WORK->unk_0x1410 = (ziU32)formats;
|
||||
if (ZI_WORK->unk_0x1C[0] == 2) {
|
||||
ZI_WORK->unk_0x1418 = 0;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->unk_0x1418++] = 1;
|
||||
@@ -87,7 +87,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
} else if (ZI_WORK->unk_0x1C[0] != 0) ZI_WORK->unk_0x1418 = 2;
|
||||
else ZI_WORK->unk_0x1418 = 1;
|
||||
count = Zi8GetCandidatesOrCount(&request, &search, __zi8_work_data);
|
||||
ZI_WORK->formats = savedFormats;
|
||||
ZI_WORK->unk_0x1410 = savedFormats;
|
||||
ZI_WORK->unk_0x1418 = savedCount;
|
||||
if (count != 0) return 1;
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ typedef struct NWC24MsgObjPrivate {
|
||||
#ifdef NWC24_MSG_READ
|
||||
u32 headerSize;
|
||||
#elif defined(NWC24_MBOX_CTRL) || defined(NWC24_MSG_COMMIT)
|
||||
u32 flags; // 0x10
|
||||
u32 unk_0x10;
|
||||
#else
|
||||
u8 unk_0x10[0x4];
|
||||
#endif
|
||||
|
||||
@@ -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->flags && (s32)entry->date == (s32)msg->date) {
|
||||
entry->flags == msg->unk_0x10 && (s32)entry->date == (s32)msg->date) {
|
||||
duplicateId = entry->msgId;
|
||||
duplicateOffset = offset;
|
||||
continue;
|
||||
@@ -956,7 +956,7 @@ static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entr
|
||||
entry->type = msg->type;
|
||||
entry->length = msg->length;
|
||||
entry->appId = msg->appId;
|
||||
entry->flags = msg->flags;
|
||||
entry->flags = msg->unk_0x10;
|
||||
entry->tag = msg->tag;
|
||||
entry->ledPattern = msg->ledPattern;
|
||||
entry->crc = msg->unk_0x1C;
|
||||
@@ -1003,7 +1003,7 @@ static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* ms
|
||||
msg->type = entry->type;
|
||||
msg->length = entry->length;
|
||||
msg->appId = entry->appId;
|
||||
msg->flags = entry->flags;
|
||||
msg->unk_0x10 = entry->flags;
|
||||
msg->tag = entry->tag;
|
||||
msg->ledPattern = entry->ledPattern;
|
||||
msg->unk_0x1C = entry->crc;
|
||||
|
||||
@@ -330,7 +330,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
}
|
||||
CHECK_WRITE(WriteString(msg, buffer));
|
||||
if (msg->type & 0x10000) {
|
||||
msg->flags = msg->length;
|
||||
msg->unk_0x10 = msg->length;
|
||||
buffer = NWC24WorkP->stringWork;
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_sprintf(buffer, "\r\n--%s", MultiPartDivider);
|
||||
@@ -339,7 +339,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
}
|
||||
CHECK_WRITE(WriteContentTypeField(msg));
|
||||
if (!(msg->type & 0x10000))
|
||||
msg->flags = msg->length;
|
||||
msg->unk_0x10 = msg->length;
|
||||
text.ptr = (const void*)msg->length;
|
||||
{ NWC24Err textResult = WritePlainText(msg);
|
||||
err = textResult == NWC24_ERR_NULL ? NWC24_OK : textResult; }
|
||||
|
||||
@@ -25,16 +25,16 @@ typedef struct {
|
||||
undefined4 result;
|
||||
undefined4 errCode;
|
||||
HTTPTestState httpTestState;
|
||||
undefined4 natState;
|
||||
undefined4 gsAvailable;
|
||||
undefined4 natTimedOut;
|
||||
undefined4 natFailed;
|
||||
undefined4 unk_0x030;
|
||||
undefined4 unk_0x034;
|
||||
undefined4 unk_0x038;
|
||||
undefined4 unk_0x03c;
|
||||
OSTime detectStartTime;
|
||||
NHTTPConnection httpConnection;
|
||||
NHTTPRequest* httpRequest;
|
||||
NHTTPResponse* httpResponse;
|
||||
NCDProxyProfile proxy;
|
||||
void* httpBuf;
|
||||
void* unk_0x7f0;
|
||||
NAT nat;
|
||||
} StaticSession;
|
||||
|
||||
@@ -64,14 +64,14 @@ void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy) {
|
||||
g_session.result = 0xFF00;
|
||||
g_session.errCode = 0;
|
||||
g_session.httpTestState = HTTP_TEST_NOT_STARTED;
|
||||
g_session.natState = 0;
|
||||
g_session.unk_0x030 = 0;
|
||||
g_session.detectStartTime = 0;
|
||||
g_session.httpConnection = 0;
|
||||
g_session.httpRequest = 0;
|
||||
g_session.httpResponse = NULL;
|
||||
g_session.gsAvailable = 0;
|
||||
g_session.natTimedOut = 0;
|
||||
g_session.natFailed = 1;
|
||||
g_session.unk_0x034 = 0;
|
||||
g_session.unk_0x038 = 0;
|
||||
g_session.unk_0x03c = 1;
|
||||
g_session.proxy = *proxy;
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ int IPLContestProcess() {
|
||||
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52200;
|
||||
OSReport("[error] Failed to start up NHTTP.\n");
|
||||
} else {
|
||||
g_session.httpBuf = IPLContestAlloc(0x400);
|
||||
g_session.unk_0x7f0 = IPLContestAlloc(0x400);
|
||||
g_session.httpTestState = HTTP_TEST_STARTED;
|
||||
OSReport("Starting HTTP conectting test.\n");
|
||||
}
|
||||
@@ -108,7 +108,7 @@ int IPLContestProcess() {
|
||||
}
|
||||
case HTTP_TEST_STARTED: {
|
||||
g_session.httpRequest =
|
||||
NHTTPCreateRequest("http://conntest.nintendowifi.net/", 0, g_session.httpBuf, 0x400, sNHTTPReqCallback, 0);
|
||||
NHTTPCreateRequest("http://conntest.nintendowifi.net/", 0, g_session.unk_0x7f0, 0x400, sNHTTPReqCallback, 0);
|
||||
if (g_session.httpRequest == 0) {
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
|
||||
g_session.result |= 4;
|
||||
@@ -156,9 +156,9 @@ int IPLContestProcess() {
|
||||
NHTTPDestroyResponse(g_session.httpResponse);
|
||||
g_session.httpResponse = NULL;
|
||||
}
|
||||
if (g_session.httpBuf != NULL) {
|
||||
IPLContestFree(g_session.httpBuf, 0);
|
||||
g_session.httpBuf = NULL;
|
||||
if (g_session.unk_0x7f0 != NULL) {
|
||||
IPLContestFree(g_session.unk_0x7f0, 0);
|
||||
g_session.unk_0x7f0 = NULL;
|
||||
}
|
||||
g_session.httpTestState = HTTP_TEST_DONE;
|
||||
NHTTPCleanupAsync(sNHTTPCleanupCallback);
|
||||
@@ -176,9 +176,9 @@ int IPLContestProcess() {
|
||||
NHTTPDestroyResponse(g_session.httpResponse);
|
||||
g_session.httpResponse = NULL;
|
||||
}
|
||||
if (g_session.httpBuf != NULL) {
|
||||
IPLContestFree(g_session.httpBuf, 0);
|
||||
g_session.httpBuf = NULL;
|
||||
if (g_session.unk_0x7f0 != NULL) {
|
||||
IPLContestFree(g_session.unk_0x7f0, 0);
|
||||
g_session.unk_0x7f0 = NULL;
|
||||
}
|
||||
g_session.httpTestState = HTTP_TEST_DONE;
|
||||
NHTTPCleanupAsync(sNHTTPCleanupCallback);
|
||||
@@ -198,11 +198,11 @@ int IPLContestProcess() {
|
||||
OSReport("Port mapping detectioning test has been skipped.\n");
|
||||
|
||||
} else
|
||||
switch (g_session.natState) {
|
||||
switch (g_session.unk_0x030) {
|
||||
case 0: {
|
||||
gsiMemoryCallbacksSet(IPLContestGSMalloc, IPLContestGSFree, IPLContestGSRealloc, IPLContestGSMemalign);
|
||||
GSIStartAvailableCheckA("wiinat");
|
||||
g_session.natState = 1;
|
||||
g_session.unk_0x030 = 1;
|
||||
OSReport("Starting GameSpy available check.\n");
|
||||
break;
|
||||
}
|
||||
@@ -212,14 +212,14 @@ int IPLContestProcess() {
|
||||
break;
|
||||
}
|
||||
case GSIACAvailable: {
|
||||
g_session.gsAvailable = 1;
|
||||
g_session.natState = 2;
|
||||
g_session.unk_0x034 = 1;
|
||||
g_session.unk_0x030 = 2;
|
||||
OSReport("GameSpy server is currently available.\n");
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
g_session.gsAvailable = 0;
|
||||
g_session.natState = 5;
|
||||
g_session.unk_0x034 = 0;
|
||||
g_session.unk_0x030 = 5;
|
||||
OSReport("GameSpy server is currently unavailable.\n");
|
||||
break;
|
||||
}
|
||||
@@ -228,7 +228,7 @@ int IPLContestProcess() {
|
||||
}
|
||||
case 2: {
|
||||
NNStartNatDetection(onNatDetectionDone);
|
||||
g_session.natState = 3;
|
||||
g_session.unk_0x030 = 3;
|
||||
OSReport("Port mapping detectioning test has been started.\n");
|
||||
g_session.detectStartTime = OSGetTime();
|
||||
break;
|
||||
@@ -238,8 +238,8 @@ int IPLContestProcess() {
|
||||
if (OSGetTime() - g_session.detectStartTime < OSMillisecondsToTicks((OSTime)90000)) {
|
||||
break;
|
||||
}
|
||||
g_session.natState = 5;
|
||||
g_session.natTimedOut = 1;
|
||||
g_session.unk_0x030 = 5;
|
||||
g_session.unk_0x038 = 1;
|
||||
OSReport("[error] NAT timeout.\n");
|
||||
break;
|
||||
}
|
||||
@@ -289,10 +289,10 @@ int IPLGetNATSupportCode(int conntype) {
|
||||
|
||||
nat = g_session.nat;
|
||||
|
||||
if (g_session.gsAvailable != 0) {
|
||||
if (g_session.natTimedOut != 0) {
|
||||
if (g_session.unk_0x034 != 0) {
|
||||
if (g_session.unk_0x038 != 0) {
|
||||
code = 11180;
|
||||
} else if (g_session.natFailed != 0) {
|
||||
} else if (g_session.unk_0x03c != 0) {
|
||||
code = 11170;
|
||||
} else {
|
||||
if (nat.mappingScheme == 0 && nat.mappings[2].publicPort == nat.mappings[1].publicPort * 2 - nat.mappings[0].publicPort) {
|
||||
@@ -464,10 +464,10 @@ void sNHTTPCleanupCallback() {
|
||||
void onNatDetectionDone(gsi_bool success, NAT nat) {
|
||||
if (success) {
|
||||
g_session.nat = nat;
|
||||
g_session.natFailed = 0;
|
||||
g_session.unk_0x03c = 0;
|
||||
} else {
|
||||
g_session.natFailed = 1;
|
||||
g_session.unk_0x03c = 1;
|
||||
}
|
||||
g_session.natState = 4;
|
||||
g_session.unk_0x030 = 4;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -15,10 +15,10 @@ namespace ipl {
|
||||
// clang-format on
|
||||
|
||||
SettingButton::SettingButton(EGG::Heap* heap, int arg) : FaderSceneBase(heap), ::gui::EventHandler() {
|
||||
unk_0x264 = 64;
|
||||
unk_0x268 = 0;
|
||||
unk_0x26C = 0;
|
||||
unk_0x270 = 0;
|
||||
mCmdCapacity = 64;
|
||||
mCmdCount = 0;
|
||||
mCmdReadIdx = 0;
|
||||
mCmdWriteIdx = 0;
|
||||
mSettingArg = arg;
|
||||
mpLayout = NULL;
|
||||
mpLayoutFile = NULL;
|
||||
@@ -81,8 +81,8 @@ namespace ipl {
|
||||
|
||||
FaderSceneCommand SettingButton::calcNormal() {
|
||||
if (!mpLayout->getAnim(ANIM_ALPHA_IN)->isPlaying() && !mpLayout->getAnim(ANIM_ALPHA_OUT)->isPlaying() &&
|
||||
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && unk_0x268 != 0) {
|
||||
Unk unk = unk_0x64[unk_0x26C];
|
||||
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && mCmdCount != 0) {
|
||||
CmdEntry unk = mCmdQueue[mCmdReadIdx];
|
||||
switch (unk.command) {
|
||||
case CMD_SHOW_BTN: {
|
||||
showBtn();
|
||||
@@ -98,11 +98,11 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
if (unk_0x268 != 0) {
|
||||
if (++unk_0x26C >= unk_0x264) {
|
||||
unk_0x26C = 0;
|
||||
if (mCmdCount != 0) {
|
||||
if (++mCmdReadIdx >= mCmdCapacity) {
|
||||
mCmdReadIdx = 0;
|
||||
}
|
||||
unk_0x268--;
|
||||
mCmdCount--;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -225,16 +225,16 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SettingButton::reserve(int command, u32 msgId) {
|
||||
if (unk_0x264 != unk_0x268) {
|
||||
int unk = unk_0x270;
|
||||
unk_0x64[unk].command = command;
|
||||
unk_0x64[unk].msgID = msgId;
|
||||
unk_0x270++;
|
||||
if (mCmdCapacity != mCmdCount) {
|
||||
int unk = mCmdWriteIdx;
|
||||
mCmdQueue[unk].command = command;
|
||||
mCmdQueue[unk].msgID = msgId;
|
||||
mCmdWriteIdx++;
|
||||
|
||||
if (unk_0x270 >= unk_0x264) {
|
||||
unk_0x270 = 0;
|
||||
if (mCmdWriteIdx >= mCmdCapacity) {
|
||||
mCmdWriteIdx = 0;
|
||||
}
|
||||
unk_0x268++;
|
||||
mCmdCount++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ namespace ipl {
|
||||
|
||||
SettingSelect::SettingSelect(EGG::Heap* heap, int arg)
|
||||
: Base(heap), ::gui::EventHandler(), mState(STATE_WAIT_BUTTON_FADE_IN), mPrevState(STATE_WAIT_BUTTON_FADE_IN), mSettingArg(arg),
|
||||
mpLayout(NULL), mpLayoutFile(NULL), mpGui(NULL), mPendingSceneId(0), mExitSeqStep(0) {
|
||||
mpLayout(NULL), mpLayoutFile(NULL), mpGui(NULL), unk_0x90(0), unk_0x94(0) {
|
||||
setSceneParentFlags(SCN_PARENTFLAG_CALC | SCN_PARENTFLAG_DRAW);
|
||||
}
|
||||
|
||||
@@ -222,7 +222,7 @@ namespace ipl {
|
||||
|
||||
void SettingSelect::stt_1st_fadeout() {
|
||||
if (is_stopped_all_anm()) {
|
||||
if (mPendingSceneId != 0) {
|
||||
if (unk_0x90 != 0) {
|
||||
System::getFader()->fadeOut();
|
||||
CHANGE_STATE(STATE_WAIT_BLACK_OUT);
|
||||
} else {
|
||||
@@ -247,7 +247,7 @@ namespace ipl {
|
||||
|
||||
void SettingSelect::stt_2nd_fadeout() {
|
||||
if (is_stopped_all_anm()) {
|
||||
if (mPendingSceneId != 0) {
|
||||
if (unk_0x90 != 0) {
|
||||
CHANGE_STATE(STATE_WAIT_CHILD);
|
||||
reset_gui();
|
||||
} else {
|
||||
@@ -309,7 +309,7 @@ namespace ipl {
|
||||
case STATE_1ST_NORMAL: {
|
||||
System::getChannelManager()->refreshAsync();
|
||||
System::getFader()->fadeOut();
|
||||
mPendingSceneId = SCENE_BOARD;
|
||||
unk_0x90 = 4;
|
||||
|
||||
reserveAllSceneDestruction(SCENE_BOARD, NULL);
|
||||
|
||||
@@ -369,8 +369,8 @@ namespace ipl {
|
||||
int backAnim = -1;
|
||||
int inAnim = -1;
|
||||
|
||||
switch (mPendingSceneId) {
|
||||
case SCENE_MEMORY: {
|
||||
switch (unk_0x90) {
|
||||
case 13: {
|
||||
#ifndef KOREAN_BUILD
|
||||
backAnim = ANIM_WII_SAVE_DATA_BACK;
|
||||
inAnim = ANIM_GC_SAVE_DATA_IN;
|
||||
@@ -380,12 +380,12 @@ namespace ipl {
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
case SCENE_MEMORY_CARD: {
|
||||
case 14: {
|
||||
backAnim = ANIM_GC_SAVE_DATA_BACK;
|
||||
inAnim = ANIM_WII_SAVE_DATA_IN;
|
||||
break;
|
||||
}
|
||||
case SCENE_CHANNEL_EDIT: {
|
||||
case 12: {
|
||||
backAnim = ANIM_CHANNEL_BACK;
|
||||
inAnim = ANIM_SAVE_DATA_IN;
|
||||
if (mSettingArg == SettingSelectArg::ARG_START_SAVE_DATA) {
|
||||
@@ -404,14 +404,14 @@ namespace ipl {
|
||||
|
||||
void SettingSelect::stt_wait_child_anm() {
|
||||
if (is_stopped_all_anm()) {
|
||||
switch (mPendingSceneId) {
|
||||
case SCENE_CHANNEL_EDIT: {
|
||||
switch (unk_0x90) {
|
||||
case 12: {
|
||||
static_cast<SettingButton*>(System::getScene(SCENE_SETTING_BUTTON))->showWii();
|
||||
CHANGE_STATE(STATE_2ND_NORMAL);
|
||||
break;
|
||||
}
|
||||
case SCENE_MEMORY:
|
||||
case SCENE_MEMORY_CARD: {
|
||||
case 13:
|
||||
case 14: {
|
||||
static_cast<SettingButton*>(System::getScene(SCENE_SETTING_BUTTON))->showWii();
|
||||
#ifndef KOREAN_BUILD
|
||||
CHANGE_STATE(STATE_3RD_NORMAL);
|
||||
@@ -422,7 +422,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
mPendingSceneId = 0;
|
||||
unk_0x90 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -587,7 +587,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BTN_SETTING: {
|
||||
mPendingSceneId = SCENE_SETTING;
|
||||
unk_0x90 = 18;
|
||||
flashAnim = ANIM_SETTING_FLASH;
|
||||
outAnim = ANIM_DATA_MANAGE_OUT;
|
||||
reserveAllSceneDestruction(SCENE_SETTING, (void*)Setting::ARG_NORMAL_PAGE);
|
||||
@@ -596,7 +596,7 @@ namespace ipl {
|
||||
}
|
||||
case BTN_SAVEDATA: {
|
||||
#ifdef KOREAN_BUILD
|
||||
mPendingSceneId = SCENE_MEMORY;
|
||||
unk_0x90 = 13;
|
||||
#endif
|
||||
flashAnim = ANIM_SAVE_DATA_FLASH;
|
||||
outAnim = ANIM_CHANNEL_OUT;
|
||||
@@ -611,7 +611,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BTN_CHANNEL: {
|
||||
mPendingSceneId = SCENE_CHANNEL_EDIT;
|
||||
unk_0x90 = 12;
|
||||
flashAnim = ANIM_CHANNEL_FLASH;
|
||||
outAnim = ANIM_SAVE_DATA_OUT;
|
||||
createChildScene(SCENE_CHANNEL_EDIT, this, NULL);
|
||||
@@ -623,7 +623,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BTN_WII_SAVE: {
|
||||
mPendingSceneId = SCENE_MEMORY;
|
||||
unk_0x90 = 13;
|
||||
flashAnim = ANIM_WII_SAVE_DATA_FLASH;
|
||||
outAnim = ANIM_GC_SAVE_DATA_OUT;
|
||||
createChildScene(SCENE_MEMORY, this, NULL);
|
||||
@@ -632,7 +632,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BTN_GC_SAVE: {
|
||||
mPendingSceneId = SCENE_MEMORY_CARD;
|
||||
unk_0x90 = 14;
|
||||
flashAnim = ANIM_GC_SAVE_DATA_FLASH;
|
||||
outAnim = ANIM_WII_SAVE_DATA_OUT;
|
||||
createChildScene(SCENE_MEMORY_CARD, this, NULL);
|
||||
@@ -689,7 +689,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SettingSelect::calc_exit_sequence() {
|
||||
switch (mExitSeqStep) {
|
||||
switch (unk_0x94) {
|
||||
case 0: {
|
||||
prepare_exit_abort();
|
||||
break;
|
||||
@@ -720,13 +720,13 @@ namespace ipl {
|
||||
|
||||
System::getBS2Manager()->abort();
|
||||
System::stopReceiveSchedule();
|
||||
mExitSeqStep = 1;
|
||||
unk_0x94 = 1;
|
||||
}
|
||||
}
|
||||
|
||||
void SettingSelect::wait_decide_se() {
|
||||
if (!snd::getSystem()->isSEActive("WIPL_SE_DECIDE")) {
|
||||
mExitSeqStep = 2;
|
||||
unk_0x94 = 2;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -734,7 +734,7 @@ namespace ipl {
|
||||
__WPADReconnect(TRUE);
|
||||
snd::getSystem()->stopAllSound(20);
|
||||
System::getFader()->fadeOut();
|
||||
mExitSeqStep = 3;
|
||||
unk_0x94 = 3;
|
||||
}
|
||||
|
||||
void SettingSelect::finish_exit_reboot() {
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
namespace ipl {
|
||||
namespace bs2 {
|
||||
Manager::Manager(EGG::Heap* pHeap)
|
||||
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), mbTickEnabled(true), mbUpdateRequested(false), mbAbortRequested(false), mbRestartRequested(false),
|
||||
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), unk_0x0C(true), unk_0x0D(false), unk_0x0E(false), unk_0x0F(false),
|
||||
mbIsDiagDisc(false), mbIncludesSeatTitles(false), mbHasBanner(FALSE), mUnlockedState(BS2_STT_NO_DISK), mbStartUpdate(false),
|
||||
mEntries(NULL), mEntrySize(1), mEntryOffset(0) {
|
||||
mpBannerBuffer = new (pHeap, DEFAULT_ALIGN) u8[BS2_DEFAULT_BANNER_SIZE];
|
||||
@@ -30,13 +30,13 @@ namespace ipl {
|
||||
return mIPLState;
|
||||
}
|
||||
|
||||
if (mbRestartRequested && !System::isNandFull()) {
|
||||
if (unk_0x0F && !System::isNandFull()) {
|
||||
BS2RestartStateMachine();
|
||||
|
||||
mbTickEnabled = true;
|
||||
unk_0x0C = true;
|
||||
mIPLState = IPL_STATE_NO_DISK;
|
||||
mbRestartRequested = false;
|
||||
} else if (mbTickEnabled) {
|
||||
unk_0x0F = false;
|
||||
} else if (unk_0x0C) {
|
||||
BOOL old = OSDisableInterrupts();
|
||||
|
||||
mState = BS2Tick();
|
||||
@@ -51,7 +51,7 @@ namespace ipl {
|
||||
|
||||
if (mbIsDiagDisc && System::isRsrcLoaded()) {
|
||||
__WPADReconnect(TRUE);
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
bootNewSystem();
|
||||
}
|
||||
}
|
||||
@@ -65,7 +65,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::startUpdate() {
|
||||
mbUpdateRequested = true;
|
||||
unk_0x0D = true;
|
||||
mbStartUpdate = true;
|
||||
mPrevEntry = 0;
|
||||
mPrevFound = 0;
|
||||
@@ -88,11 +88,11 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::reserveRVLGame() {
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
}
|
||||
|
||||
void Manager::reserveGCGame() {
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
}
|
||||
|
||||
void Manager::startRVLGame() {
|
||||
@@ -103,13 +103,13 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::abort() {
|
||||
mbAbortRequested = true;
|
||||
mbRestartRequested = false;
|
||||
unk_0x0E = true;
|
||||
unk_0x0F = false;
|
||||
}
|
||||
|
||||
void Manager::restart() {
|
||||
mbAbortRequested = false;
|
||||
mbRestartRequested = true;
|
||||
unk_0x0E = false;
|
||||
unk_0x0F = true;
|
||||
|
||||
System::checkNandOverFlowFlagAsync();
|
||||
}
|
||||
@@ -195,7 +195,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BS2_STT_64: {
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
mIPLState = IPL_STATE_8;
|
||||
break;
|
||||
}
|
||||
@@ -216,25 +216,25 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::execTick(BS2State state) {
|
||||
if (mbUpdateRequested) {
|
||||
if (unk_0x0D) {
|
||||
if (state == BS2_STT_UPDATE_DISK) {
|
||||
BS2StartUpdate();
|
||||
} else {
|
||||
mbStartUpdate = false;
|
||||
}
|
||||
} else if (mbAbortRequested) {
|
||||
} else if (unk_0x0E) {
|
||||
if (state == BS2_STT_NO_DISK || state == BS2_STT_COVER_OPEN || state == BS2_STT_55 || state == BS2_STT_WRONG_DISK ||
|
||||
state == BS2_STT_66 || state == BS2_STT_67 || state == BS2_STT_68 || state == BS2_STT_FATAL_ERROR ||
|
||||
state == BS2_STT_UPDATE_FAILED || state == BS2_STT_DIRTY_DISK) {
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
mIPLState = IPL_STATE_8;
|
||||
} else {
|
||||
BS2AbortStateMachine();
|
||||
}
|
||||
}
|
||||
|
||||
mbUpdateRequested = false;
|
||||
mbAbortRequested = false;
|
||||
unk_0x0D = false;
|
||||
unk_0x0E = false;
|
||||
}
|
||||
|
||||
void Manager::updateTick() {
|
||||
|
||||
Reference in New Issue
Block a user