Compare commits
3 Commits
cleanup/sy
...
matcher/NH
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
52d36a1840 | ||
|
|
feb7ba400d | ||
|
|
20f4af8beb |
@@ -20107,12 +20107,12 @@ gDBCommTable = .data:0x816943C8; // type:object size:0x28
|
||||
lbl_81694410 = .sdata2:0x81694410; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694418 = .sdata2:0x81694418; // type:object size:0x8 align:8 data:double
|
||||
lbl_81694420 = .sdata2:0x81694420; // type:object size:0x4 align:4 data:float
|
||||
scOrthoLeft = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
|
||||
scOrthoRight = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
|
||||
scOrthoBottom = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
|
||||
scOrthoTop = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
|
||||
scWideOrthoLeft = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
|
||||
scWideOrthoRight = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694424 = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694428 = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
|
||||
lbl_8169442C = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694430 = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694434 = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694438 = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694440 = .sdata2:0x81694440; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694444 = .sdata2:0x81694444; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694448 = .sdata2:0x81694448; // type:object size:0x8 align:8 data:double
|
||||
|
||||
@@ -371,9 +371,9 @@ static BOOL NHTTPi_RecvProxyConnectHeader(NHTTPThreadContext* context)
|
||||
response->httpStatus = NHTTPi_strToInt(header + 9, 3);
|
||||
if (NHTTPi_strnicmp(header, "HTTP/", 5) == 0 && header[8] == ' '
|
||||
&& response->httpStatus == 200) accepted = TRUE;
|
||||
ended = FALSE;
|
||||
cursor = header;
|
||||
index = 0;
|
||||
ended = FALSE;
|
||||
while (index < used)
|
||||
{
|
||||
if (index > 1 && cursor[-1] == '\r' && *cursor == '\r') ended = TRUE;
|
||||
|
||||
@@ -53,16 +53,10 @@ void iplContest_813D54F8(BOOL success, NAT nat);
|
||||
void* IPLContestAlloc(int size);
|
||||
void IPLContestFree(void* block, u32 _unused);
|
||||
|
||||
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes);
|
||||
void sNHTTPReqCallback(int error, 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);
|
||||
@@ -416,9 +410,9 @@ void IPLContestFree(void* block, u32 _unused) {
|
||||
OSUnlockMutex(&g_session.mutex);
|
||||
}
|
||||
|
||||
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) {
|
||||
void sNHTTPReqCallback(int error, NHTTPResponse* httpRes) {
|
||||
g_session.httpResponse = httpRes;
|
||||
if (param_1 == 0) {
|
||||
if (error == 0) {
|
||||
switch (NHTTPGetResultCode(httpRes)) {
|
||||
case 200: {
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_RECEIVED;
|
||||
@@ -440,7 +434,7 @@ void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) {
|
||||
}
|
||||
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
|
||||
switch (param_1) {
|
||||
switch (error) {
|
||||
case 0x4: {
|
||||
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52100;
|
||||
break;
|
||||
|
||||
@@ -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 iVar8 = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
|
||||
int nupResult = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
|
||||
OSReport("NUP_Start()\n");
|
||||
if (iVar8 < 0) {
|
||||
switch (iVar8) {
|
||||
if (nupResult < 0) {
|
||||
switch (nupResult) {
|
||||
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 iVar7 = NETGetStartupErrorCode(-111);
|
||||
mNetSetupLastErr = (-iVar7 / 100) * 100;
|
||||
int startupErr = NETGetStartupErrorCode(-111);
|
||||
mNetSetupLastErr = (-startupErr / 100) * 100;
|
||||
mNetSetupLastErr = mNetSetup.getconntype();
|
||||
}
|
||||
Setting* settingScene = (Setting*)System::getScene(SCENE_SETTING);
|
||||
@@ -451,8 +451,6 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void* NakamuraTest::conntestthread(void*) {
|
||||
int iVar1;
|
||||
|
||||
IPLContestStart();
|
||||
while (true) {
|
||||
switch (IPLContestProcess()) {
|
||||
|
||||
@@ -39,12 +39,12 @@
|
||||
extern "C" ipl::System::Arg smArg__Q23ipl6System;
|
||||
extern "C" ipl::snd::System sSystem__Q23ipl3snd;
|
||||
extern "C" void initOnMemory__Q33ipl3snd6SystemFPCvPQ23EGG4HeapUl();
|
||||
extern "C" const f32 scOrthoLeft;
|
||||
extern "C" const f32 scOrthoRight;
|
||||
extern "C" const f32 scOrthoBottom;
|
||||
extern "C" const f32 scOrthoTop;
|
||||
extern "C" const f32 scWideOrthoLeft;
|
||||
extern "C" const f32 scWideOrthoRight;
|
||||
extern "C" const f32 lbl_81694424;
|
||||
extern "C" const f32 lbl_81694428;
|
||||
extern "C" const f32 lbl_8169442C;
|
||||
extern "C" const f32 lbl_81694430;
|
||||
extern "C" const f32 lbl_81694434;
|
||||
extern "C" const f32 lbl_81694438;
|
||||
extern "C" void* m_handle__Q23ipl11TVRCManager;
|
||||
extern "C" void _savegpr_27();
|
||||
extern "C" void _restgpr_27();
|
||||
@@ -1139,7 +1139,7 @@ namespace ipl {
|
||||
bl VISetBlack
|
||||
lwz r3, 0xb0(r28)
|
||||
li r0, 1
|
||||
lfd f31, scOrthoLeft-0xc
|
||||
lfd f31, lbl_81694424-0xc
|
||||
lis r30, 0x4330
|
||||
lbz r29, 0x3d(r3)
|
||||
lis r31, sSystem__Q23ipl3snd@ha
|
||||
@@ -1162,7 +1162,7 @@ namespace ipl {
|
||||
bl makeRawData__Q33ipl7utility11JpegDecoderFv
|
||||
warning_run_no_jpeg:
|
||||
lwz r3, 0x74(r28)
|
||||
lfs f1, scOrthoLeft-0x14
|
||||
lfs f1, lbl_81694424-0x14
|
||||
lwz r27, 0(r3)
|
||||
stw r30, 8(r1)
|
||||
fmr f2, f1
|
||||
@@ -1170,7 +1170,7 @@ namespace ipl {
|
||||
fmr f5, f1
|
||||
lhz r0, 6(r27)
|
||||
stw r3, 0xc(r1)
|
||||
lfs f6, scOrthoLeft-0x4
|
||||
lfs f6, lbl_81694424-0x4
|
||||
lfd f0, 8(r1)
|
||||
stw r0, 0x14(r1)
|
||||
fsubs f3, f0, f31
|
||||
@@ -1362,17 +1362,17 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void System::getProjectionRect4x3(nw4r::ut::Rect* rect) {
|
||||
rect->left = *((volatile const f32*)&scOrthoLeft);
|
||||
rect->right = *((volatile const f32*)&scOrthoRight);
|
||||
rect->bottom = *((volatile const f32*)&scOrthoBottom);
|
||||
rect->top = *((volatile const f32*)&scOrthoTop);
|
||||
rect->left = *((volatile const f32*)&lbl_81694424);
|
||||
rect->right = *((volatile const f32*)&lbl_81694428);
|
||||
rect->bottom = *((volatile const f32*)&lbl_8169442C);
|
||||
rect->top = *((volatile const f32*)&lbl_81694430);
|
||||
}
|
||||
|
||||
void System::getProjectionRect16x9(nw4r::ut::Rect* rect) {
|
||||
rect->left = *((volatile const f32*)&scWideOrthoLeft);
|
||||
rect->right = *((volatile const f32*)&scWideOrthoRight);
|
||||
rect->bottom = *((volatile const f32*)&scOrthoBottom);
|
||||
rect->top = *((volatile const f32*)&scOrthoTop);
|
||||
rect->left = *((volatile const f32*)&lbl_81694434);
|
||||
rect->right = *((volatile const f32*)&lbl_81694438);
|
||||
rect->bottom = *((volatile const f32*)&lbl_8169442C);
|
||||
rect->top = *((volatile const f32*)&lbl_81694430);
|
||||
}
|
||||
|
||||
GXRenderModeObj* System::getRenderModeObj() {
|
||||
@@ -1516,11 +1516,11 @@ namespace ipl {
|
||||
|
||||
#ifdef __MWERKS__
|
||||
#pragma force_active on
|
||||
extern "C" const f32 scOrthoLeft = -304.0f;
|
||||
extern "C" const f32 scOrthoRight = 304.0f;
|
||||
extern "C" const f32 scOrthoBottom = 228.0f;
|
||||
extern "C" const f32 scOrthoTop = -228.0f;
|
||||
extern "C" const f32 scWideOrthoLeft = -416.0f;
|
||||
extern "C" const f32 scWideOrthoRight = 416.0f;
|
||||
extern "C" const f32 lbl_81694424 = -304.0f;
|
||||
extern "C" const f32 lbl_81694428 = 304.0f;
|
||||
extern "C" const f32 lbl_8169442C = 228.0f;
|
||||
extern "C" const f32 lbl_81694430 = -228.0f;
|
||||
extern "C" const f32 lbl_81694434 = -416.0f;
|
||||
extern "C" const f32 lbl_81694438 = 416.0f;
|
||||
#pragma force_active off
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user