Compare commits
1 Commits
main
...
agent/w092
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
665408baaf |
@@ -1528,7 +1528,7 @@ namespace ipl {
|
||||
mPage++;
|
||||
mNextPageNum--;
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), sPageOffset);
|
||||
mpLayout->getAnim(5)->setAnmType(0);
|
||||
mpLayout->getAnim(5)->setAnmType(ANIM_TYPE_FORWARD);
|
||||
mpLayout->getAnim(5)->play();
|
||||
set_page_text("T_nmbr_b", mPage + 1);
|
||||
set_page_text("T_nmbr_c", mPage);
|
||||
@@ -1544,7 +1544,7 @@ namespace ipl {
|
||||
mPage = 0;
|
||||
mPrevPageNum = 0;
|
||||
mbCover = true;
|
||||
mpLayout->getAnim(4)->setAnmType(1);
|
||||
mpLayout->getAnim(4)->setAnmType(ANIM_TYPE_BACKWARD);
|
||||
mpLayout->getAnim(4)->play();
|
||||
reset_gui(true);
|
||||
mState = STATE_LOOP_FORWARD;
|
||||
@@ -1555,7 +1555,7 @@ namespace ipl {
|
||||
case STATE_COVER_NORMAL: {
|
||||
mNextPageNum--;
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), sPageOffset);
|
||||
mpLayout->getAnim(4)->setAnmType(0);
|
||||
mpLayout->getAnim(4)->setAnmType(ANIM_TYPE_FORWARD);
|
||||
mpLayout->getAnim(4)->play();
|
||||
reset_gui(true);
|
||||
|
||||
@@ -1585,7 +1585,7 @@ namespace ipl {
|
||||
if (mPage > 0) {
|
||||
mPage--;
|
||||
mPrevPageNum--;
|
||||
mpLayout->getAnim(5)->setAnmType(1);
|
||||
mpLayout->getAnim(5)->setAnmType(ANIM_TYPE_BACKWARD);
|
||||
mpLayout->getAnim(5)->play();
|
||||
set_page_text("T_nmbr_c", mPage + 1);
|
||||
reset_gui(true);
|
||||
@@ -1596,7 +1596,7 @@ namespace ipl {
|
||||
|
||||
mState = STATE_BACKWARD;
|
||||
} else {
|
||||
mpLayout->getAnim(4)->setAnmType(1);
|
||||
mpLayout->getAnim(4)->setAnmType(ANIM_TYPE_BACKWARD);
|
||||
mpLayout->getAnim(4)->play();
|
||||
reset_gui(true);
|
||||
mState = STATE_COVER_BACKWARD;
|
||||
@@ -1608,7 +1608,7 @@ namespace ipl {
|
||||
mNextPageNum = 0;
|
||||
mbCover = false;
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), scaledPageOffset(sPageOffset, PAGE_MAX));
|
||||
mpLayout->getAnim(4)->setAnmType(0);
|
||||
mpLayout->getAnim(4)->setAnmType(ANIM_TYPE_FORWARD);
|
||||
mpLayout->getAnim(4)->play();
|
||||
set_page_text("T_nmbr_b", mPage + 1);
|
||||
reset_gui(false);
|
||||
@@ -1680,7 +1680,7 @@ namespace ipl {
|
||||
} else if (!(SCGetWCFlags() & SC_WC_FLAGS_ENABLED)) {
|
||||
System::getDialog()->callBtn2(MESG_NETWORK_NO_WC24_CONFIG, MESG_NETWORK_SETTINGS_BTN, MESG_CMN_QUIT);
|
||||
mState = STATE_MSG_WC;
|
||||
} else if (bGotParental && (pcInfo.enable & SC_PARENTAL_FLAG_ENABLED) && (SCGetNetContentRestrictions() & 2)) {
|
||||
} else if (bGotParental && (pcInfo.enable & SC_PARENTAL_FLAG_ENABLED) && (SCGetNetContentRestrictions() & SC_NET_RESTRICTIONS_MSG_BOARD)) {
|
||||
System::getDialog()->callBtn1(MESG_NETWORK_PARENTAL_RESTRICT, MESG_CMN_OK);
|
||||
mState = STATE_MSG_PARENTAL;
|
||||
} else if (mpFriendCache->check() == NWC24_ERR_NETWORK || mpFriendCache->getLastErr() == NWC24_ERR_SERVER ||
|
||||
|
||||
@@ -127,7 +127,7 @@ namespace ipl {
|
||||
switch (btnNo) {
|
||||
case BTN_WII:
|
||||
case BTN_EMAIL: {
|
||||
if (mbHovered[btnNo] == FALSE) {
|
||||
if (!mbHovered[btnNo]) {
|
||||
// Play hover in animation
|
||||
mpLayout->getAnim(btnNo + ANIM_BTN_FOCUS_IN)->play();
|
||||
|
||||
@@ -257,7 +257,7 @@ namespace ipl {
|
||||
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
|
||||
const char* paneName = component->getPane()->GetName();
|
||||
|
||||
controller::Interface* con = reinterpret_cast<controller::Interface*>(data);
|
||||
controller::Interface* con = static_cast<controller::Interface*>(data);
|
||||
|
||||
switch (event) {
|
||||
// Pointer on button
|
||||
|
||||
@@ -281,11 +281,11 @@ namespace ipl {
|
||||
wchar_t* thumbText = NULL;
|
||||
if (mLetterType == TYPE_MEMO) {
|
||||
if (recordHdr->bodyOffset != 0) {
|
||||
thumbText = (wchar_t*)((u8*)mpRecordData + recordHdr->bodyOffset);
|
||||
thumbText = (wchar_t*)(mpRecordData + recordHdr->bodyOffset);
|
||||
}
|
||||
} else {
|
||||
if (recordHdr->titleOffset != 0) {
|
||||
thumbText = (wchar_t*)((u8*)mpRecordData + recordHdr->titleOffset);
|
||||
thumbText = (wchar_t*)(mpRecordData + recordHdr->titleOffset);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -294,7 +294,7 @@ namespace ipl {
|
||||
mpLayout->hide("Nigaoe");
|
||||
|
||||
if (recordHdr->faceOffset != 0) {
|
||||
RFLiCharData* charData = (RFLiCharData*)((u8*)mpRecordData + recordHdr->faceOffset);
|
||||
RFLiCharData* charData = (RFLiCharData*)(mpRecordData + recordHdr->faceOffset);
|
||||
if (System::getMiiManager()->isValid(charData)) {
|
||||
mpNigaoe = System::getMiiManager()->create(mpHeap, 76, 76, charData, make_icon_cb_, this);
|
||||
}
|
||||
@@ -303,7 +303,7 @@ namespace ipl {
|
||||
for (int i = 0; i < RBR_ATTACHMENT_MAX; i++) {
|
||||
if (recordHdr->attach[i].type == RBRAttachmentType_MsgBoard) {
|
||||
ARCHandle arc;
|
||||
u8* off = ((u8*)mpRecordData + recordHdr->attach[i].offset);
|
||||
u8* off = (mpRecordData + recordHdr->attach[i].offset);
|
||||
|
||||
if (arc_init_handle(off, &arc)) {
|
||||
ARCFileInfo file;
|
||||
@@ -332,7 +332,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
else if (recordHdr->attach[i].type == RBRAttachmentType_Picture) {
|
||||
if (create_picture(&mPicture, System::getMem2App(), System::getMem2App(), ((u8*)mpRecordData + recordHdr->attach[i].offset),
|
||||
if (create_picture(&mPicture, System::getMem2App(), System::getMem2App(), (mpRecordData + recordHdr->attach[i].offset),
|
||||
4 + recordHdr->attach[i].size)) {
|
||||
mpCapture = new (mpHeap, 4) utility::Capture(mpHeap, 0, 0, PICTURE_THUMB_WIDTH, PICTURE_THUMB_HEIGHT, GX_TF_RGB565);
|
||||
mbCaptured = false;
|
||||
@@ -587,7 +587,7 @@ namespace ipl {
|
||||
if (picture->mpRGB565 != NULL && picture->mpWork != NULL) {
|
||||
if (ODHDecodeRGB565(src, srcSize, picture->mpRGB565, rgb565Size, picture->mpWork, workSize)) {
|
||||
DCStoreRange(picture->mpRGB565, rgb565Size);
|
||||
GXInitTexObj(&picture->texObj, picture->mpRGB565, picture->width, picture->height, GX_TF_RGB565, GX_CLAMP, GX_CLAMP, 0);
|
||||
GXInitTexObj(&picture->texObj, picture->mpRGB565, picture->width, picture->height, GX_TF_RGB565, GX_CLAMP, GX_CLAMP, GX_FALSE);
|
||||
|
||||
result = TRUE;
|
||||
|
||||
@@ -652,7 +652,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void BoardObject::start_point_event(int index, controller::Interface* con) {
|
||||
if (mbHovered == FALSE) {
|
||||
if (!mbHovered) {
|
||||
mpLayout->getAnim(ANIM_FOCUS_IN)->play();
|
||||
snd::getSystem()->startSE("WIPL_SE_BOARD_FOCUS");
|
||||
if (con != NULL) {
|
||||
@@ -787,7 +787,7 @@ namespace ipl {
|
||||
|
||||
if (recordHdr->faceOffset != 0) {
|
||||
if (mpNigaoe != NULL && mpNigaoe->created()) {
|
||||
RFLiCharData* charData = (RFLiCharData*)((u8*)mpRecordData + recordHdr->faceOffset);
|
||||
RFLiCharData* charData = (RFLiCharData*)(mpRecordData + recordHdr->faceOffset);
|
||||
if (System::getMiiManager()->isValid(charData)) {
|
||||
wcsncpy(name, (wchar_t*)charData->name, RFL_NAME_LENGTH);
|
||||
result = TRUE;
|
||||
|
||||
@@ -1370,7 +1370,7 @@ namespace ipl {
|
||||
const char* const* pFile = &scChangeTexFile[i].file;
|
||||
|
||||
if (ARCOpen(&arc, pFile[0], &arcFile)) {
|
||||
TPLPalette* tplData = (TPLPalette*)((u8*)mpArcData + ARCGetStartOffset(&arcFile));
|
||||
TPLPalette* tplData = (TPLPalette*)(mpArcData + ARCGetStartOffset(&arcFile));
|
||||
u32 tplSize = ARCGetLength(&arcFile);
|
||||
|
||||
mpBoardObj->change_tex(mpLayout, pFile[1], tplData, tplSize);
|
||||
@@ -1706,7 +1706,7 @@ namespace ipl {
|
||||
void focus_object::start_point_event(int btnNo, controller::Interface* con) {
|
||||
bool target = false;
|
||||
|
||||
if (mbHovered[btnNo] == FALSE) {
|
||||
if (!mbHovered[btnNo]) {
|
||||
switch (btnNo) {
|
||||
case BTN_ARROW_RIGHT: {
|
||||
mpLayout->getAnim(ANIM_ARROW_RIGHT_FOCUS_ON)->play();
|
||||
@@ -1988,7 +1988,7 @@ namespace ipl {
|
||||
const char* paneName = component->getPane()->GetName();
|
||||
int btnNo = mpInstance->get_button_no(paneName);
|
||||
|
||||
controller::Interface* con = reinterpret_cast<controller::Interface*>(data);
|
||||
controller::Interface* con = static_cast<controller::Interface*>(data);
|
||||
|
||||
switch (event) {
|
||||
// Pointer on button
|
||||
|
||||
@@ -404,7 +404,7 @@ namespace ipl {
|
||||
(mbEnabled || btnNo == BTN_ARROW_RIGHT || btnNo == BTN_ARROW_LEFT) &&
|
||||
(btnNo != BTN_ARROW_RIGHT || mbArrowVisible[ARROW_BTN_RIGHT] == true) &&
|
||||
(btnNo != BTN_ARROW_LEFT || mbArrowVisible[ARROW_BTN_LEFT] == true)) {
|
||||
if (mbHovered[btnNo] == FALSE) {
|
||||
if (!mbHovered[btnNo]) {
|
||||
// Play hover in animation
|
||||
layout::Animator* anim = mpLayout->getAnim(btnNo);
|
||||
anim->setMinFrame(scBtnFadeFrame[btnNo].in.start);
|
||||
@@ -892,7 +892,7 @@ namespace ipl {
|
||||
|
||||
void OptOutButton::start_point_event(const char* paneName, controller::Interface* con) {
|
||||
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
|
||||
if (mbHovered == FALSE) {
|
||||
if (!mbHovered) {
|
||||
// Play hover in animation
|
||||
mpLayout->getAnim(ANIM_OPT_OUT_FOCUS_IN)->play();
|
||||
|
||||
|
||||
@@ -360,7 +360,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Calendar::initCalcFadeout() {
|
||||
if (mbBackToBoardAlt == FALSE) {
|
||||
if (!mbBackToBoardAlt) {
|
||||
static_cast<Button*>(System::getScene(SCENE_BUTTON))->animation(Button::IDANIM_BACK_TO_BOARD);
|
||||
} else {
|
||||
static_cast<Button*>(System::getScene(SCENE_BUTTON))->animation(Button::IDANIM_BACK_TO_BOARD_ALT);
|
||||
@@ -476,7 +476,7 @@ namespace ipl {
|
||||
mbScrolling = false;
|
||||
}
|
||||
|
||||
if (!mpLayout->isPlaying(0)) {
|
||||
if (!mpLayout->isPlaying(IDANIM_0)) {
|
||||
Date* date = NULL;
|
||||
while (date = (Date*)nw4r::ut::List_GetNext(&mDateList, date), date != NULL) {
|
||||
date->initEvent();
|
||||
@@ -503,7 +503,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Calendar::on_wait_task() {
|
||||
if (mbSearchTaskRunning == FALSE) {
|
||||
if (!mbSearchTaskRunning) {
|
||||
switch (mPrevState) {
|
||||
case STATE_SCROLL_RIGHT: {
|
||||
do_scroll_r();
|
||||
|
||||
@@ -902,20 +902,20 @@ namespace ipl {
|
||||
mpCursorAnims[i]->initFrame();
|
||||
}
|
||||
|
||||
mpCursorLayout->getAnim(1)->initAnmFrame();
|
||||
mpCursorLayout->getAnim(ANIM_CURSOR_FOCUS_ON)->initAnmFrame();
|
||||
mpCursorLayout->GetRootPane()->SetVisible(false);
|
||||
} else if (state == 4) {
|
||||
mCursorState = 4;
|
||||
mPendingCursorState = 0;
|
||||
mpCursorLayout->GetRootPane()->SetVisible(true);
|
||||
startCursorAnim(2);
|
||||
startCursorAnim(ANIM_CURSOR_SELECT);
|
||||
} else {
|
||||
switch (mCursorState) {
|
||||
case 0: {
|
||||
if (state == 1) {
|
||||
mCursorState = 1;
|
||||
mpCursorLayout->GetRootPane()->SetVisible(true);
|
||||
startCursorAnim(1);
|
||||
startCursorAnim(ANIM_CURSOR_FOCUS_ON);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -932,7 +932,7 @@ namespace ipl {
|
||||
case 2: {
|
||||
if (state == 3) {
|
||||
mCursorState = 3;
|
||||
startCursorAnim(0);
|
||||
startCursorAnim(ANIM_CURSOR_FOCUS_OFF);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -2354,7 +2354,7 @@ namespace ipl {
|
||||
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
|
||||
const char* paneName = component->getPane()->GetName();
|
||||
|
||||
controller::Interface* con = reinterpret_cast<controller::Interface*>(data);
|
||||
controller::Interface* con = static_cast<controller::Interface*>(data);
|
||||
|
||||
BOOL result = FALSE;
|
||||
switch (mpInstance->mState) {
|
||||
|
||||
@@ -643,7 +643,7 @@ namespace ipl {
|
||||
|
||||
FaderSceneCommand ChannelTitle::calcFadeout() {
|
||||
if (mState == STATE_BOOT_SCENE) {
|
||||
if (mFadeoutTick == 0 && WPADGetStatus() == 0) {
|
||||
if (mFadeoutTick == 0 && WPADGetStatus() == WPAD_LIB_STATUS_0) {
|
||||
mFadeoutTick = OSGetTick();
|
||||
}
|
||||
|
||||
@@ -661,7 +661,7 @@ namespace ipl {
|
||||
rebootSystem();
|
||||
}
|
||||
|
||||
for (; WPADGetStatus() != 0 || System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8 ||
|
||||
for (; WPADGetStatus() != WPAD_LIB_STATUS_0 || System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8 ||
|
||||
!System::getSaveData()->isFinished(mpSaveDataFile) ||
|
||||
(mModuleType != MODULE_TYPE_NONE && mModuleState != MODULE_STATE_4) ||
|
||||
(sdWorker != NULL && sdWorker->is_working());) {
|
||||
@@ -674,7 +674,7 @@ namespace ipl {
|
||||
calcChannelCS();
|
||||
}
|
||||
|
||||
if (WPADGetStatus() != 0) {
|
||||
if (WPADGetStatus() != WPAD_LIB_STATUS_0) {
|
||||
OSReport("wait for WPAD\n");
|
||||
}
|
||||
if (System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8) {
|
||||
@@ -776,7 +776,7 @@ namespace ipl {
|
||||
calcChannelCS();
|
||||
}
|
||||
|
||||
if (WPADGetStatus() != 0) {
|
||||
if (WPADGetStatus() != WPAD_LIB_STATUS_0) {
|
||||
OSReport("wait for WPAD\n");
|
||||
}
|
||||
if (System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8) {
|
||||
@@ -952,7 +952,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
BOOL ChannelTitle::isFirstCall() const {
|
||||
return mbModuleTerminated == FALSE;
|
||||
return !mbModuleTerminated;
|
||||
}
|
||||
|
||||
void ChannelTitle::getRsoExBufData(void* rsoExBuf) const {
|
||||
@@ -976,9 +976,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
BOOL ChannelTitle::isStartAnimFinished() const {
|
||||
return !((mpChanBannerAnims[BANNER_ANIM_LOOP] == NULL && mpChanBannerAnims[BANNER_ANIM_START] == NULL) ||
|
||||
(mpChanBannerAnims[BANNER_ANIM_START] != NULL && !mpChanBannerAnims[BANNER_ANIM_START]->isPlaying())) == FALSE ||
|
||||
!(mpChanBannerAnims[BANNER_ANIM_LOOP] != NULL && !mpChanBannerAnims[BANNER_ANIM_LOOP]->isPlaying()) == FALSE;
|
||||
return (mpChanBannerAnims[BANNER_ANIM_LOOP] == NULL && mpChanBannerAnims[BANNER_ANIM_START] == NULL) ||
|
||||
(mpChanBannerAnims[BANNER_ANIM_START] != NULL && !mpChanBannerAnims[BANNER_ANIM_START]->isPlaying()) ||
|
||||
(mpChanBannerAnims[BANNER_ANIM_LOOP] != NULL && !mpChanBannerAnims[BANNER_ANIM_LOOP]->isPlaying());
|
||||
}
|
||||
|
||||
void* ChannelTitle::allocFromRsoExHeap(u32 size, int align) {
|
||||
@@ -1339,7 +1339,7 @@ namespace ipl {
|
||||
} else {
|
||||
missingTicket = TRUE;
|
||||
}
|
||||
if (!missingTicket && utility::ESMisc::CheckTmdCountryCode(mpCurTicket) == FALSE) {
|
||||
if (!missingTicket && !utility::ESMisc::CheckTmdCountryCode(mpCurTicket)) {
|
||||
IPLErrorDisplay(MESG_ERR_CHANNEL);
|
||||
}
|
||||
|
||||
@@ -2553,7 +2553,7 @@ namespace ipl {
|
||||
|
||||
BOOL ChannelTitle::isTimeLimitedChannel(u32* hour, u32* minute) {
|
||||
if (mLimitType == LIMIT_TYPE_TIME) {
|
||||
*hour = (u32)mTimeLimitRemain / (60 * 60);
|
||||
*hour = mTimeLimitRemain / (60 * 60);
|
||||
|
||||
// FAKEMATCH: should be modular division. not whatever this is
|
||||
*minute = (mTimeLimitRemain - ((60 * 60) * *hour)) / 60;
|
||||
@@ -2813,7 +2813,7 @@ namespace ipl {
|
||||
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
|
||||
const char* paneName = component->getPane()->GetName();
|
||||
|
||||
controller::Interface* con = reinterpret_cast<controller::Interface*>(data);
|
||||
controller::Interface* con = static_cast<controller::Interface*>(data);
|
||||
|
||||
switch (event) {
|
||||
// Drag and trig events are swapped, but still act as intended?
|
||||
|
||||
@@ -527,7 +527,7 @@ namespace ipl {
|
||||
int btnNo = get_button_no(paneName);
|
||||
int animIdx = -1;
|
||||
if (btnNo != -1) {
|
||||
if ((btnNo == BTN_ARROW_LEFT || btnNo == BTN_ARROW_RIGHT || is_exist(btnNo)) && mbHovered[btnNo] == FALSE) {
|
||||
if ((btnNo == BTN_ARROW_LEFT || btnNo == BTN_ARROW_RIGHT || is_exist(btnNo)) && !mbHovered[btnNo]) {
|
||||
// Decide animation
|
||||
switch (btnNo) {
|
||||
case BTN_ARROW_LEFT: {
|
||||
@@ -694,7 +694,7 @@ namespace ipl {
|
||||
for (int i = 0; i < BTN_MAX_FACE; i++) {
|
||||
mpGui->initPane(mpLayout->FindPaneByName(smButtonName[i]));
|
||||
|
||||
if (mbHovered[i] != FALSE) {
|
||||
if (mbHovered[i]) {
|
||||
if (is_exist(i)) {
|
||||
mpLayout->getAnim(i + ANIM_FOCUS_FACE_OUT)->play();
|
||||
}
|
||||
@@ -779,7 +779,7 @@ namespace ipl {
|
||||
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
|
||||
const char* paneName = component->getPane()->GetName();
|
||||
|
||||
controller::Interface* con = reinterpret_cast<controller::Interface*>(data);
|
||||
controller::Interface* con = static_cast<controller::Interface*>(data);
|
||||
|
||||
switch (event) {
|
||||
// Pointer on button
|
||||
|
||||
@@ -314,7 +314,7 @@ namespace ipl {
|
||||
void MailAddressSelect::start_point_event(const char* paneName, controller::Interface* con) {
|
||||
int btnNo = get_button_no(paneName);
|
||||
if (btnNo != -1) {
|
||||
if (mbHovered[btnNo] == FALSE) {
|
||||
if (!mbHovered[btnNo]) {
|
||||
snd::getSystem()->startSE("WIPL_SE_BT_TARGETTING");
|
||||
if (con != NULL) {
|
||||
con->rumble();
|
||||
@@ -601,7 +601,7 @@ namespace ipl {
|
||||
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
|
||||
const char* paneName = component->getPane()->GetName();
|
||||
|
||||
controller::Interface* con = reinterpret_cast<controller::Interface*>(data);
|
||||
controller::Interface* con = static_cast<controller::Interface*>(data);
|
||||
|
||||
switch (event) {
|
||||
// Pointer on button
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
if (System::isReceiveScheduleStopped() == FALSE) {
|
||||
if (!System::isReceiveScheduleStopped()) {
|
||||
System::stopReceiveSchedule();
|
||||
OSReport("[Receive Scheduler] Wait..\n");
|
||||
} else {
|
||||
@@ -133,7 +133,7 @@ namespace ipl {
|
||||
IPLContestInitialize(mpNUPHeapBuf, mNetSetup.getproxy());
|
||||
mpConnTestThreadStack = mpAppHeap->alloc(0x4000, 4);
|
||||
|
||||
OSCreateThread(&mConnTestThread, conntestthread, NULL, (u8*)mpConnTestThreadStack + 0x4000, 0x4000, 0x12, 1);
|
||||
OSCreateThread(&mConnTestThread, conntestthread, NULL, (u8*)mpConnTestThreadStack + 0x4000, 0x4000, 0x12, OS_THREAD_ATTR_DETACH);
|
||||
OSResumeThread(&mConnTestThread);
|
||||
mState = 4;
|
||||
break;
|
||||
|
||||
@@ -156,7 +156,7 @@ namespace ipl {
|
||||
mpThreadStack = (void*)allocfunc(0x4000, 0x20);
|
||||
stackEnd = (void*)((int)mpThreadStack + 0x4000);
|
||||
|
||||
if (OSCreateThread(&mThread, iSOStartupEXThread, (void*)mConnType, stackEnd, 0x4000, 17, 1) == 0) {
|
||||
if (OSCreateThread(&mThread, iSOStartupEXThread, (void*)mConnType, stackEnd, 0x4000, 17, OS_THREAD_ATTR_DETACH) == 0) {
|
||||
mLastErr = -(-50100 + -mConnType);
|
||||
mState = NET_SETUP_ERROR;
|
||||
OSReport("OSCreateThread failed\n");
|
||||
|
||||
@@ -203,7 +203,7 @@ namespace ipl {
|
||||
|
||||
void ParentalDialog::start_point_event(const char* paneName, controller::Interface* con) {
|
||||
int btnNo = get_button_no(paneName);
|
||||
if (btnNo != -1 && mbHovered[btnNo] == FALSE) {
|
||||
if (btnNo != -1 && !mbHovered[btnNo]) {
|
||||
switch (btnNo) {
|
||||
case BTN_CANCEL: {
|
||||
mpLayout->getAnim(ANIM_BTN_CANCEL_FOCUS_IN)->play();
|
||||
@@ -371,7 +371,7 @@ namespace ipl {
|
||||
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
|
||||
const char* paneName = component->getPane()->GetName();
|
||||
|
||||
controller::Interface* con = reinterpret_cast<controller::Interface*>(data);
|
||||
controller::Interface* con = static_cast<controller::Interface*>(data);
|
||||
|
||||
switch (event) {
|
||||
// Pointer on button
|
||||
|
||||
@@ -461,7 +461,7 @@ namespace ipl {
|
||||
return TRUE;
|
||||
} else {
|
||||
for (SceneObj::iterator it = SceneObj::iterator(mpRootScene); it.getPtr() != NULL; ++it) {
|
||||
if (it->isResetAcceptable() == FALSE) {
|
||||
if (!it->isResetAcceptable()) {
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
@@ -482,7 +482,7 @@ namespace ipl {
|
||||
return TRUE;
|
||||
} else {
|
||||
for (SceneObj::iterator it = SceneObj::iterator(mpRootScene); it.getPtr() != NULL; ++it) {
|
||||
if (it->isResetProcessDone() == FALSE) {
|
||||
if (!it->isResetProcessDone()) {
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -201,7 +201,7 @@ namespace ipl {
|
||||
if (btnNo != -1 && (mbEnabled || btnNo == BTN_ARROW_RIGHT || btnNo == BTN_ARROW_LEFT) &&
|
||||
(btnNo != BTN_ARROW_RIGHT || mbArrowVisible[ARROW_BTN_RIGHT] == true) &&
|
||||
(btnNo != BTN_ARROW_LEFT || mbArrowVisible[ARROW_BTN_LEFT] == true)) {
|
||||
if (mbHovered[btnNo] == FALSE) {
|
||||
if (!mbHovered[btnNo]) {
|
||||
layout::Animator* anim = NULL;
|
||||
|
||||
switch (btnNo) {
|
||||
|
||||
@@ -1698,7 +1698,7 @@ namespace ipl {
|
||||
|
||||
void SDChannelSelect::calcCommon() {
|
||||
if (mState == 2 && !mpLayout->isPlaying(0)) {
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(SCENE_SD_BUTTON));
|
||||
if (button != NULL) {
|
||||
button->setEventHandler(mpButtonEventHandler);
|
||||
mState = 3;
|
||||
@@ -1761,7 +1761,7 @@ namespace ipl {
|
||||
finishPageScroll();
|
||||
break;
|
||||
case 5:
|
||||
createChildScene(0x23, this, NULL, this);
|
||||
createChildScene(SCENE_SD_CHANNEL_TITLE, this, NULL, this);
|
||||
mState = 6;
|
||||
break;
|
||||
case 7:
|
||||
@@ -1856,7 +1856,7 @@ namespace ipl {
|
||||
System::getFader()->fadeOut();
|
||||
TVRCManager::getHandle()->setEnable(FALSE);
|
||||
System::getChannelManager()->refreshAsync();
|
||||
reserveAllSceneDestruction(4, reinterpret_cast<void*>(System::getNwc24Manager()->received()));
|
||||
reserveAllSceneDestruction(SCENE_BOARD, reinterpret_cast<void*>(System::getNwc24Manager()->received()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2172,19 +2172,19 @@ namespace ipl {
|
||||
mState = 28;
|
||||
}
|
||||
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(SCENE_SD_BUTTON));
|
||||
if (button != NULL && button->isActive()) {
|
||||
button->update();
|
||||
}
|
||||
|
||||
if (mState == 1) {
|
||||
controller::Interface* controller = System::getMasterController();
|
||||
if (controller->down(0x30001000)) {
|
||||
if (controller->down(controller::BTN_NEXT_LEFT)) {
|
||||
if (mCurrentPage > 0) {
|
||||
setStateAndPlaySelectSound(8);
|
||||
return;
|
||||
}
|
||||
} else if (controller->down(0x06000010) && mCurrentPage < mPageCount - 1) {
|
||||
} else if (controller->down(controller::BTN_NEXT_RIGHT) && mCurrentPage < mPageCount - 1) {
|
||||
setStateAndPlaySelectSound(9);
|
||||
return;
|
||||
}
|
||||
@@ -2207,23 +2207,23 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(SCENE_SD_BUTTON));
|
||||
if (mState == 10) {
|
||||
--mCurrentPage;
|
||||
if (mCurrentPage == 0) {
|
||||
button->animation(15);
|
||||
button->animation(SDButton::IDANIM_ARROW_LEFT_DISAPPEAR);
|
||||
mbLeftArrowVisible = false;
|
||||
} else if (!mbRightArrowVisible) {
|
||||
button->animation(14);
|
||||
button->animation(SDButton::IDANIM_ARROW_RIGHT_APPEAR);
|
||||
mbRightArrowVisible = true;
|
||||
}
|
||||
} else {
|
||||
++mCurrentPage;
|
||||
if (mCurrentPage == mPageCount - 1) {
|
||||
button->animation(16);
|
||||
button->animation(SDButton::IDANIM_ARROW_RIGHT_DISAPPEAR);
|
||||
mbRightArrowVisible = false;
|
||||
} else if (!mbLeftArrowVisible) {
|
||||
button->animation(13);
|
||||
button->animation(SDButton::IDANIM_ARROW_LEFT_APPEAR);
|
||||
mbLeftArrowVisible = true;
|
||||
}
|
||||
}
|
||||
@@ -2243,9 +2243,9 @@ namespace ipl {
|
||||
|
||||
void SDChannelSelect::initializeNormalPage() {
|
||||
if (!mpPageAnimations[0]->isPlaying() &&
|
||||
System::getSceneManager()->getScene(0x23) == NULL) {
|
||||
System::getSceneManager()->getScene(SCENE_SD_CHANNEL_TITLE) == NULL) {
|
||||
SDButton* button = static_cast<SDButton*>(
|
||||
System::getSceneManager()->getScene(0x24));
|
||||
System::getSceneManager()->getScene(SCENE_SD_BUTTON));
|
||||
button->enableBtn();
|
||||
|
||||
if (mCurrentPage > 0) {
|
||||
@@ -2636,7 +2636,7 @@ namespace ipl {
|
||||
0);
|
||||
iplSDChannelObj_playPageHide(channel);
|
||||
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(SCENE_SD_BUTTON));
|
||||
if (mbLeftArrowVisible) {
|
||||
button->animation(SDButton::IDANIM_ARROW_LEFT_DISAPPEAR);
|
||||
}
|
||||
@@ -2912,7 +2912,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SDChannelSelect::updateDragState() {
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(SCENE_SD_BUTTON));
|
||||
if (button != NULL && button->isActive()) {
|
||||
button->update();
|
||||
}
|
||||
@@ -2940,7 +2940,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SDChannelSelect::updateDragPageTransition() {
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(SCENE_SD_BUTTON));
|
||||
if (button != NULL && button->isActive()) {
|
||||
button->update();
|
||||
}
|
||||
@@ -2964,7 +2964,7 @@ namespace ipl {
|
||||
if (mbButtonEnabled || mbDialogActive) {
|
||||
finishDrag();
|
||||
} else if (mCurrentPage > 0 && mPendingIndex >= 15) {
|
||||
button->animation(7);
|
||||
button->animation(SDButton::IDANIM_ARROW_LEFT_CLICK);
|
||||
mpLayout->setMinFrame(0.0f, -1);
|
||||
mpLayout->setMaxFrame(20.0f, -1);
|
||||
mpLayout->setAnmType(ANIM_TYPE_FORWARD, -1);
|
||||
@@ -2986,7 +2986,7 @@ namespace ipl {
|
||||
|
||||
snd::getSystem()->startSE("WSD_SELECT");
|
||||
} else if (mCurrentPage < mPageCount - 1 && mPendingPage >= 15) {
|
||||
button->animation(8);
|
||||
button->animation(SDButton::IDANIM_ARROW_RIGHT_CLICK);
|
||||
mpLayout->setMinFrame(40.0f, -1);
|
||||
mpLayout->setMaxFrame(60.0f, -1);
|
||||
mpLayout->setAnmType(ANIM_TYPE_FORWARD, -1);
|
||||
@@ -3141,7 +3141,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SDChannelSelect::finishDragPageChange() {
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(SCENE_SD_BUTTON));
|
||||
if (button != NULL && button->isActive()) {
|
||||
button->update();
|
||||
}
|
||||
@@ -3156,23 +3156,23 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
button = static_cast<SDButton*>(System::getSceneManager()->getScene(SCENE_SD_BUTTON));
|
||||
if (mState == 22) {
|
||||
--mCurrentPage;
|
||||
if (mCurrentPage == 0) {
|
||||
button->animation(15);
|
||||
button->animation(SDButton::IDANIM_ARROW_LEFT_DISAPPEAR);
|
||||
mbLeftArrowVisible = false;
|
||||
} else if (!mbRightArrowVisible) {
|
||||
button->animation(14);
|
||||
button->animation(SDButton::IDANIM_ARROW_RIGHT_APPEAR);
|
||||
mbRightArrowVisible = true;
|
||||
}
|
||||
} else {
|
||||
++mCurrentPage;
|
||||
if (mCurrentPage == mPageCount - 1) {
|
||||
button->animation(16);
|
||||
button->animation(SDButton::IDANIM_ARROW_RIGHT_DISAPPEAR);
|
||||
mbRightArrowVisible = false;
|
||||
} else if (!mbLeftArrowVisible) {
|
||||
button->animation(13);
|
||||
button->animation(SDButton::IDANIM_ARROW_LEFT_APPEAR);
|
||||
mbLeftArrowVisible = true;
|
||||
}
|
||||
}
|
||||
@@ -3283,7 +3283,7 @@ namespace ipl {
|
||||
mpPageLayouts[0]->getAnim(0)->play();
|
||||
mpPageLayouts[1]->getAnim(0)->play();
|
||||
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(SCENE_SD_BUTTON));
|
||||
button->disableBtn();
|
||||
|
||||
SDChannelObj* channel = NULL;
|
||||
@@ -3319,7 +3319,7 @@ namespace ipl {
|
||||
System::getPointer()->changeType(mControllerChannel, 0);
|
||||
mpPageLayouts[1]->getAnim(1)->play();
|
||||
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(SCENE_SD_BUTTON));
|
||||
button->enableBtn();
|
||||
|
||||
mbButtonEnabled = false;
|
||||
@@ -3466,14 +3466,14 @@ namespace ipl {
|
||||
if (mpScene->mState == 1) {
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_OUT) {
|
||||
if (con != NULL) {
|
||||
if (con->downTrg(0x00100800)) {
|
||||
if (con->downTrg(controller::BTN_INTERACT)) {
|
||||
SDButton* button = static_cast<SDButton*>(
|
||||
System::getSceneManager()->getScene(0x24));
|
||||
System::getSceneManager()->getScene(SCENE_SD_BUTTON));
|
||||
if (strcmp(paneName,
|
||||
SDButton::smButtonName[SDButton::BTN_HELP]) == 0) {
|
||||
mpScene->mOperationResult = 0;
|
||||
mpScene->mState = 26;
|
||||
button->animation(4);
|
||||
button->animation(SDButton::IDANIM_HELP_BTN_CLICK);
|
||||
snd::getSystem()->startSE("WIPL_SE_DECIDE");
|
||||
return;
|
||||
}
|
||||
@@ -3489,7 +3489,7 @@ namespace ipl {
|
||||
if (strcmp(paneName,
|
||||
SDButton::smButtonName[SDButton::BTN_ARROW_LEFT]) == 0 &&
|
||||
mpScene->mCurrentPage > 0) {
|
||||
button->animation(7);
|
||||
button->animation(SDButton::IDANIM_ARROW_LEFT_CLICK);
|
||||
mpScene->setStateAndPlaySelectSound(8);
|
||||
return;
|
||||
}
|
||||
@@ -3497,7 +3497,7 @@ namespace ipl {
|
||||
if (strcmp(paneName,
|
||||
SDButton::smButtonName[SDButton::BTN_ARROW_RIGHT]) == 0 &&
|
||||
mpScene->mCurrentPage < mpScene->mPageCount - 1) {
|
||||
button->animation(8);
|
||||
button->animation(SDButton::IDANIM_ARROW_RIGHT_CLICK);
|
||||
mpScene->setStateAndPlaySelectSound(9);
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -210,7 +210,7 @@ namespace ipl {
|
||||
destroy(0);
|
||||
}
|
||||
else {
|
||||
if (((u32)OSGetTime() - (u32)sAOSSStartTimeLo)
|
||||
if (((u32)OSGetTime() - sAOSSStartTimeLo)
|
||||
/ (OS_TIMER_CLOCK / 1000)
|
||||
>= 90000)
|
||||
{
|
||||
|
||||
@@ -832,8 +832,8 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void NCDSetting::adjustNWC24FlagEx_() {
|
||||
u32 wcFlags = SCGetWCFlags() & 1;
|
||||
u32 contentRestrictions = SCGetNetContentRestrictions() & 2;
|
||||
u32 wcFlags = SCGetWCFlags() & SC_WC_FLAGS_ENABLED;
|
||||
u32 contentRestrictions = SCGetNetContentRestrictions() & SC_NET_RESTRICTIONS_MSG_BOARD;
|
||||
mConfig.nwc24Permission = 0;
|
||||
if (wcFlags && SCGetEULA()) {
|
||||
mConfig.nwc24Permission |= 4;
|
||||
|
||||
@@ -102,7 +102,7 @@ RakuRakuThread::RakuRakuThread(EGG::Heap* heap) : utility::ut_thread() {
|
||||
|
||||
RakuRakuThread::~RakuRakuThread() {
|
||||
if (mRunning) {
|
||||
OSJamMessage(&sRakuMsgQueue, (OSMessage)2, 1);
|
||||
OSJamMessage(&sRakuMsgQueue, (OSMessage)2, OS_MESSAGE_BLOCK);
|
||||
WaitForThreadExit();
|
||||
}
|
||||
destroy();
|
||||
@@ -112,7 +112,7 @@ void RakuRakuThread::destroy() {
|
||||
if (active) {
|
||||
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
|
||||
u32 start = OSGetTick();
|
||||
while ((u32)(OSGetTick() - start) / (OS_TIMER_CLOCK / 1000) < 2000) {
|
||||
while ((OSGetTick() - start) / (OS_TIMER_CLOCK / 1000) < 2000) {
|
||||
RakuProgress progress;
|
||||
if (ATERMi_ApConfigGetState(&progress) == 1 && progress.state == 7) {
|
||||
break;
|
||||
@@ -168,7 +168,7 @@ void* RakuRakuThread::Run() {
|
||||
return this;
|
||||
}
|
||||
}
|
||||
OSReceiveMessage(&sRakuMsgQueue, &message, 1);
|
||||
OSReceiveMessage(&sRakuMsgQueue, &message, OS_MESSAGE_BLOCK);
|
||||
if ((s32)message == 2) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -502,7 +502,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Setting::initString() {
|
||||
mpStringBuffer = reinterpret_cast<www::wiisetting::SetStringBuf*>(getSceneHeap()->alloc(0x64e, 4));
|
||||
mpStringBuffer = static_cast<www::wiisetting::SetStringBuf*>(getSceneHeap()->alloc(0x64e, 4));
|
||||
OSReport("HTML String Alloc Size:%d\n", 0x64e);
|
||||
memset(mpStringBuffer, 0, 0x64e);
|
||||
memset(mInputText, 0, 0x202);
|
||||
@@ -625,7 +625,7 @@ namespace ipl {
|
||||
VIFlush();
|
||||
VIWaitForRetrace();
|
||||
|
||||
if (static_cast<u32>(System::getRegion()) == 2) {
|
||||
if (static_cast<u32>(System::getRegion()) == SC_PRODUCT_AREA_EUR) {
|
||||
if (mEuRgb60Mode == 0) {
|
||||
*reinterpret_cast<u32*>(0x800000cc) = 1;
|
||||
} else {
|
||||
@@ -643,7 +643,7 @@ namespace ipl {
|
||||
|
||||
bool Setting::isInitialSequenceExit(const controller::Interface* input) {
|
||||
u32 connectedMask = utility::wpad::getWpadConnectedMask();
|
||||
if (input->downTrg(0x100800) ||
|
||||
if (input->downTrg(controller::BTN_INTERACT) ||
|
||||
((OSGetTime() - mCreatePageTime) / (OS_TIMER_CLOCK / 1000) >= 500 &&
|
||||
connectedMask != mConnectedControllerMask &&
|
||||
utility::wpad::isIncreaseConnectedWpad(mConnectedControllerMask, connectedMask))) {
|
||||
@@ -740,7 +740,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if (input != NULL) {
|
||||
if (input->downTrg(0x100800) && mpWiiSettingData->data[0x12] == 0x1e &&
|
||||
if (input->downTrg(controller::BTN_INTERACT) && mpWiiSettingData->data[0x12] == 0x1e &&
|
||||
mActionFrame >= 0x1e && mActionFrame < 0x78) {
|
||||
mActionFrame = 0x78;
|
||||
www::wiisetting::setFuncResult(1);
|
||||
@@ -823,7 +823,7 @@ namespace ipl {
|
||||
break;
|
||||
case 5: {
|
||||
scene::ParentalDialog* parentalDialog =
|
||||
static_cast<scene::ParentalDialog*>(System::getScene(0x1b));
|
||||
static_cast<scene::ParentalDialog*>(System::getScene(SCENE_PARENTAL_DIALOG));
|
||||
if (parentalDialog != NULL) {
|
||||
mUiStatus[3] = 1;
|
||||
switch (parentalDialog->getResult()) {
|
||||
@@ -849,16 +849,16 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case 6:
|
||||
if (System::getScene(0x1b) == NULL) {
|
||||
if (System::getScene(SCENE_PARENTAL_DIALOG) == NULL) {
|
||||
mUiStatus[3] = 0;
|
||||
if (mpWiiSettingFlag->smthMsgData == 0x4fU) {
|
||||
if (ncd::NCDSetting::getEnableFlag()) {
|
||||
if (SCGetEULA() != 0) {
|
||||
if (SCGetEULA()) {
|
||||
www::wiisetting::setFuncResult(6);
|
||||
mDialogState = 0;
|
||||
resetFuncMsgQ();
|
||||
} else {
|
||||
if (static_cast<u32>(System::getRegion()) != 2) {
|
||||
if (static_cast<u32>(System::getRegion()) != SC_PRODUCT_AREA_EUR) {
|
||||
System::getDialog()->callBtn2(0x172, 0x2e, 0x25);
|
||||
} else {
|
||||
System::getDialog()->callBtn2(0x175, 0x2e, 0x25);
|
||||
@@ -866,7 +866,7 @@ namespace ipl {
|
||||
mDialogState = 0xe;
|
||||
}
|
||||
} else {
|
||||
if (static_cast<u32>(System::getRegion()) != 2) {
|
||||
if (static_cast<u32>(System::getRegion()) != SC_PRODUCT_AREA_EUR) {
|
||||
System::getDialog()->callBtn2(0x170, 0x146, 0x25);
|
||||
} else {
|
||||
System::getDialog()->callBtn2(0x174, 0x146, 0x25);
|
||||
@@ -881,7 +881,7 @@ namespace ipl {
|
||||
case 7:
|
||||
if (System::getDialog()->getLastResult() == 1) {
|
||||
www::wiisetting::setFuncResult(1);
|
||||
SCSetWCFlags(SCGetWCFlags() & 0xfffffffe);
|
||||
SCSetWCFlags(SCGetWCFlags() & ~SC_WC_FLAGS_ENABLED);
|
||||
SCIdleModeInfo idleMode = {0, 0};
|
||||
SCSetIdleMode(&idleMode);
|
||||
System::getNwc24Manager()->enableLedNotification(TRUE);
|
||||
@@ -899,13 +899,13 @@ namespace ipl {
|
||||
break;
|
||||
case 10:
|
||||
if (System::getDialog()->getLastResult() == 2) {
|
||||
if (static_cast<u32>(System::getRegion()) != 2) {
|
||||
if (static_cast<u32>(System::getRegion()) != SC_PRODUCT_AREA_EUR) {
|
||||
System::getDialog()->callBtn1(0x172, 1);
|
||||
} else {
|
||||
System::getDialog()->callBtn1(0x175, 1);
|
||||
}
|
||||
mDialogState = 0xb;
|
||||
SCSetWCFlags(SCGetWCFlags() & 0xfffffffe);
|
||||
SCSetWCFlags(SCGetWCFlags() & ~SC_WC_FLAGS_ENABLED);
|
||||
SCIdleModeInfo idleMode = {0, 0};
|
||||
SCSetIdleMode(&idleMode);
|
||||
System::getNwc24Manager()->enableLedNotification(TRUE);
|
||||
@@ -931,14 +931,14 @@ namespace ipl {
|
||||
break;
|
||||
case 0xc:
|
||||
if (System::getDialog()->getLastResult() == 2) {
|
||||
SCSetWCFlags(SCGetWCFlags() & 0xfffffffe);
|
||||
SCSetWCFlags(SCGetWCFlags() & ~SC_WC_FLAGS_ENABLED);
|
||||
SCIdleModeInfo idleMode = {0, 0};
|
||||
SCSetIdleMode(&idleMode);
|
||||
System::getNwc24Manager()->enableLedNotification(TRUE);
|
||||
SCSetEULA(0);
|
||||
ncd::NCDSetting::adjustNWC24Flag();
|
||||
SCFlush();
|
||||
if (static_cast<u32>(System::getRegion()) != 2) {
|
||||
if (static_cast<u32>(System::getRegion()) != SC_PRODUCT_AREA_EUR) {
|
||||
System::getDialog()->callBtn1(0x170, 0x2e);
|
||||
} else {
|
||||
System::getDialog()->callBtn1(0x174, 0x2e);
|
||||
@@ -1052,7 +1052,7 @@ namespace ipl {
|
||||
case 1:
|
||||
resetFuncMsgQ();
|
||||
waitStart();
|
||||
createChildScene(0x19, this, NULL, NULL);
|
||||
createChildScene(SCENE_NAKAMURA_TEST, this, NULL, NULL);
|
||||
break;
|
||||
case 9:
|
||||
setNUP();
|
||||
@@ -1084,7 +1084,7 @@ namespace ipl {
|
||||
if (!System::getResetHandler()->isResetting()) {
|
||||
System::getHomeButtonMenu()->disable();
|
||||
if (mBrowserStopRequested == 0 && youngController != NULL &&
|
||||
youngController->downTrg(0x100800)) {
|
||||
youngController->downTrg(controller::BTN_INTERACT)) {
|
||||
resetFuncMsgQ();
|
||||
System::getHomeButtonMenu()->enable();
|
||||
www::wiisetting::setFuncResult(5);
|
||||
@@ -1123,7 +1123,7 @@ namespace ipl {
|
||||
resetFuncMsgQ();
|
||||
break;
|
||||
case 0x1a:
|
||||
if (static_cast<u32>(System::getRegion()) != 2) {
|
||||
if (static_cast<u32>(System::getRegion()) != SC_PRODUCT_AREA_EUR) {
|
||||
System::getDialog()->callBtn2(0x15f, 0x2e, 0x13b);
|
||||
} else {
|
||||
System::getDialog()->callBtn2(0x160, 0x2e, 0x13b);
|
||||
@@ -1136,7 +1136,7 @@ namespace ipl {
|
||||
case 'N':
|
||||
if (mpWiiSettingFlag->smthMsgData == 0x1d || calcSafeMode()) {
|
||||
if (static_cast<u8>(parental::Parental::checkFlags()) != 0) {
|
||||
createChildScene(0x1b, this, NULL, reinterpret_cast<void*>(1));
|
||||
createChildScene(SCENE_PARENTAL_DIALOG, this, NULL, reinterpret_cast<void*>(1));
|
||||
mDialogState = 5;
|
||||
} else {
|
||||
www::wiisetting::setFuncResult(1);
|
||||
@@ -1154,8 +1154,8 @@ namespace ipl {
|
||||
break;
|
||||
case 'P':
|
||||
SCSetLanguage(mpWiiSettingData->data[0x30]);
|
||||
if (SCGetConfigDoneFlag() == 0 && SCGetConfigDoneFlag2() == 0 &&
|
||||
static_cast<u32>(System::getRegion()) == 2) {
|
||||
if (!SCGetConfigDoneFlag() && !SCGetConfigDoneFlag2() &&
|
||||
static_cast<u32>(System::getRegion()) == SC_PRODUCT_AREA_EUR) {
|
||||
if (mpWiiSettingData->data[0x30] != 3) {
|
||||
mpWiiSettingData->data[0x3c] = 0x40;
|
||||
parental::Parental::setCountry(0x40);
|
||||
@@ -1250,7 +1250,7 @@ namespace ipl {
|
||||
}
|
||||
break;
|
||||
case 'd':
|
||||
createChildScene(0x1d, this, NULL, reinterpret_cast<void*>(2));
|
||||
createChildScene(SCENE_KITAYAMA_TEST, this, NULL, reinterpret_cast<void*>(2));
|
||||
resetFuncMsgQ();
|
||||
waitStart();
|
||||
break;
|
||||
@@ -1307,16 +1307,16 @@ namespace ipl {
|
||||
if (mInitialArgument == 2 || mInitialArgument == 5) {
|
||||
SCSetConfigDoneFlag(TRUE);
|
||||
SCSetConfigDoneFlag2(TRUE);
|
||||
SCSetUpdateType(0);
|
||||
SCSetUpdateType(SC_UPDATE_TYPE_NONE);
|
||||
SCFlush();
|
||||
}
|
||||
|
||||
while (WPADGetStatus() != 0 ||
|
||||
while (WPADGetStatus() != WPAD_LIB_STATUS_0 ||
|
||||
System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8) {
|
||||
snd::getSystem()->calc();
|
||||
System::getBS2Manager()->update();
|
||||
VIWaitForRetrace();
|
||||
if (WPADGetStatus() != 0) {
|
||||
if (WPADGetStatus() != WPAD_LIB_STATUS_0) {
|
||||
OSReport("wait for WPAD\n");
|
||||
}
|
||||
if (System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8) {
|
||||
@@ -1346,12 +1346,12 @@ namespace ipl {
|
||||
if (mInitialArgument == 2 || mInitialArgument == 5) {
|
||||
SCSetConfigDoneFlag(TRUE);
|
||||
SCSetConfigDoneFlag2(TRUE);
|
||||
SCSetUpdateType(0);
|
||||
SCSetUpdateType(SC_UPDATE_TYPE_NONE);
|
||||
SCFlush();
|
||||
reserveAllSceneDestruction(0x1a, NULL);
|
||||
reserveAllSceneDestruction(SCENE_HEALTH, NULL);
|
||||
} else {
|
||||
System::reloadDownloadTask();
|
||||
reserveAllSceneDestruction(0x15, NULL);
|
||||
reserveAllSceneDestruction(SCENE_SETTING_BG, NULL);
|
||||
}
|
||||
delete mpBrowserData;
|
||||
return FADER_SCN_NEXT;
|
||||
@@ -1722,12 +1722,12 @@ namespace ipl {
|
||||
if (mpWiiSettingData->data[0x11] != 13 && mpWiiSettingData->data[0x11] != 2 &&
|
||||
mpWiiSettingData->data[0x11] != 18 && mpWiiSettingData->data[0x11] != 19 &&
|
||||
mpWiiSettingData->data[0x11] != 22) {
|
||||
utility::CharacterCode::UTF8ToUTF16(reinterpret_cast<wchar_t*>(mInputText), text, 0x101);
|
||||
utility::CharacterCode::UTF8ToUTF16(mInputText, text, 0x101);
|
||||
}
|
||||
|
||||
size_t textLength = wcslen(reinterpret_cast<wchar_t*>(mInputText));
|
||||
size_t textLength = wcslen(mInputText);
|
||||
OSReport("キーボード: %d %d %d %d\n", rowLimit, stringLimit, keyboardType, textLength);
|
||||
reinterpret_cast<wchar_t*>(mInputText)[stringLimit] = 0;
|
||||
mInputText[stringLimit] = 0;
|
||||
|
||||
switch (mpWiiSettingData->data[0x11]) {
|
||||
case 1: case 2: case 3:
|
||||
@@ -1753,7 +1753,7 @@ namespace ipl {
|
||||
|
||||
keyboard::Manager::KeyboardSetting setting;
|
||||
setting.rowLimit = rowLimit;
|
||||
setting.wcString = reinterpret_cast<const wchar_t*>(mInputText);
|
||||
setting.wcString = mInputText;
|
||||
setting.stringLimit = stringLimit;
|
||||
setting.type = keyboardType;
|
||||
System::getKeyboard()->start(0, setting);
|
||||
@@ -2020,18 +2020,18 @@ namespace ipl {
|
||||
u8 formId = mpWiiSettingData->data[0x11];
|
||||
|
||||
if (formId == 2 || formId == 22) {
|
||||
utility::CharacterCode::UTF16ToANSI(convertedText, reinterpret_cast<const wchar_t*>(mInputText), 0x100);
|
||||
memset(convertedText + wcslen(reinterpret_cast<const wchar_t*>(mInputText)), 0,
|
||||
0x100 - wcslen(reinterpret_cast<const wchar_t*>(mInputText)));
|
||||
utility::CharacterCode::UTF16ToANSI(convertedText, mInputText, 0x100);
|
||||
memset(convertedText + wcslen(mInputText), 0,
|
||||
0x100 - wcslen(mInputText));
|
||||
memcpy(mpStringBuffer->securityKey, convertedText, sizeof(mpStringBuffer->securityKey));
|
||||
return;
|
||||
}
|
||||
|
||||
if (formId == 18 || formId == 19) {
|
||||
adjustSecA(reinterpret_cast<wchar_t*>(mInputText));
|
||||
adjustSecA(mInputText);
|
||||
}
|
||||
utility::CharacterCode::UTF16ToUTF8(reinterpret_cast<char*>(convertedText),
|
||||
reinterpret_cast<const wchar_t*>(mInputText), 0x301);
|
||||
mInputText, 0x301);
|
||||
|
||||
switch (mpWiiSettingData->data[0x11]) {
|
||||
case 1:
|
||||
@@ -2092,7 +2092,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Setting::initNickName() {
|
||||
bool nicknameExists = SCGetOwnerNickName(reinterpret_cast<SCOwnerNickname*>(mSettingData)) != 0;
|
||||
bool nicknameExists = SCGetOwnerNickName(reinterpret_cast<SCOwnerNickname*>(mSettingData));
|
||||
OSReport("SCGetOwnerNickName:%d\n", nicknameExists);
|
||||
if (nicknameExists) {
|
||||
SCOwnerNickname* ownerNickname = reinterpret_cast<SCOwnerNickname*>(mSettingData);
|
||||
@@ -2100,7 +2100,7 @@ namespace ipl {
|
||||
}
|
||||
memset(mpStringBuffer->nickname, 0, sizeof(mpStringBuffer->nickname));
|
||||
utility::CharacterCode::UTF16ToUTF8(mpStringBuffer->nickname,
|
||||
reinterpret_cast<const wchar_t*>(mInputText),
|
||||
mInputText,
|
||||
sizeof(mpStringBuffer->nickname));
|
||||
}
|
||||
|
||||
@@ -2188,7 +2188,7 @@ namespace ipl {
|
||||
memset(answer, 0, 0x44);
|
||||
wcsncpy(answer, parental::Parental::getSecA(), 0x20);
|
||||
memset(mInputText, 0, sizeof(mInputText));
|
||||
wcsncpy(reinterpret_cast<wchar_t*>(mInputText), answer, 0x20);
|
||||
wcsncpy(mInputText, answer, 0x20);
|
||||
adjustSecA(answer);
|
||||
utility::CharacterCode::UTF16ToUTF8(mpStringBuffer->parentalSecA, answer,
|
||||
sizeof(mpStringBuffer->parentalSecA));
|
||||
@@ -2212,12 +2212,12 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Setting::setNickName() {
|
||||
reinterpret_cast<SCOwnerNickname*>(mSettingData)->length = wcslen(reinterpret_cast<const wchar_t*>(mInputText));
|
||||
reinterpret_cast<SCOwnerNickname*>(mSettingData)->length = wcslen(mInputText);
|
||||
if (checkTextNum(mpStringBuffer->nickname) == 3) {
|
||||
memset(mSettingData, 0, sizeof(reinterpret_cast<SCOwnerNickname*>(mSettingData)->name));
|
||||
memcpy(mSettingData, mInputText,
|
||||
reinterpret_cast<SCOwnerNickname*>(mSettingData)->length * sizeof(wchar_t));
|
||||
bool written = SCSetOwnerNickName(reinterpret_cast<SCOwnerNickname*>(mSettingData)) != 0;
|
||||
bool written = SCSetOwnerNickName(reinterpret_cast<SCOwnerNickname*>(mSettingData));
|
||||
OSReport("nicknameFlag:1 %d %s\n", written,
|
||||
reinterpret_cast<SCOwnerNickname*>(mSettingData)->name);
|
||||
}
|
||||
@@ -2275,7 +2275,7 @@ namespace ipl {
|
||||
System::getDialog()->callBtn0(0x1be, 0xb4, false);
|
||||
mDialogState = 2;
|
||||
} else {
|
||||
if (ncd::NCDSetting::checkProxy(mpStringBuffer->proxy.server) != 0) {
|
||||
if (ncd::NCDSetting::checkProxy(mpStringBuffer->proxy.server)) {
|
||||
www::wiisetting::setFuncResult(3);
|
||||
memset(proxy.server, 0, sizeof(proxy.server));
|
||||
utility::CharacterCode::UTF8ToANSI(reinterpret_cast<u8*>(proxy.server),
|
||||
@@ -2290,8 +2290,8 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Setting::setBasic() {
|
||||
if (ncd::NCDSetting::checkProxyBasic(mpStringBuffer->proxyBasic.uname) != 0 &&
|
||||
ncd::NCDSetting::checkProxyBasic(mpStringBuffer->proxyBasic.pass) != 0) {
|
||||
if (ncd::NCDSetting::checkProxyBasic(mpStringBuffer->proxyBasic.uname) &&
|
||||
ncd::NCDSetting::checkProxyBasic(mpStringBuffer->proxyBasic.pass)) {
|
||||
NCDProxyServerProfile proxy;
|
||||
www::wiisetting::setFuncResult(3);
|
||||
memset(&proxy, 0, sizeof(proxy));
|
||||
@@ -2362,11 +2362,11 @@ namespace ipl {
|
||||
|
||||
void Setting::setSecA() {
|
||||
memset(mInputText, 0, sizeof(mInputText));
|
||||
utility::CharacterCode::UTF8ToUTF16(reinterpret_cast<wchar_t*>(mInputText),
|
||||
utility::CharacterCode::UTF8ToUTF16(mInputText,
|
||||
mpStringBuffer->parentalSecA, 0x44);
|
||||
reAdjustSecA();
|
||||
if (checkTextNum(NULL) == 3) {
|
||||
parental::Parental::setSecA(reinterpret_cast<const wchar_t*>(mInputText));
|
||||
parental::Parental::setSecA(mInputText);
|
||||
}
|
||||
memset(mInputText, 0, sizeof(mInputText));
|
||||
}
|
||||
@@ -2374,11 +2374,11 @@ namespace ipl {
|
||||
void Setting::setReSecA() {
|
||||
u8 result = 2;
|
||||
memset(mInputText, 0, sizeof(mInputText));
|
||||
utility::CharacterCode::UTF8ToUTF16(reinterpret_cast<wchar_t*>(mInputText),
|
||||
utility::CharacterCode::UTF8ToUTF16(mInputText,
|
||||
mpStringBuffer->parentalReSecA, 0x44);
|
||||
reAdjustSecA();
|
||||
if (checkTextNum(NULL) == 3) {
|
||||
if (parental::Parental::judgeSecA(reinterpret_cast<const wchar_t*>(mInputText))) {
|
||||
if (parental::Parental::judgeSecA(mInputText)) {
|
||||
result = 1;
|
||||
}
|
||||
www::wiisetting::setFuncResult(result);
|
||||
@@ -2405,7 +2405,7 @@ namespace ipl {
|
||||
u32 message = 0;
|
||||
switch (mpWiiSettingData->data[0x36]) {
|
||||
case 2:
|
||||
if (wcslen(reinterpret_cast<const wchar_t*>(mInputText)) != 0) {
|
||||
if (wcslen(mInputText) != 0) {
|
||||
if (checkSpace()) {
|
||||
result = 3;
|
||||
} else {
|
||||
@@ -2438,7 +2438,7 @@ namespace ipl {
|
||||
minimum = 6;
|
||||
break;
|
||||
}
|
||||
if (wcslen(reinterpret_cast<const wchar_t*>(mInputText)) >= minimum) {
|
||||
if (wcslen(mInputText) >= minimum) {
|
||||
if (checkSpace()) {
|
||||
result = 3;
|
||||
} else {
|
||||
@@ -2533,7 +2533,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (containsWideCharacter && wcslen(reinterpret_cast<const wchar_t*>(mInputText)) > 0x10) {
|
||||
if (containsWideCharacter && wcslen(mInputText) > 0x10) {
|
||||
char secondLine[0x22];
|
||||
SettingSecAText* lines = reinterpret_cast<SettingSecAText*>(text);
|
||||
memcpy(secondLine, lines->wrappedLine, 0x22);
|
||||
@@ -2710,7 +2710,7 @@ namespace ipl {
|
||||
switch (mAPScanState) {
|
||||
case 1:
|
||||
memset(&mAPScanList.count, 0, 0x800);
|
||||
mpAPScanThread->setResultData(reinterpret_cast<unsigned short*>(&mAPScanList.count));
|
||||
mpAPScanThread->setResultData(&mAPScanList.count);
|
||||
memset(mpMem1BrowserBuffer, 0, 0x1000);
|
||||
mpAPScanThread->Create(mpMem1BrowserBuffer, 0x1000, 0x12, true);
|
||||
mAPScanState = 2;
|
||||
@@ -3124,7 +3124,7 @@ namespace ipl {
|
||||
if (ncd::NCDSetting::getEnableFlag()) {
|
||||
mEULAState = 1;
|
||||
} else {
|
||||
if (static_cast<u32>(System::getRegion()) != 2) {
|
||||
if (static_cast<u32>(System::getRegion()) != SC_PRODUCT_AREA_EUR) {
|
||||
System::getDialog()->callBtn2(0x170, 0x146, 0x25);
|
||||
} else {
|
||||
System::getDialog()->callBtn2(0x174, 0x146, 0x25);
|
||||
@@ -3214,7 +3214,7 @@ namespace ipl {
|
||||
void Setting::setUpdate_Init_() {
|
||||
if (ncd::NCDSetting::getEnableFlag()) {
|
||||
www::wiisetting::setFuncResult(1);
|
||||
if (static_cast<u32>(System::getRegion()) == 2) {
|
||||
if (static_cast<u32>(System::getRegion()) == SC_PRODUCT_AREA_EUR) {
|
||||
System::getDialog()->callBtn1Sml(0x177, 0x179);
|
||||
} else {
|
||||
System::getDialog()->callBtn1Sml(0x176, 0x178);
|
||||
@@ -3234,15 +3234,15 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Setting::setUpdate_ConnectTestStart_() {
|
||||
if (System::getSceneManager()->getScene(0x19) == NULL && www::wiisetting::getFuncResult() == 0) {
|
||||
if (System::getSceneManager()->getScene(SCENE_NAKAMURA_TEST) == NULL && www::wiisetting::getFuncResult() == 0) {
|
||||
waitStart();
|
||||
createChildScene(0x19, this, NULL, NULL);
|
||||
createChildScene(SCENE_NAKAMURA_TEST, this, NULL, NULL);
|
||||
mProfileIDMode = 3;
|
||||
}
|
||||
}
|
||||
|
||||
void Setting::setUpdate_ConnectTestCreateWait_() {
|
||||
if (System::getSceneManager()->getScene(0x19) != NULL) {
|
||||
if (System::getSceneManager()->getScene(SCENE_NAKAMURA_TEST) != NULL) {
|
||||
mProfileIDMode = 4;
|
||||
}
|
||||
}
|
||||
@@ -3293,7 +3293,7 @@ namespace ipl {
|
||||
|
||||
void Setting::setUpdate_EULAInit_() {
|
||||
if (System::getDialog()->getLastResult() >= 0) {
|
||||
if (SCGetEULA() != 0) {
|
||||
if (SCGetEULA()) {
|
||||
mProfileIDMode = 10;
|
||||
} else {
|
||||
mProfileIDMode = 0;
|
||||
@@ -3347,7 +3347,7 @@ namespace ipl {
|
||||
mProfileIDMode = 6;
|
||||
mUpdateTiming = 0;
|
||||
mpWiiSettingFlag->smthMsgData = 0x54;
|
||||
SCSetUpdateType(2);
|
||||
SCSetUpdateType(SC_UPDATE_TYPE_NETWORK);
|
||||
SCFlush();
|
||||
break;
|
||||
case 2:
|
||||
@@ -3357,7 +3357,7 @@ namespace ipl {
|
||||
break;
|
||||
case 3:
|
||||
System::getDialog()->terminate();
|
||||
if (SCGetConfigDoneFlag2() == 0) {
|
||||
if (!SCGetConfigDoneFlag2()) {
|
||||
mProfileIDMode = 6;
|
||||
} else {
|
||||
mProfileIDMode = 7;
|
||||
@@ -3393,7 +3393,7 @@ namespace ipl {
|
||||
break;
|
||||
case 1:
|
||||
if (System::getDialog()->getLastResult() == 2) {
|
||||
if (static_cast<u32>(System::getRegion()) == 2) {
|
||||
if (static_cast<u32>(System::getRegion()) == SC_PRODUCT_AREA_EUR) {
|
||||
System::getDialog()->callBtn1Sml(0x177, 0x179);
|
||||
} else {
|
||||
System::getDialog()->callBtn1Sml(0x176, 0x178);
|
||||
@@ -3414,7 +3414,7 @@ namespace ipl {
|
||||
mUpdateTiming = 4;
|
||||
break;
|
||||
case 4: {
|
||||
scene::NakamuraTest* test = static_cast<scene::NakamuraTest*>(System::getSceneManager()->getScene(0x19));
|
||||
scene::NakamuraTest* test = static_cast<scene::NakamuraTest*>(System::getSceneManager()->getScene(SCENE_NAKAMURA_TEST));
|
||||
System::getDialog()->setProgBarLength(test->amtCompleted() * 100 / test->amtTotal());
|
||||
break;
|
||||
}
|
||||
@@ -3485,16 +3485,16 @@ namespace ipl {
|
||||
prefixLength += detailLength;
|
||||
message[prefixLength] = 0;
|
||||
if (mpWiiSettingFlag->smthMsgData == 9) {
|
||||
if (static_cast<u32>(System::getRegion()) == 2 &&
|
||||
static_cast<u32>(System::getLanguage()) == 2 &&
|
||||
if (static_cast<u32>(System::getRegion()) == SC_PRODUCT_AREA_EUR &&
|
||||
System::getLanguage() == SC_LANG_GERMAN &&
|
||||
static_cast<u32>(getErrorNum()) == 0x1b6) {
|
||||
System::getDialog()->callBtn1(message, 0x2e, 78.0f);
|
||||
} else {
|
||||
System::getDialog()->callBtn1(message, 0x2e);
|
||||
}
|
||||
} else if (mProfileIDMode == 0) {
|
||||
if (static_cast<u32>(System::getRegion()) == 2 &&
|
||||
static_cast<u32>(System::getLanguage()) == 2 &&
|
||||
if (static_cast<u32>(System::getRegion()) == SC_PRODUCT_AREA_EUR &&
|
||||
System::getLanguage() == SC_LANG_GERMAN &&
|
||||
static_cast<u32>(getErrorNum()) == 0x1b6) {
|
||||
System::getDialog()->callBtn1(message, 0x2e, 78.0f);
|
||||
} else {
|
||||
@@ -3612,8 +3612,8 @@ namespace ipl {
|
||||
static_cast<USBAPThread*>(mpUSBAPThread)->setData(
|
||||
reinterpret_cast<const wchar_t*>(mSettingData), &mUiStatus[1]);
|
||||
static_cast<USBAPThread*>(mpUSBAPThread)->Init(
|
||||
reinterpret_cast<unsigned short*>(mpMem2BrowserBuffer),
|
||||
reinterpret_cast<u8*>(mpBrowserStringBuffer));
|
||||
static_cast<unsigned short*>(mpMem2BrowserBuffer),
|
||||
static_cast<u8*>(mpBrowserStringBuffer));
|
||||
mUSBAPState = 2;
|
||||
} else {
|
||||
www::wiisetting::setFuncResult(2);
|
||||
@@ -3667,7 +3667,7 @@ namespace ipl {
|
||||
switch (mAOSSState) {
|
||||
case 0:
|
||||
if (!snd::getSystem()->isSEActive("WIPL_SE_DECIDE")) {
|
||||
if (!cancelled && static_cast<AOSSThread*>(mpAOSSThread)->start() != 0) {
|
||||
if (!cancelled && static_cast<AOSSThread*>(mpAOSSThread)->start()) {
|
||||
mAOSSState = 1;
|
||||
} else {
|
||||
www::wiisetting::setFuncResult(cancelled ? 5 : 2);
|
||||
@@ -3678,7 +3678,7 @@ namespace ipl {
|
||||
case 1:
|
||||
case 2: {
|
||||
int result;
|
||||
if (static_cast<AOSSThread*>(mpAOSSThread)->finish(&m_AOSSConfig, &result) != 0) {
|
||||
if (static_cast<AOSSThread*>(mpAOSSThread)->finish(&m_AOSSConfig, &result)) {
|
||||
mAOSSState = 0;
|
||||
if (cancelled) {
|
||||
www::wiisetting::setFuncResult(5);
|
||||
@@ -3724,7 +3724,7 @@ namespace ipl {
|
||||
case 0:
|
||||
case 6:
|
||||
case 7:
|
||||
if (static_cast<RakuRakuThread*>(mpRakuRakuThread)->finish(NULL, NULL) != 0) {
|
||||
if (static_cast<RakuRakuThread*>(mpRakuRakuThread)->finish(NULL, NULL)) {
|
||||
www::wiisetting::setFuncResult(5);
|
||||
resetFuncMsgQ();
|
||||
}
|
||||
@@ -3737,7 +3737,7 @@ namespace ipl {
|
||||
switch (state) {
|
||||
case 0:
|
||||
if (!snd::getSystem()->isSEActive("WIPL_SE_DECIDE") &&
|
||||
static_cast<RakuRakuThread*>(mpRakuRakuThread)->start() == 0) {
|
||||
!static_cast<RakuRakuThread*>(mpRakuRakuThread)->start()) {
|
||||
www::wiisetting::setFuncResult(cancelled ? 5 : 2);
|
||||
resetFuncMsgQ();
|
||||
}
|
||||
@@ -3755,7 +3755,7 @@ namespace ipl {
|
||||
}
|
||||
break;
|
||||
case 6: {
|
||||
if (static_cast<RakuRakuThread*>(mpRakuRakuThread)->finish(&m_RakuConfig.cfg, &result) != 0) {
|
||||
if (static_cast<RakuRakuThread*>(mpRakuRakuThread)->finish(&m_RakuConfig.cfg, &result)) {
|
||||
if (result != 1) {
|
||||
www::wiisetting::setFuncResult(2);
|
||||
} else {
|
||||
@@ -3769,7 +3769,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case 7: {
|
||||
if (static_cast<RakuRakuThread*>(mpRakuRakuThread)->finish(NULL, &result) != 0) {
|
||||
if (static_cast<RakuRakuThread*>(mpRakuRakuThread)->finish(NULL, &result)) {
|
||||
www::wiisetting::setFuncResult(2);
|
||||
resetFuncMsgQ();
|
||||
}
|
||||
@@ -3875,7 +3875,7 @@ namespace ipl {
|
||||
break;
|
||||
case ::gui::EventHandler::ON_TRIG:
|
||||
controller::Interface* input = static_cast<controller::Interface*>(data);
|
||||
if (input->downTrg(0x100800)) {
|
||||
if (input->downTrg(controller::BTN_INTERACT)) {
|
||||
mpSetting->start_trig_event(paneName);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -127,7 +127,7 @@ namespace ipl {
|
||||
|
||||
void SettingButton::start_point_event(const char* paneName, controller::Interface* controller) {
|
||||
if (isPane(paneName, "B_Button_00")) {
|
||||
if (mBtnHovered == FALSE) {
|
||||
if (!mBtnHovered) {
|
||||
snd::getSystem()->startSE("WIPL_SE_BT_TARGETTING");
|
||||
if (controller) {
|
||||
controller->rumble();
|
||||
@@ -164,7 +164,7 @@ namespace ipl {
|
||||
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
|
||||
const char* paneName = component->getPane()->GetName();
|
||||
|
||||
controller::Interface* controller = reinterpret_cast<controller::Interface*>(data);
|
||||
controller::Interface* controller = static_cast<controller::Interface*>(data);
|
||||
|
||||
switch (event) {
|
||||
case ::gui::EventHandler::ON_POINT: {
|
||||
|
||||
@@ -215,7 +215,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SettingSelect::stt_1st_fadein() {
|
||||
if (!mpLayout->getAnim(ANIM_DATA_MANAGE_IN)->isPlaying() && !mpLayout->getAnim(7)->isPlaying()) {
|
||||
if (!mpLayout->getAnim(ANIM_DATA_MANAGE_IN)->isPlaying() && !mpLayout->getAnim(ANIM_SETTING_IN)->isPlaying()) {
|
||||
CHANGE_STATE(STATE_1ST_NORMAL);
|
||||
}
|
||||
}
|
||||
@@ -449,7 +449,7 @@ namespace ipl {
|
||||
int btnNo = get_button_no(paneName);
|
||||
|
||||
if (condition(btnNo)) {
|
||||
if (mbHovered[btnNo] == FALSE) {
|
||||
if (!mbHovered[btnNo]) {
|
||||
start_focusin_anm(btnNo, con);
|
||||
}
|
||||
mbHovered[btnNo]++;
|
||||
@@ -668,7 +668,7 @@ namespace ipl {
|
||||
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
|
||||
const char* paneName = component->getPane()->GetName();
|
||||
|
||||
controller::Interface* controller = reinterpret_cast<controller::Interface*>(data);
|
||||
controller::Interface* controller = static_cast<controller::Interface*>(data);
|
||||
|
||||
switch (event) {
|
||||
case ::gui::EventHandler::ON_POINT: {
|
||||
@@ -739,12 +739,12 @@ namespace ipl {
|
||||
|
||||
void SettingSelect::finish_exit_reboot() {
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN) {
|
||||
while (WPADGetStatus() != 0 || System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8) {
|
||||
while (WPADGetStatus() != WPAD_LIB_STATUS_0 || System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8) {
|
||||
snd::getSystem()->calc();
|
||||
System::getBS2Manager()->update();
|
||||
VIWaitForRetrace();
|
||||
|
||||
if (WPADGetStatus() != 0) {
|
||||
if (WPADGetStatus() != WPAD_LIB_STATUS_0) {
|
||||
OSReport("wait for WPAD\n");
|
||||
}
|
||||
|
||||
|
||||
@@ -365,7 +365,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
BOOL cdb_backup_delete_search_cb_(void* work, CDBRecord* record) {
|
||||
CdbBackup* cdbBackup = reinterpret_cast<CdbBackup*>(work);
|
||||
CdbBackup* cdbBackup = static_cast<CdbBackup*>(work);
|
||||
|
||||
BOOL result = TRUE;
|
||||
|
||||
@@ -398,7 +398,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
BOOL cdb_backup_move_search_cb_(void* work, CDBRecord* record) {
|
||||
CdbBackup* cdbBackup = reinterpret_cast<CdbBackup*>(work);
|
||||
CdbBackup* cdbBackup = static_cast<CdbBackup*>(work);
|
||||
|
||||
BOOL result = TRUE;
|
||||
|
||||
@@ -425,7 +425,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void cdb_backup_move_task_(void* work) {
|
||||
CdbBackup* cdbBackup = reinterpret_cast<CdbBackup*>(work);
|
||||
CdbBackup* cdbBackup = static_cast<CdbBackup*>(work);
|
||||
|
||||
const CDBDate beginDate = CDBMakeCDBDate(MIN_YEAR, MIN_MONTH - 1, MIN_DAY, MIN_HOUR, MIN_MINUTE, MIN_SECOND);
|
||||
// @Bug should be MAX_MONTH-1
|
||||
|
||||
@@ -1116,22 +1116,22 @@ namespace ipl {
|
||||
}
|
||||
|
||||
// (Fakematch??) Using both 0x20 and sizeof(MD5Head) otherwise it does not match
|
||||
if (NAND_CHECK_MAGIC4((u8*)srcData + 0x20, 'L', 'Z', '7', '7')) {
|
||||
if (NAND_CHECK_MAGIC4(srcData + 0x20, 'L', 'Z', '7', '7')) {
|
||||
if (!mChannels[diskPage][diskIndex].loadedBnrData[index]) {
|
||||
// Uncompress data
|
||||
CXGetUncompressedSize((u8*)srcData + sizeof(MD5Head) + 4);
|
||||
CXUncompressLZ((u8*)srcData + 0x20 + 4, *destData);
|
||||
CXGetUncompressedSize(srcData + sizeof(MD5Head) + 4);
|
||||
CXUncompressLZ(srcData + 0x20 + 4, *destData);
|
||||
|
||||
mChannels[diskPage][diskIndex].loadedBnrData[index] = true;
|
||||
|
||||
// Verify MD5
|
||||
if (!calcMD5(md5sum, (u8*)srcData + sizeof(MD5Head), fileLen)) {
|
||||
if (!calcMD5(md5sum, srcData + sizeof(MD5Head), fileLen)) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (!mChannels[diskPage][diskIndex].loadedBnrData[index]) {
|
||||
memcpy(*destData, (u8*)srcData + sizeof(MD5Head), readSize);
|
||||
memcpy(*destData, srcData + sizeof(MD5Head), readSize);
|
||||
|
||||
mChannels[diskPage][diskIndex].loadedBnrData[index] = true;
|
||||
|
||||
@@ -1293,7 +1293,7 @@ namespace ipl {
|
||||
|
||||
BOOL Manager::isMissingTicket(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel != NULL && channel->missingTicket != FALSE) {
|
||||
if (channel != NULL && channel->missingTicket) {
|
||||
return TRUE;
|
||||
} else {
|
||||
return FALSE;
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace ipl {
|
||||
if (!mbStarted) {
|
||||
mbStarted = true;
|
||||
|
||||
memset((void*)mpStack, 0, STACK_SIZE);
|
||||
memset(mpStack, 0, STACK_SIZE);
|
||||
Create(mpStack, STACK_SIZE, 17);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace ipl {
|
||||
|
||||
void ChannelScriptManager::calc() {
|
||||
OSMessage msg;
|
||||
if (smCSState == CHANS_VM_STATE_WAIT_BEGIN_RENDER && smpThread->IsThreadSuspended() != FALSE) {
|
||||
if (smCSState == CHANS_VM_STATE_WAIT_BEGIN_RENDER && smpThread->IsThreadSuspended()) {
|
||||
OSReceiveMessage(smpThread->getCalcQueue(), &msg, 0);
|
||||
mState = *(u32*)msg;
|
||||
if (mState == CHANS_VM_MSG_STATE_BEGIN_RENDER) {
|
||||
|
||||
@@ -65,16 +65,16 @@ namespace ipl {
|
||||
u32 time = OSTicksToMilliseconds(OSGetTick() - mLastRumbleTime);
|
||||
f32 f1 = (f32)time / 1000.0f;
|
||||
if (f1 < 0.058333333f) {
|
||||
WPADControlMotor(mChan, 1);
|
||||
WPADControlMotor(mChan, WPAD_MOTOR_RUMBLE);
|
||||
} else if (f1 < kRumbleDuration[mRumbleType]) {
|
||||
WPADControlMotor(mChan, 0);
|
||||
} else if (getKPADStatus() == NULL || getKPADStatus()->wpad_err == 0) {
|
||||
WPADControlMotor(mChan, WPAD_MOTOR_STOP);
|
||||
} else if (getKPADStatus() == NULL || getKPADStatus()->wpad_err == WPAD_ERR_OK) {
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
WPADControlMotor(mChan, 0);
|
||||
WPADControlMotor(mChan, WPAD_MOTOR_STOP);
|
||||
}
|
||||
if (downTrg(BTN_INTERACT) != 0 || decide() != 0) {
|
||||
WPADControlMotor(mChan, 0);
|
||||
if (downTrg(BTN_INTERACT) || decide() != 0) {
|
||||
WPADControlMotor(mChan, WPAD_MOTOR_STOP);
|
||||
mRumbleType = 2;
|
||||
}
|
||||
break;
|
||||
@@ -83,11 +83,11 @@ namespace ipl {
|
||||
u32 time = OSTicksToMilliseconds(OSGetTick() - mLastRumbleTime);
|
||||
f32 f1 = (f32)time / 1000.0f;
|
||||
if (f1 < kRumbleDuration[1]) {
|
||||
WPADControlMotor(mChan, 0);
|
||||
} else if (getKPADStatus() == NULL || getKPADStatus()->wpad_err == 0) {
|
||||
WPADControlMotor(mChan, WPAD_MOTOR_STOP);
|
||||
} else if (getKPADStatus() == NULL || getKPADStatus()->wpad_err == WPAD_ERR_OK) {
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
WPADControlMotor(mChan, 0);
|
||||
WPADControlMotor(mChan, WPAD_MOTOR_STOP);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -123,7 +123,7 @@ namespace ipl {
|
||||
}
|
||||
void ipl::controller::Base::cancelRumbling() {
|
||||
if (mRumbleType != -1) {
|
||||
WPADControlMotor(mChan, 0);
|
||||
WPADControlMotor(mChan, WPAD_MOTOR_STOP);
|
||||
}
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
@@ -140,10 +140,10 @@ namespace ipl {
|
||||
mbWasPinching = mbPinching;
|
||||
if (isValidBtn()) {
|
||||
if (mbWasPinching == 0) {
|
||||
if (down(0x800) && down(0x400)) {
|
||||
if (down(REVO_BTN_A) && down(REVO_BTN_B)) {
|
||||
mbPinching = 1;
|
||||
}
|
||||
} else if (!down(0x800) || !down(0x400)) {
|
||||
} else if (!down(REVO_BTN_A) || !down(REVO_BTN_B)) {
|
||||
mbPinching = 0;
|
||||
}
|
||||
} else {
|
||||
@@ -157,7 +157,7 @@ namespace ipl {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (mpKpadStatus->wpad_err == 0 || mpKpadStatus->wpad_err == -7) && mpKpadStatus->dpd_valid_fg != 0;
|
||||
return (mpKpadStatus->wpad_err == WPAD_ERR_OK || mpKpadStatus->wpad_err == WPAD_ERR_CORRUPTED) && mpKpadStatus->dpd_valid_fg != 0;
|
||||
}
|
||||
bool ipl::controller::Revolution::isValidBtn() const {
|
||||
u8 val = mpKpadStatus->wpad_err;
|
||||
@@ -189,7 +189,7 @@ namespace ipl {
|
||||
kpad_rect.bottom = nw4r_rect.bottom;
|
||||
|
||||
KPADGetProjectionPos(&dest, &src, &kpad_rect, 1.10132003f);
|
||||
if (SCGetAspectRatio() == 1) {
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
dest.x *= 1.15f;
|
||||
dest.y *= 1.15f;
|
||||
}
|
||||
@@ -315,7 +315,7 @@ namespace ipl {
|
||||
rect.right = nw4r_rect.right;
|
||||
rect.bottom = nw4r_rect.bottom;
|
||||
KPADGetProjectionPos(&dest, &src, &rect, 1.10132003f);
|
||||
if (SCGetAspectRatio() == 1) {
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
dest.x *= 1.15f;
|
||||
dest.y *= 1.15f;
|
||||
}
|
||||
@@ -509,7 +509,7 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (Revolution::isValidDpd() != 0) || (mClassicCursorTimer != 0);
|
||||
return Revolution::isValidDpd() || (mClassicCursorTimer != 0);
|
||||
}
|
||||
int ipl::controller::Classic::getClassicReleaseFlag() const {
|
||||
return mpKpadStatus->ex_status.cl.release;
|
||||
|
||||
@@ -65,7 +65,7 @@ namespace ipl {
|
||||
KPADInit();
|
||||
|
||||
u32 sensitivity = SCGetBtDpdSensibility();
|
||||
for (int i = 0; i < 4; i++) {
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
WPADSetDpdSensitivity(sensitivity);
|
||||
KPADSetBtnRepeat(i, 0.5f, 0.1f);
|
||||
}
|
||||
@@ -74,8 +74,8 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::read() {
|
||||
for (int chan = 0; chan < 4; chan++) {
|
||||
if (SCGetWpadSensorBarPosition() == 1) {
|
||||
for (int chan = 0; chan < WPAD_MAX_CONTROLLERS; chan++) {
|
||||
if (SCGetWpadSensorBarPosition() == SC_WPAD_SENSOR_BAR_POSITION_TOP) {
|
||||
KPADSetSensorHeight(chan, 0.2f);
|
||||
} else {
|
||||
KPADSetSensorHeight(chan, -0.2f);
|
||||
@@ -83,11 +83,11 @@ namespace ipl {
|
||||
|
||||
u32 deviceType;
|
||||
s32 probe = WPADProbe(chan, &deviceType);
|
||||
if (probe == -1) {
|
||||
if (probe == WPAD_ERR_NO_CONTROLLER) {
|
||||
goto probe_invalid;
|
||||
}
|
||||
if (probe < -1) {
|
||||
if (probe >= -3) {
|
||||
if (probe < WPAD_ERR_NO_CONTROLLER) {
|
||||
if (probe >= WPAD_ERR_TRANSFER) {
|
||||
goto probe_valid;
|
||||
}
|
||||
goto probe_invalid;
|
||||
@@ -98,19 +98,19 @@ namespace ipl {
|
||||
probe_valid:
|
||||
{
|
||||
s32 read = KPADRead(chan, &mKPADStatus[chan], 1);
|
||||
if (read > 0 && mKPADStatus[chan].wpad_err != -4 && deviceType != 0xfd) {
|
||||
if (read > 0 && mKPADStatus[chan].wpad_err != WPAD_ERR_INVALID && deviceType != WPAD_DEV_NOT_FOUND) {
|
||||
mInvalidCount[chan] = 0;
|
||||
if (mKPADStatus[chan].wpad_err == -7 || deviceType == 0 || deviceType == 0xfb ||
|
||||
deviceType == 0xfc || deviceType == 0xff) {
|
||||
if (mControllers[chan] == NULL || mControllers[chan]->getType() != 0) {
|
||||
mControllers[chan] = new (mControllerStorage[chan]) Core(chan, 0, mKPADStatus[chan]);
|
||||
if (mKPADStatus[chan].wpad_err == WPAD_ERR_CORRUPTED || deviceType == WPAD_DEV_CORE || deviceType == WPAD_DEV_FUTURE ||
|
||||
deviceType == WPAD_DEV_NOT_SUPPORTED || deviceType == WPAD_DEV_UNKNOWN) {
|
||||
if (mControllers[chan] == NULL || mControllers[chan]->getType() != WPAD_DEV_CORE) {
|
||||
mControllers[chan] = new (mControllerStorage[chan]) Core(chan, WPAD_DEV_CORE, mKPADStatus[chan]);
|
||||
}
|
||||
} else if (deviceType == 1) {
|
||||
if (mControllers[chan] == NULL || mControllers[chan]->getType() != 1) {
|
||||
mControllers[chan] = new (mControllerStorage[chan]) FreeStyle(chan, 1, mKPADStatus[chan]);
|
||||
} else if (deviceType == WPAD_DEV_FREESTYLE) {
|
||||
if (mControllers[chan] == NULL || mControllers[chan]->getType() != WPAD_DEV_FREESTYLE) {
|
||||
mControllers[chan] = new (mControllerStorage[chan]) FreeStyle(chan, WPAD_DEV_FREESTYLE, mKPADStatus[chan]);
|
||||
}
|
||||
} else if (deviceType == 2) {
|
||||
if (mControllers[chan] == NULL || mControllers[chan]->getType() != 2) {
|
||||
} else if (deviceType == WPAD_DEV_CLASSIC) {
|
||||
if (mControllers[chan] == NULL || mControllers[chan]->getType() != WPAD_DEV_CLASSIC) {
|
||||
mControllers[chan] = new (mControllerStorage[chan]) Classic(chan, mKPADStatus[chan]);
|
||||
}
|
||||
} else {
|
||||
@@ -124,7 +124,7 @@ namespace ipl {
|
||||
if (mInvalidCount[chan] > 0x3c) {
|
||||
mInvalidCount[chan] = 0x3c;
|
||||
if (mControllers[chan] != NULL) {
|
||||
WPADControlMotor(chan, 0);
|
||||
WPADControlMotor(chan, WPAD_MOTOR_STOP);
|
||||
}
|
||||
mControllers[chan] = NULL;
|
||||
}
|
||||
@@ -144,7 +144,7 @@ namespace ipl {
|
||||
KPADSetPosParam(chan, 0.05f, 1.0f);
|
||||
}
|
||||
|
||||
for (int chan = 0; chan < 4; chan++) {
|
||||
for (int chan = 0; chan < WPAD_MAX_CONTROLLERS; chan++) {
|
||||
if (mControllers[chan] != NULL) {
|
||||
mControllers[chan]->read();
|
||||
}
|
||||
@@ -162,13 +162,13 @@ namespace ipl {
|
||||
}
|
||||
|
||||
Interface* Manager::getController(int chan) {
|
||||
return ((Interface**)this)[chan];
|
||||
return mControllers[chan];
|
||||
}
|
||||
|
||||
Interface* Manager::getYoungController() {
|
||||
Interface* ret = NULL;
|
||||
for (int i = 0; i < 4; i++) {
|
||||
Interface* controller = ((Interface**)this)[i];
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
Interface* controller = mControllers[i];
|
||||
if (controller != NULL) {
|
||||
ret = controller;
|
||||
break;
|
||||
|
||||
@@ -357,11 +357,11 @@ namespace ipl {
|
||||
// Wait for select animation to stop
|
||||
if (!mpCurDialog->gLayout->isPlaying(ANIM_SELECT_BTN_B) && !mpCurDialog->gLayout->isPlaying(ANIM_SELECT_BTN_A)) {
|
||||
if (mResult == RESULT_LEFT_BUTTON) {
|
||||
if (mbBtnHovered[DIALOG_BTN_TYPE_BTN2] != FALSE && mpPages[mCurPage].isTwoBtn) {
|
||||
if (mbBtnHovered[DIALOG_BTN_TYPE_BTN2] && mpPages[mCurPage].isTwoBtn) {
|
||||
mpCurDialog->gLayout->getAnim(ANIM_FOCUS_BTN_A_ON)->play();
|
||||
}
|
||||
} else {
|
||||
if (mbBtnHovered[DIALOG_BTN_TYPE_BTN1] != FALSE) {
|
||||
if (mbBtnHovered[DIALOG_BTN_TYPE_BTN1]) {
|
||||
mpCurDialog->gLayout->getAnim(ANIM_FOCUS_BTN_B_ON)->play();
|
||||
}
|
||||
}
|
||||
@@ -1114,7 +1114,7 @@ namespace ipl {
|
||||
int btnNo = get_button_no(paneName);
|
||||
if (!(mState == DIALOG_STATE_PAGE_FADE || mState == DIALOG_STATE_PAGE_FADE_PREPARE) ||
|
||||
(btnNo != DIALOG_BTN_TYPE_BTN2 || mpPages[mCurPage].isTwoBtn == mpPages[mPrevPage].isTwoBtn)) {
|
||||
if (btnNo != -1 && mbBtnHovered[btnNo] == FALSE) {
|
||||
if (btnNo != -1 && !mbBtnHovered[btnNo]) {
|
||||
int animIdx = -1;
|
||||
|
||||
// Get focus animation
|
||||
@@ -1301,7 +1301,7 @@ namespace ipl {
|
||||
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
|
||||
const char* paneName = component->getPane()->GetName();
|
||||
|
||||
controller::Interface* con = reinterpret_cast<controller::Interface*>(data);
|
||||
controller::Interface* con = static_cast<controller::Interface*>(data);
|
||||
|
||||
switch (event) {
|
||||
// Pointer on button
|
||||
|
||||
@@ -124,7 +124,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void ErrorHandler::calc() {
|
||||
if (mbReady == FALSE && System::getFader()->getStatus() == EGG::Fader::PREPARE_IN) {
|
||||
if (!mbReady && System::getFader()->getStatus() == EGG::Fader::PREPARE_IN) {
|
||||
System::getFader()->fadeIn();
|
||||
mbReady = TRUE;
|
||||
}
|
||||
|
||||
@@ -126,7 +126,7 @@ namespace ipl {
|
||||
wait(50);
|
||||
|
||||
for (chan = 0; chan < WPAD_MAX_CONTROLLERS; chan++) {
|
||||
if (cons[chan].wpad_err == 0) {
|
||||
if (cons[chan].wpad_err == WPAD_ERR_OK) {
|
||||
held = cons[chan].hold;
|
||||
|
||||
if ((held & WPAD_BUTTON_UP) && yCur > 0) {
|
||||
|
||||
@@ -152,7 +152,7 @@ namespace ipl {
|
||||
mConData.wiiCon[i].kpad = con->getKPADStatus();
|
||||
mConData.wiiCon[i].pos.x = con->getDpdPos().x;
|
||||
mConData.wiiCon[i].pos.y = con->getDpdPos().y;
|
||||
if (con->getType() == WPAD_DEV_CLASSIC && reinterpret_cast<controller::Classic*>(con)->isValidDpdClassic()) {
|
||||
if (con->getType() == WPAD_DEV_CLASSIC && static_cast<controller::Classic*>(con)->isValidDpdClassic()) {
|
||||
mConData.wiiCon[i].use_devtype = WPAD_DEV_CLASSIC;
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -60,7 +60,7 @@ namespace ipl {
|
||||
if (mpArc) {
|
||||
if (mbIsNandFile) {
|
||||
s32 result = wrapper::PrivateOpen(msNandFileName, &mNandFile, attr);
|
||||
if (nand_error_handling(result) == FALSE) {
|
||||
if (!nand_error_handling(result)) {
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -180,7 +180,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::doReadTask(void* work) {
|
||||
reinterpret_cast<File*>(work)->read();
|
||||
static_cast<File*>(work)->read();
|
||||
}
|
||||
|
||||
File* Manager::writeAsync(EGG::Heap* heap, const char* fileName, void* buffer, u32 length, u8 perms) {
|
||||
@@ -211,7 +211,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::doWriteTask(void* work) {
|
||||
reinterpret_cast<File*>(work)->write();
|
||||
static_cast<File*>(work)->write();
|
||||
}
|
||||
|
||||
void Manager::sendToken(int token) {
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace ipl {
|
||||
|
||||
if (mpArc) {
|
||||
s32 result = wrapper::PrivateOpen(fileName, &mNandFile, NAND_ACCESS_READ);
|
||||
if (nand_error_handling(result) == FALSE || ARCOpen(mpArc, msFileName, &mArcFile) == FALSE) {
|
||||
if (!nand_error_handling(result) || !ARCOpen(mpArc, msFileName, &mArcFile)) {
|
||||
return FALSE;
|
||||
} else {
|
||||
return TRUE;
|
||||
@@ -42,10 +42,10 @@ namespace ipl {
|
||||
|
||||
// Seek to offset
|
||||
if (mpArc) {
|
||||
result = wrapper::Seek(&mNandFile, mFileOffset + ARCGetStartOffset(&mArcFile) + offset, 0);
|
||||
result = wrapper::Seek(&mNandFile, mFileOffset + ARCGetStartOffset(&mArcFile) + offset, NAND_SEEK_BEG);
|
||||
nand_error_handling(result);
|
||||
} else {
|
||||
result = wrapper::Seek(&mNandFile, mFileOffset + offset, 0);
|
||||
result = wrapper::Seek(&mNandFile, mFileOffset + offset, NAND_SEEK_BEG);
|
||||
nand_error_handling(result);
|
||||
}
|
||||
|
||||
@@ -115,12 +115,12 @@ namespace ipl {
|
||||
|
||||
// Seek to the offset
|
||||
if (mpArc) {
|
||||
result = ES_SeekContentFile(mDescriptor, mFileOffset + ARCGetStartOffset(&mArcFile) + offset, 0);
|
||||
result = ES_SeekContentFile(mDescriptor, mFileOffset + ARCGetStartOffset(&mArcFile) + offset, ES_SEEK_BEG);
|
||||
if (result < ES_ERR_OK) {
|
||||
goto failed;
|
||||
}
|
||||
} else {
|
||||
result = ES_SeekContentFile(mDescriptor, mFileOffset + offset, 0);
|
||||
result = ES_SeekContentFile(mDescriptor, mFileOffset + offset, ES_SEEK_BEG);
|
||||
if (result < ES_ERR_OK) {
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@@ -674,7 +674,7 @@ namespace ipl {
|
||||
void* NandSDWorker::thread_main(void* work) {
|
||||
OSInitFastCast();
|
||||
|
||||
NandSDWorker* nandSdWorker = reinterpret_cast<NandSDWorker*>(work);
|
||||
NandSDWorker* nandSdWorker = static_cast<NandSDWorker*>(work);
|
||||
return nandSdWorker->run();
|
||||
}
|
||||
|
||||
@@ -4147,7 +4147,7 @@ namespace ipl {
|
||||
u16 wadVersion = 0;
|
||||
if (!changeAppCount) {
|
||||
u32 numFreeSlots;
|
||||
if (SCGetFreeChannelAppCount(&numFreeSlots) != 0) {
|
||||
if (SCGetFreeChannelAppCount(&numFreeSlots)) {
|
||||
OSReport("NandSDWorker: free nand app count = %d.\n", numFreeSlots);
|
||||
if (numFreeSlots == 0) {
|
||||
OSReport("NandSDWorker: there is no free count to install application.\n");
|
||||
@@ -4269,7 +4269,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
u32 installedCount = 0;
|
||||
if (SCGetInstalledChannelAppCount(&installedCount) == 0) {
|
||||
if (!SCGetInstalledChannelAppCount(&installedCount)) {
|
||||
OSReport("NandSDWorker: SCGetInstalledChannelAppCount failed.\n");
|
||||
return;
|
||||
}
|
||||
@@ -4729,7 +4729,7 @@ namespace ipl {
|
||||
|
||||
NandSDWorker::WorkMessage NandSDWorker::wait_work() {
|
||||
OSMessage cmd = NULL;
|
||||
OSReceiveMessage(&myWork->msgQueue, &cmd, 1);
|
||||
OSReceiveMessage(&myWork->msgQueue, &cmd, OS_MESSAGE_BLOCK);
|
||||
OSReport("NandSDWorker: recieve message = %d\n", cmd);
|
||||
return (WorkMessage)(u32)cmd;
|
||||
}
|
||||
@@ -5387,7 +5387,7 @@ namespace ipl {
|
||||
goto clean_up;
|
||||
}
|
||||
|
||||
if (item_exist_nand_save_folder(titleId, c_nocopy_folder_name) != 0) {
|
||||
if (item_exist_nand_save_folder(titleId, c_nocopy_folder_name)) {
|
||||
ret = get_num_nand_data_only_title_save_files(titleId, &numTitleFiles);
|
||||
if (ret != RESULT_OK) {
|
||||
goto clean_up;
|
||||
@@ -5401,7 +5401,7 @@ namespace ipl {
|
||||
goto clean_up;
|
||||
}
|
||||
|
||||
if (item_exist_nand_save_folder(titleId, c_notransfer_folder_name) != 0) {
|
||||
if (item_exist_nand_save_folder(titleId, c_notransfer_folder_name)) {
|
||||
ret = get_num_nand_data_only_title_save_files(titleId, &numTitleFiles);
|
||||
if (ret != RESULT_OK) {
|
||||
goto clean_up;
|
||||
|
||||
@@ -718,7 +718,7 @@ namespace ipl {
|
||||
// Create body text (NWC24 subject then NWC24 text)
|
||||
u32 failedToMakeText = FALSE;
|
||||
msgBodyText = make_text(heap, &msgObj, msgType == NWC24_MSGTYPE_PUBLIC, &failedToMakeText);
|
||||
if (failedToMakeText != FALSE) {
|
||||
if (failedToMakeText) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ namespace ipl {
|
||||
PlayTimeLog PlayTimeLog::smArg;
|
||||
|
||||
BOOL search_cb_(void* playTime, CDBRecord* record) {
|
||||
PlayTimeLog* playTimeLog = reinterpret_cast<PlayTimeLog*>(playTime);
|
||||
PlayTimeLog* playTimeLog = static_cast<PlayTimeLog*>(playTime);
|
||||
return playTimeLog->check(record);
|
||||
}
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::alarm_handler_(OSAlarm* alarm, OSContext* context) {
|
||||
Manager* manager = reinterpret_cast<Manager*>(OSGetAlarmUserData(alarm));
|
||||
Manager* manager = static_cast<Manager*>(OSGetAlarmUserData(alarm));
|
||||
manager->Send_ReceiveImmediately();
|
||||
}
|
||||
|
||||
|
||||
@@ -112,7 +112,7 @@ namespace ipl {
|
||||
case RESET_STATE_SHUTDOWN_SYSTEM: {
|
||||
switch (mState) {
|
||||
case STATE_RESTART: {
|
||||
if (WPADGetStatus() == 0) {
|
||||
if (WPADGetStatus() == WPAD_LIB_STATUS_0) {
|
||||
VISetBlack(TRUE);
|
||||
VIFlush();
|
||||
VIWaitForRetrace();
|
||||
|
||||
@@ -88,7 +88,7 @@ namespace ipl {
|
||||
void* SDVFWorker::thread_main(void* work) {
|
||||
OSInitFastCast();
|
||||
|
||||
SDVFWorker* sdVfWorker = reinterpret_cast<SDVFWorker*>(work);
|
||||
SDVFWorker* sdVfWorker = static_cast<SDVFWorker*>(work);
|
||||
return sdVfWorker->run();
|
||||
}
|
||||
|
||||
@@ -343,7 +343,7 @@ namespace ipl {
|
||||
SDVFWorker::WorkMessage SDVFWorker::wait_work() {
|
||||
SDVFWorker::WorkMessage message = MESSAGE_NONE;
|
||||
|
||||
OSReceiveMessage(&myWork->msgQueue, (OSMessage*)&message, 1);
|
||||
OSReceiveMessage(&myWork->msgQueue, (OSMessage*)&message, OS_MESSAGE_BLOCK);
|
||||
OSReport("SDVFWorker: recieve message = %d\n", message);
|
||||
|
||||
return message;
|
||||
|
||||
@@ -126,7 +126,7 @@ namespace ipl {
|
||||
u8 macAddr[NCD_MAC_ADDRESS_LENGTH];
|
||||
|
||||
memset(macAddr, 0, NCD_MAC_ADDRESS_LENGTH);
|
||||
return !(memcmp(mMacAddr, macAddr, NCD_MAC_ADDRESS_LENGTH) == 0);
|
||||
return memcmp(mMacAddr, macAddr, NCD_MAC_ADDRESS_LENGTH) != 0;
|
||||
}
|
||||
} // namespace socket
|
||||
} // namespace ipl
|
||||
|
||||
@@ -110,7 +110,7 @@ namespace ipl {
|
||||
OSReport("TREASURE HEAP: %p SIZE:%d\n", smArg.mpTreasureHeap, smArg.mpTreasureHeap->getAllocatableSize(4));
|
||||
OSReport("*****************************\n");
|
||||
|
||||
smArg.mpMem2Root = EGG::ExpHeap::create((void*)mem2Lo, ((u32)mem2Hi - (u32)mem2Lo), MEM_HEAP_OPT_DEBUG_FILL);
|
||||
smArg.mpMem2Root = EGG::ExpHeap::create((void*)mem2Lo, (mem2Hi - mem2Lo), MEM_HEAP_OPT_DEBUG_FILL);
|
||||
} else {
|
||||
smArg.mpTreasureHeap = EGG::ExpHeap::create((void*)0x93440000, 0xC0000, MEM_HEAP_OPT_DEBUG_FILL);
|
||||
|
||||
@@ -118,7 +118,7 @@ namespace ipl {
|
||||
OSReport("TREASURE HEAP: %p SIZE:%d\n", smArg.mpTreasureHeap, smArg.mpTreasureHeap->getAllocatableSize(4));
|
||||
OSReport("*****************************\n");
|
||||
|
||||
smArg.mpMem2Root = EGG::ExpHeap::create((void*)mem2Lo, (0x93440000 - (u32)mem2Lo), MEM_HEAP_OPT_DEBUG_FILL);
|
||||
smArg.mpMem2Root = EGG::ExpHeap::create((void*)mem2Lo, (0x93440000 - mem2Lo), MEM_HEAP_OPT_DEBUG_FILL);
|
||||
}
|
||||
|
||||
OSSetMEM2ArenaLo((void*)mem2Hi);
|
||||
@@ -535,7 +535,7 @@ namespace ipl {
|
||||
|
||||
SCSetAspectRatio(SC_ASPECT_RATIO_4x3);
|
||||
|
||||
SCSetWpadSensorBarPosition(0);
|
||||
SCSetWpadSensorBarPosition(SC_WPAD_SENSOR_BAR_POSITION_BOTTOM);
|
||||
#ifdef SYSMENU_REGION_USA
|
||||
SCSetBtDpdSensibility(3);
|
||||
#endif
|
||||
@@ -916,9 +916,9 @@ namespace ipl {
|
||||
|
||||
i++;
|
||||
if (i > WPAD_MAX_CONTROLLERS) {
|
||||
if (WPADGetStatus() == 3) {
|
||||
if (WPADGetStatus() == WPAD_LIB_STATUS_3) {
|
||||
for (i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
WPADControlMotor(i, 0);
|
||||
WPADControlMotor(i, WPAD_MOTOR_STOP);
|
||||
}
|
||||
}
|
||||
i = 0;
|
||||
|
||||
682
tools/decomp-assist/rx32.cleanup.md
Normal file
682
tools/decomp-assist/rx32.cleanup.md
Normal file
@@ -0,0 +1,682 @@
|
||||
# rx32 expression cleanup
|
||||
|
||||
Base `38ade13d6fb4320b5779d1e6df4b9250a018b7d8`; branch `agent/w1005/rx32`.
|
||||
|
||||
Scanned 101 C++ files in the assigned scene and system scope. Kept 264 source
|
||||
replacements across 44 files: 145 named constants, 64 cast cleanups, 53 boolean
|
||||
expression cleanups, and 2 accesses through the existing controller array member.
|
||||
Counts describe replaced expressions, not lines. No headers, configuration,
|
||||
comments, declarations, or statement order changed.
|
||||
|
||||
This round requires unchanged compiler output. The generic matching-round
|
||||
requirement to increase exact-function counts does not apply. Existing nonmatches
|
||||
were measured and preserved.
|
||||
|
||||
## Verification
|
||||
|
||||
- Rebuilt the untouched baseline and saved all 1,027 source-object hashes and the
|
||||
complete objdiff report before editing.
|
||||
- Ran `pool_diff.py` against the original objects before editing: 101/101 identical.
|
||||
- Rebuilt each trial object and compared its entire ELF file with the saved base.
|
||||
Reverted every byte change or compiler failure, then rebuilt the restored file.
|
||||
- Before the clean gate: 1,027/1,027 source objects identical, complete objdiff JSON
|
||||
identical, and 44/44 touched pools identical to the original objects.
|
||||
- Forbidden-pattern and readability scans: zero additions. `git diff --check` passed.
|
||||
- Baseline and pre-gate DOL SHA1: `26116613f624061ba99c8d1a299aaa6efa85670d`.
|
||||
|
||||
- After the clean gate: 1,027/1,027 source objects identical,
|
||||
complete objdiff JSON identical, 44/44 touched pools identical,
|
||||
DOL SHA1 `26116613f624061ba99c8d1a299aaa6efa85670d`.
|
||||
|
||||
## Files and retained replacements
|
||||
|
||||
| File | Constants | Casts | Conditions | Members |
|
||||
| --- | ---: | ---: | ---: | ---: |
|
||||
| `src/scene/address/iplAddress.cpp` | 7 | 0 | 0 | 0 |
|
||||
| `src/scene/address/iplAddressAddSel.cpp` | 0 | 1 | 1 | 0 |
|
||||
| `src/scene/board/iplBoardObject.cpp` | 1 | 6 | 1 | 0 |
|
||||
| `src/scene/board/iplFocusObject.cpp` | 0 | 2 | 1 | 0 |
|
||||
| `src/scene/button/iplButton.cpp` | 0 | 0 | 2 | 0 |
|
||||
| `src/scene/calendar/iplCalendar.cpp` | 1 | 0 | 2 | 0 |
|
||||
| `src/scene/channelSelect/iplChannelObj.cpp` | 4 | 0 | 0 | 0 |
|
||||
| `src/scene/channelSelect/iplChannelSelect.cpp` | 0 | 1 | 0 | 0 |
|
||||
| `src/scene/channelTitle/iplChannelTitle.cpp` | 4 | 2 | 3 | 0 |
|
||||
| `src/scene/faceSelect/iplFaceSelect.cpp` | 0 | 1 | 2 | 0 |
|
||||
| `src/scene/mailAddSel/iplMailAddressSelect.cpp` | 0 | 1 | 1 | 0 |
|
||||
| `src/scene/nakamuraTest/iplNakamuraTest.cpp` | 1 | 0 | 1 | 0 |
|
||||
| `src/scene/nakamuraTest/iplNetSetup.cpp` | 1 | 0 | 0 | 0 |
|
||||
| `src/scene/parentalDialog/iplParentalDialog.cpp` | 0 | 1 | 1 | 0 |
|
||||
| `src/scene/sceneSystem/iplSceneManager.cpp` | 0 | 0 | 2 | 0 |
|
||||
| `src/scene/sdButton/iplSDButton.cpp` | 0 | 0 | 1 | 0 |
|
||||
| `src/scene/sdChannelSelect/iplSDChannelSelect.cpp` | 31 | 0 | 0 | 0 |
|
||||
| `src/scene/setting/iplAOSSThread.cpp` | 0 | 1 | 0 | 0 |
|
||||
| `src/scene/setting/iplNCDSetting.cpp` | 2 | 0 | 0 | 0 |
|
||||
| `src/scene/setting/iplRakuRakuThread.cpp` | 2 | 1 | 0 | 0 |
|
||||
| `src/scene/setting/iplSetting.cpp` | 37 | 25 | 16 | 0 |
|
||||
| `src/scene/settingSelect/iplSettingButton.cpp` | 0 | 1 | 1 | 0 |
|
||||
| `src/scene/settingSelect/iplSettingSelect.cpp` | 3 | 1 | 1 | 0 |
|
||||
| `src/system/iplCdbBackup.cpp` | 0 | 3 | 0 | 0 |
|
||||
| `src/system/iplChannelManager.cpp` | 0 | 5 | 1 | 0 |
|
||||
| `src/system/iplChannelRsoThread.cpp` | 0 | 1 | 0 | 0 |
|
||||
| `src/system/iplChannelScriptManager.cpp` | 0 | 0 | 1 | 0 |
|
||||
| `src/system/iplController.cpp` | 17 | 0 | 2 | 0 |
|
||||
| `src/system/iplControllerManager.cpp` | 23 | 0 | 0 | 2 |
|
||||
| `src/system/iplDialogWindow.cpp` | 0 | 1 | 3 | 0 |
|
||||
| `src/system/iplErrorHandler.cpp` | 0 | 0 | 1 | 0 |
|
||||
| `src/system/iplException.cpp` | 1 | 0 | 0 | 0 |
|
||||
| `src/system/iplHomeButtonMenu.cpp` | 0 | 1 | 0 | 0 |
|
||||
| `src/system/iplNand.cpp` | 0 | 0 | 1 | 0 |
|
||||
| `src/system/iplNandManager.cpp` | 0 | 2 | 0 | 0 |
|
||||
| `src/system/iplNandMeta.cpp` | 4 | 0 | 2 | 0 |
|
||||
| `src/system/iplNandSDWorker.cpp` | 1 | 1 | 4 | 0 |
|
||||
| `src/system/iplNwc24Manager.cpp` | 0 | 0 | 1 | 0 |
|
||||
| `src/system/iplPlayTimeLog.cpp` | 0 | 1 | 0 | 0 |
|
||||
| `src/system/iplPostmanManager.cpp` | 0 | 1 | 0 | 0 |
|
||||
| `src/system/iplResetHandler.cpp` | 1 | 0 | 0 | 0 |
|
||||
| `src/system/iplSDVFWorker.cpp` | 1 | 1 | 0 | 0 |
|
||||
| `src/system/iplSocketSetting.cpp` | 0 | 0 | 1 | 0 |
|
||||
| `src/system/iplSystem.cpp` | 3 | 3 | 0 | 0 |
|
||||
|
||||
## Attempts
|
||||
|
||||
Each KEEP means a successful rebuild and whole-object byte equality.
|
||||
Each REVERT means the previous source and object were restored.
|
||||
|
||||
| Trial | File | Cleanup | Count | Result |
|
||||
| ---: | --- | --- | ---: | --- |
|
||||
| 1 | `src/scene/address/iplAddress.cpp` | named scene IDs, animation modes, and message flags | 6 | KEEP |
|
||||
| 2 | `src/scene/sdChannelSelect/iplSDChannelSelect.cpp` | named scene IDs, animation modes, and message flags | 15 | KEEP |
|
||||
| 3 | `src/scene/setting/iplRakuRakuThread.cpp` | named scene IDs, animation modes, and message flags | 7 | REVERT: SDK has no `OS_MESSAGE_NOBLOCK` |
|
||||
| 4 | `src/scene/setting/iplSetting.cpp` | named scene IDs, animation modes, and message flags | 12 | REVERT: SDK has no `OS_MESSAGE_NOBLOCK` |
|
||||
| 5 | `src/scene/setting/iplUSBAP.cpp` | named scene IDs, animation modes, and message flags | 2 | REVERT: SDK has no `OS_MESSAGE_NOBLOCK` |
|
||||
| 6 | `src/system/iplChannelScriptManager.cpp` | named scene IDs, animation modes, and message flags | 1 | REVERT: SDK has no `OS_MESSAGE_NOBLOCK` |
|
||||
| 7 | `src/system/iplNandSDWorker.cpp` | named scene IDs, animation modes, and message flags | 2 | REVERT: SDK has no `OS_MESSAGE_NOBLOCK` |
|
||||
| 8 | `src/system/iplSDVFWorker.cpp` | named scene IDs, animation modes, and message flags | 2 | REVERT: SDK has no `OS_MESSAGE_NOBLOCK` |
|
||||
| 9 | `src/scene/board/iplBoardObject.cpp` | GX texture mipmap flag | 1 | KEEP |
|
||||
| 10 | `src/scene/settingSelect/iplSettingSelect.cpp` | setting entry animation | 1 | KEEP |
|
||||
| 11 | `src/scene/sdChannelSelect/iplSDChannelSelect.cpp` | page button masks | 2 | KEEP |
|
||||
| 12 | `src/scene/setting/iplSetting.cpp` | region and language constants | 14 | KEEP |
|
||||
| 13 | `src/system/iplNandMeta.cpp` | NAND and ES seek origins | 4 | KEEP |
|
||||
| 14 | `src/system/iplController.cpp` | remote buttons, motor commands, errors, and aspect ratio | 17 | KEEP |
|
||||
| 15 | `src/system/iplControllerManager.cpp` | remote device and error constants | 23 | KEEP |
|
||||
| 16 | `src/system/iplSystem.cpp` | sensor bar position and motor command | 2 | KEEP |
|
||||
| 17 | `src/scene/setting/iplRakuRakuThread.cpp` | existing blocking flag and scene constants | 2 | KEEP |
|
||||
| 18 | `src/scene/setting/iplSetting.cpp` | existing blocking flag and scene constants | 11 | KEEP |
|
||||
| 19 | `src/system/iplNandSDWorker.cpp` | existing blocking flag and scene constants | 1 | KEEP |
|
||||
| 20 | `src/system/iplSDVFWorker.cpp` | existing blocking flag and scene constants | 1 | KEEP |
|
||||
| 21 | `src/scene/address/iplAddressAddSel.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 22 | `src/scene/board/iplFocusObject.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 23 | `src/scene/channelSelect/iplChannelSelect.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 24 | `src/scene/channelTitle/iplChannelTitle.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 25 | `src/scene/faceSelect/iplFaceSelect.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 26 | `src/scene/mailAddSel/iplMailAddressSelect.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 27 | `src/scene/parentalDialog/iplParentalDialog.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 28 | `src/scene/settingSelect/iplSettingButton.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 29 | `src/scene/settingSelect/iplSettingSelect.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 30 | `src/system/iplCdbBackup.cpp` | static casts from callback void pointers | 3 | KEEP |
|
||||
| 31 | `src/system/iplDialogWindow.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 32 | `src/system/iplNandManager.cpp` | static casts from callback void pointers | 2 | KEEP |
|
||||
| 33 | `src/system/iplNandSDWorker.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 34 | `src/system/iplNigaoeManager.cpp` | static casts from callback void pointers | 1 | REVERT: changed `.text` |
|
||||
| 35 | `src/system/iplPlayTimeLog.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 36 | `src/system/iplPostmanManager.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 37 | `src/system/iplSDVFWorker.cpp` | static casts from callback void pointers | 1 | KEEP |
|
||||
| 38 | `src/system/iplNandWrapper.cpp` | int cast to the declared int type | 2 | REVERT: changed `.text`, `.rela.text`, `.symtab` |
|
||||
| 39 | `src/system/iplCdbWrapper.cpp` | int cast to the declared int type | 2 | REVERT: changed `.text`, `.rela.text`, `.symtab` |
|
||||
| 40 | `src/scene/setting/iplSetting.cpp` | input text and scan count already have the required types | 22 | KEEP |
|
||||
| 41 | `src/scene/channelTitle/iplChannelTitle.cpp` | remaining time already u32 | 1 | KEEP |
|
||||
| 42 | `src/scene/board/iplBoardObject.cpp` | record data already u8 pointer | 6 | KEEP |
|
||||
| 43 | `src/scene/board/iplFocusObject.cpp` | archive data already u8 pointer | 1 | KEEP |
|
||||
| 44 | `src/system/iplChannelManager.cpp` | source data already u8 pointer | 5 | KEEP |
|
||||
| 45 | `src/system/iplSystem.cpp` | arena limits already u32 | 3 | KEEP |
|
||||
| 46 | `src/scene/setting/iplAOSSThread.cpp` | start time word already u32 | 1 | KEEP |
|
||||
| 47 | `src/system/iplControllerManager.cpp` | controller array member access | 2 | KEEP |
|
||||
| 48 | `src/scene/address/iplAddressAddSel.cpp` | direct boolean conditions | 1 | KEEP |
|
||||
| 49 | `src/scene/board/iplBoardObject.cpp` | direct boolean conditions | 1 | KEEP |
|
||||
| 50 | `src/scene/board/iplFocusObject.cpp` | direct boolean conditions | 2 | REVERT: changed `.text` |
|
||||
| 51 | `src/scene/button/iplButton.cpp` | direct boolean conditions | 2 | KEEP |
|
||||
| 52 | `src/scene/calendar/iplCalendar.cpp` | direct boolean conditions | 2 | KEEP |
|
||||
| 53 | `src/scene/channelTitle/iplChannelTitle.cpp` | direct boolean conditions | 2 | KEEP |
|
||||
| 54 | `src/scene/faceSelect/iplFaceSelect.cpp` | direct boolean conditions | 2 | KEEP |
|
||||
| 55 | `src/scene/mailAddSel/iplMailAddressSelect.cpp` | direct boolean conditions | 1 | KEEP |
|
||||
| 56 | `src/scene/nakamuraTest/iplNakamuraTest.cpp` | direct boolean conditions | 2 | REVERT: changed `.strtab` |
|
||||
| 57 | `src/scene/parentalDialog/iplParentalDialog.cpp` | direct boolean conditions | 1 | KEEP |
|
||||
| 58 | `src/scene/sceneSystem/iplSceneManager.cpp` | direct boolean conditions | 2 | KEEP |
|
||||
| 59 | `src/scene/sdButton/iplSDButton.cpp` | direct boolean conditions | 1 | KEEP |
|
||||
| 60 | `src/scene/sdChannelSelect/iplSDChannelSelect.cpp` | direct boolean conditions | 1 | REVERT: changed `.strtab` |
|
||||
| 61 | `src/scene/settingSelect/iplSettingButton.cpp` | direct boolean conditions | 1 | KEEP |
|
||||
| 62 | `src/scene/settingSelect/iplSettingSelect.cpp` | direct boolean conditions | 1 | KEEP |
|
||||
| 63 | `src/system/iplChannelManager.cpp` | direct boolean conditions | 1 | KEEP |
|
||||
| 64 | `src/system/iplChannelScriptManager.cpp` | direct boolean conditions | 1 | KEEP |
|
||||
| 65 | `src/system/iplDialogWindow.cpp` | direct boolean conditions | 3 | KEEP |
|
||||
| 66 | `src/system/iplErrorHandler.cpp` | direct boolean conditions | 1 | KEEP |
|
||||
| 67 | `src/system/iplNand.cpp` | direct boolean conditions | 1 | KEEP |
|
||||
| 68 | `src/system/iplNandMeta.cpp` | direct boolean conditions | 2 | KEEP |
|
||||
| 69 | `src/system/iplNwc24Manager.cpp` | direct boolean conditions | 1 | KEEP |
|
||||
| 70 | `src/scene/channelTitle/iplChannelTitle.cpp` | remove paired negations from animation completion | 1 | KEEP |
|
||||
| 71 | `src/system/iplSocketSetting.cpp` | direct inequality for MAC comparison | 1 | KEEP |
|
||||
| 72 | `src/system/iplController.cpp` | direct boolean button and pointer calls | 2 | KEEP |
|
||||
| 73 | `src/scene/setting/iplSetting.cpp` | direct boolean settings and proxy results | 5 | KEEP |
|
||||
| 74 | `src/system/iplNandSDWorker.cpp` | direct boolean channel counts and save folder checks | 4 | KEEP |
|
||||
| 75 | `src/scene/channelSelect/iplChannelObj.cpp` | cursor animation enum values | 4 | KEEP |
|
||||
| 76 | `src/scene/calendar/iplCalendar.cpp` | existing calendar animation enum | 1 | KEEP |
|
||||
| 77 | `src/scene/sdChannelSelect/iplSDChannelSelect.cpp` | SD button animation and interaction enums | 14 | KEEP |
|
||||
| 78 | `src/scene/setting/iplSetting.cpp` | interaction, update, and WiiConnect24 constants | 10 | KEEP |
|
||||
| 79 | `src/scene/address/iplAddress.cpp` | message board restriction bit | 1 | KEEP |
|
||||
| 80 | `src/scene/setting/iplNCDSetting.cpp` | WiiConnect24 and message board flag constants | 2 | KEEP |
|
||||
| 81 | `src/system/iplException.cpp` | remote result constant | 1 | KEEP |
|
||||
| 82 | `src/scene/nakamuraTest/iplNakamuraTest.cpp` | thread detach flag | 1 | KEEP |
|
||||
| 83 | `src/scene/nakamuraTest/iplNetSetup.cpp` | thread detach flag | 1 | KEEP |
|
||||
| 84 | `src/scene/setting/iplRakuRakuThread.cpp` | tick subtraction already u32 | 1 | KEEP |
|
||||
| 85 | `src/system/iplNandSDWorker.cpp` | thread stack end from its array member | 2 | REVERT: changed `.text`, `.line`, `.rela.text`, `.rela.line`, `.rela.debug`, `.symtab`, `.strtab` |
|
||||
| 86 | `src/scene/board/iplFocusObject.cpp` | isolate direct boolean conditions expression 1 | 1 | KEEP |
|
||||
| 87 | `src/scene/board/iplFocusObject.cpp` | isolate direct boolean conditions expression 2 | 1 | REVERT: changed `.text` |
|
||||
| 88 | `src/scene/nakamuraTest/iplNakamuraTest.cpp` | isolate direct boolean conditions expression 1 | 1 | KEEP |
|
||||
| 89 | `src/scene/nakamuraTest/iplNakamuraTest.cpp` | isolate direct boolean conditions expression 2 | 1 | REVERT: changed `.strtab` |
|
||||
| 90 | `src/scene/channelTitle/iplChannelTitle.cpp` | WPAD library status constants | 4 | KEEP |
|
||||
| 91 | `src/scene/setting/iplSetting.cpp` | WPAD library status constants | 2 | KEEP |
|
||||
| 92 | `src/scene/settingSelect/iplSettingSelect.cpp` | WPAD library status constants | 2 | KEEP |
|
||||
| 93 | `src/system/iplResetHandler.cpp` | WPAD library status constants | 1 | KEEP |
|
||||
| 94 | `src/system/iplSystem.cpp` | WPAD library status constants | 1 | KEEP |
|
||||
| 95 | `src/scene/setting/iplSetting.cpp` | static casts from allocated void pointers | 3 | KEEP |
|
||||
| 96 | `src/scene/setting/iplSetting.cpp` | boolean EULA and setup flag conditions | 5 | KEEP |
|
||||
| 97 | `src/scene/setting/iplSetting.cpp` | boolean configuration thread results | 6 | KEEP |
|
||||
| 98 | `src/system/iplChannelRsoThread.cpp` | memset accepts the stack pointer directly | 1 | KEEP |
|
||||
| 99 | `src/system/iplHomeButtonMenu.cpp` | checked classic-controller downcast | 1 | KEEP |
|
||||
|
||||
## Expressions retained after rejected trials
|
||||
|
||||
- `iplNigaoeManager.cpp`, `Manager::calc`: changing the list-result cast from
|
||||
`reinterpret_cast` to `static_cast` changed `.text`.
|
||||
- `iplNandWrapper.cpp` and `iplCdbWrapper.cpp`, `_condition`: removing the two
|
||||
casts to `int` changed `.text`, `.rela.text`, and `.symtab`.
|
||||
- `iplFocusObject.cpp`: the hover condition cleanup passed in isolation;
|
||||
replacing `mScroller.is_busy() == FALSE` changed `.text` and was reverted.
|
||||
- `iplNakamuraTest.cpp`: the schedule condition cleanup passed in isolation;
|
||||
replacing `onDefaultDrawLayer() != TRUE` changed `.strtab` and was reverted.
|
||||
- `iplSDChannelSelect.cpp`: replacing `didntGotoSDMenu() == FALSE` changed
|
||||
`.strtab` and was reverted. Metadata changes were rejected too.
|
||||
- `iplNandSDWorker.cpp`, `create`: deriving the stack end directly from
|
||||
`threadStack` changed `.text`, relocations, and debug sections; reverted.
|
||||
- Six early trial groups used an unavailable nonblocking message flag name.
|
||||
All were reverted. Only the existing `OS_MESSAGE_BLOCK` constant was used.
|
||||
|
||||
Other reviewed expressions were kept where their types or definitions matter:
|
||||
the ES title macros return 64-bit values, so their `u32` casts are required;
|
||||
`BOOL` hover fields can be counters, so comparisons with `TRUE` were preserved;
|
||||
the IMD5 structs are private to other classes, so no shared-header change was
|
||||
made to replace the thumbnail decoder offsets. The scope scan found no empty
|
||||
`if`/`else` branches or nested ternaries needing a rewrite. Secondary-layout
|
||||
animation indices without class enums were kept.
|
||||
|
||||
## Unchanged unit measurements
|
||||
|
||||
All values below are before -> after. Entire-object equality also preserves
|
||||
instruction-exact counts; the clean gate counts are copied below.
|
||||
|
||||
| Unit | Instruction exact | Objdiff functions | Matched code bytes | Matched data bytes | Fuzzy percent |
|
||||
| --- | ---: | ---: | ---: | ---: | ---: |
|
||||
| `src/scene/address/iplAddress` | 101/101 -> 101/101 | 101/101 -> 101/101 | 23988/23988 -> 23988/23988 | 1964/1964 -> 1964/1964 | 100.0 -> 100.0 |
|
||||
| `src/scene/address/iplAddressAddSel` | 24/24 -> 24/24 | 24/24 -> 24/24 | 3176/3176 -> 3176/3176 | 608/608 -> 608/608 | 100.0 -> 100.0 |
|
||||
| `src/scene/board/iplBoardObject` | 38/39 -> 38/39 | 39/39 -> 39/39 | 9184/9184 -> 9184/9184 | 1320/1320 -> 1320/1320 | 100.0 -> 100.0 |
|
||||
| `src/scene/board/iplFocusObject` | 89/89 -> 89/89 | 89/89 -> 89/89 | 20332/20332 -> 20332/20332 | 2576/2576 -> 2576/2576 | 100.0 -> 100.0 |
|
||||
| `src/scene/button/iplButton` | 41/42 -> 41/42 | 42/42 -> 42/42 | 7624/7624 -> 7624/7624 | 1744/1744 -> 1744/1744 | 100.0 -> 100.0 |
|
||||
| `src/scene/calendar/iplCalendar` | 42/42 -> 42/42 | 42/42 -> 42/42 | 7452/7452 -> 7452/7452 | 1244/1244 -> 1244/1244 | 100.0 -> 100.0 |
|
||||
| `src/scene/channelSelect/iplChannelObj` | 56/56 -> 56/56 | 56/56 -> 56/56 | 10924/10924 -> 10924/10924 | 2216/2216 -> 2216/2216 | 100.0 -> 100.0 |
|
||||
| `src/scene/channelSelect/iplChannelSelect` | 102/102 -> 102/102 | 102/102 -> 102/102 | 25668/25668 -> 25668/25668 | 2336/2336 -> 2336/2336 | 100.0 -> 100.0 |
|
||||
| `src/scene/channelTitle/iplChannelTitle` | 95/95 -> 95/95 | 95/95 -> 95/95 | 28788/28788 -> 28788/28788 | 3144/3144 -> 3144/3144 | 100.0 -> 100.0 |
|
||||
| `src/scene/faceSelect/iplFaceSelect` | 37/37 -> 37/37 | 37/37 -> 37/37 | 9524/9524 -> 9524/9524 | 2152/2152 -> 2152/2152 | 100.0 -> 100.0 |
|
||||
| `src/scene/mailAddSel/iplMailAddressSelect` | 30/30 -> 30/30 | 30/30 -> 30/30 | 6068/6068 -> 6068/6068 | 976/976 -> 976/976 | 100.0 -> 100.0 |
|
||||
| `src/scene/nakamuraTest/iplNakamuraTest` | 15/15 -> 15/15 | 15/15 -> 15/15 | 3596/3596 -> 3596/3596 | 912/912 -> 912/912 | 100.0 -> 100.0 |
|
||||
| `src/scene/nakamuraTest/iplNetSetup` | 11/11 -> 11/11 | 11/11 -> 11/11 | 2080/2080 -> 2080/2080 | 256/256 -> 256/256 | 100.0 -> 100.0 |
|
||||
| `src/scene/parentalDialog/iplParentalDialog` | 25/25 -> 25/25 | 25/25 -> 25/25 | 4540/4540 -> 4540/4540 | 808/808 -> 808/808 | 100.0 -> 100.0 |
|
||||
| `src/scene/sceneSystem/iplSceneManager` | 29/29 -> 29/29 | 29/29 -> 29/29 | 3344/3344 -> 3344/3344 | 40/40 -> 40/40 | 100.0 -> 100.0 |
|
||||
| `src/scene/sdButton/iplSDButton` | 23/23 -> 23/23 | 23/23 -> 23/23 | 5136/5136 -> 5136/5136 | 1168/1168 -> 1168/1168 | 100.0 -> 100.0 |
|
||||
| `src/scene/sdChannelSelect/iplSDChannelSelect` | 123/129 -> 123/129 | 123/129 -> 123/129 | 30344/33828 -> 30344/33828 | 2960/2960 -> 2960/2960 | 99.77309 -> 99.77309 |
|
||||
| `src/scene/setting/iplAOSSThread` | 10/10 -> 10/10 | 10/10 -> 10/10 | 1892/1892 -> 1892/1892 | 88/88 -> 88/88 | 100.0 -> 100.0 |
|
||||
| `src/scene/setting/iplNCDSetting` | 62/62 -> 62/62 | 62/62 -> 62/62 | 6796/6796 -> 6796/6796 | 14232/14232 -> 14232/14232 | 100.0 -> 100.0 |
|
||||
| `src/scene/setting/iplRakuRakuThread` | 14/14 -> 14/14 | 14/14 -> 14/14 | 2168/2168 -> 2168/2168 | 456/456 -> 456/456 | 100.0 -> 100.0 |
|
||||
| `src/scene/setting/iplSetting` | 111/112 -> 111/112 | 111/112 -> 111/112 | 36796/37884 -> 36796/37884 | 5696/5696 -> 5696/5696 | 99.97709 -> 99.97709 |
|
||||
| `src/scene/settingSelect/iplSettingButton` | 23/23 -> 23/23 | 23/23 -> 23/23 | 3116/3116 -> 3116/3116 | 664/664 -> 664/664 | 100.0 -> 100.0 |
|
||||
| `src/scene/settingSelect/iplSettingSelect` | 37/37 -> 37/37 | 37/37 -> 37/37 | 8432/8432 -> 8432/8432 | 1504/1504 -> 1504/1504 | 100.0 -> 100.0 |
|
||||
| `src/system/iplCdbBackup` | 26/26 -> 26/26 | 26/26 -> 26/26 | 4012/4012 -> 4012/4012 | 108/108 -> 108/108 | 100.0 -> 100.0 |
|
||||
| `src/system/iplChannelManager` | 74/74 -> 74/74 | 74/74 -> 74/74 | 12552/12552 -> 12552/12552 | 1080/1080 -> 1080/1080 | 100.0 -> 100.0 |
|
||||
| `src/system/iplChannelRsoThread` | 5/5 -> 5/5 | 5/5 -> 5/5 | 436/436 -> 436/436 | 48/48 -> 48/48 | 100.0 -> 100.0 |
|
||||
| `src/system/iplChannelScriptManager` | 10/10 -> 10/10 | 10/10 -> 10/10 | 2148/2148 -> 2148/2148 | 1024/1024 -> 1024/1024 | 100.0 -> 100.0 |
|
||||
| `src/system/iplController` | 84/84 -> 84/84 | 84/84 -> 84/84 | 5708/5708 -> 5708/5708 | 696/696 -> 696/696 | 100.0 -> 100.0 |
|
||||
| `src/system/iplControllerManager` | 10/10 -> 10/10 | 10/10 -> 10/10 | 1632/1632 -> 1632/1632 | 320/320 -> 320/320 | 100.0 -> 100.0 |
|
||||
| `src/system/iplDialogWindow` | 67/67 -> 67/67 | 67/67 -> 67/67 | 12984/12984 -> 12984/12984 | 1548/1548 -> 1548/1548 | 100.0 -> 100.0 |
|
||||
| `src/system/iplErrorHandler` | 6/6 -> 6/6 | 6/6 -> 6/6 | 932/932 -> 932/932 | 104/104 -> 104/104 | 100.0 -> 100.0 |
|
||||
| `src/system/iplException` | 7/7 -> 7/7 | 7/7 -> 7/7 | 1004/1004 -> 1004/1004 | 32/32 -> 32/32 | 100.0 -> 100.0 |
|
||||
| `src/system/iplHomeButtonMenu` | 12/12 -> 12/12 | 12/12 -> 12/12 | 2332/2332 -> 2332/2332 | 80/80 -> 80/80 | 100.0 -> 100.0 |
|
||||
| `src/system/iplNand` | 36/36 -> 36/36 | 36/36 -> 36/36 | 5108/5108 -> 5108/5108 | 272/272 -> 272/272 | 100.0 -> 100.0 |
|
||||
| `src/system/iplNandManager` | 19/19 -> 19/19 | 19/19 -> 19/19 | 2520/2520 -> 2520/2520 | 120/120 -> 120/120 | 100.0 -> 100.0 |
|
||||
| `src/system/iplNandMeta` | 13/13 -> 13/13 | 13/13 -> 13/13 | 1536/1536 -> 1536/1536 | 136/136 -> 136/136 | 100.0 -> 100.0 |
|
||||
| `src/system/iplNandSDWorker` | 7/203 -> 7/203 | 203/203 -> 203/203 | 51428/51428 -> 51428/51428 | 12312/12312 -> 12312/12312 | 100.0 -> 100.0 |
|
||||
| `src/system/iplNwc24Manager` | 53/53 -> 53/53 | 53/53 -> 53/53 | 10252/10252 -> 10252/10252 | 888/888 -> 888/888 | 100.0 -> 100.0 |
|
||||
| `src/system/iplPlayTimeLog` | 18/18 -> 18/18 | 18/18 -> 18/18 | 4856/4856 -> 4856/4856 | 388/388 -> 388/388 | 100.0 -> 100.0 |
|
||||
| `src/system/iplPostmanManager` | 22/22 -> 22/22 | 22/22 -> 22/22 | 2832/2832 -> 2832/2832 | 584/584 -> 584/584 | 100.0 -> 100.0 |
|
||||
| `src/system/iplResetHandler` | 10/10 -> 10/10 | 10/10 -> 10/10 | 1360/1360 -> 1360/1360 | 0/0 -> 0/0 | 100.0 -> 100.0 |
|
||||
| `src/system/iplSDVFWorker` | 23/23 -> 23/23 | 23/23 -> 23/23 | 3460/3460 -> 3460/3460 | 832/832 -> 832/832 | 100.0 -> 100.0 |
|
||||
| `src/system/iplSocketSetting` | 8/8 -> 8/8 | 8/8 -> 8/8 | 864/864 -> 864/864 | 128/128 -> 128/128 | 100.0 -> 100.0 |
|
||||
| `src/system/iplSystem` | 63/63 -> 63/63 | 63/63 -> 63/63 | 12456/12456 -> 12456/12456 | 2228/2228 -> 2228/2228 | 100.0 -> 100.0 |
|
||||
|
||||
Instruction-exact functions: 1711/1916 -> 1711/1916.
|
||||
|
||||
Totals: objdiff functions 1909/1916 unchanged;
|
||||
code 401380/405952 bytes unchanged;
|
||||
data 71992/71992 bytes unchanged.
|
||||
|
||||
## Existing nonmatching functions
|
||||
|
||||
These seven functions have the same object bytes and scores as the fresh
|
||||
baseline. No matching work was attempted during this cleanup round.
|
||||
|
||||
| Unit | Exact symbol | Objdiff percent, unchanged |
|
||||
| --- | --- | ---: |
|
||||
| `src/scene/sdChannelSelect/iplSDChannelSelect` | `create__Q33ipl5scene15SDChannelSelectFv` | 97.73972 |
|
||||
| `src/scene/sdChannelSelect/iplSDChannelSelect` | `collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl` | 97.81188 |
|
||||
| `src/scene/sdChannelSelect/iplSDChannelSelect` | `collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl` | 97.833336 |
|
||||
| `src/scene/sdChannelSelect/iplSDChannelSelect` | `collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl` | 98.007935 |
|
||||
| `src/scene/sdChannelSelect/iplSDChannelSelect` | `collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl` | 97.55125 |
|
||||
| `src/scene/sdChannelSelect/iplSDChannelSelect` | `flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv` | 99.65714 |
|
||||
| `src/scene/setting/iplSetting` | `scanAP__Q33ipl5scene7SettingFv` | 99.20221 |
|
||||
|
||||
## Clean full gate
|
||||
|
||||
Ran the unmodified gate without `--quick`, with all 44 units above and
|
||||
`--base 38ade13d6fb4320b5779d1e6df4b9250a018b7d8`.
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/scene/address/iplAddress] pool: IDENTICAL
|
||||
[src/scene/address/iplAddress] objdiff: code 23988/23988 data 1964/1964 functions 101/101 fuzzy 100.0000 linked code 23988
|
||||
[src/scene/address/iplAddress] instruction-exact functions: 101/101
|
||||
[src/scene/address/iplAddress] section .ctors size 4 match 100.0
|
||||
[src/scene/address/iplAddress] section .data size 1880 match 100.0
|
||||
[src/scene/address/iplAddress] section .rodata size 24 match 100.0
|
||||
[src/scene/address/iplAddress] section .sbss size 8 match 100.0
|
||||
[src/scene/address/iplAddress] section .sdata size 16 match 100.0
|
||||
[src/scene/address/iplAddress] section .sdata2 size 32 match 100.0
|
||||
[src/scene/address/iplAddress] section .text size 23988 match 100.0
|
||||
[src/scene/address/iplAddress] baseline: code 23988/23988 data 1964 functions 101 fuzzy 100.0000
|
||||
[src/scene/address/iplAddressAddSel] pool: IDENTICAL
|
||||
[src/scene/address/iplAddressAddSel] objdiff: code 3176/3176 data 608/608 functions 24/24 fuzzy 100.0000 linked code 3176
|
||||
[src/scene/address/iplAddressAddSel] instruction-exact functions: 24/24
|
||||
[src/scene/address/iplAddressAddSel] section .data size 592 match 100.0
|
||||
[src/scene/address/iplAddressAddSel] section .sdata size 16 match 100.0
|
||||
[src/scene/address/iplAddressAddSel] section .text size 3176 match 100.0
|
||||
[src/scene/address/iplAddressAddSel] baseline: code 3176/3176 data 608 functions 24 fuzzy 100.0000
|
||||
[src/scene/board/iplBoardObject] pool: IDENTICAL
|
||||
[src/scene/board/iplBoardObject] objdiff: code 9184/9184 data 1320/1320 functions 39/39 fuzzy 100.0000 linked code 9184
|
||||
[src/scene/board/iplBoardObject] instruction-exact functions: 38/39
|
||||
[src/scene/board/iplBoardObject] section .data size 1200 match 100.0
|
||||
[src/scene/board/iplBoardObject] section .rodata size 16 match 100.0
|
||||
[src/scene/board/iplBoardObject] section .sdata size 40 match 100.0
|
||||
[src/scene/board/iplBoardObject] section .sdata2 size 64 match 100.0
|
||||
[src/scene/board/iplBoardObject] section .text size 9184 match 99.73868
|
||||
[src/scene/board/iplBoardObject] baseline: code 9184/9184 data 1320 functions 39 fuzzy 100.0000
|
||||
[src/scene/board/iplFocusObject] pool: IDENTICAL
|
||||
[src/scene/board/iplFocusObject] objdiff: code 20332/20332 data 2576/2576 functions 89/89 fuzzy 100.0000 linked code 20332
|
||||
[src/scene/board/iplFocusObject] instruction-exact functions: 89/89
|
||||
[src/scene/board/iplFocusObject] section .data size 2168 match 100.0
|
||||
[src/scene/board/iplFocusObject] section .rodata size 176 match 100.0
|
||||
[src/scene/board/iplFocusObject] section .sdata size 176 match 100.0
|
||||
[src/scene/board/iplFocusObject] section .sdata2 size 56 match 100.0
|
||||
[src/scene/board/iplFocusObject] section .text size 20332 match 100.0
|
||||
[src/scene/board/iplFocusObject] baseline: code 20332/20332 data 2576 functions 89 fuzzy 100.0000
|
||||
[src/scene/button/iplButton] pool: IDENTICAL
|
||||
[src/scene/button/iplButton] objdiff: code 7624/7624 data 1744/1744 functions 42/42 fuzzy 100.0000 linked code 7624
|
||||
[src/scene/button/iplButton] instruction-exact functions: 41/42
|
||||
[src/scene/button/iplButton] section .data size 944 match 100.0
|
||||
[src/scene/button/iplButton] section .rodata size 552 match 100.0
|
||||
[src/scene/button/iplButton] section .sdata size 192 match 100.0
|
||||
[src/scene/button/iplButton] section .sdata2 size 56 match 100.0
|
||||
[src/scene/button/iplButton] section .text size 7624 match 98.53095
|
||||
[src/scene/button/iplButton] baseline: code 7624/7624 data 1744 functions 42 fuzzy 100.0000
|
||||
[src/scene/calendar/iplCalendar] pool: IDENTICAL
|
||||
[src/scene/calendar/iplCalendar] objdiff: code 7452/7452 data 1244/1244 functions 42/42 fuzzy 100.0000 linked code 7452
|
||||
[src/scene/calendar/iplCalendar] instruction-exact functions: 42/42
|
||||
[src/scene/calendar/iplCalendar] section .bss size 24 match 100.0
|
||||
[src/scene/calendar/iplCalendar] section .ctors size 4 match 100.0
|
||||
[src/scene/calendar/iplCalendar] section .data size 728 match 100.0
|
||||
[src/scene/calendar/iplCalendar] section .rodata size 448 match 100.0
|
||||
[src/scene/calendar/iplCalendar] section .sdata size 24 match 100.0
|
||||
[src/scene/calendar/iplCalendar] section .sdata2 size 16 match 100.0
|
||||
[src/scene/calendar/iplCalendar] section .text size 7452 match 100.0
|
||||
[src/scene/calendar/iplCalendar] baseline: code 7452/7452 data 1244 functions 42 fuzzy 100.0000
|
||||
[src/scene/channelSelect/iplChannelObj] pool: IDENTICAL
|
||||
[src/scene/channelSelect/iplChannelObj] objdiff: code 10924/10924 data 2216/2216 functions 56/56 fuzzy 100.0000 linked code 10924
|
||||
[src/scene/channelSelect/iplChannelObj] instruction-exact functions: 56/56
|
||||
[src/scene/channelSelect/iplChannelObj] section .data size 1240 match 100.0
|
||||
[src/scene/channelSelect/iplChannelObj] section .rodata size 784 match 100.0
|
||||
[src/scene/channelSelect/iplChannelObj] section .sdata size 120 match 100.0
|
||||
[src/scene/channelSelect/iplChannelObj] section .sdata2 size 72 match 100.0
|
||||
[src/scene/channelSelect/iplChannelObj] section .text size 10924 match 100.0
|
||||
[src/scene/channelSelect/iplChannelObj] baseline: code 10924/10924 data 2216 functions 56 fuzzy 100.0000
|
||||
[src/scene/channelSelect/iplChannelSelect] pool: IDENTICAL
|
||||
[src/scene/channelSelect/iplChannelSelect] objdiff: code 25668/25668 data 2336/2336 functions 102/102 fuzzy 100.0000 linked code 25668
|
||||
[src/scene/channelSelect/iplChannelSelect] instruction-exact functions: 102/102
|
||||
[src/scene/channelSelect/iplChannelSelect] section .data size 2144 match 100.0
|
||||
[src/scene/channelSelect/iplChannelSelect] section .rodata size 16 match 100.0
|
||||
[src/scene/channelSelect/iplChannelSelect] section .sbss size 8 match 100.0
|
||||
[src/scene/channelSelect/iplChannelSelect] section .sdata size 80 match 100.0
|
||||
[src/scene/channelSelect/iplChannelSelect] section .sdata2 size 88 match 100.0
|
||||
[src/scene/channelSelect/iplChannelSelect] section .text size 25668 match 100.0
|
||||
[src/scene/channelSelect/iplChannelSelect] baseline: code 25668/25668 data 2336 functions 102 fuzzy 100.0000
|
||||
[src/scene/channelTitle/iplChannelTitle] pool: IDENTICAL
|
||||
[src/scene/channelTitle/iplChannelTitle] objdiff: code 28788/28788 data 3144/3144 functions 95/95 fuzzy 100.0000 linked code 28788
|
||||
[src/scene/channelTitle/iplChannelTitle] instruction-exact functions: 95/95
|
||||
[src/scene/channelTitle/iplChannelTitle] section .bss size 440 match 100.0
|
||||
[src/scene/channelTitle/iplChannelTitle] section .data size 2384 match 100.0
|
||||
[src/scene/channelTitle/iplChannelTitle] section .rodata size 48 match 100.0
|
||||
[src/scene/channelTitle/iplChannelTitle] section .sdata size 240 match 100.0
|
||||
[src/scene/channelTitle/iplChannelTitle] section .sdata2 size 32 match 100.0
|
||||
[src/scene/channelTitle/iplChannelTitle] section .text size 28788 match 100.0
|
||||
[src/scene/channelTitle/iplChannelTitle] baseline: code 28788/28788 data 3144 functions 95 fuzzy 100.0000
|
||||
[src/scene/faceSelect/iplFaceSelect] pool: IDENTICAL
|
||||
[src/scene/faceSelect/iplFaceSelect] objdiff: code 9524/9524 data 2152/2152 functions 37/37 fuzzy 100.0000 linked code 9524
|
||||
[src/scene/faceSelect/iplFaceSelect] instruction-exact functions: 37/37
|
||||
[src/scene/faceSelect/iplFaceSelect] section .data size 2048 match 100.0
|
||||
[src/scene/faceSelect/iplFaceSelect] section .rodata size 24 match 100.0
|
||||
[src/scene/faceSelect/iplFaceSelect] section .sdata size 48 match 100.0
|
||||
[src/scene/faceSelect/iplFaceSelect] section .sdata2 size 32 match 100.0
|
||||
[src/scene/faceSelect/iplFaceSelect] section .text size 9524 match 100.0
|
||||
[src/scene/faceSelect/iplFaceSelect] baseline: code 9524/9524 data 2152 functions 37 fuzzy 100.0000
|
||||
[src/scene/mailAddSel/iplMailAddressSelect] pool: IDENTICAL
|
||||
[src/scene/mailAddSel/iplMailAddressSelect] objdiff: code 6068/6068 data 976/976 functions 30/30 fuzzy 100.0000 linked code 6068
|
||||
[src/scene/mailAddSel/iplMailAddressSelect] instruction-exact functions: 30/30
|
||||
[src/scene/mailAddSel/iplMailAddressSelect] section .data size 960 match 100.0
|
||||
[src/scene/mailAddSel/iplMailAddressSelect] section .sdata size 16 match 100.0
|
||||
[src/scene/mailAddSel/iplMailAddressSelect] section .text size 6068 match 100.0
|
||||
[src/scene/mailAddSel/iplMailAddressSelect] baseline: code 6068/6068 data 976 functions 30 fuzzy 100.0000
|
||||
[src/scene/nakamuraTest/iplNakamuraTest] pool: IDENTICAL
|
||||
[src/scene/nakamuraTest/iplNakamuraTest] objdiff: code 3596/3596 data 912/912 functions 15/15 fuzzy 100.0000 linked code 3596
|
||||
[src/scene/nakamuraTest/iplNakamuraTest] instruction-exact functions: 15/15
|
||||
[src/scene/nakamuraTest/iplNakamuraTest] section .data size 872 match 100.0
|
||||
[src/scene/nakamuraTest/iplNakamuraTest] section .rodata size 24 match 100.0
|
||||
[src/scene/nakamuraTest/iplNakamuraTest] section .sbss size 8 match 100.0
|
||||
[src/scene/nakamuraTest/iplNakamuraTest] section .sdata size 8 match 100.0
|
||||
[src/scene/nakamuraTest/iplNakamuraTest] section .text size 3596 match 100.0
|
||||
[src/scene/nakamuraTest/iplNakamuraTest] baseline: code 3596/3596 data 912 functions 15 fuzzy 100.0000
|
||||
[src/scene/nakamuraTest/iplNetSetup] pool: IDENTICAL
|
||||
[src/scene/nakamuraTest/iplNetSetup] objdiff: code 2080/2080 data 256/256 functions 11/11 fuzzy 100.0000 linked code 2080
|
||||
[src/scene/nakamuraTest/iplNetSetup] instruction-exact functions: 11/11
|
||||
[src/scene/nakamuraTest/iplNetSetup] section .bss size 40 match 100.0
|
||||
[src/scene/nakamuraTest/iplNetSetup] section .data size 208 match 100.0
|
||||
[src/scene/nakamuraTest/iplNetSetup] section .sbss size 8 match 100.0
|
||||
[src/scene/nakamuraTest/iplNetSetup] section .text size 2080 match 100.0
|
||||
[src/scene/nakamuraTest/iplNetSetup] baseline: code 2080/2080 data 256 functions 11 fuzzy 100.0000
|
||||
[src/scene/parentalDialog/iplParentalDialog] pool: IDENTICAL
|
||||
[src/scene/parentalDialog/iplParentalDialog] objdiff: code 4540/4540 data 808/808 functions 25/25 fuzzy 100.0000 linked code 4540
|
||||
[src/scene/parentalDialog/iplParentalDialog] instruction-exact functions: 25/25
|
||||
[src/scene/parentalDialog/iplParentalDialog] section .data size 752 match 100.0
|
||||
[src/scene/parentalDialog/iplParentalDialog] section .sdata size 56 match 100.0
|
||||
[src/scene/parentalDialog/iplParentalDialog] section .text size 4540 match 100.0
|
||||
[src/scene/parentalDialog/iplParentalDialog] baseline: code 4540/4540 data 808 functions 25 fuzzy 100.0000
|
||||
[src/scene/sceneSystem/iplSceneManager] pool: IDENTICAL
|
||||
[src/scene/sceneSystem/iplSceneManager] objdiff: code 3344/3344 data 40/40 functions 29/29 fuzzy 100.0000 linked code 3344
|
||||
[src/scene/sceneSystem/iplSceneManager] instruction-exact functions: 29/29
|
||||
[src/scene/sceneSystem/iplSceneManager] section .data size 40 match 100.0
|
||||
[src/scene/sceneSystem/iplSceneManager] section .text size 3344 match 100.0
|
||||
[src/scene/sceneSystem/iplSceneManager] baseline: code 3344/3344 data 40 functions 29 fuzzy 100.0000
|
||||
[src/scene/sdButton/iplSDButton] pool: IDENTICAL
|
||||
[src/scene/sdButton/iplSDButton] objdiff: code 5136/5136 data 1168/1168 functions 23/23 fuzzy 100.0000 linked code 5136
|
||||
[src/scene/sdButton/iplSDButton] instruction-exact functions: 23/23
|
||||
[src/scene/sdButton/iplSDButton] section .data size 1080 match 100.0
|
||||
[src/scene/sdButton/iplSDButton] section .sdata size 64 match 100.0
|
||||
[src/scene/sdButton/iplSDButton] section .sdata2 size 24 match 100.0
|
||||
[src/scene/sdButton/iplSDButton] section .text size 5136 match 100.0
|
||||
[src/scene/sdButton/iplSDButton] baseline: code 5136/5136 data 1168 functions 23 fuzzy 100.0000
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] pool: IDENTICAL
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] objdiff: code 30344/33828 data 2960/2960 functions 123/129 fuzzy 99.7731 linked code 0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] instruction-exact functions: 123/129
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .data size 2736 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .rodata size 64 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .sdata size 80 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .sdata2 size 80 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .text size 33828 match 99.77309
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: create__Q33ipl5scene15SDChannelSelectFv 97.73972
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.81188
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.833336
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 98.007935
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.55125
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv 99.65714
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] baseline: code 30344/33828 data 2960 functions 123 fuzzy 99.7731
|
||||
[src/scene/setting/iplAOSSThread] pool: IDENTICAL
|
||||
[src/scene/setting/iplAOSSThread] objdiff: code 1892/1892 data 88/88 functions 10/10 fuzzy 100.0000 linked code 1892
|
||||
[src/scene/setting/iplAOSSThread] instruction-exact functions: 10/10
|
||||
[src/scene/setting/iplAOSSThread] section .bss size 16 match 100.0
|
||||
[src/scene/setting/iplAOSSThread] section .data size 48 match 100.0
|
||||
[src/scene/setting/iplAOSSThread] section .sbss size 16 match 100.0
|
||||
[src/scene/setting/iplAOSSThread] section .sdata size 8 match 100.0
|
||||
[src/scene/setting/iplAOSSThread] section .text size 1892 match 100.0
|
||||
[src/scene/setting/iplAOSSThread] baseline: code 1892/1892 data 88 functions 10 fuzzy 100.0000
|
||||
[src/scene/setting/iplNCDSetting] pool: IDENTICAL
|
||||
[src/scene/setting/iplNCDSetting] objdiff: code 6796/6796 data 14232/14232 functions 62/62 fuzzy 100.0000 linked code 6796
|
||||
[src/scene/setting/iplNCDSetting] instruction-exact functions: 62/62
|
||||
[src/scene/setting/iplNCDSetting] section .bss size 14040 match 100.0
|
||||
[src/scene/setting/iplNCDSetting] section .data size 184 match 100.0
|
||||
[src/scene/setting/iplNCDSetting] section .sbss size 8 match 100.0
|
||||
[src/scene/setting/iplNCDSetting] section .text size 6796 match 100.0
|
||||
[src/scene/setting/iplNCDSetting] baseline: code 6796/6796 data 14232 functions 62 fuzzy 100.0000
|
||||
[src/scene/setting/iplRakuRakuThread] pool: IDENTICAL
|
||||
[src/scene/setting/iplRakuRakuThread] objdiff: code 2168/2168 data 456/456 functions 14/14 fuzzy 100.0000 linked code 2168
|
||||
[src/scene/setting/iplRakuRakuThread] instruction-exact functions: 14/14
|
||||
[src/scene/setting/iplRakuRakuThread] section .bss size 296 match 100.0
|
||||
[src/scene/setting/iplRakuRakuThread] section .data size 136 match 100.0
|
||||
[src/scene/setting/iplRakuRakuThread] section .sbss size 16 match 100.0
|
||||
[src/scene/setting/iplRakuRakuThread] section .sdata size 8 match 100.0
|
||||
[src/scene/setting/iplRakuRakuThread] section .text size 2168 match 100.0
|
||||
[src/scene/setting/iplRakuRakuThread] baseline: code 2168/2168 data 456 functions 14 fuzzy 100.0000
|
||||
[src/scene/setting/iplSetting] pool: IDENTICAL
|
||||
[src/scene/setting/iplSetting] objdiff: code 36796/37884 data 5696/5696 functions 111/112 fuzzy 99.9771 linked code 0
|
||||
[src/scene/setting/iplSetting] instruction-exact functions: 111/112
|
||||
[src/scene/setting/iplSetting] section .bss size 456 match 100.0
|
||||
[src/scene/setting/iplSetting] section .data size 4016 match 100.0
|
||||
[src/scene/setting/iplSetting] section .rodata size 640 match 100.0
|
||||
[src/scene/setting/iplSetting] section .sbss size 16 match 100.0
|
||||
[src/scene/setting/iplSetting] section .sdata size 504 match 100.0
|
||||
[src/scene/setting/iplSetting] section .sdata2 size 64 match 100.0
|
||||
[src/scene/setting/iplSetting] section .text size 37884 match 99.97709
|
||||
[src/scene/setting/iplSetting] below 100: scanAP__Q33ipl5scene7SettingFv 99.20221
|
||||
[src/scene/setting/iplSetting] baseline: code 36796/37884 data 5696 functions 111 fuzzy 99.9771
|
||||
[src/scene/settingSelect/iplSettingButton] pool: IDENTICAL
|
||||
[src/scene/settingSelect/iplSettingButton] objdiff: code 3116/3116 data 664/664 functions 23/23 fuzzy 100.0000 linked code 3116
|
||||
[src/scene/settingSelect/iplSettingButton] instruction-exact functions: 23/23
|
||||
[src/scene/settingSelect/iplSettingButton] section .data size 632 match 100.0
|
||||
[src/scene/settingSelect/iplSettingButton] section .sdata size 32 match 100.0
|
||||
[src/scene/settingSelect/iplSettingButton] section .text size 3116 match 100.0
|
||||
[src/scene/settingSelect/iplSettingButton] baseline: code 3116/3116 data 664 functions 23 fuzzy 100.0000
|
||||
[src/scene/settingSelect/iplSettingSelect] pool: IDENTICAL
|
||||
[src/scene/settingSelect/iplSettingSelect] objdiff: code 8432/8432 data 1504/1504 functions 37/37 fuzzy 100.0000 linked code 8432
|
||||
[src/scene/settingSelect/iplSettingSelect] instruction-exact functions: 37/37
|
||||
[src/scene/settingSelect/iplSettingSelect] section .data size 1488 match 100.0
|
||||
[src/scene/settingSelect/iplSettingSelect] section .sdata size 16 match 100.0
|
||||
[src/scene/settingSelect/iplSettingSelect] section .text size 8432 match 100.0
|
||||
[src/scene/settingSelect/iplSettingSelect] baseline: code 8432/8432 data 1504 functions 37 fuzzy 100.0000
|
||||
[src/system/iplCdbBackup] pool: IDENTICAL
|
||||
[src/system/iplCdbBackup] objdiff: code 4012/4012 data 108/108 functions 26/26 fuzzy 100.0000 linked code 4012
|
||||
[src/system/iplCdbBackup] instruction-exact functions: 26/26
|
||||
[src/system/iplCdbBackup] section .ctors size 4 match 100.0
|
||||
[src/system/iplCdbBackup] section .data size 96 match 100.0
|
||||
[src/system/iplCdbBackup] section .sbss size 8 match 100.0
|
||||
[src/system/iplCdbBackup] section .text size 4012 match 100.0
|
||||
[src/system/iplCdbBackup] baseline: code 4012/4012 data 108 functions 26 fuzzy 100.0000
|
||||
[src/system/iplChannelManager] pool: IDENTICAL
|
||||
[src/system/iplChannelManager] objdiff: code 12552/12552 data 1080/1080 functions 74/74 fuzzy 100.0000 linked code 12552
|
||||
[src/system/iplChannelManager] instruction-exact functions: 74/74
|
||||
[src/system/iplChannelManager] section .data size 224 match 100.0
|
||||
[src/system/iplChannelManager] section .rodata size 816 match 100.0
|
||||
[src/system/iplChannelManager] section .sbss size 24 match 100.0
|
||||
[src/system/iplChannelManager] section .sdata size 16 match 100.0
|
||||
[src/system/iplChannelManager] section .text size 12552 match 100.0
|
||||
[src/system/iplChannelManager] baseline: code 12552/12552 data 1080 functions 74 fuzzy 100.0000
|
||||
[src/system/iplChannelRsoThread] pool: IDENTICAL
|
||||
[src/system/iplChannelRsoThread] objdiff: code 436/436 data 48/48 functions 5/5 fuzzy 100.0000 linked code 436
|
||||
[src/system/iplChannelRsoThread] instruction-exact functions: 5/5
|
||||
[src/system/iplChannelRsoThread] section .data size 48 match 100.0
|
||||
[src/system/iplChannelRsoThread] section .text size 436 match 100.0
|
||||
[src/system/iplChannelRsoThread] baseline: code 436/436 data 48 functions 5 fuzzy 100.0000
|
||||
[src/system/iplChannelScriptManager] pool: IDENTICAL
|
||||
[src/system/iplChannelScriptManager] objdiff: code 2148/2148 data 1024/1024 functions 10/10 fuzzy 100.0000 linked code 2148
|
||||
[src/system/iplChannelScriptManager] instruction-exact functions: 10/10
|
||||
[src/system/iplChannelScriptManager] section .bss size 624 match 100.0
|
||||
[src/system/iplChannelScriptManager] section .data size 392 match 100.0
|
||||
[src/system/iplChannelScriptManager] section .sbss size 8 match 100.0
|
||||
[src/system/iplChannelScriptManager] section .text size 2148 match 100.0
|
||||
[src/system/iplChannelScriptManager] baseline: code 2148/2148 data 1024 functions 10 fuzzy 100.0000
|
||||
[src/system/iplController] pool: IDENTICAL
|
||||
[src/system/iplController] objdiff: code 5708/5708 data 696/696 functions 84/84 fuzzy 100.0000 linked code 5708
|
||||
[src/system/iplController] instruction-exact functions: 84/84
|
||||
[src/system/iplController] section .data size 616 match 100.0
|
||||
[src/system/iplController] section .rodata size 16 match 100.0
|
||||
[src/system/iplController] section .sdata size 8 match 100.0
|
||||
[src/system/iplController] section .sdata2 size 56 match 100.0
|
||||
[src/system/iplController] section .text size 5708 match 100.0
|
||||
[src/system/iplController] baseline: code 5708/5708 data 696 functions 84 fuzzy 100.0000
|
||||
[src/system/iplControllerManager] pool: IDENTICAL
|
||||
[src/system/iplControllerManager] objdiff: code 1632/1632 data 320/320 functions 10/10 fuzzy 100.0000 linked code 1632
|
||||
[src/system/iplControllerManager] instruction-exact functions: 10/10
|
||||
[src/system/iplControllerManager] section .data size 280 match 100.0
|
||||
[src/system/iplControllerManager] section .sbss size 16 match 100.0
|
||||
[src/system/iplControllerManager] section .sdata2 size 24 match 100.0
|
||||
[src/system/iplControllerManager] section .text size 1632 match 100.0
|
||||
[src/system/iplControllerManager] baseline: code 1632/1632 data 320 functions 10 fuzzy 100.0000
|
||||
[src/system/iplDialogWindow] pool: IDENTICAL
|
||||
[src/system/iplDialogWindow] objdiff: code 12984/12984 data 1548/1548 functions 67/67 fuzzy 100.0000 linked code 12984
|
||||
[src/system/iplDialogWindow] instruction-exact functions: 67/67
|
||||
[src/system/iplDialogWindow] section .ctors size 4 match 100.0
|
||||
[src/system/iplDialogWindow] section .data size 1376 match 100.0
|
||||
[src/system/iplDialogWindow] section .sbss size 16 match 100.0
|
||||
[src/system/iplDialogWindow] section .sdata size 104 match 100.0
|
||||
[src/system/iplDialogWindow] section .sdata2 size 48 match 100.0
|
||||
[src/system/iplDialogWindow] section .text size 12984 match 100.0
|
||||
[src/system/iplDialogWindow] baseline: code 12984/12984 data 1548 functions 67 fuzzy 100.0000
|
||||
[src/system/iplErrorHandler] pool: IDENTICAL
|
||||
[src/system/iplErrorHandler] objdiff: code 932/932 data 104/104 functions 6/6 fuzzy 100.0000 linked code 932
|
||||
[src/system/iplErrorHandler] instruction-exact functions: 6/6
|
||||
[src/system/iplErrorHandler] section .data size 96 match 100.0
|
||||
[src/system/iplErrorHandler] section .sdata size 8 match 100.0
|
||||
[src/system/iplErrorHandler] section .text size 932 match 100.0
|
||||
[src/system/iplErrorHandler] baseline: code 932/932 data 104 functions 6 fuzzy 100.0000
|
||||
[src/system/iplException] pool: IDENTICAL
|
||||
[src/system/iplException] objdiff: code 1004/1004 data 32/32 functions 7/7 fuzzy 100.0000 linked code 1004
|
||||
[src/system/iplException] instruction-exact functions: 7/7
|
||||
[src/system/iplException] section .rodata size 32 match 100.0
|
||||
[src/system/iplException] section .text size 1004 match 100.0
|
||||
[src/system/iplException] baseline: code 1004/1004 data 32 functions 7 fuzzy 100.0000
|
||||
[src/system/iplHomeButtonMenu] pool: IDENTICAL
|
||||
[src/system/iplHomeButtonMenu] objdiff: code 2332/2332 data 80/80 functions 12/12 fuzzy 100.0000 linked code 2332
|
||||
[src/system/iplHomeButtonMenu] instruction-exact functions: 12/12
|
||||
[src/system/iplHomeButtonMenu] section .data size 24 match 100.0
|
||||
[src/system/iplHomeButtonMenu] section .sbss size 8 match 100.0
|
||||
[src/system/iplHomeButtonMenu] section .sdata2 size 48 match 100.0
|
||||
[src/system/iplHomeButtonMenu] section .text size 2332 match 100.0
|
||||
[src/system/iplHomeButtonMenu] baseline: code 2332/2332 data 80 functions 12 fuzzy 100.0000
|
||||
[src/system/iplNand] pool: IDENTICAL
|
||||
[src/system/iplNand] objdiff: code 5108/5108 data 272/272 functions 36/36 fuzzy 100.0000 linked code 5108
|
||||
[src/system/iplNand] instruction-exact functions: 36/36
|
||||
[src/system/iplNand] section .data size 256 match 100.0
|
||||
[src/system/iplNand] section .sdata size 16 match 100.0
|
||||
[src/system/iplNand] section .text size 5108 match 100.0
|
||||
[src/system/iplNand] baseline: code 5108/5108 data 272 functions 36 fuzzy 100.0000
|
||||
[src/system/iplNandManager] pool: IDENTICAL
|
||||
[src/system/iplNandManager] objdiff: code 2520/2520 data 120/120 functions 19/19 fuzzy 100.0000 linked code 2520
|
||||
[src/system/iplNandManager] instruction-exact functions: 19/19
|
||||
[src/system/iplNandManager] section .data size 104 match 100.0
|
||||
[src/system/iplNandManager] section .sdata size 16 match 100.0
|
||||
[src/system/iplNandManager] section .text size 2520 match 100.0
|
||||
[src/system/iplNandManager] baseline: code 2520/2520 data 120 functions 19 fuzzy 100.0000
|
||||
[src/system/iplNandMeta] pool: IDENTICAL
|
||||
[src/system/iplNandMeta] objdiff: code 1536/1536 data 136/136 functions 13/13 fuzzy 100.0000 linked code 1536
|
||||
[src/system/iplNandMeta] instruction-exact functions: 13/13
|
||||
[src/system/iplNandMeta] section .data size 128 match 100.0
|
||||
[src/system/iplNandMeta] section .sdata size 8 match 100.0
|
||||
[src/system/iplNandMeta] section .text size 1536 match 100.0
|
||||
[src/system/iplNandMeta] baseline: code 1536/1536 data 136 functions 13 fuzzy 100.0000
|
||||
[src/system/iplNandSDWorker] pool: IDENTICAL
|
||||
[src/system/iplNandSDWorker] objdiff: code 51428/51428 data 12312/12312 functions 203/203 fuzzy 100.0000 linked code 51428
|
||||
[src/system/iplNandSDWorker] instruction-exact functions: 7/203
|
||||
[src/system/iplNandSDWorker] section .data size 12128 match 100.0
|
||||
[src/system/iplNandSDWorker] section .rodata size 48 match 100.0
|
||||
[src/system/iplNandSDWorker] section .sbss size 8 match 100.0
|
||||
[src/system/iplNandSDWorker] section .sdata size 96 match 100.0
|
||||
[src/system/iplNandSDWorker] section .sdata2 size 32 match 100.0
|
||||
[src/system/iplNandSDWorker] section .text size 51428 match 100.0
|
||||
[src/system/iplNandSDWorker] baseline: code 51428/51428 data 12312 functions 203 fuzzy 100.0000
|
||||
[src/system/iplNwc24Manager] pool: IDENTICAL
|
||||
[src/system/iplNwc24Manager] objdiff: code 10252/10252 data 888/888 functions 53/53 fuzzy 100.0000 linked code 10252
|
||||
[src/system/iplNwc24Manager] instruction-exact functions: 53/53
|
||||
[src/system/iplNwc24Manager] section .bss size 256 match 100.0
|
||||
[src/system/iplNwc24Manager] section .data size 576 match 100.0
|
||||
[src/system/iplNwc24Manager] section .sdata size 16 match 100.0
|
||||
[src/system/iplNwc24Manager] section .sdata2 size 40 match 100.0
|
||||
[src/system/iplNwc24Manager] section .text size 10252 match 100.0
|
||||
[src/system/iplNwc24Manager] baseline: code 10252/10252 data 888 functions 53 fuzzy 100.0000
|
||||
[src/system/iplPlayTimeLog] pool: IDENTICAL
|
||||
[src/system/iplPlayTimeLog] objdiff: code 4856/4856 data 388/388 functions 18/18 fuzzy 100.0000 linked code 4856
|
||||
[src/system/iplPlayTimeLog] instruction-exact functions: 18/18
|
||||
[src/system/iplPlayTimeLog] section .bss size 208 match 100.0
|
||||
[src/system/iplPlayTimeLog] section .ctors size 4 match 100.0
|
||||
[src/system/iplPlayTimeLog] section .data size 88 match 100.0
|
||||
[src/system/iplPlayTimeLog] section .rodata size 24 match 100.0
|
||||
[src/system/iplPlayTimeLog] section .sdata size 24 match 100.0
|
||||
[src/system/iplPlayTimeLog] section .sdata2 size 40 match 100.0
|
||||
[src/system/iplPlayTimeLog] section .text size 4856 match 100.0
|
||||
[src/system/iplPlayTimeLog] baseline: code 4856/4856 data 388 functions 18 fuzzy 100.0000
|
||||
[src/system/iplPostmanManager] pool: IDENTICAL
|
||||
[src/system/iplPostmanManager] objdiff: code 2832/2832 data 584/584 functions 22/22 fuzzy 100.0000 linked code 2832
|
||||
[src/system/iplPostmanManager] instruction-exact functions: 22/22
|
||||
[src/system/iplPostmanManager] section .data size 576 match 100.0
|
||||
[src/system/iplPostmanManager] section .sdata size 8 match 100.0
|
||||
[src/system/iplPostmanManager] section .text size 2832 match 100.0
|
||||
[src/system/iplPostmanManager] baseline: code 2832/2832 data 584 functions 22 fuzzy 100.0000
|
||||
[src/system/iplResetHandler] pool: IDENTICAL
|
||||
[src/system/iplResetHandler] objdiff: code 1360/1360 data None/None functions 10/10 fuzzy 100.0000 linked code 1360
|
||||
[src/system/iplResetHandler] instruction-exact functions: 10/10
|
||||
[src/system/iplResetHandler] section .text size 1360 match 100.0
|
||||
[src/system/iplResetHandler] baseline: code 1360/1360 data None functions 10 fuzzy 100.0000
|
||||
[src/system/iplSDVFWorker] pool: IDENTICAL
|
||||
[src/system/iplSDVFWorker] objdiff: code 3460/3460 data 832/832 functions 23/23 fuzzy 100.0000 linked code 3460
|
||||
[src/system/iplSDVFWorker] instruction-exact functions: 23/23
|
||||
[src/system/iplSDVFWorker] section .data size 824 match 100.0
|
||||
[src/system/iplSDVFWorker] section .sbss size 8 match 100.0
|
||||
[src/system/iplSDVFWorker] section .text size 3460 match 100.0
|
||||
[src/system/iplSDVFWorker] baseline: code 3460/3460 data 832 functions 23 fuzzy 100.0000
|
||||
[src/system/iplSocketSetting] pool: IDENTICAL
|
||||
[src/system/iplSocketSetting] objdiff: code 864/864 data 128/128 functions 8/8 fuzzy 100.0000 linked code 864
|
||||
[src/system/iplSocketSetting] instruction-exact functions: 8/8
|
||||
[src/system/iplSocketSetting] section .bss size 64 match 100.0
|
||||
[src/system/iplSocketSetting] section .data size 48 match 100.0
|
||||
[src/system/iplSocketSetting] section .sbss size 16 match 100.0
|
||||
[src/system/iplSocketSetting] section .text size 864 match 100.0
|
||||
[src/system/iplSocketSetting] baseline: code 864/864 data 128 functions 8 fuzzy 100.0000
|
||||
[src/system/iplSystem] pool: IDENTICAL
|
||||
[src/system/iplSystem] objdiff: code 12456/12456 data 2228/2228 functions 63/63 fuzzy 100.0000 linked code 12456
|
||||
[src/system/iplSystem] instruction-exact functions: 63/63
|
||||
[src/system/iplSystem] section .bss size 728 match 100.0
|
||||
[src/system/iplSystem] section .ctors size 4 match 100.0
|
||||
[src/system/iplSystem] section .data size 1416 match 100.0
|
||||
[src/system/iplSystem] section .sdata size 32 match 100.0
|
||||
[src/system/iplSystem] section .sdata2 size 48 match 100.0
|
||||
[src/system/iplSystem] section .text size 12456 match 100.0
|
||||
[src/system/iplSystem] baseline: code 12456/12456 data 2228 functions 63 fuzzy 100.0000
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 93.82541 -> 93.82541
|
||||
global fuzzy_match_percent: 99.81117 -> 99.81117
|
||||
global complete_code_percent: 79.26653 -> 79.26653
|
||||
global matched_data_percent: 99.99410 -> 99.99410
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
## Commits
|
||||
|
||||
- `c52fa65312674385b776c2440c2b77fb2bc3a7c5`: simplify scene constants and expressions
|
||||
- `c507a0459a9cf7f083acc2d395f4eee1b479aad9`: simplify system constants and expressions
|
||||
|
||||
Source commits were made only after the clean gate and the full object
|
||||
comparison passed. The log is committed separately.
|
||||
Reference in New Issue
Block a user