Compare commits
27 Commits
cleanup/ip
...
cleanup/ip
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f00aad57c9 | ||
|
|
f7b1b9b09b | ||
|
|
fcbc0c56b7 | ||
|
|
ab8bece04e | ||
|
|
0059de422f | ||
|
|
413c779180 | ||
|
|
f9ecefa6a2 | ||
|
|
320700d49b | ||
|
|
c52153e9f7 | ||
|
|
899438ff02 | ||
|
|
8476c93f00 | ||
|
|
9b375e1e50 | ||
|
|
73795cb3fb | ||
|
|
0c780f6d1f | ||
|
|
63f4c7aeab | ||
|
|
282ddd99b7 | ||
|
|
c7d0f8f01b | ||
|
|
414b553743 | ||
|
|
da96c27969 | ||
|
|
0a925c7053 | ||
|
|
c0126c37d4 | ||
|
|
fc2d150c6d | ||
|
|
7851b2b29f | ||
|
|
263411ccac | ||
|
|
09de907f0b | ||
|
|
4e3ab6eae5 | ||
|
|
99d6fe20a2 |
@@ -18,11 +18,11 @@ namespace ipl {
|
||||
|
||||
class line_collision {
|
||||
public:
|
||||
line_collision() : unk_0x00(0.0f), unk_0x04(0.0f), unk_0x08(0.0f) {}
|
||||
line_collision() : mLeft(0.0f), mRight(0.0f), mY(0.0f) {}
|
||||
|
||||
f32 unk_0x00;
|
||||
f32 unk_0x04;
|
||||
f32 unk_0x08;
|
||||
f32 mLeft;
|
||||
f32 mRight;
|
||||
f32 mY;
|
||||
nw4r::ut::Link mLinkList; // 0x0C
|
||||
};
|
||||
|
||||
@@ -31,9 +31,9 @@ namespace ipl {
|
||||
url_collision();
|
||||
~url_collision();
|
||||
|
||||
int unk_0x00;
|
||||
wchar_t* unk_0x04;
|
||||
wchar_t* unk_0x08;
|
||||
int mTagNo;
|
||||
wchar_t* mpStart;
|
||||
wchar_t* mpEnd;
|
||||
nw4r::ut::Link mLinkList; // 0x0C
|
||||
nw4r::ut::List mLineCollisions; // 0x14
|
||||
};
|
||||
@@ -53,19 +53,19 @@ namespace ipl {
|
||||
void parse(nw4r::ut::PrintContext<wchar_t>* context);
|
||||
|
||||
BOOL is_focused() const;
|
||||
void select(int unk);
|
||||
void select(int tagNo);
|
||||
|
||||
int get_focused_tagno(int chan) const;
|
||||
url_collision* get_selected_col();
|
||||
|
||||
void get_url(char* urlOut, u32 urlLen);
|
||||
|
||||
void setUnk_0x40(f32 val) { unk_0x40 = val; }
|
||||
void setUnk_0x44(f32 val) { unk_0x44 = val; }
|
||||
void setUnk_0x53(bool val) { unk_0x53 = val; }
|
||||
void setHitYOffset(f32 val) { mHitYOffset = val; }
|
||||
void setMemoTranslateY(f32 val) { mMemoTranslateY = val; }
|
||||
void setFocusEnabled(bool val) { mbFocusEnabled = val; }
|
||||
|
||||
u8 getUnk_0x50() const { return unk_0x50; }
|
||||
void setUnk_0x50(u8 val) { unk_0x50 = val; }
|
||||
u8 getColorPass() const { return mbColorPass; }
|
||||
void setColorPass(u8 val) { mbColorPass = val; }
|
||||
|
||||
private:
|
||||
typedef struct {
|
||||
@@ -75,14 +75,14 @@ namespace ipl {
|
||||
|
||||
con_data mConData[WPAD_MAX_CONTROLLERS]; // 0x00
|
||||
nw4r::ut::List mUrlCollisions; // 0x34
|
||||
f32 unk_0x40;
|
||||
f32 unk_0x44;
|
||||
int unk_0x48;
|
||||
int unk_0x4C;
|
||||
u8 unk_0x50;
|
||||
u8 unk_0x51;
|
||||
u8 unk_0x52;
|
||||
u8 unk_0x53;
|
||||
f32 mHitYOffset;
|
||||
f32 mMemoTranslateY;
|
||||
int mCurTagNo;
|
||||
int mSelectedTagNo;
|
||||
u8 mbColorPass;
|
||||
u8 mbInTag;
|
||||
u8 mbHoverOffset;
|
||||
u8 mbFocusEnabled;
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -259,8 +259,8 @@ namespace ipl {
|
||||
|
||||
f32 mChanThumbOff_X; // 0xD0
|
||||
f32 mChanThumbOff_Y; // 0xD4
|
||||
math::VEC3 unk_0xD8;
|
||||
math::VEC2 unk_0xE4;
|
||||
math::VEC3 mOrthoTrans;
|
||||
math::VEC2 mOrthoScale;
|
||||
f32 mScaleAdjust; // 0xEC
|
||||
|
||||
int mDiskState; // 0xF0
|
||||
|
||||
@@ -185,8 +185,8 @@ namespace ipl {
|
||||
gui::PaneManager* mpGui; // 0x74
|
||||
|
||||
BOOL mbHovered[BTN_MAX]; // 0x78
|
||||
u32 unk_0x90;
|
||||
u32 unk_0x94;
|
||||
u32 mPendingSceneId;
|
||||
u32 mExitSeqStep;
|
||||
|
||||
static const char* smButtonName[BTN_MAX];
|
||||
};
|
||||
|
||||
@@ -118,26 +118,26 @@ namespace ipl {
|
||||
public:
|
||||
Base(int chan, KPADStatus& status) {
|
||||
mButton = 0;
|
||||
unk_0x08 = 0;
|
||||
mDecideHoldCount = 0;
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
mChan = chan;
|
||||
mType = 2;
|
||||
unk_0x1C = 0;
|
||||
mbForceInvalid = 0;
|
||||
KPADEnableDPD(chan);
|
||||
unk_0x1D = 0;
|
||||
unk_0x1E = 0;
|
||||
unk_0x20 = &status;
|
||||
mbPinching = 0;
|
||||
mbWasPinching = 0;
|
||||
mpKpadStatus = &status;
|
||||
}
|
||||
|
||||
Base(int chan, int type, KPADStatus& status) {
|
||||
mButton = 0;
|
||||
unk_0x08 = 0;
|
||||
mDecideHoldCount = 0;
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
mChan = chan;
|
||||
mType = type;
|
||||
unk_0x1C = 0;
|
||||
mbForceInvalid = 0;
|
||||
KPADEnableDPD(chan);
|
||||
}
|
||||
|
||||
@@ -152,15 +152,15 @@ namespace ipl {
|
||||
|
||||
protected:
|
||||
u8 mButton;
|
||||
u32 unk_0x08;
|
||||
u32 mDecideHoldCount;
|
||||
OSTick mLastRumbleTime;
|
||||
s32 mRumbleType;
|
||||
u32 mChan;
|
||||
u32 mType;
|
||||
u8 unk_0x1C;
|
||||
u8 unk_0x1D;
|
||||
u8 unk_0x1E;
|
||||
KPADStatus* unk_0x20;
|
||||
u8 mbForceInvalid;
|
||||
u8 mbPinching;
|
||||
u8 mbWasPinching;
|
||||
KPADStatus* mpKpadStatus;
|
||||
};
|
||||
|
||||
class Revolution : public Base {
|
||||
@@ -206,8 +206,8 @@ namespace ipl {
|
||||
virtual BOOL isValidDpdClassic() const;
|
||||
|
||||
private:
|
||||
math::VEC2 unk_0x24;
|
||||
int unk_0x2C;
|
||||
math::VEC2 mClassicCursorPos;
|
||||
int mClassicCursorTimer;
|
||||
};
|
||||
|
||||
class Master : public Interface {
|
||||
@@ -264,18 +264,18 @@ namespace ipl {
|
||||
public:
|
||||
Base(int chan, KPADStatus& arg1) {
|
||||
mButton = 0;
|
||||
unk_0x08 = 0;
|
||||
mDecideHoldCount = 0;
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
mChan = chan;
|
||||
mType = 2;
|
||||
unk_0x1C = 0;
|
||||
mbForceInvalid = 0;
|
||||
|
||||
KPADEnableDPD(chan);
|
||||
|
||||
unk_0x1D = 0;
|
||||
unk_0x1E = 0;
|
||||
unk_0x20 = &arg1;
|
||||
mbPinching = 0;
|
||||
mbWasPinching = 0;
|
||||
mpKpadStatus = &arg1;
|
||||
}
|
||||
|
||||
virtual ~Base(); // 0x08
|
||||
@@ -326,15 +326,15 @@ namespace ipl {
|
||||
|
||||
// protected:
|
||||
u8 mButton; // 0x4
|
||||
u32 unk_0x08; // 0x8
|
||||
u32 mDecideHoldCount; // 0x8
|
||||
OSTick mLastRumbleTime; // 0xC
|
||||
s32 mRumbleType; // 0x10
|
||||
u32 mChan; // 0x14
|
||||
u32 mType; // 0x18
|
||||
u8 unk_0x1C;
|
||||
u8 unk_0x1D; // 0x1D
|
||||
u8 unk_0x1E; // 0x1E
|
||||
KPADStatus* unk_0x20; // 0x20
|
||||
u8 mbForceInvalid;
|
||||
u8 mbPinching; // 0x1D
|
||||
u8 mbWasPinching; // 0x1E
|
||||
KPADStatus* mpKpadStatus; // 0x20
|
||||
};
|
||||
|
||||
class Interface : public Base {
|
||||
@@ -446,8 +446,8 @@ namespace ipl {
|
||||
virtual BOOL isValidDpdClassic() const; // 0x8C
|
||||
|
||||
private:
|
||||
math::VEC2 unk_0x24;
|
||||
int unk_0x2C;
|
||||
math::VEC2 mClassicCursorPos;
|
||||
int mClassicCursorTimer;
|
||||
};
|
||||
|
||||
class Manager {
|
||||
|
||||
@@ -60,9 +60,9 @@ namespace ipl {
|
||||
|
||||
int mMessageID; // 0x08
|
||||
|
||||
int unk_0x0C;
|
||||
int unk_0x10;
|
||||
char unk_0x14[4];
|
||||
int mArg2;
|
||||
int mArg3;
|
||||
char mArg1[4];
|
||||
|
||||
u8* mpArcData; // 0x18
|
||||
u32 mArcSize; // 0x1C
|
||||
|
||||
@@ -139,7 +139,7 @@ namespace ipl {
|
||||
|
||||
bool received() { return mbReviecedMsg; }
|
||||
void prepNextReceive() { mbReviecedMsg = false; }
|
||||
volatile bool isUnk0xA31() { return unk_0xA31 == false; }
|
||||
volatile bool isReceivingIdle() { return mbReceiving == false; }
|
||||
|
||||
BOOL isAppDlEnableLock(u32 appId) {
|
||||
utility::autoMutexLock lock(mAutoLock);
|
||||
@@ -175,9 +175,9 @@ namespace ipl {
|
||||
OSMutex mAutoLock; // 0xA18
|
||||
|
||||
bool mbReviecedMsg;
|
||||
bool unk_0xA31;
|
||||
bool mbReceiving;
|
||||
bool mbReceivePaused; // 0xA32
|
||||
bool unk_0xA33;
|
||||
bool mbNewTitleTblReady;
|
||||
|
||||
static Arg smArg;
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ typedef struct {
|
||||
u8 mcuYRem; // 0x0F
|
||||
u16 mcuYCount; // 0x10
|
||||
u16 mcuXCount2; // 0x12
|
||||
u32 unk_0x14;
|
||||
u32 mcuTotal; // 0x14
|
||||
u8 remX; // 0x18
|
||||
u8 remY; // 0x19
|
||||
u8 compCount; // 0x1A
|
||||
@@ -142,7 +142,7 @@ struct TMCCJPEGDecWork_t {
|
||||
u8 mcuYRem; // 0x17FF
|
||||
u16 mcuYCount; // 0x1800
|
||||
u16 mcuXCount2; // 0x1802
|
||||
u32 unk_0x1804;
|
||||
u32 mcuTotal; // 0x1804
|
||||
u8 remX; // 0x1808
|
||||
u8 remY; // 0x1809
|
||||
u8 compCount; // 0x180A
|
||||
|
||||
@@ -51,7 +51,7 @@ s32 TMCJPEGDEC_Setsize(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
|
||||
state->componentCount = work->componentCount;
|
||||
state->result = work->unk_0x1804;
|
||||
state->result = work->mcuTotal;
|
||||
state->maxX = work->mcuYCount;
|
||||
state->maxY = work->mcuXCount2;
|
||||
|
||||
|
||||
@@ -567,7 +567,7 @@ s32 TMCJPEGDEC_scan_varinit(TMCCJPEGDecWork* work) {
|
||||
|
||||
p->mcuYCount = p->mcuYCount + ((u8)remX != 0 ? 1 : 0);
|
||||
p->mcuXCount2 = p->mcuXCount2 + ((u8)remY != 0 ? 1 : 0);
|
||||
p->unk_0x14 = (u32)p->mcuYCount * (u32)p->mcuXCount2;
|
||||
p->mcuTotal = (u32)p->mcuYCount * (u32)p->mcuXCount2;
|
||||
|
||||
for (idx = 0; idx < (s32)p->scanCompCount; idx++) {
|
||||
u8 compId;
|
||||
@@ -1929,7 +1929,7 @@ static s32 TMCJPEGDEC_parse_sof(TMCCJPEGDecWork* work) {
|
||||
mcuCountY += yr;
|
||||
frameInfo->mcuYCount = mcuCountX;
|
||||
frameInfo->mcuXCount2 = mcuCountY;
|
||||
work->unk_0x1804 = (u32)mcuCountX * (u32)mcuCountY;
|
||||
work->mcuTotal = (u32)mcuCountX * (u32)mcuCountY;
|
||||
}
|
||||
|
||||
compCount2 = frameInfo->compCount;
|
||||
|
||||
@@ -210,7 +210,7 @@ struct __zi8_work_data_s {
|
||||
ziLanguageEntry* langEntries; // 0x04
|
||||
ziU8 unk_0x08;
|
||||
ziU8 unk_0x09;
|
||||
ziU8 unk_0x0A;
|
||||
ziU8 maxWordLength;
|
||||
ziU8 unk_0x0B;
|
||||
ziU32 unk_0x0C;
|
||||
ziU32 unk_0x10;
|
||||
@@ -265,22 +265,22 @@ struct __zi8_work_data_s {
|
||||
ziPtr unk_0x11FC;
|
||||
ziPtr userKeys[0x83]; // 0x1200
|
||||
ziU8 unk_0x140C[4];
|
||||
ziU32 unk_0x1410;
|
||||
ziU32 formats; // 0x1410
|
||||
ziU8 unk_0x1414[4];
|
||||
ziU8 unk_0x1418;
|
||||
ziU8 formatCount;
|
||||
ziU8 unk_0x1419;
|
||||
ziU16 unk_0x141A;
|
||||
ziU16 capacity; // 0x141A
|
||||
ziU8 unk_0x141C;
|
||||
ziU8 unk_0x141D;
|
||||
ziU8 unk_0x141E;
|
||||
ziU8 unk_0x141F;
|
||||
ziU8 graphTableId; // 0x141E
|
||||
ziU8 maxCnt; // 0x141F
|
||||
ziU8 unk_0x1420[4];
|
||||
zi8DawgCtx dawgCtx; // 0x1424
|
||||
ziU8 unk_0x1760[4]; // 0x1760
|
||||
ziU8* unk_0x1764; // 0x1764
|
||||
ziU8* groupPtr; // 0x1764
|
||||
ziU8 unk_0x1768;
|
||||
ziU8 unk_0x1769[0x81];
|
||||
ziU16 unk_0x17EA;
|
||||
ziU16 matchOffset; // 0x17EA
|
||||
ziU8 unk_0x17EC;
|
||||
ziU8 unk_0x17ED[3];
|
||||
ziU8* dawgGroup; // 0x17F0
|
||||
@@ -321,7 +321,7 @@ struct __zi8_work_data_s {
|
||||
struct {
|
||||
ziU32 msb : 1;
|
||||
} bits;
|
||||
} unk_0x1B28;
|
||||
} pyFuzzy; // 0x1B28
|
||||
union {
|
||||
ziU32 word;
|
||||
struct {
|
||||
|
||||
@@ -577,27 +577,27 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
|
||||
if (getMode == 1) {
|
||||
switch ((int)match.phon2[index] >> 9) {
|
||||
case 24: case 25:
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B28.word)->cANDch) ordinalIndex = 0xFDFF;
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->pyFuzzy.word)->cANDch) ordinalIndex = 0xFDFF;
|
||||
break;
|
||||
case 26: case 27:
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B28.word)->sANDsh) ordinalIndex = 0xFDFF;
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->pyFuzzy.word)->sANDsh) ordinalIndex = 0xFDFF;
|
||||
break;
|
||||
case 28: case 29:
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B28.word)->zANDzh) ordinalIndex = 0xFDFF;
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->pyFuzzy.word)->zANDzh) ordinalIndex = 0xFDFF;
|
||||
break;
|
||||
case 56: case 59:
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B28.word)->fANDh) ordinalIndex = 0xF9FF;
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->pyFuzzy.word)->fANDh) ordinalIndex = 0xF9FF;
|
||||
break;
|
||||
case 38:
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B28.word)->nANDl) ordinalIndex = 0xE5FF;
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->pyFuzzy.word)->nANDl) ordinalIndex = 0xE5FF;
|
||||
break;
|
||||
case 43:
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B28.word)->nANDl && ((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B28.word)->lANDr) ordinalIndex = 0xE1FF;
|
||||
else if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B28.word)->lANDr) ordinalIndex = 0xF1FF;
|
||||
else if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B28.word)->nANDl) ordinalIndex = 0xE5FF;
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->pyFuzzy.word)->nANDl && ((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->pyFuzzy.word)->lANDr) ordinalIndex = 0xE1FF;
|
||||
else if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->pyFuzzy.word)->lANDr) ordinalIndex = 0xF1FF;
|
||||
else if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->pyFuzzy.word)->nANDl) ordinalIndex = 0xE5FF;
|
||||
break;
|
||||
case 44:
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B28.word)->lANDr) ordinalIndex = 0xF1FF;
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->pyFuzzy.word)->lANDr) ordinalIndex = 0xF1FF;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
@@ -650,13 +650,13 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
|
||||
if (getMode == 1) {
|
||||
switch (match.phon2[index] & 0x1F0) {
|
||||
case 0x10: case 0x80: case 0x100:
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B28.word)->anANDang) ordinalIndex = 0xFFF7;
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->pyFuzzy.word)->anANDang) ordinalIndex = 0xFFF7;
|
||||
break;
|
||||
case 0x180:
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B28.word)->enANDeng) ordinalIndex = 0xFFF7;
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->pyFuzzy.word)->enANDeng) ordinalIndex = 0xFFF7;
|
||||
break;
|
||||
case 0x60:
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B28.word)->inANDing) ordinalIndex = 0xFFF7;
|
||||
if (((ziFuzzyPYPairs*)&((struct __zi8_work_data_s*)work)->pyFuzzy.word)->inANDing) ordinalIndex = 0xFFF7;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -39,10 +39,10 @@ ziU32 Zi8MatchROMdata0(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
}
|
||||
if (mode == 1) acceptPrefix = 0;
|
||||
} else {
|
||||
if (ZI_WORK->unk_0x141E != 0 && graphTable == 0xc &&
|
||||
Zi8GetTableSize(language, ZI_WORK->unk_0x141E, ZI_WORK) != 0) {
|
||||
graphData = (ziU8*)Zi8GetTableAddress(language, ZI_WORK->unk_0x141E, ZI_WORK);
|
||||
keyTable = ZI_WORK->unk_0x141E + 1;
|
||||
if (ZI_WORK->graphTableId != 0 && graphTable == 0xc &&
|
||||
Zi8GetTableSize(language, ZI_WORK->graphTableId, ZI_WORK) != 0) {
|
||||
graphData = (ziU8*)Zi8GetTableAddress(language, ZI_WORK->graphTableId, ZI_WORK);
|
||||
keyTable = ZI_WORK->graphTableId + 1;
|
||||
} else {
|
||||
if (Zi8GetTableSize(language, graphTable, ZI_WORK) == 0) {
|
||||
Zi8LogError(0x961, ZI_WORK);
|
||||
@@ -136,7 +136,7 @@ descend:
|
||||
records[context->cnt].node = ZiDAWGGetChild(records[context->cnt - 1].node);
|
||||
if (records[context->cnt].node == (ziU8*)0) goto next_sibling;
|
||||
context->cnt++;
|
||||
if (ZI_WORK->unk_0x141F < context->cnt) ZI_WORK->unk_0x141F = context->cnt;
|
||||
if (ZI_WORK->maxCnt < context->cnt) ZI_WORK->maxCnt = context->cnt;
|
||||
goto update_current;
|
||||
next_sibling:
|
||||
while (context->cnt != 0) {
|
||||
@@ -184,36 +184,36 @@ unsigned int Zi8MatchROMdata1(ziWChar *elements, ziU8 count, ziU8 language, ziWC
|
||||
|
||||
result = 0;
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x1764 = (ziU8*)group;
|
||||
if (ZI_WORK->unk_0x1764 == 0) {
|
||||
ZI_WORK->groupPtr = (ziU8*)group;
|
||||
if (ZI_WORK->groupPtr == 0) {
|
||||
if (Zi8GetTableSize(language & 0xff,0xb,ZI_WORK) != 0) {
|
||||
ZI_WORK->unk_0x1764 = (ziU8*)(tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK));
|
||||
ZI_WORK->groupPtr = (ziU8*)(tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK));
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->unk_0x1764 != 0) {
|
||||
for (; (*ZI_WORK->unk_0x1764 != 0xff && ((groupIndex & 0xff) != 0));
|
||||
if (ZI_WORK->groupPtr != 0) {
|
||||
for (; (*ZI_WORK->groupPtr != 0xff && ((groupIndex & 0xff) != 0));
|
||||
groupIndex = groupIndex - 1) {
|
||||
while (*ZI_WORK->unk_0x1764 != 0xff) {
|
||||
ZI_WORK->unk_0x1764 += 2;
|
||||
while (*ZI_WORK->groupPtr != 0xff) {
|
||||
ZI_WORK->groupPtr += 2;
|
||||
}
|
||||
ZI_WORK->unk_0x1764++;
|
||||
ZI_WORK->groupPtr++;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->unk_0x1764 == 0) {
|
||||
if (ZI_WORK->groupPtr == 0) {
|
||||
result = Zi8MatchROMdata0(elements,count,language & 0xff,output,capacity & 0xffff,
|
||||
mode & 0xff,status & 0xff,0,1,acceptPrefix,0,&ZI_WORK->dawgCtx,
|
||||
ZI_WORK->unk_0x1760,ZI_WORK);
|
||||
}
|
||||
else {
|
||||
while (*ZI_WORK->unk_0x1764 != 0xff) {
|
||||
while (*ZI_WORK->groupPtr != 0xff) {
|
||||
result = Zi8MatchROMdata0(elements,count,language & 0xff,output,
|
||||
capacity & 0xffff,mode & 0xff,status & 0xff,
|
||||
*ZI_WORK->unk_0x1764,
|
||||
ZI_WORK->unk_0x1764[1],acceptPrefix,0,
|
||||
*ZI_WORK->groupPtr,
|
||||
ZI_WORK->groupPtr[1],acceptPrefix,0,
|
||||
&ZI_WORK->dawgCtx,ZI_WORK->unk_0x1760,ZI_WORK);
|
||||
if ((result & 0xff) != 0) break;
|
||||
ZI_WORK->unk_0x1764 += 2;
|
||||
ZI_WORK->groupPtr += 2;
|
||||
status = 0;
|
||||
}
|
||||
}
|
||||
@@ -230,31 +230,31 @@ unsigned int Zi8MatchROMdata2(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
if (reservedMode != 0) return 0;
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x1768 = 0;
|
||||
ZI_WORK->unk_0x17EA = 0;
|
||||
ZI_WORK->matchOffset = 0;
|
||||
if (group != 0 && *group == 0xc && language == 10 && ZI_WORK->unk_0x141C != 0) {
|
||||
ZI_WORK->unk_0x141E = 0x10;
|
||||
ZI_WORK->graphTableId = 0x10;
|
||||
} else {
|
||||
ZI_WORK->unk_0x141E = 0;
|
||||
ZI_WORK->graphTableId = 0;
|
||||
}
|
||||
}
|
||||
search_segment:
|
||||
ZI_WORK->unk_0x141F = 1;
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA,
|
||||
count - ZI_WORK->unk_0x17EA, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
ZI_WORK->maxCnt = 1;
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->matchOffset,
|
||||
count - ZI_WORK->matchOffset, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], capacity,
|
||||
mode, status, ZI_WORK->unk_0x1768, (char*)group,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) {
|
||||
for (index = (ziU8)(ZI_WORK->unk_0x17EA + result); index != 0; index--) {
|
||||
for (index = (ziU8)(ZI_WORK->matchOffset + result); index != 0; index--) {
|
||||
output[index - 1] = ZI_WORK->unk_0x17F4[index - 1];
|
||||
}
|
||||
result = (ziU8)(result + ZI_WORK->unk_0x17EA);
|
||||
result = (ziU8)(result + ZI_WORK->matchOffset);
|
||||
} else {
|
||||
if (status != 0 || count == 1) goto finish_segments;
|
||||
if (mode == 1 && ZI_WORK->unk_0x1768 == 0 &&
|
||||
(ziU8)Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA,
|
||||
count - ZI_WORK->unk_0x17EA, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
(ziU8)Zi8MatchROMdata1(elements + ZI_WORK->matchOffset,
|
||||
count - ZI_WORK->matchOffset, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], capacity,
|
||||
0, status, ZI_WORK->unk_0x1768, (char*)group,
|
||||
acceptPrefix, ZI_WORK) != 0) goto finish_segments;
|
||||
if ((Zi8GetTableCount(language, 0x1f, ZI_WORK) & 4) == 0) {
|
||||
@@ -262,25 +262,25 @@ search_segment:
|
||||
if (elements[index] == 0xeff1) goto finish_segments;
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->unk_0x141F > capacity) goto finish_segments;
|
||||
for (index = ZI_WORK->unk_0x141F; index != 0; index--) {
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA, index, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
if (ZI_WORK->maxCnt > capacity) goto finish_segments;
|
||||
for (index = ZI_WORK->maxCnt; index != 0; index--) {
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->matchOffset, index, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], capacity,
|
||||
1, 0, ZI_WORK->unk_0x1768, (char*)group,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) {
|
||||
ZI_WORK->unk_0x17EA += (ziU8)result;
|
||||
if (ZI_WORK->unk_0x17EA == count) return 0;
|
||||
ZI_WORK->matchOffset += (ziU8)result;
|
||||
if (ZI_WORK->matchOffset == count) return 0;
|
||||
ZI_WORK->unk_0x1768++;
|
||||
status = 0;
|
||||
ZI_WORK->unk_0x141E = 0;
|
||||
ZI_WORK->graphTableId = 0;
|
||||
if (ZI_WORK->dawgCtx.key == 0 && language == 10) {
|
||||
for (index = 0; index < ZI_WORK->unk_0x17EA; index++) {
|
||||
for (index = 0; index < ZI_WORK->matchOffset; index++) {
|
||||
switch (ZI_WORK->unk_0x17F4[index]) {
|
||||
case 0x61:
|
||||
case 0x6f:
|
||||
case 0x75:
|
||||
ZI_WORK->unk_0x141E = 0x10;
|
||||
ZI_WORK->graphTableId = 0x10;
|
||||
goto search_segment;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,9 +32,9 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
|
||||
ziBool Zi8ZHsetPYfuzzyPairs(ziFuzzyPYPairs pairs ZI_NEED_WORK) {
|
||||
if (pairs.ziDefault) {
|
||||
ZI_WORK->unk_0x1B28.word = *(const ziU32*)&Zi8PYdefaultFuzzyPairs;
|
||||
ZI_WORK->pyFuzzy.word = *(const ziU32*)&Zi8PYdefaultFuzzyPairs;
|
||||
} else {
|
||||
ZI_WORK->unk_0x1B28.word = *(ziU32*)&pairs;
|
||||
ZI_WORK->pyFuzzy.word = *(ziU32*)&pairs;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
@@ -50,11 +50,11 @@ ziBool Zi8ZHsetZYfuzzyPairs(ziFuzzyZYPairs pairs ZI_NEED_WORK) {
|
||||
|
||||
ziBool Zi8SetLatinSearchOrder(ziU8* searchArray, ziU8 searchSize ZI_NEED_WORK) {
|
||||
if (searchArray == 0 || *searchArray == 0) {
|
||||
ZI_WORK->unk_0x1410 = (ziU32)Zi8SOdefaultArray;
|
||||
ZI_WORK->unk_0x1418 = 9;
|
||||
ZI_WORK->formats = (ziU32)Zi8SOdefaultArray;
|
||||
ZI_WORK->formatCount = 9;
|
||||
} else {
|
||||
ZI_WORK->unk_0x1410 = (ziU32)searchArray;
|
||||
ZI_WORK->unk_0x1418 = searchSize;
|
||||
ZI_WORK->formats = (ziU32)searchArray;
|
||||
ZI_WORK->formatCount = searchSize;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
@@ -158,7 +158,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
length = length - parameters->firstCandidate;
|
||||
if (countOnly != 0) {
|
||||
parameters->letters = length;
|
||||
ZI_WORK->unk_0x0A = 0xff;
|
||||
ZI_WORK->maxWordLength = 0xff;
|
||||
return 1;
|
||||
}
|
||||
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
||||
@@ -175,7 +175,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
current = signatures.first;
|
||||
length = signatures.length;
|
||||
}
|
||||
if (length > ZI_WORK->unk_0x0A) length = ZI_WORK->unk_0x0A;
|
||||
if (length > ZI_WORK->maxWordLength) length = ZI_WORK->maxWordLength;
|
||||
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
||||
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
|
||||
length = parameters->elementCount;
|
||||
@@ -185,7 +185,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
if (parameters->letters == 2) {
|
||||
current = signatures.second;
|
||||
length = secondLength;
|
||||
if (length > ZI_WORK->unk_0x0A) length = ZI_WORK->unk_0x0A;
|
||||
if (length > ZI_WORK->maxWordLength) length = ZI_WORK->maxWordLength;
|
||||
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
||||
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
|
||||
length = parameters->elementCount;
|
||||
@@ -194,7 +194,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
*output++ = 0;
|
||||
}
|
||||
*output++ = 0;
|
||||
ZI_WORK->unk_0x0A = 0xff;
|
||||
ZI_WORK->maxWordLength = 0xff;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -226,7 +226,7 @@ static ziBool Zi8ZhSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED_WO
|
||||
length = length - parameters->firstCandidate;
|
||||
if (countOnly != 0) {
|
||||
parameters->letters = length;
|
||||
ZI_WORK->unk_0x0A = 0xff;
|
||||
ZI_WORK->maxWordLength = 0xff;
|
||||
return 1;
|
||||
}
|
||||
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
||||
@@ -279,13 +279,13 @@ static ziBool Zi8ZhSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED_WO
|
||||
|
||||
ziU8 _Zi8GetCandidates(ziGetParam* parameters ZI_NEED_WORK) {
|
||||
ZiCandidateOptions options = {0};
|
||||
options.capacity = ZI_WORK->unk_0x141A;
|
||||
options.capacity = ZI_WORK->capacity;
|
||||
return Zi8GetCandidatesOrCount(parameters, &options, ZI_WORK);
|
||||
}
|
||||
|
||||
ziU8 _Zi8CheckCandidates(ziGetParam* parameters ZI_NEED_WORK) {
|
||||
ZiCandidateOptions options = {0};
|
||||
options.capacity = ZI_WORK->unk_0x141A;
|
||||
options.capacity = ZI_WORK->capacity;
|
||||
options.flags = 1;
|
||||
return Zi8GetCandidatesOrCount(parameters, &options, ZI_WORK);
|
||||
}
|
||||
@@ -493,8 +493,8 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
ZI_WORK->subLanguage = parameters->subLanguage;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1,ZI_WORK) & 2;
|
||||
options->maxCount = ZI_WORK->unk_0x10;
|
||||
options->maxWordLength = ZI_WORK->unk_0x0A;
|
||||
ZI_WORK->unk_0x0A = -1;
|
||||
options->maxWordLength = ZI_WORK->maxWordLength;
|
||||
ZI_WORK->maxWordLength = -1;
|
||||
if ((ziU8)Zi8LangSupported(parameters->language,ZI_WORK) == 0) {
|
||||
Zi8LogError(0x163,ZI_WORK);
|
||||
return 0;
|
||||
@@ -711,6 +711,6 @@ void Zi8Memcpy(ziU8* destination, ziU8* source, ziS32 count) {
|
||||
}
|
||||
|
||||
ziBool Zi8SetMaxWordLength(ziU8 length ZI_NEED_WORK) {
|
||||
ZI_WORK->unk_0x0A = length;
|
||||
ZI_WORK->maxWordLength = length;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
Zi8Memset(__zi8_work_data, 0, 0x1B44);
|
||||
ZI_WORK->unk_0x08 = 1;
|
||||
ZI_WORK->unk_0x09 = 1;
|
||||
ZI_WORK->unk_0x0A = 0xFF;
|
||||
ZI_WORK->maxWordLength = 0xFF;
|
||||
ZI_WORK->unk_0x10 = 0x64;
|
||||
*(ziU16*)&ZI_WORK->unk_0x0C = 0xFFFF;
|
||||
ZI_WORK->separator = 0x20;
|
||||
@@ -44,17 +44,17 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
ZI_WORK->unk_0x1874 = 0x2D;
|
||||
ZI_WORK->language = 0;
|
||||
ZI_WORK->unk_0x1C[3] = 0;
|
||||
ZI_WORK->unk_0x141A = 0x100;
|
||||
ZI_WORK->capacity = 0x100;
|
||||
Zi8SetLatinSearchOrder(0, 0, ZI_WORK);
|
||||
ZADP_Zi8SetPDremoveOpt(1, ZI_WORK);
|
||||
ZI_WORK->unk_0x17 = 5;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, ZI_WORK) & 2;
|
||||
ZI_WORK->unk_0x1B28.bits.msb = 1;
|
||||
ZI_WORK->pyFuzzy.bits.msb = 1;
|
||||
ZI_WORK->unk_0x1B2C.bits.msb = 1;
|
||||
zyFuzzy = ZI_WORK->unk_0x1B2C.word;
|
||||
pzyFuzzy = &zyFuzzy;
|
||||
Zi8ZHsetZYfuzzyPairs(pzyFuzzy, ZI_WORK);
|
||||
pyFuzzy = ZI_WORK->unk_0x1B28.word;
|
||||
pyFuzzy = ZI_WORK->pyFuzzy.word;
|
||||
ppyFuzzy = &pyFuzzy;
|
||||
Zi8ZHsetPYfuzzyPairs(ppyFuzzy, ZI_WORK);
|
||||
Zi8SetParentalControls(2, ZI_WORK);
|
||||
|
||||
@@ -45,8 +45,8 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
ziWChar* cursor;
|
||||
ziU8* data;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||
ziU32 savedFormats = ZI_WORK->formats;
|
||||
ziU8 savedCount = ZI_WORK->formatCount;
|
||||
ziSearchState search = {0};
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
if (word == 0 || *word == 0) {
|
||||
@@ -73,22 +73,22 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
request.candidates = ordinals;
|
||||
request.maxCandidates = 1;
|
||||
request.firstCandidate = 0;
|
||||
ZI_WORK->unk_0x1410 = (ziU32)formats;
|
||||
ZI_WORK->formats = (ziU32)formats;
|
||||
if (ZI_WORK->unk_0x1C[0] == 2) {
|
||||
ZI_WORK->unk_0x1418 = 0;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->unk_0x1418++] = 1;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->unk_0x1418++] = 2;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->unk_0x1418++] = 3;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->unk_0x1418++] = 4;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->unk_0x1418++] = 5;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->unk_0x1418++] = 6;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->unk_0x1418++] = 7;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->unk_0x1418++] = 8;
|
||||
} else if (ZI_WORK->unk_0x1C[0] != 0) ZI_WORK->unk_0x1418 = 2;
|
||||
else ZI_WORK->unk_0x1418 = 1;
|
||||
ZI_WORK->formatCount = 0;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->formatCount++] = 1;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->formatCount++] = 2;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->formatCount++] = 3;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->formatCount++] = 4;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->formatCount++] = 5;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->formatCount++] = 6;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->formatCount++] = 7;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->formatCount++] = 8;
|
||||
} else if (ZI_WORK->unk_0x1C[0] != 0) ZI_WORK->formatCount = 2;
|
||||
else ZI_WORK->formatCount = 1;
|
||||
count = Zi8GetCandidatesOrCount(&request, &search, __zi8_work_data);
|
||||
ZI_WORK->unk_0x1410 = savedFormats;
|
||||
ZI_WORK->unk_0x1418 = savedCount;
|
||||
ZI_WORK->formats = savedFormats;
|
||||
ZI_WORK->formatCount = savedCount;
|
||||
if (count != 0) return 1;
|
||||
}
|
||||
if (language != 1) {
|
||||
|
||||
@@ -171,7 +171,7 @@ typedef struct WPADExtConfig {
|
||||
|
||||
typedef struct WPADCB {
|
||||
WPADGameInfo gameInfo; // 0x00
|
||||
s32 unk_0x38[2];
|
||||
s32 gameInfoStatus[2]; // 0x38
|
||||
u8 rxBufMain[RX_BUFFER_SIZE]; // 0x40
|
||||
u8 rxBufs[2][RX_BUFFER_SIZE]; // 0xA0
|
||||
WPADCommandQueue stdCmdQueue; // 0x160
|
||||
@@ -242,8 +242,8 @@ typedef struct WPADCB {
|
||||
WPADCallback getInfoCB; // 0x988
|
||||
u8 getInfoBusy; // 0x98C
|
||||
|
||||
u8 unk_0x98D; // 0x98D
|
||||
u8 unk_0x98E; // 0x98E
|
||||
u8 encStatus; // 0x98D
|
||||
u8 continuous; // 0x98E
|
||||
u8 unk_0x98F[0x9A0 - 0x990];
|
||||
} WPADCB;
|
||||
|
||||
@@ -261,7 +261,7 @@ void WPADiExcludeButton(s32 chan);
|
||||
void WPADiCopyOut(s32 chan);
|
||||
|
||||
BOOL WPADiSendSetPort(WPADCommandQueue* pQueue, u8 port, WPADCallback pCallback);
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL unk, WPADCallback pCallback);
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL continuous, WPADCallback pCallback);
|
||||
BOOL WPADiSendEnableDPD(WPADCommandQueue* pQueue, BOOL enable, WPADCallback pCallback);
|
||||
BOOL WPADiSendEnableSpeaker(WPADCommandQueue* pQueue, BOOL enable, WPADCallback pCallback);
|
||||
BOOL WPADiSendGetContStat(WPADCommandQueue* pQueue, WPADInfo* pInfo, WPADCallback pCallback);
|
||||
|
||||
@@ -24,7 +24,7 @@ typedef struct WPADMemBlock {
|
||||
int unk_0x04; // 0x04
|
||||
s16 unk_0x08; // 0x08
|
||||
int unk_0x0C; // 0x0C
|
||||
WPADCallback unk_0x10; // 0x10
|
||||
WPADCallback callback; // 0x10
|
||||
} WPADMemBlock;
|
||||
|
||||
typedef struct WPADGameInfo {
|
||||
|
||||
@@ -1283,7 +1283,7 @@ static void __ClearControlBlock(s32 chan) {
|
||||
p->sleeping = TRUE;
|
||||
p->getInfoBusy = FALSE;
|
||||
p->getInfoCB = NULL;
|
||||
p->unk_0x98E = 0;
|
||||
p->continuous = 0;
|
||||
|
||||
memset(&p->wpInfo, 0, sizeof(p->wpInfo));
|
||||
memset(&p->wmReadDataBuf, 0, sizeof(p->wmReadDataBuf));
|
||||
@@ -1298,8 +1298,8 @@ static void __ClearControlBlock(s32 chan) {
|
||||
memset(&p->decryptXorTable, 0, sizeof(p->decryptXorTable));
|
||||
memset(&p->gameInfo, 0, sizeof(WPADGameInfo));
|
||||
|
||||
p->unk_0x38[0] = -1;
|
||||
p->unk_0x38[1] = -1;
|
||||
p->gameInfoStatus[0] = -1;
|
||||
p->gameInfoStatus[1] = -1;
|
||||
|
||||
p->stdCmdQueue.buffer = p->stdCmdQueueList;
|
||||
p->stdCmdQueue.capacity = ARRAY_LENGTH(p->stdCmdQueueList);
|
||||
@@ -1315,7 +1315,7 @@ static void __ClearControlBlock(s32 chan) {
|
||||
_wmb[chan].unk_0x04 = 0;
|
||||
_wmb[chan].unk_0x08 = 0;
|
||||
_wmb[chan].unk_0x0C = 0;
|
||||
_wmb[chan].unk_0x10 = NULL;
|
||||
_wmb[chan].callback = NULL;
|
||||
|
||||
_rumbleCnt[chan] = 0;
|
||||
}
|
||||
@@ -1551,7 +1551,7 @@ static void firmwareCheckCallback(s32 chan, s32 status) {
|
||||
|
||||
DEBUGPrint(" ==>this error means that the firmware is for NDEV %s\n", p->configIndex != 0 ? "2.0" : "2.1 or later");
|
||||
|
||||
WPADiSendSetReportType(&p->stdCmdQueue, WPAD_FMT_CORE_BTN, p->unk_0x98E, &abortConnCallback);
|
||||
WPADiSendSetReportType(&p->stdCmdQueue, WPAD_FMT_CORE_BTN, p->continuous, &abortConnCallback);
|
||||
|
||||
WPADiSendDPDCSB(&p->stdCmdQueue, FALSE, &abortConnCallback);
|
||||
WPADiSendSetPort(&p->stdCmdQueue, port, &abortConnCallback);
|
||||
@@ -1626,7 +1626,7 @@ static void WPADiConnCallback(WUDDevInfo* devInfo, u8 open) {
|
||||
p->status = WPAD_ERR_OK;
|
||||
p->radioSensitivity = 100;
|
||||
p->sleeping = FALSE;
|
||||
p->unk_0x98D = FALSE;
|
||||
p->encStatus = FALSE;
|
||||
|
||||
WPADiSendReadData(&p->stdCmdQueue, p->wmReadDataBuf, 1, WM_ADDR_MEM_1770, firmwareCheckCallback);
|
||||
|
||||
@@ -1643,8 +1643,8 @@ static void WPADiConnCallback(WUDDevInfo* devInfo, u8 open) {
|
||||
|
||||
if (p->cmdBlkCB != NULL) {
|
||||
p->cmdBlkCB(chan, WPAD_ERR_NO_CONTROLLER);
|
||||
} else if (_wmb[chan].unk_0x10 != NULL) {
|
||||
_wmb[chan].unk_0x10(chan, WPAD_ERR_NO_CONTROLLER);
|
||||
} else if (_wmb[chan].callback != NULL) {
|
||||
_wmb[chan].callback(chan, WPAD_ERR_NO_CONTROLLER);
|
||||
}
|
||||
|
||||
do {
|
||||
@@ -1886,7 +1886,7 @@ s32 WPADSetDataFormat(s32 chan, u32 format) {
|
||||
}
|
||||
|
||||
if (currFormat != format) {
|
||||
if (!WPADiSendSetReportType(&p->stdCmdQueue, format, p->unk_0x98E, NULL)) {
|
||||
if (!WPADiSendSetReportType(&p->stdCmdQueue, format, p->continuous, NULL)) {
|
||||
status = WPAD_ERR_COMMUNICATION_ERROR;
|
||||
} else {
|
||||
enabled = OSDisableInterrupts();
|
||||
@@ -2741,13 +2741,13 @@ BOOL WPADiSendSetPort(WPADCommandQueue* pQueue, u8 port, WPADCallback pCallback)
|
||||
return success;
|
||||
}
|
||||
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL unk, WPADCallback pCallback) {
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL continuous, WPADCallback pCallback) {
|
||||
BOOL success;
|
||||
WPADCommand command;
|
||||
|
||||
command.reportID = RPTID_SET_DATA_REPORT_MODE;
|
||||
command.dataLength = RPT12_SIZE;
|
||||
command.dataBuf[RPT12_CONT_REPORT] = unk ? 0 : 4; // Always continuous reporting
|
||||
command.dataBuf[RPT12_CONT_REPORT] = continuous ? 0 : 4; // Always continuous reporting
|
||||
command.cmdCB = pCallback;
|
||||
|
||||
switch (format) {
|
||||
|
||||
@@ -111,8 +111,8 @@ static void initExtension(s32 chan) {
|
||||
|
||||
WPADiClearQueue(&p_wpd->extCmdQueue);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat,
|
||||
p_wpd->unk_0x98E, abortInitExtension);
|
||||
p_wpd->unk_0x98D = 1;
|
||||
p_wpd->continuous, abortInitExtension);
|
||||
p_wpd->encStatus = 1;
|
||||
WPADiSendWriteDataCmd(&p_wpd->extCmdQueue, 0x55, 0x04a400f0,
|
||||
abortInitExtension);
|
||||
WPADiSendWriteDataCmd(&p_wpd->extCmdQueue, 0, 0x04a400fb,
|
||||
@@ -127,7 +127,7 @@ static void abortInitExtension(s32 chan, s32 result) {
|
||||
|
||||
if (result != WPAD_ERR_NONE) {
|
||||
WPADiClearQueue(&p_wpd->extCmdQueue);
|
||||
p_wpd->unk_0x98D = 0;
|
||||
p_wpd->encStatus = 0;
|
||||
if (result == WPAD_ERR_NO_CONTROLLER) {
|
||||
type = WPAD_DEV_NOT_FOUND;
|
||||
}
|
||||
@@ -142,7 +142,7 @@ static void abortInitExtension(s32 chan, s32 result) {
|
||||
|
||||
else {
|
||||
DEBUGPrint("detaching extension during initialization.\n");
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->unk_0x98E, NULL);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->continuous, NULL);
|
||||
return;
|
||||
}
|
||||
p_wpd->devType = (u8)type;
|
||||
@@ -509,7 +509,7 @@ static void getExtType(s32 chan, s32 result) {
|
||||
}
|
||||
} else {
|
||||
if (isExtEncMain(_devType[chan])) {
|
||||
p_wpd->unk_0x98D = 2;
|
||||
p_wpd->encStatus = 2;
|
||||
WPADiSendWriteDataCmd(cmdq, 0xAA, 0x4A400F0, abortInitExtension);
|
||||
WPADiCreateKey(chan);
|
||||
WPADiSendWriteData(cmdq, p_wpd->encryptionKey, 6, 0x4A40040, abortInitExtension);
|
||||
@@ -517,7 +517,7 @@ static void getExtType(s32 chan, s32 result) {
|
||||
WPADiSendWriteData(cmdq, p_wpd->encryptionKey + 12, 4, 0x4A4004C, abortInitExtension);
|
||||
WPADiSendReadData(cmdq, p_wpd->wmReadDataBuf, 32, 0x4A40020, p_wpd->extensionCB);
|
||||
} else {
|
||||
p_wpd->unk_0x98D = 3;
|
||||
p_wpd->encStatus = 3;
|
||||
WPADiSendWriteDataCmd(cmdq, 0xAA, 0x4A400F0, abortInitExtension);
|
||||
WPADiCreateKeyFor3rd(chan);
|
||||
WPADiSendWriteData(cmdq, p_wpd->encryptionKey, 6, 0x4A40040, abortInitExtension);
|
||||
@@ -547,9 +547,9 @@ static void getGameInfo(s32 chan, s32 result, u8 index) {
|
||||
|
||||
if (p_info->checksum == sum) {
|
||||
memcpy(&p_wpd->gameInfo, p_buf, sizeof(WPADMEMGameInfo));
|
||||
p_wpd->unk_0x38[index] = WPAD_ERR_NONE;
|
||||
p_wpd->gameInfoStatus[index] = WPAD_ERR_NONE;
|
||||
} else {
|
||||
p_wpd->unk_0x38[index] = WPAD_ERR_INVALID;
|
||||
p_wpd->gameInfoStatus[index] = WPAD_ERR_INVALID;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -651,7 +651,7 @@ void __a1_20_status_report(u8 chan, u8* data) {
|
||||
p_wpd->devMode = 0;
|
||||
|
||||
WPADiClearQueue(&p_wpd->extCmdQueue);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->unk_0x98E, NULL);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->continuous, NULL);
|
||||
|
||||
if (attach) {
|
||||
if (p_wpd->extensionCB) {
|
||||
@@ -741,11 +741,11 @@ void __a1_21_user_data(u8 chan, u8* data) {
|
||||
DEBUGPrint("length : %d\n", p_wpd->wmReadLength);
|
||||
status = (p_wpd->wmReadHadError < 0) ? WPAD_ERR_TRANSFER : 0;
|
||||
DEBUGPrint("i2c = %04x\n", i2c);
|
||||
DEBUGPrint("enc = %d\n", p_wpd->unk_0x98D);
|
||||
DEBUGPrint("enc = %d\n", p_wpd->encStatus);
|
||||
|
||||
if (i2c == 0x04a4) {
|
||||
DEBUGPrint("Access to extension register.\n");
|
||||
if (p_wpd->unk_0x98D == 2 || p_wpd->unk_0x98D == 3) {
|
||||
if (p_wpd->encStatus == 2 || p_wpd->encStatus == 3) {
|
||||
DEBUGPrint("Decode!!!!\n");
|
||||
DEBUGPrint(" len = %d, addr = %04x\n", len, base);
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ typedef struct _CDBRecordFile {
|
||||
#else
|
||||
u8 unk_0x00[0x1C - 0x00];
|
||||
#endif
|
||||
int unk_0x1C;
|
||||
int allocFlag; // 0x1C
|
||||
CDBAttr attr; // 0x20
|
||||
CDBBridgeFile bridgeFile; // 0x42C
|
||||
u8 unk_0x434[0x438 - 0x434];
|
||||
|
||||
@@ -24,7 +24,7 @@ typedef struct NWC24MsgObjPrivate {
|
||||
#ifdef NWC24_MSG_READ
|
||||
u32 headerSize;
|
||||
#elif defined(NWC24_MBOX_CTRL) || defined(NWC24_MSG_COMMIT)
|
||||
u32 unk_0x10;
|
||||
u32 headerSize; // 0x10
|
||||
#else
|
||||
u8 unk_0x10[0x4];
|
||||
#endif
|
||||
@@ -46,8 +46,8 @@ typedef struct NWC24MsgObjPrivate {
|
||||
#endif
|
||||
u32 date; // 0x28
|
||||
u32 receivedDate; // 0x2C
|
||||
NWC24Data unk_0x30;
|
||||
NWC24Data unk_0x38;
|
||||
NWC24Data fromData; // 0x30
|
||||
NWC24Data toData; // 0x38
|
||||
NWC24Data subject; // 0x40
|
||||
NWC24Data text; // 0x48
|
||||
NWC24Data unk_0x50;
|
||||
@@ -73,7 +73,7 @@ typedef struct NWC24MsgObjPrivate {
|
||||
};
|
||||
u32 raw;
|
||||
} msgBoardFlags; // 0xCC
|
||||
NWC24Data unk_0xD0;
|
||||
NWC24Data extraData; // 0xD0
|
||||
NWC24Data faceData; // 0xD8
|
||||
NWC24Data altName; // 0xE0
|
||||
u32 textSize; // 0xE4
|
||||
|
||||
@@ -26,9 +26,9 @@ extern struct NWC24Work {
|
||||
|
||||
u8 configData[1024]; // 0x1300
|
||||
|
||||
u8 unk_0x1700[128]; // 0x1700
|
||||
u8 unk_0x1780[128]; // 0x1780
|
||||
u8 unk_0x1800[256]; // 0x1800
|
||||
u8 sendMbcHeader[128]; // 0x1700
|
||||
u8 recvMbcHeader[128]; // 0x1780
|
||||
u8 mbcEntry[256]; // 0x1800
|
||||
u8 base64Work[256]; // 0x1900
|
||||
u8 unk_0x1A00[4096]; // 0x1A00
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ void CDBRecordInstanceInit(CDBRecordFile* recordFile, CDBRecord* record, int typ
|
||||
OSLockMutex((OSMutex*)recordFile);
|
||||
recordFile->used = 1;
|
||||
OSUnlockMutex((OSMutex*)recordFile);
|
||||
recordFile->unk_0x1C = type;
|
||||
recordFile->allocFlag = type;
|
||||
recordFile->database = record->unk_0x00;
|
||||
CDBAttrInit(&recordFile->attr);
|
||||
CDBRecordKeyCopy(&recordFile->key, &record->key);
|
||||
@@ -310,7 +310,7 @@ CDBErr CDBRecordWrite_(CDBRecord* record, void* buffer, u32 size) {
|
||||
CDBReportError("can't write data in the record; the record is closed\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if ((recordFile->unk_0x1C & 2) == 0) {
|
||||
if ((recordFile->allocFlag & 2) == 0) {
|
||||
CDBReportError("can't write data in the record; the record is opened as READONLY\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
@@ -687,7 +687,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
if ((s32)recordFile == 0) {
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if (recordFile->unk_0x1C == 1) {
|
||||
if (recordFile->allocFlag == 1) {
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
if ((s32)buffer == 0) {
|
||||
@@ -699,7 +699,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
tempFile = record->file;
|
||||
if ((s32)tempFile == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (tempFile->unk_0x1C == 1) {
|
||||
} else if (tempFile->allocFlag == 1) {
|
||||
result = CDB_ERROR_26;
|
||||
} else {
|
||||
CDBAttrSetWiiId(&tempFile->attr, CDBGetWiiId());
|
||||
@@ -713,7 +713,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
CDBErr result;
|
||||
if ((s32)record->file == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (((CDBRecordFile*)record->file)->unk_0x1C == 1) {
|
||||
} else if (((CDBRecordFile*)record->file)->allocFlag == 1) {
|
||||
result = CDB_ERROR_26;
|
||||
} else {
|
||||
CDBAttrInitIV(&((CDBRecordFile*)record->file)->attr);
|
||||
@@ -727,7 +727,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
CDBErr result;
|
||||
if ((s32)record->file == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (((CDBRecordFile*)record->file)->unk_0x1C == 1) {
|
||||
} else if (((CDBRecordFile*)record->file)->allocFlag == 1) {
|
||||
result = CDB_ERROR_26;
|
||||
} else {
|
||||
CDBAttrSetKeyStr(&((CDBRecordFile*)record->file)->attr, key);
|
||||
|
||||
@@ -265,7 +265,7 @@ CDBErr CDBRecordFree(CDBRecord* record) {
|
||||
OSLockMutex((OSMutex*)recordFile);
|
||||
*(u32*)&recordFile->unk_0x00[0x18] = 0;
|
||||
OSUnlockMutex((OSMutex*)recordFile);
|
||||
recordFile->unk_0x1C = 0;
|
||||
recordFile->allocFlag = 0;
|
||||
record->file = NULL;
|
||||
OSUnlockMutex(&s_mutex);
|
||||
}
|
||||
|
||||
@@ -170,7 +170,7 @@ NWC24Err NWC24GetMsgObj(NWC24MsgObj* msg, NWC24MBoxType type, u32 id) {
|
||||
u32 count = 0;
|
||||
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
memset(entry, 0, sizeof(*entry));
|
||||
if (id == 0)
|
||||
return NWC24_ERR_HIDDEN;
|
||||
@@ -251,7 +251,7 @@ NWC24Err NWC24GetMsgIdList(NWC24MBoxType type, u32* ids, u32 maxLength) {
|
||||
MBCEntry* entry;
|
||||
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
err = GetCachedMBCHeader(type, &header);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
@@ -307,11 +307,11 @@ NWC24Err NWC24iOpenMBox(void) {
|
||||
NWC24File recvFile, sendFile;
|
||||
char* path = NWC24WorkP->pathWork;
|
||||
NWC24Err err;
|
||||
Mail_memset(NWC24WorkP->unk_0x1700, 0, 128);
|
||||
Mail_memset(NWC24WorkP->sendMbcHeader, 0, 128);
|
||||
err = GetCachedMBCHeader(NWC24_MBOX_TYPE_SEND, &header);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
Mail_memset(NWC24WorkP->unk_0x1780, 0, 128);
|
||||
Mail_memset(NWC24WorkP->recvMbcHeader, 0, 128);
|
||||
err = GetCachedMBCHeader(NWC24_MBOX_TYPE_RECV, &header);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
@@ -340,11 +340,11 @@ NWC24Err NWC24iInitMBox(void) {
|
||||
NWC24File recvFile, sendFile;
|
||||
NWC24Err recvResult, sendResult, err, sendStatus;
|
||||
char* path = NWC24WorkP->pathWork;
|
||||
Mail_memset(NWC24WorkP->unk_0x1700, 0, 128);
|
||||
Mail_memset(NWC24WorkP->sendMbcHeader, 0, 128);
|
||||
sendResult = CreateCtrlFile(NWC24_MBOX_TYPE_SEND, FALSE);
|
||||
if (sendResult < 0)
|
||||
return sendResult;
|
||||
Mail_memset(NWC24WorkP->unk_0x1780, 0, 128);
|
||||
Mail_memset(NWC24WorkP->recvMbcHeader, 0, 128);
|
||||
recvResult = CreateCtrlFile(NWC24_MBOX_TYPE_RECV, FALSE);
|
||||
if (recvResult < 0)
|
||||
return recvResult;
|
||||
@@ -616,11 +616,11 @@ static NWC24Err CreateCtrlFile(NWC24MBoxType type, BOOL force) {
|
||||
err = MakeCtrlPath(path, type);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
if (type == NWC24_MBOX_TYPE_SEND)
|
||||
header = (MBCHeader*)NWC24WorkP->unk_0x1700;
|
||||
header = (MBCHeader*)NWC24WorkP->sendMbcHeader;
|
||||
else if (type == NWC24_MBOX_TYPE_RECV)
|
||||
header = (MBCHeader*)NWC24WorkP->unk_0x1780;
|
||||
header = (MBCHeader*)NWC24WorkP->recvMbcHeader;
|
||||
else
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
result = err;
|
||||
@@ -676,7 +676,7 @@ static NWC24Err DeleteMsg(NWC24MBoxType type, u32 id, BOOL protect) {
|
||||
NWC24Err err, deleteResult, closeResult;
|
||||
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
err = GetCachedMBCHeader(type, &header);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
@@ -754,7 +754,7 @@ static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* ms
|
||||
NWC24Err clearResult, deleteResult;
|
||||
if (type == NWC24_MBOX_TYPE_SEND)
|
||||
return NWC24_OK;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
for (offset = 128; offset < header->fileSize; offset += 128) {
|
||||
if (count >= header->numMessages)
|
||||
break;
|
||||
@@ -783,7 +783,7 @@ static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* ms
|
||||
continue;
|
||||
}
|
||||
if (msg->unk_0x1C != 0 && entry->crc == msg->unk_0x1C && entry->type == msg->type && entry->length == msg->length &&
|
||||
entry->flags == msg->unk_0x10 && (s32)entry->date == (s32)msg->date) {
|
||||
entry->flags == msg->headerSize && (s32)entry->date == (s32)msg->date) {
|
||||
duplicateId = entry->msgId;
|
||||
duplicateOffset = offset;
|
||||
continue;
|
||||
@@ -809,9 +809,9 @@ static NWC24Err GetCachedMBCHeader(NWC24MBoxType type, MBCHeader** header) {
|
||||
char* path;
|
||||
NWC24Err err = NWC24_OK, closeResult;
|
||||
if (type == NWC24_MBOX_TYPE_SEND)
|
||||
*header = (MBCHeader*)NWC24WorkP->unk_0x1700;
|
||||
*header = (MBCHeader*)NWC24WorkP->sendMbcHeader;
|
||||
else if (type == NWC24_MBOX_TYPE_RECV)
|
||||
*header = (MBCHeader*)NWC24WorkP->unk_0x1780;
|
||||
*header = (MBCHeader*)NWC24WorkP->recvMbcHeader;
|
||||
else {
|
||||
*header = NULL;
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
@@ -874,7 +874,7 @@ static NWC24Err InitMBCHeader(MBCHeader* header, NWC24MBoxType type) {
|
||||
|
||||
static NWC24Err AddMBCEntry(MBCHeader* header, const NWC24MsgObjPrivate* msg, NWC24File* file) {
|
||||
u32 offset = header->freeOffset;
|
||||
MBCEntry* entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
MBCEntry* entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
u32 next;
|
||||
NWC24Err err;
|
||||
if (offset == 0)
|
||||
@@ -906,7 +906,7 @@ static NWC24Err AddMBCEntry(MBCHeader* header, const NWC24MsgObjPrivate* msg, NW
|
||||
}
|
||||
|
||||
static NWC24Err ClearMBCEntry(MBCHeader* header, NWC24File* file, u32 offset) {
|
||||
MBCEntry* entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
MBCEntry* entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
NWC24Err err = NWC24FSeek(file, offset, NWC24_SEEK_BEG);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
@@ -947,8 +947,8 @@ static NWC24Err MountVFMBox(NWC24MBoxType type) {
|
||||
}
|
||||
|
||||
static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entry) {
|
||||
u32 field1 = ((u32)msg->unk_0x30.ptr & 0xFFFFF) | (msg->unk_0x30.size << 20);
|
||||
u32 field2 = ((u32)msg->unk_0x38.ptr & 0xFFFFF) | (msg->unk_0x38.size << 20);
|
||||
u32 field1 = ((u32)msg->fromData.ptr & 0xFFFFF) | (msg->fromData.size << 20);
|
||||
u32 field2 = ((u32)msg->toData.ptr & 0xFFFFF) | (msg->toData.size << 20);
|
||||
u32 field3 = ((u32)msg->subject.ptr & 0xFFFFF) | (msg->subject.size << 20);
|
||||
u32 field4 = ((u32)msg->unk_0x50.ptr & 0xFFFFF) | (msg->unk_0x50.size << 20);
|
||||
u32 field5 = ((u32)msg->unk_0x58.ptr & 0xFFFFF) | (msg->unk_0x58.size << 20);
|
||||
@@ -956,7 +956,7 @@ static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entr
|
||||
entry->type = msg->type;
|
||||
entry->length = msg->length;
|
||||
entry->appId = msg->appId;
|
||||
entry->flags = msg->unk_0x10;
|
||||
entry->flags = msg->headerSize;
|
||||
entry->tag = msg->tag;
|
||||
entry->ledPattern = msg->ledPattern;
|
||||
entry->crc = msg->unk_0x1C;
|
||||
@@ -1003,7 +1003,7 @@ static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* ms
|
||||
msg->type = entry->type;
|
||||
msg->length = entry->length;
|
||||
msg->appId = entry->appId;
|
||||
msg->unk_0x10 = entry->flags;
|
||||
msg->headerSize = entry->flags;
|
||||
msg->tag = entry->tag;
|
||||
msg->ledPattern = entry->ledPattern;
|
||||
msg->unk_0x1C = entry->crc;
|
||||
@@ -1019,10 +1019,10 @@ static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* ms
|
||||
msg->textSize = entry->textSize;
|
||||
msg->dwcId = entry->dwcId;
|
||||
msg->iconNew = entry->iconNew;
|
||||
msg->unk_0x30.ptr = (void*)offset1;
|
||||
msg->unk_0x30.size = size1;
|
||||
msg->unk_0x38.ptr = (void*)offset2;
|
||||
msg->unk_0x38.size = size2;
|
||||
msg->fromData.ptr = (void*)offset1;
|
||||
msg->fromData.size = size1;
|
||||
msg->toData.ptr = (void*)offset2;
|
||||
msg->toData.size = size2;
|
||||
msg->subject.ptr = (void*)offset3;
|
||||
msg->subject.size = size3;
|
||||
msg->unk_0x50.ptr = (void*)offset4;
|
||||
|
||||
@@ -243,11 +243,11 @@ static inline NWC24Err WriteMBDelayField(NWC24MsgObjPrivate* msg) {
|
||||
|
||||
static inline NWC24Err WriteExtraFields(NWC24MsgObjPrivate* msg) {
|
||||
NWC24Err err;
|
||||
if (msg->unk_0xD0.size == 0)
|
||||
if (msg->extraData.size == 0)
|
||||
return NWC24_OK;
|
||||
err = NWC24FWrite(msg->unk_0xD0.ptr, msg->unk_0xD0.size, m_pFile);
|
||||
err = NWC24FWrite(msg->extraData.ptr, msg->extraData.size, m_pFile);
|
||||
if (err == NWC24_OK)
|
||||
msg->length += msg->unk_0xD0.size;
|
||||
msg->length += msg->extraData.size;
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -330,7 +330,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
}
|
||||
CHECK_WRITE(WriteString(msg, buffer));
|
||||
if (msg->type & 0x10000) {
|
||||
msg->unk_0x10 = msg->length;
|
||||
msg->headerSize = msg->length;
|
||||
buffer = NWC24WorkP->stringWork;
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_sprintf(buffer, "\r\n--%s", MultiPartDivider);
|
||||
@@ -339,7 +339,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
}
|
||||
CHECK_WRITE(WriteContentTypeField(msg));
|
||||
if (!(msg->type & 0x10000))
|
||||
msg->unk_0x10 = msg->length;
|
||||
msg->headerSize = msg->length;
|
||||
text.ptr = (const void*)msg->length;
|
||||
{ NWC24Err textResult = WritePlainText(msg);
|
||||
err = textResult == NWC24_ERR_NULL ? NWC24_OK : textResult; }
|
||||
@@ -577,7 +577,7 @@ static NWC24Err WriteFromField(NWC24MsgObjPrivate* msg) {
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_strncat(buffer, "From: ", 1022);
|
||||
address = buffer + 6;
|
||||
msg->unk_0x30.ptr = (const void*)(msg->length + 6);
|
||||
msg->fromData.ptr = (const void*)(msg->length + 6);
|
||||
type = 1;
|
||||
if (msg->type & 0x100000)
|
||||
type = 2;
|
||||
@@ -596,7 +596,7 @@ static NWC24Err WriteFromField(NWC24MsgObjPrivate* msg) {
|
||||
err = NWC24FWrite(NWC24WorkP->stringWork, total, m_pFile);
|
||||
if (err == NWC24_OK) {
|
||||
msg->length += total;
|
||||
msg->unk_0x30.size = msg->length - (u32)msg->unk_0x30.ptr - 2;
|
||||
msg->fromData.size = msg->length - (u32)msg->fromData.ptr - 2;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
@@ -612,7 +612,7 @@ static NWC24Err WriteToField(NWC24MsgObjPrivate* msg) {
|
||||
cursor += 4;
|
||||
index = 0;
|
||||
total = 4;
|
||||
msg->unk_0x38.ptr = (const void*)(msg->length + 4);
|
||||
msg->toData.ptr = (const void*)(msg->length + 4);
|
||||
remaining = 1018;
|
||||
for (; index < msg->numTo; ++index) {
|
||||
err = SynthesizeAddrStr(&msg->toAddrs[index], msg->type, cursor, remaining, &length);
|
||||
@@ -641,7 +641,7 @@ static NWC24Err WriteToField(NWC24MsgObjPrivate* msg) {
|
||||
err = NWC24FWrite(NWC24WorkP->stringWork, total + 2, m_pFile);
|
||||
if (err == NWC24_OK) {
|
||||
msg->length += total + 2;
|
||||
msg->unk_0x38.size = msg->length - (u32)msg->unk_0x38.ptr - 2;
|
||||
msg->toData.size = msg->length - (u32)msg->toData.ptr - 2;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
|
||||
@@ -73,11 +73,11 @@ NWC24Err NWC24InitMsgObj(NWC24MsgObj* msg, NWC24MsgType type) {
|
||||
msgObj->attachedType[i] = NWC24_TEXT_PLAIN;
|
||||
}
|
||||
|
||||
NWC24Data_Init(&msgObj->unk_0x30);
|
||||
NWC24Data_Init(&msgObj->unk_0x38);
|
||||
NWC24Data_Init(&msgObj->fromData);
|
||||
NWC24Data_Init(&msgObj->toData);
|
||||
NWC24Data_Init(&msgObj->unk_0x50);
|
||||
NWC24Data_Init(&msgObj->unk_0x58);
|
||||
NWC24Data_Init(&msgObj->unk_0xD0);
|
||||
NWC24Data_Init(&msgObj->extraData);
|
||||
NWC24Data_Init(&msgObj->faceData);
|
||||
NWC24Data_Init(&msgObj->altName);
|
||||
|
||||
|
||||
@@ -289,7 +289,7 @@ NWC24Err NWC24ReadMsgFromAddr(const NWC24MsgObj* msg, char* address, u32 capacit
|
||||
default:
|
||||
return result;
|
||||
}
|
||||
if (privateMsg->unk_0x30.size == 0)
|
||||
if (privateMsg->fromData.size == 0)
|
||||
return NWC24_ERR_NULL;
|
||||
result = NWC24iMBoxOpenStoredMsg(type, privateMsg->msgId, &file);
|
||||
switch (result) {
|
||||
@@ -300,9 +300,9 @@ NWC24Err NWC24ReadMsgFromAddr(const NWC24MsgObj* msg, char* address, u32 capacit
|
||||
}
|
||||
result = NWC24FStreamInit(&stream, &file, 0, privateMsg->length, buffer, 1024);
|
||||
if (result == NWC24_OK) {
|
||||
result = NWC24FStreamSeek(&stream, (u32)privateMsg->unk_0x30.ptr);
|
||||
result = NWC24FStreamSeek(&stream, (u32)privateMsg->fromData.ptr);
|
||||
if (result == NWC24_OK)
|
||||
result = NWC24iExtractAddrSpec(&stream, privateMsg->unk_0x30.size, 0, address, capacity);
|
||||
result = NWC24iExtractAddrSpec(&stream, privateMsg->fromData.size, 0, address, capacity);
|
||||
}
|
||||
closeResult = NWC24iMBoxCloseMsg(&file);
|
||||
if (result != NWC24_OK)
|
||||
|
||||
@@ -930,13 +930,13 @@ namespace ipl {
|
||||
math::VEC3 translate(mpLayout->FindPaneByName("N_Memo")->GetTranslate());
|
||||
|
||||
mURLProc.clear_prev_drawing();
|
||||
mURLProc.setUnk_0x44(translate.y);
|
||||
mURLProc.setMemoTranslateY(translate.y);
|
||||
|
||||
bool result = false;
|
||||
if (mState == STATE_NORMAL && mScroller.is_busy() == FALSE) {
|
||||
result = true;
|
||||
}
|
||||
mURLProc.setUnk_0x53(result);
|
||||
mURLProc.setFocusEnabled(result);
|
||||
|
||||
if (translate.y < 500.0f) {
|
||||
mpLayout->draw("N_Header");
|
||||
@@ -983,8 +983,8 @@ namespace ipl {
|
||||
mpLayout->draw("ReplyMask");
|
||||
}
|
||||
|
||||
if (!mURLProc.getUnk_0x50()) {
|
||||
mURLProc.setUnk_0x50(1);
|
||||
if (!mURLProc.getColorPass()) {
|
||||
mURLProc.setColorPass(1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1512,7 +1512,7 @@ namespace ipl {
|
||||
mURLProc.init();
|
||||
|
||||
if (mpBoardObj->mLetterType == BoardObject::TYPE_MEMO) {
|
||||
mURLProc.setUnk_0x40(8.0f);
|
||||
mURLProc.setHitYOffset(8.0f);
|
||||
}
|
||||
|
||||
nw4r::lyt::Pane* pane = mpLayout->FindPaneByName("T_Letter");
|
||||
|
||||
@@ -15,16 +15,16 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void UrlProcessor::init() {
|
||||
unk_0x52 = 0;
|
||||
unk_0x51 = 0;
|
||||
unk_0x50 = 0;
|
||||
unk_0x53 = 1;
|
||||
mbHoverOffset = 0;
|
||||
mbInTag = 0;
|
||||
mbColorPass = 0;
|
||||
mbFocusEnabled = 1;
|
||||
|
||||
unk_0x40 = 0.0f;
|
||||
unk_0x44 = 0.0f;
|
||||
mHitYOffset = 0.0f;
|
||||
mMemoTranslateY = 0.0f;
|
||||
|
||||
unk_0x48 = 0;
|
||||
unk_0x4C = -1;
|
||||
mCurTagNo = 0;
|
||||
mSelectedTagNo = -1;
|
||||
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
mConData[i].valid = false;
|
||||
@@ -60,14 +60,14 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void UrlProcessor::clear_prev_drawing() {
|
||||
unk_0x48 = 0;
|
||||
unk_0x52 = 0;
|
||||
unk_0x51 = 0;
|
||||
mCurTagNo = 0;
|
||||
mbHoverOffset = 0;
|
||||
mbInTag = 0;
|
||||
}
|
||||
|
||||
nw4r::ut::Operation UrlProcessor::Process(u16 code, nw4r::ut::PrintContext<wchar_t>* context) {
|
||||
if (code == SEPERATOR || code == (u16)'\n') {
|
||||
if (unk_0x50 == 0) {
|
||||
if (mbColorPass == 0) {
|
||||
make_collision(context, code);
|
||||
} else if (code == SEPERATOR) {
|
||||
parse(context);
|
||||
@@ -78,42 +78,42 @@ namespace ipl {
|
||||
|
||||
void UrlProcessor::make_collision(nw4r::ut::PrintContext<wchar_t>* context, u16 code) {
|
||||
if (code == SEPERATOR) {
|
||||
if (unk_0x51 == 0) {
|
||||
if (mbInTag == 0) {
|
||||
url_collision* const url_col = new (System::getMem2App(), 4) url_collision();
|
||||
line_collision* const line_col = new (System::getMem2App(), 4) line_collision();
|
||||
|
||||
url_col->unk_0x00 = unk_0x48;
|
||||
url_col->unk_0x04 = (wchar_t*)context->str;
|
||||
url_col->mTagNo = mCurTagNo;
|
||||
url_col->mpStart = (wchar_t*)context->str;
|
||||
|
||||
line_col->unk_0x00 = context->writer->GetCursorX();
|
||||
line_col->mLeft = context->writer->GetCursorX();
|
||||
nw4r::ut::List_Append(&url_col->mLineCollisions, line_col);
|
||||
nw4r::ut::List_Append(&mUrlCollisions, url_col);
|
||||
|
||||
unk_0x51 = 1;
|
||||
mbInTag = 1;
|
||||
} else {
|
||||
void* url_col_raw = nw4r::ut::List_GetPrev(&mUrlCollisions, NULL);
|
||||
void* line_col_raw = nw4r::ut::List_GetPrev(&((url_collision*)url_col_raw)->mLineCollisions, NULL);
|
||||
url_collision* url_col = (url_collision*)url_col_raw;
|
||||
line_collision* line_col = (line_collision*)line_col_raw;
|
||||
|
||||
line_col->unk_0x04 = context->writer->GetCursorX();
|
||||
line_col->unk_0x08 = context->writer->GetCursorY();
|
||||
line_col->mRight = context->writer->GetCursorX();
|
||||
line_col->mY = context->writer->GetCursorY();
|
||||
|
||||
url_col->unk_0x08 = (wchar_t*)context->str;
|
||||
url_col->mpEnd = (wchar_t*)context->str;
|
||||
|
||||
unk_0x51 = 0;
|
||||
unk_0x48++;
|
||||
mbInTag = 0;
|
||||
mCurTagNo++;
|
||||
}
|
||||
} else {
|
||||
if (unk_0x51 != 0) {
|
||||
if (mbInTag != 0) {
|
||||
url_collision* url_col = (url_collision*)nw4r::ut::List_GetPrev(&mUrlCollisions, NULL);
|
||||
line_collision* line_col = (line_collision*)nw4r::ut::List_GetPrev(&url_col->mLineCollisions, NULL);
|
||||
|
||||
line_col->unk_0x04 = context->writer->GetCursorX();
|
||||
line_col->unk_0x08 = context->writer->GetCursorY();
|
||||
line_col->mRight = context->writer->GetCursorX();
|
||||
line_col->mY = context->writer->GetCursorY();
|
||||
|
||||
line_col = new (System::getMem2App(), 4) line_collision();
|
||||
line_col->unk_0x00 = -208.0f;
|
||||
line_col->mLeft = -208.0f;
|
||||
|
||||
nw4r::ut::List_Append(&url_col->mLineCollisions, line_col);
|
||||
}
|
||||
@@ -122,41 +122,41 @@ namespace ipl {
|
||||
|
||||
void UrlProcessor::parse(nw4r::ut::PrintContext<wchar_t>* context) {
|
||||
f32 curY = context->writer->GetCursorY();
|
||||
if (unk_0x51 == 0) {
|
||||
if (unk_0x4C == unk_0x48) {
|
||||
if (mbInTag == 0) {
|
||||
if (mSelectedTagNo == mCurTagNo) {
|
||||
context->writer->SetTextColor(0xFFE664FF);
|
||||
} else if (unk_0x53 != 0 && is_focused()) {
|
||||
} else if (mbFocusEnabled != 0 && is_focused()) {
|
||||
context->writer->SetCursorY(curY - 2.0f);
|
||||
context->writer->SetTextColor(0xF06E28FF);
|
||||
unk_0x52 = 1;
|
||||
mbHoverOffset = 1;
|
||||
} else {
|
||||
context->writer->SetTextColor(0x34BEEDFF);
|
||||
}
|
||||
unk_0x51 = 1;
|
||||
mbInTag = 1;
|
||||
} else {
|
||||
if (unk_0x52 != 0) {
|
||||
if (mbHoverOffset != 0) {
|
||||
context->writer->SetCursorY(2.0f + curY);
|
||||
unk_0x52 = 0;
|
||||
mbHoverOffset = 0;
|
||||
}
|
||||
|
||||
context->writer->SetTextColor(0x646464FF);
|
||||
|
||||
unk_0x51 = 0;
|
||||
unk_0x48++;
|
||||
mbInTag = 0;
|
||||
mCurTagNo++;
|
||||
}
|
||||
}
|
||||
|
||||
BOOL UrlProcessor::is_focused() const {
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
if (unk_0x48 == get_focused_tagno(i)) {
|
||||
if (mCurTagNo == get_focused_tagno(i)) {
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void UrlProcessor::select(int unk) {
|
||||
unk_0x4C = unk;
|
||||
void UrlProcessor::select(int tagNo) {
|
||||
mSelectedTagNo = tagNo;
|
||||
}
|
||||
|
||||
int UrlProcessor::get_focused_tagno(int chan) const {
|
||||
@@ -174,13 +174,13 @@ namespace ipl {
|
||||
|
||||
while (url_col = (url_collision*)nw4r::ut::List_GetNext(&mUrlCollisions, url_col), url_col != NULL) {
|
||||
while (line_col = (line_collision*)nw4r::ut::List_GetNext(&url_col->mLineCollisions, line_col), line_col != NULL) {
|
||||
f32 left = line_col->unk_0x00 - var_f28;
|
||||
f32 right = var_f28 + line_col->unk_0x04;
|
||||
f32 temp_f0 = ((unk_0x44 + unk_0x40) - line_col->unk_0x08);
|
||||
f32 left = line_col->mLeft - var_f28;
|
||||
f32 right = var_f28 + line_col->mRight;
|
||||
f32 temp_f0 = ((mMemoTranslateY + mHitYOffset) - line_col->mY);
|
||||
f32 top = (var_f29 + temp_f0) - var_f28;
|
||||
f32 bottom = var_f28 + (var_f30 + temp_f0);
|
||||
if (left <= var_f31 && var_f31 <= right && top <= -pos.y && -pos.y <= bottom) {
|
||||
return url_col->unk_0x00;
|
||||
return url_col->mTagNo;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -194,7 +194,7 @@ namespace ipl {
|
||||
url_collision* url_col = NULL;
|
||||
|
||||
while (got = (url_collision*)nw4r::ut::List_GetNext(&mUrlCollisions, got), got != NULL) {
|
||||
if (got->unk_0x00 == unk_0x4C) {
|
||||
if (got->mTagNo == mSelectedTagNo) {
|
||||
url_col = got;
|
||||
break;
|
||||
}
|
||||
@@ -210,10 +210,10 @@ namespace ipl {
|
||||
|
||||
int chIdx2 = 0;
|
||||
int chIdx = 0;
|
||||
u32 count = (u32)url_col->unk_0x08 - (u32)url_col->unk_0x04;
|
||||
u32 count = (u32)url_col->mpEnd - (u32)url_col->mpStart;
|
||||
count >>= 1;
|
||||
for (u32 i = 0; i < count; i++) {
|
||||
wchar_t wch = url_col->unk_0x04[i];
|
||||
wchar_t wch = url_col->mpStart[i];
|
||||
if (wch != SEPERATOR && chIdx2 < 0x200) {
|
||||
url[chIdx2++] = wch;
|
||||
}
|
||||
@@ -226,9 +226,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
UrlProcessor::url_collision::url_collision() {
|
||||
unk_0x00 = 0;
|
||||
unk_0x04 = NULL;
|
||||
unk_0x08 = NULL;
|
||||
mTagNo = 0;
|
||||
mpStart = NULL;
|
||||
mpEnd = NULL;
|
||||
nw4r::ut::List_Init(&mLineCollisions, offsetof(line_collision, mLinkList));
|
||||
}
|
||||
|
||||
|
||||
@@ -329,8 +329,8 @@ namespace ipl {
|
||||
|
||||
setSceneParentFlags(SCN_PARENTFLAG_DRAW | SCN_PARENTFLAG_CALC);
|
||||
|
||||
unk_0xD8 = math::VEC3(0.0f, 0.0f, 0.0f);
|
||||
unk_0xE4 = math::VEC2(1.0f, 1.0f);
|
||||
mOrthoTrans = math::VEC3(0.0f, 0.0f, 0.0f);
|
||||
mOrthoScale = math::VEC2(1.0f, 1.0f);
|
||||
|
||||
nw4r::ut::Rect proj4x3;
|
||||
System::getProjectionRect4x3(&proj4x3);
|
||||
@@ -647,7 +647,7 @@ namespace ipl {
|
||||
void ChannelSelect::draw() {
|
||||
if (mState != STATE_INACTIVE && System::getSceneManager()->onDrawLayer(scene::DRAW_LAYER_DEFAULT)) {
|
||||
if (mState == STATE_NORMAL_FADE_ZOOM || mState == STATE_NORMAL_DONE_FADE_ZOOM || mState == STATE_NORMAL_RESTART) {
|
||||
utility::Graphics::setOrthoTransAndScale(unk_0xD8, unk_0xE4);
|
||||
utility::Graphics::setOrthoTransAndScale(mOrthoTrans, mOrthoScale);
|
||||
}
|
||||
utility::Graphics::setOrtho();
|
||||
|
||||
@@ -1909,10 +1909,10 @@ namespace ipl {
|
||||
u16 efbHeight;
|
||||
if (mState == STATE_NORMAL_FADE_ZOOM || mState == STATE_NORMAL_DONE_FADE_ZOOM || mState == STATE_NORMAL_RESTART) {
|
||||
nw4r::math::MTX44 mtx;
|
||||
f32 right = unk_0xD8.x + projRect.right / unk_0xE4.x;
|
||||
f32 left = unk_0xD8.x + projRect.left / unk_0xE4.x;
|
||||
f32 bottom = unk_0xD8.y - projRect.bottom / unk_0xE4.y;
|
||||
f32 top = unk_0xD8.y - projRect.top / unk_0xE4.y;
|
||||
f32 right = mOrthoTrans.x + projRect.right / mOrthoScale.x;
|
||||
f32 left = mOrthoTrans.x + projRect.left / mOrthoScale.x;
|
||||
f32 bottom = mOrthoTrans.y - projRect.bottom / mOrthoScale.y;
|
||||
f32 top = mOrthoTrans.y - projRect.top / mOrthoScale.y;
|
||||
MTXOrtho(mtx, top, bottom, left, right, -100.0f, 100.0f);
|
||||
nw4r::math::VEC4 vec4_in(vec.x, vec.y, 0.0f, 1.0f);
|
||||
nw4r::math::VEC4 vec4;
|
||||
@@ -1920,10 +1920,10 @@ namespace ipl {
|
||||
fbWidth = rMode->fbWidth;
|
||||
efbHeight = rMode->efbHeight;
|
||||
f32 projectionWidth = projRect.GetWidth();
|
||||
scissorX = ((1.0f + vec4.x) * fbWidth / 2) - ((mChanThumbOff_X * unk_0xE4.x) * (fbWidth / projectionWidth));
|
||||
scissorY = (efbHeight - ((1.0f + vec4.y) * efbHeight / 2)) - (mChanThumbOff_Y * unk_0xE4.y);
|
||||
scissorWidth = 2.0f * (mChanThumbOff_X * unk_0xE4.x) * (fbWidth / projectionWidth);
|
||||
scissorHeight = 2.0f * (mChanThumbOff_Y * unk_0xE4.y);
|
||||
scissorX = ((1.0f + vec4.x) * fbWidth / 2) - ((mChanThumbOff_X * mOrthoScale.x) * (fbWidth / projectionWidth));
|
||||
scissorY = (efbHeight - ((1.0f + vec4.y) * efbHeight / 2)) - (mChanThumbOff_Y * mOrthoScale.y);
|
||||
scissorWidth = 2.0f * (mChanThumbOff_X * mOrthoScale.x) * (fbWidth / projectionWidth);
|
||||
scissorHeight = 2.0f * (mChanThumbOff_Y * mOrthoScale.y);
|
||||
} else {
|
||||
fbWidth = rMode->fbWidth;
|
||||
efbHeight = rMode->efbHeight;
|
||||
@@ -2002,8 +2002,8 @@ namespace ipl {
|
||||
nw4r::ut::Rect projRect;
|
||||
System::getProjectionRect(&projRect);
|
||||
|
||||
unk_0xD8 = math::VEC3((frames[0].x + frames[1].x) / 2, (frames[0].y + frames[2].y) / 2, 0.0f);
|
||||
unk_0xE4 = math::VEC2(projRect.GetWidth() / (frames[1].x - frames[0].x), projRect.GetHeight() / (frames[0].y - frames[2].y));
|
||||
mOrthoTrans = math::VEC3((frames[0].x + frames[1].x) / 2, (frames[0].y + frames[2].y) / 2, 0.0f);
|
||||
mOrthoScale = math::VEC2(projRect.GetWidth() / (frames[1].x - frames[0].x), projRect.GetHeight() / (frames[0].y - frames[2].y));
|
||||
}
|
||||
|
||||
int ChannelSelect::isInChannelPaneNames(const char* name) const {
|
||||
|
||||
@@ -648,7 +648,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN && System::isReceiveScheduleStopped()) {
|
||||
if (System::getNwc24Manager() && !System::getNwc24Manager()->isUnk0xA31()) {
|
||||
if (System::getNwc24Manager() && !System::getNwc24Manager()->isReceivingIdle()) {
|
||||
goto scn_continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,16 +25,16 @@ typedef struct {
|
||||
undefined4 result;
|
||||
undefined4 errCode;
|
||||
HTTPTestState httpTestState;
|
||||
undefined4 unk_0x030;
|
||||
undefined4 unk_0x034;
|
||||
undefined4 unk_0x038;
|
||||
undefined4 unk_0x03c;
|
||||
undefined4 natState;
|
||||
undefined4 gsAvailable;
|
||||
undefined4 natTimedOut;
|
||||
undefined4 natFailed;
|
||||
OSTime detectStartTime;
|
||||
NHTTPConnection httpConnection;
|
||||
NHTTPRequest* httpRequest;
|
||||
NHTTPResponse* httpResponse;
|
||||
NCDProxyProfile proxy;
|
||||
void* unk_0x7f0;
|
||||
void* httpBuf;
|
||||
NAT nat;
|
||||
} StaticSession;
|
||||
|
||||
@@ -64,14 +64,14 @@ void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy) {
|
||||
g_session.result = 0xFF00;
|
||||
g_session.errCode = 0;
|
||||
g_session.httpTestState = HTTP_TEST_NOT_STARTED;
|
||||
g_session.unk_0x030 = 0;
|
||||
g_session.natState = 0;
|
||||
g_session.detectStartTime = 0;
|
||||
g_session.httpConnection = 0;
|
||||
g_session.httpRequest = 0;
|
||||
g_session.httpResponse = NULL;
|
||||
g_session.unk_0x034 = 0;
|
||||
g_session.unk_0x038 = 0;
|
||||
g_session.unk_0x03c = 1;
|
||||
g_session.gsAvailable = 0;
|
||||
g_session.natTimedOut = 0;
|
||||
g_session.natFailed = 1;
|
||||
g_session.proxy = *proxy;
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ int IPLContestProcess() {
|
||||
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52200;
|
||||
OSReport("[error] Failed to start up NHTTP.\n");
|
||||
} else {
|
||||
g_session.unk_0x7f0 = IPLContestAlloc(0x400);
|
||||
g_session.httpBuf = IPLContestAlloc(0x400);
|
||||
g_session.httpTestState = HTTP_TEST_STARTED;
|
||||
OSReport("Starting HTTP conectting test.\n");
|
||||
}
|
||||
@@ -108,7 +108,7 @@ int IPLContestProcess() {
|
||||
}
|
||||
case HTTP_TEST_STARTED: {
|
||||
g_session.httpRequest =
|
||||
NHTTPCreateRequest("http://conntest.nintendowifi.net/", 0, g_session.unk_0x7f0, 0x400, sNHTTPReqCallback, 0);
|
||||
NHTTPCreateRequest("http://conntest.nintendowifi.net/", 0, g_session.httpBuf, 0x400, sNHTTPReqCallback, 0);
|
||||
if (g_session.httpRequest == 0) {
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
|
||||
g_session.result |= 4;
|
||||
@@ -156,9 +156,9 @@ int IPLContestProcess() {
|
||||
NHTTPDestroyResponse(g_session.httpResponse);
|
||||
g_session.httpResponse = NULL;
|
||||
}
|
||||
if (g_session.unk_0x7f0 != NULL) {
|
||||
IPLContestFree(g_session.unk_0x7f0, 0);
|
||||
g_session.unk_0x7f0 = NULL;
|
||||
if (g_session.httpBuf != NULL) {
|
||||
IPLContestFree(g_session.httpBuf, 0);
|
||||
g_session.httpBuf = NULL;
|
||||
}
|
||||
g_session.httpTestState = HTTP_TEST_DONE;
|
||||
NHTTPCleanupAsync(sNHTTPCleanupCallback);
|
||||
@@ -176,9 +176,9 @@ int IPLContestProcess() {
|
||||
NHTTPDestroyResponse(g_session.httpResponse);
|
||||
g_session.httpResponse = NULL;
|
||||
}
|
||||
if (g_session.unk_0x7f0 != NULL) {
|
||||
IPLContestFree(g_session.unk_0x7f0, 0);
|
||||
g_session.unk_0x7f0 = NULL;
|
||||
if (g_session.httpBuf != NULL) {
|
||||
IPLContestFree(g_session.httpBuf, 0);
|
||||
g_session.httpBuf = NULL;
|
||||
}
|
||||
g_session.httpTestState = HTTP_TEST_DONE;
|
||||
NHTTPCleanupAsync(sNHTTPCleanupCallback);
|
||||
@@ -198,11 +198,11 @@ int IPLContestProcess() {
|
||||
OSReport("Port mapping detectioning test has been skipped.\n");
|
||||
|
||||
} else
|
||||
switch (g_session.unk_0x030) {
|
||||
switch (g_session.natState) {
|
||||
case 0: {
|
||||
gsiMemoryCallbacksSet(IPLContestGSMalloc, IPLContestGSFree, IPLContestGSRealloc, IPLContestGSMemalign);
|
||||
GSIStartAvailableCheckA("wiinat");
|
||||
g_session.unk_0x030 = 1;
|
||||
g_session.natState = 1;
|
||||
OSReport("Starting GameSpy available check.\n");
|
||||
break;
|
||||
}
|
||||
@@ -212,14 +212,14 @@ int IPLContestProcess() {
|
||||
break;
|
||||
}
|
||||
case GSIACAvailable: {
|
||||
g_session.unk_0x034 = 1;
|
||||
g_session.unk_0x030 = 2;
|
||||
g_session.gsAvailable = 1;
|
||||
g_session.natState = 2;
|
||||
OSReport("GameSpy server is currently available.\n");
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
g_session.unk_0x034 = 0;
|
||||
g_session.unk_0x030 = 5;
|
||||
g_session.gsAvailable = 0;
|
||||
g_session.natState = 5;
|
||||
OSReport("GameSpy server is currently unavailable.\n");
|
||||
break;
|
||||
}
|
||||
@@ -228,7 +228,7 @@ int IPLContestProcess() {
|
||||
}
|
||||
case 2: {
|
||||
NNStartNatDetection(onNatDetectionDone);
|
||||
g_session.unk_0x030 = 3;
|
||||
g_session.natState = 3;
|
||||
OSReport("Port mapping detectioning test has been started.\n");
|
||||
g_session.detectStartTime = OSGetTime();
|
||||
break;
|
||||
@@ -238,8 +238,8 @@ int IPLContestProcess() {
|
||||
if (OSGetTime() - g_session.detectStartTime < OSMillisecondsToTicks((OSTime)90000)) {
|
||||
break;
|
||||
}
|
||||
g_session.unk_0x030 = 5;
|
||||
g_session.unk_0x038 = 1;
|
||||
g_session.natState = 5;
|
||||
g_session.natTimedOut = 1;
|
||||
OSReport("[error] NAT timeout.\n");
|
||||
break;
|
||||
}
|
||||
@@ -289,10 +289,10 @@ int IPLGetNATSupportCode(int conntype) {
|
||||
|
||||
nat = g_session.nat;
|
||||
|
||||
if (g_session.unk_0x034 != 0) {
|
||||
if (g_session.unk_0x038 != 0) {
|
||||
if (g_session.gsAvailable != 0) {
|
||||
if (g_session.natTimedOut != 0) {
|
||||
code = 11180;
|
||||
} else if (g_session.unk_0x03c != 0) {
|
||||
} else if (g_session.natFailed != 0) {
|
||||
code = 11170;
|
||||
} else {
|
||||
if (nat.mappingScheme == 0 && nat.mappings[2].publicPort == nat.mappings[1].publicPort * 2 - nat.mappings[0].publicPort) {
|
||||
@@ -464,10 +464,10 @@ void sNHTTPCleanupCallback() {
|
||||
void onNatDetectionDone(gsi_bool success, NAT nat) {
|
||||
if (success) {
|
||||
g_session.nat = nat;
|
||||
g_session.unk_0x03c = 0;
|
||||
g_session.natFailed = 0;
|
||||
} else {
|
||||
g_session.unk_0x03c = 1;
|
||||
g_session.natFailed = 1;
|
||||
}
|
||||
g_session.unk_0x030 = 4;
|
||||
g_session.natState = 4;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -353,7 +353,7 @@ FaderSceneCommand SDChannelTitle::calcFadeout() {
|
||||
mWpadStopTick = OSGetTick();
|
||||
}
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN && System::isReceiveScheduleStopped() &&
|
||||
(!System::getNwc24Manager() || System::getNwc24Manager()->isUnk0xA31())) {
|
||||
(!System::getNwc24Manager() || System::getNwc24Manager()->isReceivingIdle())) {
|
||||
OSReport("NWC24 Scheduler stopped.\n");
|
||||
NandSDWorker* worker = mpChannelSelect->getWorker();
|
||||
if (mNextScene == 17) {
|
||||
|
||||
@@ -30,7 +30,7 @@ namespace ipl {
|
||||
|
||||
SettingSelect::SettingSelect(EGG::Heap* heap, int arg)
|
||||
: Base(heap), ::gui::EventHandler(), mState(STATE_WAIT_BUTTON_FADE_IN), mPrevState(STATE_WAIT_BUTTON_FADE_IN), mSettingArg(arg),
|
||||
mpLayout(NULL), mpLayoutFile(NULL), mpGui(NULL), unk_0x90(0), unk_0x94(0) {
|
||||
mpLayout(NULL), mpLayoutFile(NULL), mpGui(NULL), mPendingSceneId(0), mExitSeqStep(0) {
|
||||
setSceneParentFlags(SCN_PARENTFLAG_CALC | SCN_PARENTFLAG_DRAW);
|
||||
}
|
||||
|
||||
@@ -222,7 +222,7 @@ namespace ipl {
|
||||
|
||||
void SettingSelect::stt_1st_fadeout() {
|
||||
if (is_stopped_all_anm()) {
|
||||
if (unk_0x90 != 0) {
|
||||
if (mPendingSceneId != 0) {
|
||||
System::getFader()->fadeOut();
|
||||
CHANGE_STATE(STATE_WAIT_BLACK_OUT);
|
||||
} else {
|
||||
@@ -247,7 +247,7 @@ namespace ipl {
|
||||
|
||||
void SettingSelect::stt_2nd_fadeout() {
|
||||
if (is_stopped_all_anm()) {
|
||||
if (unk_0x90 != 0) {
|
||||
if (mPendingSceneId != 0) {
|
||||
CHANGE_STATE(STATE_WAIT_CHILD);
|
||||
reset_gui();
|
||||
} else {
|
||||
@@ -309,7 +309,7 @@ namespace ipl {
|
||||
case STATE_1ST_NORMAL: {
|
||||
System::getChannelManager()->refreshAsync();
|
||||
System::getFader()->fadeOut();
|
||||
unk_0x90 = 4;
|
||||
mPendingSceneId = SCENE_BOARD;
|
||||
|
||||
reserveAllSceneDestruction(SCENE_BOARD, NULL);
|
||||
|
||||
@@ -369,8 +369,8 @@ namespace ipl {
|
||||
int backAnim = -1;
|
||||
int inAnim = -1;
|
||||
|
||||
switch (unk_0x90) {
|
||||
case 13: {
|
||||
switch (mPendingSceneId) {
|
||||
case SCENE_MEMORY: {
|
||||
#ifndef KOREAN_BUILD
|
||||
backAnim = ANIM_WII_SAVE_DATA_BACK;
|
||||
inAnim = ANIM_GC_SAVE_DATA_IN;
|
||||
@@ -380,12 +380,12 @@ namespace ipl {
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
case 14: {
|
||||
case SCENE_MEMORY_CARD: {
|
||||
backAnim = ANIM_GC_SAVE_DATA_BACK;
|
||||
inAnim = ANIM_WII_SAVE_DATA_IN;
|
||||
break;
|
||||
}
|
||||
case 12: {
|
||||
case SCENE_CHANNEL_EDIT: {
|
||||
backAnim = ANIM_CHANNEL_BACK;
|
||||
inAnim = ANIM_SAVE_DATA_IN;
|
||||
if (mSettingArg == SettingSelectArg::ARG_START_SAVE_DATA) {
|
||||
@@ -404,14 +404,14 @@ namespace ipl {
|
||||
|
||||
void SettingSelect::stt_wait_child_anm() {
|
||||
if (is_stopped_all_anm()) {
|
||||
switch (unk_0x90) {
|
||||
case 12: {
|
||||
switch (mPendingSceneId) {
|
||||
case SCENE_CHANNEL_EDIT: {
|
||||
static_cast<SettingButton*>(System::getScene(SCENE_SETTING_BUTTON))->showWii();
|
||||
CHANGE_STATE(STATE_2ND_NORMAL);
|
||||
break;
|
||||
}
|
||||
case 13:
|
||||
case 14: {
|
||||
case SCENE_MEMORY:
|
||||
case SCENE_MEMORY_CARD: {
|
||||
static_cast<SettingButton*>(System::getScene(SCENE_SETTING_BUTTON))->showWii();
|
||||
#ifndef KOREAN_BUILD
|
||||
CHANGE_STATE(STATE_3RD_NORMAL);
|
||||
@@ -422,7 +422,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
unk_0x90 = 0;
|
||||
mPendingSceneId = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -587,7 +587,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BTN_SETTING: {
|
||||
unk_0x90 = 18;
|
||||
mPendingSceneId = SCENE_SETTING;
|
||||
flashAnim = ANIM_SETTING_FLASH;
|
||||
outAnim = ANIM_DATA_MANAGE_OUT;
|
||||
reserveAllSceneDestruction(SCENE_SETTING, (void*)Setting::ARG_NORMAL_PAGE);
|
||||
@@ -596,7 +596,7 @@ namespace ipl {
|
||||
}
|
||||
case BTN_SAVEDATA: {
|
||||
#ifdef KOREAN_BUILD
|
||||
unk_0x90 = 13;
|
||||
mPendingSceneId = SCENE_MEMORY;
|
||||
#endif
|
||||
flashAnim = ANIM_SAVE_DATA_FLASH;
|
||||
outAnim = ANIM_CHANNEL_OUT;
|
||||
@@ -611,7 +611,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BTN_CHANNEL: {
|
||||
unk_0x90 = 12;
|
||||
mPendingSceneId = SCENE_CHANNEL_EDIT;
|
||||
flashAnim = ANIM_CHANNEL_FLASH;
|
||||
outAnim = ANIM_SAVE_DATA_OUT;
|
||||
createChildScene(SCENE_CHANNEL_EDIT, this, NULL);
|
||||
@@ -623,7 +623,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BTN_WII_SAVE: {
|
||||
unk_0x90 = 13;
|
||||
mPendingSceneId = SCENE_MEMORY;
|
||||
flashAnim = ANIM_WII_SAVE_DATA_FLASH;
|
||||
outAnim = ANIM_GC_SAVE_DATA_OUT;
|
||||
createChildScene(SCENE_MEMORY, this, NULL);
|
||||
@@ -632,7 +632,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BTN_GC_SAVE: {
|
||||
unk_0x90 = 14;
|
||||
mPendingSceneId = SCENE_MEMORY_CARD;
|
||||
flashAnim = ANIM_GC_SAVE_DATA_FLASH;
|
||||
outAnim = ANIM_WII_SAVE_DATA_OUT;
|
||||
createChildScene(SCENE_MEMORY_CARD, this, NULL);
|
||||
@@ -689,7 +689,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SettingSelect::calc_exit_sequence() {
|
||||
switch (unk_0x94) {
|
||||
switch (mExitSeqStep) {
|
||||
case 0: {
|
||||
prepare_exit_abort();
|
||||
break;
|
||||
@@ -720,13 +720,13 @@ namespace ipl {
|
||||
|
||||
System::getBS2Manager()->abort();
|
||||
System::stopReceiveSchedule();
|
||||
unk_0x94 = 1;
|
||||
mExitSeqStep = 1;
|
||||
}
|
||||
}
|
||||
|
||||
void SettingSelect::wait_decide_se() {
|
||||
if (!snd::getSystem()->isSEActive("WIPL_SE_DECIDE")) {
|
||||
unk_0x94 = 2;
|
||||
mExitSeqStep = 2;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -734,7 +734,7 @@ namespace ipl {
|
||||
__WPADReconnect(TRUE);
|
||||
snd::getSystem()->stopAllSound(20);
|
||||
System::getFader()->fadeOut();
|
||||
unk_0x94 = 3;
|
||||
mExitSeqStep = 3;
|
||||
}
|
||||
|
||||
void SettingSelect::finish_exit_reboot() {
|
||||
|
||||
@@ -46,17 +46,17 @@ namespace ipl {
|
||||
}
|
||||
if (mButton != 0) {
|
||||
if (down(BTN_INTERACT)) {
|
||||
unk_0x08++;
|
||||
mDecideHoldCount++;
|
||||
} else {
|
||||
unk_0x08 = 0;
|
||||
mDecideHoldCount = 0;
|
||||
mButton = 0;
|
||||
}
|
||||
} else {
|
||||
unk_0x08 = 0;
|
||||
mDecideHoldCount = 0;
|
||||
}
|
||||
} else {
|
||||
mButton = 0;
|
||||
unk_0x08 = 0;
|
||||
mDecideHoldCount = 0;
|
||||
}
|
||||
|
||||
switch (mRumbleType) {
|
||||
@@ -109,7 +109,7 @@ namespace ipl {
|
||||
return NULL;
|
||||
}
|
||||
int ipl::controller::Base::decide() const {
|
||||
return unk_0x08 == 5;
|
||||
return mDecideHoldCount == 5;
|
||||
}
|
||||
int ipl::controller::Base::rumble(int type) {
|
||||
int ret = FALSE;
|
||||
@@ -130,44 +130,44 @@ namespace ipl {
|
||||
}
|
||||
void ipl::controller::Revolution::read() {
|
||||
if (!isValidDpd()) {
|
||||
unk_0x20->pos.y = 1.0f / 0.0f;
|
||||
unk_0x20->pos.x = 1.0f / 0.0f;
|
||||
unk_0x20->speed = 0.0f;
|
||||
unk_0x20->vec.y = 0.0f;
|
||||
unk_0x20->vec.x = 0.0f;
|
||||
mpKpadStatus->pos.y = 1.0f / 0.0f;
|
||||
mpKpadStatus->pos.x = 1.0f / 0.0f;
|
||||
mpKpadStatus->speed = 0.0f;
|
||||
mpKpadStatus->vec.y = 0.0f;
|
||||
mpKpadStatus->vec.x = 0.0f;
|
||||
}
|
||||
|
||||
unk_0x1E = unk_0x1D;
|
||||
mbWasPinching = mbPinching;
|
||||
if (isValidBtn()) {
|
||||
if (unk_0x1E == 0) {
|
||||
if (mbWasPinching == 0) {
|
||||
if (down(0x800) && down(0x400)) {
|
||||
unk_0x1D = 1;
|
||||
mbPinching = 1;
|
||||
}
|
||||
} else if (!down(0x800) || !down(0x400)) {
|
||||
unk_0x1D = 0;
|
||||
mbPinching = 0;
|
||||
}
|
||||
} else {
|
||||
unk_0x1D = 0;
|
||||
mbPinching = 0;
|
||||
}
|
||||
|
||||
Base::read();
|
||||
}
|
||||
bool ipl::controller::Revolution::isValidDpd() const {
|
||||
if (unk_0x1C != 0) {
|
||||
if (mbForceInvalid != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (unk_0x20->wpad_err == 0 || unk_0x20->wpad_err == -7) && unk_0x20->dpd_valid_fg != 0;
|
||||
return (mpKpadStatus->wpad_err == 0 || mpKpadStatus->wpad_err == -7) && mpKpadStatus->dpd_valid_fg != 0;
|
||||
}
|
||||
bool ipl::controller::Revolution::isValidBtn() const {
|
||||
u8 val = unk_0x20->wpad_err;
|
||||
u8 val = mpKpadStatus->wpad_err;
|
||||
|
||||
return (u8)(val + 7) <= 7 && ((1 << (val + 7)) & 0xA1) != 0;
|
||||
}
|
||||
bool ipl::controller::Revolution::down(u32 mButton) const {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
if (unk_0x20->hold & (mButton & 0xFFFF)) {
|
||||
if (mpKpadStatus->hold & (mButton & 0xFFFF)) {
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
@@ -177,7 +177,7 @@ namespace ipl {
|
||||
ipl::math::VEC2 ipl::controller::Revolution::getDpdProjectionPos() const {
|
||||
math::VEC2 ret;
|
||||
Vec2 dest;
|
||||
Vec2 src = {unk_0x20->pos.x, unk_0x20->pos.y};
|
||||
Vec2 src = {mpKpadStatus->pos.x, mpKpadStatus->pos.y};
|
||||
nw4r::ut::Rect nw4r_rect; // constructor shouldn't be inlined
|
||||
Rect kpad_rect;
|
||||
|
||||
@@ -216,9 +216,9 @@ namespace ipl {
|
||||
y = fy;
|
||||
}
|
||||
ipl::controller::Classic::Classic(int arg0, KPADStatus& arg1) : Revolution(arg0, arg1) {
|
||||
unk_0x24.x = 0.01f;
|
||||
unk_0x24.y = 0.01f;
|
||||
unk_0x2C = 0;
|
||||
mClassicCursorPos.x = 0.01f;
|
||||
mClassicCursorPos.y = 0.01f;
|
||||
mClassicCursorTimer = 0;
|
||||
}
|
||||
ipl::controller::Base::~Base() {
|
||||
}
|
||||
@@ -230,32 +230,32 @@ namespace ipl {
|
||||
}
|
||||
void ipl::controller::Classic::read() {
|
||||
if (!Revolution::isValidDpd()) {
|
||||
math::VEC2 lstick(unk_0x20->ex_status.cl.lstick.x, unk_0x20->ex_status.cl.lstick.y);
|
||||
math::VEC2 lstick(mpKpadStatus->ex_status.cl.lstick.x, mpKpadStatus->ex_status.cl.lstick.y);
|
||||
|
||||
if (lstick.x * lstick.x + lstick.y * lstick.y > 0.0036f) {
|
||||
unk_0x24.x = math::abs_clamp(unk_0x24.x + unk_0x20->ex_status.cl.lstick.x * 0.05f, 1.8f);
|
||||
unk_0x24.y = math::abs_clamp(unk_0x24.y - unk_0x20->ex_status.cl.lstick.y * 0.05f, 1.2f);
|
||||
mClassicCursorPos.x = math::abs_clamp(mClassicCursorPos.x + mpKpadStatus->ex_status.cl.lstick.x * 0.05f, 1.8f);
|
||||
mClassicCursorPos.y = math::abs_clamp(mClassicCursorPos.y - mpKpadStatus->ex_status.cl.lstick.y * 0.05f, 1.2f);
|
||||
}
|
||||
|
||||
math::VEC2 rstick = math::VEC2(unk_0x20->ex_status.cl.rstick.x, unk_0x20->ex_status.cl.rstick.y);
|
||||
math::VEC2 rstick = math::VEC2(mpKpadStatus->ex_status.cl.rstick.x, mpKpadStatus->ex_status.cl.rstick.y);
|
||||
if (getClassicHoldFlag() != 0 || lstick.x * lstick.x + lstick.y * lstick.y > 0.0036f ||
|
||||
rstick.x * rstick.x + rstick.y * rstick.y > 0.0036f) {
|
||||
unk_0x2C = 180;
|
||||
mClassicCursorTimer = 180;
|
||||
}
|
||||
|
||||
if (--unk_0x2C < 0) {
|
||||
unk_0x2C = 0;
|
||||
if (--mClassicCursorTimer < 0) {
|
||||
mClassicCursorTimer = 0;
|
||||
}
|
||||
} else {
|
||||
unk_0x24.y = 0.01f;
|
||||
unk_0x24.x = 0.01f;
|
||||
unk_0x2C = 0;
|
||||
mClassicCursorPos.y = 0.01f;
|
||||
mClassicCursorPos.x = 0.01f;
|
||||
mClassicCursorTimer = 0;
|
||||
}
|
||||
|
||||
Revolution::read();
|
||||
}
|
||||
int ipl::controller::Classic::getClassicHoldFlag() const {
|
||||
return unk_0x20->ex_status.cl.hold;
|
||||
return mpKpadStatus->ex_status.cl.hold;
|
||||
}
|
||||
template <>
|
||||
f32 ipl::math::abs_clamp<f32>(const f32& x, const f32& y) {
|
||||
@@ -270,7 +270,7 @@ namespace ipl {
|
||||
ipl::math::VEC2 ipl::controller::Classic::getHorizon() const {
|
||||
math::VEC2 ret;
|
||||
if (Revolution::isValidDpd()) {
|
||||
ret.set(unk_0x20->horizon.x, unk_0x20->horizon.y);
|
||||
ret.set(mpKpadStatus->horizon.x, mpKpadStatus->horizon.y);
|
||||
} else {
|
||||
ret.x = 1.0f;
|
||||
ret.y = -0.2679492f;
|
||||
@@ -280,9 +280,9 @@ namespace ipl {
|
||||
ipl::math::VEC2 ipl::controller::Classic::getDpdPos() const {
|
||||
math::VEC2 ret;
|
||||
if (Revolution::isValidDpd()) {
|
||||
ret.set(unk_0x20->pos.x, unk_0x20->pos.y);
|
||||
} else if (unk_0x2C != 0) {
|
||||
ret = unk_0x24;
|
||||
ret.set(mpKpadStatus->pos.x, mpKpadStatus->pos.y);
|
||||
} else if (mClassicCursorTimer != 0) {
|
||||
ret = mClassicCursorPos;
|
||||
} else {
|
||||
ret.x = (1.0f / 0.0f);
|
||||
ret.y = (1.0f / 0.0f);
|
||||
@@ -296,9 +296,9 @@ namespace ipl {
|
||||
ipl::math::VEC2 ipl::controller::Classic::getDpdProjectionPos() const {
|
||||
math::VEC2 ret;
|
||||
if (Revolution::isValidDpd()) {
|
||||
ret.set(unk_0x20->pos.x, unk_0x20->pos.y);
|
||||
} else if (unk_0x2C != 0) {
|
||||
ret = unk_0x24;
|
||||
ret.set(mpKpadStatus->pos.x, mpKpadStatus->pos.y);
|
||||
} else if (mClassicCursorTimer != 0) {
|
||||
ret = mClassicCursorPos;
|
||||
} else {
|
||||
ret.set(1.0f / 0.0f, 1.0f / 0.0f);
|
||||
}
|
||||
@@ -454,7 +454,7 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
return -1;
|
||||
}
|
||||
void ipl::controller::Base::setForceInvalid(bool flag) {
|
||||
unk_0x1C = flag;
|
||||
mbForceInvalid = flag;
|
||||
}
|
||||
int ipl::controller::Base::getType() const {
|
||||
return mType;
|
||||
@@ -463,65 +463,65 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
return mChan;
|
||||
}
|
||||
KPADStatus* ipl::controller::Revolution::getKPADStatus() const {
|
||||
return unk_0x20;
|
||||
return mpKpadStatus;
|
||||
}
|
||||
f32 ipl::controller::Revolution::getDpdDistance() const {
|
||||
return unk_0x20->dist;
|
||||
return mpKpadStatus->dist;
|
||||
}
|
||||
int ipl::controller::Revolution::getReleaseFlag() const {
|
||||
return unk_0x20->release;
|
||||
return mpKpadStatus->release;
|
||||
}
|
||||
int ipl::controller::Revolution::getTrigFlag() const {
|
||||
return unk_0x20->trig;
|
||||
return mpKpadStatus->trig;
|
||||
}
|
||||
int ipl::controller::Revolution::getHoldFlag() const {
|
||||
return unk_0x20->hold;
|
||||
return mpKpadStatus->hold;
|
||||
}
|
||||
int ipl::controller::Revolution::pinchOffTrg() const {
|
||||
int ret = 0;
|
||||
if (isValidBtn() && unk_0x1D == 0 && unk_0x1E != 0) {
|
||||
if (isValidBtn() && mbPinching == 0 && mbWasPinching != 0) {
|
||||
ret = 1;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
int ipl::controller::Revolution::pinch() const {
|
||||
int ret = 0;
|
||||
if (isValidBtn() && unk_0x1D != 0) {
|
||||
if (isValidBtn() && mbPinching != 0) {
|
||||
ret = 1;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
int ipl::controller::Revolution::pinchTrg() const {
|
||||
int ret = 0;
|
||||
if (isValidBtn() && unk_0x1D != 0 && unk_0x1E == 0) {
|
||||
if (isValidBtn() && mbPinching != 0 && mbWasPinching == 0) {
|
||||
ret = 1;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
bool ipl::controller::Revolution::repeat(u32 button) const {
|
||||
return down(button) && (unk_0x20->hold & 0x80000000) != 0;
|
||||
return down(button) && (mpKpadStatus->hold & 0x80000000) != 0;
|
||||
}
|
||||
BOOL ipl::controller::Classic::isValidDpdClassic() const {
|
||||
return unk_0x2C != 0;
|
||||
return mClassicCursorTimer != 0;
|
||||
}
|
||||
bool ipl::controller::Classic::isValidDpd() const {
|
||||
if (unk_0x1C != 0) {
|
||||
if (mbForceInvalid != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (Revolution::isValidDpd() != 0) || (unk_0x2C != 0);
|
||||
return (Revolution::isValidDpd() != 0) || (mClassicCursorTimer != 0);
|
||||
}
|
||||
int ipl::controller::Classic::getClassicReleaseFlag() const {
|
||||
return unk_0x20->ex_status.cl.release;
|
||||
return mpKpadStatus->ex_status.cl.release;
|
||||
}
|
||||
int ipl::controller::Classic::getClassicTrigFlag() const {
|
||||
return unk_0x20->ex_status.cl.trig;
|
||||
return mpKpadStatus->ex_status.cl.trig;
|
||||
}
|
||||
bool ipl::controller::Classic::upTrg(u32 button) const {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
bool pressed = true;
|
||||
KPADStatus* status = unk_0x20;
|
||||
KPADStatus* status = mpKpadStatus;
|
||||
if ((status->release & (button & 0xFFFF)) == 0) {
|
||||
if ((status->ex_status.cl.release & (button >> 16)) == 0) {
|
||||
pressed = false;
|
||||
@@ -537,7 +537,7 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
bool pressed = true;
|
||||
KPADStatus* status = unk_0x20;
|
||||
KPADStatus* status = mpKpadStatus;
|
||||
if ((status->trig & (button & 0xFFFF)) == 0) {
|
||||
if ((status->ex_status.cl.trig & (button >> 16)) == 0) {
|
||||
pressed = false;
|
||||
@@ -553,8 +553,8 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
bool pressed = true;
|
||||
if ((unk_0x20->hold & (button & 0xFFFF)) == 0) {
|
||||
if ((unk_0x20->ex_status.cl.hold & (button >> 16)) == 0) {
|
||||
if ((mpKpadStatus->hold & (button & 0xFFFF)) == 0) {
|
||||
if ((mpKpadStatus->ex_status.cl.hold & (button >> 16)) == 0) {
|
||||
pressed = false;
|
||||
}
|
||||
}
|
||||
@@ -565,15 +565,15 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
return ret;
|
||||
}
|
||||
ipl::math::VEC2 ipl::controller::Revolution::getHorizon() const {
|
||||
return math::VEC2(unk_0x20->horizon.x, unk_0x20->horizon.y);
|
||||
return math::VEC2(mpKpadStatus->horizon.x, mpKpadStatus->horizon.y);
|
||||
}
|
||||
ipl::math::VEC2 ipl::controller::Revolution::getDpdPos() const {
|
||||
return math::VEC2(unk_0x20->pos.x, unk_0x20->pos.y);
|
||||
return math::VEC2(mpKpadStatus->pos.x, mpKpadStatus->pos.y);
|
||||
}
|
||||
bool ipl::controller::Revolution::upTrg(u32 button) const {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
if (unk_0x20->release & (button & 0xFFFF)) {
|
||||
if (mpKpadStatus->release & (button & 0xFFFF)) {
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
@@ -582,7 +582,7 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
bool ipl::controller::Revolution::downTrg(u32 button) const {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
if (unk_0x20->trig & (button & 0xFFFF)) {
|
||||
if (mpKpadStatus->trig & (button & 0xFFFF)) {
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -152,9 +152,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
Revolution::Revolution(int chan, int type, KPADStatus& status) : Base(chan, type, status) {
|
||||
unk_0x1D = 0;
|
||||
unk_0x1E = 0;
|
||||
unk_0x20 = &status;
|
||||
mbPinching = 0;
|
||||
mbWasPinching = 0;
|
||||
mpKpadStatus = &status;
|
||||
}
|
||||
|
||||
Interface* Manager::getMasterController() {
|
||||
|
||||
@@ -43,13 +43,13 @@ namespace ipl {
|
||||
mMessageID = msgId;
|
||||
|
||||
// Debug related? (seems to be incomplete; unused)
|
||||
unk_0x0C = arg2;
|
||||
unk_0x10 = arg3;
|
||||
mArg2 = arg2;
|
||||
mArg3 = arg3;
|
||||
if (arg1) {
|
||||
strncpy(unk_0x14, arg1, sizeof(unk_0x14));
|
||||
unk_0x14[sizeof(unk_0x14) - 1] = 0;
|
||||
strncpy(mArg1, arg1, sizeof(mArg1));
|
||||
mArg1[sizeof(mArg1) - 1] = 0;
|
||||
} else {
|
||||
memset(unk_0x14, 0, sizeof(unk_0x14));
|
||||
memset(mArg1, 0, sizeof(mArg1));
|
||||
}
|
||||
|
||||
curThread = OSGetCurrentThread();
|
||||
|
||||
@@ -47,7 +47,7 @@ namespace ipl {
|
||||
(((mLastError > NWC24_ERR_FILE_OPEN || mLastError < NWC24_ERR_FILE_OTHER) && mLastError != NWC24_ERR_NAND_CORRUPT) && \
|
||||
(mLastError != NWC24_ERR_FILE_EXISTS && mLastError != NWC24_ERR_INTERNAL_VF && mLastError != NWC24_ERR_FILE_BROKEN))
|
||||
|
||||
Manager::Manager(EGG::Heap* heap) : mbReviecedMsg(false), unk_0xA31(false), mbReceivePaused(false), unk_0xA33(false) {
|
||||
Manager::Manager(EGG::Heap* heap) : mbReviecedMsg(false), mbReceiving(false), mbReceivePaused(false), mbNewTitleTblReady(false) {
|
||||
OSInitMutex(&mLock);
|
||||
OSInitMutex(&mAutoLock);
|
||||
|
||||
@@ -526,7 +526,7 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
unk_0xA31 = true;
|
||||
mbReceiving = true;
|
||||
|
||||
NWC24UserId myUserId;
|
||||
getMyUserId(&myUserId);
|
||||
@@ -910,8 +910,8 @@ namespace ipl {
|
||||
|
||||
close();
|
||||
|
||||
unk_0xA33 = true;
|
||||
unk_0xA31 = false;
|
||||
mbNewTitleTblReady = true;
|
||||
mbReceiving = false;
|
||||
}
|
||||
|
||||
void Manager::addDlTask() {
|
||||
@@ -996,7 +996,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
BOOL Manager::getNewTitleTbl(u32* titleTbl) const {
|
||||
if (!unk_0xA33) {
|
||||
if (!mbNewTitleTblReady) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ namespace ipl {
|
||||
if (System::getPostmanManager()->IsUnknown() ||
|
||||
(System::getSceneManager() != NULL && System::getScene(SCENE_ADDRESS) != NULL)) {
|
||||
if (System::getNwc24Manager() != NULL && !System::isNandFull()) {
|
||||
if (System::createdAfterAndLibMgr() && !System::getNwc24Manager()->isUnk0xA31()) {
|
||||
if (System::createdAfterAndLibMgr() && !System::getNwc24Manager()->isReceivingIdle()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user