Compare commits
13 Commits
cleanup/co
...
cleanup/sd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6df592c03c | ||
|
|
e2191ae933 | ||
|
|
7d77c095c0 | ||
|
|
db8ff7e141 | ||
|
|
2cb6c2dfae | ||
|
|
6f96235605 | ||
|
|
367b042e63 | ||
|
|
feb7ba400d | ||
|
|
20f4af8beb | ||
|
|
dca6cd9aef | ||
|
|
a0700bf908 | ||
|
|
de058b4298 | ||
|
|
c5468cbe50 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.37% | 87.69% | 61.81% | 91.28% |
|
||||
| 99.37% | 87.69% | 61.93% | 91.37% |
|
||||
|
||||
units 916/1027 complete, functions 12211/12563 matched.
|
||||
units 917/1027 complete, functions 12211/12563 matched.
|
||||
|
||||
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
|
||||
<!-- progress:end -->
|
||||
|
||||
@@ -14994,8 +14994,8 @@ __vt__Q37ext_ead3www14SurfaceManager = .data:0x81643AA0; // type:object size:0xC
|
||||
@1183 = .data:0x81643AB8; // type:object size:0x21 scope:local data:string
|
||||
__vt__Q37ext_ead3www9ut_thread = .data:0x81643ADC; // type:object size:0x28
|
||||
lbl_81643B08 = .data:0x81643B08; // type:object size:0x38
|
||||
lbl_81643B40 = .data:0x81643B40; // type:object size:0x1E data:string
|
||||
lbl_81643B5E = .data:0x81643B5E; // type:object size:0x24 data:string
|
||||
scWwwTexBufFmt = .data:0x81643B40; // type:object size:0x1E data:string
|
||||
scWwwNoBrowserWin = .data:0x81643B5E; // type:object size:0x24 data:string
|
||||
lbl_81643B82 = .data:0x81643B82; // type:object size:0x1B data:string
|
||||
lbl_81643B9D = .data:0x81643B9D; // type:object size:0x2B data:string
|
||||
lbl_81643BC8 = .data:0x81643BC8; // type:object size:0x12 data:string
|
||||
@@ -20016,7 +20016,7 @@ lbl_81691040 = .data:0x81691040; // type:object size:0x2D0
|
||||
lbl_81691310 = .data:0x81691310; // type:object size:0x3B data:string
|
||||
lbl_8169134C = .data:0x8169134C; // type:object size:0x3DC
|
||||
st_uhs_msc_blk_func = .data:0x81691728; // type:object size:0x20
|
||||
lbl_81691748 = .data:0x81691748; // type:object size:0x50
|
||||
__sdPathData = .data:0x81691748; // type:object size:0x50
|
||||
lbl_81691798 = .data:0x81691798; // type:object size:0x16 data:string
|
||||
lbl_816917B0 = .data:0x816917B0; // type:object size:0xD data:string
|
||||
lbl_816917C0 = .data:0x816917C0; // type:object size:0x15 data:string
|
||||
@@ -20107,12 +20107,12 @@ gDBCommTable = .data:0x816943C8; // type:object size:0x28
|
||||
lbl_81694410 = .sdata2:0x81694410; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694418 = .sdata2:0x81694418; // type:object size:0x8 align:8 data:double
|
||||
lbl_81694420 = .sdata2:0x81694420; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694424 = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694428 = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
|
||||
lbl_8169442C = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694430 = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694434 = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694438 = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
|
||||
scOrthoLeft = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
|
||||
scOrthoRight = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
|
||||
scOrthoBottom = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
|
||||
scOrthoTop = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
|
||||
scWideOrthoLeft = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
|
||||
scWideOrthoRight = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694440 = .sdata2:0x81694440; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694444 = .sdata2:0x81694444; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694448 = .sdata2:0x81694448; // type:object size:0x8 align:8 data:double
|
||||
@@ -20201,10 +20201,10 @@ lbl_816945B0 = .sdata2:0x816945B0; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945B4 = .sdata2:0x816945B4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945B8 = .sdata2:0x816945B8; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945C0 = .sdata2:0x816945C0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945C8 = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945D0 = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945D8 = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945E0 = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
|
||||
scTvrcMsPerSec = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
|
||||
scTvrcNsecPerSec = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
|
||||
scTvrcOne = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
|
||||
scTvrcFloatMagic = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945E8 = .sdata2:0x816945E8; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945EC = .sdata2:0x816945EC; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945F0 = .sdata2:0x816945F0; // type:object size:0x4 align:4 data:float
|
||||
@@ -20710,12 +20710,12 @@ lbl_81694ECC = .sdata2:0x81694ECC; // type:object size:0x4 align:4 data:float
|
||||
@880 = .sdata2:0x81694ED4; // type:object size:0x4 scope:local align:4 data:float
|
||||
@885 = .sdata2:0x81694ED8; // type:object size:0x4 scope:local align:4 data:float
|
||||
@888 = .sdata2:0x81694EE0; // type:object size:0x8 scope:local align:8 data:double
|
||||
lbl_81694EE8 = .sdata2:0x81694EE8; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694EEC = .sdata2:0x81694EEC; // type:object size:0x1 data:byte
|
||||
lbl_81694EED = .sdata2:0x81694EED; // type:object size:0x1 data:byte
|
||||
lbl_81694EEE = .sdata2:0x81694EEE; // type:object size:0x1 data:byte
|
||||
lbl_81694EEF = .sdata2:0x81694EEF; // type:object size:0x1 data:byte
|
||||
lbl_81694EF0 = .sdata2:0x81694EF0; // type:object size:0x4 align:4 data:float
|
||||
scGuiZeroF = .sdata2:0x81694EE8; // type:object size:0x4 align:4 data:float
|
||||
scGuiLineColorR = .sdata2:0x81694EEC; // type:object size:0x1 data:byte
|
||||
scGuiLineColorG = .sdata2:0x81694EED; // type:object size:0x1 data:byte
|
||||
scGuiLineColorB = .sdata2:0x81694EEE; // type:object size:0x1 data:byte
|
||||
scGuiLineColorA = .sdata2:0x81694EEF; // type:object size:0x1 data:byte
|
||||
scGuiHalfF = .sdata2:0x81694EF0; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694EF8 = .sdata2:0x81694EF8; // type:object size:0x8 data:4byte
|
||||
lbl_81694F00 = .sdata2:0x81694F00; // type:object size:0x4 data:4byte
|
||||
lbl_81694F08 = .sdata2:0x81694F08; // type:object size:0x8 align:8 data:double
|
||||
@@ -21552,7 +21552,7 @@ lbl_8169622C = .sdata:0x8169622C; // type:object size:0x1 data:byte
|
||||
lbl_8169622D = .sdata:0x8169622D; // type:object size:0x1 data:byte
|
||||
lbl_8169622E = .sdata:0x8169622E; // type:object size:0x1 data:byte
|
||||
lbl_8169622F = .sdata:0x8169622F; // type:object size:0x1 data:byte
|
||||
lbl_81696230 = .sdata:0x81696230; // type:object size:0x5 data:string
|
||||
scTvrcFileHeader = .sdata:0x81696230; // type:object size:0x5 data:string
|
||||
TVRC_FILE_HEADER__7LibTVRC = .sdata:0x81696238; // type:object size:0x4 data:4byte
|
||||
__tienHoseiNsec__7LibTVRC = .sdata:0x8169623C; // type:object size:0x4 data:4byte
|
||||
_limitMilli__7LibTVRC = .sdata:0x81696240; // type:object size:0x4 data:4byte
|
||||
@@ -21589,7 +21589,7 @@ lbl_816962DB = .sdata:0x816962DB; // type:object size:0x8 data:string
|
||||
lbl_816962E3 = .sdata:0x816962E3; // type:object size:0x1
|
||||
lbl_816962E4 = .sdata:0x816962E4; // type:object size:0x8 data:string
|
||||
lbl_816962F0 = .sdata:0x816962F0; // type:object size:0x8 data:string
|
||||
lbl_816962F8 = .sdata:0x816962F8; // type:object size:0x8 data:string
|
||||
scWwwErrorQ = .sdata:0x816962F8; // type:object size:0x8 data:string
|
||||
globalNames__Q23www9trasition = .sdata:0x81696300; // type:object size:0x8 scope:local
|
||||
@1425 = .sdata:0x81696308; // type:object size:0x1 scope:local
|
||||
gEnableDpd = .sdata:0x81696310; // type:object size:0x4 data:4byte
|
||||
|
||||
@@ -145,7 +145,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 +384,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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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*);
|
||||
@@ -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) {
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -53,16 +53,10 @@ void iplContest_813D54F8(BOOL success, NAT nat);
|
||||
void* IPLContestAlloc(int size);
|
||||
void IPLContestFree(void* block, u32 _unused);
|
||||
|
||||
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes);
|
||||
void sNHTTPReqCallback(int error, NHTTPResponse* httpRes);
|
||||
void sNHTTPCleanupCallback();
|
||||
|
||||
void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy) {
|
||||
char* pcVar1;
|
||||
char cVar2;
|
||||
char* pcVar3;
|
||||
char* pcVar4;
|
||||
int iVar5;
|
||||
|
||||
g_session.heapBuf = heapBuf;
|
||||
g_session.heap = MEMCreateExpHeapEx(heapBuf, 0x10000, 0);
|
||||
OSInitMutex(&g_session.mutex);
|
||||
@@ -416,9 +410,9 @@ void IPLContestFree(void* block, u32 _unused) {
|
||||
OSUnlockMutex(&g_session.mutex);
|
||||
}
|
||||
|
||||
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) {
|
||||
void sNHTTPReqCallback(int error, NHTTPResponse* httpRes) {
|
||||
g_session.httpResponse = httpRes;
|
||||
if (param_1 == 0) {
|
||||
if (error == 0) {
|
||||
switch (NHTTPGetResultCode(httpRes)) {
|
||||
case 200: {
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_RECEIVED;
|
||||
@@ -440,7 +434,7 @@ void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) {
|
||||
}
|
||||
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
|
||||
switch (param_1) {
|
||||
switch (error) {
|
||||
case 0x4: {
|
||||
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52100;
|
||||
break;
|
||||
|
||||
@@ -234,10 +234,10 @@ namespace ipl {
|
||||
OSReport("NUP region code : %s\n", productAreaString);
|
||||
const char* isoCountryCode = SCUTILGetISOCountryCodeA2();
|
||||
OSReport("NUP country code : %s\n", isoCountryCode);
|
||||
int iVar8 = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
|
||||
int nupResult = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
|
||||
OSReport("NUP_Start()\n");
|
||||
if (iVar8 < 0) {
|
||||
switch (iVar8) {
|
||||
if (nupResult < 0) {
|
||||
switch (nupResult) {
|
||||
case -5000: {
|
||||
OSReport("FAIL ALLOC\n");
|
||||
}
|
||||
@@ -426,8 +426,8 @@ namespace ipl {
|
||||
int val;
|
||||
int len = 4;
|
||||
if (SOGetInterfaceOpt(NULL, SO_SOL_CONFIG, SO_CONFIG_ERROR, &val, &len) == 0 && val == -111) {
|
||||
int iVar7 = NETGetStartupErrorCode(-111);
|
||||
mNetSetupLastErr = (-iVar7 / 100) * 100;
|
||||
int startupErr = NETGetStartupErrorCode(-111);
|
||||
mNetSetupLastErr = (-startupErr / 100) * 100;
|
||||
mNetSetupLastErr = mNetSetup.getconntype();
|
||||
}
|
||||
Setting* settingScene = (Setting*)System::getScene(SCENE_SETTING);
|
||||
@@ -451,8 +451,6 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void* NakamuraTest::conntestthread(void*) {
|
||||
int iVar1;
|
||||
|
||||
IPLContestStart();
|
||||
while (true) {
|
||||
switch (IPLContestProcess()) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -39,12 +39,12 @@
|
||||
extern "C" ipl::System::Arg smArg__Q23ipl6System;
|
||||
extern "C" ipl::snd::System sSystem__Q23ipl3snd;
|
||||
extern "C" void initOnMemory__Q33ipl3snd6SystemFPCvPQ23EGG4HeapUl();
|
||||
extern "C" const f32 lbl_81694424;
|
||||
extern "C" const f32 lbl_81694428;
|
||||
extern "C" const f32 lbl_8169442C;
|
||||
extern "C" const f32 lbl_81694430;
|
||||
extern "C" const f32 lbl_81694434;
|
||||
extern "C" const f32 lbl_81694438;
|
||||
extern "C" const f32 scOrthoLeft;
|
||||
extern "C" const f32 scOrthoRight;
|
||||
extern "C" const f32 scOrthoBottom;
|
||||
extern "C" const f32 scOrthoTop;
|
||||
extern "C" const f32 scWideOrthoLeft;
|
||||
extern "C" const f32 scWideOrthoRight;
|
||||
extern "C" void* m_handle__Q23ipl11TVRCManager;
|
||||
extern "C" void _savegpr_27();
|
||||
extern "C" void _restgpr_27();
|
||||
@@ -1139,7 +1139,7 @@ namespace ipl {
|
||||
bl VISetBlack
|
||||
lwz r3, 0xb0(r28)
|
||||
li r0, 1
|
||||
lfd f31, lbl_81694424-0xc
|
||||
lfd f31, scOrthoLeft-0xc
|
||||
lis r30, 0x4330
|
||||
lbz r29, 0x3d(r3)
|
||||
lis r31, sSystem__Q23ipl3snd@ha
|
||||
@@ -1162,7 +1162,7 @@ namespace ipl {
|
||||
bl makeRawData__Q33ipl7utility11JpegDecoderFv
|
||||
warning_run_no_jpeg:
|
||||
lwz r3, 0x74(r28)
|
||||
lfs f1, lbl_81694424-0x14
|
||||
lfs f1, scOrthoLeft-0x14
|
||||
lwz r27, 0(r3)
|
||||
stw r30, 8(r1)
|
||||
fmr f2, f1
|
||||
@@ -1170,7 +1170,7 @@ namespace ipl {
|
||||
fmr f5, f1
|
||||
lhz r0, 6(r27)
|
||||
stw r3, 0xc(r1)
|
||||
lfs f6, lbl_81694424-0x4
|
||||
lfs f6, scOrthoLeft-0x4
|
||||
lfd f0, 8(r1)
|
||||
stw r0, 0x14(r1)
|
||||
fsubs f3, f0, f31
|
||||
@@ -1362,17 +1362,17 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void System::getProjectionRect4x3(nw4r::ut::Rect* rect) {
|
||||
rect->left = *((volatile const f32*)&lbl_81694424);
|
||||
rect->right = *((volatile const f32*)&lbl_81694428);
|
||||
rect->bottom = *((volatile const f32*)&lbl_8169442C);
|
||||
rect->top = *((volatile const f32*)&lbl_81694430);
|
||||
rect->left = *((volatile const f32*)&scOrthoLeft);
|
||||
rect->right = *((volatile const f32*)&scOrthoRight);
|
||||
rect->bottom = *((volatile const f32*)&scOrthoBottom);
|
||||
rect->top = *((volatile const f32*)&scOrthoTop);
|
||||
}
|
||||
|
||||
void System::getProjectionRect16x9(nw4r::ut::Rect* rect) {
|
||||
rect->left = *((volatile const f32*)&lbl_81694434);
|
||||
rect->right = *((volatile const f32*)&lbl_81694438);
|
||||
rect->bottom = *((volatile const f32*)&lbl_8169442C);
|
||||
rect->top = *((volatile const f32*)&lbl_81694430);
|
||||
rect->left = *((volatile const f32*)&scWideOrthoLeft);
|
||||
rect->right = *((volatile const f32*)&scWideOrthoRight);
|
||||
rect->bottom = *((volatile const f32*)&scOrthoBottom);
|
||||
rect->top = *((volatile const f32*)&scOrthoTop);
|
||||
}
|
||||
|
||||
GXRenderModeObj* System::getRenderModeObj() {
|
||||
@@ -1516,11 +1516,11 @@ namespace ipl {
|
||||
|
||||
#ifdef __MWERKS__
|
||||
#pragma force_active on
|
||||
extern "C" const f32 lbl_81694424 = -304.0f;
|
||||
extern "C" const f32 lbl_81694428 = 304.0f;
|
||||
extern "C" const f32 lbl_8169442C = 228.0f;
|
||||
extern "C" const f32 lbl_81694430 = -228.0f;
|
||||
extern "C" const f32 lbl_81694434 = -416.0f;
|
||||
extern "C" const f32 lbl_81694438 = 416.0f;
|
||||
extern "C" const f32 scOrthoLeft = -304.0f;
|
||||
extern "C" const f32 scOrthoRight = 304.0f;
|
||||
extern "C" const f32 scOrthoBottom = 228.0f;
|
||||
extern "C" const f32 scOrthoTop = -228.0f;
|
||||
extern "C" const f32 scWideOrthoLeft = -416.0f;
|
||||
extern "C" const f32 scWideOrthoRight = 416.0f;
|
||||
#pragma force_active off
|
||||
#endif
|
||||
|
||||
@@ -46,12 +46,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;
|
||||
}
|
||||
|
||||
T get() const {
|
||||
@@ -64,11 +64,11 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(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;
|
||||
@@ -77,8 +77,8 @@ namespace ipl {
|
||||
protected:
|
||||
T mStart;
|
||||
T mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user