Compare commits

..

1 Commits

Author SHA1 Message Date
coah
d7dbc474c0 cleanup: rename CdbBackup progress percent helper
Rename fn_8135B1C0 to getProgressPercent. DOL sha1 unchanged.
2026-10-01 16:54:50 -05:00
18 changed files with 110 additions and 103 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.37% | 87.69% | 61.93% | 91.28% |
| 99.37% | 87.69% | 61.81% | 91.27% |
units 917/1027 complete, functions 12211/12563 matched.
units 916/1027 complete, functions 12211/12563 matched.
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
<!-- progress:end -->

View File

@@ -5126,8 +5126,8 @@ __ct__Q33ipl5scene10AOSSThreadFPQ23EGG4Heap = .text:0x813FCA0C; // type:function
destroy__Q33ipl5scene10AOSSThreadFi = .text:0x813FCAA0; // type:function size:0x84
__dt__Q33ipl5scene10AOSSThreadFv = .text:0x813FCB24; // type:function size:0x70
start__Q33ipl5scene10AOSSThreadFv = .text:0x813FCB94; // type:function size:0xF8
aossAlloc__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
aossFree__Q33ipl5scene10AOSSThreadFv = .text:0x813FCCE4; // type:function size:0x50
AOSSThread_813FCC8C__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
AOSSThread_813FCCE4__Q33ipl5scene10AOSSThreadFv = .text:0x813FCCE4; // type:function size:0x50
Run__Q33ipl5scene10AOSSThreadFv = .text:0x813FCD34; // type:function size:0xEC
cancel__Q33ipl5scene10AOSSThreadFv = .text:0x813FCE20; // type:function size:0x50
finish__Q33ipl5scene10AOSSThreadFP13NCDAossConfigPi = .text:0x813FCE70; // type:function size:0x2FC
@@ -21753,7 +21753,7 @@ lbl_816966E1 = .sdata:0x816966E1; // type:object size:0x6 data:string
lbl_816966E7 = .sdata:0x816966E7; // type:object size:0x7 data:string
lbl_816966EE = .sdata:0x816966EE; // type:object size:0x7 data:string
lbl_816966F5 = .sdata:0x816966F5; // type:object size:0x4 data:string
scPaneName_B_Stop = .sdata:0x816966F9; // type:object size:0x7 data:string
lbl_816966F9 = .sdata:0x816966F9; // type:object size:0x7 data:string
lbl_81696700 = .sdata:0x81696700; // type:object size:0x6 data:string
lbl_81696706 = .sdata:0x81696706; // type:object size:0x5 data:string
lbl_8169670B = .sdata:0x8169670B; // type:object size:0x6 data:string
@@ -21781,7 +21781,7 @@ lbl_81696797 = .sdata:0x81696797; // type:object size:0x8 data:string
lbl_8169679F = .sdata:0x8169679F; // type:object size:0x8 data:string
lbl_816967A7 = .sdata:0x816967A7; // type:object size:0x7 data:string
lbl_816967AE = .sdata:0x816967AE; // type:object size:0x7 data:string
scPaneName_T_Stop = .sdata:0x816967B5; // type:object size:0x7 data:string
lbl_816967B5 = .sdata:0x816967B5; // type:object size:0x7 data:string
lbl_816967C0 = .sdata:0x816967C0; // type:object size:0x4 data:string
lbl_816967C4 = .sdata:0x816967C4; // type:object size:0x6 data:string
lbl_816967CA = .sdata:0x816967CA; // type:object size:0x7 data:string
@@ -23191,7 +23191,7 @@ _repeatBitLength__7LibTVRC = .sbss:0x81698768; // type:object size:0x4 data:4byt
_repeatBitArray__7LibTVRC = .sbss:0x8169876C; // type:object size:0x4 data:4byte
_tickT__7LibTVRC = .sbss:0x81698770; // type:object size:0x4 data:4byte
m_handle__Q23ipl11TVRCManager = .sbss:0x81698778; // type:object size:0x4 data:4byte
sTvrcStartDelay__3ipl = .sbss:0x8169877C; // type:object size:0x4 data:4byte
lbl_8169877C__3ipl = .sbss:0x8169877C; // type:object size:0x4 data:4byte
suIDCounter__Q23gui11PaneManager = .sbss:0x81698780; // type:object size:0x4 data:4byte
_bgmBlk__Q23ipl3snd = .sbss:0x81698788; // type:object size:0x4
_mainBGMHandle__Q23ipl3snd = .sbss:0x8169878C; // type:object size:0x4 data:4byte
@@ -23331,7 +23331,7 @@ opera_callbacks__Q23www10wiisetting = .sbss:0x816989A0; // type:object size:0x4
sStatus__Q23www9arcreader = .sbss:0x816989A8; // type:object size:0x4 scope:local data:4byte
lbl_816989B0 = .sbss:0x816989B0; // type:object size:0x4 data:4byte
sBatteryFlag__Q210homebutton10Controller = .sbss:0x816989B8; // type:object size:0x4
sAlarmCreated__Q210homebutton10Controller = .sbss:0x816989BC; // type:object size:0x4
lbl_816989BC__Q210homebutton10Controller = .sbss:0x816989BC; // type:object size:0x4
suIDCounter__Q310homebutton3gui11PaneManager = .sbss:0x816989C0; // type:object size:0x4 data:4byte
spInstance__Q210homebutton9RemoteSpk = .sbss:0x816989C8; // type:object size:0x4 data:4byte
InvalidShutdown = .sbss:0x816989D0; // type:object size:0x4 data:4byte

View File

@@ -929,7 +929,7 @@ config.libs = [
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),

View File

@@ -75,7 +75,7 @@ namespace homebutton {
private:
static bool sBatteryFlag[WPAD_MAX_CONTROLLERS];
static bool sAlarmCreated[WPAD_MAX_CONTROLLERS];
static bool lbl_816989BC[WPAD_MAX_CONTROLLERS];
static OSAlarm sAlarm[WPAD_MAX_CONTROLLERS];
static OSAlarm sAlarmSoundOff[WPAD_MAX_CONTROLLERS];

View File

@@ -35,8 +35,8 @@ namespace ext_ead {
class SurfaceManager {
public:
static void CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
void* libBuf, const char* arcPath);
static void CreateManager(int rectW0, int rectH0, int rectW1, int rectH1, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
void* libBuf, const char* param_10);
static void DisposeManager();
static void RegisterArcFile(void* fileBuf);

View File

@@ -69,7 +69,7 @@ namespace ipl {
HermiteIntp() {}
virtual ~HermiteIntp();
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
T get() const {
f32 var_f27 = mFrame;
@@ -81,11 +81,11 @@ namespace ipl {
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r +=
(mStartTangent *
(unkVal0 *
(var_f27 +
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (2.0f * var_f27 * var_f27))))) +
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (var_f27 * var_f27))));
return r;
@@ -101,7 +101,7 @@ namespace ipl {
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 =
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
r = r + temp_f3;
return r;*/
}
@@ -109,8 +109,8 @@ namespace ipl {
protected:
T mStart;
T mEnd;
f32 mStartTangent;
f32 mEndTangent;
f32 unkVal0;
f32 unkVal1;
};
template <>
@@ -119,7 +119,7 @@ namespace ipl {
HermiteIntp() {}
virtual ~HermiteIntp();
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD,
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD,
f32 speed = 1.0f);
f32 get() const {
@@ -132,10 +132,10 @@ namespace ipl {
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r +=
(mStartTangent *
(unkVal0 *
(var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (2.0f * var_f27 * var_f27))))) +
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (var_f27 * var_f27))));
return r;
@@ -144,8 +144,8 @@ namespace ipl {
protected:
f32 mStart;
f32 mEnd;
f32 mStartTangent;
f32 mEndTangent;
f32 unkVal0;
f32 unkVal1;
};
#pragma dont_instantiate HermiteIntp<float>
@@ -155,12 +155,12 @@ namespace ipl {
public:
HermiteIntp() {}
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
mStart = start;
mEnd = end;
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
mStartTangent = startTangent;
mEndTangent = endTangent;
unkVal0 = param_5;
unkVal1 = param_6;
}
#ifdef IPL_SD_CHANNEL_SELECT_CPP
@@ -176,9 +176,9 @@ namespace ipl {
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
f32 frameSquared = frame * frame;
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
f32 tangent = mStartTangent * (frame + (cubic -
f32 tangent = unkVal0 * (frame + (cubic -
inverseDuration * (2.0f * frame * frame))) +
mEndTangent * (cubic - inverseDuration * frameSquared);
unkVal1 * (cubic - inverseDuration * frameSquared);
result.x += tangent;
result.y += tangent;
result.z += tangent;
@@ -196,7 +196,7 @@ namespace ipl {
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 =
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
r = r + temp_f3;
@@ -213,15 +213,15 @@ namespace ipl {
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 =
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
r = r + temp_f3;
return r;*/
}
#endif
protected:
f32 mStartTangent;
f32 mEndTangent;
f32 unkVal0;
f32 unkVal1;
};
#endif
@@ -236,7 +236,7 @@ namespace ipl {
public:
HermiteIntp() {}
virtual ~HermiteIntp();
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
VEC3 get() const {
f32 frame = mFrame;
f32 inverseDuration = 1.0f / mMaxFrame;
@@ -249,9 +249,9 @@ namespace ipl {
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
f32 frameSquared = frame * frame;
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
f32 tangent = mStartTangent * (frame + (cubic -
f32 tangent = unkVal0 * (frame + (cubic -
inverseDuration * (2.0f * frame * frame))) +
mEndTangent * (cubic - inverseDuration * frameSquared);
unkVal1 * (cubic - inverseDuration * frameSquared);
result.x += tangent;
result.y += tangent;
result.z += tangent;
@@ -260,8 +260,8 @@ namespace ipl {
protected:
VEC3 mStart;
VEC3 mEnd;
f32 mStartTangent;
f32 mEndTangent;
f32 unkVal0;
f32 unkVal1;
};
#endif

View File

@@ -17,7 +17,7 @@ extern "C" void __dt__Q34nw4r3snd11SoundHandleFv(nw4r::snd::SoundHandle*, int);
namespace homebutton {
bool Controller::sBatteryFlag[WPAD_MAX_CONTROLLERS];
bool Controller::sAlarmCreated[WPAD_MAX_CONTROLLERS];
bool Controller::lbl_816989BC[WPAD_MAX_CONTROLLERS];
OSAlarm Controller::sAlarm[WPAD_MAX_CONTROLLERS];
OSAlarm Controller::sAlarmSoundOff[WPAD_MAX_CONTROLLERS];
@@ -83,10 +83,10 @@ namespace homebutton {
if (chan < WPAD_MAX_CONTROLLERS) {
sBatteryFlag[chan] = false;
OSReport("Create %d\n", chan);
if (!sAlarmCreated[chan]) {
if (!lbl_816989BC[chan]) {
OSCreateAlarm(&sAlarm[chan]);
OSCreateAlarm(&sAlarmSoundOff[chan]);
sAlarmCreated[chan] = true;
lbl_816989BC[chan] = true;
}
sThis[chan] = this;
}

View File

@@ -5,6 +5,8 @@
#include "keyboard/tiHKBManager.h"
#include "keyboard/tiLayoutGather.h"
extern const u8 lbl_81616BD8[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern const u8 lbl_81616BE4[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" void SetCountry__Q39textinput5input10HKBManagerFUc();
extern "C" textinput::input::HKBManager sInstance__Q39textinput5input10HKBManager;
extern "C" void convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw();
@@ -526,9 +528,6 @@ extern const u8 controlKeys[];
return false;
}
extern "C" const u8 lbl_81616BD8[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 lbl_81616BE4[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
const u8 controlKeys[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,

View File

@@ -621,28 +621,28 @@ namespace ipl {
void BoardObject::set_thumb_text(const char* paneName, const wchar_t* thumbText) {
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(paneName));
wchar_t truncatedThumb[THUMB_TEXT_LENGTH + 3 /* "..." */ + 1 /* NULL */] = L"";
memset(truncatedThumb, 0, sizeof(truncatedThumb));
wchar_t local_28[THUMB_TEXT_LENGTH + 3 /* "..." */ + 1 /* NULL */] = L"";
memset(local_28, 0, sizeof(local_28));
if (thumbText != NULL) {
for (int i = 0; i < THUMB_TEXT_LENGTH + 1 && thumbText[i] != (u16)'\n'; i++) {
truncatedThumb[i] = thumbText[i];
local_28[i] = thumbText[i];
}
}
if (System::getRegion() == SC_PRODUCT_AREA_JPN) {
if (truncatedThumb[THUMB_TEXT_LENGTH] != 0) {
truncatedThumb[THUMB_TEXT_LENGTH + 0] = L'…';
if (local_28[THUMB_TEXT_LENGTH] != 0) {
local_28[THUMB_TEXT_LENGTH + 0] = L'…';
}
} else {
if (truncatedThumb[THUMB_TEXT_LENGTH] != 0) {
truncatedThumb[THUMB_TEXT_LENGTH + 2] = '.';
truncatedThumb[THUMB_TEXT_LENGTH + 1] = '.';
truncatedThumb[THUMB_TEXT_LENGTH + 0] = '.';
if (local_28[THUMB_TEXT_LENGTH] != 0) {
local_28[THUMB_TEXT_LENGTH + 2] = '.';
local_28[THUMB_TEXT_LENGTH + 1] = '.';
local_28[THUMB_TEXT_LENGTH + 0] = '.';
}
}
textBox->SetString(truncatedThumb);
textBox->SetString(local_28);
}
void BoardObject::update(int chan) {

View File

@@ -6,8 +6,8 @@
#include "iplSystem.h"
__declspec(section ".sdata") extern char scPaneName_B_Stop[];
extern char scPaneName_T_Stop[];
__declspec(section ".sdata") extern char lbl_816966F9[];
extern char lbl_816967B5[];
extern "C" BOOL push_button_queue(void*, const void*);
namespace ipl {
@@ -877,7 +877,7 @@ namespace ipl {
}
void OptOutButton::setText(u32 msgId) {
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(scPaneName_T_Stop));
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_816967B5));
textBox->SetString(System::getMessage(msgId));
}
@@ -890,7 +890,7 @@ namespace ipl {
}
void OptOutButton::start_point_event(const char* paneName, controller::Interface* con) {
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
if (strcmp(paneName, lbl_816966F9) == 0) {
if (mbHovered == FALSE) {
// Play hover in animation
mpLayout->getAnim(ANIM_OPT_OUT_FOCUS_IN)->play();
@@ -906,7 +906,7 @@ namespace ipl {
}
void OptOutButton::start_left_event(const char* paneName) {
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
if (strcmp(paneName, lbl_816966F9) == 0) {
if (mbHovered == TRUE) {
mpLayout->getAnim(ANIM_OPT_OUT_FOCUS_OUT)->play();
}
@@ -1005,4 +1005,4 @@ namespace ipl {
} // namespace scene
} // namespace ipl
char scPaneName_T_Stop[] = "T_Stop";
char lbl_816967B5[] = "T_Stop";

View File

@@ -35,8 +35,8 @@ namespace ipl {
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27))))));
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 = (mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) +
(mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
f32 temp_f3 = (unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) +
(unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
r.x += temp_f3;
r.y += temp_f3;
r.z += temp_f3;
@@ -51,8 +51,8 @@ namespace ipl {
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r += (mStartTangent * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (2.0f * var_f27 * var_f27))))) +
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (var_f27 * var_f27))));
r += (unkVal0 * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (2.0f * var_f27 * var_f27))))) +
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (var_f27 * var_f27))));
return r;
}
} // namespace math

View File

@@ -53,10 +53,16 @@ void iplContest_813D54F8(BOOL success, NAT nat);
void* IPLContestAlloc(int size);
void IPLContestFree(void* block, u32 _unused);
void sNHTTPReqCallback(int error, NHTTPResponse* httpRes);
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes);
void sNHTTPCleanupCallback();
void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy) {
char* pcVar1;
char cVar2;
char* pcVar3;
char* pcVar4;
int iVar5;
g_session.heapBuf = heapBuf;
g_session.heap = MEMCreateExpHeapEx(heapBuf, 0x10000, 0);
OSInitMutex(&g_session.mutex);
@@ -410,9 +416,9 @@ void IPLContestFree(void* block, u32 _unused) {
OSUnlockMutex(&g_session.mutex);
}
void sNHTTPReqCallback(int error, NHTTPResponse* httpRes) {
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) {
g_session.httpResponse = httpRes;
if (error == 0) {
if (param_1 == 0) {
switch (NHTTPGetResultCode(httpRes)) {
case 200: {
g_session.httpTestState = HTTP_TEST_RESPONSE_RECEIVED;
@@ -434,7 +440,7 @@ void sNHTTPReqCallback(int error, NHTTPResponse* httpRes) {
}
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
switch (error) {
switch (param_1) {
case 0x4: {
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52100;
break;

View File

@@ -234,10 +234,10 @@ namespace ipl {
OSReport("NUP region code : %s\n", productAreaString);
const char* isoCountryCode = SCUTILGetISOCountryCodeA2();
OSReport("NUP country code : %s\n", isoCountryCode);
int nupResult = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
int iVar8 = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
OSReport("NUP_Start()\n");
if (nupResult < 0) {
switch (nupResult) {
if (iVar8 < 0) {
switch (iVar8) {
case -5000: {
OSReport("FAIL ALLOC\n");
}
@@ -426,8 +426,8 @@ namespace ipl {
int val;
int len = 4;
if (SOGetInterfaceOpt(NULL, SO_SOL_CONFIG, SO_CONFIG_ERROR, &val, &len) == 0 && val == -111) {
int startupErr = NETGetStartupErrorCode(-111);
mNetSetupLastErr = (-startupErr / 100) * 100;
int iVar7 = NETGetStartupErrorCode(-111);
mNetSetupLastErr = (-iVar7 / 100) * 100;
mNetSetupLastErr = mNetSetup.getconntype();
}
Setting* settingScene = (Setting*)System::getScene(SCENE_SETTING);
@@ -451,6 +451,8 @@ namespace ipl {
}
void* NakamuraTest::conntestthread(void*) {
int iVar1;
IPLContestStart();
while (true) {
switch (IPLContestProcess()) {

View File

@@ -11,7 +11,7 @@ namespace ipl {
OSMutex NetSetup::sAllocLock;
NetSetup::StaticSOStartupInfo NetSetup::sSOStartupInfo;
void* NetSetup::iSOStartupEXThread(void* connType) {
void* NetSetup::iSOStartupEXThread(void* param_1) {
s32 cfgSetResult;
int soStartupRes;
SOInAddr soAddr;
@@ -61,7 +61,7 @@ namespace ipl {
soStartupRes = SOStartupEx(45000);
if (soStartupRes < 0) {
OSReport("[FAIL] SOStartup() failed.(%d)\n", soStartupRes);
soStartupRes = NETGetStartupErrorCodeEx(soStartupRes, (int)connType);
soStartupRes = NETGetStartupErrorCodeEx(soStartupRes, (int)param_1);
OSReport("<Error Code: %d>\n", -soStartupRes);
sSOStartupInfo.state = NET_SETUP_ERROR;
sSOStartupInfo.lastErr = -soStartupRes;

View File

@@ -78,8 +78,8 @@ namespace ipl {
int finish(NCDAossConfig* config, int* result);
void printInfo();
static void* aossAlloc(u32 id, s32 size);
static void aossFree(u32 id, void* ptr, s32 align);
static void* AOSSThread_813FCC8C(u32 id, s32 size);
static void AOSSThread_813FCCE4(u32 id, void* ptr, s32 align);
private:
s32 mState; // 0x32C
@@ -122,8 +122,8 @@ namespace ipl {
return 0;
}
config.alloc = aossAlloc;
config.free = aossFree;
config.alloc = AOSSThread_813FCC8C;
config.free = AOSSThread_813FCCE4;
BOOL level = OSDisableInterrupts();
@@ -144,7 +144,7 @@ namespace ipl {
return 1;
}
void* AOSSThread::aossAlloc(u32 id, s32 size) {
void* AOSSThread::AOSSThread_813FCC8C(u32 id, s32 size) {
void* buffer;
BOOL level = OSDisableInterrupts();
buffer = MEMAllocFromAllocator(&m_allocator, size);
@@ -152,7 +152,7 @@ namespace ipl {
return buffer;
}
void AOSSThread::aossFree(u32 id, void* ptr, s32 align) {
void AOSSThread::AOSSThread_813FCCE4(u32 id, void* ptr, s32 align) {
BOOL level = OSDisableInterrupts();
MEMFreeToAllocator(&m_allocator, ptr);
OSRestoreInterrupts(level);
@@ -162,7 +162,7 @@ namespace ipl {
mState = 0xF;
AOSS_SetCallback(USBAPThread::callback);
if (AOSSi_InitLocal(aossAlloc, aossFree) == -1) {
if (AOSSi_InitLocal(AOSSThread_813FCC8C, AOSSThread_813FCCE4) == -1) {
return this;
}

View File

@@ -459,48 +459,48 @@ namespace ipl {
}
void NCDSetting::setWDPrivacyMode(u16 mode) {
u16 privacyMode;
u16 uVar1;
switch (mode) {
case 0: {
privacyMode = 0;
uVar1 = 0;
break;
}
case 1: {
privacyMode = 1;
uVar1 = 1;
break;
}
case 2: {
privacyMode = 2;
uVar1 = 2;
break;
}
case 4: {
privacyMode = 4;
uVar1 = 4;
break;
}
case 5: {
privacyMode = 5;
uVar1 = 5;
break;
}
case 6: {
privacyMode = 6;
uVar1 = 6;
break;
}
case 7: {
privacyMode = 4;
uVar1 = 4;
break;
}
case 8: {
privacyMode = 1;
uVar1 = 1;
break;
}
default: {
privacyMode = 0;
uVar1 = 0;
break;
}
}
memset(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep104, 0, 0x44);
mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = privacyMode;
mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = uVar1;
}
void NCDSetting::setPrivacy(u8* newKey, int len) {

View File

@@ -21,7 +21,7 @@
namespace ipl {
TVRCManager* TVRCManager::m_handle;
int sTvrcStartDelay = 0;
int lbl_8169877C = 0;
TVRCManager::TVRCManager(EGG::Heap* heap) : mbInitialized(FALSE), mpDBFile(NULL), mbResetting(FALSE), mbPrepTVRC(FALSE), mState(STATE_0) {
/* TV model for testing at EAD? */
@@ -280,17 +280,17 @@ namespace ipl {
case STATE_3: {
if (!snd::getSystem()->isSEActive(HOMESE_GOTO_MENU)) {
snd::getSystem()->pauseOnBGM();
sTvrcStartDelay = 5;
lbl_8169877C = 5;
mState = STATE_4;
}
break;
}
case STATE_4: {
if (mbResetting) {
sTvrcStartDelay = 0;
lbl_8169877C = 0;
}
if (--sTvrcStartDelay <= 0 && !snd::getSystem()->isSEActive(HOMESE_GOTO_MENU)) {
if (--lbl_8169877C <= 0 && !snd::getSystem()->isSEActive(HOMESE_GOTO_MENU)) {
snd_shutup(TRUE);
if (IS_ENABLED && !TVRCIsActive()) {
TVRCSendStartAsync(trans_cmd(mCurrentCommand));

View File

@@ -46,12 +46,12 @@ namespace ipl {
public:
HermiteIntp() {}
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
mStart = start;
mEnd = end;
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
mStartTangent = startTangent;
mEndTangent = endTangent;
unkVal0 = param_5;
unkVal1 = param_6;
}
T get() const {
@@ -64,11 +64,11 @@ namespace ipl {
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r +=
(mStartTangent *
(unkVal0 *
(var_f27 +
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (2.0f * var_f27 * var_f27))))) +
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (var_f27 * var_f27))));
return r;
@@ -77,8 +77,8 @@ namespace ipl {
protected:
T mStart;
T mEnd;
f32 mStartTangent;
f32 mEndTangent;
f32 unkVal0;
f32 unkVal1;
};
}
}