Compare commits
135 Commits
cleanup/cn
...
cleanup/ez
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8368b38a25 | ||
|
|
30e1ef0938 | ||
|
|
9ff511afd7 | ||
|
|
2f206d7fe8 | ||
|
|
d6b044ff32 | ||
|
|
0e73a554de | ||
|
|
d4cdae2177 | ||
|
|
4b831f9ec0 | ||
|
|
fbecedd948 | ||
|
|
f533c9f0f5 | ||
|
|
1366528dd6 | ||
|
|
bd27e72a48 | ||
|
|
08c53bbe23 | ||
|
|
483005a940 | ||
|
|
b18d01602a | ||
|
|
e38a4cebfe | ||
|
|
81dc9d2b3d | ||
|
|
f645518810 | ||
|
|
51713e735e | ||
|
|
ca998ad7cf | ||
|
|
486c20c623 | ||
|
|
6adb0dc52e | ||
|
|
c9f64372cf | ||
|
|
9f4a70db74 | ||
|
|
e305e6047c | ||
|
|
df48bc9f76 | ||
|
|
3bd814f042 | ||
|
|
51b78ed7da | ||
|
|
3eb5d8faee | ||
|
|
d99950fc88 | ||
|
|
98d03059bd | ||
|
|
830e2f3920 | ||
|
|
c1b00d8a14 | ||
|
|
9acdd7f8dc | ||
|
|
abf047831a | ||
|
|
17be3b014b | ||
|
|
0d9d3d1081 | ||
|
|
196b14aa58 | ||
|
|
1dde229702 | ||
|
|
94c03497ff | ||
|
|
e9dd012c09 | ||
|
|
90e7b0ff2c | ||
|
|
f7ec594202 | ||
|
|
ceefb50e42 | ||
|
|
5d1a8bd697 | ||
|
|
c42fb1fe71 | ||
|
|
8e96e8a722 | ||
|
|
854cc579df | ||
|
|
26a36e2964 | ||
|
|
8729671a43 | ||
|
|
08f5f08a13 | ||
|
|
893afc25b4 | ||
|
|
dee9f9d8ea | ||
|
|
728bfa984b | ||
|
|
921234fdac | ||
|
|
9d6f9dce74 | ||
|
|
f1bcb9d78c | ||
|
|
efda1f0093 | ||
|
|
115bc95101 | ||
|
|
cbac1eda5a | ||
|
|
f0de86aa16 | ||
|
|
215f40f835 | ||
|
|
5b364355cd | ||
|
|
ea8e69528f | ||
|
|
2a5fbdb4b9 | ||
|
|
dd3cd80d9b | ||
|
|
3cbe527d23 | ||
|
|
3ab6d87c3d | ||
|
|
40653c3c02 | ||
|
|
f0829ff810 | ||
|
|
ffdd7b58e0 | ||
|
|
1a0f83a156 | ||
|
|
a3d088e4d3 | ||
|
|
3b90bd66c6 | ||
|
|
b395269be6 | ||
|
|
60bc67e097 | ||
|
|
4e8223f3d4 | ||
|
|
3f36d5f4cc | ||
|
|
1f0dc64062 | ||
|
|
5db0cd6086 | ||
|
|
54b44a3534 | ||
|
|
1493baaba0 | ||
|
|
22dd088277 | ||
|
|
1bbc40cb3b | ||
|
|
e6bf9cc669 | ||
|
|
ffd9cc4a69 | ||
|
|
eb8f78788d | ||
|
|
889823ed67 | ||
|
|
7dea4122fc | ||
|
|
1802d45758 | ||
|
|
130cc9e88e | ||
|
|
a801d1c5d6 | ||
|
|
8ab07fbb20 | ||
|
|
f68fcc0f9b | ||
|
|
5ad481ae40 | ||
|
|
713951c551 | ||
|
|
b47507aa3f | ||
|
|
01a73b600f | ||
|
|
83b577cf62 | ||
|
|
f67990d237 | ||
|
|
ad85ad1537 | ||
|
|
f32665703f | ||
|
|
e062e1c669 | ||
|
|
76a60f8c1a | ||
|
|
63579601e2 | ||
|
|
e46bac9a1b | ||
|
|
1f224c53c1 | ||
|
|
30e2147479 | ||
|
|
6ffcbf8f46 | ||
|
|
47add32987 | ||
|
|
e0ea552982 | ||
|
|
c7949ac4f0 | ||
|
|
e697514b7b | ||
|
|
32c3f7f2cd | ||
|
|
1618565c1d | ||
|
|
6040414eec | ||
|
|
08acc800f1 | ||
|
|
0703b62968 | ||
|
|
86c3cacc2d | ||
|
|
f7e6fc5387 | ||
|
|
dfbb774ce4 | ||
|
|
9b69048f06 | ||
|
|
602b10ed43 | ||
|
|
f0a91338f4 | ||
|
|
ff568a273c | ||
|
|
9f6ef656fd | ||
|
|
9d2f607b3f | ||
|
|
c836ab8bae | ||
|
|
b889c52efc | ||
|
|
282c29b2c7 | ||
|
|
27e37fd7ee | ||
|
|
00051c32c6 | ||
|
|
80fecf3aa3 | ||
|
|
37724c57d6 | ||
|
|
1a32db7bdc |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.37% | 87.69% | 61.93% | 91.37% |
|
||||
| 99.38% | 88.00% | 62.37% | 92.07% |
|
||||
|
||||
units 917/1027 complete, functions 12211/12563 matched.
|
||||
units 920/1027 complete, functions 12226/12563 matched.
|
||||
|
||||
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
|
||||
<!-- progress:end -->
|
||||
|
||||
@@ -29,8 +29,8 @@ force_active:
|
||||
- strspn
|
||||
- strcspn
|
||||
- padding__Q23ipl5scene
|
||||
- lbl_81695063
|
||||
- lbl_81695067
|
||||
- scRsnOuiPad
|
||||
- scWpaOuiPad
|
||||
- __vt__Q49textinput6extend4memo19NigaoeEventObserver
|
||||
|
||||
# textinput::toolbar::csPaneToAnimation points one past the end of csAninationFile.
|
||||
|
||||
@@ -804,14 +804,14 @@ src/scene/sdChannelSelect/iplSDChannelObj.cpp:
|
||||
.rodata start:0x81610608 end:0x81610918
|
||||
.data start:0x81654B38 end:0x81654F98
|
||||
.sdata2 start:0x81694B18 end:0x81694B60
|
||||
.sdata start:0x81696DD0 end:0x81696E40
|
||||
.sdata start:0x81696DD0 end:0x81696E30
|
||||
|
||||
src/scene/sdChannelTitle/iplSDChannelTitle.cpp:
|
||||
.text start:0x813E4BBC end:0x813E947C
|
||||
.rodata start:0x81610918 end:0x81610948
|
||||
.data start:0x81654F98 end:0x81655638
|
||||
.sdata2 start:0x81694B60 end:0x81694B88
|
||||
.sdata start:0x81696E40 end:0x81696EF0
|
||||
.sdata start:0x81696E30 end:0x81696EF0
|
||||
|
||||
src/scene/sdButton/iplSDButton.cpp:
|
||||
.text start:0x813E947C end:0x813EA88C
|
||||
@@ -1054,7 +1054,7 @@ src/keyboard/tiNw4rManager.cpp:
|
||||
.data start:0x8165F818 end:0x8165F8F0
|
||||
.sdata2 start:0x81694E10 end:0x81694E28
|
||||
|
||||
src/keyboard/tiManager.cpp:
|
||||
src/keyboard/tiKeyboard.cpp:
|
||||
.text start:0x81437558 end:0x81439608
|
||||
.ctors start:0x8160D208 end:0x8160D20C
|
||||
.data start:0x8165F8F0 end:0x81660378
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -918,9 +918,9 @@ config.libs = [
|
||||
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiAtokString.cpp", extra_cflags=["-O4,p"]), # for 4.3J
|
||||
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
|
||||
Object(NonMatching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiNw4rManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiUtil.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiCpData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiSwData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
@@ -1063,7 +1063,7 @@ config.libs = [
|
||||
Object(NonMatching, "nhttp/NHTTP_socket_RVL.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_stdlib_RVL.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_thread.c"),
|
||||
Object(NonMatching, "nhttp/d_nhttp_private.c"),
|
||||
Object(Matching, "nhttp/d_nhttp_private.c"),
|
||||
Object(Matching, "nhttp/d_nhttp.c"),
|
||||
Object(Matching, "nhttp/d_nhttp_common.c"),
|
||||
]
|
||||
|
||||
@@ -133,7 +133,11 @@ namespace textinput {
|
||||
friend class Base;
|
||||
public:
|
||||
RowInfoManager(u16 maxLength) : mpInfo(NULL), mMaxLength(maxLength), mpAllocator(NULL) {}
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
void init() __attribute__((never_inline));
|
||||
#else
|
||||
void init();
|
||||
#endif
|
||||
~RowInfoManager();
|
||||
#endif
|
||||
private:
|
||||
|
||||
@@ -135,8 +135,13 @@ namespace textinput {
|
||||
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
|
||||
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const { return mpCellPhoneKeyboard; }
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void* getSignKeyboard();
|
||||
virtual const void* getSignKeyboard() const;
|
||||
#else
|
||||
virtual void* getSignKeyboard() { return mpSignWindow; }
|
||||
virtual const void* getSignKeyboard() const { return mpSignWindow; }
|
||||
#endif
|
||||
|
||||
virtual candidatebox::LayoutByNW4R* getCandidateBox() { return mpCandidateBox; }
|
||||
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
|
||||
@@ -144,8 +149,13 @@ namespace textinput {
|
||||
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
|
||||
virtual const toolbar::LayoutByNW4R* getToolBar() const { return mpToolBar; }
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void* getPredictLanguageSelectDialog();
|
||||
virtual const void* getPredictLanguageSelectDialog() const;
|
||||
#else
|
||||
virtual void* getPredictLanguageSelectDialog() { return mpPredictLanguageDialog; }
|
||||
virtual const void* getPredictLanguageSelectDialog() const { return mpPredictLanguageDialog; }
|
||||
#endif
|
||||
|
||||
virtual inputform::EditBuffer* createEditBuffer();
|
||||
virtual keyboard::hwkey::HWKeyboard* createHWKeyboard();
|
||||
|
||||
@@ -293,8 +293,8 @@ namespace ipl {
|
||||
LOCKED_DIALOG_ANIM_MAX,
|
||||
};
|
||||
|
||||
static void iplChannelTitle_813BA684(void* work);
|
||||
static void iplChannelTitle_813BA784(void* work);
|
||||
static void markTmdReadyTask(void* work);
|
||||
static void deleteTmpTitleContentTask(void* work);
|
||||
static void getTmdTask(void* work);
|
||||
static void getTicketLimitTask(void* work);
|
||||
static BOOL isTimeLimitedTicket(ESTicketView * ticket, u32* remainTime = NULL);
|
||||
|
||||
@@ -81,22 +81,22 @@ namespace ipl {
|
||||
void* mpThumbnailData;
|
||||
NandSDWorker::SDAppMetaEntry mAppMeta;
|
||||
};
|
||||
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
EGG::ExpHeap* secondHeap);
|
||||
extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane);
|
||||
extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile);
|
||||
extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool selected);
|
||||
extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int enabled);
|
||||
extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel);
|
||||
extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_calc(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane);
|
||||
extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile);
|
||||
extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool selected);
|
||||
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int enabled);
|
||||
extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel);
|
||||
extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel);
|
||||
|
||||
union SDChannelSelectCommandArguments {
|
||||
u32 values[3];
|
||||
|
||||
@@ -14,8 +14,8 @@ namespace ipl {
|
||||
WAIT_UNTIL_FADE_IN = 15
|
||||
};
|
||||
|
||||
TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& unk2,
|
||||
f32 unk3 = 120.0f, f32 unk4 = 30.0f);
|
||||
TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& initialPos,
|
||||
f32 margin16x9 = 120.0f, f32 margin4x3 = 30.0f);
|
||||
~TextBalloon();
|
||||
|
||||
void calc();
|
||||
@@ -31,7 +31,7 @@ namespace ipl {
|
||||
void fadeout();
|
||||
void fadeoutForce();
|
||||
|
||||
void setPos(const math::VEC3& pos, bool unk0, int unk1);
|
||||
void setPos(const math::VEC3& pos, bool use16x9X, int hAlign);
|
||||
void updatePos(const math::VEC3& pos);
|
||||
|
||||
void set_translate(const math::VEC3& trans);
|
||||
@@ -50,7 +50,7 @@ namespace ipl {
|
||||
|
||||
undefined4 unk_0x00;
|
||||
undefined4 unk_0x04;
|
||||
BOOL unk_0x08;
|
||||
BOOL mbWaitingFadeIn; // 0x08
|
||||
|
||||
layout::Object* mpLayout; // 0x0C
|
||||
|
||||
@@ -60,10 +60,10 @@ namespace ipl {
|
||||
|
||||
u32 mTextLen; // 0x18
|
||||
math::VEC3 mBalloonPos; // 0x1C
|
||||
undefined4 unk_0x28;
|
||||
undefined unk_0x2C;
|
||||
f32 unk_0x30;
|
||||
f32 unk_0x34;
|
||||
undefined4 mHAlign; // 0x28
|
||||
undefined mbUse16x9X; // 0x2C
|
||||
f32 mMargin16x9; // 0x30
|
||||
f32 mMargin4x3; // 0x34
|
||||
|
||||
int mWaitUntilFadeIn; // 0x38
|
||||
|
||||
|
||||
@@ -336,19 +336,19 @@ namespace ipl {
|
||||
|
||||
BOOL nand_error_handling(int code);
|
||||
|
||||
SEntry* fn_8133A4E0(ESTitleId titleId);
|
||||
u32 fn_8133A57C(ESTitleId titleId);
|
||||
u32 fn_8133A5B8(ESTitleId titleId);
|
||||
BOOL fn_8133A5F0(ESTitleId titleId);
|
||||
BOOL fn_8133A634(ESTitleId titleId);
|
||||
BOOL fn_8133A678(ESTitleId titleId);
|
||||
BOOL fn_8133A6B8(ESTitleId titleId);
|
||||
BOOL fn_8133A73C(ESTitleId titleId);
|
||||
nand::MetaFile* fn_8133A7A4(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::MetaFile* fn_8133A85C(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::SharedFile* fn_8133A924(EGG::Heap* heap, ESTitleId titleId);
|
||||
void fn_8133A9F0();
|
||||
void fn_8133AA50(ESTitleId titleId);
|
||||
SEntry* findEntryByTitleId(ESTitleId titleId);
|
||||
u32 getBannerCSIdx(ESTitleId titleId);
|
||||
u32 getSoundSize(ESTitleId titleId);
|
||||
BOOL needsNetSetting(ESTitleId titleId);
|
||||
BOOL usesAltSound(ESTitleId titleId);
|
||||
BOOL isMissingTicket(ESTitleId titleId);
|
||||
BOOL isNewsChannelV6Plus(ESTitleId titleId);
|
||||
BOOL isOperaChannel(ESTitleId titleId);
|
||||
nand::MetaFile* readBannerMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::MetaFile* readSoundMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::SharedFile* readBannerCSAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
void clearTmpChannel();
|
||||
void unloadBanner(ESTitleId titleId);
|
||||
|
||||
BOOL isReady() { return mState == FINISH; }
|
||||
|
||||
|
||||
@@ -26,6 +26,18 @@ namespace ipl {
|
||||
namespace savedata {
|
||||
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
|
||||
|
||||
struct ChannelSlot {
|
||||
u8 valid; // 0x00 (primaryType)
|
||||
u8 pad[3]; // 0x01
|
||||
s32 titleId; // 0x04 (sceneID)
|
||||
u8 rest[8]; // 0x08
|
||||
};
|
||||
|
||||
struct ChannelPage {
|
||||
u8 pad[0x30];
|
||||
ChannelSlot slots[MAX_CHANNEL_INDEX]; // 0x30
|
||||
};
|
||||
|
||||
class Manager {
|
||||
public:
|
||||
Manager(EGG::Heap* heap);
|
||||
|
||||
@@ -301,9 +301,9 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
if (error == OS_EXCEPTION_FLOATING_POINT_EXCEPTION) {
|
||||
u32 uVar1 = sException.FPCSR_COPY;
|
||||
uVar1 &= (((uVar1 & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((uVar1 & 0x20000000) != 0) {
|
||||
u32 fpcsr = sException.FPCSR_COPY;
|
||||
fpcsr &= (((fpcsr & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((fpcsr & 0x20000000) != 0) {
|
||||
Exception_Printf_(" FPE: Invalid operation\n");
|
||||
if ((sException.FPCSR_COPY & 0x1000000) != 0) {
|
||||
Exception_Printf_(" SNaN\n");
|
||||
@@ -333,16 +333,16 @@ namespace nw4r {
|
||||
Exception_Printf_(" Invalid integer convert\n");
|
||||
}
|
||||
}
|
||||
if ((uVar1 & 0x10000000) != 0) {
|
||||
if ((fpcsr & 0x10000000) != 0) {
|
||||
Exception_Printf_(" FPE: Overflow\n");
|
||||
}
|
||||
if ((uVar1 & 0x8000000) != 0) {
|
||||
if ((fpcsr & 0x8000000) != 0) {
|
||||
Exception_Printf_(" FPE: Underflow\n");
|
||||
}
|
||||
if ((uVar1 & 0x4000000) != 0) {
|
||||
if ((fpcsr & 0x4000000) != 0) {
|
||||
Exception_Printf_(" FPE: Zero division\n");
|
||||
}
|
||||
if ((uVar1 & 0x2000000) != 0) {
|
||||
if ((fpcsr & 0x2000000) != 0) {
|
||||
Exception_Printf_(" FPE: Inexact result\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
#include <nw4r/db/assert.h>
|
||||
|
||||
extern "C" const u8 lbl_81695550 = 255;
|
||||
extern "C" const u8 lbl_81695551 = 255;
|
||||
extern "C" const u8 lbl_81695552 = 255;
|
||||
extern "C" const u8 lbl_81695553 = 0;
|
||||
extern "C" char lbl_816719DC[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
extern "C" const u8 scLytFatalColorR = 255;
|
||||
extern "C" const u8 scLytFatalColorG = 255;
|
||||
extern "C" const u8 scLytFatalColorB = 255;
|
||||
extern "C" const u8 scLytFatalColorA = 0;
|
||||
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
|
||||
#undef NW4R_ASSERT
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {*((volatile const u8*)&::lbl_81695550), *((volatile const u8*)&::lbl_81695551), \
|
||||
*((volatile const u8*)&::lbl_81695552), *((volatile const u8*)&::lbl_81695553)}; \
|
||||
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
|
||||
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::lbl_816719DC); \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <tmc_jpeg_internal.h>
|
||||
|
||||
static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work);
|
||||
static s32 TMCJPEG_814EB108(TMCCJPEGDecWork* work);
|
||||
static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work);
|
||||
static s32 refillJpegBuffer(TMCCJPEGDecWork* work);
|
||||
|
||||
s32 TMCJPEGDEC_init_ptr_buff(TMCCJPEGDecWork* work, void* param) {
|
||||
u32 readSize;
|
||||
@@ -52,7 +52,7 @@ s32 TMCJPEGDEC_get_byte(u8* dst, TMCCJPEGDecWork* work) {
|
||||
|
||||
if (work->pBufCur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
s32 r = TMCJPEG_814EB108(work);
|
||||
s32 r = refillJpegBuffer(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -69,7 +69,7 @@ s32 TMCJPEGDEC_get_byte(u8* dst, TMCCJPEGDecWork* work) {
|
||||
|
||||
if (cur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
s32 r = TMCJPEG_814EB108(work);
|
||||
s32 r = refillJpegBuffer(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -92,7 +92,7 @@ s32 TMCJPEGDEC_get_wbyte(u16* dst, TMCCJPEGDecWork* work) {
|
||||
|
||||
if (work->pBufCur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
r = TMCJPEG_814EB108(work);
|
||||
r = refillJpegBuffer(work);
|
||||
if (r < 0) {
|
||||
goto br;
|
||||
} else {
|
||||
@@ -119,7 +119,7 @@ s32 TMCJPEGDEC_get_wbyte(u16* dst, TMCCJPEGDecWork* work) {
|
||||
}
|
||||
|
||||
if (work->remaining != 0) {
|
||||
r = TMCJPEG_814EB108(work);
|
||||
r = refillJpegBuffer(work);
|
||||
if (r >= 0) {
|
||||
goto o1;
|
||||
}
|
||||
@@ -144,7 +144,7 @@ p2:
|
||||
goto r2;
|
||||
}
|
||||
if (work->remaining != 0) {
|
||||
r = TMCJPEG_814EB108(work);
|
||||
r = refillJpegBuffer(work);
|
||||
if (r < 0)
|
||||
goto ez;
|
||||
else {
|
||||
@@ -166,7 +166,7 @@ r2:
|
||||
}
|
||||
|
||||
if (work->remaining != 0) {
|
||||
r = TMCJPEG_814EB108(work);
|
||||
r = refillJpegBuffer(work);
|
||||
if (r < 0)
|
||||
goto ez;
|
||||
else {
|
||||
@@ -193,7 +193,7 @@ s32 TMCJPEGDEC_get_sbyte(u8* dst, u32 count, TMCCJPEGDecWork* work) {
|
||||
for (i = 0; i < count; i++) {
|
||||
if (work->pBufCur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
r = TMCJPEG_814EB108(work);
|
||||
r = refillJpegBuffer(work);
|
||||
if (r < 0) {
|
||||
goto copy_byte;
|
||||
} else {
|
||||
@@ -214,7 +214,7 @@ s32 TMCJPEGDEC_get_sbyte(u8* dst, u32 count, TMCCJPEGDecWork* work) {
|
||||
goto r0;
|
||||
}
|
||||
if (work->remaining != 0) {
|
||||
r = TMCJPEG_814EB108(work);
|
||||
r = refillJpegBuffer(work);
|
||||
if (r >= 0) {
|
||||
goto r0;
|
||||
}
|
||||
@@ -251,7 +251,7 @@ lp:
|
||||
if (work->remaining == 0) {
|
||||
goto er1;
|
||||
}
|
||||
r = TMCJPEG_814EB108(work);
|
||||
r = refillJpegBuffer(work);
|
||||
if (r >= 0) {
|
||||
goto lc;
|
||||
}
|
||||
@@ -271,7 +271,7 @@ lc:
|
||||
if (work->remaining == 0) {
|
||||
goto er2;
|
||||
}
|
||||
r = TMCJPEG_814EB108(work);
|
||||
r = refillJpegBuffer(work);
|
||||
if (r >= 0) {
|
||||
goto ret0;
|
||||
}
|
||||
@@ -320,7 +320,7 @@ s32 TMCJPEGDEC_load_buff(TMCCJPEGDecWork* work) {
|
||||
if (work->remaining == 0) {
|
||||
break;
|
||||
}
|
||||
r = TMCJPEG_814EAF50(work);
|
||||
r = refillJpegBufferAfterFF(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -345,7 +345,7 @@ s32 TMCJPEGDEC_load_buff(TMCCJPEGDecWork* work) {
|
||||
if (work->remaining == 0) {
|
||||
break;
|
||||
}
|
||||
r = TMCJPEG_814EAF50(work);
|
||||
r = refillJpegBufferAfterFF(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -364,7 +364,7 @@ s32 TMCJPEGDEC_chk_possible_size(TMCCJPEGDecWork* work) {
|
||||
return work->pBufEnd - work->pBufCur;
|
||||
}
|
||||
|
||||
static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work) {
|
||||
static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work) {
|
||||
u8 marker;
|
||||
u32 readSize;
|
||||
u8* dest;
|
||||
@@ -410,7 +410,7 @@ static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static s32 TMCJPEG_814EB108(TMCCJPEGDecWork* work) {
|
||||
static s32 refillJpegBuffer(TMCCJPEGDecWork* work) {
|
||||
u8* end;
|
||||
u32 i, j;
|
||||
s32 readSize;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
extern void* memset(void* dest, s32 val, u32 count);
|
||||
|
||||
extern const u32 lbl_8161E080[64] = {
|
||||
extern const u32 scJpegAanScale[64] = {
|
||||
0x00000100, 0x000000B9, 0x000000C4, 0x000000DA, 0x00000100, 0x00000146, 0x000001D9, 0x000003A0, 0x000000B9, 0x00000085, 0x0000008D,
|
||||
0x0000009D, 0x000000B9, 0x000000EB, 0x00000155, 0x0000029D, 0x000000C4, 0x0000008D, 0x00000096, 0x000000A7, 0x000000C4, 0x000000F9,
|
||||
0x0000016A, 0x000002C6, 0x000000DA, 0x0000009D, 0x000000A7, 0x000000B9, 0x000000DA, 0x00000115, 0x00000192, 0x00000315, 0x00000100,
|
||||
@@ -1424,7 +1424,7 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
s32 r;
|
||||
|
||||
d = tblCopy;
|
||||
*(CopyBlock64*)d = *(CopyBlock64*)lbl_8161E080;
|
||||
*(CopyBlock64*)d = *(CopyBlock64*)scJpegAanScale;
|
||||
|
||||
scaleInfo = (QuantizationTables*)&work->scaleFlag;
|
||||
|
||||
|
||||
@@ -217,7 +217,7 @@ struct __zi8_work_data_s {
|
||||
ziU16 unk_0x14;
|
||||
ziU8 unk_0x16;
|
||||
ziU8 unk_0x17;
|
||||
ziU8 unk_0x18;
|
||||
ziU8 subLanguage; // 0x18
|
||||
ziU8 unk_0x19;
|
||||
ziU16 unk_0x1A;
|
||||
ziU8 unk_0x1C[3];
|
||||
|
||||
@@ -55,7 +55,7 @@ ziU32 Zi8GetTableData(ziU8 lang, ziU8 tableIdx, ziU8 memberId ZI_NEED_WORK) {
|
||||
if (langIdx-- != 0) {
|
||||
tableData = ZI_WORK->langEntries[langIdx].tableData;
|
||||
if ((lang == ZI8_LANG_ZH) && (tableData[3] >= 4) &&
|
||||
((ZI_WORK->unk_0x18 == 1) || (ZI_WORK->unk_0x18 == 0x80) || (ZI_WORK->unk_0x18 == 0x40))) {
|
||||
((ZI_WORK->subLanguage == 1) || (ZI_WORK->subLanguage == 0x80) || (ZI_WORK->subLanguage == 0x40))) {
|
||||
offset = ((tableData[0x8B] << 0x10) + (tableData[0x8C] << 8) + tableData[0x8D]);
|
||||
if (offset != 0) {
|
||||
tableData += offset;
|
||||
|
||||
@@ -490,7 +490,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
ZI_WORK->unk_0x00 = '\0';
|
||||
}
|
||||
}
|
||||
ZI_WORK->unk_0x18 = parameters->subLanguage;
|
||||
ZI_WORK->subLanguage = parameters->subLanguage;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1,ZI_WORK) & 2;
|
||||
options->maxCount = ZI_WORK->unk_0x10;
|
||||
options->maxWordLength = ZI_WORK->unk_0x0A;
|
||||
|
||||
@@ -24,17 +24,17 @@ ziU8 Zi8GetZHCharSet(ziPtr workData) {
|
||||
return 0;
|
||||
}
|
||||
if (Zi8GetTableCount(1, 10, workData) != 0) {
|
||||
bak = ((struct __zi8_work_data_s*)workData)->unk_0x18;
|
||||
((struct __zi8_work_data_s*)workData)->unk_0x18 = 1;
|
||||
bak = ((struct __zi8_work_data_s*)workData)->subLanguage;
|
||||
((struct __zi8_work_data_s*)workData)->subLanguage = 1;
|
||||
addr = Zi8GetTableAddress(1, 10, workData);
|
||||
p = (ziU8*)addr;
|
||||
v0 = (ziU16)((ziU16)p[0] | ((ziU16)p[1] << 8));
|
||||
((struct __zi8_work_data_s*)workData)->unk_0x18 = 0;
|
||||
((struct __zi8_work_data_s*)workData)->subLanguage = 0;
|
||||
addr = Zi8GetTableAddress(1, 10, workData);
|
||||
p = (ziU8*)addr;
|
||||
v1 = (ziU16)((ziU16)p[2] | ((ziU16)p[3] << 8));
|
||||
v2 = (ziU16)((ziU16)p[4] | ((ziU16)p[5] << 8));
|
||||
((struct __zi8_work_data_s*)workData)->unk_0x18 = bak;
|
||||
((struct __zi8_work_data_s*)workData)->subLanguage = bak;
|
||||
if (v0 != 0) {
|
||||
if (v0 > 0x4E20) {
|
||||
charSet |= 8;
|
||||
|
||||
@@ -65,7 +65,7 @@ ziU16 Zi8Uni2Ptr(ziU16 ch, ziE12* buf ZI_NEED_WORK) {
|
||||
}
|
||||
}
|
||||
e = (ziU8*)table;
|
||||
if (WORKP->unk_0x1B18 != ZI8_NULL && WORKP->unk_0x1B24 == WORKP->unk_0x18) {
|
||||
if (WORKP->unk_0x1B18 != ZI8_NULL && WORKP->unk_0x1B24 == WORKP->subLanguage) {
|
||||
if ((ziU16)ch >= WORKP->unk_0x1B1C && (ziU16)ch <= WORKP->unk_0x1B1E) {
|
||||
i = (ziU16)(ch - WORKP->unk_0x1B1C);
|
||||
goto map;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
ziU32 Zi8GetTableAddress(ziU8 lang, ziU8 tableIdx, ziPtr workData);
|
||||
ziU16 Zi8GetTableCount(ziU8 lang, ziU8 tableIdx, ziPtr workData);
|
||||
|
||||
ziU8 Zi8_814813FC(ziWChar character, ziU8* result, ziU16* index, ziPtr workData) {
|
||||
ziU8 Zi8LookupKoreanChar(ziWChar character, ziU8* result, ziU16* index, ziPtr workData) {
|
||||
ziU16 i;
|
||||
ziU8* table;
|
||||
|
||||
@@ -23,7 +23,7 @@ ziU8 Zi8_814813FC(ziWChar character, ziU8* result, ziU16* index, ziPtr workData)
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData);
|
||||
ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData);
|
||||
|
||||
ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
ziPtr workData) {
|
||||
@@ -97,9 +97,9 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
|
||||
result = 0;
|
||||
for (currentCharacter = 0; currentCharacter < state.elementIndex; currentCharacter++) {
|
||||
if (Zi8_814813FC(buffer[currentCharacter], &state.characterIndex,
|
||||
if (Zi8LookupKoreanChar(buffer[currentCharacter], &state.characterIndex,
|
||||
&state.inputIndex, workData) != 0) {
|
||||
state.matched = Zi8_81481E6C(&state.nextIndex,
|
||||
state.matched = Zi8MatchKoreanSequence(&state.nextIndex,
|
||||
buffer + currentCharacter + 1,
|
||||
state.characterIndex,
|
||||
(state.elementIndex - currentCharacter) - 1,
|
||||
@@ -235,7 +235,7 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
return result;
|
||||
}
|
||||
|
||||
ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData) {
|
||||
ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData) {
|
||||
ziU16 nestedScratch;
|
||||
ziU16 nestedIndexStorage;
|
||||
ziU16 index1;
|
||||
@@ -375,8 +375,8 @@ ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPt
|
||||
}
|
||||
if ((index3 >= tableCount) || (firstCharacter != (table + index3 * 4)[2]) ||
|
||||
(input[1] != (table + index3 * 4)[1]) || (input[0] != table[index3 * 4])) {
|
||||
if ((Zi8_814813FC(input[1], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||
(Zi8_81481E6C(&nestedIndexStorage, input + 2, mappedCharacter, 1, workData) != 0)) {
|
||||
if ((Zi8LookupKoreanChar(input[1], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 2, mappedCharacter, 1, workData) != 0)) {
|
||||
*resultIndex = index1;
|
||||
return 1;
|
||||
}
|
||||
@@ -397,8 +397,8 @@ ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPt
|
||||
if ((index4 >= tableCount) || (firstCharacter != (table + index4 * 4)[3]) ||
|
||||
(input[2] != (table + index4 * 4)[2]) || (input[1] != (table + index4 * 4)[1]) ||
|
||||
(input[0] != table[index4 * 4])) {
|
||||
if ((Zi8_814813FC(input[2], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||
(Zi8_81481E6C(&nestedIndexStorage, input + 3, mappedCharacter, 1, workData) != 0)) {
|
||||
if ((Zi8LookupKoreanChar(input[2], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 3, mappedCharacter, 1, workData) != 0)) {
|
||||
*resultIndex = index2;
|
||||
return 2;
|
||||
}
|
||||
@@ -409,8 +409,8 @@ ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPt
|
||||
*resultIndex = index4;
|
||||
return 4;
|
||||
}
|
||||
if ((Zi8_814813FC(input[3], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||
(Zi8_81481E6C(&nestedIndexStorage, input + 4, mappedCharacter, 1, workData) != 0)) {
|
||||
if ((Zi8LookupKoreanChar(input[3], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 4, mappedCharacter, 1, workData) != 0)) {
|
||||
*resultIndex = index3;
|
||||
return 3;
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ ziU16 Zi8GetTableCount(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
|
||||
ziU32 Zi8GetTableAddress(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
|
||||
ziU8 Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data);
|
||||
|
||||
ziBool Zi8_81484484(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) {
|
||||
ziBool Zi8MapKeyCode(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) {
|
||||
if (character == 0xeffa) {
|
||||
*output = 0;
|
||||
} else if ((character >= 0xeff1) && (character <= 0xeff9)) {
|
||||
@@ -58,7 +58,7 @@ ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, zi
|
||||
*chars = 0;
|
||||
if (ZI_WORK->userKeys[language] != 0) {
|
||||
customTable = ZI_WORK->userKeys[language];
|
||||
if (!Zi8_81484484(key, &key, __zi8_work_data)) {
|
||||
if (!Zi8MapKeyCode(key, &key, __zi8_work_data)) {
|
||||
return 0;
|
||||
}
|
||||
keyChars = customTable->lower[key];
|
||||
@@ -87,7 +87,7 @@ tables_ready:
|
||||
Zi8ReplaceLastError(0x962, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
if (!Zi8_81484484(key, &key, __zi8_work_data) || (key >= numKeys)) {
|
||||
if (!Zi8MapKeyCode(key, &key, __zi8_work_data) || (key >= numKeys)) {
|
||||
Zi8ReplaceLastError(300, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -457,7 +457,7 @@ void bta_dm_signal_strength(tBTA_DM_MSG *p_data);
|
||||
|
||||
void bta_dm_acl_change(tBTA_DM_MSG *p_data);
|
||||
|
||||
BOOLEAN bta_sys_check_compress(int, UINT8 app_id, BD_ADDR peer_addr);
|
||||
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr);
|
||||
|
||||
void bta_dm_keep_acl(tBTA_DM_MSG *p_data);
|
||||
void bta_dm_immediate_disable(void);
|
||||
|
||||
@@ -151,7 +151,7 @@ UINT8 L2CA_SetTraceLevel(UINT8 new_level);
|
||||
UINT8 L2CA_SetDesireRole(UINT8 new_role);
|
||||
BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority);
|
||||
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
UINT8 wbits, UINT8 direction, UINT8 param_6,
|
||||
UINT8 wbits, UINT8 direction, UINT8 config,
|
||||
UINT8 enable);
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *, signed);
|
||||
UINT8 L2CA_Flush(UINT16 cid);
|
||||
|
||||
@@ -42,7 +42,7 @@ typedef struct UHF_MSC_MESSAGE {
|
||||
} UHF_MSC_MESSAGE;
|
||||
|
||||
extern UHF_MSC_DEVICE uhg_msc_blk_device_tbl[8];
|
||||
extern s32 uhg_msc_memid_8169971C;
|
||||
extern s32 uhg_msc_memid;
|
||||
s32 uhf_ker_set_priority(s32 task_id, s32 priority);
|
||||
void* uhf_ker_get_memory_block(s32 pool, u32 size, u32 alignment);
|
||||
s32 uhf_ker_release_memory_block(s32 pool, void* block);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <revolution/types.h>
|
||||
|
||||
s32 uhf_ker_create_sem(u32 param_1, int param_2);
|
||||
s32 uhf_ker_create_sem(u32 initCount, int flags);
|
||||
s32 uhf_ker_delete_sem(int sem);
|
||||
|
||||
s32 uhf_ker_get_sem(int sem);
|
||||
|
||||
@@ -16,8 +16,8 @@ typedef s32 CXStreamingResult;
|
||||
#define CX_STREAMING_ERR_BAD_FILE_TABLE -5
|
||||
|
||||
typedef struct CXUncompContextRL {
|
||||
u8* unk_0x00; // 0x00
|
||||
int unk_0x04; // 0x04
|
||||
u8* outData; // 0x00
|
||||
int outDataLen; // 0x04
|
||||
u32 size; // 0x08
|
||||
u16 unk_0x0C; // 0x0C
|
||||
u8 unk_0x0e; // 0x0E
|
||||
@@ -25,8 +25,8 @@ typedef struct CXUncompContextRL {
|
||||
} CXUncompContextRL;
|
||||
|
||||
typedef struct CXUncompContextLZ {
|
||||
u8* unk_0x00; // 0x00
|
||||
int unk_0x04; // 0x04
|
||||
u8* outData; // 0x00
|
||||
int outDataLen; // 0x04
|
||||
u32 size; // 0x08
|
||||
int unk_0x0C; // 0x0C
|
||||
u8 unk_0x10; // 0x10
|
||||
@@ -62,9 +62,9 @@ typedef struct CXUncompContextHuffman {
|
||||
CXHuffmanDecodeTableEntry decodeTableData[0x200]; // 0x20
|
||||
} CXUncompContextHuffman;
|
||||
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2);
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* param_2);
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data);
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data);
|
||||
|
||||
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size);
|
||||
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size);
|
||||
|
||||
@@ -68,7 +68,7 @@ void KPADInit();
|
||||
s32 KPADRead(s32 chan, KPADStatus* status, u32 length);
|
||||
|
||||
void KPADSetSensorHeight(s32 chan, f32 sensorHeight);
|
||||
void KPADGetProjectionPos(Vec2* dest, Vec2* src, const Rect* param_3, f32 param_4);
|
||||
void KPADGetProjectionPos(Vec2* dest, Vec2* src, const Rect* rect, f32 scale);
|
||||
|
||||
void KPADSetPosParam(s32 chan, f32 x, f32 y);
|
||||
void KPADSetBtnRepeat(s32 chan, f32, f32);
|
||||
|
||||
@@ -40,7 +40,7 @@ ISD_Error ISD_ProbeCard(u32 slot);
|
||||
ISD_Error ISD_MountCard(u32 slot, SDDev** dev);
|
||||
ISD_Error ISD_UnmountCard(SDDev* dev);
|
||||
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) NO_INLINE;
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) NO_INLINE;
|
||||
|
||||
ISD_Error ISD_ReadBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
ISD_Error ISD_WriteBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
|
||||
@@ -20,8 +20,8 @@ typedef void (*USBKBDEventCallback)(void*, char*);
|
||||
typedef void (*USBKBDCmdLEDCallback)(BOOL success, void* cbarg);
|
||||
|
||||
typedef struct USBKBDCmdLED {
|
||||
vu32 unk_0x00;
|
||||
vu8 unk_0x04;
|
||||
vu32 device; // 0x00
|
||||
vu8 ledBits; // 0x04
|
||||
} USBKBDCmdLED;
|
||||
|
||||
typedef struct USBKBDCmdLEDAsync {
|
||||
@@ -33,8 +33,8 @@ typedef struct USBKBDCmdLEDAsync {
|
||||
|
||||
USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback detachCb);
|
||||
|
||||
USBKBDErr USBKBDSetLED(u32, u8, USBKBDCmdLED* cmd);
|
||||
USBKBDErr USBKBDSetLEDAsync(u32, u8, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
|
||||
USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd);
|
||||
USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
|
||||
|
||||
USBKBDErr USBKBDRegisterEventCallback(USBKBDEventCallback cb);
|
||||
|
||||
|
||||
@@ -80,11 +80,11 @@ typedef struct {
|
||||
typedef void (*WADProcessCallback)(u32 completed, u32 total, BOOL done);
|
||||
|
||||
s32 WADGetTitleVersionEx(char* path, ESTitleId* titleId, u16* titleVersion, WADLocation location, u32 offset);
|
||||
s32 WADBackupEx(u64 titleId, u32 param_2, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 param_7,
|
||||
WADProcessCallback processCB);
|
||||
s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 offset,
|
||||
WADProcessCallback processCallback);
|
||||
|
||||
s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 param_5, WADBlocks* blocks, u32* param_7);
|
||||
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 param_4, u32 param_5, WADProcessCallback processCB);
|
||||
s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags, WADBlocks* blocks, u32* fileListOut);
|
||||
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags, WADProcessCallback processCallback);
|
||||
|
||||
s32 WADGetInstalledVersion(ESTitleId titleID, u16* version);
|
||||
|
||||
|
||||
@@ -1376,7 +1376,7 @@ static void bta_dm_link_quality_cback(tBTM_LINK_QUALITY_RESULTS *p_result)
|
||||
}
|
||||
}
|
||||
|
||||
BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
|
||||
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr)
|
||||
{
|
||||
BOOLEAN status = FALSE;
|
||||
int i;
|
||||
@@ -1399,8 +1399,8 @@ BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
|
||||
}
|
||||
|
||||
static BOOLEAN bta_dm_l2cap_server_compress_cback(
|
||||
BD_ADDR peer_addr, int param_2, int param_3, int param_4,
|
||||
int param_5, int param_6, int param_7, UINT8 **p_mem_pool,
|
||||
BD_ADDR peer_addr, int pe_type, int mem_level, int wbits,
|
||||
int direction, int config, int enable, UINT8 **p_mem_pool,
|
||||
UINT32 *mem_pool_size)
|
||||
{
|
||||
BOOLEAN status = FALSE;
|
||||
|
||||
@@ -22,7 +22,7 @@ void bte_hcisu_send(HC_BT_HDR *p_msg, UINT16 event)
|
||||
GKI_freebuf(p_msg);
|
||||
}
|
||||
|
||||
void bte_hcisu_task(int param_1)
|
||||
void bte_hcisu_task(int unused)
|
||||
{
|
||||
if (p_hcisu_if)
|
||||
{
|
||||
|
||||
@@ -152,11 +152,11 @@ void BTA_CleanUp(tBTA_APP_INFO_CBACK *p_cb)
|
||||
GKI_shutdown();
|
||||
}
|
||||
|
||||
void bta_usb_close_evt(INT8 param_1)
|
||||
void bta_usb_close_evt(INT8 status)
|
||||
{
|
||||
if (_bte_app_info)
|
||||
{
|
||||
if (param_1 >= 0)
|
||||
if (status >= 0)
|
||||
(*_bte_app_info)(0);
|
||||
else
|
||||
(*_bte_app_info)(1);
|
||||
|
||||
@@ -113,20 +113,20 @@ static UINT16 const hcisu_msg_evt_table[] =
|
||||
MSG_HC_TO_STACK_HCI_EVT,
|
||||
};
|
||||
|
||||
void hcisu_h2_usb_cback(UINT8 param_1, INT8 param_2)
|
||||
void hcisu_h2_usb_cback(UINT8 event, INT8 status)
|
||||
{
|
||||
switch (param_1)
|
||||
switch (event)
|
||||
{
|
||||
case 0:
|
||||
break;
|
||||
|
||||
case 4:
|
||||
bta_usb_close_evt(param_2);
|
||||
bta_usb_close_evt(status);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
|
||||
{
|
||||
UINT16 bytes_read = 0;
|
||||
UINT8 byte;
|
||||
@@ -138,7 +138,7 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
if (p_cb->at_0x1e != 2)
|
||||
return 0;
|
||||
|
||||
r27 = param_1 + 1;
|
||||
r27 = pipe + 1;
|
||||
|
||||
while (TRUE)
|
||||
{
|
||||
@@ -148,36 +148,36 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
++bytes_read;
|
||||
msg_received = FALSE;
|
||||
|
||||
switch (p_cb->at_0x1a[param_1])
|
||||
switch (p_cb->at_0x1a[pipe])
|
||||
{
|
||||
case 0:
|
||||
if (r27 == 1)
|
||||
{
|
||||
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_2);
|
||||
p_cb->at_0x14[param_1] = 4;
|
||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_2);
|
||||
p_cb->at_0x14[pipe] = 4;
|
||||
}
|
||||
else if (r27 == 2)
|
||||
{
|
||||
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_3);
|
||||
p_cb->at_0x14[param_1] = 2;
|
||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_3);
|
||||
p_cb->at_0x14[pipe] = 2;
|
||||
}
|
||||
else if (r27 == 3)
|
||||
{
|
||||
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_1);
|
||||
p_cb->at_0x14[param_1] = 3;
|
||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_1);
|
||||
p_cb->at_0x14[pipe] = 3;
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
if (p_cb->at_0x00[param_1])
|
||||
if (p_cb->at_0x00[pipe])
|
||||
{
|
||||
p_cb->at_0x00[param_1]->len = 0;
|
||||
p_cb->at_0x00[param_1]->event =
|
||||
hcisu_msg_evt_table[p_cb->at_0x14[param_1] - 1];
|
||||
p_cb->at_0x00[param_1]->offset = 0;
|
||||
p_cb->at_0x1a[param_1] = 1;
|
||||
p_cb->at_0x00[pipe]->len = 0;
|
||||
p_cb->at_0x00[pipe]->event =
|
||||
hcisu_msg_evt_table[p_cb->at_0x14[pipe] - 1];
|
||||
p_cb->at_0x00[pipe]->offset = 0;
|
||||
p_cb->at_0x1a[pipe] = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -185,54 +185,54 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
"HCIS: Unable to allocate buffer for incoming HCI "
|
||||
"message.");
|
||||
|
||||
p_cb->at_0x1a[param_1] = 2;
|
||||
p_cb->at_0x1a[pipe] = 2;
|
||||
}
|
||||
|
||||
p_cb->at_0x0c[param_1] =
|
||||
hcisu_preamble_table[p_cb->at_0x14[param_1] - 1];
|
||||
p_cb->at_0x0c[pipe] =
|
||||
hcisu_preamble_table[p_cb->at_0x14[pipe] - 1];
|
||||
|
||||
/* fallthrough */
|
||||
|
||||
case 1:
|
||||
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||
+ p_cb->at_0x00[param_1]->len++) = byte;
|
||||
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
||||
+ p_cb->at_0x00[pipe]->len++) = byte;
|
||||
|
||||
--p_cb->at_0x0c[param_1];
|
||||
--p_cb->at_0x0c[pipe];
|
||||
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
{
|
||||
msg_len = byte;
|
||||
|
||||
if (p_cb->at_0x14[param_1] == 2)
|
||||
if (p_cb->at_0x14[pipe] == 2)
|
||||
{
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
|
||||
|
||||
if ((p_cb->at_0x00[param_1] =
|
||||
if ((p_cb->at_0x00[pipe] =
|
||||
(HC_BT_HDR *)l2cap_link_chk_pkt_start(
|
||||
(BT_HDR *)p_cb->at_0x00[param_1]))
|
||||
(BT_HDR *)p_cb->at_0x00[pipe]))
|
||||
== 0)
|
||||
{
|
||||
p_cb->at_0x0c[param_1] = msg_len;
|
||||
p_cb->at_0x0c[pipe] = msg_len;
|
||||
|
||||
if (msg_len == 0)
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
else
|
||||
p_cb->at_0x1a[param_1] = 4;
|
||||
p_cb->at_0x1a[pipe] = 4;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
p_cb->at_0x0c[param_1] = msg_len;
|
||||
p_cb->at_0x0c[pipe] = msg_len;
|
||||
|
||||
if (sizeof(HC_BT_HDR)
|
||||
+ hcisu_preamble_table[p_cb->at_0x14[param_1] - 1]
|
||||
+ hcisu_preamble_table[p_cb->at_0x14[pipe] - 1]
|
||||
+ msg_len
|
||||
> GKI_get_buf_size(p_cb->at_0x00[param_1]))
|
||||
> GKI_get_buf_size(p_cb->at_0x00[pipe]))
|
||||
{
|
||||
GKI_freebuf(p_cb->at_0x00[param_1]);
|
||||
p_cb->at_0x00[param_1] = NULL;
|
||||
p_cb->at_0x1a[param_1] = 4;
|
||||
GKI_freebuf(p_cb->at_0x00[pipe]);
|
||||
p_cb->at_0x00[pipe] = NULL;
|
||||
p_cb->at_0x1a[pipe] = 4;
|
||||
|
||||
BT_TRACE(HCI, ERROR,
|
||||
"HCIS: Invalid length for incoming HCI message.");
|
||||
@@ -242,85 +242,85 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
|
||||
if (msg_len != 0)
|
||||
{
|
||||
p_cb->at_0x1a[param_1] = 3;
|
||||
p_cb->at_0x1a[pipe] = 3;
|
||||
}
|
||||
else
|
||||
{
|
||||
msg_received = TRUE;
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
p_cb->at_0x17[param_1] = byte;
|
||||
p_cb->at_0x17[pipe] = byte;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 2:
|
||||
--p_cb->at_0x0c[param_1];
|
||||
--p_cb->at_0x0c[pipe];
|
||||
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
{
|
||||
msg_len = byte;
|
||||
|
||||
if (p_cb->at_0x14[param_1] == 2)
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
|
||||
if (p_cb->at_0x14[pipe] == 2)
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
|
||||
|
||||
p_cb->at_0x0c[param_1] = msg_len;
|
||||
p_cb->at_0x1a[param_1] = 4;
|
||||
p_cb->at_0x0c[pipe] = msg_len;
|
||||
p_cb->at_0x1a[pipe] = 4;
|
||||
}
|
||||
else
|
||||
{
|
||||
p_cb->at_0x17[param_1] = byte;
|
||||
p_cb->at_0x17[pipe] = byte;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 3:
|
||||
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||
+ p_cb->at_0x00[param_1]->len++) = byte;
|
||||
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
||||
+ p_cb->at_0x00[pipe]->len++) = byte;
|
||||
|
||||
--p_cb->at_0x0c[param_1];
|
||||
--p_cb->at_0x0c[pipe];
|
||||
|
||||
len = UUSB_Read(param_1 + 1,
|
||||
(UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||
+ p_cb->at_0x00[param_1]->len,
|
||||
p_cb->at_0x0c[param_1]);
|
||||
len = UUSB_Read(pipe + 1,
|
||||
(UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
||||
+ p_cb->at_0x00[pipe]->len,
|
||||
p_cb->at_0x0c[pipe]);
|
||||
|
||||
p_cb->at_0x00[param_1]->len += len;
|
||||
p_cb->at_0x0c[param_1] -= len;
|
||||
p_cb->at_0x00[pipe]->len += len;
|
||||
p_cb->at_0x0c[pipe] -= len;
|
||||
bytes_read += len;
|
||||
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
{
|
||||
if (p_cb->at_0x14[param_1] == 2
|
||||
if (p_cb->at_0x14[pipe] == 2
|
||||
&& l2cap_link_chk_pkt_end() == 0)
|
||||
{
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
msg_received = TRUE;
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 4:
|
||||
--p_cb->at_0x0c[param_1];
|
||||
--p_cb->at_0x0c[pipe];
|
||||
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
if (msg_received)
|
||||
{
|
||||
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[param_1]);
|
||||
p_cb->at_0x00[param_1] = NULL;
|
||||
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[pipe]);
|
||||
p_cb->at_0x00[pipe] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -403,7 +403,7 @@ void hcisu_h2_send_msg(tHCISU_H2_CB *p_cb, HC_BT_HDR *p_msg)
|
||||
hcisu_h2_send_msg_now(p_cb, p_msg);
|
||||
}
|
||||
|
||||
void hcisu_h2_init(UINT8 param_1, UINT8 param_2, UINT16 param_3)
|
||||
void hcisu_h2_init(UINT8 taskId, UINT8 mbox, UINT16 bufSize)
|
||||
{
|
||||
hcisu_h2_cb.at_0x1e = 0;
|
||||
|
||||
@@ -411,9 +411,9 @@ void hcisu_h2_init(UINT8 param_1, UINT8 param_2, UINT16 param_3)
|
||||
hcisu_h2_cb.at_0x1a[1] = 0;
|
||||
hcisu_h2_cb.at_0x1a[2] = 0;
|
||||
|
||||
hcisu_h2_cb.at_0x1f = param_1;
|
||||
hcisu_h2_cb.at_0x20 = param_2;
|
||||
hcisu_h2_cb.at_0x12 = param_3;
|
||||
hcisu_h2_cb.at_0x1f = taskId;
|
||||
hcisu_h2_cb.at_0x20 = mbox;
|
||||
hcisu_h2_cb.at_0x12 = bufSize;
|
||||
}
|
||||
|
||||
BOOLEAN hcisu_h2_open(tHCI_CFG *_p_cfg)
|
||||
|
||||
@@ -478,7 +478,7 @@ BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority)
|
||||
}
|
||||
|
||||
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
UINT8 wbits, UINT8 direction, UINT8 param_6,
|
||||
UINT8 wbits, UINT8 direction, UINT8 config,
|
||||
UINT8 enable)
|
||||
{
|
||||
tL2C_LCB *p_lcb;
|
||||
@@ -506,7 +506,7 @@ void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
}
|
||||
}
|
||||
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *param_1, int param_2)
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *p_callback, int unused)
|
||||
{
|
||||
#if 0
|
||||
/* ... */
|
||||
|
||||
@@ -565,7 +565,7 @@ void UUSB_Open(tUUSB *uusb, tUUSB_CBACK *cback)
|
||||
(void)uusb;
|
||||
}
|
||||
|
||||
UINT16 UUSB_Read(UINT8 param_1, void *param_2, UINT16 param_3)
|
||||
UINT16 UUSB_Read(UINT8 pipe, void *buf, UINT16 len)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -580,7 +580,7 @@ int UUSB_WriteBuf(/* ... */)
|
||||
return 0;
|
||||
}
|
||||
|
||||
UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||
UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
||||
{
|
||||
short sp18 = 0;
|
||||
IOSError ret = 0;
|
||||
@@ -591,7 +591,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||
if (usb.state != 2)
|
||||
return 0;
|
||||
|
||||
switch (param_1)
|
||||
switch (pipe)
|
||||
{
|
||||
case 0:
|
||||
p_buf = GKI_getpoolbuf(usb.cmd_buffer_pool);
|
||||
@@ -656,7 +656,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||
memcpy(p_buffer, p_data, len);
|
||||
|
||||
if (len > 190)
|
||||
UUSBDBG(" woah ! thats pretty Big ! :%d", param_3);
|
||||
UUSBDBG(" woah ! thats pretty Big ! :%d", len);
|
||||
|
||||
if (usb.at_0x38 < 5 && usb.bulk_buffer_q.count == 0)
|
||||
{
|
||||
@@ -696,7 +696,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||
break;
|
||||
}
|
||||
|
||||
(void)param_4;
|
||||
(void)unused;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -221,11 +221,11 @@ CXSecureResult CXSecureUncompressLZ(const void* src, u32 length, void* dst) {
|
||||
return CX_SECURE_ERR_OK;
|
||||
}
|
||||
|
||||
BOOL CXiVerifyHuffmanTable_(const void* param_1, u8 param_2) {
|
||||
const u8* a = param_1;
|
||||
BOOL CXiVerifyHuffmanTable_(const void* table, u8 bitSize) {
|
||||
const u8* a = table;
|
||||
const u8* b = a + 1;
|
||||
u32 c = *a;
|
||||
const u8* d = (u8*)param_1 + ((c + 1) << 1);
|
||||
const u8* d = (u8*)table + ((c + 1) << 1);
|
||||
|
||||
u8 e[sizeof(u8) * 0x40];
|
||||
u32 i;
|
||||
@@ -233,7 +233,7 @@ BOOL CXiVerifyHuffmanTable_(const void* param_1, u8 param_2) {
|
||||
e[i] = 0;
|
||||
}
|
||||
|
||||
if (param_2 == 4 && c >= 16) {
|
||||
if (bitSize == 4 && c >= 16) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,18 +4,18 @@
|
||||
static inline int CXiReadHeader(u8*, int*, const u8*, int, int);
|
||||
static inline CXHuffmanDecodeTableEntry* GetNextNode(CXHuffmanDecodeTableEntry*, int);
|
||||
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2) {
|
||||
context->unk_0x00 = param_2;
|
||||
context->unk_0x04 = 0;
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
|
||||
context->outData = data;
|
||||
context->outDataLen = 0;
|
||||
context->unk_0x0e = 0;
|
||||
context->unk_0x0C = 0;
|
||||
context->unk_0x0f = 8;
|
||||
context->size = 0;
|
||||
}
|
||||
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2) {
|
||||
context->unk_0x00 = param_2;
|
||||
context->unk_0x04 = 0;
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data) {
|
||||
context->outData = data;
|
||||
context->outDataLen = 0;
|
||||
context->unk_0x11 = 0;
|
||||
context->unk_0x12 = 0;
|
||||
context->unk_0x0C = 0;
|
||||
@@ -54,27 +54,27 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
}
|
||||
}
|
||||
|
||||
a = CXiReadHeader(&context->unk_0x0f, &context->unk_0x04, pSrc, size, context->size);
|
||||
a = CXiReadHeader(&context->unk_0x0f, &context->outDataLen, pSrc, size, context->size);
|
||||
|
||||
pSrc += a;
|
||||
size -= a;
|
||||
|
||||
if (!size) {
|
||||
return !context->unk_0x0f ? context->unk_0x04 : CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
return !context->unk_0x0f ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
}
|
||||
}
|
||||
|
||||
while (context->unk_0x04 > 0) {
|
||||
while (context->outDataLen > 0) {
|
||||
if (!(context->unk_0x0e & 0x80)) {
|
||||
while (context->unk_0x0C) {
|
||||
*context->unk_0x00++ = *pSrc++;
|
||||
*context->outData++ = *pSrc++;
|
||||
|
||||
context->unk_0x0C--;
|
||||
context->unk_0x04--;
|
||||
context->outDataLen--;
|
||||
size--;
|
||||
|
||||
if (!size) {
|
||||
return context->unk_0x04;
|
||||
return context->outDataLen;
|
||||
}
|
||||
}
|
||||
} else if (context->unk_0x0C) {
|
||||
@@ -82,14 +82,14 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
size--;
|
||||
|
||||
while (context->unk_0x0C) {
|
||||
*context->unk_0x00++ = b;
|
||||
*context->outData++ = b;
|
||||
|
||||
context->unk_0x0C--;
|
||||
context->unk_0x04--;
|
||||
context->outDataLen--;
|
||||
}
|
||||
|
||||
if (!size) {
|
||||
return context->unk_0x04;
|
||||
return context->outDataLen;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -103,19 +103,19 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
context->unk_0x0C += 1;
|
||||
}
|
||||
|
||||
if (context->unk_0x0C > context->unk_0x04) {
|
||||
if (context->unk_0x0C > context->outDataLen) {
|
||||
if (!context->size) {
|
||||
return CX_STREAMING_ERR_BAD_FILE_SIZE;
|
||||
}
|
||||
|
||||
context->unk_0x0C = context->unk_0x04;
|
||||
context->unk_0x0C = context->outDataLen;
|
||||
}
|
||||
|
||||
if (size) {
|
||||
continue;
|
||||
}
|
||||
|
||||
return context->unk_0x04;
|
||||
return context->outDataLen;
|
||||
}
|
||||
|
||||
if (!context->size && size > 32) {
|
||||
@@ -125,7 +125,7 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
return CX_STREAMING_ERR_OK;
|
||||
}
|
||||
|
||||
static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize, int param_5) {
|
||||
static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize, int maxOutLen) {
|
||||
int bytesParsed = 0;
|
||||
|
||||
while (*pHdrLen) {
|
||||
@@ -150,8 +150,8 @@ static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize,
|
||||
}
|
||||
}
|
||||
|
||||
if (param_5 > 0 && param_5 < *pOutLen) {
|
||||
*pOutLen = param_5;
|
||||
if (maxOutLen > 0 && maxOutLen < *pOutLen) {
|
||||
*pOutLen = maxOutLen;
|
||||
}
|
||||
|
||||
return bytesParsed;
|
||||
@@ -174,27 +174,27 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
|
||||
}
|
||||
}
|
||||
|
||||
a = CXiReadHeader(&context->unk_0x13, &context->unk_0x04, pSrc, size, context->size);
|
||||
a = CXiReadHeader(&context->unk_0x13, &context->outDataLen, pSrc, size, context->size);
|
||||
|
||||
pSrc += a;
|
||||
size -= a;
|
||||
|
||||
if (!size) {
|
||||
return !context->unk_0x13 ? context->unk_0x04 : CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
return !context->unk_0x13 ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
}
|
||||
}
|
||||
|
||||
while (context->unk_0x04 > 0) {
|
||||
while (context->outDataLen > 0) {
|
||||
while (context->unk_0x12) {
|
||||
s32 a;
|
||||
|
||||
if (!size) {
|
||||
return context->unk_0x04;
|
||||
return context->outDataLen;
|
||||
}
|
||||
|
||||
if (!(context->unk_0x11 & 0x80)) {
|
||||
*context->unk_0x00++ = *pSrc++;
|
||||
context->unk_0x04--;
|
||||
*context->outData++ = *pSrc++;
|
||||
context->outDataLen--;
|
||||
|
||||
size--;
|
||||
|
||||
@@ -240,7 +240,7 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
|
||||
|
||||
size--;
|
||||
if (!size) {
|
||||
return context->unk_0x04;
|
||||
return context->outDataLen;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -251,23 +251,23 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
|
||||
size--;
|
||||
context->unk_0x10 = 3;
|
||||
|
||||
if (context->unk_0x0C > context->unk_0x04) {
|
||||
if (context->unk_0x0C > context->outDataLen) {
|
||||
if (!context->size) {
|
||||
return CX_STREAMING_ERR_BAD_FILE_SIZE;
|
||||
}
|
||||
|
||||
context->unk_0x0C = context->unk_0x04;
|
||||
context->unk_0x0C = context->outDataLen;
|
||||
}
|
||||
|
||||
while (context->unk_0x0C > 0) {
|
||||
*context->unk_0x00 = context->unk_0x00[-a];
|
||||
context->unk_0x00++;
|
||||
context->unk_0x04--;
|
||||
*context->outData = context->outData[-a];
|
||||
context->outData++;
|
||||
context->outDataLen--;
|
||||
context->unk_0x0C--;
|
||||
}
|
||||
|
||||
there:
|
||||
if (!context->unk_0x04) {
|
||||
if (!context->outDataLen) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
@@ -276,7 +276,7 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
|
||||
}
|
||||
|
||||
if (!size) {
|
||||
return context->unk_0x04;
|
||||
return context->outDataLen;
|
||||
}
|
||||
|
||||
context->unk_0x11 = *pSrc++;
|
||||
|
||||
@@ -291,7 +291,7 @@ s32 pfd_st_removal_callback(s32 status, void* data) {
|
||||
return 0;
|
||||
}
|
||||
g_pfd_sddrv_info.media_inserted = 0;
|
||||
if (pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
|
||||
if (g_pfd_sddrv_info.media_inserted == 0 && pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
|
||||
g_event = 1;
|
||||
result = ISD_RegisterDeviceIntrHandler(g_pfd_sddrv_info.device, (SDDevIntrCallback)pfd_st_inter_callback, &g_event);
|
||||
if (result != 0) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <private/fa/puh_msc.h>
|
||||
|
||||
s32 uhg_msc_memid_8169971C;
|
||||
s32 uhg_msc_memid;
|
||||
static s32 st_uhs_msc_tskid;
|
||||
static s32 st_uhs_msc_msgid;
|
||||
static s32 st_uhs_msc_status;
|
||||
@@ -47,13 +47,13 @@ static s32 _uhf_msc_api_send_message(UHF_MSC_PARAMETERS* parameters, u32 command
|
||||
s32 result = 0;
|
||||
s32 semaphore;
|
||||
UHF_MSC_MESSAGE* message;
|
||||
message = uhf_ker_get_memory_block(uhg_msc_memid_8169971C, sizeof(UHF_MSC_MESSAGE), 4);
|
||||
message = uhf_ker_get_memory_block(uhg_msc_memid, sizeof(UHF_MSC_MESSAGE), 4);
|
||||
if (message == NULL) {
|
||||
return -12;
|
||||
}
|
||||
semaphore = uhf_ker_create_sem(0, 0);
|
||||
if (semaphore <= 0) {
|
||||
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
|
||||
uhf_ker_release_memory_block(uhg_msc_memid, message);
|
||||
return -12;
|
||||
}
|
||||
message->command = command;
|
||||
@@ -61,7 +61,7 @@ static s32 _uhf_msc_api_send_message(UHF_MSC_PARAMETERS* parameters, u32 command
|
||||
message->result = &result;
|
||||
message->parameters = *parameters;
|
||||
if (uhf_ker_send_message(st_uhs_msc_msgid, message, 0) != 0) {
|
||||
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
|
||||
uhf_ker_release_memory_block(uhg_msc_memid, message);
|
||||
uhf_ker_delete_sem(semaphore);
|
||||
return -12;
|
||||
}
|
||||
|
||||
@@ -287,13 +287,13 @@ s32 _uhf_msc_blk_send_message(UHF_MSC_PARAMETERS* parameters, u32 command) {
|
||||
s32 semaphore;
|
||||
UHF_MSC_MESSAGE* message;
|
||||
s32 mailbox = uhf_msc_get_message_id();
|
||||
message = uhf_ker_get_memory_block(uhg_msc_memid_8169971C, sizeof(UHF_MSC_MESSAGE), 4);
|
||||
message = uhf_ker_get_memory_block(uhg_msc_memid, sizeof(UHF_MSC_MESSAGE), 4);
|
||||
if (message == NULL) {
|
||||
return -1;
|
||||
}
|
||||
semaphore = uhf_ker_create_sem(0, 0);
|
||||
if (semaphore <= 0) {
|
||||
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
|
||||
uhf_ker_release_memory_block(uhg_msc_memid, message);
|
||||
return -1;
|
||||
}
|
||||
message->command = command;
|
||||
@@ -301,7 +301,7 @@ s32 _uhf_msc_blk_send_message(UHF_MSC_PARAMETERS* parameters, u32 command) {
|
||||
message->result = &result;
|
||||
message->parameters = *parameters;
|
||||
if (uhf_ker_send_message(mailbox, message, 0) != 0) {
|
||||
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
|
||||
uhf_ker_release_memory_block(uhg_msc_memid, message);
|
||||
uhf_ker_delete_sem(semaphore);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <private/vf/PrFILE2/pf_types.h>
|
||||
|
||||
// clang-format off
|
||||
const pf_u8 pf_valid_fn_char_8162E6B0[96] = {
|
||||
const pf_u8 pf_valid_fn_char[96] = {
|
||||
1, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, 1, 1, 3, 3, 0,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 1, 0, 1, 0, 0,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
|
||||
@@ -654,7 +654,7 @@ pf_s32 PFENT_MakeRootDir(PF_VOLUME* p_vol) {
|
||||
return 7;
|
||||
}
|
||||
{
|
||||
static pf_u8 default_volume_label[16] = "NO NAME ";
|
||||
static pf_u8 default_volume_label[12] = "NO NAME ";
|
||||
PFDRV_LoadVolumeLabelFromBuf(p_vol, default_volume_label);
|
||||
}
|
||||
return 0;
|
||||
|
||||
@@ -1180,20 +1180,24 @@ s32 PFFAT_GetClusterSpecified(PFFAT_FFD* file, u32 chainIndex,
|
||||
s32 PFFAT_GetClusterAllocated(PFFAT_FFD* file, u32 chainIndex,
|
||||
u32 numClusters, u32* cluster)
|
||||
{
|
||||
u32* start;
|
||||
PF_VOLUME* vol;
|
||||
PFFAT_HINT* hint;
|
||||
u32 fatType;
|
||||
u32 locateStart;
|
||||
u32 locateEnd;
|
||||
s32 error;
|
||||
|
||||
fatType = file->p_vol->bpb.fat_type;
|
||||
start = file->p_start_cluster;
|
||||
vol = file->p_vol;
|
||||
fatType = vol->bpb.fat_type;
|
||||
hint = file->p_hint;
|
||||
if (*file->p_start_cluster == 1) {
|
||||
if (*start == 1) {
|
||||
if (fatType <= FAT_16) {
|
||||
*cluster = -1;
|
||||
return 0;
|
||||
}
|
||||
*file->p_start_cluster = file->p_vol->bpb.root_dir_cluster;
|
||||
*start = vol->bpb.root_dir_cluster;
|
||||
}
|
||||
*cluster = -1;
|
||||
error = find_cluster_in_chain(file, chainIndex, 2, numClusters, 1, cluster);
|
||||
@@ -1278,11 +1282,13 @@ s32 PFFAT_GetSectorSpecified(PFFAT_FFD* file, u32 fileSectorIndex,
|
||||
|
||||
error = PFFAT_GetSector(file, fileSectorIndex, clusterIndex != 0, 0,
|
||||
sector);
|
||||
if (error != 0) {
|
||||
goto done;
|
||||
switch (error) {
|
||||
case 0:
|
||||
error = 0;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
error = 0;
|
||||
done:
|
||||
return error;
|
||||
}
|
||||
|
||||
|
||||
@@ -120,13 +120,13 @@ pf_s32 VFiPFFAT12_WriteFATEntry(PF_VOLUME* p_vol, pf_u16 cluster, pf_u16 value)
|
||||
}
|
||||
|
||||
pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 value, PF_CACHE_PAGE* p_page) {
|
||||
pf_s32 err;
|
||||
pf_u32 next_sector;
|
||||
pf_u32 offset_in_sector;
|
||||
pf_u16 current_fat;
|
||||
pf_s32 fat_offset;
|
||||
pf_u32 fat_sector;
|
||||
pf_s32 result;
|
||||
pf_u32 next_sector;
|
||||
pf_s32 err;
|
||||
fat_offset = (pf_u16)(cluster + (cluster >> 1));
|
||||
fat_sector = (pf_u16)(p_vol->bpb.active_FAT_sector + (fat_offset >> p_vol->bpb.log2_bytes_per_sector));
|
||||
offset_in_sector = fat_offset & (p_vol->bpb.bytes_per_sector - 1);
|
||||
@@ -153,7 +153,7 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
|
||||
p_page->sector = next_sector;
|
||||
p_page->p_buf[0] = value >> 4;
|
||||
} else {
|
||||
((pf_u16)offset_in_sector + p_page->p_buf)[1] = value >> 4;
|
||||
*(p_page->p_buf + ((pf_u16)offset_in_sector + 1)) = value >> 4;
|
||||
}
|
||||
} else {
|
||||
p_page->p_buf[(pf_u16)offset_in_sector] = value;
|
||||
@@ -165,7 +165,7 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
|
||||
p_page->sector = next_sector;
|
||||
p_page->p_buf[0] = (p_page->p_buf[0] & 0xF0) | ((pf_u8)(value >> 8));
|
||||
} else {
|
||||
((pf_u16)offset_in_sector + p_page->p_buf)[1] = (((pf_u16)offset_in_sector + p_page->p_buf)[1] & 0xF0) | ((pf_u8)(value >> 8));
|
||||
*(p_page->p_buf + ((pf_u16)offset_in_sector + 1)) = (*(p_page->p_buf + ((pf_u16)offset_in_sector + 1)) & 0xF0) | ((pf_u8)(value >> 8));
|
||||
}
|
||||
}
|
||||
if (err != 0) { result = err; }
|
||||
|
||||
@@ -56,7 +56,7 @@ typedef struct PF_PATH_VOLUME_SET {
|
||||
} PF_PATH_VOLUME_SET;
|
||||
|
||||
extern PF_PATH_VOLUME_SET pf_vol_set;
|
||||
extern const pf_u8 pf_valid_fn_char_8162E6B0[96];
|
||||
extern const pf_u8 pf_valid_fn_char[96];
|
||||
extern void PFSTR_SetCodeMode(PF_STR*, pf_u32);
|
||||
extern pf_u32 PFSTR_GetCodeMode(PF_STR*);
|
||||
extern pf_s8* PFSTR_GetStrPos(PF_STR*, pf_u32);
|
||||
@@ -75,9 +75,9 @@ extern pf_u32 PFPATH_CheckExtShortNameSignature(PF_STR*);
|
||||
extern pf_u32 PFPATH_CheckExtShortName(PF_STR*, pf_u32, pf_bool);
|
||||
extern void PFCODE_Divide_Width(pf_s32, pf_s16*, pf_s16*);
|
||||
|
||||
#define VALID_PATH_CHAR(x, b) ((pf_u8)(x) >= 0x80 || ((pf_u8)(x) >= ' ' && (pf_valid_fn_char_8162E6B0[(pf_u8)(x) - ' '] & b)))
|
||||
#define VALID_PATH_CHAR(x, b) ((pf_u8)(x) >= 0x80 || ((pf_u8)(x) >= ' ' && (pf_valid_fn_char[(pf_u8)(x) - ' '] & b)))
|
||||
#define VALID_PATH_WCHAR(x, b) \
|
||||
((x) >= 0x80 || (pf_u8)(x) >= ' ' && ((pf_u8)(x) & 0xFF00) == 0 && (pf_valid_fn_char_8162E6B0[(pf_u8)((x & 0x00FF) - ' ')] & b))
|
||||
((x) >= 0x80 || (pf_u8)(x) >= ' ' && ((pf_u8)(x) & 0xFF00) == 0 && (pf_valid_fn_char[(pf_u8)((x & 0x00FF) - ' ')] & b))
|
||||
|
||||
pf_s32 PFPATH_DoSplitPath(PF_STR* p_path, PF_STR* p_dir_path, PF_STR* p_filename, pf_u32 wildcard) {
|
||||
pf_s8* p;
|
||||
|
||||
@@ -267,6 +267,14 @@ void KPADSetPosParam(s32 chan, f32 x, f32 y) {
|
||||
kpad->posParamY = y;
|
||||
}
|
||||
|
||||
extern const f32 sensorIntervalConversion;
|
||||
|
||||
static inline f32 object_interval_distance(f32 interval) {
|
||||
return interval / sensorIntervalConversion;
|
||||
}
|
||||
|
||||
const f32 sensorIntervalConversion = 0.383864f;
|
||||
|
||||
static void reset_kpad(KPADInside* kpad) {
|
||||
f32 upperY;
|
||||
f32 distanceValue;
|
||||
@@ -1570,7 +1578,7 @@ void KPADInit(void) {
|
||||
objectInterval = kp_obj_interval;
|
||||
enabled = OSDisableInterrupts();
|
||||
kp_obj_interval = objectInterval;
|
||||
distanceValue = objectInterval / 0.383864f;
|
||||
distanceValue = object_interval_distance(objectInterval);
|
||||
kp_err_dist_min = distanceValue;
|
||||
kp_dist_vv1 = distanceValue;
|
||||
OSRestoreInterrupts(enabled);
|
||||
|
||||
@@ -1174,8 +1174,8 @@ static inline s32 __nupGetBoot2Version(u16* version) {
|
||||
s32 result = ES_GetBoot2Version(&bootVersion);
|
||||
if (result == 0) {
|
||||
u16 checkedVersion = bootVersion;
|
||||
*version = checkedVersion;
|
||||
if (checkedVersion != bootVersion) { result = -0x1389; }
|
||||
if (checkedVersion == bootVersion) { *version = checkedVersion; }
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -1229,7 +1229,7 @@ extern "C" void* __nupOp(void* argument) {
|
||||
u32 needsAudit;
|
||||
char* auditData = 0;
|
||||
s32 result;
|
||||
u16 serverBootVersion = 0;
|
||||
u16 serverBootVersion;
|
||||
u16 bootTitleVersion;
|
||||
u16 systemMenuVersion;
|
||||
ESTitleId currentTitleId;
|
||||
@@ -1350,12 +1350,11 @@ extern "C" void* __nupOp(void* argument) {
|
||||
OSUnlockMutex(&context->mutex);
|
||||
for (i = 0; i < context->titleCount; i++) {
|
||||
NUPTitleInfo* title = &context->titles[i];
|
||||
ESTitleId titleId = title->titleId;
|
||||
if (titleId == 0x0000000100000001ULL) {
|
||||
if (context->titles[i].titleId == 0x0000000100000001ULL) {
|
||||
bootTitle = title;
|
||||
} else if (titleId == 0x0000000100000002ULL) {
|
||||
} else if (context->titles[i].titleId == 0x0000000100000002ULL) {
|
||||
menuTitle = title;
|
||||
} else if (titleId == currentTitleId) {
|
||||
} else if (context->titles[i].titleId == currentTitleId) {
|
||||
systemTitle = title;
|
||||
}
|
||||
if (bootTitle != 0 && menuTitle != 0 && systemTitle != 0) {
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
#define SD_SLOT_PATH_LENGTH 32
|
||||
|
||||
char lbl_81691748[] = " +++ SD RESET Failed: %d +++\n\0"
|
||||
char __sdPathData[] = " +++ SD RESET Failed: %d +++\n\0"
|
||||
"/dev/sdio/slot0\0/dev/sdio/slot1\0/dev/sdio/slotw";
|
||||
|
||||
typedef void (*SDCallbackFunc)(s32, void*);
|
||||
@@ -43,7 +43,7 @@ typedef struct __sdCbArg {
|
||||
SDCallbackFunc cb; // 0x00
|
||||
void* cbArg; // 0x04
|
||||
SDDev* dev; // 0x08
|
||||
u32 unk_0x0C;
|
||||
u32 cmd; // 0x0C
|
||||
u32 SDDevRca;
|
||||
u32* resp; // 0x14
|
||||
u8* SDSectorSize;
|
||||
@@ -55,25 +55,25 @@ enum {
|
||||
|
||||
static IOSFd sduOpenFD(u32 slot);
|
||||
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg);
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg);
|
||||
|
||||
static ISD_Error sduDatabuswidth(SDDev* dev, u32 buswidth);
|
||||
static ISD_Error sduGetSCR(SDDev* dev, u32* data) NO_INLINE;
|
||||
static ISD_Error sduGetOCR(SDDev* dev, u32* data);
|
||||
extern ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6);
|
||||
extern ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6);
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4);
|
||||
extern ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg);
|
||||
extern ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg);
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSectorSize);
|
||||
|
||||
IOSError __sdCb(s32 result, void* arg) {
|
||||
__sdCbArg* data = (__sdCbArg*)arg;
|
||||
|
||||
switch (data->unk_0x0C) {
|
||||
switch (data->cmd) {
|
||||
case 4: {
|
||||
if (result != 0) {
|
||||
OSReport(lbl_81691748, result);
|
||||
OSReport(__sdPathData, result);
|
||||
data->dev->SDDevRca = 0;
|
||||
} else {
|
||||
if (data->dev != NULL) {
|
||||
@@ -106,33 +106,33 @@ IOSError __sdCb(s32 result, void* arg) {
|
||||
return result;
|
||||
}
|
||||
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) {
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) {
|
||||
IOSError ret;
|
||||
|
||||
if (__sdHeapId[0] < 0) {
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
|
||||
__sdReg[0] = param_2;
|
||||
__sdReg[3] = param_4;
|
||||
__sdReg[0] = reg;
|
||||
__sdReg[3] = size;
|
||||
__sdReg[4] = 0;
|
||||
|
||||
if (param_3 != NULL) {
|
||||
if (outValue != NULL) {
|
||||
ret = IOS_Ioctl(dev->SDDevFd, SD_IOCTL_2, __sdReg, 0x18, __sdCmdBuffer, 4);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
*param_3 = *__sdCmdBuffer;
|
||||
*outValue = *__sdCmdBuffer;
|
||||
return ret;
|
||||
}
|
||||
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
|
||||
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* status) {
|
||||
IOSError ret = SD_ERROR_FATAL;
|
||||
|
||||
if (__sdHeapId[0] >= 0 && param_2 != NULL) {
|
||||
if (__sdHeapId[0] >= 0 && status != NULL) {
|
||||
OSLockMutex(&__reqMutex);
|
||||
|
||||
if (__sdReq != 0) {
|
||||
@@ -145,7 +145,7 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
} else {
|
||||
*param_2 = *__sdCmdBuffer;
|
||||
*status = *__sdCmdBuffer;
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -154,13 +154,13 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg) {
|
||||
IOSError ret;
|
||||
u32 readCount, writeCount;
|
||||
u32* sdCmd;
|
||||
|
||||
if (param_9 != 0) {
|
||||
if (dma != 0) {
|
||||
readCount = 2;
|
||||
writeCount = 1;
|
||||
} else {
|
||||
@@ -196,7 +196,7 @@ static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
|
||||
data->cb = cb;
|
||||
data->cbArg = cbArg;
|
||||
data->resp = resp;
|
||||
data->unk_0x0C = cmd;
|
||||
data->cmd = cmd;
|
||||
data->SDSectorSize = (u8*)sdCmd;
|
||||
|
||||
ret = IOS_IoctlvAsync(fd, 7, readCount, writeCount, __sdVect, __sdCb, data);
|
||||
@@ -216,7 +216,7 @@ static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg) {
|
||||
ISD_Error ret;
|
||||
u32* sdCmd;
|
||||
@@ -232,7 +232,7 @@ static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
|
||||
sdCmd[6] = buffer;
|
||||
sdCmd[4] = blockCount;
|
||||
sdCmd[5] = sectorSize;
|
||||
sdCmd[7] = param_9;
|
||||
sdCmd[7] = dma;
|
||||
|
||||
if (resp != NULL) {
|
||||
if (cb != NULL) {
|
||||
@@ -243,7 +243,7 @@ static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
|
||||
data->cb = cb;
|
||||
data->cbArg = cbArg;
|
||||
data->resp = resp;
|
||||
data->unk_0x0C = cmd;
|
||||
data->cmd = cmd;
|
||||
data->SDDevRca = 1;
|
||||
data->SDSectorSize = (u8*)sdCmd;
|
||||
|
||||
@@ -365,7 +365,7 @@ ISD_Error ISD_WriteMultiBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSi
|
||||
return ISD_WriteMultiBlockAsync(dev, offset, cmdResp, cmdRespSize, 0, 0);
|
||||
}
|
||||
|
||||
ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
|
||||
ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg) {
|
||||
ISD_Error ret;
|
||||
u32 status;
|
||||
|
||||
@@ -435,12 +435,12 @@ ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRe
|
||||
|
||||
DCInvalidateRange(cmdResp, cmdRespSize << 9);
|
||||
|
||||
ret = sduCommandv(dev->SDDevFd, 0x12, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
|
||||
ret = sduCommandv(dev->SDDevFd, 0x12, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)callback, (void*)callbackArg);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
|
||||
if (param_5 == 0) {
|
||||
if (callback == 0) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -449,7 +449,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
|
||||
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg) {
|
||||
ISD_Error ret;
|
||||
u32 status;
|
||||
|
||||
@@ -519,12 +519,12 @@ ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdR
|
||||
|
||||
DCFlushRange(cmdResp, cmdRespSize << 9);
|
||||
|
||||
ret = sduCommand(dev->SDDevFd, 0x19, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
|
||||
ret = sduCommand(dev->SDDevFd, 0x19, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)callback, (void*)callbackArg);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
|
||||
if (param_5 == 0) {
|
||||
if (callback == 0) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -570,7 +570,7 @@ ISD_Error ISD_UnmountCard(SDDev* dev) {
|
||||
|
||||
ISD_Error ISD_InitCard() {
|
||||
static u8* lo;
|
||||
char* paths = lbl_81691748;
|
||||
char* paths = __sdPathData;
|
||||
ISD_Error ret = SD_ERROR_SUCCESS;
|
||||
BOOL enabled;
|
||||
|
||||
@@ -782,7 +782,7 @@ static ISD_Error sduGetOCR(SDDev* dev, u32* data) {
|
||||
}
|
||||
|
||||
#ifdef __MWERKS__
|
||||
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* param_2, register u32* param_3, register u32* param_4) {
|
||||
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* outSize, register u32* outSize2, register u32* outSectorSize) {
|
||||
nofralloc
|
||||
|
||||
stwu r1, -0x30(r1)
|
||||
@@ -859,13 +859,13 @@ ISD_GetCardSize_store:
|
||||
stw r5, 0x18(r28)
|
||||
stw r0, 0x1c(r28)
|
||||
stw r3, 0x20(r28)
|
||||
beq ISD_GetCardSize_no_param2
|
||||
beq ISD_GetCardSize_no_outSize
|
||||
stw r3, 0(r29)
|
||||
ISD_GetCardSize_no_param2:
|
||||
ISD_GetCardSize_no_outSize:
|
||||
cmpwi r30, 0
|
||||
beq ISD_GetCardSize_no_param3
|
||||
beq ISD_GetCardSize_no_outSize2
|
||||
stw r3, 0(r30)
|
||||
ISD_GetCardSize_no_param3:
|
||||
ISD_GetCardSize_no_outSize2:
|
||||
cmpwi r31, 0
|
||||
beq ISD_GetCardSize_success_return
|
||||
li r0, 0x200
|
||||
@@ -884,7 +884,7 @@ ISD_GetCardSize_return:
|
||||
blr
|
||||
}
|
||||
#else
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4) {
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSectorSize) {
|
||||
ISD_Error ret;
|
||||
u32 out0;
|
||||
u32 out1;
|
||||
@@ -915,14 +915,14 @@ ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4)
|
||||
dev->SDSectorNum = out1;
|
||||
dev->SDDevSize = out2;
|
||||
|
||||
if (param_2 != NULL) {
|
||||
*param_2 = out2;
|
||||
if (outSize != NULL) {
|
||||
*outSize = out2;
|
||||
}
|
||||
if (param_3 != NULL) {
|
||||
*param_3 = out2;
|
||||
if (outSize2 != NULL) {
|
||||
*outSize2 = out2;
|
||||
}
|
||||
if (param_4 != NULL) {
|
||||
*param_4 = 512;
|
||||
if (outSectorSize != NULL) {
|
||||
*outSectorSize = 512;
|
||||
}
|
||||
|
||||
return SD_ERROR_SUCCESS;
|
||||
|
||||
@@ -34,13 +34,13 @@ static void uhf_ker_sem_inline_1() {
|
||||
}
|
||||
}
|
||||
|
||||
s32 uhf_ker_create_sem(u32 param_1, int param_2) {
|
||||
s32 uhf_ker_create_sem(u32 initCount, int flags) {
|
||||
int i, k;
|
||||
|
||||
if (param_1 != 0 && param_1 != 1) {
|
||||
if (initCount != 0 && initCount != 1) {
|
||||
return -5;
|
||||
}
|
||||
if (param_2 != 0) {
|
||||
if (flags != 0) {
|
||||
return -5;
|
||||
}
|
||||
|
||||
@@ -60,13 +60,13 @@ s32 uhf_ker_create_sem(u32 param_1, int param_2) {
|
||||
OSInitSemaphore(&st_uhf_ker_sem[i], 1);
|
||||
sem = &st_uhf_ker_sem[i];
|
||||
|
||||
for (k = (int)(1 - param_1); k > 0; k--) {
|
||||
for (k = (int)(1 - initCount); k > 0; k--) {
|
||||
OSWaitSemaphore((OSSemaphore*)sem);
|
||||
}
|
||||
|
||||
st_uhs_ker_sem_mng.entries[i].sem = sem;
|
||||
st_uhs_ker_sem_mng.entries[i].unk_0x04 = param_1;
|
||||
st_uhs_ker_sem_mng.entries[i].unk_0x08 = param_2;
|
||||
st_uhs_ker_sem_mng.entries[i].unk_0x04 = initCount;
|
||||
st_uhs_ker_sem_mng.entries[i].unk_0x08 = flags;
|
||||
st_uhs_ker_sem_mng.unk_0x90++;
|
||||
|
||||
uhf_ker_sem_inline_1();
|
||||
|
||||
@@ -96,13 +96,13 @@ USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback d
|
||||
return USB_KBD_ERR_OK;
|
||||
}
|
||||
|
||||
USBKBDErr USBKBDSetLED(u32 param_1, u8 param_2, USBKBDCmdLED* cmd) {
|
||||
USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd) {
|
||||
if (usbKbdFd < 0) {
|
||||
return USB_KBD_ERR_NOT_INIT;
|
||||
}
|
||||
|
||||
cmd->unk_0x04 = param_2;
|
||||
cmd->unk_0x00 = param_1;
|
||||
cmd->ledBits = ledBits;
|
||||
cmd->device = device;
|
||||
|
||||
return IOS_Write(usbKbdFd, cmd, sizeof(USBKBDCmdLED)) != IPC_RESULT_OK ? USB_KBD_ERR_FATAL : USB_KBD_ERR_OK;
|
||||
}
|
||||
@@ -114,12 +114,12 @@ static IOSError usbKbdSetLEDHandler(IOSError error, void* arg) {
|
||||
return IPC_RESULT_OK;
|
||||
}
|
||||
|
||||
USBKBDErr USBKBDSetLEDAsync(u32 param_1, u8 param_2, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg) {
|
||||
USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg) {
|
||||
if (usbKbdFd < 0) {
|
||||
return USB_KBD_ERR_NOT_INIT;
|
||||
}
|
||||
cmd->base.unk_0x00 = param_1;
|
||||
cmd->base.unk_0x04 = param_2;
|
||||
cmd->base.device = device;
|
||||
cmd->base.ledBits = ledBits;
|
||||
cmd->cb = cb;
|
||||
cmd->cbArg = cbArg;
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
extern void SIRefreshSamplingRate(void);
|
||||
extern void VISetRGBModeImm(void);
|
||||
extern void __VISetRevolutionModeSimple(void);
|
||||
extern volatile u32 Vdac_Flag_Changed_816991E0;
|
||||
extern volatile u32 Vdac_Flag_Changed;
|
||||
extern void __VISetYUVSEL(u32 enable);
|
||||
extern void __VISetFilter4EURGB60(u32 enable);
|
||||
extern void __VISetCGMS(void);
|
||||
@@ -324,8 +324,8 @@ position_interrupt:
|
||||
}
|
||||
old_tvtype = currentTvType;
|
||||
if (flushFlag3in1 != 0) {
|
||||
while (Vdac_Flag_Changed_816991E0 != 0) {
|
||||
changeBit = 1U << (31 - __cntlzw(Vdac_Flag_Changed_816991E0));
|
||||
while (Vdac_Flag_Changed != 0) {
|
||||
changeBit = 1U << (31 - __cntlzw(Vdac_Flag_Changed));
|
||||
switch (changeBit) {
|
||||
case 1:
|
||||
__VISetCGMS();
|
||||
@@ -352,7 +352,7 @@ position_interrupt:
|
||||
__VISetRGBModeImm();
|
||||
break;
|
||||
}
|
||||
Vdac_Flag_Changed_816991E0 &= ~changeBit;
|
||||
Vdac_Flag_Changed &= ~changeBit;
|
||||
}
|
||||
flushFlag3in1 = 0;
|
||||
}
|
||||
|
||||
@@ -138,7 +138,7 @@ static s32 Vdac_Flag_Region;
|
||||
static s32 __type;
|
||||
static s32 __gamma;
|
||||
static s32 __level;
|
||||
volatile u32 Vdac_Flag_Changed_816991E0;
|
||||
volatile u32 Vdac_Flag_Changed;
|
||||
|
||||
static void __VISetCCSEL(u8 flag) {
|
||||
u8 data[2];
|
||||
@@ -339,7 +339,7 @@ void VISetCGMS(u8 wd0, u8 wd1, u8 wd2) {
|
||||
__wd0 = wd0;
|
||||
__wd1 = wd1;
|
||||
__wd2 = wd2;
|
||||
Vdac_Flag_Changed_816991E0 |= 1;
|
||||
Vdac_Flag_Changed |= 1;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -382,7 +382,7 @@ void VISetMacrovision(s32 type) {
|
||||
if ((__type != type) || (__tvType != tvFormat)) {
|
||||
__type = type;
|
||||
__tvType = tvFormat;
|
||||
Vdac_Flag_Changed_816991E0 |= 8;
|
||||
Vdac_Flag_Changed |= 8;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -448,7 +448,7 @@ void VISetTrapFilter(BOOL filter) {
|
||||
return;
|
||||
}
|
||||
__filter = filter;
|
||||
Vdac_Flag_Changed_816991E0 |= 0x20;
|
||||
Vdac_Flag_Changed |= 0x20;
|
||||
}
|
||||
|
||||
void __VISetRGBOverDrive(void) {
|
||||
@@ -468,7 +468,7 @@ void __VISetRGBOverDrive(void) {
|
||||
}
|
||||
|
||||
void VISetRGBModeImm(void) {
|
||||
Vdac_Flag_Changed_816991E0 |= 0x80;
|
||||
Vdac_Flag_Changed |= 0x80;
|
||||
}
|
||||
|
||||
void __VISetRGBModeImm(void) {
|
||||
@@ -520,34 +520,34 @@ void __VISetRevolutionMode(void) {
|
||||
__wd0 = 0;
|
||||
__wd1 = 0;
|
||||
__wd2 = 0;
|
||||
Vdac_Flag_Changed_816991E0 |= 1;
|
||||
Vdac_Flag_Changed |= 1;
|
||||
}
|
||||
if ((__gp1 != 0) || (__gp2 != 0) || (__gp3 != 0) || (__gp4 != 0)) {
|
||||
__gp1 = 0;
|
||||
__gp2 = 0;
|
||||
__gp3 = 0;
|
||||
__gp4 = 0;
|
||||
Vdac_Flag_Changed_816991E0 |= 2;
|
||||
Vdac_Flag_Changed |= 2;
|
||||
}
|
||||
if ((__cc1 != 0) || (__cc2 != 0) || (__cc3 != 0) || (__cc4 != 0)) {
|
||||
__cc1 = 0;
|
||||
__cc2 = 0;
|
||||
__cc3 = 0;
|
||||
__cc4 = 0;
|
||||
Vdac_Flag_Changed_816991E0 |= 4;
|
||||
Vdac_Flag_Changed |= 4;
|
||||
}
|
||||
VISetMacrovision(1);
|
||||
if (__filter != 0) {
|
||||
__filter = 0;
|
||||
Vdac_Flag_Changed_816991E0 |= 0x20;
|
||||
Vdac_Flag_Changed |= 0x20;
|
||||
}
|
||||
if (__level != 0) {
|
||||
__level = 0;
|
||||
Vdac_Flag_Changed_816991E0 |= 0x40;
|
||||
Vdac_Flag_Changed |= 0x40;
|
||||
}
|
||||
if (__gamma != 10) {
|
||||
__gamma = 10;
|
||||
Vdac_Flag_Changed_816991E0 |= 0x10;
|
||||
Vdac_Flag_Changed |= 0x10;
|
||||
}
|
||||
VIFlush();
|
||||
VIWaitForRetrace();
|
||||
@@ -588,7 +588,7 @@ void VISetWSS(u8 gp1, u8 gp2, u8 gp3, u8 gp4) {
|
||||
__gp2 = gp2;
|
||||
__gp3 = gp3;
|
||||
__gp4 = gp4;
|
||||
Vdac_Flag_Changed_816991E0 |= 2;
|
||||
Vdac_Flag_Changed |= 2;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -598,14 +598,14 @@ void VISetClosedCaption(u8 cc1, u8 cc2, u8 cc3, u8 cc4) {
|
||||
__cc2 = cc2;
|
||||
__cc3 = cc3;
|
||||
__cc4 = cc4;
|
||||
Vdac_Flag_Changed_816991E0 |= 4;
|
||||
Vdac_Flag_Changed |= 4;
|
||||
}
|
||||
}
|
||||
|
||||
void VISetRGBOverDrive(s32 level) {
|
||||
if (__level != level) {
|
||||
__level = level;
|
||||
Vdac_Flag_Changed_816991E0 |= 0x40;
|
||||
Vdac_Flag_Changed |= 0x40;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2947,6 +2947,7 @@ static s32 WAD_815C43E0(WADHashThreadArgs* args) {
|
||||
|
||||
static s32 _WADHash(WADStream* stream, u32 offset, u32 size, void* context, void* buffer,
|
||||
u32 chunkSize, void* secondBuffer, void* threadStack, u32 threadStackSize) {
|
||||
OSMutex* mutex;
|
||||
s32 result;
|
||||
u32 completed = 0;
|
||||
void* readBuffer;
|
||||
@@ -3005,7 +3006,6 @@ static s32 _WADHash(WADStream* stream, u32 offset, u32 size, void* context, void
|
||||
OSResumeThread(&thread);
|
||||
bufferIndex = 0;
|
||||
while (size != 0 && transfer.error == 0) {
|
||||
OSMutex* mutex;
|
||||
readSize = size > chunkSize ? chunkSize : size;
|
||||
mutex = &transfer.mutex[bufferIndex];
|
||||
OSLockMutex(mutex);
|
||||
@@ -3019,11 +3019,10 @@ static s32 _WADHash(WADStream* stream, u32 offset, u32 size, void* context, void
|
||||
readBuffer = transfer.buffers[bufferIndex];
|
||||
result = WADReadStream(stream, &readBuffer, readSize, offset + completed);
|
||||
if ((u32)result != readSize) {
|
||||
OSMutex* otherMutex = &transfer.mutex[bufferIndex ^ 1];
|
||||
OSLockMutex(otherMutex);
|
||||
OSLockMutex(&transfer.mutex[bufferIndex ^ 1]);
|
||||
OSCancelThread(&thread);
|
||||
OSJoinThread(&thread, 0);
|
||||
OSUnlockMutex(otherMutex);
|
||||
OSUnlockMutex(&transfer.mutex[bufferIndex ^ 1]);
|
||||
OSUnlockMutex(mutex);
|
||||
result = -3005;
|
||||
goto done;
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
#define DPD_CONFIG2_SIZE 2
|
||||
#define SPK_CONFIG_SIZE 7
|
||||
|
||||
char lbl_81687720[] = "<< RVL_SDK - WPAD \trelease build: Apr 20 2010 11:20:55 (0x4199_60831) >>";
|
||||
const char* __WPADVersion = lbl_81687720;
|
||||
char scWpadVersionStr[] = "<< RVL_SDK - WPAD \trelease build: Apr 20 2010 11:20:55 (0x4199_60831) >>";
|
||||
const char* __WPADVersion = scWpadVersionStr;
|
||||
|
||||
WPADStorage _wpd;
|
||||
WPADCB* _wpdcb[WPAD_MAX_CONTROLLERS];
|
||||
@@ -617,7 +617,7 @@ static void __reconnect(BOOL exec) {
|
||||
WUDShutdown(exec);
|
||||
}
|
||||
#ifdef __MWERKS__
|
||||
char lbl_81687810[0x58] = "Reconnect Start!!\n\0\0\0\0\0\0"
|
||||
char scWpadManageStrs[0x58] = "Reconnect Start!!\n\0\0\0\0\0\0"
|
||||
"Check the update of WiFi using channel\n\0"
|
||||
"WiFi uses channel = %d\n";
|
||||
extern void _savegpr_19();
|
||||
@@ -629,8 +629,8 @@ static asm void WPADiManageHandler(OSAlarm* pAlarm, OSContext* pContext) {
|
||||
stw r0, 0x164(r1)
|
||||
addi r11, r1, 0x160
|
||||
bl _savegpr_19
|
||||
lis r28, lbl_81687720@ha
|
||||
addi r28, r28, lbl_81687720@l
|
||||
lis r28, scWpadVersionStr@ha
|
||||
addi r28, r28, scWpadVersionStr@l
|
||||
bl WUDGetStatus
|
||||
cmpwi r3, 0x3
|
||||
beq WPADiManageHandler_8AC8
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -6,13 +6,10 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata"
|
||||
extern const char lbl_816979E8[8] = "/\0\0\0\0\0\0\0";
|
||||
#pragma pop
|
||||
char CDBFSPathSeparator = '/';
|
||||
|
||||
void CDBFSConcatenatePath(char* path, const char* concatPath) {
|
||||
strcat(path, lbl_816979E8);
|
||||
strcat(path, &CDBFSPathSeparator);
|
||||
strcat(path, concatPath);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <private/nhttp.h>
|
||||
|
||||
const char NHTTPi_strMultipartBound[] = STR_POSTBOUND;
|
||||
const char NHTTPi_strMultipartBound[24] = STR_POSTBOUND;
|
||||
|
||||
void* NHTTPi_alloc(u32 size, int align);
|
||||
void NHTTPi_free(void* ptr);
|
||||
|
||||
@@ -55,7 +55,13 @@ static s32 ConnectionStarted(NHTTPConnectionInfo* handle) {
|
||||
void* system=NHTTPi_GetSystemInfoP();
|
||||
void* mutex=NHTTPi_GetMutexInfoP(system);
|
||||
NHTTPConnectionInfo* connection=NHTTPi_GetConnection(mutex,handle);
|
||||
return connection ? connection->started : -1;
|
||||
s32 started;
|
||||
if (connection == NULL) {
|
||||
started = -1;
|
||||
} else {
|
||||
started = connection->started;
|
||||
}
|
||||
return started;
|
||||
}
|
||||
|
||||
static s32 ConnectionState(NHTTPConnectionInfo* handle) {
|
||||
|
||||
@@ -873,40 +873,48 @@ NWC24Err NWC24GetDlTask(NWC24DlTask* dlTask, NWC24DlId dlId) {
|
||||
return operationResult;
|
||||
}
|
||||
|
||||
static inline NWC24Err InitDlIteration(DlTaskIterationState* state, u32 sortMode) {
|
||||
memset(state, 0, sizeof(*state));
|
||||
state->comparisonValue = 0x7fffffff;
|
||||
state->selectedValue = (s32)0x80000001;
|
||||
state->sortMode = sortMode;
|
||||
state->comparisonId = 0xffffffff;
|
||||
state->initialized = 1;
|
||||
state->valid = 1;
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
NWC24Err NWC24PurgeOldestDlTask() {
|
||||
DlTaskIterationState state;
|
||||
NWC24File file;
|
||||
NWC24DlTask task;
|
||||
DlTaskListHeader* header;
|
||||
NWC24DlId taskId;
|
||||
NWC24DlTask* taskPointer;
|
||||
NWC24DlId selectedId;
|
||||
NWC24DlTask* taskPointer;
|
||||
NWC24Err result;
|
||||
NWC24Err closeResult;
|
||||
|
||||
memset(&state, 0, sizeof(state));
|
||||
state.sortMode = 0;
|
||||
state.comparisonValue = 0x7fffffff;
|
||||
state.selectedValue = (s32)0x80000001;
|
||||
state.comparisonId = 0xffffffff;
|
||||
state.initialized = 1;
|
||||
state.valid = 1;
|
||||
result = InitDlIteration(&state, 0);
|
||||
if (result < NWC24_OK) { return NWC24_OK; }
|
||||
|
||||
while ((result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId)) == NWC24_OK) {
|
||||
header = GetCachedDlHeader();
|
||||
if (taskId >= header->taskCount) { break; }
|
||||
}
|
||||
|
||||
if (result < NWC24_OK) {
|
||||
if (result == NWC24_ERR_DONE) { result = NWC24_ERR_FAILED; }
|
||||
return result;
|
||||
if (result >= NWC24_OK) {
|
||||
taskPointer = &task;
|
||||
selectedId = taskId;
|
||||
result = ReadDlTaskInline(taskPointer, selectedId);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
taskPointer = &task;
|
||||
result = RemoveDlTask(taskPointer);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
} else if (result == NWC24_ERR_DONE) {
|
||||
result = NWC24_ERR_FAILED;
|
||||
}
|
||||
|
||||
taskPointer = &task;
|
||||
selectedId = taskId;
|
||||
result = ReadDlTaskInline(taskPointer, selectedId);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
return RemoveDlTask(taskPointer);
|
||||
return result;
|
||||
}
|
||||
NWC24Err NWC24ManageDlTaskListForMenu() {
|
||||
NWC24DlTask task;
|
||||
@@ -921,7 +929,9 @@ NWC24Err NWC24ManageDlTaskListForMenu() {
|
||||
result = ReadDlTaskInline(taskPointer, 2);
|
||||
if (result == NWC24_ERR_NOT_FOUND) { return NWC24_OK; }
|
||||
if (result < NWC24_OK) { return result; }
|
||||
return RemoveDlTask(&task);
|
||||
taskPointer = &task;
|
||||
result = RemoveDlTask(taskPointer);
|
||||
return result;
|
||||
}
|
||||
|
||||
NWC24Err NWC24GetDlOptOutFlags(NWC24DlTask* dlTask, u8* dlOptOutFlags) {
|
||||
|
||||
@@ -18,10 +18,8 @@ enum {
|
||||
#define FRIEND_LIST_MAGIC 'WcFl'
|
||||
#define FRIEND_LIST_VERSION 2
|
||||
|
||||
const char lbl_8166E160[26] __attribute__((section(".data"), aligned(8))) = "/shared2/wc24/nwc24fl.bin";
|
||||
void* const lbl_8166E160_pad __attribute__((section(".data"))) = (void*)0;
|
||||
static const char* FLFilePath = lbl_8166E160;
|
||||
const u32 FLFilePath_pad __attribute__((section(".sdata"), aligned(1))) = 0;
|
||||
char scNwc24FlPath[] = "/shared2/wc24/nwc24fl.bin";
|
||||
static const char* FLFilePath = scNwc24FlPath;
|
||||
|
||||
const char g_SpecialsChars[16] = { '(', ')', '<', '>', '[', ']', ':', ';', '\\', ',', '"' };
|
||||
|
||||
|
||||
@@ -198,8 +198,10 @@ int SOShutdown(int socket, int how) {
|
||||
}
|
||||
|
||||
int SOPoll(SOPollFD* fds, unsigned int count, s64 timeout) {
|
||||
s32 size;
|
||||
s32 bytes;
|
||||
s32 result;
|
||||
s32 rm;
|
||||
s32 result,bytes,size;
|
||||
PollRequest* request;
|
||||
SOPollFD* reply;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
|
||||
@@ -10,36 +10,36 @@
|
||||
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata2"
|
||||
const u8 lbl_81695060 = 0;
|
||||
const u8 lbl_81695061 = 0x0F;
|
||||
const u8 lbl_81695062 = 0xAC;
|
||||
const u8 lbl_81695063 = 0;
|
||||
const u8 lbl_81695064 = 0;
|
||||
const u8 lbl_81695065 = 0x50;
|
||||
const u8 lbl_81695066 = 0xF2;
|
||||
const u8 lbl_81695067 = 0;
|
||||
const u8 scRsnOui0 = 0;
|
||||
const u8 scRsnOui1 = 0x0F;
|
||||
const u8 scRsnOui2 = 0xAC;
|
||||
const u8 scRsnOuiPad = 0;
|
||||
const u8 scWpaOui0 = 0;
|
||||
const u8 scWpaOui1 = 0x50;
|
||||
const u8 scWpaOui2 = 0xF2;
|
||||
const u8 scWpaOuiPad = 0;
|
||||
#pragma pop
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata"
|
||||
const u8 lbl_81697D70 = 0;
|
||||
const u8 lbl_81697D71 = 0x50;
|
||||
const u8 lbl_81697D72 = 0xF2;
|
||||
const u8 lbl_81697D73 = 0;
|
||||
const u8 lbl_81697D74 = 0;
|
||||
const u8 lbl_81697D75 = 0;
|
||||
const u8 lbl_81697D76 = 0;
|
||||
const u8 lbl_81697D77 = 0;
|
||||
const u8 scWpaFindOui0 = 0;
|
||||
const u8 scWpaFindOui1 = 0x50;
|
||||
const u8 scWpaFindOui2 = 0xF2;
|
||||
const u8 scWpaFindOuiPad0 = 0;
|
||||
const u8 scWpaFindOuiPad1 = 0;
|
||||
const u8 scWpaFindOuiPad2 = 0;
|
||||
const u8 scWpaFindOuiPad3 = 0;
|
||||
const u8 scWpaFindOuiPad4 = 0;
|
||||
#pragma pop
|
||||
|
||||
#define lbl_81695060 (*((volatile const u8*)&lbl_81695060))
|
||||
#define lbl_81695061 (*((volatile const u8*)&lbl_81695061))
|
||||
#define lbl_81695062 (*((volatile const u8*)&lbl_81695062))
|
||||
#define lbl_81695064 (*((volatile const u8*)&lbl_81695064))
|
||||
#define lbl_81695065 (*((volatile const u8*)&lbl_81695065))
|
||||
#define lbl_81695066 (*((volatile const u8*)&lbl_81695066))
|
||||
#define lbl_81697D70 (*((volatile const u8*)&lbl_81697D70))
|
||||
#define lbl_81697D71 (*((volatile const u8*)&lbl_81697D71))
|
||||
#define lbl_81697D72 (*((volatile const u8*)&lbl_81697D72))
|
||||
#define scRsnOui0 (*((volatile const u8*)&scRsnOui0))
|
||||
#define scRsnOui1 (*((volatile const u8*)&scRsnOui1))
|
||||
#define scRsnOui2 (*((volatile const u8*)&scRsnOui2))
|
||||
#define scWpaOui0 (*((volatile const u8*)&scWpaOui0))
|
||||
#define scWpaOui1 (*((volatile const u8*)&scWpaOui1))
|
||||
#define scWpaOui2 (*((volatile const u8*)&scWpaOui2))
|
||||
#define scWpaFindOui0 (*((volatile const u8*)&scWpaFindOui0))
|
||||
#define scWpaFindOui1 (*((volatile const u8*)&scWpaFindOui1))
|
||||
#define scWpaFindOui2 (*((volatile const u8*)&scWpaFindOui2))
|
||||
extern void _savegpr_21();
|
||||
extern void _restgpr_21();
|
||||
|
||||
@@ -175,9 +175,9 @@ s32 WDGetPrivacyMode(WDBssDesc* bssDesc) {
|
||||
if (WDFindInformationElement((WDInfoElement**)&ieData, &ieLength, bssDesc, 0x30)) {
|
||||
u8 data[WD_VENDOR_LENGTH];
|
||||
|
||||
data[0] = lbl_81695060;
|
||||
data[1] = lbl_81695061;
|
||||
data[2] = lbl_81695062;
|
||||
data[0] = scRsnOui0;
|
||||
data[1] = scRsnOui1;
|
||||
data[2] = scRsnOui2;
|
||||
memcpy(readIE, ieData, sizeof(WDVendorInfoElement) + 2);
|
||||
if (memcmp(&readIE[2], data, WD_VENDOR_LENGTH) == 0) {
|
||||
if ((s32)readIE[5] == 3) {
|
||||
@@ -218,15 +218,15 @@ privacy_second: {
|
||||
u8 data[WD_VENDOR_LENGTH];
|
||||
u8 findData[WD_VENDOR_LENGTH];
|
||||
|
||||
findData[0] = lbl_81697D70;
|
||||
findData[1] = lbl_81697D71;
|
||||
findData[2] = lbl_81697D72;
|
||||
findData[0] = scWpaFindOui0;
|
||||
findData[1] = scWpaFindOui1;
|
||||
findData[2] = scWpaFindOui2;
|
||||
if (!WDiFindVendorSpecificIE(&ieData, &ieLength, bssDesc, 0xDD, findData, 1)) {
|
||||
goto privacy_fallback;
|
||||
}
|
||||
data[0] = lbl_81695064;
|
||||
data[1] = lbl_81695065;
|
||||
data[2] = lbl_81695066;
|
||||
data[0] = scWpaOui0;
|
||||
data[1] = scWpaOui1;
|
||||
data[2] = scWpaOui2;
|
||||
|
||||
{
|
||||
memcpy(readIE, ieData, sizeof(WDVendorInfoElement));
|
||||
|
||||
@@ -313,18 +313,18 @@ asm void __div2u() {
|
||||
cmpwi r3, 0x0
|
||||
cntlzw r0, r3
|
||||
cntlzw r9, r4
|
||||
bne L_815F9538
|
||||
bne __div2u_L_815F9538
|
||||
addi r0, r9, 0x20
|
||||
L_815F9538:
|
||||
__div2u_L_815F9538:
|
||||
cmpwi r5, 0x0
|
||||
cntlzw r9, r5
|
||||
cntlzw r10, r6
|
||||
bne L_815F954C
|
||||
bne __div2u_L_815F954C
|
||||
addi r9, r10, 0x20
|
||||
L_815F954C:
|
||||
__div2u_L_815F954C:
|
||||
cmpw r0, r9
|
||||
subfic r10, r0, 0x40
|
||||
bgt L_815F9604
|
||||
bgt __div2u_L_815F9604
|
||||
addi r9, r9, 0x1
|
||||
subfic r9, r9, 0x40
|
||||
add r0, r0, r9
|
||||
@@ -332,49 +332,49 @@ L_815F954C:
|
||||
mtctr r9
|
||||
cmpwi r9, 0x20
|
||||
subi r7, r9, 0x20
|
||||
blt L_815F9584
|
||||
blt __div2u_L_815F9584
|
||||
srw r8, r3, r7
|
||||
li r7, 0x0
|
||||
b L_815F9598
|
||||
L_815F9584:
|
||||
b __div2u_L_815F9598
|
||||
__div2u_L_815F9584:
|
||||
srw r8, r4, r9
|
||||
subfic r7, r9, 0x20
|
||||
slw r7, r3, r7
|
||||
or r8, r8, r7
|
||||
srw r7, r3, r9
|
||||
L_815F9598:
|
||||
__div2u_L_815F9598:
|
||||
cmpwi r0, 0x20
|
||||
subic r9, r0, 0x20
|
||||
blt L_815F95B0
|
||||
blt __div2u_L_815F95B0
|
||||
slw r3, r4, r9
|
||||
li r4, 0x0
|
||||
b L_815F95C4
|
||||
L_815F95B0:
|
||||
b __div2u_L_815F95C4
|
||||
__div2u_L_815F95B0:
|
||||
slw r3, r3, r0
|
||||
subfic r9, r0, 0x20
|
||||
srw r9, r4, r9
|
||||
or r3, r3, r9
|
||||
slw r4, r4, r0
|
||||
L_815F95C4:
|
||||
__div2u_L_815F95C4:
|
||||
li r10, -0x1
|
||||
addic r7, r7, 0x0
|
||||
L_815F95CC:
|
||||
__div2u_L_815F95CC:
|
||||
adde r4, r4, r4
|
||||
adde r3, r3, r3
|
||||
adde r8, r8, r8
|
||||
adde r7, r7, r7
|
||||
subfc r0, r6, r8
|
||||
subfe. r9, r5, r7
|
||||
blt L_815F95F4
|
||||
blt __div2u_L_815F95F4
|
||||
mr r8, r0
|
||||
mr r7, r9
|
||||
addic r0, r10, 0x1
|
||||
L_815F95F4:
|
||||
bdnz L_815F95CC
|
||||
__div2u_L_815F95F4:
|
||||
bdnz __div2u_L_815F95CC
|
||||
adde r4, r4, r4
|
||||
adde r3, r3, r3
|
||||
blr
|
||||
L_815F9604:
|
||||
__div2u_L_815F9604:
|
||||
li r4, 0x0
|
||||
li r3, 0x0
|
||||
blr
|
||||
@@ -385,32 +385,32 @@ asm void __div2i() {
|
||||
#ifdef __MWERKS__
|
||||
stwu r1, -0x10(r1)
|
||||
clrrwi. r9, r3, 31
|
||||
beq L_815F9624
|
||||
beq __div2i_L_815F9624
|
||||
subfic r4, r4, 0x0
|
||||
subfze r3, r3
|
||||
L_815F9624:
|
||||
__div2i_L_815F9624:
|
||||
stw r9, 0x8(r1)
|
||||
clrrwi. r10, r5, 31
|
||||
beq L_815F9638
|
||||
beq __div2i_L_815F9638
|
||||
subfic r6, r6, 0x0
|
||||
subfze r5, r5
|
||||
L_815F9638:
|
||||
__div2i_L_815F9638:
|
||||
stw r10, 0xc(r1)
|
||||
cmpwi r3, 0x0
|
||||
cntlzw r0, r3
|
||||
cntlzw r9, r4
|
||||
bne L_815F9650
|
||||
bne __div2i_L_815F9650
|
||||
addi r0, r9, 0x20
|
||||
L_815F9650:
|
||||
__div2i_L_815F9650:
|
||||
cmpwi r5, 0x0
|
||||
cntlzw r9, r5
|
||||
cntlzw r10, r6
|
||||
bne L_815F9664
|
||||
bne __div2i_L_815F9664
|
||||
addi r9, r10, 0x20
|
||||
L_815F9664:
|
||||
__div2i_L_815F9664:
|
||||
cmpw r0, r9
|
||||
subfic r10, r0, 0x40
|
||||
bgt L_815F9738
|
||||
bgt __div2i_L_815F9738
|
||||
addi r9, r9, 0x1
|
||||
subfic r9, r9, 0x40
|
||||
add r0, r0, r9
|
||||
@@ -418,60 +418,60 @@ L_815F9664:
|
||||
mtctr r9
|
||||
cmpwi r9, 0x20
|
||||
subi r7, r9, 0x20
|
||||
blt L_815F969C
|
||||
blt __div2i_L_815F969C
|
||||
srw r8, r3, r7
|
||||
li r7, 0x0
|
||||
b L_815F96B0
|
||||
L_815F969C:
|
||||
b __div2i_L_815F96B0
|
||||
__div2i_L_815F969C:
|
||||
srw r8, r4, r9
|
||||
subfic r7, r9, 0x20
|
||||
slw r7, r3, r7
|
||||
or r8, r8, r7
|
||||
srw r7, r3, r9
|
||||
L_815F96B0:
|
||||
__div2i_L_815F96B0:
|
||||
cmpwi r0, 0x20
|
||||
subic r9, r0, 0x20
|
||||
blt L_815F96C8
|
||||
blt __div2i_L_815F96C8
|
||||
slw r3, r4, r9
|
||||
li r4, 0x0
|
||||
b L_815F96DC
|
||||
L_815F96C8:
|
||||
b __div2i_L_815F96DC
|
||||
__div2i_L_815F96C8:
|
||||
slw r3, r3, r0
|
||||
subfic r9, r0, 0x20
|
||||
srw r9, r4, r9
|
||||
or r3, r3, r9
|
||||
slw r4, r4, r0
|
||||
L_815F96DC:
|
||||
__div2i_L_815F96DC:
|
||||
li r10, -0x1
|
||||
addic r7, r7, 0x0
|
||||
L_815F96E4:
|
||||
__div2i_L_815F96E4:
|
||||
adde r4, r4, r4
|
||||
adde r3, r3, r3
|
||||
adde r8, r8, r8
|
||||
adde r7, r7, r7
|
||||
subfc r0, r6, r8
|
||||
subfe. r9, r5, r7
|
||||
blt L_815F970C
|
||||
blt __div2i_L_815F970C
|
||||
mr r8, r0
|
||||
mr r7, r9
|
||||
addic r0, r10, 0x1
|
||||
L_815F970C:
|
||||
bdnz L_815F96E4
|
||||
__div2i_L_815F970C:
|
||||
bdnz __div2i_L_815F96E4
|
||||
adde r4, r4, r4
|
||||
adde r3, r3, r3
|
||||
lwz r9, 0x8(r1)
|
||||
lwz r10, 0xc(r1)
|
||||
xor. r7, r9, r10
|
||||
beq L_815F9734
|
||||
beq __div2i_L_815F9734
|
||||
cmpwi r9, 0x0
|
||||
subfic r4, r4, 0x0
|
||||
subfze r3, r3
|
||||
L_815F9734:
|
||||
b L_815F9740
|
||||
L_815F9738:
|
||||
__div2i_L_815F9734:
|
||||
b __div2i_L_815F9740
|
||||
__div2i_L_815F9738:
|
||||
li r4, 0x0
|
||||
li r3, 0x0
|
||||
L_815F9740:
|
||||
__div2i_L_815F9740:
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
#endif
|
||||
@@ -482,18 +482,18 @@ asm void __mod2u() {
|
||||
cmpwi r3, 0x0
|
||||
cntlzw r0, r3
|
||||
cntlzw r9, r4
|
||||
bne L_815F975C
|
||||
bne __mod2u_L_815F975C
|
||||
addi r0, r9, 0x20
|
||||
L_815F975C:
|
||||
__mod2u_L_815F975C:
|
||||
cmpwi r5, 0x0
|
||||
cntlzw r9, r5
|
||||
cntlzw r10, r6
|
||||
bne L_815F9770
|
||||
bne __mod2u_L_815F9770
|
||||
addi r9, r10, 0x20
|
||||
L_815F9770:
|
||||
__mod2u_L_815F9770:
|
||||
cmpw r0, r9
|
||||
subfic r10, r0, 0x40
|
||||
bgt L_815F9828
|
||||
bgt __mod2u_L_815F9828
|
||||
addi r9, r9, 0x1
|
||||
subfic r9, r9, 0x40
|
||||
add r0, r0, r9
|
||||
@@ -501,49 +501,49 @@ L_815F9770:
|
||||
mtctr r9
|
||||
cmpwi r9, 0x20
|
||||
subi r7, r9, 0x20
|
||||
blt L_815F97A8
|
||||
blt __mod2u_L_815F97A8
|
||||
srw r8, r3, r7
|
||||
li r7, 0x0
|
||||
b L_815F97BC
|
||||
L_815F97A8:
|
||||
b __mod2u_L_815F97BC
|
||||
__mod2u_L_815F97A8:
|
||||
srw r8, r4, r9
|
||||
subfic r7, r9, 0x20
|
||||
slw r7, r3, r7
|
||||
or r8, r8, r7
|
||||
srw r7, r3, r9
|
||||
L_815F97BC:
|
||||
__mod2u_L_815F97BC:
|
||||
cmpwi r0, 0x20
|
||||
subic r9, r0, 0x20
|
||||
blt L_815F97D4
|
||||
blt __mod2u_L_815F97D4
|
||||
slw r3, r4, r9
|
||||
li r4, 0x0
|
||||
b L_815F97E8
|
||||
L_815F97D4:
|
||||
b __mod2u_L_815F97E8
|
||||
__mod2u_L_815F97D4:
|
||||
slw r3, r3, r0
|
||||
subfic r9, r0, 0x20
|
||||
srw r9, r4, r9
|
||||
or r3, r3, r9
|
||||
slw r4, r4, r0
|
||||
L_815F97E8:
|
||||
__mod2u_L_815F97E8:
|
||||
li r10, -0x1
|
||||
addic r7, r7, 0x0
|
||||
L_815F97F0:
|
||||
__mod2u_L_815F97F0:
|
||||
adde r4, r4, r4
|
||||
adde r3, r3, r3
|
||||
adde r8, r8, r8
|
||||
adde r7, r7, r7
|
||||
subfc r0, r6, r8
|
||||
subfe. r9, r5, r7
|
||||
blt L_815F9818
|
||||
blt __mod2u_L_815F9818
|
||||
mr r8, r0
|
||||
mr r7, r9
|
||||
addic r0, r10, 0x1
|
||||
L_815F9818:
|
||||
bdnz L_815F97F0
|
||||
__mod2u_L_815F9818:
|
||||
bdnz __mod2u_L_815F97F0
|
||||
mr r4, r8
|
||||
mr r3, r7
|
||||
blr
|
||||
L_815F9828:
|
||||
__mod2u_L_815F9828:
|
||||
blr
|
||||
#endif
|
||||
}
|
||||
@@ -551,30 +551,30 @@ L_815F9828:
|
||||
asm void __mod2i() {
|
||||
#ifdef __MWERKS__
|
||||
cmpwi cr7, r3, 0x0
|
||||
bge cr7, L_815F983C
|
||||
bge cr7, __mod2i_L_815F983C
|
||||
subfic r4, r4, 0x0
|
||||
subfze r3, r3
|
||||
L_815F983C:
|
||||
__mod2i_L_815F983C:
|
||||
cmpwi r5, 0x0
|
||||
bge L_815F984C
|
||||
bge __mod2i_L_815F984C
|
||||
subfic r6, r6, 0x0
|
||||
subfze r5, r5
|
||||
L_815F984C:
|
||||
__mod2i_L_815F984C:
|
||||
cmpwi r3, 0x0
|
||||
cntlzw r0, r3
|
||||
cntlzw r9, r4
|
||||
bne L_815F9860
|
||||
bne __mod2i_L_815F9860
|
||||
addi r0, r9, 0x20
|
||||
L_815F9860:
|
||||
__mod2i_L_815F9860:
|
||||
cmpwi r5, 0x0
|
||||
cntlzw r9, r5
|
||||
cntlzw r10, r6
|
||||
bne L_815F9874
|
||||
bne __mod2i_L_815F9874
|
||||
addi r9, r10, 0x20
|
||||
L_815F9874:
|
||||
__mod2i_L_815F9874:
|
||||
cmpw r0, r9
|
||||
subfic r10, r0, 0x40
|
||||
bgt L_815F9928
|
||||
bgt __mod2i_L_815F9928
|
||||
addi r9, r9, 0x1
|
||||
subfic r9, r9, 0x40
|
||||
add r0, r0, r9
|
||||
@@ -582,52 +582,52 @@ L_815F9874:
|
||||
mtctr r9
|
||||
cmpwi r9, 0x20
|
||||
subi r7, r9, 0x20
|
||||
blt L_815F98AC
|
||||
blt __mod2i_L_815F98AC
|
||||
srw r8, r3, r7
|
||||
li r7, 0x0
|
||||
b L_815F98C0
|
||||
L_815F98AC:
|
||||
b __mod2i_L_815F98C0
|
||||
__mod2i_L_815F98AC:
|
||||
srw r8, r4, r9
|
||||
subfic r7, r9, 0x20
|
||||
slw r7, r3, r7
|
||||
or r8, r8, r7
|
||||
srw r7, r3, r9
|
||||
L_815F98C0:
|
||||
__mod2i_L_815F98C0:
|
||||
cmpwi r0, 0x20
|
||||
subic r9, r0, 0x20
|
||||
blt L_815F98D8
|
||||
blt __mod2i_L_815F98D8
|
||||
slw r3, r4, r9
|
||||
li r4, 0x0
|
||||
b L_815F98EC
|
||||
L_815F98D8:
|
||||
b __mod2i_L_815F98EC
|
||||
__mod2i_L_815F98D8:
|
||||
slw r3, r3, r0
|
||||
subfic r9, r0, 0x20
|
||||
srw r9, r4, r9
|
||||
or r3, r3, r9
|
||||
slw r4, r4, r0
|
||||
L_815F98EC:
|
||||
__mod2i_L_815F98EC:
|
||||
li r10, -0x1
|
||||
addic r7, r7, 0x0
|
||||
L_815F98F4:
|
||||
__mod2i_L_815F98F4:
|
||||
adde r4, r4, r4
|
||||
adde r3, r3, r3
|
||||
adde r8, r8, r8
|
||||
adde r7, r7, r7
|
||||
subfc r0, r6, r8
|
||||
subfe. r9, r5, r7
|
||||
blt L_815F991C
|
||||
blt __mod2i_L_815F991C
|
||||
mr r8, r0
|
||||
mr r7, r9
|
||||
addic r0, r10, 0x1
|
||||
L_815F991C:
|
||||
bdnz L_815F98F4
|
||||
__mod2i_L_815F991C:
|
||||
bdnz __mod2i_L_815F98F4
|
||||
mr r4, r8
|
||||
mr r3, r7
|
||||
L_815F9928:
|
||||
bge cr7, L_815F9934
|
||||
__mod2i_L_815F9928:
|
||||
bge cr7, __mod2i_L_815F9934
|
||||
subfic r4, r4, 0x0
|
||||
subfze r3, r3
|
||||
L_815F9934:
|
||||
__mod2i_L_815F9934:
|
||||
blr
|
||||
#endif
|
||||
}
|
||||
@@ -668,9 +668,9 @@ asm void __shr2i() {
|
||||
slw r10, r3, r8
|
||||
or r4, r4, r10
|
||||
sraw r10, r3, r9
|
||||
ble L_815F99A0
|
||||
ble __shr2i_L_815F99A0
|
||||
or r4, r4, r10
|
||||
L_815F99A0:
|
||||
__shr2i_L_815F99A0:
|
||||
sraw r3, r3, r5
|
||||
blr
|
||||
#endif
|
||||
@@ -680,13 +680,13 @@ asm void __cvt_sll_dbl() {
|
||||
#ifdef __MWERKS__
|
||||
stwu r1, -0x10(r1)
|
||||
clrrwi. r5, r3, 31
|
||||
beq L_815F99BC
|
||||
beq __cvt_sll_dbl_L_815F99BC
|
||||
subfic r4, r4, 0x0
|
||||
subfze r3, r3
|
||||
L_815F99BC:
|
||||
__cvt_sll_dbl_L_815F99BC:
|
||||
or. r7, r3, r4
|
||||
li r6, 0x0
|
||||
beq L_815F9A44
|
||||
beq __cvt_sll_dbl_L_815F9A44
|
||||
cntlzw r7, r3
|
||||
cntlzw r8, r4
|
||||
extlwi r9, r7, 5, 26
|
||||
@@ -705,22 +705,22 @@ L_815F99BC:
|
||||
clrlwi r7, r4, 21
|
||||
cmpwi r7, 0x400
|
||||
addi r6, r6, 0x43e
|
||||
blt L_815F9A2C
|
||||
bgt L_815F9A20
|
||||
blt __cvt_sll_dbl_L_815F9A2C
|
||||
bgt __cvt_sll_dbl_L_815F9A20
|
||||
rlwinm. r7, r4, 0, 20, 20
|
||||
beq L_815F9A2C
|
||||
L_815F9A20:
|
||||
beq __cvt_sll_dbl_L_815F9A2C
|
||||
__cvt_sll_dbl_L_815F9A20:
|
||||
addic r4, r4, 0x800
|
||||
addze r3, r3
|
||||
addze r6, r6
|
||||
L_815F9A2C:
|
||||
__cvt_sll_dbl_L_815F9A2C:
|
||||
rotrwi r4, r4, 11
|
||||
rlwimi r4, r3, 21, 0, 10
|
||||
extrwi r3, r3, 20, 1
|
||||
slwi r6, r6, 20
|
||||
or r3, r6, r3
|
||||
or r3, r5, r3
|
||||
L_815F9A44:
|
||||
__cvt_sll_dbl_L_815F9A44:
|
||||
stw r3, 0x8(r1)
|
||||
stw r4, 0xc(r1)
|
||||
lfd f1, 0x8(r1)
|
||||
@@ -734,7 +734,7 @@ asm void __cvt_ull_dbl() {
|
||||
stwu r1, -0x10(r1)
|
||||
or. r7, r3, r4
|
||||
li r6, 0x0
|
||||
beq L_815F9AE0
|
||||
beq __cvt_ull_dbl_L_815F9AE0
|
||||
cntlzw r7, r3
|
||||
cntlzw r8, r4
|
||||
extlwi r9, r7, 5, 26
|
||||
@@ -753,21 +753,21 @@ asm void __cvt_ull_dbl() {
|
||||
clrlwi r7, r4, 21
|
||||
cmpwi r7, 0x400
|
||||
addi r6, r6, 0x43e
|
||||
blt L_815F9ACC
|
||||
bgt L_815F9AC0
|
||||
blt __cvt_ull_dbl_L_815F9ACC
|
||||
bgt __cvt_ull_dbl_L_815F9AC0
|
||||
rlwinm. r7, r4, 0, 20, 20
|
||||
beq L_815F9ACC
|
||||
L_815F9AC0:
|
||||
beq __cvt_ull_dbl_L_815F9ACC
|
||||
__cvt_ull_dbl_L_815F9AC0:
|
||||
addic r4, r4, 0x800
|
||||
addze r3, r3
|
||||
addze r6, r6
|
||||
L_815F9ACC:
|
||||
__cvt_ull_dbl_L_815F9ACC:
|
||||
rotrwi r4, r4, 11
|
||||
rlwimi r4, r3, 21, 0, 10
|
||||
extrwi r3, r3, 20, 1
|
||||
slwi r6, r6, 20
|
||||
or r3, r6, r3
|
||||
L_815F9AE0:
|
||||
__cvt_ull_dbl_L_815F9AE0:
|
||||
stw r3, 0x8(r1)
|
||||
stw r4, 0xc(r1)
|
||||
lfd f1, 0x8(r1)
|
||||
@@ -781,7 +781,7 @@ asm void __cvt_ull_flt() {
|
||||
stwu r1, -0x10(r1)
|
||||
or. r7, r3, r4
|
||||
li r6, 0x0
|
||||
beq L_815F9B7C
|
||||
beq __cvt_ull_flt_L_815F9B7C
|
||||
cntlzw r7, r3
|
||||
cntlzw r8, r4
|
||||
extlwi r9, r7, 5, 26
|
||||
@@ -800,21 +800,21 @@ asm void __cvt_ull_flt() {
|
||||
clrlwi r7, r4, 21
|
||||
cmpwi r7, 0x400
|
||||
addi r6, r6, 0x43e
|
||||
blt L_815F9B68
|
||||
bgt L_815F9B5C
|
||||
blt __cvt_ull_flt_L_815F9B68
|
||||
bgt __cvt_ull_flt_L_815F9B5C
|
||||
rlwinm. r7, r4, 0, 20, 20
|
||||
beq L_815F9B68
|
||||
L_815F9B5C:
|
||||
beq __cvt_ull_flt_L_815F9B68
|
||||
__cvt_ull_flt_L_815F9B5C:
|
||||
addic r4, r4, 0x800
|
||||
addze r3, r3
|
||||
addze r6, r6
|
||||
L_815F9B68:
|
||||
__cvt_ull_flt_L_815F9B68:
|
||||
rotrwi r4, r4, 11
|
||||
rlwimi r4, r3, 21, 0, 10
|
||||
extrwi r3, r3, 20, 1
|
||||
slwi r6, r6, 20
|
||||
or r3, r6, r3
|
||||
L_815F9B7C:
|
||||
__cvt_ull_flt_L_815F9B7C:
|
||||
stw r3, 0x8(r1)
|
||||
stw r4, 0xc(r1)
|
||||
lfd f1, 0x8(r1)
|
||||
@@ -832,17 +832,17 @@ asm void __cvt_dbl_usll() {
|
||||
lwz r4, 0xc(r1)
|
||||
extrwi r5, r3, 11, 1
|
||||
cmplwi r5, 0x3ff
|
||||
bge L_815F9BBC
|
||||
bge __cvt_dbl_usll_L_815F9BBC
|
||||
li r3, 0x0
|
||||
li r4, 0x0
|
||||
b L_815F9C58
|
||||
L_815F9BBC:
|
||||
b __cvt_dbl_usll_L_815F9C58
|
||||
__cvt_dbl_usll_L_815F9BBC:
|
||||
mr r6, r3
|
||||
clrlwi r3, r3, 12
|
||||
oris r3, r3, 0x10
|
||||
subi r5, r5, 0x433
|
||||
cmpwi r5, 0x0
|
||||
bge L_815F9BFC
|
||||
bge __cvt_dbl_usll_L_815F9BFC
|
||||
neg r5, r5
|
||||
subfic r8, r5, 0x20
|
||||
subic r9, r5, 0x20
|
||||
@@ -852,21 +852,21 @@ L_815F9BBC:
|
||||
srw r10, r3, r9
|
||||
or r4, r4, r10
|
||||
srw r3, r3, r5
|
||||
b L_815F9C48
|
||||
L_815F9BFC:
|
||||
b __cvt_dbl_usll_L_815F9C48
|
||||
__cvt_dbl_usll_L_815F9BFC:
|
||||
cmpwi r5, 0xa
|
||||
ble+ L_815F9C28
|
||||
ble+ __cvt_dbl_usll_L_815F9C28
|
||||
clrrwi. r6, r6, 31
|
||||
beq L_815F9C18
|
||||
beq __cvt_dbl_usll_L_815F9C18
|
||||
lis r3, 0x8000
|
||||
li r4, 0x0
|
||||
b L_815F9C58
|
||||
L_815F9C18:
|
||||
b __cvt_dbl_usll_L_815F9C58
|
||||
__cvt_dbl_usll_L_815F9C18:
|
||||
lis r3, 0x7fff
|
||||
ori r3, r3, 0xffff
|
||||
li r4, -0x1
|
||||
b L_815F9C58
|
||||
L_815F9C28:
|
||||
b __cvt_dbl_usll_L_815F9C58
|
||||
__cvt_dbl_usll_L_815F9C28:
|
||||
subfic r8, r5, 0x20
|
||||
subic r9, r5, 0x20
|
||||
slw r3, r3, r5
|
||||
@@ -875,12 +875,12 @@ L_815F9C28:
|
||||
slw r10, r4, r9
|
||||
or r3, r3, r10
|
||||
slw r4, r4, r5
|
||||
L_815F9C48:
|
||||
__cvt_dbl_usll_L_815F9C48:
|
||||
clrrwi. r6, r6, 31
|
||||
beq L_815F9C58
|
||||
beq __cvt_dbl_usll_L_815F9C58
|
||||
subfic r4, r4, 0x0
|
||||
subfze r3, r3
|
||||
L_815F9C58:
|
||||
__cvt_dbl_usll_L_815F9C58:
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
#endif
|
||||
@@ -894,19 +894,19 @@ asm void __cvt_dbl_ull() {
|
||||
lwz r4, 0xc(r1)
|
||||
extrwi r5, r3, 11, 1
|
||||
cmplwi r5, 0x3ff
|
||||
bge L_815F9C88
|
||||
L_815F9C7C:
|
||||
bge __cvt_dbl_ull_L_815F9C88
|
||||
__cvt_dbl_ull_L_815F9C7C:
|
||||
li r3, 0x0
|
||||
li r4, 0x0
|
||||
b L_815F9D00
|
||||
L_815F9C88:
|
||||
b __cvt_dbl_ull_L_815F9D00
|
||||
__cvt_dbl_ull_L_815F9C88:
|
||||
clrrwi. r6, r3, 31
|
||||
bne L_815F9C7C
|
||||
bne __cvt_dbl_ull_L_815F9C7C
|
||||
clrlwi r3, r3, 12
|
||||
oris r3, r3, 0x10
|
||||
subi r5, r5, 0x433
|
||||
cmpwi r5, 0x0
|
||||
bge L_815F9CCC
|
||||
bge __cvt_dbl_ull_L_815F9CCC
|
||||
neg r5, r5
|
||||
subfic r8, r5, 0x20
|
||||
subic r9, r5, 0x20
|
||||
@@ -916,14 +916,14 @@ L_815F9C88:
|
||||
srw r10, r3, r9
|
||||
or r4, r4, r10
|
||||
srw r3, r3, r5
|
||||
b L_815F9D00
|
||||
L_815F9CCC:
|
||||
b __cvt_dbl_ull_L_815F9D00
|
||||
__cvt_dbl_ull_L_815F9CCC:
|
||||
cmpwi r5, 0xb
|
||||
ble+ L_815F9CE0
|
||||
ble+ __cvt_dbl_ull_L_815F9CE0
|
||||
li r3, -0x1
|
||||
li r4, -0x1
|
||||
b L_815F9D00
|
||||
L_815F9CE0:
|
||||
b __cvt_dbl_ull_L_815F9D00
|
||||
__cvt_dbl_ull_L_815F9CE0:
|
||||
subfic r8, r5, 0x20
|
||||
subic r9, r5, 0x20
|
||||
slw r3, r3, r5
|
||||
@@ -932,7 +932,7 @@ L_815F9CE0:
|
||||
slw r10, r4, r9
|
||||
or r3, r3, r10
|
||||
slw r4, r4, r5
|
||||
L_815F9D00:
|
||||
__cvt_dbl_ull_L_815F9D00:
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
#endif
|
||||
|
||||
@@ -30,8 +30,8 @@ typedef struct AppLoaderHeader {
|
||||
} AppLoaderHeader;
|
||||
|
||||
u8 TicketViewsBuf[OSRoundUp32B(sizeof(ESTicketView) * 64)] ALIGN32;
|
||||
ESTicketView *lbl_81696578 = (ESTicketView *)TicketViewsBuf;
|
||||
DVDDiskID lbl_810ADF60 ALIGN32;
|
||||
ESTicketView *TicketViews = (ESTicketView *)TicketViewsBuf;
|
||||
DVDDiskID UpdateDiskID ALIGN32;
|
||||
OSBootInfo2 bi2 ALIGN32;
|
||||
AppLoaderHeader AppLoaderHdr ALIGN32;
|
||||
OSBootInfo3 bi3 ALIGN32;
|
||||
@@ -41,118 +41,66 @@ DVDDiskID DiskID ALIGN32;
|
||||
DVDPartitionParams PartitionParams ALIGN32;
|
||||
NANDCommandBlock BS2NandBlock;
|
||||
NANDFileInfo BS2CacheFileInfo;
|
||||
DVDCommandBlock lbl_8108BF60;
|
||||
DVDCommandBlock CoverBlock;
|
||||
u8 PartitionInfoBuf[OSRoundUp32B(sizeof(DVDPartitionInfo) * 256)] ALIGN32;
|
||||
DVDCommandBlock Block;
|
||||
|
||||
BS2State State = BS2_STT_BEGIN;
|
||||
vu32 lbl_81698A0C = 0;
|
||||
u32 lbl_81698A10 = 0;
|
||||
u32 lbl_81698A14 = 0;
|
||||
u32 lbl_81698A18 = 0;
|
||||
u32 lbl_81698A1C = 0;
|
||||
vu32 DvdReadPending = 0;
|
||||
u32 BannerAllocation = 0;
|
||||
u32 BannerBuffer = 0;
|
||||
u32 BannerAvailable = 0;
|
||||
u32 Allocator = 0;
|
||||
BOOL StartingGame = FALSE;
|
||||
u32 lbl_81698A24 = 0;
|
||||
u32 lbl_81698A28 = 0;
|
||||
u32 lbl_81698A2C = 0;
|
||||
u32 lbl_81698A30 = 0;
|
||||
u32 RestartRequested = 0;
|
||||
u32 PartitionOpen = 0;
|
||||
u32 CacheSeekComplete = 0;
|
||||
u32 LoadingTitle = 0;
|
||||
BOOL FatalErrorFlag = FALSE;
|
||||
BOOL RetryErrorFlag = FALSE;
|
||||
BOOL UpdateErrorFlag = FALSE;
|
||||
BOOL AbortFlag = FALSE;
|
||||
volatile int lbl_81698A44 = 0;
|
||||
volatile int lbl_81698A48 = 0;
|
||||
volatile int lbl_81698A4C = 0;
|
||||
vu32 lbl_81698A50 = 0;
|
||||
u32 lbl_81698A54 = 0;
|
||||
u32 lbl_81698A58 = 0;
|
||||
u32 lbl_81698A5C = 0;
|
||||
u64 lbl_81698A60 = 0;
|
||||
u64 lbl_81698A68 = 0;
|
||||
u64 lbl_81698A70 = 0;
|
||||
u32 lbl_81698A78 = 0;
|
||||
u32 lbl_81698A7C = 0;
|
||||
u32 lbl_81698A80 = 0;
|
||||
u32 lbl_81698A84 = 0;
|
||||
u32 lbl_81698A88 = 0;
|
||||
u32 lbl_81698A8C = 0;
|
||||
u32 lbl_81698A90 = 0;
|
||||
u32 lbl_81698A94 = 0;
|
||||
u32 lbl_81698A98 = 0;
|
||||
u32 lbl_81698A9C = 0;
|
||||
u64 lbl_81698AA0 = 0;
|
||||
u32 lbl_81698AA8 = 0;
|
||||
u32 lbl_81698AAC = 0;
|
||||
vu32 lbl_81698AB0 = 0;
|
||||
vu32 lbl_81698AB4 = 0;
|
||||
u8 *lbl_81698AB8 = NULL;
|
||||
NANDFileInfo *lbl_81698ABC = NULL;
|
||||
vu32 lbl_81698AC0 = 0;
|
||||
volatile NANDCallback lbl_81698AC4 = NULL;
|
||||
u32 lbl_81698AC8 = 0;
|
||||
vu32 lbl_81698ACC = 0;
|
||||
u32 lbl_81698AD0 = 0;
|
||||
vu32 lbl_81698AD4 = 0;
|
||||
vu32 lbl_81698AD8 = 0;
|
||||
vu32 lbl_81698ADC = 0;
|
||||
vu32 lbl_81698AE0 = 0;
|
||||
u32 *lbl_81698AE4 = 0;
|
||||
u32 lbl_81698AE8 = 0;
|
||||
u32 lbl_81698AEC = 0;
|
||||
u32 lbl_81698AF0 = 0;
|
||||
volatile int CacheFailed = 0;
|
||||
volatile int RegionValid = 0;
|
||||
volatile int NandPending = 0;
|
||||
vu32 CancelNand = 0;
|
||||
u32 LowReadResult = 0;
|
||||
u32 CacheCommandComplete = 0;
|
||||
u32 AudioBufferUnconfigured = 0;
|
||||
u64 ResetTime = 0;
|
||||
u64 SpinupDeadline = 0;
|
||||
u64 CoverPollTime = 0;
|
||||
u32 DriveWasReset = 0;
|
||||
u32 TitleTicketView = 0;
|
||||
u32 CurrentTmd = 0;
|
||||
u32 TitleCode = 0;
|
||||
u32 RequiredIosHigh = 0;
|
||||
u32 RequiredIosLow = 0;
|
||||
u32 GamePartition = 0;
|
||||
u32 UpdatePartition = 0;
|
||||
u32 PartitionCursor = 0;
|
||||
u32 DataToc = 0;
|
||||
u64 GameToc = 0;
|
||||
u32 CoverOpenTimeHigh = 0;
|
||||
u32 CoverOpenTimeLow = 0;
|
||||
vu32 NandTransferred = 0;
|
||||
vu32 NandLength = 0;
|
||||
u8 *NandBuffer = NULL;
|
||||
NANDFileInfo *NandFile = NULL;
|
||||
vu32 NandOperation = 0;
|
||||
volatile NANDCallback NandCompletion = NULL;
|
||||
u32 LoaderOffset = 0;
|
||||
vu32 LoaderLength = 0;
|
||||
u32 LoaderAddress = 0;
|
||||
vu32 CacheLength = 0;
|
||||
vu32 BannerLength = 0;
|
||||
vu32 DvdTransferLength = 0;
|
||||
vu32 DvdTransferred = 0;
|
||||
u32 *DvdProgress = 0;
|
||||
u32 LoaderClose = 0;
|
||||
u32 LoaderMain = 0;
|
||||
u32 LoaderInit = 0;
|
||||
|
||||
#define DvdReadPending lbl_81698A0C
|
||||
#define BannerAllocation lbl_81698A10
|
||||
#define BannerBuffer lbl_81698A14
|
||||
#define BannerAvailable lbl_81698A18
|
||||
#define Allocator lbl_81698A1C
|
||||
#define RestartRequested lbl_81698A24
|
||||
#define PartitionOpen lbl_81698A28
|
||||
#define CacheSeekComplete lbl_81698A2C
|
||||
#define LoadingTitle lbl_81698A30
|
||||
#define CacheFailed lbl_81698A44
|
||||
#define RegionValid lbl_81698A48
|
||||
#define NandPending lbl_81698A4C
|
||||
#define CancelNand lbl_81698A50
|
||||
#define LowReadResult lbl_81698A54
|
||||
#define CacheCommandComplete lbl_81698A58
|
||||
#define AudioBufferUnconfigured lbl_81698A5C
|
||||
#define ResetTime lbl_81698A60
|
||||
#define SpinupDeadline lbl_81698A68
|
||||
#define CoverPollTime lbl_81698A70
|
||||
#define DriveWasReset lbl_81698A78
|
||||
#define TitleTicketView lbl_81698A7C
|
||||
#define CurrentTmd lbl_81698A80
|
||||
#define TitleCode lbl_81698A84
|
||||
#define RequiredIosHigh lbl_81698A88
|
||||
#define RequiredIosLow lbl_81698A8C
|
||||
#define GamePartition lbl_81698A90
|
||||
#define UpdatePartition lbl_81698A94
|
||||
#define PartitionCursor lbl_81698A98
|
||||
#define DataToc lbl_81698A9C
|
||||
#define GameToc lbl_81698AA0
|
||||
#define CoverOpenTimeHigh lbl_81698AA8
|
||||
#define CoverOpenTimeLow lbl_81698AAC
|
||||
#define NandTransferred lbl_81698AB0
|
||||
#define NandLength lbl_81698AB4
|
||||
#define NandBuffer lbl_81698AB8
|
||||
#define NandFile lbl_81698ABC
|
||||
#define NandOperation lbl_81698AC0
|
||||
#define NandCompletion lbl_81698AC4
|
||||
#define LoaderOffset lbl_81698AC8
|
||||
#define LoaderLength lbl_81698ACC
|
||||
#define LoaderAddress lbl_81698AD0
|
||||
#define CacheLength lbl_81698AD4
|
||||
#define BannerLength lbl_81698AD8
|
||||
#define DvdTransferLength lbl_81698ADC
|
||||
#define DvdTransferred lbl_81698AE0
|
||||
#define DvdProgress lbl_81698AE4
|
||||
#define LoaderClose lbl_81698AE8
|
||||
#define LoaderMain lbl_81698AEC
|
||||
#define LoaderInit lbl_81698AF0
|
||||
#define CoverBlock lbl_8108BF60
|
||||
#define UpdateDiskID lbl_810ADF60
|
||||
#define TicketViews lbl_81696578
|
||||
|
||||
void BS2Report(const char *msg, ...) {
|
||||
#ifdef ENABLE_BS2_REPORT
|
||||
|
||||
@@ -20,14 +20,14 @@ void VoiceCallback(void* _voice) {
|
||||
}
|
||||
|
||||
inline u8* getCurrAddr(VoiceInfo* voice) {
|
||||
AXPB* iVar4 = &voice->getAXVPB()->pb;
|
||||
AXPB* pb = &voice->getAXVPB()->pb;
|
||||
nw4r::ut::AutoInterruptLock lock;
|
||||
if (iVar4 == NULL) {
|
||||
if (pb == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
u16 addrHi = iVar4->addr.currentAddressHi;
|
||||
u16 addrLo = iVar4->addr.currentAddressLo;
|
||||
u16 addrHi = pb->addr.currentAddressHi;
|
||||
u16 addrLo = pb->addr.currentAddressLo;
|
||||
return (u8*)((addrHi << 16) + addrLo);
|
||||
}
|
||||
|
||||
|
||||
@@ -604,7 +604,7 @@ vmBoolInt VmIsNan(vmFloat value) {
|
||||
return isnan(value) || value == VM_NAN;
|
||||
}
|
||||
|
||||
double CHANSVm_8144B1D8(double value) {
|
||||
double CHANSVmFloatSign(double value) {
|
||||
// Clamp to -1.0~1.0
|
||||
return value < 0.0 ? -1.0 : value > 0.0 ? 1.0 : value;
|
||||
}
|
||||
@@ -650,14 +650,14 @@ static s32 CHANSVmParseInt(CHANSVmObjHdr* obj, s32 base, u64* out) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B30C(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToIntFromFloat(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
// Convert to int from float
|
||||
CHANSVmObjHdr* newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_INTEGER, 0);
|
||||
if (newObj != vmNull) {
|
||||
if (VmIsNan(object->value.float_v)) {
|
||||
newObj->value.int_v = 0;
|
||||
} else {
|
||||
newObj->value.int_v = (u64)(CHANSVm_8144B1D8(object->value.float_v) * floor(fabs(object->value.float_v)));
|
||||
newObj->value.int_v = (u64)(CHANSVmFloatSign(object->value.float_v) * floor(fabs(object->value.float_v)));
|
||||
}
|
||||
}
|
||||
return newObj;
|
||||
@@ -675,7 +675,7 @@ CHANSVmObjHdr* CHANSVmConvertToIntFromArray(CHANSVm* vm, CHANSVmObjType type, CH
|
||||
return vmNull;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B430(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToFloatFromUndefined(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
CHANSVmObjHdr* result = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
|
||||
if (result != vmNull) {
|
||||
result->value.float_v = VM_NAN;
|
||||
@@ -683,7 +683,7 @@ CHANSVmObjHdr* CHANSVm_8144B430(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr*
|
||||
return result;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B470(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* intObj) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToFloatFromInt(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* intObj) {
|
||||
CHANSVmObjHdr* result = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
|
||||
if (result != vmNull) {
|
||||
result->value.float_v = VmIntToFloat(intObj->value.int_v);
|
||||
@@ -692,31 +692,31 @@ CHANSVmObjHdr* CHANSVm_8144B470(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr*
|
||||
}
|
||||
|
||||
// The 16-bit strings use a single null byte for termination for some reason. Because of that, L"..." cannot be used.
|
||||
u8 lbl_81669070[19] = {0x00, 'u', 0x00, 'n', 0x00, 'd', 0x00, 'e', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'e', 0x00, 'd', 0x00};
|
||||
u8 lbl_81669083[17] = {0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
|
||||
u8 lbl_81669094[19] = {0x00, '-', 0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
|
||||
u8 scUndefinedUtf16[19] = {0x00, 'u', 0x00, 'n', 0x00, 'd', 0x00, 'e', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'e', 0x00, 'd', 0x00};
|
||||
u8 scInfinityUtf16[17] = {0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
|
||||
u8 scMinusInfinityUtf16[19] = {0x00, '-', 0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
|
||||
|
||||
// clang-format off
|
||||
const CHANSVmObjHdr CHANSVmConstStringObjectUndefined = {{(wchar_t*)lbl_81669070, 18}, {0}, vmNull};
|
||||
const CHANSVmObjHdr lbl_81616C88 = {{(wchar_t*)"\0N\0a\0N", 6}, {0}, vmNull};
|
||||
const CHANSVmObjHdr lbl_81616C98 = {{(wchar_t*)lbl_81669083, 16}, {0}, vmNull};
|
||||
const CHANSVmObjHdr lbl_81616CA8 = {{(wchar_t*)lbl_81669094, 18}, {0}, vmNull};
|
||||
const CHANSVmObjHdr lbl_81616CB8 = {{(wchar_t*)"\0,", 2}, {0}, vmNull};
|
||||
const CHANSVmObjHdr CHANSVmConstStringObjectUndefined = {{(wchar_t*)scUndefinedUtf16, 18}, {0}, vmNull};
|
||||
const CHANSVmObjHdr CHANSVmConstStringObjectNaN = {{(wchar_t*)"\0N\0a\0N", 6}, {0}, vmNull};
|
||||
const CHANSVmObjHdr CHANSVmConstStringObjectInfinity = {{(wchar_t*)scInfinityUtf16, 16}, {0}, vmNull};
|
||||
const CHANSVmObjHdr CHANSVmConstStringObjectMinusInfinity = {{(wchar_t*)scMinusInfinityUtf16, 18}, {0}, vmNull};
|
||||
const CHANSVmObjHdr CHANSVmConstStringObjectComma = {{(wchar_t*)"\0,", 2}, {0}, vmNull};
|
||||
const CHANSVmObjHdr CHANSVmConstStringDataEmpty = {{(wchar_t*)"", 0}, {0}, vmNull};
|
||||
const CHANSVmObjHdr CHANSVmConstStringObjectUndefined_[] = {{{(void*)&CHANSVmConstStringObjectUndefined, 0}, 0x03800100, vmNull},
|
||||
{{(void*)&lbl_81616C88, 0}, 0x03800100, vmNull},
|
||||
{{(void*)&lbl_81616C98, 0}, 0x03800100, vmNull},
|
||||
{{(void*)&lbl_81616CA8, 0}, 0x03800100, vmNull},
|
||||
{{(void*)&CHANSVmConstStringObjectNaN, 0}, 0x03800100, vmNull},
|
||||
{{(void*)&CHANSVmConstStringObjectInfinity, 0}, 0x03800100, vmNull},
|
||||
{{(void*)&CHANSVmConstStringObjectMinusInfinity, 0}, 0x03800100, vmNull},
|
||||
{{vmNull, 0}, 0x00800000, vmNull}};
|
||||
char VmReportFormat[] = "%s";
|
||||
|
||||
const CHANSVmFloatConstantList lbl_81616D28[] = {
|
||||
const CHANSVmFloatConstantList scFloatConstantList[] = {
|
||||
{ "Infinity", (double*)&VmInf },
|
||||
{ "+Infinity", (double*)&VmInf },
|
||||
{ "-Infinity", (double*)&VmMinusInf },
|
||||
{ "NaN", (double*)&VmNaN }
|
||||
};
|
||||
char lbl_8169758A[] = "%.16lg";
|
||||
char scFloatPrintfFmt[] = "%.16lg";
|
||||
// clang-format on
|
||||
|
||||
static inline s32 CHANSVmParseFloat(CHANSVmObjHdr* obj, f64* out) {
|
||||
@@ -741,8 +741,8 @@ static inline s32 CHANSVmParseFloat(CHANSVmObjHdr* obj, f64* out) {
|
||||
*bufEnd = '\0';
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (strcmp(buf, lbl_81616D28[i].spName) == 0) {
|
||||
number = *lbl_81616D28[i].pValue;
|
||||
if (strcmp(buf, scFloatConstantList[i].spName) == 0) {
|
||||
number = *scFloatConstantList[i].pValue;
|
||||
goto store;
|
||||
}
|
||||
}
|
||||
@@ -771,7 +771,7 @@ static inline s32 CHANSVmParseFloat(CHANSVmObjHdr* obj, f64* out) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B4D4(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToFloatFromStr(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
// Convert string keyword into float value
|
||||
CHANSVmObjHdr* newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
|
||||
|
||||
@@ -785,8 +785,8 @@ CHANSVmObjHdr* CHANSVmConvertToStrFromUndefined(CHANSVm* vm, CHANSVmObjType type
|
||||
return (CHANSVmObjHdr*)CHANSVmConstStringObjectUndefined_;
|
||||
}
|
||||
|
||||
s32 CHANSVm_8144B62C(vmWString buf, u32 len, vmFloat val) NO_INLINE {
|
||||
s32 result = snprintf((char*)buf, len / 2, lbl_8169758A, val);
|
||||
s32 CHANSVmFloatToWString(vmWString buf, u32 len, vmFloat val) NO_INLINE {
|
||||
s32 result = snprintf((char*)buf, len / 2, scFloatPrintfFmt, val);
|
||||
CHANSVmStrCpyToU16FromU8(buf, (vmString)buf, result);
|
||||
return VM_STR_LENGTH(result);
|
||||
}
|
||||
@@ -815,7 +815,7 @@ error:
|
||||
return vmNull;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B734(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* value) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToStrFromFloat(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* value) {
|
||||
const CHANSVmObjHdr* base;
|
||||
CHANSVmObjHdr* newObj;
|
||||
s32 result;
|
||||
@@ -835,7 +835,7 @@ CHANSVmObjHdr* CHANSVm_8144B734(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr*
|
||||
|
||||
newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_STRING, VM_STRING_SIZE);
|
||||
if (newObj != vmNull) {
|
||||
result = CHANSVm_8144B62C(newObj->value.wstring_v->spData, VM_STRING_SIZE, value->value.float_v);
|
||||
result = CHANSVmFloatToWString(newObj->value.wstring_v->spData, VM_STRING_SIZE, value->value.float_v);
|
||||
newObj->value.wstring_v->len = result;
|
||||
if (newObj->value.wstring_v->len == 0) {
|
||||
goto error;
|
||||
@@ -899,14 +899,14 @@ vmBoolInt CHANSVmGetEnumedType(CHANSVmObjType* eType, vmU32 iType) NO_INLINE {
|
||||
}
|
||||
|
||||
// TODO: Here was a function defined that was inlined into VmStep.
|
||||
char lbl_81669128[] = "VmGetResultType";
|
||||
char scVmGetResultType[] = "VmGetResultType";
|
||||
|
||||
// clang-format off
|
||||
const VmConvertEntry VmTypeConvertFuncTbl[] = {
|
||||
{vmNull, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertObjectTypeError, vmNull, CHANSVm_8144B30C, CHANSVmConvertToIntFromStr, CHANSVmConvertToIntFromArray, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVm_8144B430, CHANSVm_8144B470, vmNull, CHANSVm_8144B4D4, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertToStrFromUndefined, CHANSVmConvertToStrFromInt, CHANSVm_8144B734, vmNull, CHANSVmConvertToStrFromArray, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertObjectTypeError, vmNull, CHANSVmConvertToIntFromFloat, CHANSVmConvertToIntFromStr, CHANSVmConvertToIntFromArray, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertToFloatFromUndefined, CHANSVmConvertToFloatFromInt, vmNull, CHANSVmConvertToFloatFromStr, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertToStrFromUndefined, CHANSVmConvertToStrFromInt, CHANSVmConvertToStrFromFloat, vmNull, CHANSVmConvertToStrFromArray, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, vmNull, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, vmNull},
|
||||
};
|
||||
@@ -1254,7 +1254,7 @@ CHANSVmErr VmBitXor(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* ret, CHANSV
|
||||
}
|
||||
|
||||
CHANSVmErr VmCmpEq(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* ret, CHANSVmObjHdr* left, CHANSVmObjHdr* right) {
|
||||
vmBoolInt bVar1;
|
||||
vmBoolInt stringsMatch;
|
||||
vmBoolInt isEqual;
|
||||
CHANSVmErr err;
|
||||
|
||||
@@ -1287,11 +1287,11 @@ CHANSVmErr VmCmpEq(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* ret, CHANSVm
|
||||
case CHANS_VM_OBJ_TYPE_STRING: {
|
||||
isEqual = vmFalse;
|
||||
if (left->value.string_v->len == right->value.string_v->len) {
|
||||
bVar1 = vmFalse;
|
||||
stringsMatch = vmFalse;
|
||||
if (left->value.string_v->len == 0 || memcmp(*left->value.ptr_v, *right->value.ptr_v, left->value.string_v->len) == 0) {
|
||||
bVar1 = vmTrue;
|
||||
stringsMatch = vmTrue;
|
||||
}
|
||||
if (bVar1) {
|
||||
if (stringsMatch) {
|
||||
isEqual = vmTrue;
|
||||
}
|
||||
}
|
||||
@@ -2183,7 +2183,7 @@ static u32 VmArrayJoinSub(CHANSVmObjHdr* obj, CHANSVmObjHdr* array, wchar_t* sep
|
||||
if (offset + 0x80 > bufSize) {
|
||||
goto error;
|
||||
}
|
||||
elemLen = CHANSVm_8144B62C((vmWString)((u8*)(*obj->value.ptr_v) + offset), 0x80, chunk->elements[countInChunk].value.float_v);
|
||||
elemLen = CHANSVmFloatToWString((vmWString)((u8*)(*obj->value.ptr_v) + offset), 0x80, chunk->elements[countInChunk].value.float_v);
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_TYPE_ARRAY: {
|
||||
@@ -2225,7 +2225,7 @@ CHANSVmObjHdr* VmArrayJoinCommon(CHANSVm* vm, u32 retObjAddr, CHANSVmObjHdr* obj
|
||||
u32 actualLen;
|
||||
|
||||
if (separatorAddr == 0) {
|
||||
separatorAddr = *(u32*)&lbl_81616CB8;
|
||||
separatorAddr = *(u32*)&CHANSVmConstStringObjectComma;
|
||||
separatorLen = 2;
|
||||
}
|
||||
|
||||
@@ -3400,7 +3400,7 @@ VmMethodDefine(String, ToUpperCase) {
|
||||
return vmFalse;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8145049C(CHANSVm* vm, CHANSVmObjHdr* obj, u32 arg) {
|
||||
CHANSVmObjHdr* CHANSVmFormatString(CHANSVm* vm, CHANSVmObjHdr* obj, u32 arg) {
|
||||
u8 pad0[8];
|
||||
u8 tempBuf[16];
|
||||
u8 fmtBufData[32];
|
||||
@@ -3745,7 +3745,7 @@ null_return:
|
||||
VmMethodDefine(String, Format) {
|
||||
u32 result;
|
||||
if (VmParentObj != vmNull && VmParentObj->type == CHANS_VM_TYPE_CLASS_REF) {
|
||||
result = (u32)CHANSVm_8145049C(VmInst, VmReturnObj, 0);
|
||||
result = (u32)CHANSVmFormatString(VmInst, VmReturnObj, 0);
|
||||
return result != 0;
|
||||
}
|
||||
return 0;
|
||||
@@ -3775,10 +3775,10 @@ int VmGetIntFromObjHdr(CHANSVmObjHdr* object) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 CHANSVm_81451314(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit);
|
||||
BOOL CHANSVm_81451348(BlobHeader* blob, s64 size);
|
||||
u32 CHANSVmBlobGetCount(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit);
|
||||
BOOL CHANSVmBlobHasSpace(BlobHeader* blob, s64 size);
|
||||
CHANSVmObjHdr* CHANSVmNewBlobObject(CHANSVm* VmInst, CHANSVmObjHdr* obj, u32 size, void* src, u32 count);
|
||||
static u64 CHANSVm_814540E0(u32 upper, u32 lower);
|
||||
static u64 CHANSVmMakeU64(u32 upper, u32 lower);
|
||||
|
||||
static void VmBlobInitValue(BlobHeader* blob, u32 size) {
|
||||
if (blob != vmNull) {
|
||||
@@ -3790,9 +3790,9 @@ static void VmBlobInitValue(BlobHeader* blob, u32 size) {
|
||||
|
||||
static const char VmBlobClassName[] = "Blob";
|
||||
|
||||
char lbl_81669DF5[] = "0123456789abcdef";
|
||||
char* lbl_816976E4 = lbl_81669DF5;
|
||||
char* lbl_816976E8 = lbl_81669DF5;
|
||||
char scHexDigits[] = "0123456789abcdef";
|
||||
char* scHexDigitsPtr = scHexDigits;
|
||||
char* scHexDigitsPtr2 = scHexDigits;
|
||||
|
||||
static CHANSVmObjHdr* VmBlobCreateDirect(CHANSVm* vm, CHANSVmObjHdr* obj, u32 size) NO_INLINE {
|
||||
CHANSVmNativeClass* cls;
|
||||
@@ -3834,7 +3834,7 @@ static u8* VmBlobGetDataBufferDirect(CHANSVmObjHdr* obj) {
|
||||
return vmNull;
|
||||
}
|
||||
|
||||
BOOL CHANSVm_81450D14(BlobHeader* blob, s64 val, u32* out) {
|
||||
BOOL CHANSVmBlobResolveOffset(BlobHeader* blob, s64 val, u32* out) {
|
||||
s64 pos;
|
||||
|
||||
if (blob == vmNull) {
|
||||
@@ -3901,7 +3901,7 @@ VmMethodDefine(Blob, Seek) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, val->value.int_v, &tmp)) {
|
||||
if (CHANSVmBlobResolveOffset(blob, val->value.int_v, &tmp)) {
|
||||
blob->offset = tmp;
|
||||
} else {
|
||||
return 0;
|
||||
@@ -3988,9 +3988,9 @@ VmMethodDefine(Blob, Fill) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
count = blob != vmNull ? CHANSVm_81451314(blob, fill, blob->offset) : 0;
|
||||
count = blob != vmNull ? CHANSVmBlobGetCount(blob, fill, blob->offset) : 0;
|
||||
|
||||
if (CHANSVm_81451348(blob, count)) {
|
||||
if (CHANSVmBlobHasSpace(blob, count)) {
|
||||
memset(blob->pData + blob->offset, (u8)val->value.int_v, count);
|
||||
blob->offset += count;
|
||||
return 1;
|
||||
@@ -3999,7 +3999,7 @@ VmMethodDefine(Blob, Fill) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 CHANSVm_81451314(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit) {
|
||||
u32 CHANSVmBlobGetCount(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit) {
|
||||
if (ptr != vmNull) {
|
||||
return *(u32*)((u8*)ptr + 4);
|
||||
}
|
||||
@@ -4013,7 +4013,7 @@ u32 CHANSVm_81451314(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
BOOL CHANSVm_81451348(BlobHeader* blob, s64 size) {
|
||||
BOOL CHANSVmBlobHasSpace(BlobHeader* blob, s64 size) {
|
||||
u32 curOff = blob->offset;
|
||||
return size >= 0 && (s64)(blob->size - curOff) >= size;
|
||||
}
|
||||
@@ -4028,7 +4028,7 @@ VmMethodDefine(Blob, GetString) {
|
||||
}
|
||||
|
||||
size = (u32)arg->value.int_v;
|
||||
if (CHANSVm_81451348(blob, size)) {
|
||||
if (CHANSVmBlobHasSpace(blob, size)) {
|
||||
CHANSVmErr err = CHANSVmSetU16StringFromU8(VmInst, VmReturnObj, (char*)(blob->pData + blob->offset), size);
|
||||
blob->offset += size;
|
||||
return err == CHANS_VM_OK;
|
||||
@@ -4058,7 +4058,7 @@ VmMethodDefine(Blob, SetString) {
|
||||
}
|
||||
}
|
||||
|
||||
if (CHANSVm_81451348(blob, size)) {
|
||||
if (CHANSVmBlobHasSpace(blob, size)) {
|
||||
memset(blob->pData + blob->offset, 0, size);
|
||||
CHANSVmStrCpyToU8FromU16(blob->pData + blob->offset, strData, charCount);
|
||||
blob->offset += size;
|
||||
@@ -4076,7 +4076,7 @@ VmMethodDefine(Blob, GetWString) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81451348(blob, VM_STR_LENGTH(arg->value.int_v))) {
|
||||
if (CHANSVmBlobHasSpace(blob, VM_STR_LENGTH(arg->value.int_v))) {
|
||||
CHANSVmErr err = CHANSVmSetU16String(VmInst, VmReturnObj, (wchar_t*)(blob->pData + blob->offset), (u32)arg->value.int_v << 1);
|
||||
u32 oldOffset = blob->offset;
|
||||
u64 length = VM_STR_LENGTH(arg->value.int_v);
|
||||
@@ -4113,7 +4113,7 @@ VmMethodDefine(Blob, SetWString) {
|
||||
}
|
||||
}
|
||||
|
||||
if (CHANSVm_81451348(blob, size)) {
|
||||
if (CHANSVmBlobHasSpace(blob, size)) {
|
||||
memcpy(blob->pData + blob->offset, strData, strLen);
|
||||
if (strLen < size) {
|
||||
memset(blob->pData + blob->offset + strLen, 0, size - strLen);
|
||||
@@ -4184,8 +4184,8 @@ VmMethodDefine(Blob, CopyRangeFrom) {
|
||||
srcOff = 0;
|
||||
destOff = 0;
|
||||
|
||||
if (CHANSVm_81450D14(destBlob, destOffObj->value.int_v, &destOff) != 0 && CHANSVm_81450D14(srcBlob, srcOffObj->value.int_v, &srcOff) != 0) {
|
||||
count = CHANSVm_81451314(srcBlob, countObj, srcOff);
|
||||
if (CHANSVmBlobResolveOffset(destBlob, destOffObj->value.int_v, &destOff) != 0 && CHANSVmBlobResolveOffset(srcBlob, srcOffObj->value.int_v, &srcOff) != 0) {
|
||||
count = CHANSVmBlobGetCount(srcBlob, countObj, srcOff);
|
||||
{
|
||||
u32 destinationOffset = destOff;
|
||||
okFlag = (s64)count >= 0 && (s64)(destBlob->size - destinationOffset) >= (s64)count;
|
||||
@@ -4213,9 +4213,9 @@ VmMethodDefine(Blob, GetBlob) {
|
||||
if (blob == vmNull)
|
||||
return 0;
|
||||
|
||||
count = blob != vmNull ? CHANSVm_81451314(blob, arg, blob->offset) : 0;
|
||||
count = blob != vmNull ? CHANSVmBlobGetCount(blob, arg, blob->offset) : 0;
|
||||
|
||||
if (CHANSVm_81451348(blob, count)) {
|
||||
if (CHANSVmBlobHasSpace(blob, count)) {
|
||||
if (CHANSVmNewBlobObject(VmInst, VmReturnObj, count, blob->offset + blob->pData, count) != vmNull) {
|
||||
blob->offset += count;
|
||||
return 1;
|
||||
@@ -4262,7 +4262,7 @@ VmMethodDefine(Blob, SetBlob) {
|
||||
}
|
||||
}
|
||||
|
||||
if (CHANSVm_81451348(destBlob, logicalSize)) {
|
||||
if (CHANSVmBlobHasSpace(destBlob, logicalSize)) {
|
||||
memmove(destBlob->pData + *(u32*)&destBlob->offset, srcBlob->pData + srcBlob->offset, copySize);
|
||||
if (copySize < logicalSize) {
|
||||
memset(destBlob->offset + destBlob->pData + copySize, 0, logicalSize - copySize);
|
||||
@@ -4284,15 +4284,15 @@ VmMethodDefine(Blob, GetHexString) {
|
||||
return vmFalse;
|
||||
}
|
||||
|
||||
count = blob != vmNull ? CHANSVm_81451314(blob, arg, blob->offset) : 0;
|
||||
count = blob != vmNull ? CHANSVmBlobGetCount(blob, arg, blob->offset) : 0;
|
||||
|
||||
if (CHANSVm_81451348(blob, count) && CHANSVmNewObject(VmInst, vmFalse, VmReturnObj, CHANS_VM_OBJ_TYPE_STRING, count * 4) != vmNull) {
|
||||
if (CHANSVmBlobHasSpace(blob, count) && CHANSVmNewObject(VmInst, vmFalse, VmReturnObj, CHANS_VM_OBJ_TYPE_STRING, count * 4) != vmNull) {
|
||||
wchar_t* dest = (wchar_t*)VmGetStrFromObjHdr(VmReturnObj);
|
||||
u8* src = blob->pData;
|
||||
u32 offset = blob->offset;
|
||||
u32 destOff = 0;
|
||||
u32 i = 0;
|
||||
char* hexTbl = lbl_816976E4;
|
||||
char* hexTbl = scHexDigitsPtr;
|
||||
u32 loop_i;
|
||||
|
||||
src += offset;
|
||||
@@ -4352,8 +4352,8 @@ VmMethodDefine(Blob, CalcRangeSHA1Digest) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
|
||||
{
|
||||
u32 off = offset;
|
||||
@@ -4417,8 +4417,8 @@ VmMethodDefine(Blob, CalcRangeMD5Digest) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
|
||||
{
|
||||
u32 off = offset;
|
||||
@@ -4464,8 +4464,8 @@ VmMethodDefine(Blob, CalcRangeCRC16) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
{
|
||||
u32 off = offset;
|
||||
if (((s64)size >= 0LL && (s64)(blob->size - off) >= (s64)size) != vmFalse) {
|
||||
@@ -4500,8 +4500,8 @@ VmMethodDefine(Blob, CalcRangeCRC32) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
{
|
||||
u32 off = offset;
|
||||
|
||||
@@ -4573,8 +4573,8 @@ VmMethodDefine(Blob, CalcRangeHMAC) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
off = offset;
|
||||
if (((s64)size >= 0LL && (s64)(blob->size - off) >= (s64)size) != vmFalse) {
|
||||
NETHMACContext ctx;
|
||||
@@ -5202,7 +5202,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
copySize = paramValue;
|
||||
}
|
||||
|
||||
if (copySize < 0 || !CHANSVm_81451348(parentBlob, copySize)) {
|
||||
if (copySize < 0 || !CHANSVmBlobHasSpace(parentBlob, copySize)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5220,7 +5220,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
if (paramValue < 0 || !CHANSVm_81451348(parentBlob, paramValue)) {
|
||||
if (paramValue < 0 || !CHANSVmBlobHasSpace(parentBlob, paramValue)) {
|
||||
goto error;
|
||||
}
|
||||
if (paramValue > 0) {
|
||||
@@ -5247,7 +5247,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (!CHANSVm_81451348(parentBlob, elemSize * count)) {
|
||||
if (!CHANSVmBlobHasSpace(parentBlob, elemSize * count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5342,7 +5342,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
*(u64*)packBuf = CHANSVm_814540E0(packBuf[0], packBuf[1]);
|
||||
*(u64*)packBuf = CHANSVmMakeU64(packBuf[0], packBuf[1]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -5379,7 +5379,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (!CHANSVm_81451348(parentBlob, elemSize * count)) {
|
||||
if (!CHANSVmBlobHasSpace(parentBlob, elemSize * count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5424,7 +5424,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
}
|
||||
|
||||
bufSize = (count + 1) / 2;
|
||||
if (!CHANSVm_81451348(parentBlob, bufSize)) {
|
||||
if (!CHANSVmBlobHasSpace(parentBlob, bufSize)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5472,7 +5472,7 @@ error:
|
||||
return vmFalse;
|
||||
}
|
||||
|
||||
static u64 CHANSVm_814540E0(u32 upper, u32 lower) {
|
||||
static u64 CHANSVmMakeU64(u32 upper, u32 lower) {
|
||||
// Read U64 and byte-swap
|
||||
u64 x = (u64)upper << 32 | lower;
|
||||
return x >> 56 & 0x00000000000000ffULL | x >> 40 & 0x000000000000ff00ULL | x >> 24 & 0x0000000000ff0000ULL | x >> 8 & 0x00000000ff000000ULL |
|
||||
@@ -5648,7 +5648,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
} else {
|
||||
count = outVal;
|
||||
}
|
||||
if (count < 0 || !CHANSVm_81451348(srcBlob, count)) {
|
||||
if (count < 0 || !CHANSVmBlobHasSpace(srcBlob, count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5663,7 +5663,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
if (outVal < 0 || !CHANSVm_81451348(srcBlob, outVal)) {
|
||||
if (outVal < 0 || !CHANSVmBlobHasSpace(srcBlob, outVal)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5682,7 +5682,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
} else {
|
||||
count = outVal;
|
||||
}
|
||||
if (count < 0 || !CHANSVm_81451348(srcBlob, outSize * count)) {
|
||||
if (count < 0 || !CHANSVmBlobHasSpace(srcBlob, outSize * count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5710,7 +5710,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
unpackBuf.value = CHANSVm_814540E0(unpackBuf.words[0], unpackBuf.words[1]);
|
||||
unpackBuf.value = CHANSVmMakeU64(unpackBuf.words[0], unpackBuf.words[1]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -5794,7 +5794,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
}
|
||||
count = (srcBlob->size - srcBlob->offset) / outSize;
|
||||
}
|
||||
if ((s32)count < 0 || !CHANSVm_81451348(srcBlob, outSize * count)) {
|
||||
if ((s32)count < 0 || !CHANSVmBlobHasSpace(srcBlob, outSize * count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5845,7 +5845,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
}
|
||||
|
||||
bufSize = (s32)(count + 1) / 2;
|
||||
if (!CHANSVm_81451348(srcBlob, bufSize)) {
|
||||
if (!CHANSVmBlobHasSpace(srcBlob, bufSize)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5864,7 +5864,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
u8* hexTable;
|
||||
u8 byte;
|
||||
u8 nibble;
|
||||
hexTable = (u8*)lbl_816976E8;
|
||||
hexTable = (u8*)scHexDigitsPtr2;
|
||||
srcPos = srcData;
|
||||
destPos = destStr;
|
||||
|
||||
@@ -5992,7 +5992,7 @@ void CHANSVmImageRegisterAllocator(CHANSVmImageAllocatorCallback allocCb, CHANSV
|
||||
VmImageCtorCallback = ctorCb;
|
||||
}
|
||||
|
||||
char lbl_8169778C[] = "Image";
|
||||
char scImageClassName[] = "Image";
|
||||
|
||||
CHANSVmObjHdr* CHANSVmNewImageObject(CHANSVm* vm, CHANSVmObjHdr* object, vmPtr srcData, vmU16 width, vmU16 height, s32 format) {
|
||||
u32 bpp;
|
||||
@@ -6030,7 +6030,7 @@ CHANSVmObjHdr* CHANSVmNewImageObject(CHANSVm* vm, CHANSVmObjHdr* object, vmPtr s
|
||||
if (object == vmNull) {
|
||||
goto ret;
|
||||
}
|
||||
if (CHANSVmSetObjectAsNativeInstance(vm, object, vmNull, lbl_8169778C) != CHANS_VM_OK) {
|
||||
if (CHANSVmSetObjectAsNativeInstance(vm, object, vmNull, scImageClassName) != CHANS_VM_OK) {
|
||||
goto error;
|
||||
}
|
||||
image = (CHANSVmImage*)((u32*)object->value.ptr_v)[0];
|
||||
@@ -6120,10 +6120,10 @@ static vmBoolInt VmWinEmuWrite(CHANSVm* vm, CHANSVmObjHdr* parent, CHANSVmObjHdr
|
||||
|
||||
const CHANSVmMethodList VmWinEmuMethodTbl[] = {"write", VmWinEmuWrite};
|
||||
|
||||
char lbl_816977AC[] = "Date";
|
||||
char lbl_816977B1[] = "@Math";
|
||||
char lbl_816977B7[] = "Math";
|
||||
char lbl_816977BC[] = "@WinEmu";
|
||||
char scDateClassName[] = "Date";
|
||||
char scMathInternalName[] = "@Math";
|
||||
char scMathClassName[] = "Math";
|
||||
char scWinEmuInternalName[] = "@WinEmu";
|
||||
|
||||
static CHANSVmErr VmPushFuncReturnInfo(CHANSVm* vm, u32 argCount, u32 totalSlots, u32 headerCount);
|
||||
|
||||
@@ -6186,7 +6186,7 @@ CHANSVmErr CHANSVmInit(CHANSVm* vm, vmPtr work, vmU32 size) {
|
||||
goto class_fail;
|
||||
|
||||
/* Date class */
|
||||
cls = CHANSVmAddNativeClass2(vm, lbl_816977AC, VmDateCtor, 0, VmDateDtor);
|
||||
cls = CHANSVmAddNativeClass2(vm, scDateClassName, VmDateCtor, 0, VmDateDtor);
|
||||
if (cls == vmNull) {
|
||||
ok = vmFalse;
|
||||
} else {
|
||||
@@ -6196,7 +6196,7 @@ CHANSVmErr CHANSVmInit(CHANSVm* vm, vmPtr work, vmU32 size) {
|
||||
goto class_fail;
|
||||
|
||||
/* Math class */
|
||||
if (CHANSVmNewBuiltinObject(vm, lbl_816977B1, vmNull, vmNull, vmNull, lbl_816977B7, vmNull, VmMathPropertyTbl, CHANSVmPropertyCount(VmMathPropertyTbl),
|
||||
if (CHANSVmNewBuiltinObject(vm, scMathInternalName, vmNull, vmNull, vmNull, scMathClassName, vmNull, VmMathPropertyTbl, CHANSVmPropertyCount(VmMathPropertyTbl),
|
||||
VmMathMethodTbl, CHANSVmMethodCount(VmMathMethodTbl)) == 0) {
|
||||
goto class_fail;
|
||||
}
|
||||
@@ -6235,13 +6235,13 @@ CHANSVmErr CHANSVmInit(CHANSVm* vm, vmPtr work, vmU32 size) {
|
||||
/* Image class */
|
||||
VmImageAllocCallback = vmNull;
|
||||
VmImageCtorCallback = vmNull;
|
||||
if (CHANSVmNewBuiltinObject(vm, lbl_8169778C, vmNull, VmImageCtor, vmNull, vmNull, vmNull, VmImagePropertyTbl, CHANSVmPropertyCount(VmImagePropertyTbl),
|
||||
if (CHANSVmNewBuiltinObject(vm, scImageClassName, vmNull, VmImageCtor, vmNull, vmNull, vmNull, VmImagePropertyTbl, CHANSVmPropertyCount(VmImagePropertyTbl),
|
||||
vmNull, 0) == 0) {
|
||||
goto class_fail;
|
||||
}
|
||||
|
||||
/* Screen (@WinEmu) class */
|
||||
if (CHANSVmNewBuiltinObject(vm, lbl_816977BC, vmNull, vmNull, vmNull, "document", vmNull, vmNull, 0, (CHANSVmMethodList*)&VmWinEmuMethodTbl,
|
||||
if (CHANSVmNewBuiltinObject(vm, scWinEmuInternalName, vmNull, vmNull, vmNull, "document", vmNull, vmNull, 0, (CHANSVmMethodList*)&VmWinEmuMethodTbl,
|
||||
CHANSVmMethodCount(VmWinEmuMethodTbl)) == 0) {
|
||||
class_fail:
|
||||
result = CHANS_VM_ERR_NATIVE_METHOD_INIT;
|
||||
@@ -6466,7 +6466,7 @@ void CHANSConvertModuleOfsToPtr(CHANSVmModule* ptr) {
|
||||
VmOffsU32ToPtr((void**)&ptr->pLineTbl, ptr);
|
||||
}
|
||||
|
||||
static CHANSVmObjHdr* CHANSVm_81455654(CHANSVm* vm, s32 id) {
|
||||
static CHANSVmObjHdr* CHANSVmLookupScopedObject(CHANSVm* vm, s32 id) {
|
||||
CHANSVmObjHdr* data = vmNull;
|
||||
CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;
|
||||
CHANSVmExecutionCtx* ctx = pVm->pActiveCtx;
|
||||
@@ -6755,7 +6755,7 @@ static CHANSVmErr VmReturnWithValue(CHANSVm* vm, u32 val) {
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < pVm->pActiveCtx->pDbg->moduleCount; i++) {
|
||||
if (CHANSVmDeleteObject(vm, CHANSVm_81455654(vm, i)) != CHANS_VM_OK) {
|
||||
if (CHANSVmDeleteObject(vm, CHANSVmLookupScopedObject(vm, i)) != CHANS_VM_OK) {
|
||||
return CHANS_VM_ERR_RETURN;
|
||||
}
|
||||
}
|
||||
@@ -6873,7 +6873,7 @@ CHANSVmErr CHANSVmLinkModules(CHANSVm* vm, vmS32 unk0) {
|
||||
CHANSVmObjHdr* obj;
|
||||
if (idx >= module->moduleCount) {
|
||||
goto pass3_idx_err;
|
||||
} else if (obj = CHANSVm_81455654(vm, idx), obj == vmNull) {
|
||||
} else if (obj = CHANSVmLookupScopedObject(vm, idx), obj == vmNull) {
|
||||
goto pass3_obj_err;
|
||||
} else if (obj->type == CHANS_VM_OBJ_TYPE_BLANK) {
|
||||
goto pass3_success;
|
||||
@@ -7417,7 +7417,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
}
|
||||
default: {
|
||||
// TODO: This is an inlined function called "VmGetResultType"
|
||||
CHANS_VM_PRINTF_CUSTOM("%s: no table for op '%c'\n", lbl_81669128, opKind);
|
||||
CHANS_VM_PRINTF_CUSTOM("%s: no table for op '%c'\n", scVmGetResultType, opKind);
|
||||
goto error_setter;
|
||||
}
|
||||
}
|
||||
@@ -7602,7 +7602,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_OBJ_TYPE_FLOAT: {
|
||||
invertedVal = (s64)(CHANSVm_8144B1D8(pAcc->value.float_v) * floor(fabs(pAcc->value.float_v)));
|
||||
invertedVal = (s64)(CHANSVmFloatSign(pAcc->value.float_v) * floor(fabs(pAcc->value.float_v)));
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_OBJ_TYPE_STRING: {
|
||||
@@ -7818,7 +7818,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
result = CHANS_VM_ERR_GET_PROPERTY_NAME;
|
||||
arrayIdx = 0;
|
||||
imm16Val = VM_READ_BE_U16(operandBuf, 0);
|
||||
foundObj = CHANSVm_81455654(vm, imm16Val);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
|
||||
accumulator = &pVm->accumulator;
|
||||
if (foundObj != vmNull && accumulator->type == CHANS_VM_OBJ_TYPE_INTEGER &&
|
||||
(computedAddr = accumulator->value.data.len, (u64)accumulator->value.int_v <= ~1U)) {
|
||||
@@ -7954,7 +7954,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
if (operandBuf == vmNull) {
|
||||
return CHANS_VM_ERR_CODE_RANGE;
|
||||
}
|
||||
foundObj = CHANSVm_81455654(vm, (VM_READ_BE_U16(operandBuf, 0)) & 0x1FFF);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, (VM_READ_BE_U16(operandBuf, 0)) & 0x1FFF);
|
||||
result = VmDeleteCommon(vm, foundObj);
|
||||
break;
|
||||
}
|
||||
@@ -7982,12 +7982,12 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
imm16Val = (opcodeVal << 8 | operandBuf[1]) & 0x1FFF;
|
||||
switch (opcodeVal & CHANS_VM_OP_SYMBOL_STORE) {
|
||||
case 0: {
|
||||
foundObj = CHANSVm_81455654(vm, imm16Val);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
|
||||
result = VmStore(vm, &pVm->accumulator, foundObj);
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_OP_SYMBOL_STORE: {
|
||||
foundObj = CHANSVm_81455654(vm, imm16Val);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
|
||||
result = VmStore(vm, foundObj, &pVm->accumulator);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -5,13 +5,6 @@
|
||||
|
||||
#include <new>
|
||||
|
||||
extern "C" const f32 lbl_81694D90;
|
||||
extern "C" const f32 lbl_81694DA8;
|
||||
extern "C" const f32 lbl_81694DAC;
|
||||
extern "C" const f32 lbl_81694DB0;
|
||||
extern "C" const f32 lbl_81694DB4;
|
||||
extern "C" const f32 lbl_81694DBC;
|
||||
extern "C" const double lbl_81694DC8;
|
||||
extern "C" void _savegpr_24();
|
||||
extern "C" void _restgpr_24();
|
||||
extern "C" void GetFont__Q34nw4r3lyt8TextBoxCFv();
|
||||
@@ -21,22 +14,22 @@ namespace textinput {
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8165D2D0[15] = "T_prdc_Text_00";
|
||||
extern "C" const char lbl_8165D2E0[17] = "P_prdc_scrl_Left";
|
||||
extern "C" const char scT_prdc_Text_00[15] = "T_prdc_Text_00";
|
||||
extern "C" const char scP_prdc_scrl_Left[17] = "P_prdc_scrl_Left";
|
||||
#pragma pop
|
||||
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata"
|
||||
extern "C" const char* lbl_816973C0 = lbl_8165D2D0;
|
||||
extern "C" const char* lbl_816973C4 = lbl_8165D2E0;
|
||||
extern "C" const wchar_t lbl_816973C8[4] = {0, 0, 0, 1};
|
||||
extern "C" const char lbl_816973D0[8] = "P_OnBtn";
|
||||
extern "C" const char lbl_816973D8[8] = "B_OnBtn";
|
||||
extern "C" const char* scCommonTextAnimName = scT_prdc_Text_00;
|
||||
extern "C" const char* scCommonScrollAnimName = scP_prdc_scrl_Left;
|
||||
extern "C" const wchar_t scEmptyWChars[4] = {0, 0, 0, 1};
|
||||
extern "C" const char scP_OnBtn[8] = "P_OnBtn";
|
||||
extern "C" const char scB_OnBtn[8] = "B_OnBtn";
|
||||
#pragma pop
|
||||
|
||||
|
||||
#define COMMON_TEXT_ANIM lbl_816973C0
|
||||
#define COMMON_SCROLL_ANIM lbl_816973C4
|
||||
#define COMMON_TEXT_ANIM scCommonTextAnimName
|
||||
#define COMMON_SCROLL_ANIM scCommonScrollAnimName
|
||||
|
||||
// name made up, no dwarf (?)
|
||||
struct AnimationFile {
|
||||
@@ -77,7 +70,7 @@ namespace textinput {
|
||||
char tail[12];
|
||||
};
|
||||
|
||||
extern "C" const CandidatePaneData lbl_8165D2F8 __attribute__((aligned(8))) = {{
|
||||
extern "C" const CandidatePaneData scCandidatePaneData __attribute__((aligned(8))) = {{
|
||||
{KT_CandidateText, "N_predictInput", 1, NULL, {&csAninationFile[0]}},
|
||||
{KT_ScrollButton,
|
||||
"P_prdc_scrl_Left",
|
||||
@@ -212,7 +205,7 @@ namespace textinput {
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8165D984[132] =
|
||||
extern "C" const char scPaneNameTable[132] =
|
||||
"B_OffBtn\0\0\0"
|
||||
"P_JPOffBtn\0"
|
||||
"P_CNOffBtn\0"
|
||||
@@ -222,10 +215,10 @@ namespace textinput {
|
||||
"B_prdc_scrl_Rght\0\0\0"
|
||||
"P_prdc_scrl_Rght\0\0\0"
|
||||
"\0\0\0";
|
||||
extern "C" char lbl_8165DA08[16] = "W_predictWindow";
|
||||
extern "C" const char lbl_8165DA18[15] = "N_predictInput";
|
||||
extern "C" const char lbl_8165DA28[13] = "W_OnOff_Area";
|
||||
extern "C" const char lbl_8165DA38[13] = "N_prdc_Texts";
|
||||
extern "C" char scW_predictWindow[16] = "W_predictWindow";
|
||||
extern "C" const char scN_predictInput[15] = "N_predictInput";
|
||||
extern "C" const char scW_OnOff_Area[13] = "W_OnOff_Area";
|
||||
extern "C" const char scN_prdc_Texts[13] = "N_prdc_Texts";
|
||||
#pragma pop
|
||||
|
||||
void CandidateBoxCaller::Candidates::addCandidate(const wchar_t* wcString) {
|
||||
@@ -398,20 +391,20 @@ namespace textinput {
|
||||
mTextArea.Init();
|
||||
mOnOffButton.Create(this);
|
||||
mOnOffButton.Init();
|
||||
const char* paneNames = lbl_8165D984;
|
||||
const char* paneNames = scPaneNameTable;
|
||||
mLeftScroll.Create(this, paneNames + 68, paneNames + 48);
|
||||
mRightScroll.Create(this, paneNames + 108, paneNames + 88);
|
||||
mLeftScroll.Init();
|
||||
mRightScroll.Init();
|
||||
mTextWindow.Create(this, lbl_8165DA08);
|
||||
mTextWindow.Create(this, scW_predictWindow);
|
||||
init();
|
||||
}
|
||||
|
||||
void LayoutByNW4R::createAnmPane_(MEMAllocator* allocator) {
|
||||
CandidateTextAnmPane* pane;
|
||||
for (u16 i = 0; i < ARRAY_LENGTH(lbl_8165D2F8.panes); i++) {
|
||||
for (u16 i = 0; i < ARRAY_LENGTH(scCandidatePaneData.panes); i++) {
|
||||
pane = NULL;
|
||||
const PaneToAnimation& p = lbl_8165D2F8.panes[i];
|
||||
const PaneToAnimation& p = scCandidatePaneData.panes[i];
|
||||
switch (p.type) {
|
||||
case KT_ScrollButton: {
|
||||
void* pBtnBuf = MEMAllocFromAllocator(allocator, sizeof(CandidateScrollAnmPane));
|
||||
@@ -454,7 +447,7 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::init() {
|
||||
searchAnmPane(lbl_8165DA18)->changeAnimation(ANM_Normal);
|
||||
searchAnmPane(scN_predictInput)->changeAnimation(ANM_Normal);
|
||||
Base::setInvalid(false);
|
||||
setActive(true);
|
||||
setOnOff(false);
|
||||
@@ -467,7 +460,7 @@ namespace textinput {
|
||||
mpLayout->CalculateMtx(mDrawInfo);
|
||||
if (meLanguage == KR) {
|
||||
mTextWindow.SetVisible(false);
|
||||
getPane(lbl_8165DA28)->SetVisible(false);
|
||||
getPane(scW_OnOff_Area)->SetVisible(false);
|
||||
} else if (meLanguage == CN) {
|
||||
setOnOff(true);
|
||||
mTextWindow.SetVisible(true);
|
||||
@@ -477,16 +470,16 @@ namespace textinput {
|
||||
} else {
|
||||
mTextWindow.ChangeAnimation(ANM_Normal);
|
||||
}
|
||||
getPane(lbl_8165DA28)->SetVisible(false);
|
||||
getPane(scW_OnOff_Area)->SetVisible(false);
|
||||
} else {
|
||||
getPane(lbl_8165DA28)->SetVisible(true);
|
||||
getPane(scW_OnOff_Area)->SetVisible(true);
|
||||
}
|
||||
}
|
||||
|
||||
void LayoutByNW4R::draw() {
|
||||
getPane(lbl_8165DA38)->SetVisible(false);
|
||||
getPane(scN_prdc_Texts)->SetVisible(false);
|
||||
nw4rmanager::Layout::draw();
|
||||
getPane(lbl_8165DA38)->SetVisible(true);
|
||||
getPane(scN_prdc_Texts)->SetVisible(true);
|
||||
if (!isInvalid()) {
|
||||
mTextArea.Draw(mDrawInfo);
|
||||
}
|
||||
@@ -496,8 +489,8 @@ namespace textinput {
|
||||
nw4rmanager::Layout::calc();
|
||||
mTextArea.Calc();
|
||||
if (mbAnimOn) {
|
||||
getPane(lbl_8165DA38)->Animate(0);
|
||||
getPane(lbl_8165DA38)->CalculateMtx(mDrawInfo);
|
||||
getPane(scN_prdc_Texts)->Animate(0);
|
||||
getPane(scN_prdc_Texts)->CalculateMtx(mDrawInfo);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -505,7 +498,7 @@ namespace textinput {
|
||||
Base::setLanguage(language);
|
||||
init();
|
||||
// Maybe inlines, maybe not
|
||||
nw4r::math::VEC3 pos = searchAnmPane(lbl_8165DA08)->getPane()->GetTranslate();
|
||||
nw4r::math::VEC3 pos = searchAnmPane(scW_predictWindow)->getPane()->GetTranslate();
|
||||
if (meLanguage == CN || meLanguage == KR) {
|
||||
Base::checkValidation();
|
||||
// Potentially an inline
|
||||
@@ -520,7 +513,7 @@ namespace textinput {
|
||||
pos.x = 202.0f;
|
||||
}
|
||||
|
||||
searchAnmPane(lbl_8165DA08)->getPane()->SetTranslate(pos);
|
||||
searchAnmPane(scW_predictWindow)->getPane()->SetTranslate(pos);
|
||||
if (meLanguage == CN) {
|
||||
mTextArea.ApplyFontScale(1.2f);
|
||||
} else if (meLanguage == KR) {
|
||||
@@ -531,10 +524,10 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::onOnOffButton(bool arg) {
|
||||
const char* base = lbl_8165D2D0;
|
||||
const char* base = scT_prdc_Text_00;
|
||||
mTextWindow.TurnOnOff(!isOn());
|
||||
if (isOn()) {
|
||||
searchAnmPane(lbl_816973D0)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
|
||||
searchAnmPane(scP_OnBtn)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
|
||||
if (arg) {
|
||||
mpEventObserver->onSE(sound::SE_PREDICT_OFF);
|
||||
}
|
||||
@@ -588,7 +581,7 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::startTurnOn(bool on) {
|
||||
const char* base = lbl_8165D2D0;
|
||||
const char* base = scT_prdc_Text_00;
|
||||
if (isInScroll()) {
|
||||
return;
|
||||
}
|
||||
@@ -596,7 +589,7 @@ namespace textinput {
|
||||
mTextWindow.TurnOnOff(on);
|
||||
|
||||
if (!on) {
|
||||
searchAnmPane(lbl_816973D0)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
|
||||
searchAnmPane(scP_OnBtn)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
|
||||
mpEventObserver->onSE(sound::SE_PREDICT_OFF);
|
||||
} else {
|
||||
searchAnmPane(base + 0x6a8)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
|
||||
@@ -637,7 +630,7 @@ namespace textinput {
|
||||
current = reinterpret_cast<CandidateBoxCaller::Candidates*>(reinterpret_cast<u8*>(current) + sizeof(current->szwcPredicted[0]));
|
||||
}
|
||||
}
|
||||
gui::PaneComponent* p = mpPaneManager->searchPaneComponent(isOn() ? lbl_816973D8 : lbl_8165D984);
|
||||
gui::PaneComponent* p = mpPaneManager->searchPaneComponent(isOn() ? scB_OnBtn : scPaneNameTable);
|
||||
if (p != NULL) {
|
||||
p->lockInitialize(true);
|
||||
}
|
||||
@@ -706,8 +699,8 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::cancelStateFocusIn() {
|
||||
const PaneToAnimation* pane = lbl_8165D2F8.panes;
|
||||
for (int i = 0; i < ARRAY_LENGTH(lbl_8165D2F8.panes); i++) {
|
||||
const PaneToAnimation* pane = scCandidatePaneData.panes;
|
||||
for (int i = 0; i < ARRAY_LENGTH(scCandidatePaneData.panes); i++) {
|
||||
CandidateTextAnmPane* p = static_cast<CandidateTextAnmPane*>(searchAnmPane(pane->paneName));
|
||||
if (p != NULL) {
|
||||
switch (p->getKeyType()) {
|
||||
@@ -765,7 +758,7 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::onEvent(UIObj* obj, u32 id, void* data) {
|
||||
const char* base = lbl_8165D2D0;
|
||||
const char* base = scT_prdc_Text_00;
|
||||
int tmp;
|
||||
|
||||
switch (id) {
|
||||
@@ -996,7 +989,7 @@ namespace textinput {
|
||||
void UITextArea::Create(nw4rmanager::Layout* layout) {
|
||||
// These could have been static...
|
||||
const char* textPanes[NUM_PANES] = {
|
||||
lbl_8165D2D0, "T_prdc_Text_01", "T_prdc_Text_02", "T_prdc_Text_03", "T_prdc_Text_04", "T_prdc_Text_05", "T_prdc_Text_06",
|
||||
scT_prdc_Text_00, "T_prdc_Text_01", "T_prdc_Text_02", "T_prdc_Text_03", "T_prdc_Text_04", "T_prdc_Text_05", "T_prdc_Text_06",
|
||||
"T_prdc_Text_07", "T_prdc_Text_08", "T_prdc_Text_09", "T_prdc_Text_10", "T_prdc_Text_11", "T_prdc_Text_12", "T_prdc_Text_13",
|
||||
"T_prdc_Text_14", "T_prdc_Text_15", "T_prdc_Text_16", "T_prdc_Text_17", "T_prdc_Text_18", "T_prdc_Text_19",
|
||||
};
|
||||
@@ -1015,7 +1008,7 @@ namespace textinput {
|
||||
mpBoundingPane[i]->setListener(this);
|
||||
}
|
||||
mpTextAreaPane = mgr->searchPaneComponent("N_prdcTextArea");
|
||||
mpTextsPane = mgr->searchPaneComponent(lbl_8165DA38);
|
||||
mpTextsPane = mgr->searchPaneComponent(scN_prdc_Texts);
|
||||
mSize = mpTextBoxPane[0]->getTextPane()->GetFontSize();
|
||||
mpTextAreaPane->setListener(this);
|
||||
}
|
||||
@@ -1023,7 +1016,7 @@ namespace textinput {
|
||||
|
||||
void UITextArea::Init() {
|
||||
for (u32 i = 0; i < NUM_PANES; i++) {
|
||||
mpTextBoxPane[i]->getTextPane()->SetString(const_cast<const wchar_t*>(lbl_816973C8), 0);
|
||||
mpTextBoxPane[i]->getTextPane()->SetString(const_cast<const wchar_t*>(scEmptyWChars), 0);
|
||||
mpBoundingPane[i]->setTriggerTarget(true);
|
||||
}
|
||||
mfTextWidth = 0.0f;
|
||||
@@ -1210,7 +1203,7 @@ namespace textinput {
|
||||
|
||||
void UITextArea::Clear() {
|
||||
for (u32 i = 0; i < NUM_PANES; i++) {
|
||||
mpTextBoxPane[i]->getTextPane()->SetString(const_cast<const wchar_t*>(lbl_816973C8), 0);
|
||||
mpTextBoxPane[i]->getTextPane()->SetString(const_cast<const wchar_t*>(scEmptyWChars), 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1493,7 +1486,7 @@ namespace textinput {
|
||||
if (mgr()->isInScroll() && event != 1 && event != 0) {
|
||||
return;
|
||||
}
|
||||
if (!mgr()->searchAnmPane(lbl_8165DA08)->isInAnimation() || event == 1) {
|
||||
if (!mgr()->searchAnmPane(scW_predictWindow)->isInAnimation() || event == 1) {
|
||||
if (!mgr()->isInvalid()) {
|
||||
switch (event) {
|
||||
case 4:
|
||||
@@ -1645,7 +1638,7 @@ namespace textinput {
|
||||
if (mgr()->isInScroll() && event != 1 && event != 0) {
|
||||
return;
|
||||
}
|
||||
if (!mgr()->searchAnmPane(lbl_8165DA08)->isInAnimation() || event == 1) {
|
||||
if (!mgr()->searchAnmPane(scW_predictWindow)->isInAnimation() || event == 1) {
|
||||
if (!mgr()->isInvalid()) {
|
||||
switch (event) {
|
||||
case 4:
|
||||
@@ -1691,15 +1684,15 @@ namespace textinput {
|
||||
mpOnPictPane = mgr->searchPaneComponent("P_OnBtn");
|
||||
mpOnBoundPane = mgr->searchPaneComponent("B_OnBtn");
|
||||
mpOnAnmPane = static_cast<OnOffAnmPane*>(layout->searchAnmPane("P_OnBtn"));
|
||||
mpOffPictPane = mgr->searchPaneComponent(lbl_8165D2F8.tail);
|
||||
mpOffBoundPane = mgr->searchPaneComponent(lbl_8165D984);
|
||||
mpOffAnmPane = static_cast<OnOffAnmPane*>(layout->searchAnmPane(lbl_8165D2F8.tail));
|
||||
mpOffPictPane = mgr->searchPaneComponent(scCandidatePaneData.tail);
|
||||
mpOffBoundPane = mgr->searchPaneComponent(scPaneNameTable);
|
||||
mpOffAnmPane = static_cast<OnOffAnmPane*>(layout->searchAnmPane(scCandidatePaneData.tail));
|
||||
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_8165D2F8.tail)->GetMaterial()->GetTexture(&mOffTexDefault, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_8165D984 + 12)->GetMaterial()->GetTexture(&mOffTexJP, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_8165D984 + 24)->GetMaterial()->GetTexture(&mOffTexCN, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_816973D0)->GetMaterial()->GetTexture(&mOnTexDefault, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_8165D984 + 36)->GetMaterial()->GetTexture(&mOnTexCN, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(scCandidatePaneData.tail)->GetMaterial()->GetTexture(&mOffTexDefault, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(scPaneNameTable + 12)->GetMaterial()->GetTexture(&mOffTexJP, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(scPaneNameTable + 24)->GetMaterial()->GetTexture(&mOffTexCN, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(scP_OnBtn)->GetMaterial()->GetTexture(&mOnTexDefault, 0);
|
||||
layout->getLayout()->GetRootPane()->FindPaneByName(scPaneNameTable + 36)->GetMaterial()->GetTexture(&mOnTexCN, 0);
|
||||
|
||||
mpOffBoundPane->setListener(this);
|
||||
mpOnBoundPane->setListener(this);
|
||||
@@ -1756,7 +1749,7 @@ namespace textinput {
|
||||
if (mgr()->isInScroll() && event != 1 && event != 0) {
|
||||
return;
|
||||
}
|
||||
if (!mgr()->searchAnmPane(lbl_8165DA08)->isInAnimation() || event == 1) {
|
||||
if (!mgr()->searchAnmPane(scW_predictWindow)->isInAnimation() || event == 1) {
|
||||
OnOffAnmPane* p;
|
||||
if (&component == mpOnBoundPane) {
|
||||
p = mpOnAnmPane;
|
||||
|
||||
@@ -19,7 +19,7 @@ extern "C" void updateFromReceiver__Q29textinput13CommandSenderFUlPv();
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
typedef void (*KeyboardDataFunction)();
|
||||
extern "C" KeyboardDataFunction const jumptable_81668EF8[0x3f] = {
|
||||
extern "C" KeyboardDataFunction const scHwKeyboardConvertWCCodeJumpTable[0x3f] = {
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000158),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001d8),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
@@ -526,23 +526,6 @@ extern const u8 controlKeys[];
|
||||
return false;
|
||||
}
|
||||
|
||||
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
|
||||
const u8 controlKeys[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
|
||||
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
|
||||
0x00, 0x04, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
|
||||
0x2b, 0x2c, 0x19, 0x1a, 0x1b, 0x13, 0x15, 0x17, 0x14, 0x16, 0x18, 0x00,
|
||||
0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x0f, 0x0e,
|
||||
0x00, 0x00, 0x00, 0x00,
|
||||
0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x05, 0x07, 0x0b,
|
||||
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
bool HWKeyboard::updateTappingShift_(input::HKBManager& hkbManager) {
|
||||
hkbManager.GetModifierState();
|
||||
input::HKBManager::KeySet currentKeySet;
|
||||
@@ -636,6 +619,24 @@ const u8 controlKeys[] = {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
|
||||
const u8 controlKeys[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
|
||||
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
|
||||
0x00, 0x04, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
|
||||
0x2b, 0x2c, 0x19, 0x1a, 0x1b, 0x13, 0x15, 0x17, 0x14, 0x16, 0x18, 0x00,
|
||||
0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x0f, 0x0e,
|
||||
0x00, 0x00, 0x00, 0x00,
|
||||
0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x05, 0x07, 0x0b,
|
||||
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
|
||||
extern "C" asm void setLanguage__Q49textinput8keyboard5hwkey10HWKeyboardFQ29textinput11DestinationQ29textinput8Language() {
|
||||
nofralloc
|
||||
cmpwi r4, 2
|
||||
@@ -736,9 +737,9 @@ const u8 controlKeys[] = {
|
||||
addi r0, r31, -0x21
|
||||
cmplwi r0, 0x3e
|
||||
bgt convertWCCode_HWKeyboard_L1
|
||||
lis r3, jumptable_81668EF8@ha
|
||||
lis r3, scHwKeyboardConvertWCCodeJumpTable@ha
|
||||
slwi r0, r0, 2
|
||||
addi r3, r3, jumptable_81668EF8@l
|
||||
addi r3, r3, scHwKeyboardConvertWCCodeJumpTable@l
|
||||
lwzx r3, r3, r0
|
||||
mtctr r3
|
||||
bctr
|
||||
|
||||
@@ -139,22 +139,22 @@ extern "C" asm void draw__Q39textinput11nw4rmanager6LayoutFv();
|
||||
extern "C" asm void searchPaneComponent__Q39textinput3gui11PaneManagerFPCc();
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8165C820[];
|
||||
extern "C" const char lbl_8165C830[];
|
||||
extern "C" const char lbl_8165C8C0[];
|
||||
extern "C" const char lbl_8165C8CC[];
|
||||
extern "C" const char lbl_8165C8E0[];
|
||||
extern "C" const char lbl_8165C8F0[];
|
||||
extern "C" const char lbl_8165C900[];
|
||||
extern "C" const char lbl_8165C918[];
|
||||
extern "C" const char lbl_8165C928[];
|
||||
extern "C" const char lbl_8165C938[];
|
||||
extern "C" const char lbl_8165C950[];
|
||||
extern "C" const char lbl_8165C960[];
|
||||
extern "C" const char scP_txtScrll_UP[];
|
||||
extern "C" const char scP_txtScrll_DOWN[];
|
||||
extern "C" const char scN_JPNUSAEUR[];
|
||||
extern "C" const char scN_separateBarAll[];
|
||||
extern "C" const char scT_2l_TextBox[];
|
||||
extern "C" const char scT_title_textJPN[];
|
||||
extern "C" const char scN_separateBarKOR[];
|
||||
extern "C" const char scT_2l_TextBoxKOR[];
|
||||
extern "C" const char scT_title_textKOR[];
|
||||
extern "C" const char scN_separateBarCHN[];
|
||||
extern "C" const char scT_2l_TextBoxCHN[];
|
||||
extern "C" const char scT_title_textCHN[];
|
||||
extern "C" const char lbl_816973A4[];
|
||||
extern "C" const char lbl_816973AC[];
|
||||
#pragma pop
|
||||
extern "C" const f32 lbl_81694D28;
|
||||
extern "C" const f32 scInputFormZeroF;
|
||||
extern "C" void _savegpr_20();
|
||||
extern "C" void _restgpr_20();
|
||||
extern "C" void _savegpr_27();
|
||||
@@ -314,7 +314,7 @@ void Base::resetContextPredict_() {
|
||||
|
||||
static GXColor kanaBackground = {128, 255, 128, 255};
|
||||
static GXColor candidateBackground = {255, 210, 12, 255};
|
||||
const char* csScrollButtonAnimationTarget = lbl_8165C820;
|
||||
const char* csScrollButtonAnimationTarget = scP_txtScrll_UP;
|
||||
|
||||
struct InputFormAnimationFile {
|
||||
u32 id;
|
||||
@@ -337,14 +337,14 @@ extern "C" const InputFormAnimationFile csAninationFile__Q29textinput9inputform[
|
||||
#pragma section data_type ".rodata"
|
||||
extern "C" const VisiblePanes csVisiblePaneUEJ__Q29textinput9inputform = {
|
||||
1, 2,
|
||||
{lbl_8165C8C0, NULL, NULL, NULL},
|
||||
{scN_JPNUSAEUR, NULL, NULL, NULL},
|
||||
{"N_KOR", "N_CHN", NULL, NULL},
|
||||
};
|
||||
|
||||
extern "C" const VisiblePanes csVisiblePaneKOR__Q29textinput9inputform = {
|
||||
1, 2,
|
||||
{"N_KOR", NULL, NULL, NULL},
|
||||
{"N_CHN", lbl_8165C8C0, NULL, NULL},
|
||||
{"N_CHN", scN_JPNUSAEUR, NULL, NULL},
|
||||
};
|
||||
|
||||
extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
|
||||
@@ -354,7 +354,7 @@ extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
|
||||
0,
|
||||
0,
|
||||
"N_KOR",
|
||||
lbl_8165C8C0,
|
||||
scN_JPNUSAEUR,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
@@ -362,23 +362,23 @@ extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
|
||||
|
||||
extern "C" const LanguagePaneData csLanguageDependencyDataUEJ__Q29textinput9inputform = {
|
||||
&csVisiblePaneUEJ__Q29textinput9inputform,
|
||||
lbl_8165C8CC,
|
||||
lbl_8165C8E0,
|
||||
lbl_8165C8F0,
|
||||
scN_separateBarAll,
|
||||
scT_2l_TextBox,
|
||||
scT_title_textJPN,
|
||||
};
|
||||
|
||||
extern "C" const LanguagePaneData csLanguageDependencyDataKOR__Q29textinput9inputform = {
|
||||
&csVisiblePaneKOR__Q29textinput9inputform,
|
||||
lbl_8165C900,
|
||||
lbl_8165C918,
|
||||
lbl_8165C928,
|
||||
scN_separateBarKOR,
|
||||
scT_2l_TextBoxKOR,
|
||||
scT_title_textKOR,
|
||||
};
|
||||
|
||||
extern "C" const LanguagePaneData csLanguageDependencyDataCHN__Q29textinput9inputform = {
|
||||
reinterpret_cast<const VisiblePanes*>(csVisiblePaneCHN__Q29textinput9inputform),
|
||||
lbl_8165C938,
|
||||
lbl_8165C950,
|
||||
lbl_8165C960,
|
||||
scN_separateBarCHN,
|
||||
scT_2l_TextBoxCHN,
|
||||
scT_title_textCHN,
|
||||
};
|
||||
#pragma section data_type ".data"
|
||||
|
||||
@@ -386,39 +386,39 @@ extern "C" const wchar_t pppURLCheck[2][10] = {L"http://", L"https://"};
|
||||
|
||||
#pragma pop
|
||||
|
||||
extern "C" const f32 lbl_81694D28 = 0.0f;
|
||||
extern "C" const f32 lbl_81694D2C = 640.0f;
|
||||
extern "C" const f64 lbl_81694D30 = 4503601774854144.0;
|
||||
extern "C" const f32 lbl_81694D38 = 1.0f;
|
||||
extern "C" const f32 lbl_81694D3C = 0.5f;
|
||||
extern "C" const f32 lbl_81694D40 = 0.7111111f;
|
||||
extern "C" const f32 lbl_81694D44 = 150.0f;
|
||||
extern "C" const f32 lbl_81694D48 = 30.0f;
|
||||
extern "C" const f32 lbl_81694D4C = 50.0f;
|
||||
extern "C" const f32 lbl_81694D50 = 10.0f;
|
||||
extern "C" const f32 lbl_81694D54 = 52.0f;
|
||||
extern "C" const f32 lbl_81694D58 = 2.0f;
|
||||
extern "C" const f32 lbl_81694D5C = 140.0f;
|
||||
extern "C" const f32 lbl_81694D60 = 90.0f;
|
||||
extern "C" const f32 lbl_81694D64 = 253.0f;
|
||||
extern "C" const f32 lbl_81694D68 = 20.0f;
|
||||
extern "C" const u8 lbl_81694D6C = 0xff;
|
||||
extern "C" const u8 lbl_81694D6D = 0x32;
|
||||
extern "C" const u8 lbl_81694D6E = 0x32;
|
||||
extern "C" const u8 lbl_81694D6F = 0;
|
||||
extern "C" const f32 lbl_81694D70 = 255.0f;
|
||||
extern "C" const f32 lbl_81694D74 = 127.0f;
|
||||
extern "C" const f32 lbl_81694D78 = 14592.0f;
|
||||
extern "C" const f64 lbl_81694D80 = 4503599627370496.0;
|
||||
extern "C" const f32 lbl_81694D88 = 15.0f;
|
||||
extern "C" const f32 scInputFormZeroF = 0.0f;
|
||||
extern "C" const f32 scInputForm640F = 640.0f;
|
||||
extern "C" const f64 scInputFormF32ConvertMagic = 4503601774854144.0;
|
||||
extern "C" const f32 scInputFormOneF = 1.0f;
|
||||
extern "C" const f32 scInputFormHalfF = 0.5f;
|
||||
extern "C" const f32 scInputFormDegToFIdxF = 0.7111111f;
|
||||
extern "C" const f32 scInputForm150F = 150.0f;
|
||||
extern "C" const f32 scInputForm30F = 30.0f;
|
||||
extern "C" const f32 scInputForm50F = 50.0f;
|
||||
extern "C" const f32 scInputForm10F = 10.0f;
|
||||
extern "C" const f32 scInputForm52F = 52.0f;
|
||||
extern "C" const f32 scInputFormTwoF = 2.0f;
|
||||
extern "C" const f32 scInputForm140F = 140.0f;
|
||||
extern "C" const f32 scInputForm90F = 90.0f;
|
||||
extern "C" const f32 scInputForm253F = 253.0f;
|
||||
extern "C" const f32 scInputForm20F = 20.0f;
|
||||
extern "C" const u8 scInputFormColorRU8 = 0xff;
|
||||
extern "C" const u8 scInputFormColorGU8 = 0x32;
|
||||
extern "C" const u8 scInputFormColorBU8 = 0x32;
|
||||
extern "C" const u8 scInputFormColorAU8 = 0;
|
||||
extern "C" const f32 scInputForm255F = 255.0f;
|
||||
extern "C" const f32 scInputForm127F = 127.0f;
|
||||
extern "C" const f32 scInputForm14592F = 14592.0f;
|
||||
extern "C" const f64 scInputFormF64ConvertMagic = 4503599627370496.0;
|
||||
extern "C" const f32 scInputForm15F = 15.0f;
|
||||
f32 sfColorPhase;
|
||||
|
||||
bool mbHyphen = true;
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8165C820[] = "P_txtScrll_UP";
|
||||
extern "C" const char lbl_8165C830[] = "P_txtScrll_DOWN";
|
||||
extern "C" const char scP_txtScrll_UP[] = "P_txtScrll_UP";
|
||||
extern "C" const char scP_txtScrll_DOWN[] = "P_txtScrll_DOWN";
|
||||
struct ButtonAnimations {
|
||||
KeyType type;
|
||||
const char* paneName;
|
||||
@@ -428,27 +428,27 @@ struct ButtonAnimations {
|
||||
};
|
||||
|
||||
const ButtonAnimations csButtonAnimations[] = {
|
||||
{KT_NormalButton, lbl_8165C820, 8, NULL, {
|
||||
{KT_NormalButton, scP_txtScrll_UP, 8, NULL, {
|
||||
&csAninationFile__Q29textinput9inputform[0], &csAninationFile__Q29textinput9inputform[1],
|
||||
&csAninationFile__Q29textinput9inputform[2], &csAninationFile__Q29textinput9inputform[3],
|
||||
&csAninationFile__Q29textinput9inputform[4], &csAninationFile__Q29textinput9inputform[5],
|
||||
&csAninationFile__Q29textinput9inputform[6], &csAninationFile__Q29textinput9inputform[7]}},
|
||||
{KT_NormalButton, lbl_8165C830, 8, csScrollButtonAnimationTarget, {
|
||||
{KT_NormalButton, scP_txtScrll_DOWN, 8, csScrollButtonAnimationTarget, {
|
||||
&csAninationFile__Q29textinput9inputform[0], &csAninationFile__Q29textinput9inputform[1],
|
||||
&csAninationFile__Q29textinput9inputform[2], &csAninationFile__Q29textinput9inputform[3],
|
||||
&csAninationFile__Q29textinput9inputform[4], &csAninationFile__Q29textinput9inputform[5],
|
||||
&csAninationFile__Q29textinput9inputform[6], &csAninationFile__Q29textinput9inputform[7]}}
|
||||
};
|
||||
extern "C" const char lbl_8165C8C0[] = "N_JPNUSAEUR";
|
||||
extern "C" const char lbl_8165C8CC[] = "N_separateBarAll";
|
||||
extern "C" const char lbl_8165C8E0[] = "T_2l_TextBox";
|
||||
extern "C" const char lbl_8165C8F0[] = "T_title_textJPN";
|
||||
extern "C" const char lbl_8165C900[] = "N_separateBarKOR";
|
||||
extern "C" const char lbl_8165C918[] = "T_2l_TextBoxKOR";
|
||||
extern "C" const char lbl_8165C928[] = "T_title_textKOR";
|
||||
extern "C" const char lbl_8165C938[] = "N_separateBarCHN";
|
||||
extern "C" const char lbl_8165C950[] = "T_2l_TextBoxCHN";
|
||||
extern "C" const char lbl_8165C960[] = "T_title_textCHN";
|
||||
extern "C" const char scN_JPNUSAEUR[] = "N_JPNUSAEUR";
|
||||
extern "C" const char scN_separateBarAll[] = "N_separateBarAll";
|
||||
extern "C" const char scT_2l_TextBox[] = "T_2l_TextBox";
|
||||
extern "C" const char scT_title_textJPN[] = "T_title_textJPN";
|
||||
extern "C" const char scN_separateBarKOR[] = "N_separateBarKOR";
|
||||
extern "C" const char scT_2l_TextBoxKOR[] = "T_2l_TextBoxKOR";
|
||||
extern "C" const char scT_title_textKOR[] = "T_title_textKOR";
|
||||
extern "C" const char scN_separateBarCHN[] = "N_separateBarCHN";
|
||||
extern "C" const char scT_2l_TextBoxCHN[] = "T_2l_TextBoxCHN";
|
||||
extern "C" const char scT_title_textCHN[] = "T_title_textCHN";
|
||||
bool DeadKeyStream::sbCompatibleFilterEnabled = true;
|
||||
|
||||
inline bool DeadKeyStream::isCompatible(wchar_t character) {
|
||||
@@ -509,13 +509,13 @@ void Base::setLanguage(Language language) {
|
||||
case UK:
|
||||
setPredictMode(PM_En);
|
||||
break;
|
||||
case FR:
|
||||
case DE:
|
||||
setPredictMode(PM_De);
|
||||
break;
|
||||
case DE:
|
||||
case IT:
|
||||
setPredictMode(PM_It);
|
||||
break;
|
||||
case IT:
|
||||
case NL:
|
||||
setPredictMode(PM_Nl);
|
||||
break;
|
||||
case SP:
|
||||
@@ -525,7 +525,7 @@ void Base::setLanguage(Language language) {
|
||||
setPredictMode(PM_USSp);
|
||||
}
|
||||
break;
|
||||
case NL:
|
||||
case FR:
|
||||
if (meDestination == DST_EU) {
|
||||
setPredictMode(PM_Fr);
|
||||
} else {
|
||||
@@ -2419,178 +2419,42 @@ void Base::onPressRight() {
|
||||
meScrollFlag = SF_ScrollOn;
|
||||
}
|
||||
|
||||
extern "C" asm void calc__Q39textinput9inputform4BaseFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x40(r1)
|
||||
mflr r0
|
||||
stw r0, 0x44(r1)
|
||||
stfd f31, 0x30(r1)
|
||||
psq_st f31, 0x38(r1), 0, 0
|
||||
stw r31, 0x2c(r1)
|
||||
stw r30, 0x28(r1)
|
||||
mr r30, r3
|
||||
lwz r12, 0x18c(r3)
|
||||
lwz r12, 0x14(r12)
|
||||
mtctr r12
|
||||
addi r3, r3, 0x18c
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
beq calc_L1
|
||||
lwz r12, 0x18c(r30)
|
||||
addi r3, r30, 0x18c
|
||||
lwz r12, 0x10(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
frsp f0, f1
|
||||
stfs f1, 0x188(r30)
|
||||
stfs f0, 0x100(r30)
|
||||
calc_L1:
|
||||
lwz r12, 0x18c(r30)
|
||||
addi r3, r30, 0x18c
|
||||
lwz r12, 0x14(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
bne calc_L2
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
lwz r12, 0x16c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
calc_L2:
|
||||
lwz r3, 0x164(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x78(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
bne calc_L3
|
||||
lfs f1, lbl_81694D38(r0)
|
||||
lfs f0, 0x1ac(r30)
|
||||
fadds f0, f1, f0
|
||||
stfs f0, 0x1ac(r30)
|
||||
calc_L3:
|
||||
lwz r12, 0x18c(r30)
|
||||
addi r3, r30, 0x18c
|
||||
lwz r12, 0xc(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lfs f1, sfColorPhase(r0)
|
||||
lfs f0, lbl_81694D40(r0)
|
||||
fmuls f1, f0, f1
|
||||
bl SinFIdx__Q24nw4r4mathFf
|
||||
lfs f0, lbl_81694D48(r0)
|
||||
li r0, 0x5a
|
||||
li r3, 2
|
||||
li r31, 0xfd
|
||||
fmuls f2, f0, f1
|
||||
lfs f0, lbl_81694D44(r0)
|
||||
stb r3, 0x1c0(r30)
|
||||
fmr f31, f1
|
||||
lwz r3, 0x164(r30)
|
||||
fadds f0, f0, f2
|
||||
stb r0, 0x1c1(r30)
|
||||
fctiwz f0, f0
|
||||
stb r31, 0x1c2(r30)
|
||||
stfd f0, 8(r1)
|
||||
lwz r0, 0xc(r1)
|
||||
stb r0, 0x1c3(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x78(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
beq calc_L4
|
||||
lfs f1, lbl_81694D50(r0)
|
||||
li r0, 0x8c
|
||||
li r3, 0x34
|
||||
lfs f0, lbl_81694D4C(r0)
|
||||
fmuls f1, f1, f31
|
||||
stb r0, 0x1c1(r30)
|
||||
stb r3, 0x1c0(r30)
|
||||
fadds f0, f0, f1
|
||||
stb r31, 0x1c2(r30)
|
||||
fctiwz f0, f0
|
||||
stfd f0, 8(r1)
|
||||
lwz r0, 0xc(r1)
|
||||
stb r0, 0x1c3(r30)
|
||||
b calc_L7
|
||||
calc_L4:
|
||||
lfs f1, 0x1ac(r30)
|
||||
lfs f5, lbl_81694D4C(r0)
|
||||
fcmpo cr0, f1, f5
|
||||
cror eq, lt, eq
|
||||
bne calc_L7
|
||||
lfs f2, lbl_81694D28(r0)
|
||||
lfs f3, lbl_81694D54(r0)
|
||||
fmr f4, f2
|
||||
lfs f6, lbl_81694D58(r0)
|
||||
fmr f7, f2
|
||||
bl hermiteInterporation__Q29textinput4utilFfffffff
|
||||
fctiwz f0, f1
|
||||
lfs f2, lbl_81694D28(r0)
|
||||
lfs f1, 0x1ac(r30)
|
||||
fmr f4, f2
|
||||
lfs f3, lbl_81694D5C(r0)
|
||||
stfd f0, 8(r1)
|
||||
fmr f7, f2
|
||||
lfs f5, lbl_81694D4C(r0)
|
||||
lwz r0, 0xc(r1)
|
||||
lfs f6, lbl_81694D60(r0)
|
||||
stb r0, 0x1c0(r30)
|
||||
bl hermiteInterporation__Q29textinput4utilFfffffff
|
||||
fctiwz f0, f1
|
||||
lfs f2, lbl_81694D28(r0)
|
||||
lfs f3, lbl_81694D64(r0)
|
||||
fmr f4, f2
|
||||
lfs f1, 0x1ac(r30)
|
||||
stfd f0, 0x10(r1)
|
||||
fmr f6, f3
|
||||
lfs f5, lbl_81694D4C(r0)
|
||||
lwz r0, 0x14(r1)
|
||||
fmr f7, f2
|
||||
stb r0, 0x1c1(r30)
|
||||
bl hermiteInterporation__Q29textinput4utilFfffffff
|
||||
fctiwz f1, f1
|
||||
lfs f2, sfColorPhase(r0)
|
||||
lfs f0, lbl_81694D40(r0)
|
||||
stfd f1, 0x18(r1)
|
||||
fmuls f1, f0, f2
|
||||
lwz r0, 0x1c(r1)
|
||||
stb r0, 0x1c2(r30)
|
||||
bl SinFIdx__Q24nw4r4mathFf
|
||||
lfs f2, lbl_81694D28(r0)
|
||||
fmr f31, f1
|
||||
lfs f3, lbl_81694D4C(r0)
|
||||
fmr f4, f2
|
||||
lfs f1, 0x1ac(r30)
|
||||
fmr f5, f3
|
||||
lfs f6, lbl_81694D44(r0)
|
||||
fmr f7, f2
|
||||
bl hermiteInterporation__Q29textinput4utilFfffffff
|
||||
lfs f0, lbl_81694D68(r0)
|
||||
fmuls f0, f0, f31
|
||||
fadds f0, f1, f0
|
||||
fctiwz f0, f0
|
||||
stfd f0, 0x20(r1)
|
||||
lwz r0, 0x24(r1)
|
||||
stb r0, 0x1c3(r30)
|
||||
calc_L7:
|
||||
lwz r3, 0x214(r30)
|
||||
lfs f1, sfColorPhase(r0)
|
||||
lfs f0, lbl_81694D58(r0)
|
||||
addi r0, r3, 8
|
||||
stw r0, 0x214(r30)
|
||||
fadds f0, f1, f0
|
||||
stfs f0, sfColorPhase(r0)
|
||||
psq_l f31, 0x38(r1), 0, 0
|
||||
lfd f31, 0x30(r1)
|
||||
lwz r31, 0x2c(r1)
|
||||
lwz r30, 0x28(r1)
|
||||
lwz r0, 0x44(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x40
|
||||
blr
|
||||
inline f32 nextColorPhase(f32 phase) { phase += 2.0f; return phase; }
|
||||
inline f32 colorSine(f32 phase) { return nw4r::math::SinFIdx(phase * 0.7111111f); }
|
||||
void Base::calc() {
|
||||
if (mScrollAnm.isActive()) {
|
||||
f32 scroll = mScrollAnm.getValue();
|
||||
mfScrollY = scroll;
|
||||
mfDrawScrollY = mfScrollY;
|
||||
}
|
||||
if (!mScrollAnm.isActive()) autoScroll();
|
||||
if (!mpString->isOnSustain()) mfSustainTimer = 1.0f + mfSustainTimer;
|
||||
mScrollAnm.calc();
|
||||
f32 wave = colorSine(sfColorPhase);
|
||||
mSelectedColor.r = 2;
|
||||
mSelectedColor.g = 90;
|
||||
mSelectedColor.b = 253;
|
||||
mSelectedColor.a = static_cast<u8>(150.0f + 30.0f * wave);
|
||||
if (mpString->isOnSustain()) {
|
||||
mSelectedColor.r = 52;
|
||||
mSelectedColor.g = 140;
|
||||
mSelectedColor.b = 253;
|
||||
mSelectedColor.a = static_cast<u8>(50.0f + 10.0f * wave);
|
||||
} else if (mfSustainTimer <= 50.0f) {
|
||||
mSelectedColor.r = static_cast<u8>(util::hermiteInterporation(mfSustainTimer, 0.0f, 52.0f, 0.0f, 50.0f, 2.0f, 0.0f));
|
||||
mSelectedColor.g = static_cast<u8>(util::hermiteInterporation(mfSustainTimer, 0.0f, 140.0f, 0.0f, 50.0f, 90.0f, 0.0f));
|
||||
u8 blue = static_cast<u8>(util::hermiteInterporation(mfSustainTimer, 0.0f, 253.0f, 0.0f, 50.0f, 253.0f, 0.0f));
|
||||
f32 phase = sfColorPhase;
|
||||
f32 angle = phase * 0.7111111f;
|
||||
mSelectedColor.b = blue;
|
||||
wave = nw4r::math::SinFIdx(angle);
|
||||
f32 alpha = util::hermiteInterporation(mfSustainTimer, 0.0f, 50.0f, 0.0f, 50.0f, 150.0f, 0.0f);
|
||||
mSelectedColor.a = static_cast<u8>(alpha + 20.0f * wave);
|
||||
}
|
||||
u32 cursorTimer = muCursorTimer + 8;
|
||||
f32 phase = sfColorPhase;
|
||||
muCursorTimer = cursorTimer;
|
||||
sfColorPhase = nextColorPhase(phase);
|
||||
}
|
||||
|
||||
Base::RowInfoManager::~RowInfoManager() {
|
||||
@@ -2824,49 +2688,29 @@ void tistring::Decolated::clear() {
|
||||
}
|
||||
|
||||
namespace inputform {
|
||||
extern "C" asm void init__Q49textinput9inputform4Base14RowInfoManagerFv() {
|
||||
nofralloc
|
||||
li r8, 0
|
||||
li r4, 0
|
||||
b init_RowInfo_L1
|
||||
init_RowInfo_L2:
|
||||
lwz r7, 0(r3)
|
||||
subi r5, r8, 1
|
||||
clrlslwi r6, r8, 16, 3
|
||||
addi r0, r8, 1
|
||||
sthux r5, r6, r7
|
||||
addi r8, r8, 1
|
||||
sth r0, 2(r6)
|
||||
sth r4, 4(r6)
|
||||
sth r4, 6(r6)
|
||||
init_RowInfo_L1:
|
||||
lhz r5, 4(r3)
|
||||
clrlwi r0, r8, 16
|
||||
cmplw r0, r5
|
||||
blt init_RowInfo_L2
|
||||
lhz r0, 4(r3)
|
||||
subi r5, r5, 1
|
||||
lwz r7, 0(r3)
|
||||
li r4, 0
|
||||
slwi r6, r0, 3
|
||||
clrlslwi r0, r5, 16, 3
|
||||
sthux r5, r6, r7
|
||||
sth r4, 2(r6)
|
||||
lwz r6, 0(r3)
|
||||
lhz r5, 4(r3)
|
||||
add r4, r6, r0
|
||||
sth r5, 2(r4)
|
||||
lhz r0, 4(r3)
|
||||
sth r0, 0(r6)
|
||||
lhz r5, 4(r3)
|
||||
lwz r4, 0(r3)
|
||||
addi r5, r5, 1
|
||||
clrlslwi r0, r5, 16, 3
|
||||
sthux r5, r4, r0
|
||||
lhz r3, 4(r3)
|
||||
addi r0, r3, 1
|
||||
sth r0, 2(r4)
|
||||
blr
|
||||
inline u16 initializeRowLinks(Base::Info_* const& rows, const u16& capacity) {
|
||||
for (u16 index = 0; index < capacity; ++index) {
|
||||
Base::Info_* row = &rows[index];
|
||||
row->Back = index - 1;
|
||||
row->Next = index + 1;
|
||||
row->StrCount = 0;
|
||||
row->DispRowCount = 0;
|
||||
}
|
||||
return capacity;
|
||||
}
|
||||
void Base::RowInfoManager::init() {
|
||||
u16 capacity = initializeRowLinks(mpInfo, mMaxLength);
|
||||
Info_* freeHead = &mpInfo[mMaxLength];
|
||||
u16 last = capacity - 1;
|
||||
freeHead->Back = last;
|
||||
freeHead->Next = 0;
|
||||
Info_* rows = mpInfo;
|
||||
rows[last].Next = mMaxLength;
|
||||
rows[0].Back = mMaxLength;
|
||||
u16 activeIndex = mMaxLength + 1;
|
||||
Info_* activeHead = &mpInfo[activeIndex];
|
||||
activeHead->Back = activeIndex;
|
||||
activeHead->Next = mMaxLength + 1;
|
||||
}
|
||||
nw4r::math::VEC2 LayoutByNW4R::getScale() const {
|
||||
return mpLayout->GetRootPane()->FindPaneByName(static_cast<const char*>(mpLayoutData), true)->GetScale();
|
||||
@@ -3205,8 +3049,8 @@ bool Base::onCursor(CursorPos* cursor) {
|
||||
glyph.rect.bottom = 0.0f;
|
||||
glyph.character = *predicted;
|
||||
calcRect(glyph);
|
||||
f32 width = glyph.rect.right - glyph.rect.left;
|
||||
f32 fieldWidth = mRect.right - mRect.left;
|
||||
f32 width = glyph.rect.GetWidth();
|
||||
f32 fieldWidth = mRect.GetWidth();
|
||||
f32 cursorX = GetCursorX();
|
||||
if (cursorX + width >= fieldWidth) doLineFeed();
|
||||
Print(*predicted);
|
||||
@@ -3249,9 +3093,7 @@ bool Base::onCursor(CursorPos* cursor) {
|
||||
marker.character = 0xE057;
|
||||
calcRect(space);
|
||||
calcRect(marker);
|
||||
f32 markerWidth = marker.rect.right - marker.rect.left;
|
||||
f32 spaceWidth = space.rect.right - space.rect.left;
|
||||
f32 offset = ((spaceWidth - markerWidth) * 0.5f) * getScale().x;
|
||||
f32 offset = ((space.rect.GetWidth() - marker.rect.GetWidth()) / 2.0f) * getScale().x;
|
||||
MoveCursorX(offset);
|
||||
Print(0xE057);
|
||||
MoveCursorX(offset);
|
||||
@@ -3544,7 +3386,7 @@ void Base::drawCursor(f32 x, f32 y) {
|
||||
f32 opacity = static_cast<u32>(muGlobalAlpha) / 255.0f;
|
||||
mfCursorX = x;
|
||||
mfCursorY = y;
|
||||
GXColor color = {lbl_81694D6C, lbl_81694D6D, lbl_81694D6E, lbl_81694D6F};
|
||||
GXColor color = {scInputFormColorRU8, scInputFormColorGU8, scInputFormColorBU8, scInputFormColorAU8};
|
||||
f32 pulse = nw4r::math::SinFIdx(0.7111111f * muCursorTimer);
|
||||
color.a = static_cast<s32>(opacity * (127.0f + 127.0f * pulse));
|
||||
f32 width = mfViewWidth - mfViewX;
|
||||
@@ -3628,7 +3470,7 @@ void NormalButtonAnmPane::onAnmEvent(AnmPaneEvent event) {
|
||||
changeAnimation(ANM_Pushed);
|
||||
}
|
||||
switch (meState) {
|
||||
case ANM_FocusOut:
|
||||
case ANM_FadeIn:
|
||||
if (event == PE_4) changeAnimation(ANM_Normal);
|
||||
if (event == PE_1) changeAnimation(ANM_FocusIn);
|
||||
break;
|
||||
@@ -3642,7 +3484,7 @@ void NormalButtonAnmPane::onAnmEvent(AnmPaneEvent event) {
|
||||
case ANM_RollOver:
|
||||
if (event == PE_2) changeAnimation(ANM_FocusOut);
|
||||
break;
|
||||
case ANM_FadeIn:
|
||||
case ANM_FocusOut:
|
||||
if (event == PE_4) changeAnimation(ANM_Normal);
|
||||
if (event == PE_1) changeAnimation(ANM_FocusIn);
|
||||
break;
|
||||
|
||||
@@ -312,6 +312,10 @@ void Manager::SetFont(nw4r::lyt::FontRefLink* link) {
|
||||
if (mpInputForm) mpInputForm->nw4r::ut::CharWriter::SetFont(*font);
|
||||
if (mpCellPhoneKeyboard) static_cast<nw4rmanager::Layout&>(*mpCellPhoneKeyboard).SetFontForce(font);
|
||||
}
|
||||
void* Manager::getPredictLanguageSelectDialog() { return mpPredictLanguageDialog; }
|
||||
const void* Manager::getPredictLanguageSelectDialog() const { return mpPredictLanguageDialog; }
|
||||
void* Manager::getSignKeyboard() { return mpSignWindow; }
|
||||
const void* Manager::getSignKeyboard() const { return mpSignWindow; }
|
||||
void Manager::setDefaultPredictionJP(int count, const char** predictions) {
|
||||
static_cast<tistring::WithAtok*>(getInputForm()->getAtokString())->setDefaultPrediction(count, predictions);
|
||||
}
|
||||
@@ -2539,11 +2539,14 @@ namespace textinput {
|
||||
u32 koreanCode = code;
|
||||
if (caps)
|
||||
koreanCode = util::reverseLetterCaseW(koreanCode);
|
||||
u16 mapped;
|
||||
if (koreanCode >= L'a' && koreanCode <= L'z')
|
||||
koreanCode = KOREAN_LOWER[static_cast<u16>(koreanCode) - L'a'];
|
||||
mapped = KOREAN_LOWER[static_cast<u16>(koreanCode) - L'a'];
|
||||
else if (koreanCode >= L'A' && koreanCode <= L'Z')
|
||||
koreanCode = KOREAN_UPPER[static_cast<u16>(koreanCode) - L'A'];
|
||||
code = koreanCode;
|
||||
mapped = KOREAN_UPPER[static_cast<u16>(koreanCode) - L'A'];
|
||||
else
|
||||
mapped = koreanCode;
|
||||
code = mapped;
|
||||
}
|
||||
}
|
||||
animation = searchAnmPane(code);
|
||||
|
||||
@@ -486,12 +486,12 @@ namespace ipl {
|
||||
|
||||
void BoardObject::stt_stand() {
|
||||
f32 degrees = mStandData.unk_0x0C * 30.0f + 30.0f;
|
||||
f32 dVar2 = nw4r::math::CosFIdx(degrees * 0.7111111f);
|
||||
f32 cosF = nw4r::math::CosFIdx(degrees * 0.7111111f);
|
||||
degrees = mStandData.unk_0x0C * 30.0f + 30.0f;
|
||||
f32 dVar3 = nw4r::math::SinFIdx(degrees * 0.7111111f);
|
||||
f32 sinF = nw4r::math::SinFIdx(degrees * 0.7111111f);
|
||||
|
||||
math::VEC2 standPos;
|
||||
__ct__Q33ipl4math4VEC2Fff(&standPos, dVar3 * 160.0f, dVar2 * 160.0f);
|
||||
__ct__Q33ipl4math4VEC2Fff(&standPos, sinF * 160.0f, cosF * 160.0f);
|
||||
mBoardPos = (((mStandData.pos * (f32)(10 - mStandData.unk_0x08)) + (standPos * mStandData.unk_0x08)) / 10.0f);
|
||||
|
||||
if ((mStandData.unk_0x08 += 1) > 10) {
|
||||
|
||||
@@ -312,8 +312,7 @@ namespace ipl {
|
||||
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata2"
|
||||
extern "C" const f32 lbl_816948EC = 0.0f;
|
||||
extern "C" const f32 lbl_816948F0;
|
||||
extern "C" const f32 scDateZeroF = 0.0f;
|
||||
#pragma pop
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -45,7 +45,7 @@ struct CardThreadState {
|
||||
|
||||
MEMAllocator sAllocator_;
|
||||
static CardThreadState* sThread;
|
||||
extern "C" void* CardSequence_813D2C8C();
|
||||
extern "C" void* cardThreadMain();
|
||||
static char sCardSlotName[3] = "AB";
|
||||
|
||||
FileInfo* getCardDirState() {
|
||||
@@ -68,7 +68,7 @@ long getCardLastCMDFCmdResult() {
|
||||
return sThread->completionResult;
|
||||
}
|
||||
|
||||
extern "C" s32 CardSequence_813D205C(u8 slot) {
|
||||
extern "C" s32 sendCardUnmountCmd(u8 slot) {
|
||||
sThread->sourceSlot = slot;
|
||||
sThread->lastCommand = 9;
|
||||
sThread->lastResult = -21;
|
||||
@@ -114,12 +114,12 @@ void sendCardDeleteCmd(u8 slot, s16 fileNo) {
|
||||
}
|
||||
|
||||
void sendCardThreadStopCmd() NO_INLINE {
|
||||
CardSequence_813D205C(0);
|
||||
CardSequence_813D205C(1);
|
||||
sendCardUnmountCmd(0);
|
||||
sendCardUnmountCmd(1);
|
||||
OSSendMessage(&sThread->requests, (OSMessage)0xB, 0);
|
||||
}
|
||||
|
||||
extern "C" void CardSequence_813D222C(u8 slot) {
|
||||
extern "C" void pollCardSlot(u8 slot) {
|
||||
s32 result;
|
||||
|
||||
if (sThread->valid == 1) {
|
||||
@@ -139,7 +139,7 @@ extern "C" void CardSequence_813D222C(u8 slot) {
|
||||
}
|
||||
}
|
||||
if (result == 0) {
|
||||
if (sThread->slots[slot].state > 2 && CardSequence_813D205C(slot)) {
|
||||
if (sThread->slots[slot].state > 2 && sendCardUnmountCmd(slot)) {
|
||||
sThread->slots[slot].changed = 0;
|
||||
}
|
||||
}
|
||||
@@ -148,7 +148,7 @@ done:
|
||||
return;
|
||||
}
|
||||
|
||||
extern "C" s32 CardSequence_813D233C(s32 result) {
|
||||
extern "C" s32 mapCardErrorCode(s32 result) {
|
||||
switch (result) {
|
||||
case 0:
|
||||
return 0;
|
||||
@@ -186,8 +186,8 @@ extern "C" s32 CardSequence_813D233C(s32 result) {
|
||||
void probeCard() {
|
||||
OSMessage message;
|
||||
|
||||
CardSequence_813D222C(0);
|
||||
CardSequence_813D222C(1);
|
||||
pollCardSlot(0);
|
||||
pollCardSlot(1);
|
||||
while (OSReceiveMessage(&sThread->responses, &message, 0)) {
|
||||
s16 slot = (s16)(((u32)message >> 16) & 1);
|
||||
s8 command = (u8)(u32)message;
|
||||
@@ -251,9 +251,9 @@ checkCommand:
|
||||
break;
|
||||
}
|
||||
|
||||
sThread->lastResult = CardSequence_813D233C((s8)(((u32)message << 16) >> 24));
|
||||
sThread->lastResult = mapCardErrorCode((s8)(((u32)message << 16) >> 24));
|
||||
if ((s8)(u8)(u32)message != 0 && (s8)(u8)(u32)message != 9) {
|
||||
sThread->completionResult = CardSequence_813D233C((s8)(((u32)message << 16) >> 24));
|
||||
sThread->completionResult = mapCardErrorCode((s8)(((u32)message << 16) >> 24));
|
||||
if (sThread->sourceSlot != (s16)(((u32)message >> 16) & 1)) {
|
||||
sThread->destinationFileNo = (u32)message >> 24;
|
||||
}
|
||||
@@ -302,7 +302,7 @@ void initCardThread() {
|
||||
|
||||
OSInitMessageQueue(&sThread->responses, sThread->responseMessages, 0x10);
|
||||
OSInitMessageQueue(&sThread->requests, sThread->requestMessages, 0x10);
|
||||
OSCreateThread(&sThread->thread, (void* (*)(void*))CardSequence_813D2C8C, 0,
|
||||
OSCreateThread(&sThread->thread, (void* (*)(void*))cardThreadMain, 0,
|
||||
sThread->stack + sizeof(sThread->stack), 0x8000, 0x11, 0);
|
||||
OSResumeThread(&sThread->thread);
|
||||
OSSendMessage(&sThread->requests, (OSMessage)10, 0);
|
||||
@@ -348,7 +348,7 @@ const char* getIconComment(u8 slot, s16 index) {
|
||||
return sThread->comments[slot][index];
|
||||
}
|
||||
|
||||
extern "C" void CardSequence_813D2A74(s32 slot, s32 index) {
|
||||
extern "C" void clearCardFileEntry(s32 slot, s32 index) {
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
sThread->files[slot][index].fileNo = 0;
|
||||
sThread->files[slot][index].size = 0;
|
||||
@@ -360,7 +360,7 @@ extern "C" void CardSequence_813D2A74(s32 slot, s32 index) {
|
||||
OSRestoreInterrupts(interrupts);
|
||||
}
|
||||
|
||||
extern "C" void CardSequence_813D2B40(s32 slot) {
|
||||
extern "C" void refreshCardSlotInfo(s32 slot) {
|
||||
u16 memSize;
|
||||
u32 sectorSize;
|
||||
s32 freeBytes;
|
||||
@@ -391,12 +391,12 @@ extern "C" void CardSequence_813D2B40(s32 slot) {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" s32 CardSequence_813D320C(s32 slot, s32 result);
|
||||
extern "C" s32 CardSequence_813D32A8(s32 slot, s32 state, s32 result);
|
||||
extern "C" void CardSequence_813D3380(s32 slot, s32 state, s32 fileNo);
|
||||
extern "C" void CardSequence_813D33D8(s32 slot);
|
||||
extern "C" s32 CardSequence_813D3424(s32 slot, s32 fileNo, CARDDir* dir);
|
||||
extern "C" void CardSequence_813D3D14(s32 slot, s16 fileNo, s32 command);
|
||||
extern "C" s32 handleCardMountResult(s32 slot, s32 result);
|
||||
extern "C" s32 reportCardThreadError(s32 slot, s32 state, s32 result);
|
||||
extern "C" void sendCardSlotState(s32 slot, s32 state, s32 fileNo);
|
||||
extern "C" void clearAllCardFileEntries(s32 slot);
|
||||
extern "C" s32 loadCardFileIcons(s32 slot, s32 fileNo, CARDDir* dir);
|
||||
extern "C" void runCardMoveOrCopy(s32 slot, s16 fileNo, s32 command);
|
||||
|
||||
static inline void sendValidityResponse(u32 command, u32 valid) {
|
||||
union {
|
||||
@@ -408,7 +408,7 @@ static inline void sendValidityResponse(u32 command, u32 valid) {
|
||||
OSSendMessage(&sThread->responses, (OSMessage)reply.value, 1);
|
||||
}
|
||||
|
||||
extern "C" void* CardSequence_813D2C8C() {
|
||||
extern "C" void* cardThreadMain() {
|
||||
struct CardThreadLocals {
|
||||
u8 compareName[6];
|
||||
u32 message;
|
||||
@@ -455,7 +455,7 @@ loopStart:
|
||||
command = (local.message >> 14) & 4;
|
||||
result = CARDMount(slot, sThread->mountBuffers[command / 4], 0);
|
||||
if (result < 0) {
|
||||
result = CardSequence_813D320C(slot, result);
|
||||
result = handleCardMountResult(slot, result);
|
||||
if (result != 0) {
|
||||
goto mountContinue;
|
||||
}
|
||||
@@ -467,11 +467,11 @@ loopStart:
|
||||
}
|
||||
|
||||
mountContinue:
|
||||
CardSequence_813D33D8(slot);
|
||||
clearAllCardFileEntries(slot);
|
||||
for (file = 0; file < 0x7F; ++file) {
|
||||
result = __CARDGetStatusEx(slot, (s16)file, &local.mountDir);
|
||||
if (result < 0) {
|
||||
result = CardSequence_813D320C(slot, result);
|
||||
result = handleCardMountResult(slot, result);
|
||||
if (result != 0) {
|
||||
continue;
|
||||
}
|
||||
@@ -496,16 +496,16 @@ loopStart:
|
||||
goto mountError;
|
||||
}
|
||||
} else {
|
||||
result = CardSequence_813D3424(slot, (s16)file, &local.mountDir);
|
||||
result = loadCardFileIcons(slot, (s16)file, &local.mountDir);
|
||||
if (result < 0) {
|
||||
goto mountError;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
CardSequence_813D2B40(slot);
|
||||
refreshCardSlotInfo(slot);
|
||||
sThread->mounted[command / 4] = 1;
|
||||
CardSequence_813D3380(slot, 0, 0);
|
||||
sendCardSlotState(slot, 0, 0);
|
||||
OSReport("Slot %c\n", sCardSlotName[slot]);
|
||||
for (listingFile = 0; listingFile < 0x7F; ++listingFile) {
|
||||
if (__CARDGetStatusEx(slot, (u16)listingFile, &local.listingDir) == 0) {
|
||||
@@ -519,30 +519,30 @@ loopStart:
|
||||
|
||||
mountError:
|
||||
OSReport("MountError\n");
|
||||
CardSequence_813D32A8(slot, 0, result);
|
||||
reportCardThreadError(slot, 0, result);
|
||||
break;
|
||||
}
|
||||
case 9:
|
||||
CardSequence_813D32A8((local.message >> 16) & 1, 9, -3);
|
||||
reportCardThreadError((local.message >> 16) & 1, 9, -3);
|
||||
break;
|
||||
case 1: {
|
||||
slot = (local.message >> 16) & 1;
|
||||
result = CARDFormat(slot);
|
||||
if (result < 0) {
|
||||
CardSequence_813D32A8(slot, 1, result);
|
||||
reportCardThreadError(slot, 1, result);
|
||||
} else {
|
||||
sThread->mounted[slot] = 1;
|
||||
CardSequence_813D2B40(slot);
|
||||
CardSequence_813D3380(slot, 1, 0);
|
||||
refreshCardSlotInfo(slot);
|
||||
sendCardSlotState(slot, 1, 0);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
CardSequence_813D3D14((local.message >> 16) & 1,
|
||||
runCardMoveOrCopy((local.message >> 16) & 1,
|
||||
(s16)(u8)(local.message >> 24), (s8)command);
|
||||
break;
|
||||
case 3:
|
||||
CardSequence_813D3D14((local.message >> 16) & 1,
|
||||
runCardMoveOrCopy((local.message >> 16) & 1,
|
||||
(s16)(u8)(local.message >> 24), (s8)command);
|
||||
break;
|
||||
case 4: {
|
||||
@@ -550,11 +550,11 @@ loopStart:
|
||||
fileNo = (s16)(local.message >> 24);
|
||||
result = CARDFastDelete(slot, fileNo);
|
||||
if (result < 0) {
|
||||
CardSequence_813D32A8(slot, 4, result);
|
||||
reportCardThreadError(slot, 4, result);
|
||||
} else {
|
||||
CardSequence_813D2A74(slot, fileNo);
|
||||
CardSequence_813D2B40(slot);
|
||||
CardSequence_813D3380(slot, 4, (u8)fileNo);
|
||||
clearCardFileEntry(slot, fileNo);
|
||||
refreshCardSlotInfo(slot);
|
||||
sendCardSlotState(slot, 4, (u8)fileNo);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -581,7 +581,7 @@ loopStart:
|
||||
++outerSlot;
|
||||
|
||||
} while (outerSlot < 2);
|
||||
CardSequence_813D3380(0, 0xC, 0);
|
||||
sendCardSlotState(0, 0xC, 0);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -593,9 +593,9 @@ loopCheck:
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern "C" s32 CardSequence_813D3C38(s32 slot, s16 fileNo);
|
||||
extern "C" s32 checkCardFileDuplicate(s32 slot, s16 fileNo);
|
||||
|
||||
extern "C" void CardSequence_813D3140() {
|
||||
extern "C" void markAllCardFilesDirty() {
|
||||
u32 slot = 0;
|
||||
s32 fileNo;
|
||||
|
||||
@@ -607,7 +607,7 @@ extern "C" void CardSequence_813D3140() {
|
||||
sThread->files[slot][fileNo].unk_0x06 = 0;
|
||||
if (sThread->mounted[slot] != 0 &&
|
||||
sThread->mounted[slot ^ 1] != 0 &&
|
||||
CardSequence_813D3C38((u8)slot, (s16)fileNo) < 0) {
|
||||
checkCardFileDuplicate((u8)slot, (s16)fileNo) < 0) {
|
||||
sThread->files[slot][fileNo].unk_0x06 = flagValue;
|
||||
}
|
||||
++fileNo;
|
||||
@@ -618,7 +618,7 @@ extern "C" void CardSequence_813D3140() {
|
||||
} while ((s32)slot < 2);
|
||||
}
|
||||
|
||||
extern "C" s32 CardSequence_813D320C(s32 slot, s32 result) {
|
||||
extern "C" s32 handleCardMountResult(s32 slot, s32 result) {
|
||||
if (result == -5) {
|
||||
goto reportError;
|
||||
}
|
||||
@@ -640,32 +640,32 @@ repairedCard:
|
||||
{
|
||||
result = CARDCheck(slot);
|
||||
if (result < 0) {
|
||||
return CardSequence_813D32A8(slot, 0, result);
|
||||
return reportCardThreadError(slot, 0, result);
|
||||
}
|
||||
OSReport("CardThread:Broken Card Repaired\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
reportError:
|
||||
return CardSequence_813D32A8(slot, 0, result);
|
||||
return reportCardThreadError(slot, 0, result);
|
||||
}
|
||||
|
||||
extern "C" s32 CardSequence_813D32A8(s32 slot, s32 state, s32 result) {
|
||||
extern "C" s32 reportCardThreadError(s32 slot, s32 state, s32 result) {
|
||||
if (result != -7 && result != -27 && result != -8 && result != -9 &&
|
||||
(CardSequence_813D33D8(slot), result != -6) && result != -13) {
|
||||
(clearAllCardFileEntries(slot), result != -6) && result != -13) {
|
||||
OSReport("DEBUG: UnmountCard %d \n", slot);
|
||||
CARDUnmount(slot);
|
||||
sThread->mounted[slot & 0xFF] = 0;
|
||||
}
|
||||
OSReport("DEBUG: CardThread error %d %d\n", state, result);
|
||||
CardSequence_813D3140();
|
||||
markAllCardFilesDirty();
|
||||
OSSendMessage(&sThread->responses,
|
||||
(OSMessage)(((slot & 1) << 16) | ((result & 0xFF) << 8) | (state & 0xFF)), 1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern "C" void CardSequence_813D3380(s32 slot, s32 state, s32 fileNo) {
|
||||
CardSequence_813D3140();
|
||||
extern "C" void sendCardSlotState(s32 slot, s32 state, s32 fileNo) {
|
||||
markAllCardFilesDirty();
|
||||
OSMessageQueue* queue = &sThread->responses;
|
||||
union CardThreadMessage {
|
||||
u32 value;
|
||||
@@ -683,15 +683,15 @@ extern "C" void CardSequence_813D3380(s32 slot, s32 state, s32 fileNo) {
|
||||
OSSendMessage(queue, (OSMessage)message.value, 1);
|
||||
}
|
||||
|
||||
extern "C" void CardSequence_813D33D8(s32 slot) {
|
||||
extern "C" void clearAllCardFileEntries(s32 slot) {
|
||||
s32 file = 0;
|
||||
do {
|
||||
CardSequence_813D2A74(slot, (s16)file);
|
||||
clearCardFileEntry(slot, (s16)file);
|
||||
file = file + 1;
|
||||
} while (file < 0x7F);
|
||||
}
|
||||
|
||||
extern "C" s32 CardSequence_813D3424(s32 slot, s32 fileNo, CARDDir* dir) {
|
||||
extern "C" s32 loadCardFileIcons(s32 slot, s32 fileNo, CARDDir* dir) {
|
||||
struct CardSequenceFileData {
|
||||
s32 commentSectorSize;
|
||||
s32 sectorSize;
|
||||
@@ -922,11 +922,11 @@ closeFileSuccess:
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern "C" void CardSequence_813D3C24(s32, s32) {
|
||||
extern "C" void clearCardWritePending(s32, s32) {
|
||||
sThread->writePending = 0;
|
||||
}
|
||||
|
||||
extern "C" s32 CardSequence_813D3C38(s32 slot, s16 fileNo) {
|
||||
extern "C" s32 checkCardFileDuplicate(s32 slot, s16 fileNo) {
|
||||
CARDDir sourceDir;
|
||||
CARDDir otherDir;
|
||||
s32 result = __CARDGetStatusEx(slot, fileNo, &sourceDir);
|
||||
@@ -950,7 +950,7 @@ extern "C" s32 CardSequence_813D3C38(s32 slot, s16 fileNo) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern "C" void CardSequence_813D3D14(s32 slot, s16 fileNo, s32 command) {
|
||||
extern "C" void runCardMoveOrCopy(s32 slot, s16 fileNo, s32 command) {
|
||||
CARDDir createStatus;
|
||||
CARDDir checkedStatus;
|
||||
CARDDir ioStatus;
|
||||
@@ -970,10 +970,10 @@ extern "C" void CardSequence_813D3D14(s32 slot, s16 fileNo, s32 command) {
|
||||
s32 statusResult;
|
||||
s32 stage;
|
||||
|
||||
result = CardSequence_813D3C38(slot, fileNo);
|
||||
result = checkCardFileDuplicate(slot, fileNo);
|
||||
|
||||
if (result < 0) {
|
||||
CardSequence_813D32A8(slot, command, result);
|
||||
reportCardThreadError(slot, command, result);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
@@ -999,7 +999,7 @@ sectorSizeCheck:
|
||||
goto sectorSizeDone;
|
||||
}
|
||||
sectorSizeError:
|
||||
CardSequence_813D32A8(slot, command, sectorError);
|
||||
reportCardThreadError(slot, command, sectorError);
|
||||
goto finish;
|
||||
sectorSizeDone:
|
||||
;
|
||||
@@ -1023,7 +1023,7 @@ sectorSizeDone:
|
||||
result = CARDGetResultCode(slot);
|
||||
}
|
||||
if (result < 0) {
|
||||
CardSequence_813D32A8(slot, command, result);
|
||||
reportCardThreadError(slot, command, result);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
@@ -1056,7 +1056,7 @@ createDone:
|
||||
;
|
||||
}
|
||||
if (destinationFileNo < 0) {
|
||||
CardSequence_813D32A8(destinationSlot, command, destinationFileNo);
|
||||
reportCardThreadError(destinationSlot, command, destinationFileNo);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
@@ -1099,7 +1099,7 @@ createDone:
|
||||
sThread->writePending = 1;
|
||||
ioResult = CARDWriteAsync(&sThread->destinationFile,
|
||||
sThread->transferBuffer, size, offset,
|
||||
CardSequence_813D3C24);
|
||||
clearCardWritePending);
|
||||
if (ioResult < 0) {
|
||||
goto copyIoFailure;
|
||||
}
|
||||
@@ -1176,7 +1176,7 @@ copyIoDone:
|
||||
}
|
||||
} else {
|
||||
metadataCopied = TRUE;
|
||||
result = CardSequence_813D3424(destinationSlot, destinationFileNo,
|
||||
result = loadCardFileIcons(destinationSlot, destinationFileNo,
|
||||
&sourceStatus);
|
||||
if (result < 0) {
|
||||
OSReport("Can't read icon for move dstfile\n");
|
||||
@@ -1214,7 +1214,7 @@ copyIoDone:
|
||||
s32 setResult = result;
|
||||
if (result == -3) {
|
||||
CARDFastDelete(slot, fileNo);
|
||||
CardSequence_813D2A74(slot, fileNo);
|
||||
clearCardFileEntry(slot, fileNo);
|
||||
} else {
|
||||
s32 restoreResult = __CARDSetStatusEx(slot, fileNo, &moveStatus);
|
||||
if (restoreResult < 0) {
|
||||
@@ -1227,13 +1227,13 @@ copyIoDone:
|
||||
stage = 3;
|
||||
result = CARDFastDelete(slot, fileNo);
|
||||
if (result >= 0) {
|
||||
CardSequence_813D2A74(slot, fileNo);
|
||||
clearCardFileEntry(slot, fileNo);
|
||||
stage = 4;
|
||||
result = __CARDGetStatusEx(destinationSlot,
|
||||
destinationFileNo, &moveStatus);
|
||||
if (result >= 0) {
|
||||
stage = 5;
|
||||
if ((result = CardSequence_813D3424(
|
||||
if ((result = loadCardFileIcons(
|
||||
destinationSlot, destinationFileNo, &moveStatus)) < 0) {
|
||||
goto moveStatusError;
|
||||
}
|
||||
@@ -1270,10 +1270,10 @@ moveStatusDone:
|
||||
}
|
||||
|
||||
if (result >= 0) {
|
||||
CardSequence_813D2B40(slot);
|
||||
CardSequence_813D2B40(destinationSlot);
|
||||
CardSequence_813D3380(slot, 0, fileNo & 0xFF);
|
||||
CardSequence_813D3380(destinationSlot, command, destinationFileNo & 0xFF);
|
||||
refreshCardSlotInfo(slot);
|
||||
refreshCardSlotInfo(destinationSlot);
|
||||
sendCardSlotState(slot, 0, fileNo & 0xFF);
|
||||
sendCardSlotState(destinationSlot, command, destinationFileNo & 0xFF);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
@@ -1281,7 +1281,7 @@ cleanup:
|
||||
destinationSlot = slot ^ 1;
|
||||
result = CARDGetResultCode(destinationSlot);
|
||||
if (result < 0) {
|
||||
CardSequence_813D32A8(destinationSlot, command, result);
|
||||
reportCardThreadError(destinationSlot, command, result);
|
||||
} else {
|
||||
if (temporaryCreated && !metadataCopied) {
|
||||
CARDFastDelete(destinationSlot, destinationFileNo);
|
||||
@@ -1289,18 +1289,18 @@ cleanup:
|
||||
if (metadataCopied) {
|
||||
if (__CARDGetStatusEx(destinationSlot, destinationFileNo,
|
||||
&createStatus) == 0) {
|
||||
CardSequence_813D3424(destinationSlot, destinationFileNo, &createStatus);
|
||||
loadCardFileIcons(destinationSlot, destinationFileNo, &createStatus);
|
||||
}
|
||||
}
|
||||
CardSequence_813D2B40(destinationSlot);
|
||||
CardSequence_813D3380(destinationSlot, 0, fileNo & 0xFF);
|
||||
refreshCardSlotInfo(destinationSlot);
|
||||
sendCardSlotState(destinationSlot, 0, fileNo & 0xFF);
|
||||
}
|
||||
result = CARDGetResultCode(slot);
|
||||
if (result < 0) {
|
||||
CardSequence_813D32A8(slot, command, result);
|
||||
reportCardThreadError(slot, command, result);
|
||||
} else {
|
||||
CardSequence_813D2B40(slot);
|
||||
CardSequence_813D3380(slot, 0, fileNo & 0xFF);
|
||||
refreshCardSlotInfo(slot);
|
||||
sendCardSlotState(slot, 0, fileNo & 0xFF);
|
||||
}
|
||||
|
||||
finish:
|
||||
|
||||
@@ -4,27 +4,27 @@
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8164D108[] = "it_ObjChannelEdit_b_SaveDataIn.brlan";
|
||||
extern "C" const char lbl_8164D12D[] = "it_ObjChannelEdit_b_SaveDataOut.brlan";
|
||||
extern "C" const char lbl_8164D153[] = "it_ObjChannelEdit_b_SaveDataFoucusIn.brlan";
|
||||
extern "C" const char lbl_8164D17E[] = "it_ObjChannelEdit_b_SaveDataFoucusOut.brlan";
|
||||
extern "C" const char lbl_8164D1AA[] = "N_Data16x9";
|
||||
extern "C" const char lbl_8164D1B5[] = "N_Data4x3";
|
||||
extern "C" const char lbl_8164D1BF[] = "B_Data_01";
|
||||
extern "C" const char lbl_8164D1C9[] = "B_Data_00";
|
||||
extern "C" const char lbl_8164D1D3[] = "N_Atari16x9";
|
||||
extern "C" const char lbl_8164D1DF[] = "N_Data_01";
|
||||
extern "C" const char lbl_8164D1E9[] = "N_Atari4x3";
|
||||
extern "C" const char lbl_8164D1F4[] = "N_Data_00";
|
||||
extern "C" const char lbl_8164D1FE[] = "DataBaseCover_00";
|
||||
extern "C" const char lbl_8164D20F[] = "DataBaseCover_01";
|
||||
extern "C" const char scBrlan_SaveDataIn[] = "it_ObjChannelEdit_b_SaveDataIn.brlan";
|
||||
extern "C" const char scBrlan_SaveDataOut[] = "it_ObjChannelEdit_b_SaveDataOut.brlan";
|
||||
extern "C" const char scBrlan_SaveDataFocusIn[] = "it_ObjChannelEdit_b_SaveDataFoucusIn.brlan";
|
||||
extern "C" const char scBrlan_SaveDataFocusOut[] = "it_ObjChannelEdit_b_SaveDataFoucusOut.brlan";
|
||||
extern "C" const char scPaneName_N_Data16x9[] = "N_Data16x9";
|
||||
extern "C" const char scPaneName_N_Data4x3[] = "N_Data4x3";
|
||||
extern "C" const char scPaneName_B_Data_01[] = "B_Data_01";
|
||||
extern "C" const char scPaneName_B_Data_00[] = "B_Data_00";
|
||||
extern "C" const char scPaneName_N_Atari16x9[] = "N_Atari16x9";
|
||||
extern "C" const char scPaneName_N_Data_01[] = "N_Data_01";
|
||||
extern "C" const char scPaneName_N_Atari4x3[] = "N_Atari4x3";
|
||||
extern "C" const char scPaneName_N_Data_00[] = "N_Data_00";
|
||||
extern "C" const char scPaneName_DataBaseCover_00[] = "DataBaseCover_00";
|
||||
extern "C" const char scPaneName_DataBaseCover_01[] = "DataBaseCover_01";
|
||||
#pragma section const_type ".sdata"
|
||||
extern "C" __declspec(section ".sdata") const char lbl_81696848[] = "G_Data";
|
||||
extern "C" __declspec(section ".sdata") const wchar_t lbl_81696850[] = L"???";
|
||||
extern "C" __declspec(section ".sdata") const char scGroup_G_Data[] = "G_Data";
|
||||
extern "C" __declspec(section ".sdata") const wchar_t scUnknownWstr[] = L"???";
|
||||
#pragma section sconst_type ".sdata2"
|
||||
extern "C" __declspec(section ".sdata2") const f32 lbl_81694900 = 0.5f;
|
||||
extern "C" __declspec(section ".sdata2") const f32 lbl_81694904 = 2.0f;
|
||||
extern "C" __declspec(section ".sdata2") const f64 lbl_81694908 = 4503599627370496.0;
|
||||
extern "C" __declspec(section ".sdata2") const f32 scHalfF = 0.5f;
|
||||
extern "C" __declspec(section ".sdata2") const f32 scTwoF = 2.0f;
|
||||
extern "C" __declspec(section ".sdata2") const f64 scF2IBias = 4503599627370496.0;
|
||||
#pragma pop
|
||||
|
||||
namespace ipl {
|
||||
@@ -33,26 +33,26 @@ namespace ipl {
|
||||
: AnmController(heap), ::gui::EventHandler(), mState(STATE_HIDDEN), mpThumbnail(NULL), mpBalloon(NULL), mbInitBalloon(false) {
|
||||
mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName);
|
||||
|
||||
add_animation(lbl_8164D108, lbl_81696848);
|
||||
add_animation(lbl_8164D12D, lbl_81696848);
|
||||
add_animation(lbl_8164D153, lbl_81696848);
|
||||
add_animation(lbl_8164D17E, lbl_81696848);
|
||||
add_animation(scBrlan_SaveDataIn, scGroup_G_Data);
|
||||
add_animation(scBrlan_SaveDataOut, scGroup_G_Data);
|
||||
add_animation(scBrlan_SaveDataFocusIn, scGroup_G_Data);
|
||||
add_animation(scBrlan_SaveDataFocusOut, scGroup_G_Data);
|
||||
|
||||
mpLayout->finishBinding();
|
||||
|
||||
set_visible(lbl_8164D1AA, false);
|
||||
set_visible(lbl_8164D1B5, false);
|
||||
set_visible(scPaneName_N_Data16x9, false);
|
||||
set_visible(scPaneName_N_Data4x3, false);
|
||||
|
||||
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true);
|
||||
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
|
||||
mpGui->setAllComponentTriggerTarget(false);
|
||||
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_8164D1BF), true);
|
||||
add_anmpane(lbl_8164D1BF, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scPaneName_B_Data_01), true);
|
||||
add_anmpane(scPaneName_B_Data_01, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
|
||||
} else {
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_8164D1C9), true);
|
||||
add_anmpane(lbl_8164D1C9, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scPaneName_B_Data_00), true);
|
||||
add_anmpane(scPaneName_B_Data_00, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,11 +92,11 @@ namespace ipl {
|
||||
|
||||
nw4r::math::VEC2 scale = mpThumbnail->getLytObj()->GetRootPane()->GetScale();
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
scale *= get_scale(lbl_8164D1D3).x;
|
||||
scale *= get_scale(lbl_8164D1DF).x;
|
||||
scale *= get_scale(scPaneName_N_Atari16x9).x;
|
||||
scale *= get_scale(scPaneName_N_Data_01).x;
|
||||
} else {
|
||||
scale *= get_scale(lbl_8164D1E9).x;
|
||||
scale *= get_scale(lbl_8164D1F4).x;
|
||||
scale *= get_scale(scPaneName_N_Atari4x3).x;
|
||||
scale *= get_scale(scPaneName_N_Data_00).x;
|
||||
}
|
||||
mpThumbnail->getLytObj()->GetRootPane()->SetScale(scale);
|
||||
}
|
||||
@@ -127,8 +127,8 @@ namespace ipl {
|
||||
return;
|
||||
mpLayout->draw();
|
||||
|
||||
set_visible(lbl_8164D1FE, false);
|
||||
set_visible(lbl_8164D20F, false);
|
||||
set_visible(scPaneName_DataBaseCover_00, false);
|
||||
set_visible(scPaneName_DataBaseCover_01, false);
|
||||
|
||||
ChannelEdit* sceneChannelEdit = get_channel_edit();
|
||||
if (sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_R || sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_L)
|
||||
@@ -138,7 +138,7 @@ namespace ipl {
|
||||
if (mState == STATE_FADE_OUT)
|
||||
return;
|
||||
|
||||
if (!get_visible(lbl_8164D1B5) && !get_visible(lbl_8164D1AA))
|
||||
if (!get_visible(scPaneName_N_Data4x3) && !get_visible(scPaneName_N_Data16x9))
|
||||
return;
|
||||
|
||||
if (mpThumbnail == NULL) {
|
||||
@@ -171,11 +171,11 @@ namespace ipl {
|
||||
mpThumbnail->draw();
|
||||
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
set_visible(lbl_8164D20F, true);
|
||||
mpLayout->draw(lbl_8164D20F);
|
||||
set_visible(scPaneName_DataBaseCover_01, true);
|
||||
mpLayout->draw(scPaneName_DataBaseCover_01);
|
||||
} else {
|
||||
set_visible(lbl_8164D1FE, true);
|
||||
mpLayout->draw(lbl_8164D1FE);
|
||||
set_visible(scPaneName_DataBaseCover_00, true);
|
||||
mpLayout->draw(scPaneName_DataBaseCover_00);
|
||||
}
|
||||
|
||||
GXSetScissor(0, 0, System::getRenderModeObj()->fbWidth, System::getRenderModeObj()->efbHeight);
|
||||
@@ -187,11 +187,11 @@ namespace ipl {
|
||||
|
||||
void ChanAppBox::anmFadein() {
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
set_visible(lbl_8164D1AA, true);
|
||||
set_visible(lbl_8164D1B5, false);
|
||||
set_visible(scPaneName_N_Data16x9, true);
|
||||
set_visible(scPaneName_N_Data4x3, false);
|
||||
} else {
|
||||
set_visible(lbl_8164D1AA, false);
|
||||
set_visible(lbl_8164D1B5, true);
|
||||
set_visible(scPaneName_N_Data16x9, false);
|
||||
set_visible(scPaneName_N_Data4x3, true);
|
||||
}
|
||||
do_animation(ANIM_DATA_IN, ANIM_TYPE_FORWARD, true);
|
||||
mState = STATE_FADE_IN;
|
||||
@@ -226,7 +226,7 @@ namespace ipl {
|
||||
|
||||
mbInitBalloon = true;
|
||||
if (mpThumbnail->getIsCorrupt()) {
|
||||
mpBalloon->init(lbl_81696850);
|
||||
mpBalloon->init(scUnknownWstr);
|
||||
} else {
|
||||
if (mpThumbnail->getMatchesTmpTitle()) {
|
||||
mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
|
||||
@@ -251,7 +251,7 @@ namespace ipl {
|
||||
|
||||
mbInitBalloon = true;
|
||||
if (mpThumbnail->getIsCorrupt()) {
|
||||
mpBalloon->init(lbl_81696850);
|
||||
mpBalloon->init(scUnknownWstr);
|
||||
} else {
|
||||
if (mpThumbnail->getMatchesTmpTitle()) {
|
||||
mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
|
||||
@@ -297,9 +297,9 @@ namespace ipl {
|
||||
|
||||
void ChanAppBox::clearEvent() {
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
clear_anmpane(lbl_8164D1BF);
|
||||
clear_anmpane(scPaneName_B_Data_01);
|
||||
} else {
|
||||
clear_anmpane(lbl_8164D1C9);
|
||||
clear_anmpane(scPaneName_B_Data_00);
|
||||
}
|
||||
|
||||
if (mpBalloon != NULL) {
|
||||
@@ -314,8 +314,8 @@ namespace ipl {
|
||||
|
||||
WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadein, ANIM_DATA_IN, mState = STATE_IDLE);
|
||||
WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadeout, ANIM_DATA_OUT, {
|
||||
set_visible(lbl_8164D1AA, false);
|
||||
set_visible(lbl_8164D1B5, false);
|
||||
set_visible(scPaneName_N_Data16x9, false);
|
||||
set_visible(scPaneName_N_Data4x3, false);
|
||||
mState = STATE_IDLE;
|
||||
});
|
||||
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
// clang-format off
|
||||
extern "C" char lbl_8164E290[] = "Cursur_a";
|
||||
extern "C" char scCursur_a[] = "Cursur_a";
|
||||
|
||||
static const char* scCursur = lbl_8164E290;
|
||||
static const char* scCursur = scCursur_a;
|
||||
|
||||
static const char* scCursorAnims[] = {
|
||||
"my_IplTop_d_FocusOff.brlan",
|
||||
@@ -20,10 +20,10 @@ namespace ipl {
|
||||
"my_IplTop_d_Select.brlan",
|
||||
};
|
||||
|
||||
extern "C" const char* lbl_8169699C = "T_Balloon";
|
||||
extern "C" const char* scPaneName_T_Balloon = "T_Balloon";
|
||||
|
||||
extern "C" const char* lbl_816969A8 = "W_Base";
|
||||
extern "C" const char* lbl_816969B4 = "W_Shade";
|
||||
extern "C" const char* scPaneName_W_Base = "W_Base";
|
||||
extern "C" const char* scPaneName_W_Shade = "W_Shade";
|
||||
|
||||
static const char* scLangGroups[] = {
|
||||
"JPN",
|
||||
@@ -38,8 +38,8 @@ namespace ipl {
|
||||
"KOR",
|
||||
};
|
||||
|
||||
extern "C" char lbl_816969DC[] = "Calc";
|
||||
extern "C" char lbl_816969E1[] = "Create";
|
||||
extern "C" char scExport_Calc[] = "Calc";
|
||||
extern "C" char scExport_Create[] = "Create";
|
||||
|
||||
#pragma pack(1)
|
||||
struct ModuleData {
|
||||
@@ -53,7 +53,7 @@ namespace ipl {
|
||||
};
|
||||
#pragma pack()
|
||||
|
||||
extern "C" ModuleData lbl_8164E328 = {
|
||||
extern "C" ModuleData scModuleData = {
|
||||
{
|
||||
{
|
||||
"JPN",
|
||||
@@ -112,9 +112,9 @@ namespace ipl {
|
||||
"icon_Whole.brlan",
|
||||
};
|
||||
|
||||
extern "C" char lbl_8164E6AF[] = "%s_Rso%d.brlan";
|
||||
extern "C" char lbl_8164E6C0[] = "icon_Start.brlan";
|
||||
extern "C" char lbl_816969E8[] = "arc";
|
||||
extern "C" char scBrlan_RsoFmt[] = "%s_Rso%d.brlan";
|
||||
extern "C" char scBrlan_icon_Start[] = "icon_Start.brlan";
|
||||
extern "C" char scArc[] = "arc";
|
||||
|
||||
static const u32 scLangLookup[SC_PRODUCT_AREA_MAX][16] = {
|
||||
// Japan
|
||||
@@ -296,7 +296,7 @@ namespace ipl {
|
||||
|
||||
int ChannelObj::calcExtModule(EGG::ExpHeap* expHeap, bool unk0, bool onSceneChange) {
|
||||
int result = EXT_MODULE_RESULT_WAIT;
|
||||
const char* dataBase = lbl_8164E290;
|
||||
const char* dataBase = scCursur_a;
|
||||
|
||||
if (mExtModuleState == EXT_MODULE_STATE_UNAVAILABLE) {
|
||||
return EXT_MODULE_RESULT_UNAVAILABLE;
|
||||
@@ -354,7 +354,7 @@ namespace ipl {
|
||||
|
||||
// Import `int Calc(int)`
|
||||
// This is during ChannelObj's loop.
|
||||
mpRSOCalc = (channel::CalcFunc)RSOFindExportSymbolAddr(mpRSOHeader, lbl_816969DC);
|
||||
mpRSOCalc = (channel::CalcFunc)RSOFindExportSymbolAddr(mpRSOHeader, scExport_Calc);
|
||||
|
||||
// Import `void ThreadCalc()`
|
||||
// This is executed on a seperate thread.
|
||||
@@ -364,7 +364,7 @@ namespace ipl {
|
||||
|
||||
// Import `void Create(nw4r::lyt::Layout*)`
|
||||
// This is the initialization of the module.
|
||||
channel::CreateFunc createFunc = (channel::CreateFunc)RSOFindExportSymbolAddr(mpRSOHeader, lbl_816969E1);
|
||||
channel::CreateFunc createFunc = (channel::CreateFunc)RSOFindExportSymbolAddr(mpRSOHeader, scExport_Create);
|
||||
if (createFunc != NULL) {
|
||||
createFunc(mpThumbLayout->getNW4RLyt());
|
||||
}
|
||||
@@ -501,8 +501,8 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void ChannelObj::createDiskLayout(void* data) {
|
||||
const ModuleData* moduleData = reinterpret_cast<const ModuleData*>(lbl_8164E290 + 0x98);
|
||||
mpDiskLayout = layout::Object::create(mpDiskHeap, 0x19000, data, lbl_816969E8, moduleData->iconBrlyt);
|
||||
const ModuleData* moduleData = reinterpret_cast<const ModuleData*>(scCursur_a + 0x98);
|
||||
mpDiskLayout = layout::Object::create(mpDiskHeap, 0x19000, data, scArc, moduleData->iconBrlyt);
|
||||
setLangPane(mpDiskLayout);
|
||||
|
||||
if (mpDiskLayout->searchFile(moduleData->iconBrlan)) {
|
||||
@@ -638,33 +638,33 @@ namespace ipl {
|
||||
void ChannelObj::setLangPane(const layout::Object* layout) {
|
||||
int lang = System::getLanguage();
|
||||
const char* langGroup = scLangGroups[lang];
|
||||
char local_50[40] = "";
|
||||
char langCodeBuf[40] = "";
|
||||
|
||||
bool bVar4 = false;
|
||||
bool foundLangGroup = false;
|
||||
|
||||
for (nw4r::lyt::GroupList::Iterator it = layout->GetGroupList().GetBeginIter(); it != layout->GetGroupList().GetEndIter(); it++) {
|
||||
if (strcmp(it->GetName(), langGroup) == 0) {
|
||||
bVar4 = true;
|
||||
foundLangGroup = true;
|
||||
} else {
|
||||
bool bVar3 = true;
|
||||
bool isNonRsoGroup = true;
|
||||
for (int i = 0; i < channel::MAX_ANIMS; i++) {
|
||||
char name[6];
|
||||
sprintf(name, "Rso%d", i);
|
||||
if (strncmp(it->GetName(), name, 5) == 0) {
|
||||
bVar3 = false;
|
||||
isNonRsoGroup = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (bVar3) {
|
||||
if (isNonRsoGroup) {
|
||||
for (nw4r::lyt::PaneLinkList::Iterator it2 = it->GetPaneList().GetBeginIter(); it2 != it->GetPaneList().GetEndIter(); it2++) {
|
||||
it2->mTarget->SetVisible(false);
|
||||
}
|
||||
|
||||
for (int i = 0; i < 10; i++) {
|
||||
if (strncmp(it->GetName(), scLangGroups[i], 3) == 0) {
|
||||
memcpy(&local_50[i], it->GetName(), 3);
|
||||
local_50[i + 3] = 0;
|
||||
memcpy(&langCodeBuf[i], it->GetName(), 3);
|
||||
langCodeBuf[i + 3] = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -672,7 +672,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
if (bVar4) {
|
||||
if (foundLangGroup) {
|
||||
nw4r::lyt::Group* group = layout->FindGroupByName(langGroup);
|
||||
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter(); it++) {
|
||||
it->mTarget->SetVisible(true);
|
||||
@@ -680,10 +680,10 @@ namespace ipl {
|
||||
} else {
|
||||
s32 region = System::getRegion();
|
||||
for (int i = 0; i < channel::MAX_ANIMS; i++) {
|
||||
char* groupName = (char*)lbl_8164E328.langGroupLookup[region][i];
|
||||
char* groupName = (char*)scModuleData.langGroupLookup[region][i];
|
||||
|
||||
if (groupName != NULL) {
|
||||
if (strcmp(groupName, &local_50[scLangLookup[region][i]]) == 0) {
|
||||
if (strcmp(groupName, &langCodeBuf[scLangLookup[region][i]]) == 0) {
|
||||
nw4r::lyt::Group* group = layout->FindGroupByName(groupName);
|
||||
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter();
|
||||
it++) {
|
||||
@@ -698,7 +698,7 @@ namespace ipl {
|
||||
void ChannelObj::bindRsoAnm(layout::Object* layout, layout::Animator** anims, const char* layoutFile) {
|
||||
for (int i = 0; i < channel::MAX_ANIMS; i++) {
|
||||
char fileName[20];
|
||||
sprintf(fileName, lbl_8164E6AF, layoutFile, i);
|
||||
sprintf(fileName, scBrlan_RsoFmt, layoutFile, i);
|
||||
|
||||
if (layout->searchFile(fileName)) {
|
||||
char groupName[8];
|
||||
@@ -730,7 +730,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void ChannelObj::createThumbnail() {
|
||||
bool bVar1 = false;
|
||||
bool shouldAdjustHeap = false;
|
||||
|
||||
if (mpBalloonLayout == NULL && System::getChannelManager()->isLoaded(mChanPage, mChanIndex)) {
|
||||
initBalloon();
|
||||
@@ -746,12 +746,12 @@ namespace ipl {
|
||||
frame = createWadThumbnail();
|
||||
} else {
|
||||
frame = createWrongThumbnail();
|
||||
bVar1 = true;
|
||||
shouldAdjustHeap = true;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
frame = createEmptyThumbnail();
|
||||
bVar1 = true;
|
||||
shouldAdjustHeap = true;
|
||||
}
|
||||
|
||||
calcNormal();
|
||||
@@ -764,7 +764,7 @@ namespace ipl {
|
||||
mpThumbAnim->setCurrentFrame(frame);
|
||||
}
|
||||
|
||||
if (bVar1) {
|
||||
if (shouldAdjustHeap) {
|
||||
mpThumbLayout->adjustHeap();
|
||||
}
|
||||
}
|
||||
@@ -772,10 +772,10 @@ namespace ipl {
|
||||
f32 ChannelObj::createWadThumbnail() {
|
||||
f32 frame = 0.0f;
|
||||
|
||||
mpThumbLayout = layout::Object::create(mpMainHeap, 0x8000, mpThumbFile->getBuffer(), lbl_816969E8, lbl_8164E290 + 0x3F8);
|
||||
mpThumbLayout = layout::Object::create(mpMainHeap, 0x8000, mpThumbFile->getBuffer(), scArc, scCursur_a + 0x3F8);
|
||||
setLangPane(mpThumbLayout);
|
||||
|
||||
const char* dataBase = lbl_8164E290;
|
||||
const char* dataBase = scCursur_a;
|
||||
u32 rsoIdx = System::getChannelManager()->getIconRSOIdx(mChanPage, mChanIndex);
|
||||
u32 csIdx = System::getChannelManager()->getIconCSIdx(mChanPage, mChanIndex);
|
||||
|
||||
@@ -826,11 +826,11 @@ namespace ipl {
|
||||
return frame;
|
||||
}
|
||||
|
||||
extern "C" char lbl_8164E6CF[] = "my_IplTop_b.brlyt";
|
||||
extern "C" char lbl_8164E6E1[] = "my_IplTop_b.brlan";
|
||||
extern "C" char scBrlyt_my_IplTop_b[] = "my_IplTop_b.brlyt";
|
||||
extern "C" char scBrlan_my_IplTop_b[] = "my_IplTop_b.brlan";
|
||||
|
||||
f32 ChannelObj::createWrongThumbnail() {
|
||||
mpThumbLayout = layout::Object::create(mpMainHeap, 0x8000, mpSysLayoutFile, lbl_816969E8, lbl_8164E6CF);
|
||||
mpThumbLayout = layout::Object::create(mpMainHeap, 0x8000, mpSysLayoutFile, scArc, scBrlyt_my_IplTop_b);
|
||||
|
||||
mpThumbLayout->FindPaneByName("Ch0")->SetVisible(false);
|
||||
mpThumbLayout->FindPaneByName("Ch1")->GetMaterial()->SetTevColor(0, (GXColorS10){0, 0, 0, 255});
|
||||
@@ -841,8 +841,8 @@ namespace ipl {
|
||||
}
|
||||
|
||||
f32 ChannelObj::createEmptyThumbnail() {
|
||||
mpThumbLayout = layout::Object::create(mpMainHeap, 0x8000, mpSysLayoutFile, lbl_816969E8, lbl_8164E6CF);
|
||||
mpThumbAnim = mpThumbLayout->bind(lbl_8164E6E1);
|
||||
mpThumbLayout = layout::Object::create(mpMainHeap, 0x8000, mpSysLayoutFile, scArc, scBrlyt_my_IplTop_b);
|
||||
mpThumbAnim = mpThumbLayout->bind(scBrlan_my_IplTop_b);
|
||||
|
||||
return System::getRndm()->get_u16() % 2000;
|
||||
}
|
||||
@@ -871,12 +871,12 @@ namespace ipl {
|
||||
calcBalloon(pos);
|
||||
}
|
||||
|
||||
extern "C" char lbl_8164E6F3[] = "my_IplTop_d.brlyt";
|
||||
extern "C" char lbl_8164E705[] = "my_IplTopBalloon_a.brlyt";
|
||||
extern "C" char lbl_8164E71E[] = "my_IplTopBalloon_a_BalloonInOut.brlan";
|
||||
extern "C" char scBrlyt_my_IplTop_d[] = "my_IplTop_d.brlyt";
|
||||
extern "C" char scBrlyt_my_IplTopBalloon_a[] = "my_IplTopBalloon_a.brlyt";
|
||||
extern "C" char scBrlan_BalloonInOut[] = "my_IplTopBalloon_a_BalloonInOut.brlan";
|
||||
|
||||
void ChannelObj::initCursor() {
|
||||
mpCursorLayout = new (mpCursorHeap, 4) layout::Object(mpCursorHeap, mpSysLayoutFile, lbl_816969E8, lbl_8164E6F3);
|
||||
mpCursorLayout = new (mpCursorHeap, 4) layout::Object(mpCursorHeap, mpSysLayoutFile, scArc, scBrlyt_my_IplTop_d);
|
||||
|
||||
for (int i = 0; i < ANIM_CURSOR_MAX; i++) {
|
||||
mpCursorAnims[i] = mpCursorLayout->bind(scCursorAnims[i], scCursur, false);
|
||||
@@ -1001,19 +1001,19 @@ namespace ipl {
|
||||
mpBalloonLayout = NULL;
|
||||
return;
|
||||
}
|
||||
mpBalloonLayout = new (mpBalloonHeap, 4) layout::Object(mpBalloonHeap, mpSysLayoutFile, lbl_816969E8, lbl_8164E705);
|
||||
mpBalloonLayout = new (mpBalloonHeap, 4) layout::Object(mpBalloonHeap, mpSysLayoutFile, scArc, scBrlyt_my_IplTopBalloon_a);
|
||||
|
||||
setBalloonText((wchar_t*)System::getChannelManager()->getTitleName(mChanPage, mChanIndex, 0));
|
||||
|
||||
mpBalloonAnim = mpBalloonLayout->bind(lbl_8164E71E);
|
||||
mpBalloonAnim = mpBalloonLayout->bind(scBrlan_BalloonInOut);
|
||||
setBalloonAnim(0);
|
||||
mpBalloonLayout->finishBinding();
|
||||
}
|
||||
|
||||
extern "C" char lbl_8164E744[] = "WIPL_SE_BALLOON";
|
||||
extern "C" char scSE_BALLOON[] = "WIPL_SE_BALLOON";
|
||||
|
||||
void ChannelObj::setBalloonText(const wchar_t* text) {
|
||||
nw4r::lyt::TextBox* textPane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpBalloonLayout->FindPaneByName(lbl_8169699C));
|
||||
nw4r::lyt::TextBox* textPane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpBalloonLayout->FindPaneByName(scPaneName_T_Balloon));
|
||||
|
||||
wchar_t fullStr[channel::META_CHANNEL_NAME_LENGTH + 3] = L"";
|
||||
u32 strLen;
|
||||
@@ -1052,22 +1052,22 @@ namespace ipl {
|
||||
|
||||
nw4r::ut::Rect textRect = textPane->GetTextDrawRect(*mpBalloonLayout->getDrawInfo());
|
||||
|
||||
nw4r::lyt::Size newSize(mpBalloonLayout->FindPaneByName(lbl_816969A8)->GetSize());
|
||||
nw4r::lyt::Size newSize(mpBalloonLayout->FindPaneByName(scPaneName_W_Base)->GetSize());
|
||||
newSize.width = textRect.right - textRect.left + 40.0f;
|
||||
|
||||
if (newSize.width < mLocationAdjust * 160.0f) {
|
||||
newSize.width = mLocationAdjust * 160.0f;
|
||||
}
|
||||
|
||||
mpBalloonLayout->FindPaneByName(lbl_816969B4)->SetSize(newSize);
|
||||
mpBalloonLayout->FindPaneByName(lbl_816969A8)->SetSize(newSize);
|
||||
mpBalloonLayout->FindPaneByName(scPaneName_W_Shade)->SetSize(newSize);
|
||||
mpBalloonLayout->FindPaneByName(scPaneName_W_Base)->SetSize(newSize);
|
||||
}
|
||||
|
||||
void ChannelObj::calcBalloon(const nw4r::math::VEC3& vec) {
|
||||
if (mpBalloonLayout != NULL) {
|
||||
nw4r::lyt::Size size;
|
||||
|
||||
size = mpBalloonLayout->FindPaneByName(lbl_816969A8)->GetSize();
|
||||
size = mpBalloonLayout->FindPaneByName(scPaneName_W_Base)->GetSize();
|
||||
|
||||
f32 val = -2.0f + ((size.height / 2) + mThumbHeight);
|
||||
val *= -1.0f;
|
||||
@@ -1117,7 +1117,7 @@ namespace ipl {
|
||||
mpBalloonLayout->GetRootPane()->SetVisible(true);
|
||||
mpBalloonLayout->setAnmType(ANIM_TYPE_FORWARD);
|
||||
mpBalloonLayout->start();
|
||||
snd::getSystem()->startSE(lbl_8164E744);
|
||||
snd::getSystem()->startSE(scSE_BALLOON);
|
||||
} else if (unk == 4) {
|
||||
unk_0x68 = 0;
|
||||
}
|
||||
@@ -1229,7 +1229,7 @@ namespace ipl {
|
||||
if (group != NULL) {
|
||||
mpNwc24NewGroup = group;
|
||||
} else {
|
||||
lookup = (char**)lbl_8164E328.langGroupLookup[System::getRegion()];
|
||||
lookup = (char**)scModuleData.langGroupLookup[System::getRegion()];
|
||||
|
||||
for (int i = 0; lookup[i] != NULL; i++) {
|
||||
sprintf(grpName, "New_%s", lookup[i]);
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace ipl {
|
||||
extern "C" void List_GetNth__Q24nw4r2utFPCQ34nw4r2ut4ListUs();
|
||||
extern "C" void getChannelBasePane__Q33ipl5scene13ChannelSelectFi();
|
||||
extern "C" void initPane__Q33ipl3gui11PaneManagerFPQ34nw4r3lyt4Pane();
|
||||
extern "C" void* jumptable_8164DE80[];
|
||||
extern "C" void* updateDiskState_jumptable[];
|
||||
extern "C" void getCurrentChannel__Q33ipl7channel7ManagerFPiPi();
|
||||
extern "C" void calcNormalRestart__Q33ipl5scene13ChannelSelectFv();
|
||||
extern "C" void _savegpr_28();
|
||||
@@ -131,15 +131,15 @@ namespace ipl {
|
||||
extern "C" char mscBasePaneNames__Q33ipl5scene13ChannelSelect[];
|
||||
extern "C" char mscClockPaneNames__Q33ipl5scene13ChannelSelect[];
|
||||
extern "C" u32 mscMaskPaneName__Q33ipl5scene13ChannelSelect;
|
||||
extern "C" char lbl_8164DFE1[];
|
||||
extern "C" char lbl_8164DE64[];
|
||||
extern "C" char lbl_8164DE6D[];
|
||||
extern "C" char lbl_8164DE9C[];
|
||||
extern "C" char lbl_8164DFCB[];
|
||||
extern "C" char lbl_8164DFF1[];
|
||||
extern "C" char lbl_8164E000[];
|
||||
extern "C" char lbl_8164E024[];
|
||||
extern "C" char lbl_8164E038[];
|
||||
extern "C" char scSE_WIPL_SE_CH_HOLD[];
|
||||
extern "C" char scPaneName_N_GCIcon[];
|
||||
extern "C" char scPaneName_N_DiscUpdateIcon[];
|
||||
extern "C" char scSE_WSD_SELECT[];
|
||||
extern "C" char scSE_WIPL_SE_CH_TARGETTING[];
|
||||
extern "C" char scSE_WIPL_SE_CH_SET[];
|
||||
extern "C" char scSE_WIPL_SE_CH_NOT_MOVE[];
|
||||
extern "C" char scSE_WIPL_SE_GRAY_BUTTON[];
|
||||
extern "C" char scSE_WIPL_SE_DECIDE[];
|
||||
extern "C" void draw__Q33ipl6layout6ObjectFPQ34nw4r3lyt4Pane();
|
||||
extern "C" void SetVisible__Q34nw4r3lyt4PaneFb();
|
||||
extern "C" void drawChannelThumbnails__Q33ipl5scene13ChannelSelectFv();
|
||||
@@ -855,9 +855,9 @@ namespace ipl {
|
||||
mpDiskInOutLyt->finishBinding();
|
||||
}
|
||||
|
||||
extern "C" char lbl_8164DE64[] = "N_GCIcon";
|
||||
extern "C" char lbl_8164DE6D[] = "N_DiscUpdateIcon";
|
||||
extern "C" void* jumptable_8164DE80[7] = {
|
||||
extern "C" char scPaneName_N_GCIcon[] = "N_GCIcon";
|
||||
extern "C" char scPaneName_N_DiscUpdateIcon[] = "N_DiscUpdateIcon";
|
||||
extern "C" void* updateDiskState_jumptable[7] = {
|
||||
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x4C),
|
||||
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x21C),
|
||||
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x284),
|
||||
@@ -1346,21 +1346,21 @@ namespace ipl {
|
||||
lwz r4, 0xa8(r28)
|
||||
cmplwi r0, 0x6
|
||||
lwz r27, 0x4(r4)
|
||||
bgt updateDiskState_813AD2C8
|
||||
lis r4, jumptable_8164DE80@ha
|
||||
bgt updateDiskState_done
|
||||
lis r4, updateDiskState_jumptable@ha
|
||||
slwi r0, r0, 2
|
||||
addi r4, r4, jumptable_8164DE80@l
|
||||
addi r4, r4, updateDiskState_jumptable@l
|
||||
lwzx r4, r4, r0
|
||||
mtctr r4
|
||||
bctr
|
||||
updateDiskState_813ACF94:
|
||||
updateDiskState_case0:
|
||||
lwz r4, 0xa4(r3)
|
||||
lwz r0, 0x14(r4)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
lwz r3, 0x94(r3)
|
||||
lis r29, lbl_8164DE64@ha
|
||||
addi r4, r29, lbl_8164DE64@l
|
||||
lis r29, scPaneName_N_GCIcon@ha
|
||||
addi r4, r29, scPaneName_N_GCIcon@l
|
||||
li r5, 0x1
|
||||
lwz r3, 0x14(r3)
|
||||
lwz r12, 0x0(r3)
|
||||
@@ -1370,8 +1370,8 @@ namespace ipl {
|
||||
li r4, 0x1
|
||||
bl SetVisible__Q34nw4r3lyt4PaneFb
|
||||
lwz r3, 0x94(r31)
|
||||
lis r30, lbl_8164DE6D@ha
|
||||
addi r4, r30, lbl_8164DE6D@l
|
||||
lis r30, scPaneName_N_DiscUpdateIcon@ha
|
||||
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
|
||||
li r5, 0x1
|
||||
lwz r3, 0x14(r3)
|
||||
lwz r12, 0x0(r3)
|
||||
@@ -1381,7 +1381,7 @@ namespace ipl {
|
||||
li r4, 0x0
|
||||
bl SetVisible__Q34nw4r3lyt4PaneFb
|
||||
cmpwi r27, 0x5
|
||||
bne updateDiskState_813AD078
|
||||
bne updateDiskState_case0_diskState3
|
||||
lwz r4, 0xc0(r31)
|
||||
lwz r3, 0x84(r28)
|
||||
subi r4, r4, 0xf
|
||||
@@ -1391,35 +1391,35 @@ namespace ipl {
|
||||
lwz r0, 0xc0(r31)
|
||||
mr r27, r3
|
||||
cmpwi r0, 0xf
|
||||
bne updateDiskState_813AD03C
|
||||
bne updateDiskState_case0_afterThumb
|
||||
lwz r3, 0xa8(r28)
|
||||
addi r4, r31, 0xf8
|
||||
addi r5, r31, 0xfc
|
||||
bl getDiskInfo__Q33ipl3bs27ManagerFPPcPPc
|
||||
updateDiskState_813AD03C:
|
||||
updateDiskState_case0_afterThumb:
|
||||
cmpwi r27, 0x0
|
||||
beq updateDiskState_813AD050
|
||||
beq updateDiskState_case0_afterLayout
|
||||
lwz r3, 0x90(r31)
|
||||
mr r4, r27
|
||||
bl createDiskLayout__Q33ipl5scene10ChannelObjFPv
|
||||
updateDiskState_813AD050:
|
||||
updateDiskState_case0_afterLayout:
|
||||
lbz r0, 0xf4(r31)
|
||||
cmpwi r0, 0x0
|
||||
bne updateDiskState_813AD064
|
||||
bne updateDiskState_case0_afterDiskIn
|
||||
mr r3, r31
|
||||
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
|
||||
updateDiskState_813AD064:
|
||||
updateDiskState_case0_afterDiskIn:
|
||||
li r3, 0x0
|
||||
li r0, 0x1
|
||||
stb r3, 0xf4(r31)
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD078:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case0_diskState3:
|
||||
cmpwi r27, 0x3
|
||||
bne updateDiskState_813AD134
|
||||
bne updateDiskState_case0_diskState6
|
||||
lwz r3, 0x84(r28)
|
||||
li r0, 0x0
|
||||
addi r4, r29, lbl_8164DE64@l
|
||||
addi r4, r29, scPaneName_N_GCIcon@l
|
||||
li r5, 0x1
|
||||
stb r0, 0x1b81(r3)
|
||||
lwz r3, 0x94(r31)
|
||||
@@ -1431,7 +1431,7 @@ namespace ipl {
|
||||
li r4, 0x0
|
||||
bl SetVisible__Q34nw4r3lyt4PaneFb
|
||||
lwz r3, 0x94(r31)
|
||||
addi r4, r30, lbl_8164DE6D@l
|
||||
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
|
||||
li r5, 0x1
|
||||
lwz r3, 0x14(r3)
|
||||
lwz r12, 0x0(r3)
|
||||
@@ -1444,7 +1444,7 @@ namespace ipl {
|
||||
bl setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object
|
||||
lwz r3, 0x98(r31)
|
||||
cmpwi r3, 0x0
|
||||
beq updateDiskState_813AD10C
|
||||
beq updateDiskState_case0_state3_afterAnim
|
||||
li r0, 0x2
|
||||
stw r0, 0x18(r3)
|
||||
lwz r28, 0x98(r31)
|
||||
@@ -1452,45 +1452,45 @@ namespace ipl {
|
||||
bl initFrame__Q33ipl7utility15FrameControllerFv
|
||||
li r0, 0x1
|
||||
stw r0, 0x14(r28)
|
||||
updateDiskState_813AD10C:
|
||||
updateDiskState_case0_state3_afterAnim:
|
||||
lbz r0, 0xf4(r31)
|
||||
cmpwi r0, 0x0
|
||||
bne updateDiskState_813AD120
|
||||
bne updateDiskState_case0_state3_afterDiskIn
|
||||
mr r3, r31
|
||||
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
|
||||
updateDiskState_813AD120:
|
||||
updateDiskState_case0_state3_afterDiskIn:
|
||||
li r3, 0x0
|
||||
li r0, 0x1
|
||||
stb r3, 0xf4(r31)
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD134:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case0_diskState6:
|
||||
cmpwi r27, 0x6
|
||||
bne updateDiskState_813AD2C8
|
||||
bne updateDiskState_done
|
||||
lbz r0, 0xf4(r31)
|
||||
cmpwi r0, 0x0
|
||||
bne updateDiskState_813AD150
|
||||
bne updateDiskState_case0_state6_afterDiskIn
|
||||
mr r3, r31
|
||||
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
|
||||
updateDiskState_813AD150:
|
||||
updateDiskState_case0_state6_afterDiskIn:
|
||||
li r3, 0x0
|
||||
li r0, 0x4
|
||||
stb r3, 0xf4(r31)
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD164:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case1:
|
||||
lwz r4, 0x8c(r3)
|
||||
lwz r0, 0x14(r4)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
lwz r3, 0x90(r3)
|
||||
bl resetDiskTitleName__Q33ipl5scene10ChannelObjFv
|
||||
cmpwi r27, 0x5
|
||||
bne updateDiskState_813AD1C0
|
||||
bne updateDiskState_case1_setState3
|
||||
lwz r3, 0x90(r31)
|
||||
lwz r3, 0x34(r3)
|
||||
cmpwi r3, 0x0
|
||||
beq updateDiskState_813AD1B4
|
||||
beq updateDiskState_case1_setState2
|
||||
li r0, 0x2
|
||||
stw r0, 0x18(r3)
|
||||
lwz r3, 0x90(r31)
|
||||
@@ -1499,85 +1499,85 @@ namespace ipl {
|
||||
bl initFrame__Q33ipl7utility15FrameControllerFv
|
||||
li r0, 0x1
|
||||
stw r0, 0x14(r27)
|
||||
updateDiskState_813AD1B4:
|
||||
updateDiskState_case1_setState2:
|
||||
li r0, 0x2
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD1C0:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case1_setState3:
|
||||
li r0, 0x3
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD1CC:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case2:
|
||||
cmpwi r27, 0x5
|
||||
bne updateDiskState_813AD1E4
|
||||
bne updateDiskState_case2_doOut
|
||||
lwz r4, 0x84(r28)
|
||||
lbz r0, 0x1b81(r4)
|
||||
cmpwi r0, 0x0
|
||||
beq updateDiskState_813AD2C8
|
||||
updateDiskState_813AD1E4:
|
||||
beq updateDiskState_done
|
||||
updateDiskState_case2_doOut:
|
||||
lwz r3, 0xa0(r3)
|
||||
lwz r0, 0x14(r3)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
mr r3, r31
|
||||
bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv
|
||||
lwz r3, 0x90(r31)
|
||||
bl changeDisk__Q33ipl5scene10ChannelObjFv
|
||||
li r0, 0x6
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD210:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case3:
|
||||
cmpwi r27, 0x3
|
||||
bne updateDiskState_813AD228
|
||||
bne updateDiskState_case3_doOut
|
||||
lwz r4, 0x84(r28)
|
||||
lbz r0, 0x1b81(r4)
|
||||
cmpwi r0, 0x0
|
||||
beq updateDiskState_813AD2C8
|
||||
updateDiskState_813AD228:
|
||||
beq updateDiskState_done
|
||||
updateDiskState_case3_doOut:
|
||||
lwz r3, 0xa0(r3)
|
||||
lwz r0, 0x14(r3)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
mr r3, r31
|
||||
bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv
|
||||
lwz r3, 0x90(r31)
|
||||
bl changeDisk__Q33ipl5scene10ChannelObjFv
|
||||
li r0, 0x6
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD254:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case4:
|
||||
lwz r4, 0x8c(r3)
|
||||
lwz r0, 0x14(r4)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
li r0, 0x5
|
||||
stw r0, 0xf0(r3)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD270:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case5:
|
||||
cmpwi r27, 0x6
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
lwz r4, 0xa0(r3)
|
||||
lwz r0, 0x14(r4)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv
|
||||
lwz r3, 0x90(r31)
|
||||
bl changeDisk__Q33ipl5scene10ChannelObjFv
|
||||
li r0, 0x6
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD2A0:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case6:
|
||||
lwz r4, 0x8c(r3)
|
||||
lwz r0, 0x14(r4)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
lwz r3, 0x90(r3)
|
||||
bl destroyDiskLayout__Q33ipl5scene10ChannelObjFv
|
||||
lwz r3, 0x90(r31)
|
||||
bl resetDiskTitleName__Q33ipl5scene10ChannelObjFv
|
||||
li r0, 0x0
|
||||
stw r0, 0xf0(r31)
|
||||
updateDiskState_813AD2C8:
|
||||
updateDiskState_done:
|
||||
addi r11, r1, 0x20
|
||||
bl _restgpr_27
|
||||
lwz r0, 0x24(r1)
|
||||
@@ -2087,10 +2087,11 @@ namespace ipl {
|
||||
mpMoveLytDrop->getAnim()->initAnmFrame();
|
||||
}
|
||||
|
||||
extern "C" char lbl_8164DFCB[] = "WIPL_SE_CH_TARGETTING";
|
||||
extern "C" char lbl_8164DFE1[] = "WIPL_SE_CH_HOLD";
|
||||
extern "C" char lbl_8164DFF1[] = "WIPL_SE_CH_SET";
|
||||
extern "C" char lbl_8164E000[] = "WIPL_SE_CH_NOT_MOVE";
|
||||
extern "C" char scSE_WSD_SELECT[] = "WSD_SELECT";
|
||||
extern "C" char scSE_WIPL_SE_CH_TARGETTING[] = "WIPL_SE_CH_TARGETTING";
|
||||
extern "C" char scSE_WIPL_SE_CH_HOLD[] = "WIPL_SE_CH_HOLD";
|
||||
extern "C" char scSE_WIPL_SE_CH_SET[] = "WIPL_SE_CH_SET";
|
||||
extern "C" char scSE_WIPL_SE_CH_NOT_MOVE[] = "WIPL_SE_CH_NOT_MOVE";
|
||||
|
||||
void ChannelSelect::calcNormalGrab() {
|
||||
Button* button = getButton();
|
||||
@@ -2167,7 +2168,7 @@ namespace ipl {
|
||||
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
|
||||
mpGui->initPane(getChannelBasePane(i));
|
||||
}
|
||||
snd::getSystem()->startSE(lbl_8164DE9C);
|
||||
snd::getSystem()->startSE(scSE_WSD_SELECT);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -2193,7 +2194,7 @@ namespace ipl {
|
||||
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
|
||||
mpGui->initPane(getChannelBasePane(i));
|
||||
}
|
||||
snd::getSystem()->startSE(lbl_8164DE9C);
|
||||
snd::getSystem()->startSE(scSE_WSD_SELECT);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -2357,7 +2358,7 @@ namespace ipl {
|
||||
case ::gui::EventHandler::ON_POINT: {
|
||||
if (isReleasableArea(mCurrentPage, id) || (mCurrentPage == mMoveOldPage && id == mMoveOldIndex)) {
|
||||
searchList(mCurrentPage, id)->onPoint(2);
|
||||
snd::getSystem()->startSE(lbl_8164DFCB);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_CH_TARGETTING);
|
||||
con->rumble(1);
|
||||
break;
|
||||
}
|
||||
@@ -2438,7 +2439,7 @@ namespace ipl {
|
||||
mbModuleSceneChange = true;
|
||||
unk_0x185 = true;
|
||||
|
||||
snd::getSystem()->startSEwithPos(lbl_8164DFE1, mDragPos.x);
|
||||
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_HOLD, mDragPos.x);
|
||||
|
||||
mState = STATE_NORMAL_GRAB;
|
||||
}
|
||||
@@ -2450,13 +2451,13 @@ namespace ipl {
|
||||
mpMoveLytDrop->GetRootPane()->SetTranslate(translate);
|
||||
mpMoveLytDrop->getAnim(0)->play();
|
||||
|
||||
snd::getSystem()->startSEwithPos(lbl_8164DFF1, mDragPos.x);
|
||||
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_SET, mDragPos.x);
|
||||
|
||||
mpMoveLytMask->getAnim(1)->play();
|
||||
|
||||
mState = STATE_NORMAL_MOVE_CHAN_IN;
|
||||
} else {
|
||||
snd::getSystem()->startSEwithPos(lbl_8164E000, mDragPos.x);
|
||||
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_NOT_MOVE, mDragPos.x);
|
||||
|
||||
mState = STATE_NORMAL_RELEASE_WAIT;
|
||||
}
|
||||
@@ -2519,8 +2520,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" char lbl_8164E024[] = "WIPL_SE_GRAY_BUTTON";
|
||||
extern "C" char lbl_8164E038[] = "WIPL_SE_DECIDE";
|
||||
extern "C" char scSE_WIPL_SE_GRAY_BUTTON[] = "WIPL_SE_GRAY_BUTTON";
|
||||
extern "C" char scSE_WIPL_SE_DECIDE[] = "WIPL_SE_DECIDE";
|
||||
|
||||
void ChannelSelectEventHandler::onEvent(u32 compId, u32 event, void* data) {
|
||||
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
|
||||
@@ -2561,7 +2562,7 @@ namespace ipl {
|
||||
case ::gui::EventHandler::ON_POINT: {
|
||||
if (mpInstance->mState == ChannelSelect::STATE_NORMAL && chanObj->isValid()) {
|
||||
chanObj->onPoint(0);
|
||||
snd::getSystem()->startSE(lbl_8164DFCB);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_CH_TARGETTING);
|
||||
con->rumble(1);
|
||||
}
|
||||
break;
|
||||
@@ -2599,13 +2600,13 @@ namespace ipl {
|
||||
if (System::isSafeMode()) {
|
||||
System::getDialog()->callBtn0(MESG_CHAN_SEL_SAFE_MODE, 180);
|
||||
mpInstance->mState = ChannelSelect::STATE_NORMAL_SAFE_MODE_DIALOG;
|
||||
snd::getSystem()->startSE(lbl_8164E024);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_GRAY_BUTTON);
|
||||
} else {
|
||||
mpInstance->setSomething();
|
||||
mpInstance->mState = ChannelSelect::STATE_START_BOARD_SCENE;
|
||||
mpInstance->tryToStartBoardScene();
|
||||
TVRCManager::getHandle()->setEnable(FALSE);
|
||||
snd::getSystem()->startSE(lbl_8164E038);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
|
||||
}
|
||||
} else if (Button::cmpButtonName(paneName, Button::BTN_SETTING) == 0) {
|
||||
button->setEventHandler(NULL);
|
||||
@@ -2615,7 +2616,7 @@ namespace ipl {
|
||||
System::getFader()->fadeOut();
|
||||
TVRCManager::getHandle()->setEnable(FALSE);
|
||||
mpInstance->mState = ChannelSelect::STATE_START_SETTING_SCENE;
|
||||
snd::getSystem()->startSE(lbl_8164E038);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
|
||||
} else if (Button::cmpButtonName(paneName, Button::BTN_ARROW_LEFT) == 0 && mpInstance->mCurrentPage > 0) {
|
||||
button->animation(Button::IDANIM_ARROW_LEFT_SELECT);
|
||||
mpInstance->preparePageScrolling(ChannelSelect::STATE_PREP_LEFT_PAGE_SCROLL);
|
||||
@@ -2650,7 +2651,7 @@ namespace ipl {
|
||||
System::getFader()->fadeOut();
|
||||
TVRCManager::getHandle()->setEnable(FALSE);
|
||||
mpInstance->mState = ChannelSelect::STATE_START_SD_MENU_SCENE;
|
||||
snd::getSystem()->startSE(lbl_8164E038);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -32,181 +32,181 @@ namespace ipl {
|
||||
ChannelTitle::TicketViewStorage ChannelTitle::msTicketView ALIGN32;
|
||||
ESTicketView ChannelTitle::msUnlockTicket;
|
||||
|
||||
extern "C" char lbl_81696A10[];
|
||||
extern "C" char lbl_81696A17[];
|
||||
extern "C" char lbl_81696A28[];
|
||||
extern "C" char lbl_81696A34[];
|
||||
extern "C" char lbl_81696A3A[];
|
||||
extern "C" char lbl_81696A44[];
|
||||
extern "C" char lbl_81696A54[];
|
||||
extern "C" char lbl_81696A5A[];
|
||||
extern "C" char lbl_81696A60[];
|
||||
extern "C" char lbl_81696A66[];
|
||||
extern "C" char lbl_81696A6C[];
|
||||
extern "C" char lbl_81696A72[];
|
||||
extern "C" char lbl_81696A78[];
|
||||
extern "C" char lbl_81696A7E[];
|
||||
extern "C" char lbl_81696A84[];
|
||||
extern "C" char lbl_81696A8A[];
|
||||
extern "C" char lbl_81696A90[];
|
||||
extern "C" char lbl_81696A96[];
|
||||
extern "C" char lbl_81696A9C[];
|
||||
extern "C" char lbl_81696AA3[];
|
||||
extern "C" char scPaneName_B_BtnA[];
|
||||
extern "C" char scPaneName_B_BtnB[];
|
||||
extern "C" char scGroup_Change[];
|
||||
extern "C" char scGroup_G_Wii[];
|
||||
extern "C" char scGroup_G_GC[];
|
||||
extern "C" char scGroup_G_Back[];
|
||||
extern "C" char scPaneName_Fre_a[];
|
||||
extern "C" char scPaneName_Fre_d[];
|
||||
extern "C" char scPaneName_Fre_i[];
|
||||
extern "C" char scPaneName_Fre_l[];
|
||||
extern "C" char scPaneName_Fre_e[];
|
||||
extern "C" char scPaneName_Fre_f[];
|
||||
extern "C" char scPaneName_Fre_g[];
|
||||
extern "C" char scPaneName_Fre_h[];
|
||||
extern "C" char scPaneName_Fre_b[];
|
||||
extern "C" char scPaneName_Fre_c[];
|
||||
extern "C" char scPaneName_Fre_j[];
|
||||
extern "C" char scPaneName_Fre_k[];
|
||||
extern "C" char scPaneName_T_BtnA[];
|
||||
extern "C" char scPaneName_T_BtnB[];
|
||||
|
||||
// clang-format off
|
||||
extern "C" char lbl_8164E768[] = "G_FocusBtnA";
|
||||
extern "C" char lbl_8164E774[] = "G_FocusBtnB";
|
||||
extern "C" char lbl_8164E780[] = "G_SelectBtnA";
|
||||
extern "C" char lbl_8164E78D[] = "G_SelectBtnB";
|
||||
extern "C" char lbl_8164E79A[] = "G_OnOffBtnA";
|
||||
extern "C" char lbl_8164E7A6[] = "G_OnOffBtnB";
|
||||
extern "C" char lbl_8164E7B2[] = "G_ChangeTextA";
|
||||
extern "C" char lbl_8164E7C0[] = "G_ChangeTextB";
|
||||
extern "C" char scGroup_G_FocusBtnA[] = "G_FocusBtnA";
|
||||
extern "C" char scGroup_G_FocusBtnB[] = "G_FocusBtnB";
|
||||
extern "C" char scGroup_G_SelectBtnA[] = "G_SelectBtnA";
|
||||
extern "C" char scGroup_G_SelectBtnB[] = "G_SelectBtnB";
|
||||
extern "C" char scGroup_G_OnOffBtnA[] = "G_OnOffBtnA";
|
||||
extern "C" char scGroup_G_OnOffBtnB[] = "G_OnOffBtnB";
|
||||
extern "C" char scGroup_G_ChangeTextA[] = "G_ChangeTextA";
|
||||
extern "C" char scGroup_G_ChangeTextB[] = "G_ChangeTextB";
|
||||
|
||||
const char* scAnimGroups[8+1] = {
|
||||
lbl_8164E768,
|
||||
lbl_8164E774,
|
||||
lbl_8164E780,
|
||||
lbl_8164E78D,
|
||||
lbl_8164E79A,
|
||||
lbl_8164E7A6,
|
||||
lbl_8164E7B2,
|
||||
lbl_8164E7C0,
|
||||
scGroup_G_FocusBtnA,
|
||||
scGroup_G_FocusBtnB,
|
||||
scGroup_G_SelectBtnA,
|
||||
scGroup_G_SelectBtnB,
|
||||
scGroup_G_OnOffBtnA,
|
||||
scGroup_G_OnOffBtnB,
|
||||
scGroup_G_ChangeTextA,
|
||||
scGroup_G_ChangeTextB,
|
||||
NULL
|
||||
};
|
||||
|
||||
extern "C" char lbl_8164E7F4[] = "my_ChTop_a_FocusBtnA_off.brlan";
|
||||
extern "C" char lbl_8164E813[] = "my_ChTop_a_FocusBtn_on.brlan";
|
||||
extern "C" char lbl_8164E830[] = "my_ChTop_a_SelectBtn_Ac.brlan";
|
||||
extern "C" char lbl_8164E84E[] = "my_ChTop_a_OffBtn.brlan";
|
||||
extern "C" char lbl_8164E866[] = "my_ChTop_a_OnBtn.brlan";
|
||||
extern "C" char lbl_8164E87D[] = "my_ChTop_a_ChangeTextOut.brlan";
|
||||
extern "C" char lbl_8164E89C[] = "my_ChTop_a_ChangeTextIn.brlan";
|
||||
extern "C" char lbl_8164E8BA[] = "my_ChTop_a_ChangeIn.brlan";
|
||||
extern "C" char lbl_8164E8D4[] = "my_ChTop_a_ChangeRoop.brlan";
|
||||
extern "C" char lbl_8164E8F0[] = "my_ChTop_a_ChangeOut.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_FocusBtnA_off[] = "my_ChTop_a_FocusBtnA_off.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_FocusBtn_on[] = "my_ChTop_a_FocusBtn_on.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_SelectBtn_Ac[] = "my_ChTop_a_SelectBtn_Ac.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_OffBtn[] = "my_ChTop_a_OffBtn.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_OnBtn[] = "my_ChTop_a_OnBtn.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_ChangeTextOut[] = "my_ChTop_a_ChangeTextOut.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_ChangeTextIn[] = "my_ChTop_a_ChangeTextIn.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_ChangeIn[] = "my_ChTop_a_ChangeIn.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_ChangeRoop[] = "my_ChTop_a_ChangeRoop.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_ChangeOut[] = "my_ChTop_a_ChangeOut.brlan";
|
||||
|
||||
const char* scAnimNames[10] = {
|
||||
lbl_8164E7F4,
|
||||
lbl_8164E813,
|
||||
lbl_8164E830,
|
||||
lbl_8164E84E,
|
||||
lbl_8164E866,
|
||||
lbl_8164E87D,
|
||||
lbl_8164E89C,
|
||||
lbl_8164E8BA,
|
||||
lbl_8164E8D4,
|
||||
lbl_8164E8F0
|
||||
scBrlan_my_ChTop_a_FocusBtnA_off,
|
||||
scBrlan_my_ChTop_a_FocusBtn_on,
|
||||
scBrlan_my_ChTop_a_SelectBtn_Ac,
|
||||
scBrlan_my_ChTop_a_OffBtn,
|
||||
scBrlan_my_ChTop_a_OnBtn,
|
||||
scBrlan_my_ChTop_a_ChangeTextOut,
|
||||
scBrlan_my_ChTop_a_ChangeTextIn,
|
||||
scBrlan_my_ChTop_a_ChangeIn,
|
||||
scBrlan_my_ChTop_a_ChangeRoop,
|
||||
scBrlan_my_ChTop_a_ChangeOut
|
||||
};
|
||||
|
||||
extern "C" char lbl_8164E934[] = "banner.brlan";
|
||||
extern "C" char lbl_8164E941[] = "banner_Start.brlan";
|
||||
extern "C" char lbl_8164E954[] = "banner_Loop.brlan";
|
||||
extern "C" char scBrlan_banner[] = "banner.brlan";
|
||||
extern "C" char scBrlan_banner_Start[] = "banner_Start.brlan";
|
||||
extern "C" char scBrlan_banner_Loop[] = "banner_Loop.brlan";
|
||||
|
||||
const char* scBannerAnims[3] = {
|
||||
lbl_8164E934,
|
||||
lbl_8164E941,
|
||||
lbl_8164E954
|
||||
scBrlan_banner,
|
||||
scBrlan_banner_Start,
|
||||
scBrlan_banner_Loop
|
||||
};
|
||||
|
||||
extern "C" char lbl_8164E974[] = "G_Comment0";
|
||||
extern "C" char lbl_8164E97F[] = "G_DiskIn";
|
||||
extern "C" char scGroup_G_Comment0[] = "G_Comment0";
|
||||
extern "C" char scGroup_G_DiskIn[] = "G_DiskIn";
|
||||
|
||||
const char* scDiskGroups[5] = {
|
||||
lbl_8164E974,
|
||||
lbl_81696A34,
|
||||
lbl_81696A3A,
|
||||
lbl_8164E97F,
|
||||
scGroup_G_Comment0,
|
||||
scGroup_G_Wii,
|
||||
scGroup_G_GC,
|
||||
scGroup_G_DiskIn,
|
||||
NULL
|
||||
};
|
||||
|
||||
extern "C" char lbl_8164E99C[] = "my_DiskCh_a_Start.brlan";
|
||||
extern "C" char lbl_8164E9B4[] = "my_DiskCh_a_DiskStart.brlan";
|
||||
extern "C" char lbl_8164E9D0[] = "my_DiskCh_a_DiskLoop.brlan";
|
||||
extern "C" char lbl_8164E9EB[] = "my_DiskCh_a_DiskEnd.brlan";
|
||||
extern "C" char lbl_8164EA05[] = "my_DiskCh_a_DiskLost.brlan";
|
||||
extern "C" char lbl_8164EA20[] = "my_DiskCh_a_DiskIn.brlan";
|
||||
extern "C" char lbl_8164EA39[] = "my_DiskCh_a_DiskEject.brlan";
|
||||
extern "C" char lbl_8164EA55[] = "my_DiskCh_a_Unknown.brlan";
|
||||
extern "C" char lbl_8164EA6F[] = "my_DiskCh_a_UnknownLoop.brlan";
|
||||
extern "C" char lbl_8164EA8D[] = "my_DiskCh_a_UnknwnEject.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_Start[] = "my_DiskCh_a_Start.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_DiskStart[] = "my_DiskCh_a_DiskStart.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_DiskLoop[] = "my_DiskCh_a_DiskLoop.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_DiskEnd[] = "my_DiskCh_a_DiskEnd.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_DiskLost[] = "my_DiskCh_a_DiskLost.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_DiskIn[] = "my_DiskCh_a_DiskIn.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_DiskEject[] = "my_DiskCh_a_DiskEject.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_Unknown[] = "my_DiskCh_a_Unknown.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_UnknownLoop[] = "my_DiskCh_a_UnknownLoop.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_UnknwnEject[] = "my_DiskCh_a_UnknwnEject.brlan";
|
||||
|
||||
const char* scDiskAnimNames[10] = {
|
||||
lbl_8164E99C,
|
||||
lbl_8164E9B4,
|
||||
lbl_8164E9D0,
|
||||
lbl_8164E9EB,
|
||||
lbl_8164EA05,
|
||||
lbl_8164EA20,
|
||||
lbl_8164EA39,
|
||||
lbl_8164EA55,
|
||||
lbl_8164EA6F,
|
||||
lbl_8164EA8D
|
||||
scBrlan_my_DiskCh_a_Start,
|
||||
scBrlan_my_DiskCh_a_DiskStart,
|
||||
scBrlan_my_DiskCh_a_DiskLoop,
|
||||
scBrlan_my_DiskCh_a_DiskEnd,
|
||||
scBrlan_my_DiskCh_a_DiskLost,
|
||||
scBrlan_my_DiskCh_a_DiskIn,
|
||||
scBrlan_my_DiskCh_a_DiskEject,
|
||||
scBrlan_my_DiskCh_a_Unknown,
|
||||
scBrlan_my_DiskCh_a_UnknownLoop,
|
||||
scBrlan_my_DiskCh_a_UnknwnEject
|
||||
};
|
||||
|
||||
extern "C" char lbl_8164EAD4[] = "my_DiskCh_a.brlyt";
|
||||
extern "C" char lbl_8164EAE6[] = "my_GCTop_a_BackLoop.brlan";
|
||||
extern "C" char scBrlyt_my_DiskCh_a[] = "my_DiskCh_a.brlyt";
|
||||
extern "C" char scBrlan_my_GCTop_a_BackLoop[] = "my_GCTop_a_BackLoop.brlan";
|
||||
|
||||
#pragma push
|
||||
#pragma section data_type ".sdata"
|
||||
extern "C" char lbl_81696A10[] = "B_BtnA";
|
||||
extern "C" char lbl_81696A17[] = "B_BtnB";
|
||||
extern "C" const char* lbl_81696A20[2] = {
|
||||
lbl_81696A10,
|
||||
lbl_81696A17,
|
||||
extern "C" char scPaneName_B_BtnA[] = "B_BtnA";
|
||||
extern "C" char scPaneName_B_BtnB[] = "B_BtnB";
|
||||
extern "C" const char* scPaneNames_B_Btn[2] = {
|
||||
scPaneName_B_BtnA,
|
||||
scPaneName_B_BtnB,
|
||||
};
|
||||
extern "C" char lbl_81696A28[] = "Change";
|
||||
extern "C" const char* lbl_81696A30[] = {
|
||||
lbl_81696A28,
|
||||
extern "C" char scGroup_Change[] = "Change";
|
||||
extern "C" const char* scGroupNames_Change[] = {
|
||||
scGroup_Change,
|
||||
};
|
||||
extern "C" char lbl_81696A34[] = "G_Wii";
|
||||
extern "C" char lbl_81696A3A[] = "G_GC";
|
||||
extern "C" char scGroup_G_Wii[] = "G_Wii";
|
||||
extern "C" char scGroup_G_GC[] = "G_GC";
|
||||
const char* scLayoutNames[] = {
|
||||
lbl_8164EAD4,
|
||||
scBrlyt_my_DiskCh_a,
|
||||
};
|
||||
extern "C" char lbl_81696A44[] = "G_Back";
|
||||
extern "C" char scGroup_G_Back[] = "G_Back";
|
||||
const char* scGCAnimGroups[] = {
|
||||
lbl_81696A44,
|
||||
scGroup_G_Back,
|
||||
};
|
||||
const char* scGCAnimNames[] = {
|
||||
lbl_8164EAE6,
|
||||
scBrlan_my_GCTop_a_BackLoop,
|
||||
};
|
||||
extern "C" char lbl_81696A54[] = "Fre_a";
|
||||
extern "C" char lbl_81696A5A[] = "Fre_d";
|
||||
extern "C" char lbl_81696A60[] = "Fre_i";
|
||||
extern "C" char lbl_81696A66[] = "Fre_l";
|
||||
extern "C" char lbl_81696A6C[] = "Fre_e";
|
||||
extern "C" char lbl_81696A72[] = "Fre_f";
|
||||
extern "C" char lbl_81696A78[] = "Fre_g";
|
||||
extern "C" char lbl_81696A7E[] = "Fre_h";
|
||||
extern "C" char lbl_81696A84[] = "Fre_b";
|
||||
extern "C" char lbl_81696A8A[] = "Fre_c";
|
||||
extern "C" char lbl_81696A90[] = "Fre_j";
|
||||
extern "C" char lbl_81696A96[] = "Fre_k";
|
||||
extern "C" char lbl_81696A9C[] = "T_BtnA";
|
||||
extern "C" char lbl_81696AA3[] = "T_BtnB";
|
||||
const char* lbl_81696AAC[] = {
|
||||
lbl_81696A9C,
|
||||
lbl_81696AA3,
|
||||
extern "C" char scPaneName_Fre_a[] = "Fre_a";
|
||||
extern "C" char scPaneName_Fre_d[] = "Fre_d";
|
||||
extern "C" char scPaneName_Fre_i[] = "Fre_i";
|
||||
extern "C" char scPaneName_Fre_l[] = "Fre_l";
|
||||
extern "C" char scPaneName_Fre_e[] = "Fre_e";
|
||||
extern "C" char scPaneName_Fre_f[] = "Fre_f";
|
||||
extern "C" char scPaneName_Fre_g[] = "Fre_g";
|
||||
extern "C" char scPaneName_Fre_h[] = "Fre_h";
|
||||
extern "C" char scPaneName_Fre_b[] = "Fre_b";
|
||||
extern "C" char scPaneName_Fre_c[] = "Fre_c";
|
||||
extern "C" char scPaneName_Fre_j[] = "Fre_j";
|
||||
extern "C" char scPaneName_Fre_k[] = "Fre_k";
|
||||
extern "C" char scPaneName_T_BtnA[] = "T_BtnA";
|
||||
extern "C" char scPaneName_T_BtnB[] = "T_BtnB";
|
||||
const char* scPaneNames_T_Btn[] = {
|
||||
scPaneName_T_BtnA,
|
||||
scPaneName_T_BtnB,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
const char* scWidePanes[3][4] = {
|
||||
{
|
||||
lbl_81696A54,
|
||||
lbl_81696A5A,
|
||||
lbl_81696A60,
|
||||
lbl_81696A66,
|
||||
scPaneName_Fre_a,
|
||||
scPaneName_Fre_d,
|
||||
scPaneName_Fre_i,
|
||||
scPaneName_Fre_l,
|
||||
}, {
|
||||
lbl_81696A6C,
|
||||
lbl_81696A72,
|
||||
lbl_81696A78,
|
||||
lbl_81696A7E,
|
||||
scPaneName_Fre_e,
|
||||
scPaneName_Fre_f,
|
||||
scPaneName_Fre_g,
|
||||
scPaneName_Fre_h,
|
||||
}, {
|
||||
lbl_81696A84,
|
||||
lbl_81696A8A,
|
||||
lbl_81696A90,
|
||||
lbl_81696A96,
|
||||
scPaneName_Fre_b,
|
||||
scPaneName_Fre_c,
|
||||
scPaneName_Fre_j,
|
||||
scPaneName_Fre_k,
|
||||
}
|
||||
};
|
||||
|
||||
@@ -341,12 +341,12 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[0]), MESG_CMN_WII_MENU);
|
||||
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[0]), MESG_CMN_WII_MENU);
|
||||
|
||||
if (System::getChannelManager()->checkNeedUpdate(mChanPage, mChanIndex)) {
|
||||
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_TTL_BTN_UPDATE);
|
||||
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CHAN_TTL_BTN_UPDATE);
|
||||
} else {
|
||||
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CMN_START);
|
||||
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CMN_START);
|
||||
}
|
||||
|
||||
if (isEnableToExecute(mChanPage, mChanIndex)) {
|
||||
@@ -390,7 +390,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
for (int i = ANIM_CHANGE_IN; i <= ANIM_CHANGE_OUT; i++) {
|
||||
mpChangeAnims[i] = mpLayout->bind(scAnimNames[i], lbl_81696A30[0], false, false);
|
||||
mpChangeAnims[i] = mpLayout->bind(scAnimNames[i], scGroupNames_Change[0], false, false);
|
||||
}
|
||||
|
||||
mpLayout->finishBinding();
|
||||
@@ -400,8 +400,8 @@ namespace ipl {
|
||||
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
|
||||
mpGui->setAllComponentTriggerTarget(false);
|
||||
|
||||
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_A]))->setTriggerTarget(true);
|
||||
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_B]))->setTriggerTarget(true);
|
||||
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(scPaneNames_B_Btn[BTN_A]))->setTriggerTarget(true);
|
||||
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(scPaneNames_B_Btn[BTN_B]))->setTriggerTarget(true);
|
||||
|
||||
mpLimitRemainLyt = new layout::Object(getSceneHeap(), mpLayoutFile, "arc", "my_Timer_a.brlyt");
|
||||
mpLimitDoneLyt = new layout::Object(getSceneHeap(), mpLayoutFile, "arc", "my_Timer_b.brlyt");
|
||||
@@ -1187,9 +1187,9 @@ namespace ipl {
|
||||
if (mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_IN]->getCurrentFrame() ==
|
||||
mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_IN]->getMaxFrame()) {
|
||||
if (System::getChannelManager()->checkNeedUpdate(mChanPage, mChanIndex)) {
|
||||
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_SEL_UPDATE_BTN, false);
|
||||
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CHAN_SEL_UPDATE_BTN, false);
|
||||
} else {
|
||||
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_SEL_START_BTN, false);
|
||||
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CHAN_SEL_START_BTN, false);
|
||||
}
|
||||
mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_OUT]->play();
|
||||
mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_IN]->initAnmFrame();
|
||||
@@ -2289,7 +2289,7 @@ namespace ipl {
|
||||
|
||||
unk_0x360 = false;
|
||||
|
||||
System::getTask1()->request(iplChannelTitle_813BA684, this, NULL);
|
||||
System::getTask1()->request(markTmdReadyTask, this, NULL);
|
||||
|
||||
mState = STATE_WAIT_TMD;
|
||||
} else {
|
||||
@@ -2301,7 +2301,7 @@ namespace ipl {
|
||||
|
||||
unk_0x360 = false;
|
||||
|
||||
System::getTask1()->request(iplChannelTitle_813BA684, this, NULL);
|
||||
System::getTask1()->request(markTmdReadyTask, this, NULL);
|
||||
|
||||
mState = STATE_WAIT_TMD;
|
||||
}
|
||||
@@ -2408,7 +2408,7 @@ namespace ipl {
|
||||
|
||||
if (mTmpTitleID != 0) {
|
||||
SCSetTmpTitleID(0);
|
||||
System::getTask1()->request(iplChannelTitle_813BA784, this, NULL);
|
||||
System::getTask1()->request(deleteTmpTitleContentTask, this, NULL);
|
||||
} else {
|
||||
unk_0x370 = true;
|
||||
}
|
||||
@@ -2464,7 +2464,7 @@ namespace ipl {
|
||||
if (unk_0x8C == 0) {
|
||||
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_OFF_BTN]->stop();
|
||||
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_ON_BTN]->play();
|
||||
mpGui->initPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_B]));
|
||||
mpGui->initPane(mpLayout->FindPaneByName(scPaneNames_B_Btn[BTN_B]));
|
||||
mbHovered[BTN_B] = FALSE;
|
||||
}
|
||||
unk_0x8C = 1;
|
||||
@@ -2604,8 +2604,8 @@ namespace ipl {
|
||||
|
||||
wcscpy(limitStr, System::getMessage(MESG_CHAN_SEL_TIME_LIMIT));
|
||||
|
||||
wchar_t local_38[16] = L"";
|
||||
wchar_t local_58[16] = L"";
|
||||
wchar_t hourStr[16] = L"";
|
||||
wchar_t minuteStr[16] = L"";
|
||||
|
||||
if (hour == 0 && minute == 0) {
|
||||
swprintf(limitStr, 65, L"%ls %ls", limitStr, System::getMessage(MESG_CHAN_SEL_LIMIT_UNDER_60));
|
||||
@@ -2616,42 +2616,42 @@ namespace ipl {
|
||||
if (System::getLanguage() == SC_LANG_JAPANESE || System::getLanguage() == SC_LANG_KOREAN ||
|
||||
System::getLanguage() == SC_LANG_GERMAN) {
|
||||
if (hour == 1) {
|
||||
swprintf(local_38, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
swprintf(hourStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
} else if (hour != 0) {
|
||||
swprintf(local_38, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
swprintf(hourStr, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
}
|
||||
|
||||
if (minute == 1) {
|
||||
swprintf(local_58, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
swprintf(minuteStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
} else if (minute != 0) {
|
||||
swprintf(local_58, 16, L"%d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
swprintf(minuteStr, 16, L"%d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
}
|
||||
} else if (System::getLanguage() == SC_LANG_FRENCH || System::getLanguage() == SC_LANG_ITALIAN) {
|
||||
if (hour == 1) {
|
||||
swprintf(local_38, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
swprintf(hourStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
} else if (hour != 0) {
|
||||
swprintf(local_38, 16, L"%02d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
swprintf(hourStr, 16, L"%02d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
}
|
||||
|
||||
if (minute == 1) {
|
||||
swprintf(local_58, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
swprintf(minuteStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
} else if (minute != 0) {
|
||||
swprintf(local_58, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
swprintf(minuteStr, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
}
|
||||
} else {
|
||||
if (hour == 1) {
|
||||
swprintf(local_38, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
swprintf(hourStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
} else if (hour != 0) {
|
||||
swprintf(local_38, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
swprintf(hourStr, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
}
|
||||
|
||||
if (minute == 1) {
|
||||
swprintf(local_58, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
swprintf(minuteStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
} else if (minute != 0) {
|
||||
swprintf(local_58, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
swprintf(minuteStr, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
}
|
||||
}
|
||||
swprintf(limitStr, 65, L"%ls %ls%ls", limitStr, local_38, local_58);
|
||||
swprintf(limitStr, 65, L"%ls %ls%ls", limitStr, hourStr, minuteStr);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2673,7 +2673,7 @@ namespace ipl {
|
||||
chanTtl->unk_0x360 = true;
|
||||
}
|
||||
|
||||
void ChannelTitle::iplChannelTitle_813BA684(void* work) {
|
||||
void ChannelTitle::markTmdReadyTask(void* work) {
|
||||
ChannelTitle* chanTtl = static_cast<ChannelTitle*>(work);
|
||||
chanTtl->unk_0x360 = true;
|
||||
}
|
||||
@@ -2699,7 +2699,7 @@ namespace ipl {
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
void ChannelTitle::iplChannelTitle_813BA784(void* work) {
|
||||
void ChannelTitle::deleteTmpTitleContentTask(void* work) {
|
||||
ChannelTitle* chanTtl = static_cast<ChannelTitle*>(work);
|
||||
|
||||
if (chanTtl->mTmpTitleID != 0) {
|
||||
@@ -2822,12 +2822,12 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
if (con->downTrg(controller::BTN_INTERACT)) {
|
||||
if (strcmp(paneName, lbl_81696A20[ChannelTitle::BTN_A]) == 0) {
|
||||
if (strcmp(paneName, scPaneNames_B_Btn[ChannelTitle::BTN_A]) == 0) {
|
||||
mpInstance->mpGrpAnims[ChannelTitle::ANIM_GRP_SELECT_BTN_A][ChannelTitle::ANIM_SELECT_BTN]->play();
|
||||
snd::getSystem()->startSE("WIPL_SE_BT_PUSH");
|
||||
mpInstance->mState = ChannelTitle::STATE_START_ZOOM_OUT;
|
||||
mpInstance->tryToGoBackward();
|
||||
} else if (strcmp(paneName, lbl_81696A20[ChannelTitle::BTN_B]) == 0) {
|
||||
} else if (strcmp(paneName, scPaneNames_B_Btn[ChannelTitle::BTN_B]) == 0) {
|
||||
if (mpInstance->unk_0x8C != 2) {
|
||||
snd::getSystem()->startSE("WIPL_SE_GRAY_BUTTON");
|
||||
} else {
|
||||
@@ -2841,7 +2841,7 @@ namespace ipl {
|
||||
}
|
||||
case ::gui::EventHandler::ON_POINT: {
|
||||
for (int i = 0; i < ChannelTitle::BTN_MAX; i++) {
|
||||
if (strcmp(paneName, lbl_81696A20[i]) == 0) {
|
||||
if (strcmp(paneName, scPaneNames_B_Btn[i]) == 0) {
|
||||
if (i == 0 || mpInstance->unk_0x8C > 0) {
|
||||
mpInstance->mbHovered[i]++;
|
||||
if (mpInstance->mbHovered[i] <= TRUE) {
|
||||
@@ -2857,7 +2857,7 @@ namespace ipl {
|
||||
}
|
||||
case ::gui::EventHandler::ON_LEFT: {
|
||||
for (int i = 0; i < ChannelTitle::BTN_MAX; i++) {
|
||||
if (strcmp(paneName, lbl_81696A20[i]) == 0) {
|
||||
if (strcmp(paneName, scPaneNames_B_Btn[i]) == 0) {
|
||||
if (i == 0 || mpInstance->unk_0x8C > 0) {
|
||||
mpInstance->mbHovered[i]--;
|
||||
if (mpInstance->mbHovered[i] <= FALSE) {
|
||||
|
||||
@@ -749,7 +749,7 @@ void GCWindow::onMemEvent(long event, u8 cardState) {
|
||||
break;
|
||||
}
|
||||
goto process_complete;
|
||||
case 0x15:
|
||||
default:
|
||||
return;
|
||||
|
||||
process_complete:
|
||||
@@ -758,6 +758,18 @@ void GCWindow::onMemEvent(long event, u8 cardState) {
|
||||
show_button_ok();
|
||||
mState = 0xe;
|
||||
break;
|
||||
case 0:
|
||||
case 1:
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
case 6:
|
||||
case 7:
|
||||
case 0xB:
|
||||
case 0xD:
|
||||
case 0x10:
|
||||
case 0x15:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ struct MemoryCardSortEntry {
|
||||
s64 key;
|
||||
};
|
||||
|
||||
extern "C" int iplMemoryCardManager_813CD034(const void* first, const void* second) {
|
||||
extern "C" int compareMemoryCardSortEntries(const void* first, const void* second) {
|
||||
const MemoryCardSortEntry* a = static_cast<const MemoryCardSortEntry*>(first);
|
||||
const MemoryCardSortEntry* b = static_cast<const MemoryCardSortEntry*>(second);
|
||||
s64 bKey = b->key;
|
||||
@@ -92,7 +92,7 @@ void MemoryCardManager::sort_file_array(u8 slot) {
|
||||
mFile[slot][file].unk_0x08 = 0;
|
||||
}
|
||||
}
|
||||
qsort(mFile[slot], 0x7f, sizeof(MCFile), iplMemoryCardManager_813CD034);
|
||||
qsort(mFile[slot], 0x7f, sizeof(MCFile), compareMemoryCardSortEntries);
|
||||
}
|
||||
|
||||
void MemoryCardManager::sendCardCmdMove(u8 slot, s16 index) {
|
||||
|
||||
@@ -48,7 +48,7 @@ void IPLContestGSFree(void* block);
|
||||
void* IPLContestGSRealloc(void* oldBlock, u32 newSize);
|
||||
void* IPLContestGSMemalign(u32 align, u32 size);
|
||||
|
||||
void iplContest_813D54F8(BOOL success, NAT nat);
|
||||
void onNatDetectionDone(BOOL success, NAT nat);
|
||||
|
||||
void* IPLContestAlloc(int size);
|
||||
void IPLContestFree(void* block, u32 _unused);
|
||||
@@ -227,7 +227,7 @@ int IPLContestProcess() {
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
NNStartNatDetection(iplContest_813D54F8);
|
||||
NNStartNatDetection(onNatDetectionDone);
|
||||
g_session.unk_0x030 = 3;
|
||||
OSReport("Port mapping detectioning test has been started.\n");
|
||||
g_session.detectStartTime = OSGetTime();
|
||||
@@ -461,7 +461,7 @@ void sNHTTPCleanupCallback() {
|
||||
g_session.state = 3;
|
||||
}
|
||||
|
||||
void iplContest_813D54F8(gsi_bool success, NAT nat) {
|
||||
void onNatDetectionDone(gsi_bool success, NAT nat) {
|
||||
if (success) {
|
||||
g_session.nat = nat;
|
||||
g_session.unk_0x03c = 0;
|
||||
|
||||
@@ -512,25 +512,25 @@ namespace ipl {
|
||||
case 12:
|
||||
onDialogState12();
|
||||
break;
|
||||
case 13:
|
||||
case 19:
|
||||
onDialogState13();
|
||||
break;
|
||||
case 14:
|
||||
case 13:
|
||||
onDialogState14();
|
||||
break;
|
||||
case 15:
|
||||
case 14:
|
||||
onDialogState15();
|
||||
break;
|
||||
case 16:
|
||||
case 15:
|
||||
onDialogState16();
|
||||
break;
|
||||
case 17:
|
||||
case 16:
|
||||
onDialogState17();
|
||||
break;
|
||||
case 18:
|
||||
case 17:
|
||||
onDialogState18();
|
||||
break;
|
||||
case 19:
|
||||
case 18:
|
||||
onDialogState19();
|
||||
break;
|
||||
case 20:
|
||||
@@ -934,7 +934,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" bool iplSDMemory_813EE358(const SDMemory* memory,
|
||||
extern "C" bool iplSDMemory_containsTitleId(const SDMemory* memory,
|
||||
ESTitleId titleId,
|
||||
const ESTitleId* titleIds, u32 titleCount) {
|
||||
for (u32 i = 0; i < titleCount; i++) {
|
||||
@@ -951,7 +951,7 @@ namespace ipl {
|
||||
s32 result = mpSDChannelSelect->getWorker()->get_async_result();
|
||||
if (result == 0) {
|
||||
ESTitleId titleId = mTitleIds[mCurrentTitle];
|
||||
if (iplSDMemory_813EE358(this, titleId,
|
||||
if (iplSDMemory_containsTitleId(this, titleId,
|
||||
mNandTitleIds, mNandTitleCount)) {
|
||||
mDialogState = 17;
|
||||
} else {
|
||||
@@ -984,8 +984,8 @@ namespace ipl {
|
||||
swprintf(mCurrentTitleName, 0x107f, L"%ls\n%ls", titleName, message);
|
||||
System::getDialog()->setTitleForSDMemory(mCurrentTitleName);
|
||||
|
||||
if (iplSDMemory_813EE358(this, mTitleIds[mCurrentTitle], mSDTitleIds, mTitleNameCount) ||
|
||||
iplSDMemory_813EE358(this, mTitleIds[mCurrentTitle], mNandTitleIds, mNandTitleCount)) {
|
||||
if (iplSDMemory_containsTitleId(this, mTitleIds[mCurrentTitle], mSDTitleIds, mTitleNameCount) ||
|
||||
iplSDMemory_containsTitleId(this, mTitleIds[mCurrentTitle], mNandTitleIds, mNandTitleCount)) {
|
||||
ESTitleId titleId = mTitleIds[mCurrentTitle];
|
||||
if (iplSDChannelSelect_813DB478(mpSDChannelSelect, titleId)) {
|
||||
mDialogState = 14;
|
||||
@@ -1058,13 +1058,13 @@ namespace ipl {
|
||||
}
|
||||
|
||||
const ESTitleId* titleEntry = &mTitleIds[mCurrentTitle];
|
||||
System::getChannelManager()->fn_8133AA50(*titleEntry);
|
||||
System::getChannelManager()->unloadBanner(*titleEntry);
|
||||
|
||||
if (mpSDChannelSelect->getWorker()->get_async_result() == 0) {
|
||||
mCurrentTitle++;
|
||||
if (mTitleCount > mCurrentTitle) {
|
||||
ESTitleId nextTitleId = mTitleIds[mCurrentTitle];
|
||||
if (iplSDMemory_813EE358(this, nextTitleId,
|
||||
if (iplSDMemory_containsTitleId(this, nextTitleId,
|
||||
mNandTitleIds, mNandTitleCount)) {
|
||||
mDialogState = 17;
|
||||
} else {
|
||||
|
||||
@@ -49,42 +49,42 @@ namespace ipl {
|
||||
};
|
||||
|
||||
static const f32 scThumbnailOffsets[][2] = {{64.0f, 48.0f}, {85.0f, 48.0f}};
|
||||
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
EGG::ExpHeap* secondHeap) NO_INLINE;
|
||||
extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, bool request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3580(const layout::Object* layout) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3858(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" f32 iplSDChannelObj_813E3920(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" f32 iplSDChannelObj_813E3A84(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3B1C(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3BA0(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3C58(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3C9C(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3E38(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3F28(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3F74(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" const wchar_t* iplSDChannelObj_813E4060(SDChannelObj* channel, int index) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E413C(SDChannelObj* channel, const wchar_t* text) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E4410(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E4558(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E4704(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E481C(SDChannelObj* channel, layout::Object* layout) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E49A8(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" BOOL iplSDChannelObj_813E4A54(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_calc(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, bool request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_createBaseLayout(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" f32 iplSDChannelObj_createIconLayout(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" f32 iplSDChannelObj_createMenuLayout(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_syncLayoutsToPane(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_createPageLayout(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setPageTranslate(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setPageAnim(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_updatePageAnim(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_playPageAnimator(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_createDialogLayout(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" const wchar_t* iplSDChannelObj_getLocalizedName(SDChannelObj* channel, int index) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setBalloonText(SDChannelObj* channel, const wchar_t* text) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_positionDialog(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setDialogAnim(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_updateDialogAnim(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_findNewMessageGroup(SDChannelObj* channel, layout::Object* layout) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_updateNewMessage(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" BOOL iplSDChannelObj_checkNewMessage(SDChannelObj* channel) NO_INLINE;
|
||||
|
||||
SDChannelObj::SDChannelObj(EGG::Heap* heap, int page, int index)
|
||||
: mpHeap(heap), mpDialogHeap(NULL), mpChannelHeap(NULL), mState(0), mPage(page), mIndex(index),
|
||||
@@ -112,42 +112,42 @@ namespace ipl {
|
||||
if (mpDialogLayout != NULL)
|
||||
delete mpDialogLayout;
|
||||
}
|
||||
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel) {
|
||||
if (channel->mState == 0)
|
||||
channel->mState = 2;
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
EGG::ExpHeap* secondHeap) {
|
||||
channel->mpDialogHeap = firstHeap;
|
||||
channel->mpChannelHeap = secondHeap;
|
||||
}
|
||||
|
||||
extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel) {
|
||||
extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel) {
|
||||
if (channel->mpThumbnailData == NULL)
|
||||
channel->mpThumbnailData = new (channel->mpHeap, 32) u8[0x19000];
|
||||
return channel->mpThumbnailData;
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane) {
|
||||
extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane) {
|
||||
channel->mpPane = pane;
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile) {
|
||||
extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile) {
|
||||
if (!SDChannelSelect::isChannelReady(channel)) {
|
||||
channel->mpLayoutFile = layoutFile;
|
||||
if (channel->mpPageLayout == NULL)
|
||||
iplSDChannelObj_813E3BA0(channel);
|
||||
iplSDChannelObj_createPageLayout(channel);
|
||||
if (channel->mpDialogLayout == NULL)
|
||||
iplSDChannelObj_813E3F74(channel);
|
||||
iplSDChannelObj_createDialogLayout(channel);
|
||||
if (channel->mState == 2 || channel->mState == 1 && channel->mpPaneAnimator->isFinished()) {
|
||||
iplSDChannelObj_813E3858(channel);
|
||||
iplSDChannelObj_createBaseLayout(channel);
|
||||
channel->mState = 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_calc(SDChannelObj* channel) {
|
||||
switch (channel->mState) {
|
||||
case 0:
|
||||
channel->mState = 2;
|
||||
@@ -157,25 +157,25 @@ namespace ipl {
|
||||
break;
|
||||
channel->mState = 2;
|
||||
case 2:
|
||||
iplSDChannelObj_813E3858(channel);
|
||||
iplSDChannelObj_createBaseLayout(channel);
|
||||
channel->mState = 3;
|
||||
break;
|
||||
case 3:
|
||||
iplSDChannelObj_813E3B1C(channel);
|
||||
iplSDChannelObj_syncLayoutsToPane(channel);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel) {
|
||||
if (SDChannelSelect::isChannelReady(channel))
|
||||
channel->mpBaseLayout->draw();
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel) {
|
||||
channel->mpPageLayout->draw();
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel) {
|
||||
if (channel->mpDialogLayout != NULL)
|
||||
channel->mpDialogLayout->draw();
|
||||
}
|
||||
@@ -184,14 +184,14 @@ namespace ipl {
|
||||
return (nw4r::math::VEC3&)mpBaseLayout->GetRootPane()->GetTranslate();
|
||||
}
|
||||
|
||||
extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel) {
|
||||
extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel) {
|
||||
if (channel->mStateFlags == 0 || channel->mStateFlags == 3)
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int request) {
|
||||
extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int request) {
|
||||
if (request & 0x10000U) {
|
||||
channel->mAnimationState = 0;
|
||||
} else if (request & 0x20000U) {
|
||||
@@ -201,14 +201,14 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if (!(request & 1)) {
|
||||
iplSDChannelObj_813E3C9C(channel, 1);
|
||||
iplSDChannelObj_setPageAnim(channel, 1);
|
||||
}
|
||||
if (!(request & 2)) {
|
||||
iplSDChannelObj_813E4558(channel, 1);
|
||||
iplSDChannelObj_setDialogAnim(channel, 1);
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int request) {
|
||||
extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int request) {
|
||||
if (request & 0x10000U) {
|
||||
channel->mAnimationState = 0;
|
||||
} else if (request & 0x20000U) {
|
||||
@@ -218,44 +218,44 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if (!(request & 1)) {
|
||||
iplSDChannelObj_813E3C9C(channel, 3);
|
||||
iplSDChannelObj_setPageAnim(channel, 3);
|
||||
}
|
||||
if (!(request & 2)) {
|
||||
iplSDChannelObj_813E4558(channel, 4);
|
||||
iplSDChannelObj_setDialogAnim(channel, 4);
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool request) {
|
||||
extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool request) {
|
||||
if (request) {
|
||||
iplSDChannelObj_813E3C9C(channel, 1);
|
||||
iplSDChannelObj_setPageAnim(channel, 1);
|
||||
channel->mAnimationState = 1;
|
||||
} else {
|
||||
iplSDChannelObj_813E3C9C(channel, 0);
|
||||
iplSDChannelObj_setPageAnim(channel, 0);
|
||||
channel->mAnimationState = 0;
|
||||
}
|
||||
|
||||
iplSDChannelObj_813E4558(channel, 0);
|
||||
iplSDChannelObj_setDialogAnim(channel, 0);
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel) {
|
||||
iplSDChannelObj_813E3C9C(channel, 4);
|
||||
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel) {
|
||||
iplSDChannelObj_setPageAnim(channel, 4);
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int request) {
|
||||
iplSDChannelObj_813E3C9C(channel, 0);
|
||||
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int request) {
|
||||
iplSDChannelObj_setPageAnim(channel, 0);
|
||||
if (request) {
|
||||
channel->mAnimationState = 0;
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, bool request) {
|
||||
iplSDChannelObj_813E4558(channel, 0);
|
||||
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, bool request) {
|
||||
iplSDChannelObj_setDialogAnim(channel, 0);
|
||||
if (request) {
|
||||
channel->mAnimationState = 0;
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3580(const layout::Object* layout) {
|
||||
extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) {
|
||||
int lang = System::getLanguage();
|
||||
const char* langGroup = scLangGroups[lang];
|
||||
char availableLanguages[10][4] = {};
|
||||
@@ -319,18 +319,18 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3858(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_createBaseLayout(SDChannelObj* channel) {
|
||||
bool adjust = false;
|
||||
if (channel->mpDialogLayout == NULL)
|
||||
iplSDChannelObj_813E3F74(channel);
|
||||
iplSDChannelObj_createDialogLayout(channel);
|
||||
f32 frame;
|
||||
if (iplSDChannelObj_813E3330(channel))
|
||||
frame = iplSDChannelObj_813E3920(channel);
|
||||
if (iplSDChannelObj_hasAppMeta(channel))
|
||||
frame = iplSDChannelObj_createIconLayout(channel);
|
||||
else {
|
||||
frame = iplSDChannelObj_813E3A84(channel);
|
||||
frame = iplSDChannelObj_createMenuLayout(channel);
|
||||
adjust = true;
|
||||
}
|
||||
iplSDChannelObj_813E3B1C(channel);
|
||||
iplSDChannelObj_syncLayoutsToPane(channel);
|
||||
if (channel->mpBaseAnimator != NULL)
|
||||
channel->mpBaseAnimator->play();
|
||||
channel->mpBaseLayout->finishBinding();
|
||||
@@ -340,11 +340,11 @@ namespace ipl {
|
||||
channel->mpBaseLayout->adjustHeap();
|
||||
}
|
||||
|
||||
extern "C" f32 iplSDChannelObj_813E3920(SDChannelObj* channel) {
|
||||
extern "C" f32 iplSDChannelObj_createIconLayout(SDChannelObj* channel) {
|
||||
f32 frame = 0.0f;
|
||||
channel->mpBaseLayout =
|
||||
layout::Object::create(channel->mpHeap, 0x8000, channel->mpThumbnailData, "arc", "icon.brlyt");
|
||||
iplSDChannelObj_813E3580(channel->mpBaseLayout);
|
||||
iplSDChannelObj_applyLanguageGroups(channel->mpBaseLayout);
|
||||
if (channel->mpBaseLayout->searchFile("icon.brlan"))
|
||||
channel->mpBaseAnimator = channel->mpBaseLayout->bind("icon.brlan");
|
||||
else if (channel->mpBaseLayout->searchFile("icon_Whole.brlan"))
|
||||
@@ -357,30 +357,30 @@ namespace ipl {
|
||||
frame = minimum + (System::getRndm()->get_u16() % (u16)(maximum - minimum));
|
||||
}
|
||||
if (channel->mStateFlags == 0) {
|
||||
iplSDChannelObj_813E481C(channel, channel->mpBaseLayout);
|
||||
iplSDChannelObj_findNewMessageGroup(channel, channel->mpBaseLayout);
|
||||
channel->mNewMessageState = 1;
|
||||
}
|
||||
return frame;
|
||||
}
|
||||
|
||||
extern "C" f32 iplSDChannelObj_813E3A84(SDChannelObj* channel) {
|
||||
extern "C" f32 iplSDChannelObj_createMenuLayout(SDChannelObj* channel) {
|
||||
channel->mpBaseLayout =
|
||||
layout::Object::create(channel->mpHeap, 0x8000, channel->mpLayoutFile, "arc", "mn_SdcardMenu_d.brlyt");
|
||||
channel->mpBaseAnimator = channel->mpBaseLayout->bind("mn_SdcardMenu_d.brlan");
|
||||
return System::getRndm()->get_u16() % 2000;
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3B1C(SDChannelObj* channel) {
|
||||
iplSDChannelObj_813E49A8(channel);
|
||||
extern "C" void iplSDChannelObj_syncLayoutsToPane(SDChannelObj* channel) {
|
||||
iplSDChannelObj_updateNewMessage(channel);
|
||||
nw4r::math::VEC3 position(0, 0, 0);
|
||||
MTXMultVec(channel->mpPane->GetGlobalMtx(), position, position);
|
||||
channel->mpBaseLayout->GetRootPane()->SetTranslate(position);
|
||||
channel->mpBaseLayout->calc();
|
||||
iplSDChannelObj_813E3C58(channel, position);
|
||||
iplSDChannelObj_813E4410(channel, position);
|
||||
iplSDChannelObj_setPageTranslate(channel, position);
|
||||
iplSDChannelObj_positionDialog(channel, position);
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3BA0(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_createPageLayout(SDChannelObj* channel) {
|
||||
channel->mpPageLayout = new (channel->mpDialogHeap, 4)
|
||||
layout::Object(channel->mpDialogHeap, channel->mpLayoutFile, "arc", "my_IplTop_d.brlyt");
|
||||
|
||||
@@ -388,17 +388,17 @@ namespace ipl {
|
||||
channel->mpPageAnimators[i] = channel->mpPageLayout->bind(scCursorAnims[i], scCursur, false);
|
||||
}
|
||||
|
||||
iplSDChannelObj_813E3C9C(channel, 0);
|
||||
iplSDChannelObj_setPageAnim(channel, 0);
|
||||
channel->mpPageLayout->finishBinding();
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3C58(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
|
||||
extern "C" void iplSDChannelObj_setPageTranslate(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
|
||||
channel->mpPageLayout->GetRootPane()->SetTranslate(vec);
|
||||
iplSDChannelObj_813E3E38(channel);
|
||||
iplSDChannelObj_updatePageAnim(channel);
|
||||
channel->mpPageLayout->calc();
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3C9C(SDChannelObj* channel, int request) {
|
||||
extern "C" void iplSDChannelObj_setPageAnim(SDChannelObj* channel, int request) {
|
||||
if (request == 0) {
|
||||
channel->mPageAnimation = 0;
|
||||
channel->mPageAnimationFrame = 0;
|
||||
@@ -413,14 +413,14 @@ namespace ipl {
|
||||
channel->mPageAnimation = 4;
|
||||
channel->mPageAnimationFrame = 0;
|
||||
channel->mpPageLayout->GetRootPane()->SetVisible(true);
|
||||
iplSDChannelObj_813E3F28(channel, 2);
|
||||
iplSDChannelObj_playPageAnimator(channel, 2);
|
||||
} else {
|
||||
switch (channel->mPageAnimation) {
|
||||
case 0: {
|
||||
if (request == 1) {
|
||||
channel->mPageAnimation = 1;
|
||||
channel->mpPageLayout->GetRootPane()->SetVisible(true);
|
||||
iplSDChannelObj_813E3F28(channel, 1);
|
||||
iplSDChannelObj_playPageAnimator(channel, 1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -437,7 +437,7 @@ namespace ipl {
|
||||
case 2: {
|
||||
if (request == 3) {
|
||||
channel->mPageAnimation = 3;
|
||||
iplSDChannelObj_813E3F28(channel, 0);
|
||||
iplSDChannelObj_playPageAnimator(channel, 0);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -453,7 +453,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3E38(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_updatePageAnim(SDChannelObj* channel) {
|
||||
switch (channel->mPageAnimation) {
|
||||
case 1: {
|
||||
if (!channel->mpPageAnimators[1]->isPlaying()) {
|
||||
@@ -472,7 +472,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
if (prev == 3) {
|
||||
iplSDChannelObj_813E3C9C(channel, 3);
|
||||
iplSDChannelObj_setPageAnim(channel, 3);
|
||||
channel->mPageAnimationFrame = 0;
|
||||
}
|
||||
}
|
||||
@@ -481,46 +481,46 @@ namespace ipl {
|
||||
case 3: {
|
||||
if (!channel->mpPageAnimators[0]->isPlaying()) {
|
||||
int prev = channel->mPageAnimationFrame;
|
||||
iplSDChannelObj_813E3C9C(channel, 0);
|
||||
iplSDChannelObj_setPageAnim(channel, 0);
|
||||
if (prev == 1) {
|
||||
iplSDChannelObj_813E3C9C(channel, 1);
|
||||
iplSDChannelObj_setPageAnim(channel, 1);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
if (!channel->mpPageAnimators[2]->isPlaying()) {
|
||||
iplSDChannelObj_813E3C9C(channel, 0);
|
||||
iplSDChannelObj_setPageAnim(channel, 0);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3F28(SDChannelObj* channel, int request) {
|
||||
extern "C" void iplSDChannelObj_playPageAnimator(SDChannelObj* channel, int request) {
|
||||
channel->mpPageAnimators[request]->setAnmType(ANIM_TYPE_FORWARD);
|
||||
channel->mpPageAnimators[request]->play();
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3F74(SDChannelObj* channel) {
|
||||
if (!iplSDChannelObj_813E3330(channel)) {
|
||||
extern "C" void iplSDChannelObj_createDialogLayout(SDChannelObj* channel) {
|
||||
if (!iplSDChannelObj_hasAppMeta(channel)) {
|
||||
channel->mpDialogLayout = NULL;
|
||||
return;
|
||||
}
|
||||
channel->mpDialogLayout = new (channel->mpChannelHeap, 4)
|
||||
layout::Object(channel->mpChannelHeap, channel->mpLayoutFile, "arc", "my_IplTopBalloon_a.brlyt");
|
||||
if (channel->mStateFlags == 0)
|
||||
iplSDChannelObj_813E413C(channel, iplSDChannelObj_813E4060(channel, 0));
|
||||
iplSDChannelObj_setBalloonText(channel, iplSDChannelObj_getLocalizedName(channel, 0));
|
||||
else if (channel->mStateFlags == 3)
|
||||
iplSDChannelObj_813E413C(channel, scUnknownName);
|
||||
iplSDChannelObj_setBalloonText(channel, scUnknownName);
|
||||
else
|
||||
iplSDChannelObj_813E413C(channel, L"");
|
||||
iplSDChannelObj_setBalloonText(channel, L"");
|
||||
channel->mpDialogAnimator = channel->mpDialogLayout->bind("my_IplTopBalloon_a_BalloonInOut.brlan");
|
||||
iplSDChannelObj_813E4558(channel, 0);
|
||||
iplSDChannelObj_setDialogAnim(channel, 0);
|
||||
channel->mpDialogLayout->finishBinding();
|
||||
}
|
||||
|
||||
extern "C" const wchar_t* iplSDChannelObj_813E4060(SDChannelObj* channel, int index) {
|
||||
extern "C" const wchar_t* iplSDChannelObj_getLocalizedName(SDChannelObj* channel, int index) {
|
||||
if (channel->mAppMeta.metaHdr.names[System::getLanguage()][index][0] != 0)
|
||||
return channel->mAppMeta.metaHdr.names[System::getLanguage()][index];
|
||||
const u32* languages = scLangLookup[System::getRegion()];
|
||||
@@ -533,7 +533,7 @@ namespace ipl {
|
||||
return channel->mAppMeta.metaHdr.names[languages[0]][index];
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E413C(SDChannelObj* channel, const wchar_t* text) {
|
||||
extern "C" void iplSDChannelObj_setBalloonText(SDChannelObj* channel, const wchar_t* text) {
|
||||
nw4r::lyt::TextBox* textPane =
|
||||
nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(channel->mpDialogLayout->FindPaneByName(scBalloon));
|
||||
|
||||
@@ -585,7 +585,7 @@ namespace ipl {
|
||||
channel->mpDialogLayout->FindPaneByName(scBase)->SetSize(newSize);
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E4410(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
|
||||
extern "C" void iplSDChannelObj_positionDialog(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
|
||||
if (channel->mpDialogLayout != NULL) {
|
||||
nw4r::lyt::Size size;
|
||||
|
||||
@@ -611,12 +611,12 @@ namespace ipl {
|
||||
const nw4r::math::VEC3 pos(vec.x + horizontalOffset, vec.y + verticalOffset, 0.0f);
|
||||
channel->mpDialogLayout->GetRootPane()->SetTranslate(pos);
|
||||
|
||||
iplSDChannelObj_813E4704(channel);
|
||||
iplSDChannelObj_updateDialogAnim(channel);
|
||||
channel->mpDialogLayout->calc();
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E4558(SDChannelObj* channel, int request) {
|
||||
extern "C" void iplSDChannelObj_setDialogAnim(SDChannelObj* channel, int request) {
|
||||
if (channel->mpDialogLayout != NULL) {
|
||||
if (request == 0) {
|
||||
channel->mDialogState = 0;
|
||||
@@ -676,11 +676,11 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E4704(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_updateDialogAnim(SDChannelObj* channel) {
|
||||
switch (channel->mDialogState) {
|
||||
case 1: {
|
||||
if ((reinterpret_cast<u32&>(channel->mDialogTimer) += 1) >= 20.0f) {
|
||||
iplSDChannelObj_813E4558(channel, 2);
|
||||
iplSDChannelObj_setDialogAnim(channel, 2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -690,9 +690,9 @@ namespace ipl {
|
||||
case 2: {
|
||||
if (!channel->mpDialogLayout->isPlaying(0)) {
|
||||
int prev = channel->mDialogFrame;
|
||||
iplSDChannelObj_813E4558(channel, 3);
|
||||
iplSDChannelObj_setDialogAnim(channel, 3);
|
||||
if (prev == 4) {
|
||||
iplSDChannelObj_813E4558(channel, 4);
|
||||
iplSDChannelObj_setDialogAnim(channel, 4);
|
||||
channel->mDialogFrame = 0;
|
||||
}
|
||||
}
|
||||
@@ -701,9 +701,9 @@ namespace ipl {
|
||||
case 4: {
|
||||
if (!channel->mpDialogLayout->isPlaying(0)) {
|
||||
int prev = channel->mDialogFrame;
|
||||
iplSDChannelObj_813E4558(channel, 0);
|
||||
iplSDChannelObj_setDialogAnim(channel, 0);
|
||||
if (prev == 1) {
|
||||
iplSDChannelObj_813E4558(channel, 1);
|
||||
iplSDChannelObj_setDialogAnim(channel, 1);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -711,7 +711,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E481C(SDChannelObj* channel, layout::Object* layout) {
|
||||
extern "C" void iplSDChannelObj_findNewMessageGroup(SDChannelObj* channel, layout::Object* layout) {
|
||||
char groupName[20];
|
||||
char** lookup;
|
||||
nw4r::lyt::Group* group;
|
||||
@@ -752,11 +752,11 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E49A8(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_updateNewMessage(SDChannelObj* channel) {
|
||||
if (System::getNwc24Manager() != NULL) {
|
||||
switch (channel->mNewMessageState) {
|
||||
case 1: {
|
||||
if (iplSDChannelObj_813E4A54(channel)) {
|
||||
if (iplSDChannelObj_checkNewMessage(channel)) {
|
||||
channel->mNewMessageState = 2;
|
||||
channel->mNewMessageFrame = 0;
|
||||
}
|
||||
@@ -772,7 +772,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" BOOL iplSDChannelObj_813E4A54(SDChannelObj* channel) {
|
||||
extern "C" BOOL iplSDChannelObj_checkNewMessage(SDChannelObj* channel) {
|
||||
if (System::getNwc24Manager() == NULL || !System::getNwc24Manager()->getNewTitleTbl(NULL)) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -107,13 +107,8 @@ namespace ipl {
|
||||
|
||||
|
||||
|
||||
extern "C" bool iplSDChannelSelect_813DD240(
|
||||
SDChannelSelect* scene, const s32* requiredBytes, const s32* requiredBlocks,
|
||||
ESTitleId* titleIds, char* titleNames, u32* titleCount);
|
||||
|
||||
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, int enabled);
|
||||
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, int enabled);
|
||||
|
||||
SDChannelSelect::SDChannelSelect(EGG::Heap* heap)
|
||||
: FaderSceneBase(heap),
|
||||
@@ -213,7 +208,7 @@ namespace ipl {
|
||||
SDChannelObj* channel = NULL;
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
iplSDChannelObj_813E3104(channel);
|
||||
iplSDChannelObj_activateIfIdle(channel);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -571,7 +566,7 @@ namespace ipl {
|
||||
mWorkerCommand = 11;
|
||||
break;
|
||||
case 12:
|
||||
mpSDWorker->iplNandSD_81348EA8(
|
||||
mpSDWorker->check_sd_app_titles_async(
|
||||
command.arguments.pointers[0], command.arguments.pointers[1],
|
||||
command.arguments.pointers[2]);
|
||||
mWorkerCommand = 12;
|
||||
@@ -602,7 +597,7 @@ namespace ipl {
|
||||
mpCurrentLoadedChannel = loadedChannel;
|
||||
mpSDWorker->get_sd_app_meta_async(
|
||||
static_cast<ESTitleId32>(notice.titleId),
|
||||
static_cast<u8*>(iplSDChannelObj_813E3128(loadedChannel)),
|
||||
static_cast<u8*>(iplSDChannelObj_getOrAllocThumbnailData(loadedChannel)),
|
||||
&loadedChannel->mAppMeta);
|
||||
mWorkerCommand = 3;
|
||||
}
|
||||
@@ -845,9 +840,9 @@ namespace ipl {
|
||||
SDChannelObj* completed = mpCurrentLoadedChannel;
|
||||
completed->mStateFlags = 0;
|
||||
completed->mState = 2;
|
||||
DCFlushRange(iplSDChannelObj_813E3128(mpCurrentLoadedChannel), 0x19000);
|
||||
DCFlushRange(iplSDChannelObj_getOrAllocThumbnailData(mpCurrentLoadedChannel), 0x19000);
|
||||
} else {
|
||||
memcpy(iplSDChannelObj_813E3128(mpCurrentLoadedChannel),
|
||||
memcpy(iplSDChannelObj_getOrAllocThumbnailData(mpCurrentLoadedChannel),
|
||||
mpCorruptIconFile->getBuffer(), mpCorruptIconFile->getLength());
|
||||
memset(&mpCurrentLoadedChannel->mAppMeta, 0, sizeof(mpCurrentLoadedChannel->mAppMeta));
|
||||
SDChannelObj* completed = mpCurrentLoadedChannel;
|
||||
@@ -1037,52 +1032,52 @@ namespace ipl {
|
||||
}
|
||||
|
||||
switch (mWorkerCommand) {
|
||||
case 0:
|
||||
case 1:
|
||||
processWorkerCommands();
|
||||
break;
|
||||
case 1:
|
||||
case 0:
|
||||
handleNandTitleUsageComplete();
|
||||
break;
|
||||
case 2:
|
||||
handleSDTitleList();
|
||||
break;
|
||||
case 3:
|
||||
case 4:
|
||||
handleSDMountComplete();
|
||||
break;
|
||||
case 4:
|
||||
case 5:
|
||||
handleSDTitleListResult();
|
||||
break;
|
||||
case 5:
|
||||
case 3:
|
||||
handleSDChannelUpdateComplete();
|
||||
break;
|
||||
case 6:
|
||||
case 7:
|
||||
handleCopyComplete();
|
||||
break;
|
||||
case 7:
|
||||
case 8:
|
||||
handleSDLocationUpdateComplete();
|
||||
break;
|
||||
case 8:
|
||||
case 9:
|
||||
handleSDLocationReadComplete();
|
||||
break;
|
||||
case 9:
|
||||
case 10:
|
||||
handleMoveComplete();
|
||||
break;
|
||||
case 10:
|
||||
case 11:
|
||||
handleBackupFitComplete();
|
||||
break;
|
||||
case 11:
|
||||
case 12:
|
||||
handleNandSDCleanupComplete();
|
||||
break;
|
||||
case 12:
|
||||
case 13:
|
||||
handleSDDeleteComplete();
|
||||
break;
|
||||
case 13:
|
||||
case 6:
|
||||
handleSDCardReady();
|
||||
break;
|
||||
case 14:
|
||||
case 15:
|
||||
handleCardCommand();
|
||||
break;
|
||||
case 15:
|
||||
case 14:
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1749,79 +1744,79 @@ namespace ipl {
|
||||
}
|
||||
|
||||
switch (state) {
|
||||
case 0:
|
||||
case 1:
|
||||
processNormalInput();
|
||||
break;
|
||||
case 1:
|
||||
case 8:
|
||||
case 9:
|
||||
setPageActionFrame();
|
||||
break;
|
||||
case 2:
|
||||
case 10:
|
||||
case 11:
|
||||
finishPageScroll();
|
||||
break;
|
||||
case 3:
|
||||
case 5:
|
||||
createChildScene(0x23, this, NULL, this);
|
||||
mState = 6;
|
||||
break;
|
||||
case 4:
|
||||
case 7:
|
||||
advancePageAnimation();
|
||||
break;
|
||||
case 5:
|
||||
case 12:
|
||||
mState = 13;
|
||||
break;
|
||||
case 6:
|
||||
case 14:
|
||||
initializeNormalPage();
|
||||
break;
|
||||
case 7:
|
||||
case 15:
|
||||
updateDragState();
|
||||
break;
|
||||
case 8:
|
||||
case 16:
|
||||
updateDragPageTransition();
|
||||
break;
|
||||
case 9:
|
||||
case 17:
|
||||
finishDragWait();
|
||||
break;
|
||||
case 10:
|
||||
case 18:
|
||||
finishDragPageTransition();
|
||||
break;
|
||||
case 11:
|
||||
case 19:
|
||||
applyChannelMove();
|
||||
break;
|
||||
case 12:
|
||||
case 20:
|
||||
finishChannelMove();
|
||||
break;
|
||||
case 13:
|
||||
case 21:
|
||||
resetDragPreview();
|
||||
break;
|
||||
case 14:
|
||||
finishDragPageChange();
|
||||
break;
|
||||
case 15:
|
||||
handleFourPageDialog();
|
||||
break;
|
||||
case 16:
|
||||
flushSaveDataAndMountSD();
|
||||
break;
|
||||
case 17:
|
||||
handleThreePageDialog();
|
||||
break;
|
||||
case 18:
|
||||
finishCardDialog();
|
||||
break;
|
||||
case 19:
|
||||
finishDialogOperation();
|
||||
break;
|
||||
case 20:
|
||||
finishDialogTransition();
|
||||
break;
|
||||
case 21:
|
||||
case 22:
|
||||
case 23:
|
||||
finishDragPageChange();
|
||||
break;
|
||||
case 24:
|
||||
handleFourPageDialog();
|
||||
break;
|
||||
case 25:
|
||||
flushSaveDataAndMountSD();
|
||||
break;
|
||||
case 26:
|
||||
handleThreePageDialog();
|
||||
break;
|
||||
case 27:
|
||||
finishCardDialog();
|
||||
break;
|
||||
case 28:
|
||||
finishDialogOperation();
|
||||
break;
|
||||
case 29:
|
||||
finishDialogTransition();
|
||||
break;
|
||||
case 0:
|
||||
case 2:
|
||||
case 3:
|
||||
case 4:
|
||||
case 6:
|
||||
case 13:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -1835,9 +1830,9 @@ namespace ipl {
|
||||
int channelIndex = channel->getIndex();
|
||||
if (channelPage == mCurrentPage) {
|
||||
if (mState != 5 || channelIndex != mCurrentChannelIndex) {
|
||||
iplSDChannelObj_813E34E8(channel, 1);
|
||||
iplSDChannelObj_resetPageAnim(channel, 1);
|
||||
}
|
||||
iplSDChannelObj_813E3534(channel, 1);
|
||||
iplSDChannelObj_resetDialogAnim(channel, 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2059,19 +2054,19 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SDChannelSelect::updateChannelObject(SDChannelObj* channel) {
|
||||
iplSDChannelObj_813E3104(channel);
|
||||
iplSDChannelObj_813E311C(channel, mpDialogHeap, mpChannelHeap);
|
||||
iplSDChannelObj_813E3178(channel,
|
||||
iplSDChannelObj_activateIfIdle(channel);
|
||||
iplSDChannelObj_setHeaps(channel, mpDialogHeap, mpChannelHeap);
|
||||
iplSDChannelObj_setPane(channel,
|
||||
getChannelBasePane(channel->getPage(), channel->getIndex(),
|
||||
mCurrentPage));
|
||||
iplSDChannelObj_813E3180(channel, mpLayoutFile);
|
||||
iplSDChannelObj_setLayoutFile(channel, mpLayoutFile);
|
||||
}
|
||||
|
||||
void SDChannelSelect::calcChannelObjects() {
|
||||
SDChannelObj* channel = NULL;
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
iplSDChannelObj_813E322C(channel);
|
||||
iplSDChannelObj_calc(channel);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2086,9 +2081,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
setChannelScissor(channel);
|
||||
iplSDChannelObj_813E32C8(channel);
|
||||
iplSDChannelObj_drawBase(channel);
|
||||
|
||||
if (iplSDChannelObj_813E3330(channel)) {
|
||||
if (iplSDChannelObj_hasAppMeta(channel)) {
|
||||
switch (mState) {
|
||||
case 15:
|
||||
case 16:
|
||||
@@ -2154,7 +2149,7 @@ namespace ipl {
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
if (hasChannelObject(channel->getPage(), channel->getIndex())) {
|
||||
iplSDChannelObj_813E3304(channel);
|
||||
iplSDChannelObj_drawPage(channel);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2162,7 +2157,7 @@ namespace ipl {
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
if (hasChannelObject(channel->getPage(), channel->getIndex())) {
|
||||
iplSDChannelObj_813E330C(channel);
|
||||
iplSDChannelObj_drawDialog(channel);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2296,7 +2291,7 @@ namespace ipl {
|
||||
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
int titleIndex = channel->getPage() * MAX_CHANNEL_INDEX + channel->getIndex();
|
||||
if (!iplSDChannelObj_813E3330(channel) && mpChannelTitleIds[titleIndex] != 0 &&
|
||||
if (!iplSDChannelObj_hasAppMeta(channel) && mpChannelTitleIds[titleIndex] != 0 &&
|
||||
mbNeedsRefresh) {
|
||||
channel->mStateFlags = 2;
|
||||
}
|
||||
@@ -2391,7 +2386,7 @@ namespace ipl {
|
||||
while (channel = static_cast<SDChannelObj*>(
|
||||
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
if (iplSDChannelObj_813E3330(channel)) {
|
||||
if (iplSDChannelObj_hasAppMeta(channel)) {
|
||||
SDChannelObj* previous = static_cast<SDChannelObj*>(
|
||||
nw4r::ut::List_GetPrev(&mChannelObjects, channel));
|
||||
nw4r::ut::List_Remove(&mChannelObjects, channel);
|
||||
@@ -2418,7 +2413,7 @@ namespace ipl {
|
||||
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
int channelIndex = channel->mPage * 12 + channel->mIndex;
|
||||
if (!iplSDChannelObj_813E3330(channel) &&
|
||||
if (!iplSDChannelObj_hasAppMeta(channel) &&
|
||||
mpChannelTitleIds[channelIndex] != 0) {
|
||||
channel->mStateFlags = 2;
|
||||
}
|
||||
@@ -2634,7 +2629,7 @@ namespace ipl {
|
||||
initPageAnimations(
|
||||
math::VEC3((nw4r::math::VEC3&)channel->mpBaseLayout->GetRootPane()->GetTranslate()),
|
||||
0);
|
||||
iplSDChannelObj_813E34E0(channel);
|
||||
iplSDChannelObj_playPageHide(channel);
|
||||
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
if (mbLeftArrowVisible) {
|
||||
@@ -2982,7 +2977,7 @@ namespace ipl {
|
||||
while (channel = static_cast<SDChannelObj*>(
|
||||
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
iplSDChannelObj_813E34E8(channel, 1);
|
||||
iplSDChannelObj_resetPageAnim(channel, 1);
|
||||
}
|
||||
|
||||
for (int index = 0; index < MAX_CHANNEL_INDEX; ++index) {
|
||||
@@ -3004,7 +2999,7 @@ namespace ipl {
|
||||
while (channel = static_cast<SDChannelObj*>(
|
||||
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
iplSDChannelObj_813E34E8(channel, 1);
|
||||
iplSDChannelObj_resetPageAnim(channel, 1);
|
||||
}
|
||||
|
||||
for (int index = 0; index < MAX_CHANNEL_INDEX; ++index) {
|
||||
@@ -3066,10 +3061,10 @@ namespace ipl {
|
||||
} else {
|
||||
SDChannelObj* destination = findChannelObject(mDestinationPage, mDestinationIndex);
|
||||
|
||||
iplSDChannelObj_813E3178(
|
||||
iplSDChannelObj_setPane(
|
||||
static_cast<SDChannelObj*>(mpCurrentChannel),
|
||||
getChannelBasePane(mDestinationPage, mDestinationIndex, mCurrentPage));
|
||||
iplSDChannelObj_813E3178(
|
||||
iplSDChannelObj_setPane(
|
||||
destination, getChannelBasePane(mSourcePage, mSourceIndex, mCurrentPage));
|
||||
|
||||
SDChannelObj* current;
|
||||
@@ -3083,8 +3078,8 @@ namespace ipl {
|
||||
destination->mPage = sourcePage;
|
||||
destination->mIndex = sourceIndex;
|
||||
|
||||
iplSDChannelObj_813E322C(static_cast<SDChannelObj*>(mpCurrentChannel));
|
||||
iplSDChannelObj_813E322C(destination);
|
||||
iplSDChannelObj_calc(static_cast<SDChannelObj*>(mpCurrentChannel));
|
||||
iplSDChannelObj_calc(destination);
|
||||
|
||||
mpCurrentChannel = transitionAnimator;
|
||||
destination->mpBaseAnimator->setCurrentFrame(mpHelpLayout->getCurrentFrame());
|
||||
@@ -3208,7 +3203,7 @@ namespace ipl {
|
||||
if (isChannelMoveTarget(mCurrentPage, index) ||
|
||||
(mCurrentPage == mSourcePage && index == mSourceIndex)) {
|
||||
SDChannelObj* channel = findChannelObject(mCurrentPage, index);
|
||||
iplSDChannelObj_813E3354(channel, 2);
|
||||
iplSDChannelObj_startAppear(channel, 2);
|
||||
snd::getSystem()->startSE("WIPL_SE_CH_TARGETTING");
|
||||
controller->rumble(1);
|
||||
}
|
||||
@@ -3217,7 +3212,7 @@ namespace ipl {
|
||||
if (isChannelMoveTarget(mCurrentPage, index) ||
|
||||
(mCurrentPage == mSourcePage && index == mSourceIndex)) {
|
||||
SDChannelObj* channel = findChannelObject(mCurrentPage, index);
|
||||
iplSDChannelObj_813E33EC(channel, 2);
|
||||
iplSDChannelObj_startDisappear(channel, 2);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@@ -3297,7 +3292,7 @@ namespace ipl {
|
||||
int channelPage = channel->getPage();
|
||||
int channelIndex = channel->getIndex();
|
||||
bool selected = channelPage == page && channelIndex == index;
|
||||
iplSDChannelObj_813E3480(channel, selected);
|
||||
iplSDChannelObj_setSelected(channel, selected);
|
||||
}
|
||||
|
||||
snd::getSystem()->startSEwithPos("WIPL_SE_CH_HOLD", mPointerPosition.x);
|
||||
@@ -3333,7 +3328,7 @@ namespace ipl {
|
||||
SDChannelObj* channel = NULL;
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
iplSDChannelObj_813E34E8(channel, 1);
|
||||
iplSDChannelObj_resetPageAnim(channel, 1);
|
||||
}
|
||||
|
||||
for (int index = 0; index < MAX_CHANNEL_INDEX; ++index) {
|
||||
@@ -3432,14 +3427,14 @@ namespace ipl {
|
||||
break;
|
||||
case ::gui::EventHandler::ON_POINT:
|
||||
if (mpScene->mState == 1 && SDChannelSelect::isChannelReady(channel)) {
|
||||
iplSDChannelObj_813E3354(channel, 0);
|
||||
iplSDChannelObj_startAppear(channel, 0);
|
||||
snd::getSystem()->startSE("WIPL_SE_CH_TARGETTING");
|
||||
controller->rumble(1);
|
||||
}
|
||||
break;
|
||||
case ::gui::EventHandler::ON_LEFT:
|
||||
if (mpScene->mState == 1 && SDChannelSelect::isChannelReady(channel)) {
|
||||
iplSDChannelObj_813E33EC(channel, 0);
|
||||
iplSDChannelObj_startDisappear(channel, 0);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -290,25 +290,25 @@ extern int SORecvFrom(int socket, void* buffer, int length, int flags, void* add
|
||||
extern int SOSendTo(int socket, const void* buffer, int length, int flags, const void* address);
|
||||
extern int SOBind(int socket, const void* address);
|
||||
|
||||
int AOSS_813FFD68(AOSSInitInput* input);
|
||||
int AOSSValidateInitConfig(AOSSInitInput* input);
|
||||
int AOSS_CheckAP(AOSSAccessPointRecord* list);
|
||||
int AOSS_814001B4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request, int socket);
|
||||
int AOSS_814002F0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
|
||||
int AOSS_814004D0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
|
||||
int AOSS_814006A4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
|
||||
int AOSS_81400830(AOSSDecryptionMessage* message);
|
||||
int AOSS_81400D34(u16 command, const u8* manufacturerAddress);
|
||||
int AOSS_81401104(const AOSSOptionRecord* packet, AOSSStoredConfig* config);
|
||||
int AOSS_81401284(const AOSSOptionRecord* packet, AOSSStoredConfig* config);
|
||||
void AOSS_81401C9C(AOSSKeySchedule* schedule, const u8* key, u32 keyLength, u32 stateLength);
|
||||
void AOSS_81401DC0(u32 seed, u32* table);
|
||||
s16 AOSS_81401BBC(void* buffer);
|
||||
int AOSS_81401574(void* packet, AOSSRequestRecords* request, int socket);
|
||||
int AOSS_81401778(void* packet, void* request, int socket);
|
||||
int AOSS_81401E80(void* packet, s32 length, char* key, int keyLength);
|
||||
int AOSS_814020CC(void* settings, void* config);
|
||||
int AOSS_81400E0C(const AOSSOptionRecord* packet, u8* settings);
|
||||
int AOSS_814013AC(int state, const AOSSReplyOption* response, int responseLength, void* config, void* networkData);
|
||||
int AOSSDispatchReceiveState(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request, int socket);
|
||||
int AOSSHandleDiscoverReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
|
||||
int AOSSHandleAuthReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
|
||||
int AOSSHandleFinalReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
|
||||
int AOSSDecryptMessage(AOSSDecryptionMessage* message);
|
||||
int AOSSCheckAccessPointName(u16 command, const u8* manufacturerAddress);
|
||||
int AOSSParseWepConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config);
|
||||
int AOSSParsePskConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config);
|
||||
void AOSSInitKeySchedule(AOSSKeySchedule* schedule, const u8* key, u32 keyLength, u32 stateLength);
|
||||
void AOSSInitCrc32Table(u32 seed, u32* table);
|
||||
s16 AOSSBuildInterfaceOption(void* buffer);
|
||||
int AOSSSendDiscoveryRequest(void* packet, AOSSRequestRecords* request, int socket);
|
||||
int AOSSSendHelloRequest(void* packet, void* request, int socket);
|
||||
int AOSSXorBufferWithKey(void* packet, s32 length, char* key, int keyLength);
|
||||
int AOSSConnectAndAwaitHost(void* settings, void* config);
|
||||
int AOSSParseNetworkSettings(const AOSSOptionRecord* packet, u8* settings);
|
||||
int AOSSApplyAuthOptions(int state, const AOSSReplyOption* response, int responseLength, void* config, void* networkData);
|
||||
|
||||
int AOSSi_Init(AOSSInitInput* input) {
|
||||
int result;
|
||||
@@ -652,7 +652,7 @@ int AOSS_Init_old(AOSSInitInput* input)
|
||||
}
|
||||
goto finish_initialization;
|
||||
wait_for_initial_link:
|
||||
state = AOSS_814020CC(&settings,s_accessPointConfig);
|
||||
state = AOSSConnectAndAwaitHost(&settings,s_accessPointConfig);
|
||||
if (state == -1) {
|
||||
input->status = 0xf;
|
||||
if (s_accessPointConfig) {
|
||||
@@ -860,7 +860,7 @@ request_socket_cleanup_complete:
|
||||
memset(s_accessPointConfig,0,0x58);
|
||||
initialWait = waitIntervals.limits.connection;
|
||||
for (waitAttempt = 0; waitAttempt < (short)initialWait; waitAttempt++) {
|
||||
requestResult = AOSS_814020CC(&settings,s_accessPointConfig);
|
||||
requestResult = AOSSConnectAndAwaitHost(&settings,s_accessPointConfig);
|
||||
if (requestResult == -1) {
|
||||
input->status = 0xf;
|
||||
if (s_accessPointConfig) {
|
||||
@@ -950,14 +950,14 @@ request_socket_cleanup_complete:
|
||||
s_operationState = 2;
|
||||
AOSSi_Status(2);
|
||||
}
|
||||
requestResult = AOSS_81401574(networkAddresses,&requestRecords,requestResult);
|
||||
requestResult = AOSSSendDiscoveryRequest(networkAddresses,&requestRecords,requestResult);
|
||||
break;
|
||||
case 1:
|
||||
if (s_operationState != 3) {
|
||||
s_operationState = 3;
|
||||
AOSSi_Status(3);
|
||||
}
|
||||
requestResult = AOSS_81401778(networkAddresses,&requestRecords,requestResult);
|
||||
requestResult = AOSSSendHelloRequest(networkAddresses,&requestRecords,requestResult);
|
||||
|
||||
break;
|
||||
case 2:
|
||||
@@ -969,7 +969,7 @@ request_socket_cleanup_complete:
|
||||
memset(s_responseBuffer,0,0x5dc);
|
||||
memcpy(messageIdentity,&requestRecords.records[2],8);
|
||||
manufacturerLength = strlen(s_manufacturer);
|
||||
AOSS_81401E80(messageIdentity,8,s_manufacturer,manufacturerLength);
|
||||
AOSSXorBufferWithKey(messageIdentity,8,s_manufacturer,manufacturerLength);
|
||||
receivedLength = SOHtoNs(1);
|
||||
packetWords->initialLength = receivedLength;
|
||||
packetWords->initialType = 0;
|
||||
@@ -1089,7 +1089,7 @@ process_received_packet:
|
||||
packetBuffer->socket = s_socket;
|
||||
retryWait = SONtoHs(receivedLength);
|
||||
packetBuffer->length = retryWait & 0xffff;
|
||||
requestResult = AOSS_814001B4(protocolState,packetBuffer,&receivedPackets,&requestRecords,s_socket);
|
||||
requestResult = AOSSDispatchReceiveState(protocolState,packetBuffer,&receivedPackets,&requestRecords,s_socket);
|
||||
if (requestResult == 100) {
|
||||
protocolResult = 0;
|
||||
}
|
||||
@@ -1206,7 +1206,7 @@ wait_for_packet:
|
||||
memset(s_accessPointConfig,0,0x58);
|
||||
initialWait = waitIntervals.limits.connection;
|
||||
for (waitAttempt = 0; waitAttempt < (short)initialWait; waitAttempt++) {
|
||||
state = AOSS_814020CC(&settings,s_accessPointConfig);
|
||||
state = AOSSConnectAndAwaitHost(&settings,s_accessPointConfig);
|
||||
if (state == -1) {
|
||||
input->status = 0xf;
|
||||
if (s_accessPointConfig) {
|
||||
@@ -1391,7 +1391,7 @@ protocol_socket_cleanup_complete:
|
||||
resultCode = 0xffffffff;
|
||||
goto finish_initialization;
|
||||
} else {
|
||||
protocolResult = AOSS_813FFD68(input);
|
||||
protocolResult = AOSSValidateInitConfig(input);
|
||||
if (protocolResult == 0) goto configuration_success;
|
||||
{
|
||||
input->status = 6;
|
||||
@@ -1414,7 +1414,7 @@ finish_initialization:
|
||||
return (int)resultCode;
|
||||
}
|
||||
|
||||
int AOSS_813FFD68(AOSSInitInput* input) {
|
||||
int AOSSValidateInitConfig(AOSSInitInput* input) {
|
||||
AOSSConfigRecord* config;
|
||||
u8* output;
|
||||
u8* cursor;
|
||||
@@ -1599,7 +1599,7 @@ int AOSS_CheckAP(AOSSAccessPointRecord* list) {
|
||||
return result;
|
||||
}
|
||||
|
||||
int AOSS_814001B4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request, int socket) {
|
||||
int AOSSDispatchReceiveState(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request, int socket) {
|
||||
u16 messageLength = SONtoHs(packet->message.messageLength);
|
||||
u16 opcode;
|
||||
|
||||
@@ -1611,26 +1611,26 @@ int AOSS_814001B4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestR
|
||||
(*count)++;
|
||||
return state;
|
||||
}
|
||||
if (AOSS_81400830((AOSSDecryptionMessage*)&packet->message) > 0) {
|
||||
if (AOSSDecryptMessage((AOSSDecryptionMessage*)&packet->message) > 0) {
|
||||
(*count)++;
|
||||
return state;
|
||||
}
|
||||
opcode = SONtoHs(packet->message.opcode);
|
||||
switch (opcode) {
|
||||
case 0x1010:
|
||||
state = AOSS_814002F0(state, packet, count, request);
|
||||
state = AOSSHandleDiscoverReply(state, packet, count, request);
|
||||
break;
|
||||
case 0x2010:
|
||||
state = AOSS_814004D0(state, packet, count, request);
|
||||
state = AOSSHandleAuthReply(state, packet, count, request);
|
||||
break;
|
||||
case 0x3010:
|
||||
state = AOSS_814006A4(state, packet, count, request);
|
||||
state = AOSSHandleFinalReply(state, packet, count, request);
|
||||
break;
|
||||
}
|
||||
return state;
|
||||
}
|
||||
|
||||
int AOSS_814002F0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
|
||||
int AOSSHandleDiscoverReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
|
||||
AOSSReplyPayload* reply;
|
||||
AOSSRequestRecord* requestRecord;
|
||||
size_t manufacturerLength;
|
||||
@@ -1652,7 +1652,7 @@ int AOSS_814002F0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestR
|
||||
manufacturerLength = strlen(s_manufacturer);
|
||||
reply = &packet->message.payload.reply;
|
||||
requestRecord = &request->records[0];
|
||||
AOSS_81401E80(&packet->message.payload.manufacturerAddress, 8, s_manufacturer, manufacturerLength);
|
||||
AOSSXorBufferWithKey(&packet->message.payload.manufacturerAddress, 8, s_manufacturer, manufacturerLength);
|
||||
compareResult = memcmp(requestRecord->address, packet->message.payload.manufacturerAddress, 6);
|
||||
if (compareResult != 0) {
|
||||
validationResult = -1;
|
||||
@@ -1686,7 +1686,7 @@ int AOSS_814002F0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestR
|
||||
(*count)++;
|
||||
return state;
|
||||
}
|
||||
parserResult = AOSS_81400E0C(&reply->data.optionRecord, s_networkBuffer);
|
||||
parserResult = AOSSParseNetworkSettings(&reply->data.optionRecord, s_networkBuffer);
|
||||
if (parserResult < 0) {
|
||||
if (parserResult == -2) {
|
||||
s_errorCode = 0x16;
|
||||
@@ -1705,7 +1705,7 @@ int AOSS_814002F0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestR
|
||||
return 1;
|
||||
}
|
||||
|
||||
int AOSS_814004D0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
|
||||
int AOSSHandleAuthReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
|
||||
size_t manufacturerLength;
|
||||
int compareResult;
|
||||
u16 packetSequence;
|
||||
@@ -1724,7 +1724,7 @@ int AOSS_814004D0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestR
|
||||
operationResult = 0;
|
||||
reply = &packet->message.payload.reply;
|
||||
manufacturerLength = strlen(s_manufacturer);
|
||||
AOSS_81401E80(&packet->message.payload.manufacturerAddress, 8, s_manufacturer, manufacturerLength);
|
||||
AOSSXorBufferWithKey(&packet->message.payload.manufacturerAddress, 8, s_manufacturer, manufacturerLength);
|
||||
compareResult = memcmp(request->records[1].address,
|
||||
packet->message.payload.manufacturerAddress, 6);
|
||||
if (compareResult != 0) {
|
||||
@@ -1756,7 +1756,7 @@ int AOSS_814004D0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestR
|
||||
} else {
|
||||
memset(&s_configData, 0, sizeof(s_configData));
|
||||
authType = SONtoHs(packet->message.authType);
|
||||
operationResult = AOSS_814013AC(0, (const AOSSReplyOption*)reply, authType, &s_configData,
|
||||
operationResult = AOSSApplyAuthOptions(0, (const AOSSReplyOption*)reply, authType, &s_configData,
|
||||
s_networkBuffer);
|
||||
if (operationResult < 0) {
|
||||
*count = *count + 1;
|
||||
@@ -1772,7 +1772,7 @@ int AOSS_814004D0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestR
|
||||
return state;
|
||||
}
|
||||
|
||||
int AOSS_814006A4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
|
||||
int AOSSHandleFinalReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
|
||||
int result = state;
|
||||
size_t manufacturerLength;
|
||||
int compareResult;
|
||||
@@ -1788,7 +1788,7 @@ int AOSS_814006A4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestR
|
||||
|
||||
errorCode = 0;
|
||||
manufacturerLength = strlen(s_manufacturer);
|
||||
AOSS_81401E80(&packet->message.payload.manufacturerAddress, 8, s_manufacturer, manufacturerLength);
|
||||
AOSSXorBufferWithKey(&packet->message.payload.manufacturerAddress, 8, s_manufacturer, manufacturerLength);
|
||||
compareResult = memcmp(request->records[2].address,
|
||||
packet->message.payload.manufacturerAddress, 6);
|
||||
if (compareResult != 0) {
|
||||
@@ -1828,7 +1828,7 @@ int AOSS_814006A4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestR
|
||||
return result;
|
||||
}
|
||||
|
||||
int AOSS_81400830(AOSSDecryptionMessage* message) {
|
||||
int AOSSDecryptMessage(AOSSDecryptionMessage* message) {
|
||||
u32 checksum;
|
||||
u8 manufacturerAddress[8];
|
||||
AOSSKeySchedule schedule;
|
||||
@@ -1850,14 +1850,14 @@ int AOSS_81400830(AOSSDecryptionMessage* message) {
|
||||
int result;
|
||||
|
||||
memcpy(manufacturerAddress, message->manufacturerAddress, sizeof(manufacturerAddress));
|
||||
result = AOSS_81401E80(manufacturerAddress, sizeof(manufacturerAddress), s_manufacturer,
|
||||
result = AOSSXorBufferWithKey(manufacturerAddress, sizeof(manufacturerAddress), s_manufacturer,
|
||||
strlen(s_manufacturer));
|
||||
if (result == -1) {
|
||||
s_errorCode = 2;
|
||||
return -100;
|
||||
}
|
||||
|
||||
result = AOSS_81400D34(SONtoHs(message->command), manufacturerAddress);
|
||||
result = AOSSCheckAccessPointName(SONtoHs(message->command), manufacturerAddress);
|
||||
if (result != 0) {
|
||||
return result;
|
||||
}
|
||||
@@ -1886,7 +1886,7 @@ int AOSS_81400830(AOSSDecryptionMessage* message) {
|
||||
} else {
|
||||
memcpy(s_packetState.keyNonce, &encrypted->keyNonce, sizeof(encrypted->keyNonce));
|
||||
memcpy(s_packetState.keyAddress, s_accessPointName, sizeof(s_accessPointName));
|
||||
AOSS_81401C9C(&schedule, s_packetState.keyNonce,
|
||||
AOSSInitKeySchedule(&schedule, s_packetState.keyNonce,
|
||||
sizeof(s_packetState.keyNonce) + sizeof(s_packetState.keyAddress), dataLength);
|
||||
|
||||
outputCursor = decryptedData;
|
||||
@@ -1906,7 +1906,7 @@ int AOSS_81400830(AOSSDecryptionMessage* message) {
|
||||
}
|
||||
|
||||
crc = 0xffffffff;
|
||||
AOSS_81401DC0(0, s_crcTable);
|
||||
AOSSInitCrc32Table(0, s_crcTable);
|
||||
for (crcIndex = 0; crcIndex < (s32)dataLength; crcIndex++) {
|
||||
crc = (crc >> 8) ^ s_crcTable[(crc ^ decryptedData[crcIndex]) & 0xff];
|
||||
}
|
||||
@@ -1931,7 +1931,7 @@ int AOSS_81400830(AOSSDecryptionMessage* message) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int AOSS_81400D34(u16 command, const u8* manufacturerAddress) {
|
||||
int AOSSCheckAccessPointName(u16 command, const u8* manufacturerAddress) {
|
||||
u8* storedAddress = s_accessPointName;
|
||||
int result = 0;
|
||||
int hasAddress = 0;
|
||||
@@ -1961,7 +1961,7 @@ int AOSS_81400D34(u16 command, const u8* manufacturerAddress) {
|
||||
return result;
|
||||
}
|
||||
|
||||
int AOSS_81400E0C(const AOSSOptionRecord* packet, u8* settings) {
|
||||
int AOSSParseNetworkSettings(const AOSSOptionRecord* packet, u8* settings) {
|
||||
const u8* packetBytes = (const u8*)packet;
|
||||
const AOSSOptionRecord* record;
|
||||
s32 length;
|
||||
@@ -2027,7 +2027,7 @@ int AOSS_81400E0C(const AOSSOptionRecord* packet, u8* settings) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int AOSS_81401104(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
|
||||
int AOSSParseWepConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
|
||||
const u8* packetBytes = (const u8*)packet;
|
||||
const AOSSOptionRecord* record = (const AOSSOptionRecord*)(packetBytes + 6);
|
||||
u32 length;
|
||||
@@ -2099,7 +2099,7 @@ int AOSS_81401104(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int AOSS_81401284(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
|
||||
int AOSSParsePskConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
|
||||
const u8* packetBytes = (const u8*)packet;
|
||||
const AOSSOptionRecord* record = (const AOSSOptionRecord*)(packetBytes + 6);
|
||||
u32 length;
|
||||
@@ -2146,7 +2146,7 @@ int AOSS_81401284(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int AOSS_814013AC(int state, const AOSSReplyOption* response, int responseLength, void* config, void* networkData) {
|
||||
int AOSSApplyAuthOptions(int state, const AOSSReplyOption* response, int responseLength, void* config, void* networkData) {
|
||||
u32 flags = 0;
|
||||
const AOSSReplyOption* responseRecord;
|
||||
AOSSConfigRecord* configRecord;
|
||||
@@ -2190,19 +2190,19 @@ int AOSS_814013AC(int state, const AOSSReplyOption* response, int responseLength
|
||||
do {
|
||||
switch (option->fields.type) {
|
||||
case 3:
|
||||
result = AOSS_81401104((const AOSSOptionRecord*)option, wep40Config);
|
||||
result = AOSSParseWepConfig((const AOSSOptionRecord*)option, wep40Config);
|
||||
flags |= 1;
|
||||
break;
|
||||
case 4:
|
||||
result = AOSS_81401104((const AOSSOptionRecord*)option, wep104Config);
|
||||
result = AOSSParseWepConfig((const AOSSOptionRecord*)option, wep104Config);
|
||||
flags |= 2;
|
||||
break;
|
||||
case 5:
|
||||
result = AOSS_81401284((const AOSSOptionRecord*)option, tkipConfig);
|
||||
result = AOSSParsePskConfig((const AOSSOptionRecord*)option, tkipConfig);
|
||||
flags |= 4;
|
||||
break;
|
||||
case 6:
|
||||
result = AOSS_81401284((const AOSSOptionRecord*)option, aesConfig);
|
||||
result = AOSSParsePskConfig((const AOSSOptionRecord*)option, aesConfig);
|
||||
flags |= 8;
|
||||
break;
|
||||
case 10:
|
||||
@@ -2234,7 +2234,7 @@ int AOSS_814013AC(int state, const AOSSReplyOption* response, int responseLength
|
||||
return 0;
|
||||
}
|
||||
|
||||
int AOSS_81401574(void* packet, AOSSRequestRecords* request, int socket) {
|
||||
int AOSSSendDiscoveryRequest(void* packet, AOSSRequestRecords* request, int socket) {
|
||||
u8* responsePayload;
|
||||
u8 accessPointName[8];
|
||||
AOSSSocketAddress destination;
|
||||
@@ -2257,7 +2257,7 @@ int AOSS_81401574(void* packet, AOSSRequestRecords* request, int socket) {
|
||||
responsePayload = response->payload;
|
||||
memcpy(s_accessPointName, &request->records[0], 8);
|
||||
memcpy(accessPointName, s_accessPointName, 8);
|
||||
recordLength = AOSS_81401BBC(&requestRecord->record);
|
||||
recordLength = AOSSBuildInterfaceOption(&requestRecord->record);
|
||||
if (recordLength < 0) {
|
||||
s_errorCode = 3;
|
||||
if (requestRecord != 0) {
|
||||
@@ -2269,7 +2269,7 @@ int AOSS_81401574(void* packet, AOSSRequestRecords* request, int socket) {
|
||||
requestRecord->length = SOHtoNs(recordLength);
|
||||
requestLength = recordLength + 4;
|
||||
memcpy(responsePayload, requestRecord, requestLength);
|
||||
encryptionResult = AOSS_81401E80(accessPointName, 8, s_manufacturer, 6);
|
||||
encryptionResult = AOSSXorBufferWithKey(accessPointName, 8, s_manufacturer, 6);
|
||||
if (encryptionResult != 0) {
|
||||
s_errorCode = 2;
|
||||
if (requestRecord != 0) {
|
||||
@@ -2302,7 +2302,7 @@ int AOSS_81401574(void* packet, AOSSRequestRecords* request, int socket) {
|
||||
return result;
|
||||
}
|
||||
|
||||
int AOSS_81401778(void* packet, void* request, int socket) {
|
||||
int AOSSSendHelloRequest(void* packet, void* request, int socket) {
|
||||
AOSSHelloPacket* response = (AOSSHelloPacket*)s_responseBuffer;
|
||||
AOSSHelloPayload* payload;
|
||||
AOSSRequestRecords* requestRecords = (AOSSRequestRecords*)request;
|
||||
@@ -2343,7 +2343,7 @@ int AOSS_81401778(void* packet, void* request, int socket) {
|
||||
const u32* crcTable;
|
||||
sequence = 1;
|
||||
checksum = 0xffffffff;
|
||||
AOSS_81401DC0(0, s_crcTable);
|
||||
AOSSInitCrc32Table(0, s_crcTable);
|
||||
crcTable = s_crcTable;
|
||||
{
|
||||
u32 part;
|
||||
@@ -2361,7 +2361,7 @@ int AOSS_81401778(void* packet, void* request, int socket) {
|
||||
memcpy(&payload->encrypted.key.nonce, &nonce, 2);
|
||||
memcpy(s_packetState.keyNonce, payload->encrypted.key.nonceBytes, 2);
|
||||
memcpy(s_packetState.keyAddress, s_accessPointName, 8);
|
||||
AOSS_81401C9C(&construction.schedule, s_packetState.keyNonce,
|
||||
AOSSInitKeySchedule(&construction.schedule, s_packetState.keyNonce,
|
||||
sizeof(s_packetState.keyNonce) + sizeof(s_packetState.keyAddress), 8);
|
||||
for (index = 0; index < 8; index++) {
|
||||
state = construction.schedule.bytes;
|
||||
@@ -2386,7 +2386,7 @@ int AOSS_81401778(void* packet, void* request, int socket) {
|
||||
}
|
||||
|
||||
memcpy(construction.accessPointName, &requestRecords->records[1], 8);
|
||||
encryptionResult = AOSS_81401E80(construction.accessPointName, 8, s_manufacturer, 6);
|
||||
encryptionResult = AOSSXorBufferWithKey(construction.accessPointName, 8, s_manufacturer, 6);
|
||||
if (encryptionResult != 0) {
|
||||
s_errorCode = 2;
|
||||
return -1;
|
||||
@@ -2415,7 +2415,7 @@ int AOSS_81401778(void* packet, void* request, int socket) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
s16 AOSS_81401BBC(void* buffer) {
|
||||
s16 AOSSBuildInterfaceOption(void* buffer) {
|
||||
AOSSOptionRecord* record = (AOSSOptionRecord*)buffer;
|
||||
u32 optionValue;
|
||||
s16 dataLength;
|
||||
@@ -2439,7 +2439,7 @@ s16 AOSS_81401BBC(void* buffer) {
|
||||
return (s16)(dataLength + 10);
|
||||
}
|
||||
|
||||
void AOSS_81401C9C(AOSSKeySchedule* schedule, const u8* key, u32 keyLength, u32 stateLength) {
|
||||
void AOSSInitKeySchedule(AOSSKeySchedule* schedule, const u8* key, u32 keyLength, u32 stateLength) {
|
||||
u32 index = 0;
|
||||
u32 keyIndex;
|
||||
u32 swapIndex;
|
||||
@@ -2471,7 +2471,7 @@ void AOSS_81401C9C(AOSSKeySchedule* schedule, const u8* key, u32 keyLength, u32
|
||||
}
|
||||
}
|
||||
|
||||
void AOSS_81401DC0(u32 seed, u32* table) {
|
||||
void AOSSInitCrc32Table(u32 seed, u32* table) {
|
||||
u32 index;
|
||||
u32 value;
|
||||
|
||||
@@ -2488,7 +2488,7 @@ void AOSS_81401DC0(u32 seed, u32* table) {
|
||||
}
|
||||
}
|
||||
|
||||
int AOSS_81401E80(void* packet, s32 length, char* key, int keyLength) {
|
||||
int AOSSXorBufferWithKey(void* packet, s32 length, char* key, int keyLength) {
|
||||
u8* temporaryHalf;
|
||||
s32 halfLength = length / 2;
|
||||
u8* packetHalf;
|
||||
@@ -2542,7 +2542,7 @@ int AOSS_81401E80(void* packet, s32 length, char* key, int keyLength) {
|
||||
return result;
|
||||
}
|
||||
|
||||
int AOSS_814020CC(void* settings, void* config) {
|
||||
int AOSSConnectAndAwaitHost(void* settings, void* config) {
|
||||
s32 connectionAttempts = 0;
|
||||
u32 ticksPerMillisecond;
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@ static u8 secondaryDns[4];
|
||||
static void* (*allocateMemory)(u32, s32);
|
||||
static void (*releaseMemory)(u32, void*, s32);
|
||||
static void (*statusCallback)(void);
|
||||
static NCDIfConfig AOSS_810BD4A8;
|
||||
static NCDIpConfig AOSS_810BD608;
|
||||
static NCDIfConfig AOSSi_NcdIfConfig;
|
||||
static NCDIpConfig AOSSi_NcdIpConfig;
|
||||
|
||||
struct AOSSRate {
|
||||
u16 mask;
|
||||
@@ -60,11 +60,11 @@ void AOSSi_Cancel(void) {
|
||||
AOSSi_cancel_flag = 1;
|
||||
}
|
||||
|
||||
void AOSS_813FD17C(OSAlarm* alarm, OSContext* context) {
|
||||
void AOSSi_SleepAlarmHandler(OSAlarm* alarm, OSContext* context) {
|
||||
OSSendMessage((OSMessageQueue*)alarm->tag, NULL, 0);
|
||||
}
|
||||
|
||||
void AOSS_813FD18C(u32 milliseconds) {
|
||||
void AOSSi_SleepMs(u32 milliseconds) {
|
||||
OSMessage storage;
|
||||
OSMessage message;
|
||||
OSMessageQueue queue;
|
||||
@@ -72,7 +72,7 @@ void AOSS_813FD18C(u32 milliseconds) {
|
||||
OSInitMessageQueue(&queue, &storage, 1);
|
||||
OSCreateAlarm(&alarm);
|
||||
OSSetAlarmTag(&alarm, (u32)&queue);
|
||||
OSSetAlarm(&alarm, (u32)(milliseconds * (OS_TIMER_CLOCK / 1000)), AOSS_813FD17C);
|
||||
OSSetAlarm(&alarm, (u32)(milliseconds * (OS_TIMER_CLOCK / 1000)), AOSSi_SleepAlarmHandler);
|
||||
OSReceiveMessage(&queue, &message, 1);
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ void AOSSi_Free(void* block) {
|
||||
}
|
||||
}
|
||||
|
||||
void AOSS_813FD25C(u8* destination, u32 address) {
|
||||
void AOSSi_StoreIpv4Octets(u8* destination, u32 address) {
|
||||
int index;
|
||||
for (index = 0; index < 4; ++index) {
|
||||
*destination++ = address >> ((3 - index) * 8);
|
||||
@@ -97,11 +97,11 @@ void AOSS_813FD25C(u8* destination, u32 address) {
|
||||
}
|
||||
|
||||
int AOSSi_SetNCDIPAddr(u32 address, u32 netmask, u32 gateway, u32 dns1, u32 dns2) {
|
||||
AOSS_813FD25C(ipAddress, address);
|
||||
AOSS_813FD25C(ipNetmask, netmask);
|
||||
AOSS_813FD25C(ipGateway, gateway);
|
||||
AOSS_813FD25C(primaryDns, dns1);
|
||||
AOSS_813FD25C(secondaryDns, dns2);
|
||||
AOSSi_StoreIpv4Octets(ipAddress, address);
|
||||
AOSSi_StoreIpv4Octets(ipNetmask, netmask);
|
||||
AOSSi_StoreIpv4Octets(ipGateway, gateway);
|
||||
AOSSi_StoreIpv4Octets(primaryDns, dns1);
|
||||
AOSSi_StoreIpv4Octets(secondaryDns, dns2);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -150,7 +150,7 @@ startup:
|
||||
goto unlock;
|
||||
}
|
||||
++startupRetries;
|
||||
AOSS_813FD18C(10);
|
||||
AOSSi_SleepMs(10);
|
||||
goto startup;
|
||||
}
|
||||
if (WD_GetInfo(&info) == 0) {
|
||||
@@ -231,7 +231,7 @@ startup:
|
||||
*output = list;
|
||||
break;
|
||||
}
|
||||
AOSS_813FD18C(100);
|
||||
AOSSi_SleepMs(100);
|
||||
}
|
||||
AOSSi_Free(buffer);
|
||||
}
|
||||
@@ -242,7 +242,7 @@ cleanup:
|
||||
goto unlock;
|
||||
}
|
||||
++cleanupRetries;
|
||||
AOSS_813FD18C(10);
|
||||
AOSSi_SleepMs(10);
|
||||
goto cleanup;
|
||||
}
|
||||
unlock:
|
||||
@@ -252,7 +252,7 @@ unlock:
|
||||
return -1;
|
||||
}
|
||||
++unlockRetries;
|
||||
AOSS_813FD18C(10);
|
||||
AOSSi_SleepMs(10);
|
||||
goto unlock;
|
||||
}
|
||||
return result;
|
||||
@@ -262,7 +262,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
|
||||
int retries = 0;
|
||||
int result = 0;
|
||||
WD_Info info ATTRIBUTE_ALIGN(32);
|
||||
NCDIfConfig* interfaceConfig = &AOSS_810BD4A8;
|
||||
NCDIfConfig* interfaceConfig = &AOSSi_NcdIfConfig;
|
||||
NCDIpConfig* ipConfig;
|
||||
memset(interfaceConfig, 0, sizeof(*interfaceConfig));
|
||||
interfaceConfig->selectedMedia = 1;
|
||||
@@ -288,7 +288,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
|
||||
}
|
||||
interfaceConfig->netif.wireless.config.manual.ssidLength = (u8)connection->ssidLength;
|
||||
memcpy(interfaceConfig->netif.wireless.config.manual.ssid, connection->ssid, connection->ssidLength);
|
||||
ipConfig = &AOSS_810BD608;
|
||||
ipConfig = &AOSSi_NcdIpConfig;
|
||||
memset(ipConfig, 0, sizeof(*ipConfig));
|
||||
ipConfig->adjust.maxTransferUnit = 1300;
|
||||
ipConfig->adjust.tcpRetransTimeout = 100;
|
||||
@@ -303,7 +303,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
|
||||
if (NCDSetIpConfig(ipConfig) != 0) {
|
||||
result = -1;
|
||||
}
|
||||
if (result == 0 && NCDSetIfConfig(&AOSS_810BD4A8) != 0) {
|
||||
if (result == 0 && NCDSetIfConfig(&AOSSi_NcdIfConfig) != 0) {
|
||||
result = -1;
|
||||
}
|
||||
if (result == 0) {
|
||||
@@ -317,7 +317,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
|
||||
break;
|
||||
}
|
||||
++retries;
|
||||
AOSS_813FD18C(10);
|
||||
AOSSi_SleepMs(10);
|
||||
}
|
||||
}
|
||||
if (result == 0) {
|
||||
@@ -335,7 +335,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
|
||||
}
|
||||
|
||||
void AOSSi_Sleep(u32 milliseconds) {
|
||||
AOSS_813FD18C(milliseconds);
|
||||
AOSSi_SleepMs(milliseconds);
|
||||
}
|
||||
|
||||
int AOSSi_Status(void) {
|
||||
|
||||
@@ -540,20 +540,20 @@ AtermProgressCallback gAtermProgressCallback;
|
||||
u32 gAtermResult;
|
||||
s32 gAtermState;
|
||||
|
||||
void ATERM_8140684C(OSAlarm* alarm, OSContext* context);
|
||||
s32 ATERM_814038C8(void);
|
||||
void ATERM_81405ACC(AtermMd5Context* context, void* input, u32 length);
|
||||
void ATERMAlarmWakeQueue(OSAlarm* alarm, OSContext* context);
|
||||
s32 ATERMRunConfigProtocol(void);
|
||||
void ATERMMd5Update(AtermMd5Context* context, void* input, u32 length);
|
||||
extern u8 gAtermDigestFill[64];
|
||||
extern u8* gAtermRequestOptions;
|
||||
int ATERM_81404844(u16* destination, u16* source, u32 length, void* key, u32 keyLength);
|
||||
int ATERM_81404A18(u16* destination, u16* source, u32 length, void* key, u32 keyLength);
|
||||
int ATERM_81404BFC(u32* expandedKey, const void* key, u32 keyBits);
|
||||
int ATERM_8140502C(u32* expandedKey, const void* key, u32 keyBits);
|
||||
void ATERM_81405254(const u32* expandedKey, u32 rounds, const u8* input, u8* output);
|
||||
void ATERM_81405690(const u32* expandedKey, u32 rounds, const u8* input, u8* output);
|
||||
int ATERM_814033F0(u16* response);
|
||||
int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 keyLength);
|
||||
int ATERMAesKeyUnwrap(u16* destination, u16* source, u32 length, void* key, u32 keyLength);
|
||||
int ATERMAesExpandEncryptKey(u32* expandedKey, const void* key, u32 keyBits);
|
||||
int ATERMAesExpandDecryptKey(u32* expandedKey, const void* key, u32 keyBits);
|
||||
void ATERMAesEncryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u8* output);
|
||||
void ATERMAesDecryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u8* output);
|
||||
int ATERMParseAssociationResponse(u16* response);
|
||||
|
||||
int ATERM_814021BC(void) {
|
||||
int ATERMStartNetworkStack(void) {
|
||||
int status;
|
||||
int waitCount = 0;
|
||||
u32 convertedHost;
|
||||
@@ -605,7 +605,7 @@ int ATERM_814021BC(void) {
|
||||
OSCreateAlarm(&interfaceAlarm);
|
||||
OSSetAlarmTag(&interfaceAlarm, (u32)&interfaceQueue);
|
||||
timeoutTicks = (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10;
|
||||
OSSetAlarm(&interfaceAlarm, timeoutTicks, ATERM_8140684C);
|
||||
OSSetAlarm(&interfaceAlarm, timeoutTicks, ATERMAlarmWakeQueue);
|
||||
OSReceiveMessage(&interfaceQueue, &interfaceMessage, 1);
|
||||
}
|
||||
|
||||
@@ -621,7 +621,7 @@ int ATERM_814021BC(void) {
|
||||
OSCreateAlarm(&hostAlarm);
|
||||
OSSetAlarmTag(&hostAlarm, (u32)&hostQueue);
|
||||
timeoutTicks = (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10;
|
||||
OSSetAlarm(&hostAlarm, timeoutTicks, ATERM_8140684C);
|
||||
OSSetAlarm(&hostAlarm, timeoutTicks, ATERMAlarmWakeQueue);
|
||||
OSReceiveMessage(&hostQueue, &hostMessage, 1);
|
||||
}
|
||||
} else {
|
||||
@@ -631,7 +631,7 @@ int ATERM_814021BC(void) {
|
||||
return waitCount;
|
||||
}
|
||||
|
||||
int ATERM_81402424(u16* resultBuffer, u32 resultBufferLength) {
|
||||
int ATERMScanAccessPoints(u16* resultBuffer, u32 resultBufferLength) {
|
||||
int lockId;
|
||||
int result = -2;
|
||||
u16* scanBuffer = resultBuffer;
|
||||
@@ -678,7 +678,7 @@ int ATERM_81402424(u16* resultBuffer, u32 resultBufferLength) {
|
||||
OSCreateAlarm(&startupAlarm);
|
||||
OSSetAlarmTag(&startupAlarm, (u32)&startupQueue);
|
||||
OSSetAlarm(&startupAlarm, (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10,
|
||||
ATERM_8140684C);
|
||||
ATERMAlarmWakeQueue);
|
||||
OSReceiveMessage(&startupQueue, &startupMessage, 1);
|
||||
} while (1);
|
||||
|
||||
@@ -719,7 +719,7 @@ int ATERM_81402424(u16* resultBuffer, u32 resultBufferLength) {
|
||||
OSCreateAlarm(&scanAlarm);
|
||||
OSSetAlarmTag(&scanAlarm, (u32)&scanQueue);
|
||||
OSSetAlarm(&scanAlarm, (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10,
|
||||
ATERM_8140684C);
|
||||
ATERMAlarmWakeQueue);
|
||||
OSReceiveMessage(&scanQueue, &scanMessage, 1);
|
||||
}
|
||||
|
||||
@@ -737,7 +737,7 @@ cleanup_driver:
|
||||
OSCreateAlarm(&cleanupAlarm);
|
||||
OSSetAlarmTag(&cleanupAlarm, (u32)&cleanupQueue);
|
||||
OSSetAlarm(&cleanupAlarm, (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10,
|
||||
ATERM_8140684C);
|
||||
ATERMAlarmWakeQueue);
|
||||
OSReceiveMessage(&cleanupQueue, &cleanupMessage, 1);
|
||||
}
|
||||
|
||||
@@ -752,7 +752,7 @@ unlock_driver:
|
||||
OSCreateAlarm(&unlockAlarm);
|
||||
OSSetAlarmTag(&unlockAlarm, (u32)&unlockQueue);
|
||||
OSSetAlarm(&unlockAlarm, (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10,
|
||||
ATERM_8140684C);
|
||||
ATERMAlarmWakeQueue);
|
||||
OSReceiveMessage(&unlockQueue, &unlockMessage, 1);
|
||||
}
|
||||
}
|
||||
@@ -760,7 +760,7 @@ unlock_driver:
|
||||
return result;
|
||||
}
|
||||
|
||||
int ATERM_8140276C(AtermApRecordSet* currentRecords, AtermApRecordSet* previousRecords,
|
||||
int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet* previousRecords,
|
||||
u32* changedIndex) {
|
||||
u32 previousIndex;
|
||||
u32 currentIndex = 0;
|
||||
@@ -869,7 +869,7 @@ int ATERM_8140276C(AtermApRecordSet* currentRecords, AtermApRecordSet* previousR
|
||||
return result;
|
||||
}
|
||||
|
||||
int ATERM_81402A24(void) {
|
||||
int ATERMDiscoverAccessPoints(void) {
|
||||
s32 result = -1;
|
||||
u32 scanBufferBytes;
|
||||
u32 recordIndex;
|
||||
@@ -912,7 +912,7 @@ int ATERM_81402A24(void) {
|
||||
break;
|
||||
}
|
||||
|
||||
result = ATERM_81402424((u16*)scanBuffer, scanBufferBytes);
|
||||
result = ATERMScanAccessPoints((u16*)scanBuffer, scanBufferBytes);
|
||||
if (result < 0) {
|
||||
goto cleanup;
|
||||
}
|
||||
@@ -954,7 +954,7 @@ int ATERM_81402A24(void) {
|
||||
|
||||
currentRecords->count = result;
|
||||
if (gAtermState != 1 &&
|
||||
ATERM_8140276C(currentRecords, previousRecords, (u32*)&progressInfo[0])) {
|
||||
ATERMFindChangedApRecord(currentRecords, previousRecords, (u32*)&progressInfo[0])) {
|
||||
AtermApRecord* selectedRecord;
|
||||
gAtermSelectedRecordIndex = progressInfo[0];
|
||||
selectedRecord = ¤tRecords->entries[progressInfo[0]];
|
||||
@@ -1036,7 +1036,7 @@ cleanup:
|
||||
return result;
|
||||
}
|
||||
|
||||
int ATERM_81402E40(u16* messageBuffer, u32 sequence, u16* payload, size_t payloadLength,
|
||||
int ATERMBuildEncryptedMessage(u16* messageBuffer, u32 sequence, u16* payload, size_t payloadLength,
|
||||
void* encryptionKey) {
|
||||
u8* end;
|
||||
u8* cursor;
|
||||
@@ -1045,7 +1045,7 @@ int ATERM_81402E40(u16* messageBuffer, u32 sequence, u16* payload, size_t payloa
|
||||
memset(payload, 0, 8);
|
||||
payload[0] = SOHtoNs((payloadLength - 8) & 0xFFFF);
|
||||
if (encryptionKey != NULL) {
|
||||
ATERM_81404844(messageBuffer + 3, payload, payloadLength, encryptionKey, 0x10);
|
||||
ATERMAesKeyWrap(messageBuffer + 3, payload, payloadLength, encryptionKey, 0x10);
|
||||
payloadLength += 8;
|
||||
} else {
|
||||
memcpy(messageBuffer + 3, payload, payloadLength);
|
||||
@@ -1064,7 +1064,7 @@ int ATERM_81402E40(u16* messageBuffer, u32 sequence, u16* payload, size_t payloa
|
||||
return (int)(end + sizeof(u16) - (u8*)messageBuffer);
|
||||
}
|
||||
|
||||
int ATERM_81402FC0(AtermPacket* packet, u32* setupType) {
|
||||
int ATERMParsePacket(AtermPacket* packet, u32* setupType) {
|
||||
u8* cursor;
|
||||
u8* end;
|
||||
u8* payload;
|
||||
@@ -1142,7 +1142,7 @@ int ATERM_81402FC0(AtermPacket* packet, u32* setupType) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ATERM_814031DC(AtermAssociationRequest* request) {
|
||||
int ATERMBuildAssociationRequest(AtermAssociationRequest* request) {
|
||||
u8 scanAddress[8];
|
||||
u8 interfaceMacAddress[8];
|
||||
char interfaceMacText[32];
|
||||
@@ -1227,7 +1227,7 @@ int ATERM_814031DC(AtermAssociationRequest* request) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
int ATERM_814033F0(u16* response) {
|
||||
int ATERMParseAssociationResponse(u16* response) {
|
||||
u16* optionCursor = response + 4;
|
||||
u8* optionValue;
|
||||
u16* responseEnd;
|
||||
@@ -1317,7 +1317,7 @@ int ATERM_814033F0(u16* response) {
|
||||
return result;
|
||||
}
|
||||
|
||||
int ATERM_81403614(u8* destination, const char* source, s32 length) {
|
||||
int ATERMParseHexBytes(u8* destination, const char* source, s32 length) {
|
||||
s32 value = 0;
|
||||
s32 characterIndex = 0;
|
||||
|
||||
@@ -1349,7 +1349,7 @@ int ATERM_81403614(u8* destination, const char* source, s32 length) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
int ATERM_814036D8(void) {
|
||||
int ATERMApplyScanSecuritySettings(void) {
|
||||
s32 result = 1;
|
||||
char* sourceKey;
|
||||
char* outputKey;
|
||||
@@ -1389,7 +1389,7 @@ int ATERM_814036D8(void) {
|
||||
break;
|
||||
case 10:
|
||||
gAtermConfigurationResult.setupMode = 1;
|
||||
ATERM_81403614((u8*)outputKey, keyString, 10);
|
||||
ATERMParseHexBytes((u8*)outputKey, keyString, 10);
|
||||
break;
|
||||
case 13:
|
||||
gAtermConfigurationResult.setupMode = 2;
|
||||
@@ -1397,7 +1397,7 @@ int ATERM_814036D8(void) {
|
||||
break;
|
||||
case 26:
|
||||
gAtermConfigurationResult.setupMode = 2;
|
||||
ATERM_81403614((u8*)outputKey, keyString, 0x1A);
|
||||
ATERMParseHexBytes((u8*)outputKey, keyString, 0x1A);
|
||||
break;
|
||||
case 16:
|
||||
gAtermConfigurationResult.setupMode = 3;
|
||||
@@ -1405,7 +1405,7 @@ int ATERM_814036D8(void) {
|
||||
break;
|
||||
case 32:
|
||||
gAtermConfigurationResult.setupMode = 3;
|
||||
ATERM_81403614((u8*)outputKey, keyString, 0x20);
|
||||
ATERMParseHexBytes((u8*)outputKey, keyString, 0x20);
|
||||
break;
|
||||
default:
|
||||
result = -7;
|
||||
@@ -1432,7 +1432,7 @@ int ATERM_814036D8(void) {
|
||||
return result;
|
||||
}
|
||||
|
||||
s32 ATERM_814038C8(void) {
|
||||
s32 ATERMRunConfigProtocol(void) {
|
||||
OSMessageQueue waitQueue;
|
||||
OSMessage waitBuffer[1];
|
||||
OSMessage waitMessage;
|
||||
@@ -1459,7 +1459,7 @@ s32 ATERM_814038C8(void) {
|
||||
OSSetAlarmTag(&waitAlarm, (u32)&waitQueue);
|
||||
OSSetAlarm(&waitAlarm,
|
||||
(__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6) * 500,
|
||||
ATERM_8140684C);
|
||||
ATERMAlarmWakeQueue);
|
||||
OSReceiveMessage(&waitQueue, &waitMessage, 1);
|
||||
switch (gAtermProtocolState) {
|
||||
case 0:
|
||||
@@ -1467,7 +1467,7 @@ s32 ATERM_814038C8(void) {
|
||||
case 1:
|
||||
{
|
||||
AtermProgress progress;
|
||||
result = ATERM_81402A24();
|
||||
result = ATERMDiscoverAccessPoints();
|
||||
if (result != 1) {
|
||||
failed = 1;
|
||||
break;
|
||||
@@ -1485,7 +1485,7 @@ s32 ATERM_814038C8(void) {
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
result = ATERM_814021BC();
|
||||
result = ATERMStartNetworkStack();
|
||||
if (result != 1) {
|
||||
failed = 1;
|
||||
break;
|
||||
@@ -1525,11 +1525,11 @@ s32 ATERM_814038C8(void) {
|
||||
break;
|
||||
}
|
||||
peerAddress.length = 8;
|
||||
ATERM_814031DC((AtermAssociationRequest*)gAtermConfigurationResult.connectionPrefix);
|
||||
ATERMBuildAssociationRequest((AtermAssociationRequest*)gAtermConfigurationResult.connectionPrefix);
|
||||
receivedLength = SORecvFrom(socket, gAtermConfigurationResult.packetBuffer,
|
||||
sizeof(gAtermConfigurationResult.packetBuffer), 4, &peerAddress);
|
||||
if (receivedLength > 0 &&
|
||||
ATERM_81402FC0((AtermPacket*)gAtermConfigurationResult.packetBuffer, &gAtermResponseMode)) {
|
||||
ATERMParsePacket((AtermPacket*)gAtermConfigurationResult.packetBuffer, &gAtermResponseMode)) {
|
||||
AtermProgress progress;
|
||||
gAtermDeadline = (u32)(OSGetTime() / (__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6)) + 30000;
|
||||
gAtermProtocolState = 5;
|
||||
@@ -1588,7 +1588,7 @@ s32 ATERM_814038C8(void) {
|
||||
longOption++;
|
||||
}
|
||||
optionEnd = (u8*)longOption;
|
||||
gAtermMessageLength = ATERM_81402E40((u16*)gAtermConfigurationResult.packetBuffer, 2,
|
||||
gAtermMessageLength = ATERMBuildEncryptedMessage((u16*)gAtermConfigurationResult.packetBuffer, 2,
|
||||
(u16*)response->data, optionEnd - gAtermRequestOptions + 8, NULL);
|
||||
sendAddress.length = 8;
|
||||
sendAddress.family = 2;
|
||||
@@ -1628,7 +1628,7 @@ s32 ATERM_814038C8(void) {
|
||||
} else if (sequence != 3) {
|
||||
payloadLength = 0;
|
||||
} else if (gAtermConfigurationResult.connectionPrefix != NULL) {
|
||||
ATERM_81404A18((u16*)response->authentication.payload, (u16*)payload,
|
||||
ATERMAesKeyUnwrap((u16*)response->authentication.payload, (u16*)payload,
|
||||
payloadLength, gAtermConfigurationResult.connectionPrefix, 16);
|
||||
payloadLength -= 8;
|
||||
} else {
|
||||
@@ -1660,7 +1660,7 @@ s32 ATERM_814038C8(void) {
|
||||
digestContext.state[1] = 0xEFCDAB89;
|
||||
digestContext.state[2] = 0x98BADCFE;
|
||||
digestContext.state[3] = 0x10325476;
|
||||
ATERM_81405ACC(&digestContext, &authenticationTime, sizeof(authenticationTime));
|
||||
ATERMMd5Update(&digestContext, &authenticationTime, sizeof(authenticationTime));
|
||||
digestLength[0] = digestContext.bitCountLow;
|
||||
digestLength[1] = digestContext.bitCountLow >> 8;
|
||||
digestLength[2] = digestContext.bitCountLow >> 16;
|
||||
@@ -1670,9 +1670,9 @@ s32 ATERM_814038C8(void) {
|
||||
digestLength[6] = digestContext.bitCountHigh >> 16;
|
||||
digestLength[7] = digestContext.bitCountHigh >> 24;
|
||||
digestBytes = (digestContext.bitCountLow >> 3) & 0x3F;
|
||||
ATERM_81405ACC(&digestContext, gAtermDigestFill,
|
||||
ATERMMd5Update(&digestContext, gAtermDigestFill,
|
||||
digestBytes < 56 ? 56 - digestBytes : 120 - digestBytes);
|
||||
ATERM_81405ACC(&digestContext, digestLength, sizeof(digestLength));
|
||||
ATERMMd5Update(&digestContext, digestLength, sizeof(digestLength));
|
||||
response->authentication.digest[0] = digestContext.state[0];
|
||||
response->authentication.digest[1] = digestContext.state[0] >> 8;
|
||||
response->authentication.digest[2] = digestContext.state[0] >> 16;
|
||||
@@ -1724,7 +1724,7 @@ s32 ATERM_814038C8(void) {
|
||||
memcpy(option->value, response->authentication.digest, 8);
|
||||
gAtermReplyLength = (u8*)(option + 1) - response->data;
|
||||
response->authentication.decoded.length = gAtermReplyLength - 8;
|
||||
gAtermMessageLength = ATERM_81402E40((u16*)gAtermConfigurationResult.packetBuffer, 4,
|
||||
gAtermMessageLength = ATERMBuildEncryptedMessage((u16*)gAtermConfigurationResult.packetBuffer, 4,
|
||||
(u16*)response->data, gAtermReplyLength, gAtermConfigurationResult.connectionPrefix);
|
||||
sendAddress.length = 8;
|
||||
sendAddress.family = 2;
|
||||
@@ -1758,14 +1758,14 @@ s32 ATERM_814038C8(void) {
|
||||
} else if (sequence != 5) {
|
||||
payloadLength = 0;
|
||||
} else if (sessionKey != NULL) {
|
||||
ATERM_81404A18((u16*)response->authentication.payload, (u16*)payload,
|
||||
ATERMAesKeyUnwrap((u16*)response->authentication.payload, (u16*)payload,
|
||||
payloadLength, sessionKey, 16);
|
||||
payloadLength -= 8;
|
||||
} else {
|
||||
memcpy(response->authentication.payload, payload, payloadLength);
|
||||
}
|
||||
gAtermReplyLength = payloadLength;
|
||||
if (payloadLength != 0 && ATERM_814033F0((u16*)response->data)) {
|
||||
if (payloadLength != 0 && ATERMParseAssociationResponse((u16*)response->data)) {
|
||||
gAtermProtocolState = 9;
|
||||
retries = 0;
|
||||
gAtermMode = gScanSettings.ssid[0] != 0;
|
||||
@@ -1795,7 +1795,7 @@ s32 ATERM_814038C8(void) {
|
||||
memcpy(option->value, &gAtermMode, 1);
|
||||
gAtermReplyLength = (u8*)(option + 1) - response->data;
|
||||
response->authentication.decoded.length = gAtermReplyLength - 8;
|
||||
gAtermMessageLength = ATERM_81402E40((u16*)gAtermConfigurationResult.packetBuffer, 6,
|
||||
gAtermMessageLength = ATERMBuildEncryptedMessage((u16*)gAtermConfigurationResult.packetBuffer, 6,
|
||||
(u16*)response->data, gAtermReplyLength, sessionKey);
|
||||
if (NCDGetLinkStatus() != 5) {
|
||||
lastSendTime = (u32)(OSGetTime() / (__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6)) + 1000;
|
||||
@@ -1817,7 +1817,7 @@ s32 ATERM_814038C8(void) {
|
||||
if (now >= lastSendTime + 1000) {
|
||||
if (++retries >= 10) {
|
||||
failed = 1;
|
||||
result = ATERM_814036D8();
|
||||
result = ATERMApplyScanSecuritySettings();
|
||||
} else {
|
||||
gAtermProtocolState = 9;
|
||||
}
|
||||
@@ -1840,7 +1840,7 @@ s32 ATERM_814038C8(void) {
|
||||
u8 gAtermDigestFill[64] = { 0x80 };
|
||||
|
||||
s32 ATERMi_AutoConfigThread(void) {
|
||||
s32 result = ATERM_814038C8();
|
||||
s32 result = ATERMRunConfigProtocol();
|
||||
AtermProgress progress;
|
||||
u32 equalityMask;
|
||||
s32 completedState;
|
||||
@@ -1864,7 +1864,7 @@ s32 ATERMi_AutoConfigThread(void) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ATERM_81404844(u16* destination, u16* source, u32 length, void* key, u32 keyLength) {
|
||||
int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 keyLength) {
|
||||
u32 expandedKey[80];
|
||||
union { u32 words[4]; u8 bytes[16]; } block;
|
||||
union { u64 value; u8 bytes[8]; } counter;
|
||||
@@ -1889,7 +1889,7 @@ int ATERM_81404844(u16* destination, u16* source, u32 length, void* key, u32 key
|
||||
return 0;
|
||||
}
|
||||
|
||||
rounds = ATERM_81404BFC(expandedKey, key, keyLength << 3);
|
||||
rounds = ATERMAesExpandEncryptKey(expandedKey, key, keyLength << 3);
|
||||
destinationBytes = (u8*)destination;
|
||||
sourceBytes = (const u8*)source;
|
||||
memcpy(destinationBytes + 8, sourceBytes, length);
|
||||
@@ -1901,7 +1901,7 @@ int ATERM_81404844(u16* destination, u16* source, u32 length, void* key, u32 key
|
||||
|
||||
outputBlock = destinationBytes + blockOffset;
|
||||
memcpy(stateBytes + 8, outputBlock, 8);
|
||||
ATERM_81405254(expandedKey, rounds, stateBytes, stateBytes);
|
||||
ATERMAesEncryptBlock(expandedKey, rounds, stateBytes, stateBytes);
|
||||
counter.value = (u64)(s64)blockIndex + passBase;
|
||||
stateBytes[0] ^= counter.bytes[0];
|
||||
stateBytes[1] ^= counter.bytes[1];
|
||||
@@ -1918,7 +1918,7 @@ int ATERM_81404844(u16* destination, u16* source, u32 length, void* key, u32 key
|
||||
return 1;
|
||||
}
|
||||
|
||||
int ATERM_81404A18(u16* destination, u16* source, u32 length, void* key, u32 keyLength) {
|
||||
int ATERMAesKeyUnwrap(u16* destination, u16* source, u32 length, void* key, u32 keyLength) {
|
||||
u32 expandedKey[80];
|
||||
union { u32 words[4]; u8 bytes[16]; } block;
|
||||
union { u64 value; u8 bytes[8]; } counter;
|
||||
@@ -1942,7 +1942,7 @@ int ATERM_81404A18(u16* destination, u16* source, u32 length, void* key, u32 key
|
||||
return 0;
|
||||
}
|
||||
|
||||
rounds = ATERM_8140502C(expandedKey, key, keyLength << 3);
|
||||
rounds = ATERMAesExpandDecryptKey(expandedKey, key, keyLength << 3);
|
||||
destinationBytes = (u8*)destination;
|
||||
sourceBytes = (const u8*)source;
|
||||
memcpy(block.words, sourceBytes, 8);
|
||||
@@ -1963,7 +1963,7 @@ int ATERM_81404A18(u16* destination, u16* source, u32 length, void* key, u32 key
|
||||
stateBytes[6] ^= counter.bytes[6];
|
||||
stateBytes[7] ^= counter.bytes[7];
|
||||
memcpy(stateBytes + 8, outputBlock, 8);
|
||||
ATERM_81405690(expandedKey, rounds, stateBytes, stateBytes);
|
||||
ATERMAesDecryptBlock(expandedKey, rounds, stateBytes, stateBytes);
|
||||
memcpy(outputBlock, stateBytes + 8, 8);
|
||||
}
|
||||
}
|
||||
@@ -1986,7 +1986,7 @@ int ATERM_81404A18(u16* destination, u16* source, u32 length, void* key, u32 key
|
||||
((u32)keyBytes[(index) * 4 + 2] << 8) ^ \
|
||||
keyBytes[(index) * 4 + 3])
|
||||
|
||||
int ATERM_81404BFC(u32* expandedKey, const void* key, u32 keyBits) {
|
||||
int ATERMAesExpandEncryptKey(u32* expandedKey, const void* key, u32 keyBits) {
|
||||
const u8* keyBytes = (const u8*)key;
|
||||
u32* roundKey = expandedKey;
|
||||
|
||||
@@ -2096,8 +2096,8 @@ int ATERM_81404BFC(u32* expandedKey, const void* key, u32 keyBits) {
|
||||
(inverseTable0[byte0] ^ inverseTable1[byte1]); \
|
||||
}
|
||||
|
||||
int ATERM_8140502C(u32* expandedKey, const void* key, u32 keyBits) {
|
||||
int rounds = ATERM_81404BFC(expandedKey, key, keyBits);
|
||||
int ATERMAesExpandDecryptKey(u32* expandedKey, const void* key, u32 keyBits) {
|
||||
int rounds = ATERMAesExpandEncryptKey(expandedKey, key, keyBits);
|
||||
u32* roundKey;
|
||||
s32 roundCount;
|
||||
s32 firstIndex;
|
||||
@@ -2145,7 +2145,7 @@ int ATERM_8140502C(u32* expandedKey, const void* key, u32 keyBits) {
|
||||
|
||||
#undef ATERM_AES_TRANSFORM_KEY
|
||||
|
||||
void ATERM_81405254(const u32* expandedKey, u32 rounds, const u8* input, u8* output) {
|
||||
void ATERMAesEncryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u8* output) {
|
||||
u32 state0, state1, state2, state3;
|
||||
u32 next0, next1, next2, next3;
|
||||
s32 roundPairs;
|
||||
@@ -2232,7 +2232,7 @@ void ATERM_81405254(const u32* expandedKey, u32 rounds, const u8* input, u8* out
|
||||
output[15] = state3;
|
||||
}
|
||||
|
||||
void ATERM_81405690(const u32* expandedKey, u32 rounds, const u8* input, u8* output) {
|
||||
void ATERMAesDecryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u8* output) {
|
||||
u32 state0, state1, state2, state3;
|
||||
u32 next0, next1, next2, next3;
|
||||
s32 roundPairs;
|
||||
@@ -2319,9 +2319,9 @@ void ATERM_81405690(const u32* expandedKey, u32 rounds, const u8* input, u8* out
|
||||
output[15] = state3;
|
||||
}
|
||||
|
||||
void ATERM_81405D0C(u32 state[4], const u8 block[64]);
|
||||
void ATERMMd5Transform(u32 state[4], const u8 block[64]);
|
||||
|
||||
void ATERM_81405ACC(AtermMd5Context* context, void* input, u32 length) {
|
||||
void ATERMMd5Update(AtermMd5Context* context, void* input, u32 length) {
|
||||
u8* data = (u8*)input;
|
||||
u32 bufferIndex = (context->bitCountLow >> 3) & 0x3F;
|
||||
u32 bytesToFill;
|
||||
@@ -2338,9 +2338,9 @@ void ATERM_81405ACC(AtermMd5Context* context, void* input, u32 length) {
|
||||
for (copiedBytes = 0; copiedBytes < bytesToFill; copiedBytes++) {
|
||||
context->buffer8[bufferIndex + copiedBytes] = data[copiedBytes];
|
||||
}
|
||||
ATERM_81405D0C(context->state, context->buffer8);
|
||||
ATERMMd5Transform(context->state, context->buffer8);
|
||||
for (copiedBytes = bytesToFill; copiedBytes + 63 < length; copiedBytes += 64) {
|
||||
ATERM_81405D0C(context->state, data + copiedBytes);
|
||||
ATERMMd5Transform(context->state, data + copiedBytes);
|
||||
}
|
||||
bufferIndex = 0;
|
||||
} else {
|
||||
@@ -2358,7 +2358,7 @@ void ATERM_81405ACC(AtermMd5Context* context, void* input, u32 length) {
|
||||
(A) += (B); \
|
||||
} while (0)
|
||||
|
||||
void ATERM_81405D0C(u32 state[4], const u8 block[64]) {
|
||||
void ATERMMd5Transform(u32 state[4], const u8 block[64]) {
|
||||
u32 byteIndex;
|
||||
u32 index;
|
||||
const u8* inputWord;
|
||||
@@ -2452,7 +2452,7 @@ void ATERM_81405D0C(u32 state[4], const u8 block[64]) {
|
||||
}
|
||||
#undef ATERM_MD5_STEP
|
||||
|
||||
void ATERM_8140684C(OSAlarm* alarm, OSContext* context) {
|
||||
void ATERMAlarmWakeQueue(OSAlarm* alarm, OSContext* context) {
|
||||
OSMessageQueue* queue = (OSMessageQueue*)alarm->tag;
|
||||
OSSendMessage(queue, NULL, 0);
|
||||
}
|
||||
@@ -2525,7 +2525,7 @@ int ATERMi_ApConfigEnd(void) {
|
||||
OSSetAlarmTag(&cancelAlarm, (u32)&cancelQueue);
|
||||
OSSetAlarm(&cancelAlarm,
|
||||
OSMillisecondsToTicks(100),
|
||||
ATERM_8140684C);
|
||||
ATERMAlarmWakeQueue);
|
||||
OSReceiveMessage(&cancelQueue, &cancelMessage, 1);
|
||||
}
|
||||
|
||||
@@ -2534,7 +2534,7 @@ int ATERMi_ApConfigEnd(void) {
|
||||
OSSetAlarmTag(&joinAlarm, (u32)&joinQueue);
|
||||
OSSetAlarm(&joinAlarm,
|
||||
OSMillisecondsToTicks(500),
|
||||
ATERM_8140684C);
|
||||
ATERMAlarmWakeQueue);
|
||||
OSReceiveMessage(&joinQueue, &joinMessage, 1);
|
||||
while (OSIsThreadTerminated(&sAtermThread) == 0) {
|
||||
OSJoinThread(&sAtermThread, NULL);
|
||||
|
||||
@@ -64,6 +64,11 @@ namespace ipl {
|
||||
static s32 sAOSSState;
|
||||
static s32 sAOSSUnk;
|
||||
|
||||
struct AOSSStack {
|
||||
u32 storage[4080];
|
||||
u32 sentinel;
|
||||
};
|
||||
|
||||
class AOSSThread : public utility::ut_thread {
|
||||
public:
|
||||
AOSSThread(EGG::Heap* heap);
|
||||
@@ -84,7 +89,7 @@ namespace ipl {
|
||||
private:
|
||||
s32 mState; // 0x32C
|
||||
s32 mThreadPriority; // 0x330
|
||||
u8* mpStackBuffer; // 0x334
|
||||
AOSSStack* mpStack; // 0x334
|
||||
u8* mpHeapBuffer; // 0x338
|
||||
MEMHeapHandle mpExpHeap; // 0x33C
|
||||
AOSSConfig mAoss; // 0x340
|
||||
@@ -94,7 +99,7 @@ namespace ipl {
|
||||
mpExpHeap = NULL;
|
||||
sAOSSState = 0;
|
||||
mpHeapBuffer = (u8*)heap->alloc(0x40000, 0x20);
|
||||
mpStackBuffer = (u8*)heap->alloc(0x1000, 0x20);
|
||||
mpStack = (AOSSStack*)heap->alloc(0x1000, 0x20);
|
||||
}
|
||||
|
||||
void AOSSThread::destroy(int flag) {
|
||||
@@ -137,8 +142,8 @@ namespace ipl {
|
||||
mThreadPriority = OSGetThreadPriority(OSGetCurrentThread()) - 2;
|
||||
sAOSSState = 1;
|
||||
SOInit(&config);
|
||||
memset(mpStackBuffer, 0, 4);
|
||||
Create(mpStackBuffer, 0x1000, mThreadPriority, TRUE);
|
||||
memset(mpStack, 0, 4);
|
||||
Create(mpStack, 0x1000, mThreadPriority, TRUE);
|
||||
|
||||
OSRestoreInterrupts(level);
|
||||
return 1;
|
||||
@@ -178,7 +183,7 @@ namespace ipl {
|
||||
mAoss.unk_0x04 = 4;
|
||||
NETGetWirelessMacAddress(mAoss.mac);
|
||||
|
||||
*(u32*)(mpStackBuffer + 0x3FC0) = 0x97654321;
|
||||
mpStack->sentinel = 0x97654321;
|
||||
|
||||
mState = AOSSi_Init(&mAoss);
|
||||
AOSSi_EndLocal();
|
||||
|
||||
@@ -28,26 +28,26 @@ int ATERMi_ApConfigEnd();
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
extern "C" MEMAllocator RakuRakuThread_810BDDD0;
|
||||
MEMAllocator RakuRakuThread_810BDDD0;
|
||||
extern "C" MEMAllocator sRakuAllocator;
|
||||
MEMAllocator sRakuAllocator;
|
||||
struct RakuStatus {
|
||||
RakuProgress progress;
|
||||
RakuConfiguration configuration;
|
||||
};
|
||||
extern "C" RakuStatus RakuRakuThread_810BDDE0;
|
||||
RakuStatus RakuRakuThread_810BDDE0;
|
||||
extern "C" OSMessageQueue RakuRakuThread_810BDED4;
|
||||
OSMessageQueue RakuRakuThread_810BDED4;
|
||||
extern "C" RakuStatus sRakuStatus;
|
||||
RakuStatus sRakuStatus;
|
||||
extern "C" OSMessageQueue sRakuMsgQueue;
|
||||
OSMessageQueue sRakuMsgQueue;
|
||||
static OSTime startTime;
|
||||
static bool active;
|
||||
static OSMessage messageSlot;
|
||||
static int displayState = 1;
|
||||
|
||||
extern "C" {
|
||||
static void* RakuRakuThread_813FDEF0(u32, s32 size);
|
||||
static void RakuRakuThread_813FDEFC(u32, void* block, s32);
|
||||
static void* RakuRakuThread_813FDF08(u32 size);
|
||||
static void RakuRakuThread_813FDF18(void* block);
|
||||
static void* RakuSocketAlloc(u32, s32 size);
|
||||
static void RakuSocketFree(u32, void* block, s32);
|
||||
static void* RakuAtermAlloc(u32 size);
|
||||
static void RakuAtermFree(void* block);
|
||||
}
|
||||
|
||||
struct RakuStack {
|
||||
@@ -60,7 +60,7 @@ public:
|
||||
virtual ~RakuRakuThread();
|
||||
virtual void* Run();
|
||||
virtual void unk_0x2C() = 0;
|
||||
void RakuRakuThread_813FDA04();
|
||||
void syncRakuProgress();
|
||||
static void progressCallback(RakuProgress* progress);
|
||||
void destroy();
|
||||
int start();
|
||||
@@ -78,15 +78,15 @@ private:
|
||||
MEMHeapHandle mHeap;
|
||||
};
|
||||
|
||||
void RakuRakuThread::RakuRakuThread_813FDA04() {
|
||||
void RakuRakuThread::syncRakuProgress() {
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
RakuRakuThread_810BDDE0.progress = *(RakuProgress*)this;
|
||||
sRakuStatus.progress = *(RakuProgress*)this;
|
||||
startTime = OSGetTime();
|
||||
OSRestoreInterrupts(interrupts);
|
||||
}
|
||||
|
||||
void RakuRakuThread::progressCallback(RakuProgress* progress) {
|
||||
((RakuRakuThread*)progress)->RakuRakuThread_813FDA04();
|
||||
((RakuRakuThread*)progress)->syncRakuProgress();
|
||||
}
|
||||
|
||||
RakuRakuThread::RakuRakuThread(EGG::Heap* heap) : utility::ut_thread() {
|
||||
@@ -101,12 +101,12 @@ RakuRakuThread::RakuRakuThread(EGG::Heap* heap) : utility::ut_thread() {
|
||||
active = false;
|
||||
mFinished = 0;
|
||||
mRunning = 0;
|
||||
OSInitMessageQueue(&RakuRakuThread_810BDED4, &messageSlot, 1);
|
||||
OSInitMessageQueue(&sRakuMsgQueue, &messageSlot, 1);
|
||||
}
|
||||
|
||||
RakuRakuThread::~RakuRakuThread() {
|
||||
if (mRunning) {
|
||||
OSJamMessage(&RakuRakuThread_810BDED4, (OSMessage)2, 1);
|
||||
OSJamMessage(&sRakuMsgQueue, (OSMessage)2, 1);
|
||||
WaitForThreadExit();
|
||||
}
|
||||
destroy();
|
||||
@@ -114,7 +114,7 @@ RakuRakuThread::~RakuRakuThread() {
|
||||
|
||||
void RakuRakuThread::destroy() {
|
||||
if (active) {
|
||||
OSSendMessage(&RakuRakuThread_810BDED4, (OSMessage)1, 0);
|
||||
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
|
||||
u32 start = OSGetTick();
|
||||
while ((u32)(OSGetTick() - start) / (OS_TIMER_CLOCK / 1000) < 2000) {
|
||||
RakuProgress progress;
|
||||
@@ -127,7 +127,7 @@ void RakuRakuThread::destroy() {
|
||||
}
|
||||
if (mHeap != NULL) {
|
||||
MEMDestroyExpHeap(mHeap);
|
||||
memset(&RakuRakuThread_810BDDD0, 0, sizeof(MEMAllocator));
|
||||
memset(&sRakuAllocator, 0, sizeof(MEMAllocator));
|
||||
mHeap = NULL;
|
||||
}
|
||||
}
|
||||
@@ -139,19 +139,19 @@ int RakuRakuThread::start() {
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
startTime = OSGetTime();
|
||||
mHeap = MEMCreateExpHeapEx(mHeapBuffer, 0x40000, 2);
|
||||
MEMInitAllocatorForExpHeap(&RakuRakuThread_810BDDD0, mHeap, 32);
|
||||
MEMInitAllocatorForExpHeap(&sRakuAllocator, mHeap, 32);
|
||||
mPriority = OSGetThreadPriority(OSGetCurrentThread()) - 1;
|
||||
active = true;
|
||||
mFinished = 0;
|
||||
memset(&RakuRakuThread_810BDDE0.configuration, 0, sizeof(RakuConfiguration));
|
||||
memset(&RakuRakuThread_810BDDE0.progress, 0, sizeof(RakuProgress));
|
||||
memset(&sRakuStatus.configuration, 0, sizeof(RakuConfiguration));
|
||||
memset(&sRakuStatus.progress, 0, sizeof(RakuProgress));
|
||||
SOLibraryConfig socketConfig;
|
||||
socketConfig.alloc = RakuRakuThread_813FDEF0;
|
||||
socketConfig.free = RakuRakuThread_813FDEFC;
|
||||
socketConfig.alloc = RakuSocketAlloc;
|
||||
socketConfig.free = RakuSocketFree;
|
||||
SOInit(&socketConfig);
|
||||
ATERMi_ApConfigStart(mPriority, 200,
|
||||
progressCallback,
|
||||
RakuRakuThread_813FDF08, RakuRakuThread_813FDF18, 4096);
|
||||
RakuAtermAlloc, RakuAtermFree, 4096);
|
||||
if (!mRunning) {
|
||||
mRunning = 1;
|
||||
memset(mStack, 0, 4);
|
||||
@@ -165,12 +165,12 @@ int RakuRakuThread::start() {
|
||||
void* RakuRakuThread::Run() {
|
||||
OSMessage message;
|
||||
while (true) {
|
||||
while (OSReceiveMessage(&RakuRakuThread_810BDED4, &message, 0)) {
|
||||
while (OSReceiveMessage(&sRakuMsgQueue, &message, 0)) {
|
||||
if ((s32)message == 2) {
|
||||
return this;
|
||||
}
|
||||
}
|
||||
OSReceiveMessage(&RakuRakuThread_810BDED4, &message, 1);
|
||||
OSReceiveMessage(&sRakuMsgQueue, &message, 1);
|
||||
if ((s32)message == 2) {
|
||||
break;
|
||||
}
|
||||
@@ -184,17 +184,17 @@ void* RakuRakuThread::Run() {
|
||||
return this;
|
||||
}
|
||||
|
||||
static void* RakuRakuThread_813FDEF0(u32, s32 size) {
|
||||
return MEMAllocFromAllocator(&RakuRakuThread_810BDDD0, size);
|
||||
static void* RakuSocketAlloc(u32, s32 size) {
|
||||
return MEMAllocFromAllocator(&sRakuAllocator, size);
|
||||
}
|
||||
static void RakuRakuThread_813FDEFC(u32, void* block, s32) {
|
||||
MEMFreeToAllocator(&RakuRakuThread_810BDDD0, block);
|
||||
static void RakuSocketFree(u32, void* block, s32) {
|
||||
MEMFreeToAllocator(&sRakuAllocator, block);
|
||||
}
|
||||
static void* RakuRakuThread_813FDF08(u32 size) {
|
||||
return MEMAllocFromAllocator(&RakuRakuThread_810BDDD0, size);
|
||||
static void* RakuAtermAlloc(u32 size) {
|
||||
return MEMAllocFromAllocator(&sRakuAllocator, size);
|
||||
}
|
||||
static void RakuRakuThread_813FDF18(void* block) {
|
||||
MEMFreeToAllocator(&RakuRakuThread_810BDDD0, block);
|
||||
static void RakuAtermFree(void* block) {
|
||||
MEMFreeToAllocator(&sRakuAllocator, block);
|
||||
}
|
||||
|
||||
int RakuRakuThread::getState() {
|
||||
@@ -202,7 +202,7 @@ int RakuRakuThread::getState() {
|
||||
return 0;
|
||||
}
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
switch (RakuRakuThread_810BDDE0.progress.state) {
|
||||
switch (sRakuStatus.progress.state) {
|
||||
case 1: displayState = 1; break;
|
||||
case 2: displayState = 2; break;
|
||||
case 3: displayState = 2; break;
|
||||
@@ -214,14 +214,14 @@ int RakuRakuThread::getState() {
|
||||
}
|
||||
if (displayState != 6 && displayState != 7 &&
|
||||
((u32)OSGetTime() - (u32)startTime) / (OS_TIMER_CLOCK / 1000) >= 90000) {
|
||||
OSSendMessage(&RakuRakuThread_810BDED4, (OSMessage)1, 0);
|
||||
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
|
||||
}
|
||||
OSRestoreInterrupts(interrupts);
|
||||
return displayState;
|
||||
}
|
||||
|
||||
int RakuRakuThread::cancel() {
|
||||
return OSSendMessage(&RakuRakuThread_810BDED4, (OSMessage)1, 0);
|
||||
return OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
|
||||
}
|
||||
|
||||
int RakuRakuThread::finish(NCDApConfig* config, int* result) {
|
||||
@@ -231,23 +231,23 @@ int RakuRakuThread::finish(NCDApConfig* config, int* result) {
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
s32 state = RakuRakuThread_810BDDE0.progress.state;
|
||||
s32 state = sRakuStatus.progress.state;
|
||||
if ((u32)(state - 6) > 1) {
|
||||
return 0;
|
||||
}
|
||||
if (!mFinished) {
|
||||
if (state == 6) {
|
||||
ATERMi_ApConfigGetResult(&RakuRakuThread_810BDDE0.configuration);
|
||||
ATERMi_ApConfigGetResult(&sRakuStatus.configuration);
|
||||
printInfo();
|
||||
}
|
||||
OSSendMessage(&RakuRakuThread_810BDED4, (OSMessage)1, 0);
|
||||
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
|
||||
return 0;
|
||||
}
|
||||
SOFinish();
|
||||
active = false;
|
||||
destroy();
|
||||
if (config != NULL) {
|
||||
RakuConfiguration* settings = &RakuRakuThread_810BDDE0.configuration;
|
||||
RakuConfiguration* settings = &sRakuStatus.configuration;
|
||||
memcpy(config->ssid, settings->ssid, 32);
|
||||
config->ssidLength = strlen(settings->ssid);
|
||||
if (settings->security == 1) {
|
||||
@@ -273,7 +273,7 @@ int RakuRakuThread::finish(NCDApConfig* config, int* result) {
|
||||
}
|
||||
}
|
||||
if (result != NULL) {
|
||||
*result = RakuRakuThread_810BDDE0.progress.result;
|
||||
*result = sRakuStatus.progress.result;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
#define IPL_CONTROLLER_TRIVIAL_RECT_DTOR
|
||||
#include <nw4r/ut/Rect.h>
|
||||
#undef IPL_CONTROLLER_TRIVIAL_RECT_DTOR
|
||||
|
||||
#include "system/iplSystem.h"
|
||||
#include "system/iplNand.h"
|
||||
#include "utility/iplGraphics.h"
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
TextBalloon::TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const math::VEC3& unk2,
|
||||
f32 unk3, f32 unk4)
|
||||
: unk_0x08(FALSE), mpText(NULL), mTextLen(0), mBalloonPos(unk2), unk_0x28(0), unk_0x2C(1), unk_0x30(unk3), unk_0x34(unk4),
|
||||
TextBalloon::TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const math::VEC3& initialPos,
|
||||
f32 margin16x9, f32 margin4x3)
|
||||
: mbWaitingFadeIn(FALSE), mpText(NULL), mTextLen(0), mBalloonPos(initialPos), mHAlign(0), mbUse16x9X(1), mMargin16x9(margin16x9), mMargin4x3(margin4x3),
|
||||
mWaitUntilFadeIn(0) {
|
||||
mpLayout = new (heap, 4) layout::Object(heap, layoutFile, directory, fileName);
|
||||
mpLayout->bind("my_IplTopBalloon_a_BalloonInOut.brlan");
|
||||
@@ -31,7 +31,7 @@ namespace ipl {
|
||||
void TextBalloon::calc() {
|
||||
mpLayout->calc();
|
||||
|
||||
switch (unk_0x08) {
|
||||
switch (mbWaitingFadeIn) {
|
||||
case TRUE: {
|
||||
break;
|
||||
}
|
||||
@@ -73,7 +73,7 @@ namespace ipl {
|
||||
|
||||
balloonPane->SetVisible(false);
|
||||
|
||||
unk_0x08 = FALSE;
|
||||
mbWaitingFadeIn = FALSE;
|
||||
}
|
||||
|
||||
void TextBalloon::fadein() {
|
||||
@@ -81,7 +81,7 @@ namespace ipl {
|
||||
mpLayout->FindPaneByName("N_Balloon")->SetVisible(false);
|
||||
|
||||
mWaitUntilFadeIn = 0;
|
||||
unk_0x08 = TRUE;
|
||||
mbWaitingFadeIn = TRUE;
|
||||
|
||||
set_textbox(mpText);
|
||||
set_translate(mBalloonPos);
|
||||
@@ -91,17 +91,17 @@ namespace ipl {
|
||||
void TextBalloon::fadeinNoSetTextbox() {
|
||||
if (mpText != NULL) {
|
||||
mWaitUntilFadeIn = 0;
|
||||
unk_0x08 = TRUE;
|
||||
mbWaitingFadeIn = TRUE;
|
||||
|
||||
set_translate(mBalloonPos);
|
||||
}
|
||||
}
|
||||
|
||||
void TextBalloon::setPos(const math::VEC3& pos, bool unk0, int unk1) {
|
||||
void TextBalloon::setPos(const math::VEC3& pos, bool use16x9X, int hAlign) {
|
||||
mBalloonPos = pos;
|
||||
|
||||
unk_0x28 = unk1;
|
||||
unk_0x2C = unk0;
|
||||
mHAlign = hAlign;
|
||||
mbUse16x9X = use16x9X;
|
||||
|
||||
nw4r::ut::Rect proj16x9;
|
||||
nw4r::ut::Rect proj4x3;
|
||||
@@ -109,7 +109,7 @@ namespace ipl {
|
||||
System::getProjectionRect(&proj16x9);
|
||||
System::getProjectionRect4x3(&proj4x3);
|
||||
|
||||
if (unk_0x2C == 0) {
|
||||
if (mbUse16x9X == 0) {
|
||||
mBalloonPos.x *= proj4x3.GetWidth() / proj16x9.GetWidth();
|
||||
}
|
||||
}
|
||||
@@ -122,7 +122,7 @@ namespace ipl {
|
||||
System::getProjectionRect(&proj16x9);
|
||||
System::getProjectionRect4x3(&proj4x3);
|
||||
|
||||
if (unk_0x2C == 0) {
|
||||
if (mbUse16x9X == 0) {
|
||||
mBalloonPos.x *= proj4x3.GetWidth() / proj16x9.GetWidth();
|
||||
}
|
||||
|
||||
@@ -133,27 +133,27 @@ namespace ipl {
|
||||
if (mWaitUntilFadeIn++ > WAIT_UNTIL_FADE_IN) {
|
||||
anm_fadein();
|
||||
snd::getSystem()->startSE("WIPL_SE_BALLOON");
|
||||
unk_0x08 = FALSE;
|
||||
mbWaitingFadeIn = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
void TextBalloon::fadeout() {
|
||||
if (!unk_0x08) {
|
||||
if (!mbWaitingFadeIn) {
|
||||
mpLayout->setAnmType(ANIM_TYPE_BACKWARD);
|
||||
mpLayout->start();
|
||||
}
|
||||
unk_0x08 = FALSE;
|
||||
mbWaitingFadeIn = FALSE;
|
||||
}
|
||||
|
||||
void TextBalloon::fadeoutForce() {
|
||||
if (!unk_0x08) {
|
||||
if (!mbWaitingFadeIn) {
|
||||
if (mpLayout->getAnim()->getAnmType() == ANIM_TYPE_FORWARD) {
|
||||
mpLayout->getAnim()->setAnmType(ANIM_TYPE_BACKWARD);
|
||||
mpLayout->getAnim()->restart();
|
||||
}
|
||||
} else if (unk_0x08 == TRUE) {
|
||||
} else if (mbWaitingFadeIn == TRUE) {
|
||||
mWaitUntilFadeIn = 0;
|
||||
unk_0x08 = FALSE;
|
||||
mbWaitingFadeIn = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,9 +167,9 @@ namespace ipl {
|
||||
f32 temp0;
|
||||
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
temp0 = unk_0x30;
|
||||
temp0 = mMargin16x9;
|
||||
} else {
|
||||
temp0 = unk_0x34;
|
||||
temp0 = mMargin4x3;
|
||||
}
|
||||
|
||||
nw4r::lyt::Pane* balloonPane = mpLayout->FindPaneByName("N_Balloon");
|
||||
@@ -181,7 +181,7 @@ namespace ipl {
|
||||
System::getProjectionRect(&proj16x9);
|
||||
System::getProjectionRect4x3(&proj4x3);
|
||||
|
||||
switch (unk_0x28) {
|
||||
switch (mHAlign) {
|
||||
case 1: {
|
||||
temp1 = get_size("W_Base")->width / 2;
|
||||
break;
|
||||
@@ -192,7 +192,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
if (unk_0x2C == 0) {
|
||||
if (mbUse16x9X == 0) {
|
||||
temp1 *= proj4x3.GetWidth() / proj16x9.GetWidth();
|
||||
}
|
||||
|
||||
|
||||
@@ -19,11 +19,11 @@ extern "C" {
|
||||
}
|
||||
extern "C" void _seBlk__Q23ipl3snd();
|
||||
extern "C" nw4r::snd::SoundHandle* _mainBGMHandle__Q23ipl3snd;
|
||||
extern "C" const f32 lbl_816946A4;
|
||||
extern "C" const f32 lbl_816946AC;
|
||||
extern "C" const f32 lbl_816946A8;
|
||||
extern "C" const f32 lbl_816946B0;
|
||||
extern "C" const f32 lbl_816946B4;
|
||||
extern "C" const f32 scSoundZeroF;
|
||||
extern "C" const f32 scSoundOneF;
|
||||
extern "C" const f32 scSoundTwoF;
|
||||
extern "C" const f32 scSoundThirtyF;
|
||||
extern "C" const f32 scSoundSixtyF;
|
||||
extern "C" {
|
||||
void _savegpr_29();
|
||||
void pauseOffSE__Q33ipl3snd6SystemFv();
|
||||
@@ -265,10 +265,10 @@ namespace ipl {
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
lfs f1, lbl_816946A4
|
||||
lfs f1, scSoundZeroF
|
||||
li r4, 0
|
||||
bl SetMasterVolume__Q44nw4r3snd6detail9AxManagerFfi
|
||||
lfs f1, lbl_816946A4
|
||||
lfs f1, scSoundZeroF
|
||||
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
|
||||
bl setMasterVolume__17BannerSoundPlayerFf
|
||||
addi r11, r1, 0x20
|
||||
@@ -315,7 +315,7 @@ namespace ipl {
|
||||
sBannerSoundPlayer.setMasterVolume(0.9f);
|
||||
}
|
||||
|
||||
extern "C" const f32 lbl_816946A4 = 0.0f;
|
||||
extern "C" const f32 scSoundZeroF = 0.0f;
|
||||
|
||||
void System::stopBannerSound(int unk) {
|
||||
sBannerSoundPlayer.stop(unk);
|
||||
@@ -500,21 +500,21 @@ namespace snd {
|
||||
if (block->handle.detail_GetAttachedSound() != NULL) {
|
||||
block->handle.detail_GetAttachedSound()->SetPan(pan);
|
||||
}
|
||||
f32 pitch = lbl_816946A8 * y / rect.right;
|
||||
if (lbl_816946AC < pitch) {
|
||||
pitch = lbl_816946AC;
|
||||
f32 pitch = scSoundTwoF * y / rect.right;
|
||||
if (scSoundOneF < pitch) {
|
||||
pitch = scSoundOneF;
|
||||
}
|
||||
if (block->handle.detail_GetAttachedSound() != NULL) {
|
||||
block->handle.detail_GetAttachedSound()->SetVolume(pitch, 0);
|
||||
}
|
||||
if (lbl_816946B0 < y) {
|
||||
f32 pitch2 = y / lbl_816946B0;
|
||||
if (scSoundThirtyF < y) {
|
||||
f32 pitch2 = y / scSoundThirtyF;
|
||||
if (block->handle.detail_GetAttachedSound() != NULL) {
|
||||
block->handle.detail_GetAttachedSound()->SetPitch(pitch2);
|
||||
}
|
||||
} else if (lbl_816946B4 < y) {
|
||||
} else if (scSoundSixtyF < y) {
|
||||
if (block->handle.detail_GetAttachedSound() != NULL) {
|
||||
block->handle.detail_GetAttachedSound()->SetPitch(lbl_816946A8);
|
||||
block->handle.detail_GetAttachedSound()->SetPitch(scSoundTwoF);
|
||||
}
|
||||
}
|
||||
return (int)block;
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
#include <revolution/gx/GXStruct.h>
|
||||
#include <revolution/os/OSError.h>
|
||||
|
||||
extern "C" const unsigned char lbl_8169622C;
|
||||
extern "C" const unsigned char lbl_8169622D;
|
||||
extern "C" const unsigned char lbl_8169622E;
|
||||
extern "C" const unsigned char lbl_8169622F;
|
||||
extern "C" const char lbl_81639230[65];
|
||||
extern "C" const unsigned char scRsoFatalColorR;
|
||||
extern "C" const unsigned char scRsoFatalColorG;
|
||||
extern "C" const unsigned char scRsoFatalColorB;
|
||||
extern "C" const unsigned char scRsoFatalColorA;
|
||||
extern "C" const char scRsoFatalMsg[65];
|
||||
|
||||
#define NW4R_DB_ASSERT_H
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {*((volatile const unsigned char*)&lbl_8169622C), *((volatile const unsigned char*)&lbl_8169622D), *((volatile const unsigned char*)&lbl_8169622E), *((volatile const unsigned char*)&lbl_8169622F)}; \
|
||||
GXColor front = {*((volatile const unsigned char*)&scRsoFatalColorR), *((volatile const unsigned char*)&scRsoFatalColorG), *((volatile const unsigned char*)&scRsoFatalColorB), *((volatile const unsigned char*)&scRsoFatalColorA)}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, lbl_81639230); \
|
||||
OSFatal((GXColor)front, (GXColor)back, scRsoFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
@@ -326,15 +326,15 @@ __declspec(export) void IplRso_symbolMaker() {
|
||||
wideTextWriter->CalcStringRect(&rect, L"");
|
||||
}
|
||||
|
||||
extern "C" __declspec(section ".sdata") const unsigned char lbl_8169622C = 255;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char lbl_8169622D = 255;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char lbl_8169622E = 255;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char lbl_8169622F = 0;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char scRsoFatalColorR = 255;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char scRsoFatalColorG = 255;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char scRsoFatalColorB = 255;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char scRsoFatalColorA = 0;
|
||||
|
||||
extern "C" __declspec(section ".data") const char lbl_81639230[65] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
extern "C" __declspec(section ".data") const char scRsoFatalMsg[65] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
|
||||
extern "C" __declspec(section ".data") __declspec(align(1)) const f32 rso_data_pad_f32 = 0.0f;
|
||||
extern "C" __declspec(section ".data") __declspec(align(1)) const u16 rso_data_pad_u16 = 0;
|
||||
extern "C" __declspec(section ".data") __declspec(align(1)) const u8 rso_data_pad_u8 = 0;
|
||||
|
||||
extern "C" __declspec(section ".sdata2") const f32 lbl_81694598 = 0.0f;
|
||||
extern "C" __declspec(section ".sdata2") const f32 scRsoZeroF = 0.0f;
|
||||
|
||||
@@ -1235,7 +1235,7 @@ namespace ipl {
|
||||
|
||||
#pragma pop
|
||||
|
||||
SEntry* Manager::fn_8133A4E0(ESTitleId titleId) {
|
||||
SEntry* Manager::findEntryByTitleId(ESTitleId titleId) {
|
||||
for (int page = 0; page < MAX_CHANNEL_PAGE; page++) {
|
||||
for (int index = 0; index < MAX_CHANNEL_INDEX; index++) {
|
||||
ESTitleId cmp = ES_TITLE_ID(mChannels[page][index].info.titleType, mChannels[page][index].info.titleCode);
|
||||
@@ -1255,8 +1255,8 @@ namespace ipl {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
u32 Manager::fn_8133A57C(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
u32 Manager::getBannerCSIdx(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel != NULL) {
|
||||
return channel->metaHdr->blockHdr.bannerCSIdx;
|
||||
} else {
|
||||
@@ -1264,8 +1264,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
u32 Manager::fn_8133A5B8(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
u32 Manager::getSoundSize(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel != NULL) {
|
||||
return channel->metaHdr->blockHdr.soundSize;
|
||||
} else {
|
||||
@@ -1273,8 +1273,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
BOOL Manager::fn_8133A5F0(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
BOOL Manager::needsNetSetting(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel != NULL && (channel->metaHdr->blockHdr.netSetting << 8)) {
|
||||
return TRUE;
|
||||
} else {
|
||||
@@ -1282,8 +1282,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
BOOL Manager::fn_8133A634(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
BOOL Manager::usesAltSound(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel != NULL && (channel->metaHdr->blockHdr.useAltSound << 14)) {
|
||||
return TRUE;
|
||||
} else {
|
||||
@@ -1291,8 +1291,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
BOOL Manager::fn_8133A678(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
BOOL Manager::isMissingTicket(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel != NULL && channel->missingTicket != FALSE) {
|
||||
return TRUE;
|
||||
} else {
|
||||
@@ -1300,8 +1300,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
BOOL Manager::fn_8133A6B8(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
BOOL Manager::isNewsChannelV6Plus(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
@@ -1315,8 +1315,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
BOOL Manager::fn_8133A73C(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
BOOL Manager::isOperaChannel(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
@@ -1329,8 +1329,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
nand::MetaFile* Manager::fn_8133A7A4(EGG::Heap* heap, ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
nand::MetaFile* Manager::readBannerMetaAsync(EGG::Heap* heap, ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -1343,8 +1343,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
nand::MetaFile* Manager::fn_8133A85C(EGG::Heap* heap, ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
nand::MetaFile* Manager::readSoundMetaAsync(EGG::Heap* heap, ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -1357,8 +1357,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
nand::SharedFile* Manager::fn_8133A924(EGG::Heap* heap, ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
nand::SharedFile* Manager::readBannerCSAsync(EGG::Heap* heap, ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -1366,7 +1366,7 @@ namespace ipl {
|
||||
if (!channel->loadedBnr || channel->info.primaryType == channel::PRIMARY_TYPE_DISK) {
|
||||
return NULL;
|
||||
} else {
|
||||
u32 index = fn_8133A57C(titleId);
|
||||
u32 index = getBannerCSIdx(titleId);
|
||||
if (index == 0) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -1375,15 +1375,15 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
void Manager::fn_8133A9F0() {
|
||||
void Manager::clearTmpChannel() {
|
||||
if (mTmpChannel.bnrFile != NULL) {
|
||||
delete mTmpChannel.bnrFile;
|
||||
}
|
||||
memset(&mTmpChannel, 0, sizeof(mTmpChannel));
|
||||
}
|
||||
|
||||
void Manager::fn_8133AA50(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
void Manager::unloadBanner(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel != NULL) {
|
||||
channel->loadedBnr = false;
|
||||
}
|
||||
|
||||
@@ -230,34 +230,29 @@ namespace ipl {
|
||||
blr
|
||||
}
|
||||
|
||||
asm int Manager::getNumValidChannel() const {
|
||||
nofralloc
|
||||
li r9, 0
|
||||
li r10, 0
|
||||
li r4, 0
|
||||
li r0, 0xc
|
||||
getNumValidChannel_L1:
|
||||
add r8, r3, r4
|
||||
li r5, 0
|
||||
mtctr r0
|
||||
getNumValidChannel_L2:
|
||||
add r7, r8, r5
|
||||
lbz r6, 0x30(r7)
|
||||
cmpwi r6, 0
|
||||
beq getNumValidChannel_L3
|
||||
lwz r6, 0x34(r7)
|
||||
cmpwi r6, 0
|
||||
beq getNumValidChannel_L3
|
||||
addi r9, r9, 1
|
||||
getNumValidChannel_L3:
|
||||
addi r5, r5, 0x10
|
||||
bdnz getNumValidChannel_L2
|
||||
addi r10, r10, 1
|
||||
addi r4, r4, 0xc0
|
||||
cmpwi r10, 4
|
||||
blt getNumValidChannel_L1
|
||||
mr r3, r9
|
||||
blr
|
||||
int Manager::getNumValidChannel() const {
|
||||
const ChannelSlot* q;
|
||||
int dens = 12;
|
||||
const ChannelPage* p;
|
||||
int slot;
|
||||
int count = 0;
|
||||
int page;
|
||||
u8 flag;
|
||||
s32 val;
|
||||
for (page = 0; page < 4; page++) {
|
||||
p = (const ChannelPage*)((const u8*)this + page * 0xc0);
|
||||
for (slot = 0; slot < dens; slot++) {
|
||||
q = &p->slots[slot];
|
||||
flag = q->valid;
|
||||
if (flag != 0) {
|
||||
val = q->titleId;
|
||||
if (val != 0) {
|
||||
count++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
BOOL Manager::isResetAcceptable() {
|
||||
@@ -1003,39 +998,21 @@ namespace ipl {
|
||||
return count - 1;
|
||||
}
|
||||
|
||||
asm int Manager::getAvailableInList(register const ESTitleId* titleIds, register u32 titleCount) {
|
||||
nofralloc
|
||||
li r8, 0
|
||||
li r6, 0
|
||||
li r7, 0xc
|
||||
mtctr r5
|
||||
cmplwi r5, 0
|
||||
ble getAvailableInList_L3
|
||||
getAvailableInList_L1:
|
||||
add r5, r4, r6
|
||||
lwzx r0, r4, r6
|
||||
lwz r5, 4(r5)
|
||||
or. r0, r5, r0
|
||||
bne getAvailableInList_L2
|
||||
divw r5, r8, r7
|
||||
mullw r0, r5, r7
|
||||
mulli r5, r5, 0xc0
|
||||
subf r0, r0, r8
|
||||
add r5, r3, r5
|
||||
slwi r0, r0, 4
|
||||
add r5, r5, r0
|
||||
lbz r0, 0x30(r5)
|
||||
cmplwi r0, 1
|
||||
beq getAvailableInList_L2
|
||||
mr r3, r8
|
||||
blr
|
||||
getAvailableInList_L2:
|
||||
addi r8, r8, 1
|
||||
addi r6, r6, 8
|
||||
bdnz getAvailableInList_L1
|
||||
getAvailableInList_L3:
|
||||
li r3, -1
|
||||
blr
|
||||
int Manager::getAvailableInList(const ESTitleId* titleIds, u32 titleCount) {
|
||||
int dens = 12;
|
||||
u32 i;
|
||||
for (i = 0; i < titleCount; i++) {
|
||||
if (titleIds[i] == 0) {
|
||||
int page = (int)i / dens;
|
||||
int slot = (int)i % dens;
|
||||
u8* p = (u8*)this + page * 0xc0;
|
||||
p += slot * 16;
|
||||
if (*(p + 0x30) != 1) {
|
||||
return (int)i;
|
||||
}
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
asm int Manager::isEqualChannel(register ESTitleId titleId0, register ESTitleId titleId1) {
|
||||
|
||||
@@ -152,81 +152,81 @@ Rvl_decode_szs_done:
|
||||
}
|
||||
#else
|
||||
int Rvl_decode_szs(u8* out, u8* in) {
|
||||
register u8* pbVar1;
|
||||
register u8 bVar2;
|
||||
register u8 bVar3;
|
||||
register u8* pbVar5;
|
||||
register int iVar6;
|
||||
register int iVar7;
|
||||
register u32 uVar8;
|
||||
register u32 uVar9;
|
||||
register u32 uVar10;
|
||||
register u32 param_5;
|
||||
iVar6 = *(int*)(in + 4);
|
||||
uVar8 = 0;
|
||||
register u8* copySrc;
|
||||
register u8 hdrByte;
|
||||
register u8 extLenByte;
|
||||
register u8* inPtr;
|
||||
register int decodedSize;
|
||||
register int remaining;
|
||||
register u32 bitMask;
|
||||
register u32 copyLen;
|
||||
register u32 blockCount;
|
||||
register u32 flags;
|
||||
decodedSize = *(int*)(in + 4);
|
||||
bitMask = 0;
|
||||
in += 0x10;
|
||||
iVar7 = iVar6;
|
||||
remaining = decodedSize;
|
||||
do {
|
||||
next:
|
||||
while (1) {
|
||||
uVar8 >>= 1;
|
||||
pbVar5 = in;
|
||||
if (uVar8 == 0) {
|
||||
param_5 = *in;
|
||||
uVar8 = 0x80;
|
||||
pbVar5 = in + 1;
|
||||
bitMask >>= 1;
|
||||
inPtr = in;
|
||||
if (bitMask == 0) {
|
||||
flags = *in;
|
||||
bitMask = 0x80;
|
||||
inPtr = in + 1;
|
||||
}
|
||||
bVar2 = *pbVar5;
|
||||
if ((uVar8 & param_5) == 0) {
|
||||
hdrByte = *inPtr;
|
||||
if ((bitMask & flags) == 0) {
|
||||
break;
|
||||
}
|
||||
in = pbVar5 + 1;
|
||||
iVar7--;
|
||||
*out = bVar2;
|
||||
in = inPtr + 1;
|
||||
remaining--;
|
||||
*out = hdrByte;
|
||||
out++;
|
||||
if (iVar7 != 0) {
|
||||
if (remaining != 0) {
|
||||
goto next;
|
||||
}
|
||||
goto done;
|
||||
}
|
||||
uVar9 = bVar2 >> 4;
|
||||
in = pbVar5 + 2;
|
||||
if (uVar9 == 0) {
|
||||
bVar3 = *in;
|
||||
in = pbVar5 + 3;
|
||||
uVar9 = bVar3 + 0x10;
|
||||
copyLen = hdrByte >> 4;
|
||||
in = inPtr + 2;
|
||||
if (copyLen == 0) {
|
||||
extLenByte = *in;
|
||||
in = inPtr + 3;
|
||||
copyLen = extLenByte + 0x10;
|
||||
}
|
||||
pbVar5 = out - (((bVar2 & 0xf) << 8) | pbVar5[1]);
|
||||
iVar7 = (iVar7 - uVar9) - 2;
|
||||
*out = pbVar5[-1];
|
||||
out[1] = *pbVar5;
|
||||
pbVar5 += 2;
|
||||
uVar10 = uVar9 >> 3;
|
||||
inPtr = out - (((hdrByte & 0xf) << 8) | inPtr[1]);
|
||||
remaining = (remaining - copyLen) - 2;
|
||||
*out = inPtr[-1];
|
||||
out[1] = *inPtr;
|
||||
inPtr += 2;
|
||||
blockCount = copyLen >> 3;
|
||||
out += 2;
|
||||
if (uVar10 != 0) {
|
||||
if (blockCount != 0) {
|
||||
do {
|
||||
*out = pbVar5[-1];
|
||||
out[1] = *pbVar5;
|
||||
out[2] = pbVar5[1];
|
||||
out[3] = pbVar5[2];
|
||||
out[4] = pbVar5[3];
|
||||
out[5] = pbVar5[4];
|
||||
out[6] = pbVar5[5];
|
||||
out[7] = pbVar5[6];
|
||||
pbVar5 += 8;
|
||||
*out = inPtr[-1];
|
||||
out[1] = *inPtr;
|
||||
out[2] = inPtr[1];
|
||||
out[3] = inPtr[2];
|
||||
out[4] = inPtr[3];
|
||||
out[5] = inPtr[4];
|
||||
out[6] = inPtr[5];
|
||||
out[7] = inPtr[6];
|
||||
inPtr += 8;
|
||||
out += 8;
|
||||
uVar10--;
|
||||
} while (uVar10 != 0);
|
||||
blockCount--;
|
||||
} while (blockCount != 0);
|
||||
}
|
||||
for (uVar9 &= 7; uVar9 != 0; uVar9--) {
|
||||
pbVar1 = pbVar5 - 1;
|
||||
pbVar5++;
|
||||
*out = *pbVar1;
|
||||
for (copyLen &= 7; copyLen != 0; copyLen--) {
|
||||
copySrc = inPtr - 1;
|
||||
inPtr++;
|
||||
*out = *copySrc;
|
||||
out++;
|
||||
}
|
||||
} while (0 < iVar7);
|
||||
} while (0 < remaining);
|
||||
done:
|
||||
return iVar6;
|
||||
return decodedSize;
|
||||
}
|
||||
#endif
|
||||
#ifdef __MWERKS__
|
||||
@@ -490,225 +490,225 @@ L_Rvl_decode_ash_return:
|
||||
}
|
||||
#else
|
||||
int Rvl_decode_ash(u8* out, u8* in) {
|
||||
u8* puVar1;
|
||||
u32* puVar2;
|
||||
u32 uVar3;
|
||||
u32 uVar4;
|
||||
u32 uVar5;
|
||||
u32 uVar6;
|
||||
int iVar7;
|
||||
u16 uVar8;
|
||||
u16 uVar10;
|
||||
u8* puVar9;
|
||||
int iVar11;
|
||||
u32 uVar12;
|
||||
u32 uVar13;
|
||||
u32 uVar14;
|
||||
u32 uVar15;
|
||||
int iVar16;
|
||||
int iVar17;
|
||||
u32 uVar18;
|
||||
u32 uVar19;
|
||||
u32 uVar20;
|
||||
u16* puVar21;
|
||||
u8* dst;
|
||||
u32* inWordPtr;
|
||||
u32 decodedSize;
|
||||
u32 sym9;
|
||||
u32 sym11;
|
||||
u32 nodeVal;
|
||||
int needBits;
|
||||
u16 nodeCount;
|
||||
u16 nextNode;
|
||||
u8* litPtr;
|
||||
int bitOff1;
|
||||
u32 bitPos1;
|
||||
u32 shifted;
|
||||
u32 bitWord1;
|
||||
u32 tmp15;
|
||||
int stackDepth;
|
||||
int bitOff2;
|
||||
u32 bitPos2;
|
||||
u32 bitWord2;
|
||||
u32 tmp20;
|
||||
u16* stackPtr;
|
||||
|
||||
uVar3 = *(u32*)(in + 4) & 0xffffff;
|
||||
iVar11 = 0x10;
|
||||
uVar12 = 0;
|
||||
uVar18 = 0;
|
||||
uVar19 = *(u32*)(*(int*)(in + 8) + in);
|
||||
iVar17 = *(int*)(in + 8) + 4;
|
||||
puVar21 = (u16*)&work[0x4ff8];
|
||||
uVar8 = 0x200;
|
||||
iVar16 = 0;
|
||||
uVar14 = *(u32*)(in + 0xc);
|
||||
uVar10 = 0x200;
|
||||
decodedSize = *(u32*)(in + 4) & 0xffffff;
|
||||
bitOff1 = 0x10;
|
||||
bitPos1 = 0;
|
||||
bitPos2 = 0;
|
||||
bitWord2 = *(u32*)(*(int*)(in + 8) + in);
|
||||
bitOff2 = *(int*)(in + 8) + 4;
|
||||
stackPtr = (u16*)&work[0x4ff8];
|
||||
nodeCount = 0x200;
|
||||
stackDepth = 0;
|
||||
bitWord1 = *(u32*)(in + 0xc);
|
||||
nextNode = 0x200;
|
||||
do {
|
||||
while (1) {
|
||||
if (uVar12 == 0x1f) {
|
||||
uVar13 = *(u32*)(in + iVar11);
|
||||
uVar12 = 0;
|
||||
iVar11 = iVar11 + 4;
|
||||
if (bitPos1 == 0x1f) {
|
||||
shifted = *(u32*)(in + bitOff1);
|
||||
bitPos1 = 0;
|
||||
bitOff1 = bitOff1 + 4;
|
||||
} else {
|
||||
uVar12 = uVar12 + 1;
|
||||
uVar13 = uVar14 << 1;
|
||||
bitPos1 = bitPos1 + 1;
|
||||
shifted = bitWord1 << 1;
|
||||
}
|
||||
if (-1 < (int)uVar14) {
|
||||
if (-1 < (int)bitWord1) {
|
||||
break;
|
||||
}
|
||||
*puVar21 = uVar10 | 0x8000;
|
||||
puVar21[1] = uVar10 | 0x4000;
|
||||
puVar21 = puVar21 + 2;
|
||||
iVar16 = iVar16 + 2;
|
||||
uVar8 = uVar8 + 1;
|
||||
uVar14 = uVar13;
|
||||
uVar10 = uVar10 + 1;
|
||||
*stackPtr = nextNode | 0x8000;
|
||||
stackPtr[1] = nextNode | 0x4000;
|
||||
stackPtr = stackPtr + 2;
|
||||
stackDepth = stackDepth + 2;
|
||||
nodeCount = nodeCount + 1;
|
||||
bitWord1 = shifted;
|
||||
nextNode = nextNode + 1;
|
||||
}
|
||||
iVar7 = uVar12 + 9;
|
||||
if (iVar7 < 0x21) {
|
||||
uVar4 = uVar13 >> 0x17;
|
||||
if (iVar7 == 0x20) {
|
||||
uVar14 = *(u32*)(in + iVar11);
|
||||
uVar12 = 0;
|
||||
iVar11 = iVar11 + 4;
|
||||
needBits = bitPos1 + 9;
|
||||
if (needBits < 0x21) {
|
||||
sym9 = shifted >> 0x17;
|
||||
if (needBits == 0x20) {
|
||||
bitWord1 = *(u32*)(in + bitOff1);
|
||||
bitPos1 = 0;
|
||||
bitOff1 = bitOff1 + 4;
|
||||
} else {
|
||||
uVar14 = uVar13 << 9;
|
||||
uVar12 = uVar12 + 9;
|
||||
bitWord1 = shifted << 9;
|
||||
bitPos1 = bitPos1 + 9;
|
||||
}
|
||||
} else {
|
||||
puVar2 = (u32*)(in + iVar11);
|
||||
iVar11 = iVar11 + 4;
|
||||
uVar4 = uVar13 >> 0x17 | *puVar2 >> (0x40U - iVar7 & 0x3f);
|
||||
uVar12 = uVar12 - 0x17;
|
||||
uVar14 = *puVar2 << (uVar12 & 0x3f);
|
||||
inWordPtr = (u32*)(in + bitOff1);
|
||||
bitOff1 = bitOff1 + 4;
|
||||
sym9 = shifted >> 0x17 | *inWordPtr >> (0x40U - needBits & 0x3f);
|
||||
bitPos1 = bitPos1 - 0x17;
|
||||
bitWord1 = *inWordPtr << (bitPos1 & 0x3f);
|
||||
}
|
||||
while (1) {
|
||||
puVar21 = puVar21 - 1;
|
||||
uVar10 = *puVar21;
|
||||
iVar16 = iVar16 - 1;
|
||||
iVar7 = (uVar10 & 0x3fff) * 2;
|
||||
if ((uVar10 & 0x8000) == 0) {
|
||||
stackPtr = stackPtr - 1;
|
||||
nextNode = *stackPtr;
|
||||
stackDepth = stackDepth - 1;
|
||||
needBits = (nextNode & 0x3fff) * 2;
|
||||
if ((nextNode & 0x8000) == 0) {
|
||||
break;
|
||||
}
|
||||
*(u16*)(&work[0x7fe] + iVar7) = (u16)uVar4;
|
||||
uVar4 = uVar10 & 0x3fff;
|
||||
if (iVar16 == 0) {
|
||||
uVar8 = 0x800;
|
||||
iVar16 = 0;
|
||||
uVar10 = 0x800;
|
||||
*(u16*)(&work[0x7fe] + needBits) = (u16)sym9;
|
||||
sym9 = nextNode & 0x3fff;
|
||||
if (stackDepth == 0) {
|
||||
nodeCount = 0x800;
|
||||
stackDepth = 0;
|
||||
nextNode = 0x800;
|
||||
do {
|
||||
while (1) {
|
||||
if (uVar18 == 0x1f) {
|
||||
uVar13 = *(u32*)(in + iVar17);
|
||||
uVar18 = 0;
|
||||
iVar17 = iVar17 + 4;
|
||||
if (bitPos2 == 0x1f) {
|
||||
shifted = *(u32*)(in + bitOff2);
|
||||
bitPos2 = 0;
|
||||
bitOff2 = bitOff2 + 4;
|
||||
} else {
|
||||
uVar18 = uVar18 + 1;
|
||||
uVar13 = uVar19 << 1;
|
||||
bitPos2 = bitPos2 + 1;
|
||||
shifted = bitWord2 << 1;
|
||||
}
|
||||
if (-1 < (int)uVar19) {
|
||||
if (-1 < (int)bitWord2) {
|
||||
break;
|
||||
}
|
||||
*puVar21 = uVar10 | 0x8000;
|
||||
puVar21[1] = uVar10 | 0x4000;
|
||||
puVar21 = puVar21 + 2;
|
||||
iVar16 = iVar16 + 2;
|
||||
uVar8 = uVar8 + 1;
|
||||
uVar19 = uVar13;
|
||||
uVar10 = uVar10 + 1;
|
||||
*stackPtr = nextNode | 0x8000;
|
||||
stackPtr[1] = nextNode | 0x4000;
|
||||
stackPtr = stackPtr + 2;
|
||||
stackDepth = stackDepth + 2;
|
||||
nodeCount = nodeCount + 1;
|
||||
bitWord2 = shifted;
|
||||
nextNode = nextNode + 1;
|
||||
}
|
||||
iVar7 = uVar18 + 0xb;
|
||||
if (iVar7 < 0x21) {
|
||||
uVar5 = uVar13 >> 0x15;
|
||||
if (iVar7 == 0x20) {
|
||||
uVar19 = *(u32*)(in + iVar17);
|
||||
uVar18 = 0;
|
||||
iVar17 = iVar17 + 4;
|
||||
needBits = bitPos2 + 0xb;
|
||||
if (needBits < 0x21) {
|
||||
sym11 = shifted >> 0x15;
|
||||
if (needBits == 0x20) {
|
||||
bitWord2 = *(u32*)(in + bitOff2);
|
||||
bitPos2 = 0;
|
||||
bitOff2 = bitOff2 + 4;
|
||||
} else {
|
||||
uVar19 = uVar13 << 0xb;
|
||||
uVar18 = uVar18 + 0xb;
|
||||
bitWord2 = shifted << 0xb;
|
||||
bitPos2 = bitPos2 + 0xb;
|
||||
}
|
||||
} else {
|
||||
puVar2 = (u32*)(in + iVar17);
|
||||
iVar17 = iVar17 + 4;
|
||||
uVar5 = uVar13 >> 0x15 | *puVar2 >> (0x40U - iVar7 & 0x3f);
|
||||
uVar18 = uVar18 - 0x15;
|
||||
uVar19 = *puVar2 << (uVar18 & 0x3f);
|
||||
inWordPtr = (u32*)(in + bitOff2);
|
||||
bitOff2 = bitOff2 + 4;
|
||||
sym11 = shifted >> 0x15 | *inWordPtr >> (0x40U - needBits & 0x3f);
|
||||
bitPos2 = bitPos2 - 0x15;
|
||||
bitWord2 = *inWordPtr << (bitPos2 & 0x3f);
|
||||
}
|
||||
while (1) {
|
||||
puVar21 = puVar21 - 1;
|
||||
uVar10 = *puVar21;
|
||||
iVar16 = iVar16 - 1;
|
||||
iVar7 = (uVar10 & 0x3fff) * 2;
|
||||
if ((uVar10 & 0x8000) == 0) {
|
||||
stackPtr = stackPtr - 1;
|
||||
nextNode = *stackPtr;
|
||||
stackDepth = stackDepth - 1;
|
||||
needBits = (nextNode & 0x3fff) * 2;
|
||||
if ((nextNode & 0x8000) == 0) {
|
||||
break;
|
||||
}
|
||||
*(u16*)(&work[0x2ffa] + iVar7) = (u16)uVar5;
|
||||
uVar5 = uVar10 & 0x3fff;
|
||||
uVar6 = uVar4;
|
||||
uVar13 = uVar3;
|
||||
if (iVar16 == 0) {
|
||||
*(u16*)(&work[0x2ffa] + needBits) = (u16)sym11;
|
||||
sym11 = nextNode & 0x3fff;
|
||||
nodeVal = sym9;
|
||||
shifted = decodedSize;
|
||||
if (stackDepth == 0) {
|
||||
do {
|
||||
while (0x1ff < uVar6) {
|
||||
if (uVar12 == 0x1f) {
|
||||
uVar15 = *(u32*)(in + iVar11);
|
||||
iVar11 = iVar11 + 4;
|
||||
uVar12 = 0;
|
||||
while (0x1ff < nodeVal) {
|
||||
if (bitPos1 == 0x1f) {
|
||||
tmp15 = *(u32*)(in + bitOff1);
|
||||
bitOff1 = bitOff1 + 4;
|
||||
bitPos1 = 0;
|
||||
} else {
|
||||
uVar12 = uVar12 + 1;
|
||||
uVar15 = uVar14 << 1;
|
||||
bitPos1 = bitPos1 + 1;
|
||||
tmp15 = bitWord1 << 1;
|
||||
}
|
||||
if ((int)uVar14 < 0) {
|
||||
uVar6 = *(u16*)(&work[0x7fe] + uVar6 * 2);
|
||||
uVar14 = uVar15;
|
||||
if ((int)bitWord1 < 0) {
|
||||
nodeVal = *(u16*)(&work[0x7fe] + nodeVal * 2);
|
||||
bitWord1 = tmp15;
|
||||
} else {
|
||||
uVar6 = *(u16*)((u8*)work + uVar6 * 2);
|
||||
uVar14 = uVar15;
|
||||
nodeVal = *(u16*)((u8*)work + nodeVal * 2);
|
||||
bitWord1 = tmp15;
|
||||
}
|
||||
}
|
||||
uVar15 = uVar5;
|
||||
if (uVar6 < 0x100) {
|
||||
*out = (char)uVar6;
|
||||
tmp15 = sym11;
|
||||
if (nodeVal < 0x100) {
|
||||
*out = (char)nodeVal;
|
||||
out = out + 1;
|
||||
uVar13 = uVar13 - 1;
|
||||
shifted = shifted - 1;
|
||||
} else {
|
||||
while (0x7ff < uVar15) {
|
||||
if (uVar18 == 0x1f) {
|
||||
uVar20 = *(u32*)(in + iVar17);
|
||||
iVar17 = iVar17 + 4;
|
||||
uVar18 = 0;
|
||||
while (0x7ff < tmp15) {
|
||||
if (bitPos2 == 0x1f) {
|
||||
tmp20 = *(u32*)(in + bitOff2);
|
||||
bitOff2 = bitOff2 + 4;
|
||||
bitPos2 = 0;
|
||||
} else {
|
||||
uVar18 = uVar18 + 1;
|
||||
uVar20 = uVar19 << 1;
|
||||
bitPos2 = bitPos2 + 1;
|
||||
tmp20 = bitWord2 << 1;
|
||||
}
|
||||
if ((int)uVar19 < 0) {
|
||||
uVar15 = *(u16*)(&work[0x2ffa] + uVar15 * 2);
|
||||
uVar19 = uVar20;
|
||||
if ((int)bitWord2 < 0) {
|
||||
tmp15 = *(u16*)(&work[0x2ffa] + tmp15 * 2);
|
||||
bitWord2 = tmp20;
|
||||
} else {
|
||||
uVar15 = *(u16*)(&work[0xffc] + uVar15 * 2);
|
||||
uVar19 = uVar20;
|
||||
tmp15 = *(u16*)(&work[0xffc] + tmp15 * 2);
|
||||
bitWord2 = tmp20;
|
||||
}
|
||||
}
|
||||
uVar6 = uVar6 - 0xfd;
|
||||
puVar9 = out - uVar15;
|
||||
uVar13 = uVar13 - uVar6;
|
||||
uVar15 = uVar6 >> 3;
|
||||
if (uVar15 == 0) {
|
||||
goto LAB_813325b8;
|
||||
nodeVal = nodeVal - 0xfd;
|
||||
litPtr = out - tmp15;
|
||||
shifted = shifted - nodeVal;
|
||||
tmp15 = nodeVal >> 3;
|
||||
if (tmp15 == 0) {
|
||||
goto copy_lit_tail;
|
||||
}
|
||||
do {
|
||||
*out = puVar9[-1];
|
||||
out[1] = *puVar9;
|
||||
out[2] = puVar9[1];
|
||||
out[3] = puVar9[2];
|
||||
out[4] = puVar9[3];
|
||||
out[5] = puVar9[4];
|
||||
out[6] = puVar9[5];
|
||||
out[7] = puVar9[6];
|
||||
puVar9 = puVar9 + 8;
|
||||
*out = litPtr[-1];
|
||||
out[1] = *litPtr;
|
||||
out[2] = litPtr[1];
|
||||
out[3] = litPtr[2];
|
||||
out[4] = litPtr[3];
|
||||
out[5] = litPtr[4];
|
||||
out[6] = litPtr[5];
|
||||
out[7] = litPtr[6];
|
||||
litPtr = litPtr + 8;
|
||||
out = out + 8;
|
||||
uVar15 = uVar15 - 1;
|
||||
} while (uVar15 != 0);
|
||||
for (uVar6 = uVar6 & 7; uVar6 != 0; uVar6 = uVar6 - 1) {
|
||||
LAB_813325b8:
|
||||
puVar1 = puVar9 - 1;
|
||||
puVar9 = puVar9 + 1;
|
||||
*out = *puVar1;
|
||||
tmp15 = tmp15 - 1;
|
||||
} while (tmp15 != 0);
|
||||
for (nodeVal = nodeVal & 7; nodeVal != 0; nodeVal = nodeVal - 1) {
|
||||
copy_lit_tail:
|
||||
dst = litPtr - 1;
|
||||
litPtr = litPtr + 1;
|
||||
*out = *dst;
|
||||
out = out + 1;
|
||||
}
|
||||
}
|
||||
uVar6 = uVar4;
|
||||
} while (uVar13 != 0);
|
||||
return uVar3;
|
||||
nodeVal = sym9;
|
||||
} while (shifted != 0);
|
||||
return decodedSize;
|
||||
}
|
||||
}
|
||||
*(u16*)(&work[0xffc] + iVar7) = (u16)uVar5;
|
||||
uVar10 = uVar8;
|
||||
*(u16*)(&work[0xffc] + needBits) = (u16)sym11;
|
||||
nextNode = nodeCount;
|
||||
} while (1);
|
||||
}
|
||||
}
|
||||
*(u16*)((u8*)work + iVar7) = (u16)uVar4;
|
||||
uVar10 = uVar8;
|
||||
*(u16*)((u8*)work + needBits) = (u16)sym9;
|
||||
nextNode = nodeCount;
|
||||
} while (1);
|
||||
}
|
||||
#endif
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user