Compare commits
1 Commits
cleanup/er
...
cleanup/ip
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
24e76ff0bb |
@@ -18,11 +18,11 @@ namespace ipl {
|
||||
|
||||
class line_collision {
|
||||
public:
|
||||
line_collision() : unk_0x00(0.0f), unk_0x04(0.0f), unk_0x08(0.0f) {}
|
||||
line_collision() : mLeft(0.0f), mRight(0.0f), mY(0.0f) {}
|
||||
|
||||
f32 unk_0x00;
|
||||
f32 unk_0x04;
|
||||
f32 unk_0x08;
|
||||
f32 mLeft;
|
||||
f32 mRight;
|
||||
f32 mY;
|
||||
nw4r::ut::Link mLinkList; // 0x0C
|
||||
};
|
||||
|
||||
@@ -31,9 +31,9 @@ namespace ipl {
|
||||
url_collision();
|
||||
~url_collision();
|
||||
|
||||
int unk_0x00;
|
||||
wchar_t* unk_0x04;
|
||||
wchar_t* unk_0x08;
|
||||
int mTagNo;
|
||||
wchar_t* mpStart;
|
||||
wchar_t* mpEnd;
|
||||
nw4r::ut::Link mLinkList; // 0x0C
|
||||
nw4r::ut::List mLineCollisions; // 0x14
|
||||
};
|
||||
@@ -53,19 +53,19 @@ namespace ipl {
|
||||
void parse(nw4r::ut::PrintContext<wchar_t>* context);
|
||||
|
||||
BOOL is_focused() const;
|
||||
void select(int unk);
|
||||
void select(int tagNo);
|
||||
|
||||
int get_focused_tagno(int chan) const;
|
||||
url_collision* get_selected_col();
|
||||
|
||||
void get_url(char* urlOut, u32 urlLen);
|
||||
|
||||
void setUnk_0x40(f32 val) { unk_0x40 = val; }
|
||||
void setUnk_0x44(f32 val) { unk_0x44 = val; }
|
||||
void setUnk_0x53(bool val) { unk_0x53 = val; }
|
||||
void setHitYOffset(f32 val) { mHitYOffset = val; }
|
||||
void setMemoTranslateY(f32 val) { mMemoTranslateY = val; }
|
||||
void setFocusEnabled(bool val) { mbFocusEnabled = val; }
|
||||
|
||||
u8 getUnk_0x50() const { return unk_0x50; }
|
||||
void setUnk_0x50(u8 val) { unk_0x50 = val; }
|
||||
u8 getColorPass() const { return mbColorPass; }
|
||||
void setColorPass(u8 val) { mbColorPass = val; }
|
||||
|
||||
private:
|
||||
typedef struct {
|
||||
@@ -75,14 +75,14 @@ namespace ipl {
|
||||
|
||||
con_data mConData[WPAD_MAX_CONTROLLERS]; // 0x00
|
||||
nw4r::ut::List mUrlCollisions; // 0x34
|
||||
f32 unk_0x40;
|
||||
f32 unk_0x44;
|
||||
int unk_0x48;
|
||||
int unk_0x4C;
|
||||
u8 unk_0x50;
|
||||
u8 unk_0x51;
|
||||
u8 unk_0x52;
|
||||
u8 unk_0x53;
|
||||
f32 mHitYOffset;
|
||||
f32 mMemoTranslateY;
|
||||
int mCurTagNo;
|
||||
int mSelectedTagNo;
|
||||
u8 mbColorPass;
|
||||
u8 mbInTag;
|
||||
u8 mbHoverOffset;
|
||||
u8 mbFocusEnabled;
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -60,9 +60,9 @@ namespace ipl {
|
||||
|
||||
int mMessageID; // 0x08
|
||||
|
||||
int mArg2;
|
||||
int mArg3;
|
||||
char mArg1[4];
|
||||
int unk_0x0C;
|
||||
int unk_0x10;
|
||||
char unk_0x14[4];
|
||||
|
||||
u8* mpArcData; // 0x18
|
||||
u32 mArcSize; // 0x1C
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -930,13 +930,13 @@ namespace ipl {
|
||||
math::VEC3 translate(mpLayout->FindPaneByName("N_Memo")->GetTranslate());
|
||||
|
||||
mURLProc.clear_prev_drawing();
|
||||
mURLProc.setUnk_0x44(translate.y);
|
||||
mURLProc.setMemoTranslateY(translate.y);
|
||||
|
||||
bool result = false;
|
||||
if (mState == STATE_NORMAL && mScroller.is_busy() == FALSE) {
|
||||
result = true;
|
||||
}
|
||||
mURLProc.setUnk_0x53(result);
|
||||
mURLProc.setFocusEnabled(result);
|
||||
|
||||
if (translate.y < 500.0f) {
|
||||
mpLayout->draw("N_Header");
|
||||
@@ -983,8 +983,8 @@ namespace ipl {
|
||||
mpLayout->draw("ReplyMask");
|
||||
}
|
||||
|
||||
if (!mURLProc.getUnk_0x50()) {
|
||||
mURLProc.setUnk_0x50(1);
|
||||
if (!mURLProc.getColorPass()) {
|
||||
mURLProc.setColorPass(1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1512,7 +1512,7 @@ namespace ipl {
|
||||
mURLProc.init();
|
||||
|
||||
if (mpBoardObj->mLetterType == BoardObject::TYPE_MEMO) {
|
||||
mURLProc.setUnk_0x40(8.0f);
|
||||
mURLProc.setHitYOffset(8.0f);
|
||||
}
|
||||
|
||||
nw4r::lyt::Pane* pane = mpLayout->FindPaneByName("T_Letter");
|
||||
|
||||
@@ -15,16 +15,16 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void UrlProcessor::init() {
|
||||
unk_0x52 = 0;
|
||||
unk_0x51 = 0;
|
||||
unk_0x50 = 0;
|
||||
unk_0x53 = 1;
|
||||
mbHoverOffset = 0;
|
||||
mbInTag = 0;
|
||||
mbColorPass = 0;
|
||||
mbFocusEnabled = 1;
|
||||
|
||||
unk_0x40 = 0.0f;
|
||||
unk_0x44 = 0.0f;
|
||||
mHitYOffset = 0.0f;
|
||||
mMemoTranslateY = 0.0f;
|
||||
|
||||
unk_0x48 = 0;
|
||||
unk_0x4C = -1;
|
||||
mCurTagNo = 0;
|
||||
mSelectedTagNo = -1;
|
||||
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
mConData[i].valid = false;
|
||||
@@ -60,14 +60,14 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void UrlProcessor::clear_prev_drawing() {
|
||||
unk_0x48 = 0;
|
||||
unk_0x52 = 0;
|
||||
unk_0x51 = 0;
|
||||
mCurTagNo = 0;
|
||||
mbHoverOffset = 0;
|
||||
mbInTag = 0;
|
||||
}
|
||||
|
||||
nw4r::ut::Operation UrlProcessor::Process(u16 code, nw4r::ut::PrintContext<wchar_t>* context) {
|
||||
if (code == SEPERATOR || code == (u16)'\n') {
|
||||
if (unk_0x50 == 0) {
|
||||
if (mbColorPass == 0) {
|
||||
make_collision(context, code);
|
||||
} else if (code == SEPERATOR) {
|
||||
parse(context);
|
||||
@@ -78,42 +78,42 @@ namespace ipl {
|
||||
|
||||
void UrlProcessor::make_collision(nw4r::ut::PrintContext<wchar_t>* context, u16 code) {
|
||||
if (code == SEPERATOR) {
|
||||
if (unk_0x51 == 0) {
|
||||
if (mbInTag == 0) {
|
||||
url_collision* const url_col = new (System::getMem2App(), 4) url_collision();
|
||||
line_collision* const line_col = new (System::getMem2App(), 4) line_collision();
|
||||
|
||||
url_col->unk_0x00 = unk_0x48;
|
||||
url_col->unk_0x04 = (wchar_t*)context->str;
|
||||
url_col->mTagNo = mCurTagNo;
|
||||
url_col->mpStart = (wchar_t*)context->str;
|
||||
|
||||
line_col->unk_0x00 = context->writer->GetCursorX();
|
||||
line_col->mLeft = context->writer->GetCursorX();
|
||||
nw4r::ut::List_Append(&url_col->mLineCollisions, line_col);
|
||||
nw4r::ut::List_Append(&mUrlCollisions, url_col);
|
||||
|
||||
unk_0x51 = 1;
|
||||
mbInTag = 1;
|
||||
} else {
|
||||
void* url_col_raw = nw4r::ut::List_GetPrev(&mUrlCollisions, NULL);
|
||||
void* line_col_raw = nw4r::ut::List_GetPrev(&((url_collision*)url_col_raw)->mLineCollisions, NULL);
|
||||
url_collision* url_col = (url_collision*)url_col_raw;
|
||||
line_collision* line_col = (line_collision*)line_col_raw;
|
||||
|
||||
line_col->unk_0x04 = context->writer->GetCursorX();
|
||||
line_col->unk_0x08 = context->writer->GetCursorY();
|
||||
line_col->mRight = context->writer->GetCursorX();
|
||||
line_col->mY = context->writer->GetCursorY();
|
||||
|
||||
url_col->unk_0x08 = (wchar_t*)context->str;
|
||||
url_col->mpEnd = (wchar_t*)context->str;
|
||||
|
||||
unk_0x51 = 0;
|
||||
unk_0x48++;
|
||||
mbInTag = 0;
|
||||
mCurTagNo++;
|
||||
}
|
||||
} else {
|
||||
if (unk_0x51 != 0) {
|
||||
if (mbInTag != 0) {
|
||||
url_collision* url_col = (url_collision*)nw4r::ut::List_GetPrev(&mUrlCollisions, NULL);
|
||||
line_collision* line_col = (line_collision*)nw4r::ut::List_GetPrev(&url_col->mLineCollisions, NULL);
|
||||
|
||||
line_col->unk_0x04 = context->writer->GetCursorX();
|
||||
line_col->unk_0x08 = context->writer->GetCursorY();
|
||||
line_col->mRight = context->writer->GetCursorX();
|
||||
line_col->mY = context->writer->GetCursorY();
|
||||
|
||||
line_col = new (System::getMem2App(), 4) line_collision();
|
||||
line_col->unk_0x00 = -208.0f;
|
||||
line_col->mLeft = -208.0f;
|
||||
|
||||
nw4r::ut::List_Append(&url_col->mLineCollisions, line_col);
|
||||
}
|
||||
@@ -122,41 +122,41 @@ namespace ipl {
|
||||
|
||||
void UrlProcessor::parse(nw4r::ut::PrintContext<wchar_t>* context) {
|
||||
f32 curY = context->writer->GetCursorY();
|
||||
if (unk_0x51 == 0) {
|
||||
if (unk_0x4C == unk_0x48) {
|
||||
if (mbInTag == 0) {
|
||||
if (mSelectedTagNo == mCurTagNo) {
|
||||
context->writer->SetTextColor(0xFFE664FF);
|
||||
} else if (unk_0x53 != 0 && is_focused()) {
|
||||
} else if (mbFocusEnabled != 0 && is_focused()) {
|
||||
context->writer->SetCursorY(curY - 2.0f);
|
||||
context->writer->SetTextColor(0xF06E28FF);
|
||||
unk_0x52 = 1;
|
||||
mbHoverOffset = 1;
|
||||
} else {
|
||||
context->writer->SetTextColor(0x34BEEDFF);
|
||||
}
|
||||
unk_0x51 = 1;
|
||||
mbInTag = 1;
|
||||
} else {
|
||||
if (unk_0x52 != 0) {
|
||||
if (mbHoverOffset != 0) {
|
||||
context->writer->SetCursorY(2.0f + curY);
|
||||
unk_0x52 = 0;
|
||||
mbHoverOffset = 0;
|
||||
}
|
||||
|
||||
context->writer->SetTextColor(0x646464FF);
|
||||
|
||||
unk_0x51 = 0;
|
||||
unk_0x48++;
|
||||
mbInTag = 0;
|
||||
mCurTagNo++;
|
||||
}
|
||||
}
|
||||
|
||||
BOOL UrlProcessor::is_focused() const {
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
if (unk_0x48 == get_focused_tagno(i)) {
|
||||
if (mCurTagNo == get_focused_tagno(i)) {
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void UrlProcessor::select(int unk) {
|
||||
unk_0x4C = unk;
|
||||
void UrlProcessor::select(int tagNo) {
|
||||
mSelectedTagNo = tagNo;
|
||||
}
|
||||
|
||||
int UrlProcessor::get_focused_tagno(int chan) const {
|
||||
@@ -174,13 +174,13 @@ namespace ipl {
|
||||
|
||||
while (url_col = (url_collision*)nw4r::ut::List_GetNext(&mUrlCollisions, url_col), url_col != NULL) {
|
||||
while (line_col = (line_collision*)nw4r::ut::List_GetNext(&url_col->mLineCollisions, line_col), line_col != NULL) {
|
||||
f32 left = line_col->unk_0x00 - var_f28;
|
||||
f32 right = var_f28 + line_col->unk_0x04;
|
||||
f32 temp_f0 = ((unk_0x44 + unk_0x40) - line_col->unk_0x08);
|
||||
f32 left = line_col->mLeft - var_f28;
|
||||
f32 right = var_f28 + line_col->mRight;
|
||||
f32 temp_f0 = ((mMemoTranslateY + mHitYOffset) - line_col->mY);
|
||||
f32 top = (var_f29 + temp_f0) - var_f28;
|
||||
f32 bottom = var_f28 + (var_f30 + temp_f0);
|
||||
if (left <= var_f31 && var_f31 <= right && top <= -pos.y && -pos.y <= bottom) {
|
||||
return url_col->unk_0x00;
|
||||
return url_col->mTagNo;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -194,7 +194,7 @@ namespace ipl {
|
||||
url_collision* url_col = NULL;
|
||||
|
||||
while (got = (url_collision*)nw4r::ut::List_GetNext(&mUrlCollisions, got), got != NULL) {
|
||||
if (got->unk_0x00 == unk_0x4C) {
|
||||
if (got->mTagNo == mSelectedTagNo) {
|
||||
url_col = got;
|
||||
break;
|
||||
}
|
||||
@@ -210,10 +210,10 @@ namespace ipl {
|
||||
|
||||
int chIdx2 = 0;
|
||||
int chIdx = 0;
|
||||
u32 count = (u32)url_col->unk_0x08 - (u32)url_col->unk_0x04;
|
||||
u32 count = (u32)url_col->mpEnd - (u32)url_col->mpStart;
|
||||
count >>= 1;
|
||||
for (u32 i = 0; i < count; i++) {
|
||||
wchar_t wch = url_col->unk_0x04[i];
|
||||
wchar_t wch = url_col->mpStart[i];
|
||||
if (wch != SEPERATOR && chIdx2 < 0x200) {
|
||||
url[chIdx2++] = wch;
|
||||
}
|
||||
@@ -226,9 +226,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
UrlProcessor::url_collision::url_collision() {
|
||||
unk_0x00 = 0;
|
||||
unk_0x04 = NULL;
|
||||
unk_0x08 = NULL;
|
||||
mTagNo = 0;
|
||||
mpStart = NULL;
|
||||
mpEnd = NULL;
|
||||
nw4r::ut::List_Init(&mLineCollisions, offsetof(line_collision, mLinkList));
|
||||
}
|
||||
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -43,13 +43,13 @@ namespace ipl {
|
||||
mMessageID = msgId;
|
||||
|
||||
// Debug related? (seems to be incomplete; unused)
|
||||
mArg2 = arg2;
|
||||
mArg3 = arg3;
|
||||
unk_0x0C = arg2;
|
||||
unk_0x10 = arg3;
|
||||
if (arg1) {
|
||||
strncpy(mArg1, arg1, sizeof(mArg1));
|
||||
mArg1[sizeof(mArg1) - 1] = 0;
|
||||
strncpy(unk_0x14, arg1, sizeof(unk_0x14));
|
||||
unk_0x14[sizeof(unk_0x14) - 1] = 0;
|
||||
} else {
|
||||
memset(mArg1, 0, sizeof(mArg1));
|
||||
memset(unk_0x14, 0, sizeof(unk_0x14));
|
||||
}
|
||||
|
||||
curThread = OSGetCurrentThread();
|
||||
|
||||
Reference in New Issue
Block a user