Compare commits
153 Commits
agent/data
...
cleanup/me
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
302504e198 | ||
|
|
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 | ||
|
|
2aab31c1f9 | ||
|
|
24c84f5bfc | ||
|
|
73de5786da | ||
|
|
3abcd34252 | ||
|
|
5c20a11fa8 | ||
|
|
f85a98a6e3 | ||
|
|
137ee3242a | ||
|
|
2368a9a774 | ||
|
|
90399bb6cf | ||
|
|
fc831357ea | ||
|
|
e2191ae933 | ||
|
|
7d77c095c0 | ||
|
|
db8ff7e141 | ||
|
|
2cb6c2dfae | ||
|
|
6f96235605 | ||
|
|
367b042e63 | ||
|
|
feb7ba400d | ||
|
|
20f4af8beb | ||
|
|
dca6cd9aef | ||
|
|
a0700bf908 | ||
|
|
de058b4298 | ||
|
|
c5468cbe50 | ||
|
|
62591733eb | ||
|
|
e2488b073a | ||
|
|
9a8de22195 | ||
|
|
a6bf0e5f4f | ||
|
|
d434f5b897 | ||
|
|
0adc759b42 | ||
|
|
9c55b47c1d | ||
|
|
081329daa8 | ||
|
|
a348c9777a | ||
|
|
d5204f5c62 | ||
|
|
cedc1f1390 | ||
|
|
ff0cce33f6 | ||
|
|
2beeb23a47 | ||
|
|
35d9ed53b1 | ||
|
|
015d50906c | ||
|
|
348da5bd89 | ||
|
|
cdceb82200 | ||
|
|
1b56ea5051 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.37% | 87.47% | 61.64% | 91.14% |
|
||||
| 99.38% | 87.96% | 62.33% | 92.07% |
|
||||
|
||||
units 915/1027 complete, functions 12203/12563 matched.
|
||||
units 919/1027 complete, functions 12224/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
|
||||
@@ -1111,7 +1111,7 @@ src/keyboard/MyTiInputForm.cpp:
|
||||
|
||||
src/keyboard/MyTiLetterForm.cpp:
|
||||
.text start:0x81444730 end:0x814454D8
|
||||
.rodata start:0x816168B8 end:0x81616B88
|
||||
.rodata start:0x816168B8 end:0x81616BC8
|
||||
.data start:0x81668860 end:0x81668CD8
|
||||
.sdata2 start:0x81694EB0 end:0x81694ED0
|
||||
.sdata start:0x81697528 end:0x81697570
|
||||
@@ -1138,7 +1138,7 @@ src/keyboard/tiHKBManager.cpp:
|
||||
src/keyboard/tiHwKeyboard.cpp:
|
||||
.bss start:0x810C8940 end:0x810C8950
|
||||
.text start:0x81448AA4 end:0x81449C98
|
||||
.rodata start:0x81616B88 end:0x81616C78
|
||||
.rodata start:0x81616BC8 end:0x81616C78
|
||||
.data start:0x81668EF8 end:0x81669018
|
||||
.sdata2 start:0x81694EF8 end:0x81694F08
|
||||
.sdata start:0x81697570 end:0x81697578
|
||||
@@ -1405,7 +1405,7 @@ libs/RVLMiddleware/eZiText/src/clib/zikorean.c:
|
||||
extab start:0x81330748 end:0x81330760
|
||||
extabindex start:0x8133147C end:0x813314A0
|
||||
.text start:0x814813FC end:0x81482840
|
||||
.data start:0x8166B2B0 end:0x8166B3D0
|
||||
.data start:0x8166B2B0 end:0x8166B3A8
|
||||
|
||||
libs/RVLMiddleware/eZiText/src/clib/ziswordw.c:
|
||||
extab start:0x81330760 end:0x81330770
|
||||
@@ -1417,6 +1417,7 @@ libs/RVLMiddleware/eZiText/src/clib/zkokeyp.c:
|
||||
extab start:0x81330770 end:0x813307A8
|
||||
extabindex start:0x813314B8 end:0x8133150C
|
||||
.text start:0x8148302C end:0x8148447C
|
||||
.data start:0x8166B3A8 end:0x8166B3D0
|
||||
|
||||
libs/RVLMiddleware/eZiText/src/clib/zierror.c:
|
||||
.text start:0x8148447C end:0x81484484
|
||||
|
||||
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),
|
||||
@@ -929,7 +929,7 @@ config.libs = [
|
||||
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
|
||||
@@ -1004,7 +1004,7 @@ config.libs = [
|
||||
Object(Matching, "clib/zi8ver.c"),
|
||||
Object(Matching, "clib/zi8ZHuwd.c"),
|
||||
Object(NonMatching, "clib/zidawg1.c"),
|
||||
Object(NonMatching, "clib/zikorean.c"),
|
||||
Object(Matching, "clib/zikorean.c"),
|
||||
Object(NonMatching, "clib/ziswordw.c"),
|
||||
Object(NonMatching, "clib/zkokeyp.c"),
|
||||
Object(Matching, "clib/zierror.c"),
|
||||
|
||||
@@ -75,7 +75,7 @@ namespace homebutton {
|
||||
|
||||
private:
|
||||
static bool sBatteryFlag[WPAD_MAX_CONTROLLERS];
|
||||
static bool lbl_816989BC[WPAD_MAX_CONTROLLERS];
|
||||
static bool sAlarmCreated[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
static OSAlarm sAlarm[WPAD_MAX_CONTROLLERS];
|
||||
static OSAlarm sAlarmSoundOff[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
@@ -35,8 +35,8 @@ namespace ext_ead {
|
||||
|
||||
class SurfaceManager {
|
||||
public:
|
||||
static void CreateManager(int rectW0, int rectH0, int rectW1, int rectH1, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* param_10);
|
||||
static void CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* arcPath);
|
||||
static void DisposeManager();
|
||||
|
||||
static void RegisterArcFile(void* fileBuf);
|
||||
|
||||
@@ -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:
|
||||
@@ -145,7 +149,7 @@ namespace textinput {
|
||||
#ifdef TISIGNWINDOW_IMPLEMENTATION
|
||||
bool isAtokActive() const;
|
||||
#endif
|
||||
#ifdef MYTILETTERFORM_IMPLEMENTATION
|
||||
#if defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
@@ -384,7 +388,7 @@ namespace textinput {
|
||||
virtual void setRootPaneScaleFor16x9();
|
||||
virtual void setRootPaneScaleFor4x3();
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void onSE(sound::SE seId);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <nw4r/ut/CharWriter.h>
|
||||
#include <nw4r/ut/Rect.h>
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace textinput {
|
||||
} CursorPos;
|
||||
|
||||
typedef struct DrawInfo {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
nw4r::ut::Rect rect;
|
||||
wchar_t character;
|
||||
#else
|
||||
@@ -94,7 +94,7 @@ namespace textinput {
|
||||
virtual u32 getEndPos() const;
|
||||
|
||||
// todo
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void setDrawModifyScopeLine(s32 startLine, s32 endLine);
|
||||
virtual void setDrawCacheScopeLine(s32 startLine, s32 endLine);
|
||||
virtual void modifyCursorCache(s32 line, u32 position, f32 x, f32 y, f32 width, f32 height);
|
||||
@@ -103,12 +103,12 @@ namespace textinput {
|
||||
virtual void setDrawCacheScopeLine();
|
||||
virtual void modifyCursorCache();
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual bool isEnableCursorCache() const;
|
||||
#else
|
||||
virtual void isEnableCursorCache();
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual u32 getDrawModifyStartLine() const;
|
||||
virtual u32 getDrawModifyEndLine() const;
|
||||
#else
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace ipl {
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
|
||||
T get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
@@ -81,11 +81,11 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(unkVal0 *
|
||||
(mStartTangent *
|
||||
(var_f27 +
|
||||
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -101,7 +101,7 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
@@ -109,8 +109,8 @@ namespace ipl {
|
||||
protected:
|
||||
T mStart;
|
||||
T mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
|
||||
template <>
|
||||
@@ -119,7 +119,7 @@ namespace ipl {
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD,
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD,
|
||||
f32 speed = 1.0f);
|
||||
|
||||
f32 get() const {
|
||||
@@ -132,10 +132,10 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(unkVal0 *
|
||||
(mStartTangent *
|
||||
(var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -144,8 +144,8 @@ namespace ipl {
|
||||
protected:
|
||||
f32 mStart;
|
||||
f32 mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
|
||||
#pragma dont_instantiate HermiteIntp<float>
|
||||
@@ -155,12 +155,12 @@ namespace ipl {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
mStart = start;
|
||||
mEnd = end;
|
||||
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
|
||||
unkVal0 = param_5;
|
||||
unkVal1 = param_6;
|
||||
mStartTangent = startTangent;
|
||||
mEndTangent = endTangent;
|
||||
}
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
@@ -176,9 +176,9 @@ namespace ipl {
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = unkVal0 * (frame + (cubic -
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
unkVal1 * (cubic - inverseDuration * frameSquared);
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
@@ -196,7 +196,7 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
|
||||
r = r + temp_f3;
|
||||
|
||||
@@ -213,15 +213,15 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
#endif
|
||||
|
||||
protected:
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -236,7 +236,7 @@ namespace ipl {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
VEC3 get() const {
|
||||
f32 frame = mFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
@@ -249,9 +249,9 @@ namespace ipl {
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = unkVal0 * (frame + (cubic -
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
unkVal1 * (cubic - inverseDuration * frameSquared);
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
@@ -260,8 +260,8 @@ namespace ipl {
|
||||
protected:
|
||||
VEC3 mStart;
|
||||
VEC3 mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -167,12 +167,12 @@ namespace ipl {
|
||||
|
||||
bool is_stopped_all_anm() const;
|
||||
|
||||
void fn_81409864();
|
||||
void calc_exit_sequence();
|
||||
|
||||
void fn_814098F4();
|
||||
void fn_unk_inline();
|
||||
void fn_81409988();
|
||||
void fn_814099EC();
|
||||
void prepare_exit_abort();
|
||||
void wait_decide_se();
|
||||
void start_exit_fade();
|
||||
void finish_exit_reboot();
|
||||
|
||||
int mState; // 0x60
|
||||
int mPrevState; // 0x64
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace ipl {
|
||||
void stt_wait_fns_msg();
|
||||
void stt_wait_terminate();
|
||||
|
||||
int fn_8135B1C0();
|
||||
int getProgressPercent();
|
||||
|
||||
void error_handling();
|
||||
|
||||
|
||||
@@ -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; }
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace ipl {
|
||||
void read_sd_app_location_async(ESTitleId32* titleIds);
|
||||
void check_for_sd_app_to_nand_async(ESTitleId titleId, AppBlocksInfo* usedBlocks, AppBlocksInfo* freeBlocks);
|
||||
void check_backup_fits_async(TitleIdList* newTitles, TitleIdList* replacingTitles);
|
||||
void iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC);
|
||||
void check_sd_app_titles_async(void* ptrA, void* ptrB, void* ptrC);
|
||||
|
||||
void list_nand_apps_usage_async(void* ptrA, void* ptr);
|
||||
|
||||
@@ -514,7 +514,7 @@ namespace ipl {
|
||||
void do_check_for_sd_app_to_nand();
|
||||
void check_backup_fits();
|
||||
void do_list_nand_apps_usage();
|
||||
void do_unk_8134C838();
|
||||
void do_check_sd_app_titles();
|
||||
|
||||
void do_move_nand_app_to_sd();
|
||||
void do_move_sd_app_to_nand();
|
||||
|
||||
@@ -24,7 +24,19 @@ namespace ipl {
|
||||
class Manager;
|
||||
}
|
||||
namespace savedata {
|
||||
extern "C" BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
|
||||
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:
|
||||
@@ -87,7 +99,7 @@ namespace ipl {
|
||||
channel::SInfo& getChanInfo(int page, int index) { return mData.chanInfo[page][index]; }
|
||||
textinput::extend::savedata::MemoSetting getMemoSetting() { return mData.memoSetting; }
|
||||
|
||||
void iplSavedata_813596B8(ESTitleId titleId);
|
||||
void pushTitleCache(ESTitleId titleId);
|
||||
|
||||
private:
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_ACCESS
|
||||
@@ -184,7 +196,7 @@ namespace ipl {
|
||||
u8 unused_0x504[28];
|
||||
|
||||
friend class channel::Manager;
|
||||
friend BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
|
||||
friend BOOL isTitleCached(void* manager, ESTitleId titleId);
|
||||
};
|
||||
} // namespace savedata
|
||||
} // namespace ipl
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
char lbl_81693350[0xd0] = {
|
||||
char scCntCacheStrs[0xd0] = {
|
||||
0x3c, 0x3c, 0x20, 0x52, 0x56, 0x4c, 0x5f, 0x53, 0x44, 0x4b, 0x20, 0x2d, 0x20, 0x43, 0x4e, 0x54,
|
||||
0x43, 0x41, 0x43, 0x48, 0x45, 0x20, 0x09, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x62,
|
||||
0x75, 0x69, 0x6c, 0x64, 0x3a, 0x20, 0x41, 0x70, 0x72, 0x20, 0x32, 0x30, 0x20, 0x32, 0x30, 0x31,
|
||||
@@ -22,12 +22,12 @@ char lbl_81693350[0xd0] = {
|
||||
0x74, 0x20, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00,
|
||||
0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x00
|
||||
};
|
||||
char lbl_81693420[0x16] = {
|
||||
char scCntCacheTitleDataFmt[0x16] = {
|
||||
0x2f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x2f, 0x25, 0x30, 0x38, 0x78, 0x2f, 0x25, 0x30, 0x38, 0x78,
|
||||
0x2f, 0x64, 0x61, 0x74, 0x61, 0x00,
|
||||
};
|
||||
const char* __CNTCACHEVersion = lbl_81693350;
|
||||
char lbl_816985DC[3] = {0x20, 0x0a, 0x00};
|
||||
const char* __CNTCACHEVersion = scCntCacheStrs;
|
||||
char scCntCacheSpaceNl[3] = {0x20, 0x0a, 0x00};
|
||||
|
||||
extern void _savegpr_23();
|
||||
extern void _restgpr_23();
|
||||
@@ -72,9 +72,9 @@ asm void CNTCACHEClear() {
|
||||
mr r11, r12
|
||||
stw r0, 4(r12)
|
||||
bl _savegpr_23
|
||||
lis r30, lbl_81693350@ha
|
||||
lis r30, scCntCacheStrs@ha
|
||||
lis r3, _CNTCACHEMutex@ha
|
||||
addi r30, r30, lbl_81693350@l
|
||||
addi r30, r30, scCntCacheStrs@l
|
||||
li r29, 0
|
||||
addi r3, r3, _CNTCACHEMutex@l
|
||||
bl OSLockMutex
|
||||
@@ -146,7 +146,7 @@ L_184:
|
||||
stb r31, 0(r4)
|
||||
subf r23, r24, r4
|
||||
mr r3, r24
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
cmpwi r3, 0
|
||||
mr r29, r3
|
||||
@@ -246,7 +246,7 @@ asm void _CNTCACHEDeleteTitle() {
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
stw r0, 0x24(r1)
|
||||
stw r31, 0x1c(r1)
|
||||
stw r30, 0x18(r1)
|
||||
@@ -284,7 +284,7 @@ L_350:
|
||||
bl ES_DeleteTitleContent
|
||||
L_364:
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
L_370:
|
||||
cmpwi r3, 0
|
||||
@@ -305,10 +305,10 @@ asm int _CNTCACHEIsTitleRemovable(ESTitleId titleId) {
|
||||
subfic r11, r11, -0x2100
|
||||
stwux r1, r1, r11
|
||||
mflr r0
|
||||
lis r5, lbl_81693420@ha
|
||||
lis r5, scCntCacheTitleDataFmt@ha
|
||||
stw r0, 4(r12)
|
||||
li r0, 1
|
||||
addi r5, r5, lbl_81693420@l
|
||||
addi r5, r5, scCntCacheTitleDataFmt@l
|
||||
stw r31, -4(r12)
|
||||
stw r30, -8(r12)
|
||||
mr r30, r3
|
||||
@@ -403,7 +403,7 @@ asm void _CNTCACHEDeleteContent() {
|
||||
stw r0, 4(r12)
|
||||
bl _savegpr_26
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
li r31, 0
|
||||
li r4, 0
|
||||
@@ -441,10 +441,10 @@ asm void _CNTCACHEDeleteContent() {
|
||||
rlwinm. r0, r3, 0, 0x1b, 0x1b
|
||||
beq L_6f0
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
li r26, 1
|
||||
lis r27, lbl_81693420@ha
|
||||
lis r27, scCntCacheTitleDataFmt@ha
|
||||
b L_6e8
|
||||
L_5b0:
|
||||
stw r31, errno(r0)
|
||||
@@ -488,7 +488,7 @@ L_5e8:
|
||||
li r0, -1
|
||||
stw r26, 0x20(r1)
|
||||
addi r3, r1, 0x40
|
||||
addi r5, r27, lbl_81693420@l
|
||||
addi r5, r27, scCntCacheTitleDataFmt@l
|
||||
stw r26, 0x24(r1)
|
||||
and r6, r30, r0
|
||||
and r7, r29, r0
|
||||
@@ -529,7 +529,7 @@ L_6d4:
|
||||
bdnz L_5e8
|
||||
L_6dc:
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
L_6e8:
|
||||
cmpwi r3, 0
|
||||
|
||||
@@ -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,8 +4,8 @@
|
||||
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;
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
|
||||
context->unk_0x00 = data;
|
||||
context->unk_0x04 = 0;
|
||||
context->unk_0x0e = 0;
|
||||
context->unk_0x0C = 0;
|
||||
@@ -13,8 +13,8 @@ void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2) {
|
||||
context->size = 0;
|
||||
}
|
||||
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2) {
|
||||
context->unk_0x00 = param_2;
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data) {
|
||||
context->unk_0x00 = data;
|
||||
context->unk_0x04 = 0;
|
||||
context->unk_0x11 = 0;
|
||||
context->unk_0x12 = 0;
|
||||
@@ -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;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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; }
|
||||
|
||||
@@ -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*);
|
||||
@@ -55,17 +55,17 @@ 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;
|
||||
@@ -73,7 +73,7 @@ IOSError __sdCb(s32 result, void* arg) {
|
||||
switch (data->unk_0x0C) {
|
||||
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 {
|
||||
@@ -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) {
|
||||
@@ -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->unk_0x04 = ledBits;
|
||||
cmd->unk_0x00 = 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.unk_0x00 = device;
|
||||
cmd->base.unk_0x04 = ledBits;
|
||||
cmd->cb = cb;
|
||||
cmd->cbArg = cbArg;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -371,9 +371,9 @@ static BOOL NHTTPi_RecvProxyConnectHeader(NHTTPThreadContext* context)
|
||||
response->httpStatus = NHTTPi_strToInt(header + 9, 3);
|
||||
if (NHTTPi_strnicmp(header, "HTTP/", 5) == 0 && header[8] == ' '
|
||||
&& response->httpStatus == 200) accepted = TRUE;
|
||||
ended = FALSE;
|
||||
cursor = header;
|
||||
index = 0;
|
||||
ended = FALSE;
|
||||
while (index < used)
|
||||
{
|
||||
if (index > 1 && cursor[-1] == '\r' && *cursor == '\r') ended = TRUE;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
@@ -4292,7 +4292,7 @@ VmMethodDefine(Blob, GetHexString) {
|
||||
u32 offset = blob->offset;
|
||||
u32 destOff = 0;
|
||||
u32 i = 0;
|
||||
char* hexTbl = lbl_816976E4;
|
||||
char* hexTbl = scHexDigitsPtr;
|
||||
u32 loop_i;
|
||||
|
||||
src += offset;
|
||||
@@ -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;
|
||||
@@ -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: {
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
#include <revolution/gx/GXStruct.h>
|
||||
#include <revolution/os/OSError.h>
|
||||
|
||||
extern "C" const char lbl_8166A6E3[];
|
||||
extern "C" const u8 lbl_81697844;
|
||||
extern "C" const u8 lbl_81697845;
|
||||
extern "C" const u8 lbl_81697846;
|
||||
extern "C" const u8 lbl_81697847;
|
||||
extern "C" const char scCsFatalMsg[];
|
||||
extern "C" const u8 scCsFatalColorR;
|
||||
extern "C" const u8 scCsFatalColorG;
|
||||
extern "C" const u8 scCsFatalColorB;
|
||||
extern "C" const u8 scCsFatalColorA;
|
||||
|
||||
#define NW4R_DB_ASSERT_H
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {lbl_81697844, lbl_81697845, lbl_81697846, lbl_81697847}; \
|
||||
GXColor front = {scCsFatalColorR, scCsFatalColorG, scCsFatalColorB, scCsFatalColorA}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, lbl_8166A6E3); \
|
||||
OSFatal((GXColor)front, (GXColor)back, scCsFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ extern "C" const u8 lbl_81697847;
|
||||
|
||||
#include "math/iplMathTypes.h"
|
||||
|
||||
extern "C" const f32 lbl_81694FC0 = 0.0f;
|
||||
extern "C" const f32 scCsZeroF = 0.0f;
|
||||
|
||||
extern "C" nw4r::ut::Color GetTextColor__Q34nw4r3lyt7TextBoxCFUl(const nw4r::lyt::TextBox*, u32);
|
||||
|
||||
@@ -130,7 +130,7 @@ namespace ipl {
|
||||
nw4r::math::VEC2 scale;
|
||||
scale.x = pane->GetScale().x;
|
||||
scale.y = pane->GetScale().y;
|
||||
result = vec3::_ctor(VmInst, VmReturnObj, scale.x, scale.y, lbl_81694FC0) == TRUE;
|
||||
result = vec3::_ctor(VmInst, VmReturnObj, scale.x, scale.y, scCsZeroF) == TRUE;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
@@ -514,7 +514,7 @@ namespace ipl {
|
||||
nw4r::math::VEC3 get_vec_(CHANSVm* vm) {
|
||||
u32 argc = CHANSVmGetArgc(vm);
|
||||
CHANSVmObjHdr* arg = CHANSVmGetArg(vm, 0);
|
||||
nw4r::math::VEC3 out(lbl_81694FC0, lbl_81694FC0, lbl_81694FC0);
|
||||
nw4r::math::VEC3 out(scCsZeroF, scCsZeroF, scCsZeroF);
|
||||
if (argc == 1 && util::is_valid_class(arg, "VEC3")) {
|
||||
f32* src = static_cast<f32*>(*arg->value.ptr_v);
|
||||
out.x = src[0];
|
||||
@@ -540,7 +540,7 @@ namespace ipl {
|
||||
nw4r::lyt::Size get_size_(CHANSVm* vm) {
|
||||
u32 argc = CHANSVmGetArgc(vm);
|
||||
CHANSVmObjHdr* arg = CHANSVmGetArg(vm, 0);
|
||||
nw4r::lyt::Size out(lbl_81694FC0, lbl_81694FC0);
|
||||
nw4r::lyt::Size out(scCsZeroF, scCsZeroF);
|
||||
if (argc == 1 && util::is_valid_class(arg, "Size")) {
|
||||
f32* src = static_cast<f32*>(*arg->value.ptr_v);
|
||||
out.width = src[0];
|
||||
@@ -622,15 +622,15 @@ namespace ipl {
|
||||
namespace pane {
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8166A6E3[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
extern "C" const char scCsFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
#pragma pop
|
||||
|
||||
#pragma push
|
||||
#pragma section data_type ".sdata"
|
||||
extern "C" __declspec(section ".sdata") const u8 lbl_81697844 = 0xff;
|
||||
extern "C" __declspec(section ".sdata") const u8 lbl_81697845 = 0xff;
|
||||
extern "C" __declspec(section ".sdata") const u8 lbl_81697846 = 0xff;
|
||||
extern "C" __declspec(section ".sdata") const u8 lbl_81697847 = 0;
|
||||
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorR = 0xff;
|
||||
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorG = 0xff;
|
||||
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorB = 0xff;
|
||||
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorA = 0;
|
||||
#pragma pop
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ extern "C" void __dt__Q34nw4r3snd11SoundHandleFv(nw4r::snd::SoundHandle*, int);
|
||||
|
||||
namespace homebutton {
|
||||
bool Controller::sBatteryFlag[WPAD_MAX_CONTROLLERS];
|
||||
bool Controller::lbl_816989BC[WPAD_MAX_CONTROLLERS];
|
||||
bool Controller::sAlarmCreated[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
OSAlarm Controller::sAlarm[WPAD_MAX_CONTROLLERS];
|
||||
OSAlarm Controller::sAlarmSoundOff[WPAD_MAX_CONTROLLERS];
|
||||
@@ -83,10 +83,10 @@ namespace homebutton {
|
||||
if (chan < WPAD_MAX_CONTROLLERS) {
|
||||
sBatteryFlag[chan] = false;
|
||||
OSReport("Create %d\n", chan);
|
||||
if (!lbl_816989BC[chan]) {
|
||||
if (!sAlarmCreated[chan]) {
|
||||
OSCreateAlarm(&sAlarm[chan]);
|
||||
OSCreateAlarm(&sAlarmSoundOff[chan]);
|
||||
lbl_816989BC[chan] = true;
|
||||
sAlarmCreated[chan] = true;
|
||||
}
|
||||
sThis[chan] = this;
|
||||
}
|
||||
|
||||
@@ -12,11 +12,11 @@ namespace ext_ead {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" char lbl_816962F8[] = "ERROR?\n";
|
||||
extern "C" char lbl_81643B40[] = " TextureBuffer_ %d:%d ptr:%p\n";
|
||||
extern "C" char lbl_81643B5E[] = "INFO: cannot create browser window\n";
|
||||
extern "C" char scWwwErrorQ[] = "ERROR?\n";
|
||||
extern "C" char scWwwTexBufFmt[] = " TextureBuffer_ %d:%d ptr:%p\n";
|
||||
extern "C" char scWwwNoBrowserWin[] = "INFO: cannot create browser window\n";
|
||||
|
||||
#define OSReport(...) OSReport(lbl_816962F8)
|
||||
#define OSReport(...) OSReport(scWwwErrorQ)
|
||||
#include "iplwww/www_window.h"
|
||||
#undef OSReport
|
||||
|
||||
@@ -76,12 +76,12 @@ namespace ext_ead {
|
||||
memset(mTexBufArr[i][j], 0, texBufSize);
|
||||
DCStoreRange(mTexBufArr[i][j], texBufSize);
|
||||
|
||||
print::IPLWWWReport(print::WWW_DEBUG, lbl_81643B40, j, i, mTexBufArr[i][j]);
|
||||
print::IPLWWWReport(print::WWW_DEBUG, scWwwTexBufFmt, j, i, mTexBufArr[i][j]);
|
||||
}
|
||||
}
|
||||
|
||||
if (WWWCreateBrowserWindow(mpBrowserThread->GetHandle(), &mpWwwWindow, 0)) {
|
||||
print::IPLWWWReport(print::WWW_WARNING, lbl_81643B5E);
|
||||
print::IPLWWWReport(print::WWW_WARNING, scWwwNoBrowserWin);
|
||||
return NULL;
|
||||
} else {
|
||||
WWWRect rect = {0, 0, 0, 0};
|
||||
|
||||
@@ -20,6 +20,16 @@ protected:
|
||||
namespace extend {
|
||||
namespace memo {
|
||||
|
||||
class EventHandler : public inputform::EventHandler {
|
||||
public:
|
||||
EventHandler(InputForm* form) : inputform::EventHandler(form), mpMemoForm(form) {}
|
||||
virtual ~EventHandler() {}
|
||||
virtual void onTiEvent(gui::PaneComponent*, u32, Input*);
|
||||
private:
|
||||
InputForm* mpMemoForm;
|
||||
};
|
||||
|
||||
|
||||
class AnmPane : public nw4rmanager::AnmPane {
|
||||
protected:
|
||||
AnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
@@ -28,8 +38,8 @@ public:
|
||||
virtual ~AnmPane();
|
||||
virtual void init();
|
||||
virtual void changeAnimation(u32 id);
|
||||
virtual u32 getState();
|
||||
virtual u32 getKeyType() const;
|
||||
virtual u32 getState();
|
||||
protected:
|
||||
u32 meState;
|
||||
u32 meKeyType;
|
||||
@@ -49,13 +59,6 @@ public:
|
||||
virtual void onAnmEvent(AnmPaneEvent event);
|
||||
};
|
||||
|
||||
class SimpleAnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
SimpleAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : nw4rmanager::AnmPane(pane, observer) {}
|
||||
virtual ~SimpleAnmPane() {}
|
||||
virtual void init();
|
||||
virtual void changeAnimation(u32 id);
|
||||
};
|
||||
|
||||
class ScrollButton {
|
||||
public:
|
||||
@@ -74,15 +77,16 @@ private:
|
||||
bool mbRightPressed;
|
||||
};
|
||||
|
||||
class EventHandler : public inputform::EventHandler {
|
||||
|
||||
class SimpleAnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
EventHandler(InputForm* form) : inputform::EventHandler(form), mpMemoForm(form) {}
|
||||
virtual ~EventHandler() {}
|
||||
virtual void onTiEvent(gui::PaneComponent*, u32, Input*);
|
||||
private:
|
||||
InputForm* mpMemoForm;
|
||||
SimpleAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : nw4rmanager::AnmPane(pane, observer) {}
|
||||
virtual ~SimpleAnmPane() {}
|
||||
virtual void init();
|
||||
virtual void changeAnimation(u32 id);
|
||||
};
|
||||
|
||||
|
||||
static const char* scPaneName[] = {
|
||||
"N_Header", "N_Body", "B_Body", "N_Footer", "Nigaoe",
|
||||
"T_Nigaoe", "B_Nigaoe", "T_Letter", "T_TouchLetter"
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
namespace textinput {
|
||||
namespace gui {
|
||||
extern "C" void drawLine___Q29textinput3guiFfffffUcR8_GXColor();
|
||||
extern "C" const f32 lbl_81694EE8;
|
||||
extern "C" const f32 scGuiZeroF;
|
||||
|
||||
void drawLine_(f32 x0, f32 y0, f32 x1, f32 y1, f32 z, u8 width, GXColor& color) {
|
||||
GXClearVtxDesc();
|
||||
@@ -31,7 +31,7 @@ namespace textinput {
|
||||
GXSetBlendMode(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_NOOP);
|
||||
|
||||
Mtx mtx;
|
||||
MTXTrans(mtx, lbl_81694EE8, lbl_81694EE8, lbl_81694EE8);
|
||||
MTXTrans(mtx, scGuiZeroF, scGuiZeroF, scGuiZeroF);
|
||||
GXLoadPosMtxImm(mtx, 0);
|
||||
|
||||
GXSetLineWidth(width, GX_TO_ZERO);
|
||||
@@ -334,7 +334,7 @@ namespace textinput {
|
||||
MTXInverse(mpPane->GetGlobalMtx(), globalMtx);
|
||||
|
||||
nw4r::math::VEC3 pos;
|
||||
MTXMultVec(globalMtx, nw4r::math::VEC3(x, y, lbl_81694EE8), pos);
|
||||
MTXMultVec(globalMtx, nw4r::math::VEC3(x, y, scGuiZeroF), pos);
|
||||
|
||||
nw4r::ut::Rect rect = mpPane->GetPaneRect(*drawInfo);
|
||||
|
||||
@@ -348,12 +348,12 @@ namespace textinput {
|
||||
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata2"
|
||||
extern "C" const f32 lbl_81694EE8 = 0.0f;
|
||||
extern "C" const u8 lbl_81694EEC = 0xFF;
|
||||
extern "C" const u8 lbl_81694EED = 0x00;
|
||||
extern "C" const u8 lbl_81694EEE = 0x00;
|
||||
extern "C" const u8 lbl_81694EEF = 0xFF;
|
||||
extern "C" const f32 lbl_81694EF0 = 0.5f;
|
||||
extern "C" const f32 scGuiZeroF = 0.0f;
|
||||
extern "C" const u8 scGuiLineColorR = 0xFF;
|
||||
extern "C" const u8 scGuiLineColorG = 0x00;
|
||||
extern "C" const u8 scGuiLineColorB = 0x00;
|
||||
extern "C" const u8 scGuiLineColorA = 0xFF;
|
||||
extern "C" const f32 scGuiHalfF = 0.5f;
|
||||
#pragma pop
|
||||
|
||||
extern "C" asm void draw__Q39textinput3gui13PaneComponentFv() {
|
||||
@@ -376,15 +376,15 @@ namespace textinput {
|
||||
beq pane_component_draw_done
|
||||
lwz r5, 0x9c(r31)
|
||||
mr r3, r31
|
||||
lbz r7, lbl_81694EEC
|
||||
lbz r7, scGuiLineColorR
|
||||
li r4, 0
|
||||
lfs f1, 0x4c(r5)
|
||||
lfs f0, 0x50(r5)
|
||||
lfs f31, 0x90(r5)
|
||||
lfs f30, 0xa0(r5)
|
||||
lbz r6, lbl_81694EED
|
||||
lbz r5, lbl_81694EEE
|
||||
lbz r0, lbl_81694EEF
|
||||
lbz r6, scGuiLineColorG
|
||||
lbz r5, scGuiLineColorB
|
||||
lbz r0, scGuiLineColorA
|
||||
stb r7, 8(r1)
|
||||
stb r6, 9(r1)
|
||||
stb r5, 0xa(r1)
|
||||
@@ -402,13 +402,13 @@ namespace textinput {
|
||||
stb r3, 8(r1)
|
||||
stb r0, 0xa(r1)
|
||||
pane_component_draw_lines:
|
||||
lfs f1, lbl_81694EF0
|
||||
lfs f1, scGuiHalfF
|
||||
addi r4, r1, 8
|
||||
lfs f0, 0x14(r1)
|
||||
li r3, 8
|
||||
lfs f2, 0x10(r1)
|
||||
fmuls f0, f0, f1
|
||||
lfs f5, lbl_81694EE8
|
||||
lfs f5, scGuiZeroF
|
||||
fmuls f3, f2, f1
|
||||
fsubs f2, f30, f0
|
||||
fsubs f1, f31, f3
|
||||
@@ -417,24 +417,24 @@ namespace textinput {
|
||||
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
|
||||
lfs f1, 0x10(r1)
|
||||
addi r4, r1, 8
|
||||
lfs f2, lbl_81694EF0
|
||||
lfs f2, scGuiHalfF
|
||||
li r3, 8
|
||||
lfs f0, 0x14(r1)
|
||||
fmuls f1, f1, f2
|
||||
lfs f5, lbl_81694EE8
|
||||
lfs f5, scGuiZeroF
|
||||
fmuls f0, f0, f2
|
||||
fadds f1, f31, f1
|
||||
fsubs f2, f30, f0
|
||||
fadds f4, f30, f0
|
||||
fmr f3, f1
|
||||
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
|
||||
lfs f1, lbl_81694EF0
|
||||
lfs f1, scGuiHalfF
|
||||
addi r4, r1, 8
|
||||
lfs f0, 0x14(r1)
|
||||
li r3, 8
|
||||
lfs f2, 0x10(r1)
|
||||
fmuls f0, f0, f1
|
||||
lfs f5, lbl_81694EE8
|
||||
lfs f5, scGuiZeroF
|
||||
fmuls f3, f2, f1
|
||||
fadds f2, f30, f0
|
||||
fadds f1, f31, f3
|
||||
@@ -443,11 +443,11 @@ namespace textinput {
|
||||
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
|
||||
lfs f1, 0x10(r1)
|
||||
addi r4, r1, 8
|
||||
lfs f2, lbl_81694EF0
|
||||
lfs f2, scGuiHalfF
|
||||
li r3, 8
|
||||
lfs f0, 0x14(r1)
|
||||
fmuls f1, f1, f2
|
||||
lfs f5, lbl_81694EE8
|
||||
lfs f5, scGuiZeroF
|
||||
fmuls f0, f0, f2
|
||||
fsubs f1, f31, f1
|
||||
fadds f2, f30, f0
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
#include "keyboard/tiHKBManager.h"
|
||||
#include "keyboard/tiLayoutGather.h"
|
||||
|
||||
extern const u8 lbl_81616BD8[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
extern const u8 lbl_81616BE4[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
extern "C" void SetCountry__Q39textinput5input10HKBManagerFUc();
|
||||
extern "C" textinput::input::HKBManager sInstance__Q39textinput5input10HKBManager;
|
||||
extern "C" void convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw();
|
||||
@@ -21,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),
|
||||
@@ -528,20 +526,6 @@ extern const u8 controlKeys[];
|
||||
return false;
|
||||
}
|
||||
|
||||
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;
|
||||
@@ -635,20 +619,38 @@ 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
|
||||
bne setLanguage_L1
|
||||
lis r4, lbl_81616BD8@ha
|
||||
lis r4, scCountryMap_EU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, lbl_81616BD8@l
|
||||
addi r4, r4, scCountryMap_EU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
setLanguage_L1:
|
||||
lis r4, lbl_81616BE4@ha
|
||||
lis r4, scCountryMap_NonEU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, lbl_81616BE4@l
|
||||
addi r4, r4, scCountryMap_NonEU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
@@ -735,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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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);
|
||||
}
|
||||
@@ -274,7 +274,7 @@ namespace textinput {
|
||||
xOffset *= scale - 1.0f;
|
||||
viewport[0] = left + xOffset;
|
||||
f32 height = (mProjectionRect.bottom -
|
||||
mProjectionRect.top) * 0.5f;
|
||||
mProjectionRect.top) / 2.0f;
|
||||
viewport[1] = rect.bottom + height;
|
||||
viewport[2] = scale * (100.0f + (rect.right - rect.left));
|
||||
viewport[3] = rect.top - rect.bottom;
|
||||
|
||||
@@ -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) {
|
||||
@@ -621,28 +621,28 @@ namespace ipl {
|
||||
void BoardObject::set_thumb_text(const char* paneName, const wchar_t* thumbText) {
|
||||
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(paneName));
|
||||
|
||||
wchar_t local_28[THUMB_TEXT_LENGTH + 3 /* "..." */ + 1 /* NULL */] = L"";
|
||||
memset(local_28, 0, sizeof(local_28));
|
||||
wchar_t truncatedThumb[THUMB_TEXT_LENGTH + 3 /* "..." */ + 1 /* NULL */] = L"";
|
||||
memset(truncatedThumb, 0, sizeof(truncatedThumb));
|
||||
|
||||
if (thumbText != NULL) {
|
||||
for (int i = 0; i < THUMB_TEXT_LENGTH + 1 && thumbText[i] != (u16)'\n'; i++) {
|
||||
local_28[i] = thumbText[i];
|
||||
truncatedThumb[i] = thumbText[i];
|
||||
}
|
||||
}
|
||||
|
||||
if (System::getRegion() == SC_PRODUCT_AREA_JPN) {
|
||||
if (local_28[THUMB_TEXT_LENGTH] != 0) {
|
||||
local_28[THUMB_TEXT_LENGTH + 0] = L'…';
|
||||
if (truncatedThumb[THUMB_TEXT_LENGTH] != 0) {
|
||||
truncatedThumb[THUMB_TEXT_LENGTH + 0] = L'…';
|
||||
}
|
||||
} else {
|
||||
if (local_28[THUMB_TEXT_LENGTH] != 0) {
|
||||
local_28[THUMB_TEXT_LENGTH + 2] = '.';
|
||||
local_28[THUMB_TEXT_LENGTH + 1] = '.';
|
||||
local_28[THUMB_TEXT_LENGTH + 0] = '.';
|
||||
if (truncatedThumb[THUMB_TEXT_LENGTH] != 0) {
|
||||
truncatedThumb[THUMB_TEXT_LENGTH + 2] = '.';
|
||||
truncatedThumb[THUMB_TEXT_LENGTH + 1] = '.';
|
||||
truncatedThumb[THUMB_TEXT_LENGTH + 0] = '.';
|
||||
}
|
||||
}
|
||||
|
||||
textBox->SetString(local_28);
|
||||
textBox->SetString(truncatedThumb);
|
||||
}
|
||||
|
||||
void BoardObject::update(int chan) {
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
|
||||
#include "iplSystem.h"
|
||||
|
||||
__declspec(section ".sdata") extern char lbl_816966F9[];
|
||||
extern char lbl_816967B5[];
|
||||
__declspec(section ".sdata") extern char scPaneName_B_Stop[];
|
||||
extern char scPaneName_T_Stop[];
|
||||
extern "C" BOOL push_button_queue(void*, const void*);
|
||||
|
||||
namespace ipl {
|
||||
@@ -877,7 +877,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void OptOutButton::setText(u32 msgId) {
|
||||
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_816967B5));
|
||||
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(scPaneName_T_Stop));
|
||||
textBox->SetString(System::getMessage(msgId));
|
||||
}
|
||||
|
||||
@@ -890,7 +890,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void OptOutButton::start_point_event(const char* paneName, controller::Interface* con) {
|
||||
if (strcmp(paneName, lbl_816966F9) == 0) {
|
||||
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
|
||||
if (mbHovered == FALSE) {
|
||||
// Play hover in animation
|
||||
mpLayout->getAnim(ANIM_OPT_OUT_FOCUS_IN)->play();
|
||||
@@ -906,7 +906,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void OptOutButton::start_left_event(const char* paneName) {
|
||||
if (strcmp(paneName, lbl_816966F9) == 0) {
|
||||
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
|
||||
if (mbHovered == TRUE) {
|
||||
mpLayout->getAnim(ANIM_OPT_OUT_FOCUS_OUT)->play();
|
||||
}
|
||||
@@ -1005,4 +1005,4 @@ namespace ipl {
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
char lbl_816967B5[] = "T_Stop";
|
||||
char scPaneName_T_Stop[] = "T_Stop";
|
||||
|
||||
@@ -215,19 +215,19 @@ namespace ipl {
|
||||
MESG_CALENDAR_DEC,
|
||||
};
|
||||
|
||||
static const char* lbl_8164C458[] = {
|
||||
static const char* scPaneName_T_CalMonth[] = {
|
||||
"T_CalMonth_a",
|
||||
"T_CalMonth_b",
|
||||
"T_CalMonth_c",
|
||||
};
|
||||
|
||||
static const char* lbl_8164C480[] = {
|
||||
static const char* scPaneName_N_Cal[] = {
|
||||
"N_Cal_a1",
|
||||
"N_Cal_b1",
|
||||
"N_Cal_c1",
|
||||
};
|
||||
|
||||
static const char* lbl_8164C4B0[] = {
|
||||
static const char* scPaneName_N_CalPos[] = {
|
||||
"N_CalPos_a",
|
||||
"N_CalPos_b",
|
||||
"N_CalPos_c",
|
||||
@@ -661,9 +661,9 @@ namespace ipl {
|
||||
utility::Calendar::getLastMonth(*mpBoardDate, &last);
|
||||
utility::Calendar::getNextMonth(*mpBoardDate, &next);
|
||||
|
||||
set_textbox_month(lbl_8164C458[0], last);
|
||||
set_textbox_month(lbl_8164C458[1], *mpBoardDate);
|
||||
set_textbox_month(lbl_8164C458[2], next);
|
||||
set_textbox_month(scPaneName_T_CalMonth[0], last);
|
||||
set_textbox_month(scPaneName_T_CalMonth[1], *mpBoardDate);
|
||||
set_textbox_month(scPaneName_T_CalMonth[2], next);
|
||||
}
|
||||
|
||||
void Calendar::set_textbox_month(const char* paneName, const utility::Date& date) {
|
||||
@@ -714,31 +714,31 @@ namespace ipl {
|
||||
|
||||
OSCalendarTime curTime = System::getCurrentTime();
|
||||
|
||||
utility::Date local_64(curTime.year, curTime.mon + 1, curTime.mday);
|
||||
utility::Date local_70;
|
||||
utility::Date local_7c;
|
||||
utility::Date todayDate(curTime.year, curTime.mon + 1, curTime.mday);
|
||||
utility::Date lastMonth;
|
||||
utility::Date nextMonth;
|
||||
|
||||
utility::Calendar::getLastMonth(date, &local_70);
|
||||
utility::Calendar::getNextMonth(date, &local_7c);
|
||||
utility::Calendar::getLastMonth(date, &lastMonth);
|
||||
utility::Calendar::getNextMonth(date, &nextMonth);
|
||||
|
||||
int dateIndex;
|
||||
int iVar10;
|
||||
int weekOffset;
|
||||
if (mbAsian || mbUSA) {
|
||||
iVar10 = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
|
||||
weekOffset = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
|
||||
} else {
|
||||
week--;
|
||||
if (week < 0) {
|
||||
week = 6;
|
||||
}
|
||||
iVar10 = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
|
||||
if (iVar10 >= 7) {
|
||||
iVar10 = 0;
|
||||
weekOffset = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
|
||||
if (weekOffset >= 7) {
|
||||
weekOffset = 0;
|
||||
}
|
||||
}
|
||||
|
||||
dateIndex = unk == 1 ? 0 : DATE_COUNT;
|
||||
|
||||
utility::Date local_88;
|
||||
utility::Date cellDate;
|
||||
|
||||
u32 attr;
|
||||
int val2;
|
||||
@@ -750,25 +750,25 @@ namespace ipl {
|
||||
|
||||
val = (maxDays + week);
|
||||
attr = 0;
|
||||
val2 = (iVar10 + val);
|
||||
val2 = (weekOffset + val);
|
||||
if ((week - i) > 0) {
|
||||
local_88.year = local_70.year;
|
||||
local_88.month = local_70.month;
|
||||
local_88.day = i + (local_70.day - week) + 1;
|
||||
cellDate.year = lastMonth.year;
|
||||
cellDate.month = lastMonth.month;
|
||||
cellDate.day = i + (lastMonth.day - week) + 1;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if ((val - i) > 0) {
|
||||
local_88.year = date.year;
|
||||
local_88.month = date.month;
|
||||
local_88.day = (i - week) + 1;
|
||||
cellDate.year = date.year;
|
||||
cellDate.month = date.month;
|
||||
cellDate.day = (i - week) + 1;
|
||||
attr |= 2;
|
||||
|
||||
if (local_88 == local_64) {
|
||||
if (cellDate == todayDate) {
|
||||
attr |= 1;
|
||||
}
|
||||
|
||||
switch (utility::Calendar::getWeek(local_88.year, local_88.month, local_88.day)) {
|
||||
switch (utility::Calendar::getWeek(cellDate.year, cellDate.month, cellDate.day)) {
|
||||
case 6: {
|
||||
attr |= 8;
|
||||
break;
|
||||
@@ -782,9 +782,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if ((val2 - i) > 0) {
|
||||
local_88.year = local_7c.year;
|
||||
local_88.month = local_7c.month;
|
||||
local_88.day = ((i - maxDays) - week) + 1;
|
||||
cellDate.year = nextMonth.year;
|
||||
cellDate.month = nextMonth.month;
|
||||
cellDate.day = ((i - maxDays) - week) + 1;
|
||||
goto out;
|
||||
} else {
|
||||
dateScn->setVisible(false);
|
||||
@@ -792,14 +792,14 @@ namespace ipl {
|
||||
}
|
||||
|
||||
out:
|
||||
dateScn->setDate(local_88);
|
||||
dateScn->setDate(cellDate);
|
||||
dateScn->setAttribute(attr);
|
||||
}
|
||||
}
|
||||
|
||||
void Calendar::set_date_pos(int unk) {
|
||||
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(lbl_8164C480[unk]);
|
||||
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(lbl_8164C4B0[unk]);
|
||||
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(scPaneName_N_Cal[unk]);
|
||||
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(scPaneName_N_CalPos[unk]);
|
||||
|
||||
int dateIndex = unk == 1 ? 0 : DATE_COUNT;
|
||||
|
||||
@@ -807,14 +807,14 @@ namespace ipl {
|
||||
Date* dateScn = ((Date*)nw4r::ut::List_GetNth(&mDateList, dateIndex));
|
||||
dateIndex++;
|
||||
|
||||
nw4r::math::VEC3 local_68;
|
||||
local_68.x = ((u16)i % 7) * 0x46;
|
||||
local_68.y = ((u16)i / 7) * -0x30;
|
||||
local_68.z = 0.0f;
|
||||
nw4r::math::VEC3 cellPos;
|
||||
cellPos.x = ((u16)i % 7) * 0x46;
|
||||
cellPos.y = ((u16)i / 7) * -0x30;
|
||||
cellPos.z = 0.0f;
|
||||
|
||||
MTXMultVec(pane2->GetGlobalMtx(), local_68, local_68);
|
||||
MTXMultVec(pane2->GetGlobalMtx(), cellPos, cellPos);
|
||||
|
||||
dateScn->setTranslate(local_68);
|
||||
dateScn->setTranslate(cellPos);
|
||||
dateScn->setRotate(pane1->GetRotate());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,40 +7,40 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
extern "C" char lbl_816967D8[];
|
||||
extern "C" char lbl_816967DE[];
|
||||
extern "C" char lbl_816967E4[];
|
||||
extern "C" char lbl_816967EB[];
|
||||
extern "C" char lbl_816967F2[];
|
||||
extern "C" char scW_Cal[];
|
||||
extern "C" char scT_Cal[];
|
||||
extern "C" char scCal_Ac[];
|
||||
extern "C" char scInfo_a[];
|
||||
extern "C" char scB_Cal[];
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8164C620[] = "N_CalDay_r";
|
||||
extern "C" const char scN_CalDay_r[] = "N_CalDay_r";
|
||||
#pragma pop
|
||||
|
||||
// clang-format off
|
||||
extern "C" const char* lbl_8164C62C[Date::ANIM_PANE_MAX] = {
|
||||
lbl_8164C620,
|
||||
lbl_816967D8,
|
||||
lbl_816967DE,
|
||||
lbl_816967E4,
|
||||
lbl_816967EB,
|
||||
extern "C" const char* scDateAnimPaneNames[Date::ANIM_PANE_MAX] = {
|
||||
scN_CalDay_r,
|
||||
scW_Cal,
|
||||
scT_Cal,
|
||||
scCal_Ac,
|
||||
scInfo_a,
|
||||
};
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8164C640[] = "my_IplTop_f.brlan";
|
||||
extern "C" const char lbl_8164C652[] = "N_CalDay_t";
|
||||
extern "C" const char lbl_8164C65D[] = "WIPL_SE_DATE_FOCUS";
|
||||
extern "C" const char scMyIplTopFBrlan[] = "my_IplTop_f.brlan";
|
||||
extern "C" const char scN_CalDay_t[] = "N_CalDay_t";
|
||||
extern "C" const char scSEDateFocus[] = "WIPL_SE_DATE_FOCUS";
|
||||
#pragma pop
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".sdata"
|
||||
extern "C" char lbl_816967D8[] = "W_Cal";
|
||||
extern "C" char lbl_816967DE[] = "T_Cal";
|
||||
extern "C" char lbl_816967E4[] = "Cal_Ac";
|
||||
extern "C" char lbl_816967EB[] = "Info_a";
|
||||
extern "C" char lbl_816967F2[] = "B_Cal";
|
||||
extern "C" char scW_Cal[] = "W_Cal";
|
||||
extern "C" char scT_Cal[] = "T_Cal";
|
||||
extern "C" char scCal_Ac[] = "Cal_Ac";
|
||||
extern "C" char scInfo_a[] = "Info_a";
|
||||
extern "C" char scB_Cal[] = "B_Cal";
|
||||
#pragma pop
|
||||
|
||||
static const Date::AnmFrame scAnmFrame[] = {
|
||||
@@ -73,7 +73,7 @@ namespace ipl {
|
||||
|
||||
// Bind animations
|
||||
for (int i = 0; i < ANIM_PANE_MAX; i++) {
|
||||
mpPaneAnims[i] = mpLayout->bind(lbl_8164C640, lbl_8164C62C[i], false);
|
||||
mpPaneAnims[i] = mpLayout->bind(scMyIplTopFBrlan, scDateAnimPaneNames[i], false);
|
||||
}
|
||||
mpLayout->finishBinding();
|
||||
|
||||
@@ -81,7 +81,7 @@ namespace ipl {
|
||||
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL);
|
||||
mpGui->setupScene(mpLayout);
|
||||
mpGui->setAllComponentTriggerTarget(false);
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_816967F2), true);
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scB_Cal), true);
|
||||
|
||||
// Init date
|
||||
mpDate = new utility::Date();
|
||||
@@ -128,19 +128,19 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Date::setRotate(const nw4r::math::VEC3& vec) {
|
||||
mpLayout->FindPaneByName(lbl_8164C652)->SetRotate(vec);
|
||||
mpLayout->FindPaneByName(scN_CalDay_t)->SetRotate(vec);
|
||||
}
|
||||
|
||||
void Date::setTranslate(const nw4r::math::VEC3& vec) {
|
||||
mpLayout->FindPaneByName(lbl_8164C652)->SetTranslate(vec);
|
||||
mpLayout->FindPaneByName(scN_CalDay_t)->SetTranslate(vec);
|
||||
}
|
||||
|
||||
void Date::setVisible(bool visible) {
|
||||
mpLayout->FindPaneByName(lbl_8164C62C[0])->SetVisible(visible);
|
||||
mpLayout->FindPaneByName(scDateAnimPaneNames[0])->SetVisible(visible);
|
||||
}
|
||||
|
||||
bool Date::getVisible() {
|
||||
return mpLayout->FindPaneByName(lbl_8164C62C[0])->IsVisible();
|
||||
return mpLayout->FindPaneByName(scDateAnimPaneNames[0])->IsVisible();
|
||||
}
|
||||
|
||||
void Date::setAttribute(int attr) {
|
||||
@@ -209,13 +209,13 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Date::start_point_event(const char* paneName, controller::Interface* con) {
|
||||
if (strcmp(paneName, lbl_816967F2) == 0) {
|
||||
if (strcmp(paneName, scB_Cal) == 0) {
|
||||
if (unk_0x3C == 0) {
|
||||
static_cast<Calendar*>(System::getScene(SCENE_CALENDAR))->onPointDate(this);
|
||||
onCmdRecv(1);
|
||||
|
||||
if (getVisible()) {
|
||||
snd::getSystem()->startSE(lbl_8164C65D);
|
||||
snd::getSystem()->startSE(scSEDateFocus);
|
||||
if (con != NULL) {
|
||||
con->rumble(1);
|
||||
}
|
||||
@@ -226,7 +226,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Date::start_left_event(const char* paneName) {
|
||||
if (strcmp(paneName, lbl_816967F2) == 0) {
|
||||
if (strcmp(paneName, scB_Cal) == 0) {
|
||||
if (unk_0x3C == 1) {
|
||||
onCmdRecv(2);
|
||||
}
|
||||
@@ -262,7 +262,7 @@ namespace ipl {
|
||||
|
||||
numStr[index++] = 0;
|
||||
|
||||
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_8164C62C[2]));
|
||||
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(scDateAnimPaneNames[2]));
|
||||
pane->SetString(numStr);
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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]);
|
||||
|
||||
@@ -35,8 +35,8 @@ namespace ipl {
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27))))));
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 = (unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
f32 temp_f3 = (mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r.x += temp_f3;
|
||||
r.y += temp_f3;
|
||||
r.z += temp_f3;
|
||||
@@ -51,8 +51,8 @@ namespace ipl {
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r += (unkVal0 * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (var_f27 * var_f27))));
|
||||
r += (mStartTangent * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (var_f27 * var_f27))));
|
||||
return r;
|
||||
}
|
||||
} // namespace math
|
||||
@@ -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;
|
||||
}
|
||||
@@ -2390,7 +2390,7 @@ namespace ipl {
|
||||
|
||||
if (sceneID == SCENE_UNLOCKED_TITLE || sceneID == SCENE_LOCKED_TITLE) {
|
||||
System::getSaveData()->setPrevPage(mChanPage);
|
||||
System::getSaveData()->iplSavedata_813596B8(System::getChannelManager()->getTitleID(mChanPage, mChanIndex));
|
||||
System::getSaveData()->pushTitleCache(System::getChannelManager()->getTitleID(mChanPage, mChanIndex));
|
||||
mpSaveDataFile = System::getSaveData()->flushAsync(System::getMem2App());
|
||||
}
|
||||
}
|
||||
@@ -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,21 +48,15 @@ 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);
|
||||
|
||||
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes);
|
||||
void sNHTTPReqCallback(int error, NHTTPResponse* httpRes);
|
||||
void sNHTTPCleanupCallback();
|
||||
|
||||
void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy) {
|
||||
char* pcVar1;
|
||||
char cVar2;
|
||||
char* pcVar3;
|
||||
char* pcVar4;
|
||||
int iVar5;
|
||||
|
||||
g_session.heapBuf = heapBuf;
|
||||
g_session.heap = MEMCreateExpHeapEx(heapBuf, 0x10000, 0);
|
||||
OSInitMutex(&g_session.mutex);
|
||||
@@ -233,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();
|
||||
@@ -416,9 +410,9 @@ void IPLContestFree(void* block, u32 _unused) {
|
||||
OSUnlockMutex(&g_session.mutex);
|
||||
}
|
||||
|
||||
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) {
|
||||
void sNHTTPReqCallback(int error, NHTTPResponse* httpRes) {
|
||||
g_session.httpResponse = httpRes;
|
||||
if (param_1 == 0) {
|
||||
if (error == 0) {
|
||||
switch (NHTTPGetResultCode(httpRes)) {
|
||||
case 200: {
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_RECEIVED;
|
||||
@@ -440,7 +434,7 @@ void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) {
|
||||
}
|
||||
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
|
||||
switch (param_1) {
|
||||
switch (error) {
|
||||
case 0x4: {
|
||||
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52100;
|
||||
break;
|
||||
@@ -467,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;
|
||||
|
||||
@@ -234,10 +234,10 @@ namespace ipl {
|
||||
OSReport("NUP region code : %s\n", productAreaString);
|
||||
const char* isoCountryCode = SCUTILGetISOCountryCodeA2();
|
||||
OSReport("NUP country code : %s\n", isoCountryCode);
|
||||
int iVar8 = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
|
||||
int nupResult = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
|
||||
OSReport("NUP_Start()\n");
|
||||
if (iVar8 < 0) {
|
||||
switch (iVar8) {
|
||||
if (nupResult < 0) {
|
||||
switch (nupResult) {
|
||||
case -5000: {
|
||||
OSReport("FAIL ALLOC\n");
|
||||
}
|
||||
@@ -426,8 +426,8 @@ namespace ipl {
|
||||
int val;
|
||||
int len = 4;
|
||||
if (SOGetInterfaceOpt(NULL, SO_SOL_CONFIG, SO_CONFIG_ERROR, &val, &len) == 0 && val == -111) {
|
||||
int iVar7 = NETGetStartupErrorCode(-111);
|
||||
mNetSetupLastErr = (-iVar7 / 100) * 100;
|
||||
int startupErr = NETGetStartupErrorCode(-111);
|
||||
mNetSetupLastErr = (-startupErr / 100) * 100;
|
||||
mNetSetupLastErr = mNetSetup.getconntype();
|
||||
}
|
||||
Setting* settingScene = (Setting*)System::getScene(SCENE_SETTING);
|
||||
@@ -451,8 +451,6 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void* NakamuraTest::conntestthread(void*) {
|
||||
int iVar1;
|
||||
|
||||
IPLContestStart();
|
||||
while (true) {
|
||||
switch (IPLContestProcess()) {
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace ipl {
|
||||
OSMutex NetSetup::sAllocLock;
|
||||
NetSetup::StaticSOStartupInfo NetSetup::sSOStartupInfo;
|
||||
|
||||
void* NetSetup::iSOStartupEXThread(void* param_1) {
|
||||
void* NetSetup::iSOStartupEXThread(void* connType) {
|
||||
s32 cfgSetResult;
|
||||
int soStartupRes;
|
||||
SOInAddr soAddr;
|
||||
@@ -61,7 +61,7 @@ namespace ipl {
|
||||
soStartupRes = SOStartupEx(45000);
|
||||
if (soStartupRes < 0) {
|
||||
OSReport("[FAIL] SOStartup() failed.(%d)\n", soStartupRes);
|
||||
soStartupRes = NETGetStartupErrorCodeEx(soStartupRes, (int)param_1);
|
||||
soStartupRes = NETGetStartupErrorCodeEx(soStartupRes, (int)connType);
|
||||
OSReport("<Error Code: %d>\n", -soStartupRes);
|
||||
sSOStartupInfo.state = NET_SETUP_ERROR;
|
||||
sSOStartupInfo.lastErr = -soStartupRes;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -1496,7 +1491,7 @@ namespace ipl {
|
||||
mpNandTitleInfo[usageIndex].curTitleId, &page, &channelIndex) == 0) {
|
||||
continue;
|
||||
}
|
||||
if (iplSavedata_813597A0(System::getSaveData(),
|
||||
if (isTitleCached(System::getSaveData(),
|
||||
mpNandTitleInfo[usageIndex].curTitleId) != FALSE) {
|
||||
continue;
|
||||
}
|
||||
@@ -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
@@ -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);
|
||||
@@ -78,13 +83,13 @@ namespace ipl {
|
||||
int finish(NCDAossConfig* config, int* result);
|
||||
void printInfo();
|
||||
|
||||
static void* AOSSThread_813FCC8C(u32 id, s32 size);
|
||||
static void AOSSThread_813FCCE4(u32 id, void* ptr, s32 align);
|
||||
static void* aossAlloc(u32 id, s32 size);
|
||||
static void aossFree(u32 id, void* ptr, s32 align);
|
||||
|
||||
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) {
|
||||
@@ -122,8 +127,8 @@ namespace ipl {
|
||||
return 0;
|
||||
}
|
||||
|
||||
config.alloc = AOSSThread_813FCC8C;
|
||||
config.free = AOSSThread_813FCCE4;
|
||||
config.alloc = aossAlloc;
|
||||
config.free = aossFree;
|
||||
|
||||
BOOL level = OSDisableInterrupts();
|
||||
|
||||
@@ -137,14 +142,14 @@ 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;
|
||||
}
|
||||
|
||||
void* AOSSThread::AOSSThread_813FCC8C(u32 id, s32 size) {
|
||||
void* AOSSThread::aossAlloc(u32 id, s32 size) {
|
||||
void* buffer;
|
||||
BOOL level = OSDisableInterrupts();
|
||||
buffer = MEMAllocFromAllocator(&m_allocator, size);
|
||||
@@ -152,7 +157,7 @@ namespace ipl {
|
||||
return buffer;
|
||||
}
|
||||
|
||||
void AOSSThread::AOSSThread_813FCCE4(u32 id, void* ptr, s32 align) {
|
||||
void AOSSThread::aossFree(u32 id, void* ptr, s32 align) {
|
||||
BOOL level = OSDisableInterrupts();
|
||||
MEMFreeToAllocator(&m_allocator, ptr);
|
||||
OSRestoreInterrupts(level);
|
||||
@@ -162,7 +167,7 @@ namespace ipl {
|
||||
mState = 0xF;
|
||||
AOSS_SetCallback(USBAPThread::callback);
|
||||
|
||||
if (AOSSi_InitLocal(AOSSThread_813FCC8C, AOSSThread_813FCCE4) == -1) {
|
||||
if (AOSSi_InitLocal(aossAlloc, aossFree) == -1) {
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -459,48 +459,48 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void NCDSetting::setWDPrivacyMode(u16 mode) {
|
||||
u16 uVar1;
|
||||
u16 privacyMode;
|
||||
|
||||
switch (mode) {
|
||||
case 0: {
|
||||
uVar1 = 0;
|
||||
privacyMode = 0;
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
uVar1 = 1;
|
||||
privacyMode = 1;
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
uVar1 = 2;
|
||||
privacyMode = 2;
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
uVar1 = 4;
|
||||
privacyMode = 4;
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
uVar1 = 5;
|
||||
privacyMode = 5;
|
||||
break;
|
||||
}
|
||||
case 6: {
|
||||
uVar1 = 6;
|
||||
privacyMode = 6;
|
||||
break;
|
||||
}
|
||||
case 7: {
|
||||
uVar1 = 4;
|
||||
privacyMode = 4;
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
uVar1 = 1;
|
||||
privacyMode = 1;
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
uVar1 = 0;
|
||||
privacyMode = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
memset(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep104, 0, 0x44);
|
||||
mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = uVar1;
|
||||
mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = privacyMode;
|
||||
}
|
||||
|
||||
void NCDSetting::setPrivacy(u8* newKey, int len) {
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -185,7 +185,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case STATE_16: {
|
||||
fn_81409864();
|
||||
calc_exit_sequence();
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -688,28 +688,28 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
void SettingSelect::fn_81409864() {
|
||||
void SettingSelect::calc_exit_sequence() {
|
||||
switch (unk_0x94) {
|
||||
case 0: {
|
||||
fn_814098F4();
|
||||
prepare_exit_abort();
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
fn_unk_inline();
|
||||
wait_decide_se();
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
fn_81409988();
|
||||
start_exit_fade();
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
fn_814099EC();
|
||||
finish_exit_reboot();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SettingSelect::fn_814098F4() {
|
||||
void SettingSelect::prepare_exit_abort() {
|
||||
if (System::getChannelManager()->isReady()) {
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
controller::Interface* con = System::getController(i);
|
||||
@@ -724,20 +724,20 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
void SettingSelect::fn_unk_inline() {
|
||||
void SettingSelect::wait_decide_se() {
|
||||
if (!snd::getSystem()->isSEActive("WIPL_SE_DECIDE")) {
|
||||
unk_0x94 = 2;
|
||||
}
|
||||
}
|
||||
|
||||
void SettingSelect::fn_81409988() {
|
||||
void SettingSelect::start_exit_fade() {
|
||||
__WPADReconnect(TRUE);
|
||||
snd::getSystem()->stopAllSound(20);
|
||||
System::getFader()->fadeOut();
|
||||
unk_0x94 = 3;
|
||||
}
|
||||
|
||||
void SettingSelect::fn_814099EC() {
|
||||
void SettingSelect::finish_exit_reboot() {
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN) {
|
||||
while (WPADGetStatus() != 0 || System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8) {
|
||||
snd::getSystem()->calc();
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
|
||||
#pragma sym on
|
||||
|
||||
extern "C" const f32 lbl_816945C8 = 1000.0f;
|
||||
extern "C" const f64 lbl_816945D0 = 1000000000.0;
|
||||
extern "C" const f64 lbl_816945D8 = 1.0;
|
||||
extern "C" const f64 lbl_816945E0 = 4503599627370496.0;
|
||||
extern "C" const f32 scTvrcMsPerSec = 1000.0f;
|
||||
extern "C" const f64 scTvrcNsecPerSec = 1000000000.0;
|
||||
extern "C" const f64 scTvrcOne = 1.0;
|
||||
extern "C" const f64 scTvrcFloatMagic = 4503599627370496.0;
|
||||
|
||||
extern "C" BOOL _isInitialized__7LibTVRC;
|
||||
extern "C" BOOL _isActive__7LibTVRC;
|
||||
@@ -53,11 +53,11 @@ extern "C" void __FTVRCLoop1Handler__7LibTVRCFP7OSAlarmP9OSContext();
|
||||
|
||||
#pragma push
|
||||
#pragma section data_type ".sdata"
|
||||
extern "C" char lbl_81696230[5] = {'T', 'V', 'R', '0', '\0'};
|
||||
extern "C" char scTvrcFileHeader[5] = {'T', 'V', 'R', '0', '\0'};
|
||||
#pragma pop
|
||||
|
||||
namespace LibTVRC {
|
||||
const char* TVRC_FILE_HEADER = lbl_81696230;
|
||||
const char* TVRC_FILE_HEADER = scTvrcFileHeader;
|
||||
u32 __tienHoseiNsec = 1100;
|
||||
u32 _limitMilli = 400;
|
||||
|
||||
@@ -267,7 +267,7 @@ TVRCSendStartAsync_valid:
|
||||
bne TVRCSendStartAsync_custom
|
||||
lwz r6, _tvrcFile__7LibTVRC
|
||||
lis r3, 2
|
||||
lfs f1, lbl_816945C8
|
||||
lfs f1, scTvrcMsPerSec
|
||||
lis r4, 0x8000
|
||||
lfs f0, 0xc(r6)
|
||||
subi r0, r3, 0x17b8
|
||||
@@ -309,7 +309,7 @@ TVRCSendStartAsync_no_repeat:
|
||||
TVRCSendStartAsync_timing:
|
||||
lfs f1, _onTimeRatio__7LibTVRC
|
||||
lis r4, 0x8000
|
||||
lfd f0, lbl_816945D0
|
||||
lfd f0, scTvrcNsecPerSec
|
||||
lis r27, 0x4330
|
||||
lwz r0, 0xf8(r4)
|
||||
lis r3, 2
|
||||
@@ -321,7 +321,7 @@ TVRCSendStartAsync_timing:
|
||||
divwu r26, r4, r0
|
||||
fdiv f2, f1, f0
|
||||
stw r27, 8(r1)
|
||||
lfd f1, lbl_816945E0
|
||||
lfd f1, scTvrcFloatMagic
|
||||
stw r25, 0xc(r1)
|
||||
lfd f0, 8(r1)
|
||||
fsub f0, f0, f1
|
||||
@@ -339,13 +339,13 @@ TVRCSendStartAsync_timing:
|
||||
bl __div2i
|
||||
lfs f2, _onTimeRatio__7LibTVRC
|
||||
lis r28, _tickWait__7LibTVRC@ha
|
||||
lfd f1, lbl_816945D8
|
||||
lfd f1, scTvrcOne
|
||||
addi r29, r28, _tickWait__7LibTVRC@l
|
||||
lfd f0, lbl_816945D0
|
||||
lfd f0, scTvrcNsecPerSec
|
||||
fsub f3, f1, f2
|
||||
lfs f2, _Hz__7LibTVRC
|
||||
stw r25, 0x14(r1)
|
||||
lfd f1, lbl_816945E0
|
||||
lfd f1, scTvrcFloatMagic
|
||||
fmul f3, f0, f3
|
||||
stw r27, 0x10(r1)
|
||||
lfd f0, 0x10(r1)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user