Compare commits

...

16 Commits

Author SHA1 Message Date
coah
dd2993f12d Match RVL SDK FAFinfo wrapper 2026-09-23 02:26:52 +00:00
coah
4b71db7dfd Match FAInitDiskManager data (#207) 2026-09-22 21:23:18 -05:00
coah
e052c9ae0c Match RVL SDK ferror wrapper (#206) 2026-09-22 21:22:57 -05:00
coah
a843f0770f Match RVL SDK flock wrapper (#204) 2026-09-22 03:49:37 -05:00
coah
c356c90f22 Match RVL SDK ferror wrapper (#203) 2026-09-22 03:49:32 -05:00
coah
6af767089f Match RVL SDK FAFclose wrapper (#201) 2026-09-22 03:40:42 -05:00
coah
bee0a51dbf Match MSL wctype tables (#200) 2026-09-22 03:40:29 -05:00
coah
d9e7306a99 Match RVL SDK errnum wrapper (#198) 2026-09-22 03:37:57 -05:00
coah
f214b726b5 Match RVL SDK closedir wrapper (#190) 2026-09-22 03:35:37 -05:00
coah
cbe489cd37 Match AXFX HiExp reverb unit (#195) 2026-09-22 03:33:39 -05:00
coah
d78ab4cfd1 Link matching www browser unit (#193) 2026-09-22 03:32:00 -05:00
coah
311b437e5f Match RVL SDK feof wrapper (#192) 2026-09-22 03:31:56 -05:00
coah
8581b15e80 Match RVL SDK OS exception jump (#191) 2026-09-22 03:31:22 -05:00
coah
16317c11e2 Match RVLFaceLib controller data (#188) 2026-09-22 03:28:53 -05:00
coah
667b9f6fa2 Match MSL wide string helpers (#187) 2026-09-22 03:27:28 -05:00
coah
bf479c7e3f Match ChannelTitle unit (#182) 2026-09-22 03:22:51 -05:00
20 changed files with 1132 additions and 216 deletions

View File

@@ -692,7 +692,7 @@ config.libs = [
]
),
IPLSection("iplwww", [
Object(Equivalent, "iplwww/www_browser.cpp"),
Object(Matching, "iplwww/www_browser.cpp"),
Object(Matching, "iplwww/www_message.cpp"),
Object(Matching, "iplwww/www_surface.cpp"),
Object(Matching, "iplwww/www_thread.cpp"),
@@ -1446,7 +1446,7 @@ config.libs = [
RVLSDKLib("axfx", [
Object(Matching, "axfx/AXFXReverbHi.c"),
Object(Matching, "axfx/AXFXReverbHiDpl2.c"),
Object(NonMatching, "axfx/AXFXReverbHiExp.c"),
Object(Matching, "axfx/AXFXReverbHiExp.c"),
Object(NonMatching, "axfx/AXFXReverbHiExpDpl2.c"),
Object(Matching, "axfx/AXFXDelay.c"),
Object(Matching, "axfx/AXFXReverbStd.c"),
@@ -1714,7 +1714,7 @@ config.libs = [
Object(NonMatching, "fa/pf_chdmod.c"),
Object(NonMatching, "fa/pf_chmod.c"),
Object(NonMatching, "fa/pf_cinsert.c"),
Object(NonMatching, "fa/pf_closedir.c"),
Object(Matching, "fa/pf_closedir.c"),
Object(NonMatching, "fa/pf_combine.c"),
Object(NonMatching, "fa/pf_create.c"),
Object(NonMatching, "fa/pf_createdir.c"),
@@ -1722,16 +1722,16 @@ config.libs = [
Object(NonMatching, "fa/pf_derrnum.c"),
Object(NonMatching, "fa/pf_detach.c"),
Object(NonMatching, "fa/pf_divide.c"),
Object(NonMatching, "fa/pf_errnum.c"),
Object(Matching, "fa/pf_errnum.c"),
Object(NonMatching, "fa/pf_fadjust.c"),
Object(NonMatching, "fa/pf_fappend.c"),
Object(NonMatching, "fa/pf_fchdir.c"),
Object(Matching, "fa/pf_fclose.c"),
Object(NonMatching, "fa/pf_fconcat.c"),
Object(NonMatching, "fa/pf_feof.c"),
Object(NonMatching, "fa/pf_ferror.c"),
Object(Matching, "fa/pf_feof.c"),
Object(Matching, "fa/pf_ferror.c"),
Object(NonMatching, "fa/pf_finfo.c"),
Object(NonMatching, "fa/pf_flock.c"),
Object(Matching, "fa/pf_flock.c"),
Object(NonMatching, "fa/pf_fopen.c"),
Object(NonMatching, "fa/pf_format.c"),
Object(Matching, "fa/pf_fread.c"),
@@ -1831,8 +1831,8 @@ config.libs = [
Object(NonMatching, "fa/api/FACreatedir.c"),
Object(NonMatching, "fa/api/FADetach.c"),
Object(NonMatching, "fa/api/FAErrnum.c"),
Object(NonMatching, "fa/api/FAFclose.c"),
Object(NonMatching, "fa/api/FAFinfo.c"),
Object(Matching, "fa/api/FAFclose.c"),
Object(Matching, "fa/api/FAFinfo.c"),
Object(NonMatching, "fa/api/FAFopen.c"),
Object(NonMatching, "fa/api/FAFormat.c"),
Object(Matching, "fa/api/FAFread.c"),
@@ -1843,7 +1843,7 @@ config.libs = [
Object(Matching, "fa/api/FAFwrite.c"),
Object(NonMatching, "fa/api/FAGetdev.c"),
Object(NonMatching, "fa/api/FAInit.c"),
Object(NonMatching, "fa/api/FAInitDiskManager.c"),
Object(Matching, "fa/api/FAInitDiskManager.c"),
Object(NonMatching, "fa/api/FAMount.c"),
Object(NonMatching, "fa/api/FARegistCB.c"),
Object(NonMatching, "fa/api/FARemove.c"),
@@ -1967,10 +1967,10 @@ config.libs = [
Object(NonMatching, "MSL_Common/strtold.c"),
Object(NonMatching, "MSL_Common/strtoul.c"),
Object(NonMatching, "MSL_Common/time.c"),
Object(NonMatching, "MSL_Common/wctype.c"),
Object(Matching, "MSL_Common/wctype.c"),
Object(Matching, "MSL_Common/wmem.c"),
Object(NonMatching, "MSL_Common/wprintf.c"),
Object(NonMatching, "MSL_Common/wstring.c"),
Object(Matching, "MSL_Common/wstring.c"),
Object(Matching, "MSL_Common/wchar_io.c"),
Object(Matching, "PPC_EABI/time.dolphin.c"),
Object(Matching, "PPC_EABI/sysenv.GCN.c"),

View File

@@ -30,10 +30,14 @@ namespace gui {
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
virtual void draw() {} // 0x18 (0x06)
virtual ~Interface() {} // 0x1C (0x07)
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual ~Interface(); // 0x1C (0x07)
#else
virtual ~Interface() {} // 0x1C (0x07)
#endif
};
class EventHandler {
class __declspec(novtable) EventHandler {
public:
enum {
ON_TRIG = 0,

View File

@@ -11,14 +11,18 @@
namespace ipl {
namespace gui {
class PaneComponent : public ::gui::PaneComponent {};
class PaneManager : public ::gui::PaneManager {
class PaneManager : public ::gui::PaneManager {
public:
PaneManager(::gui::EventHandler* event, const nw4r::lyt::DrawInfo* drawInfo, EGG::Heap* heap, EGG::Allocator* allocator, bool bDisableCon = false) :
::gui::PaneManager(event, allocator, drawInfo),
mpHeap(heap),
mbDisableCon(bDisableCon) {}
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual ~PaneManager();
#else
virtual ~PaneManager() {}
#endif
void update();
void update(int chan);

View File

@@ -45,32 +45,29 @@ namespace ipl {
};
template <typename T>
class HermiteIntp : public Interporation<T> {
class __declspec(novtable) HermiteIntp : public utility::FrameController {
public:
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) {
mStart = start;
mEnd = end;
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
unkVal0 = param_5;
unkVal1 = param_6;
}
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);
T get() const {
f32 var_f27 = mFrame;
f32 var_f28 = 1.0f / mMaxFrame;
f32 t1t2 =
(var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) - (var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)));
T r = (mStart * (1.0f + t1t2)) - (mEnd * t1t2);
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)));
r = r + temp_f3;
T r =
(mStart *
(1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(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))));
return r;
@@ -91,9 +88,49 @@ namespace ipl {
}
protected:
T mStart;
T mEnd;
f32 unkVal0;
f32 unkVal1;
};
template <>
class HermiteIntp<f32> : public utility::FrameController {
public:
HermiteIntp() {}
virtual ~HermiteIntp();
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD,
f32 speed = 1.0f);
f32 get() const {
f32 var_f27 = mFrame;
f32 var_f28 = 1.0f / mMaxFrame;
f32 r =
(mStart *
(1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(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))));
return r;
}
protected:
f32 mStart;
f32 mEnd;
f32 unkVal0;
f32 unkVal1;
};
#pragma dont_instantiate HermiteIntp<float>
} // namespace math
} // namespace ipl

View File

@@ -404,7 +404,12 @@ namespace ipl {
int mModuleIndex; // 0x400
EGG::ExpHeap* mpCSHeap; // 0x404
static ESTicketView msTicketView;
struct TicketViewStorage {
ESTicketView view;
u8 pad[8];
};
static TicketViewStorage msTicketView;
static ESTicketView msUnlockTicket;
static const char* mscBtnNames[BTN_MAX];

View File

@@ -0,0 +1,104 @@
const unsigned int __wctype_mapC[128] = {
0x00040004, 0x00040004, 0x00040004, 0x00040004,
0x00040106, 0x01040104, 0x01040104, 0x00040004,
0x00040004, 0x00040004, 0x00040004, 0x00040004,
0x00040004, 0x00040004, 0x00040004, 0x00040004,
0x014200D0, 0x00D000D0, 0x00D000D0, 0x00D000D0,
0x00D000D0, 0x00D000D0, 0x00D000D0, 0x00D000D0,
0x04580458, 0x04580458, 0x04580458, 0x04580458,
0x04580458, 0x00D000D0, 0x00D000D0, 0x00D000D0,
0x00D00651, 0x06510651, 0x06510651, 0x06510251,
0x02510251, 0x02510251, 0x02510251, 0x02510251,
0x02510251, 0x02510251, 0x02510251, 0x02510251,
0x02510251, 0x025100D0, 0x00D000D0, 0x00D000D0,
0x00D00471, 0x04710471, 0x04710471, 0x04710071,
0x00710071, 0x00710071, 0x00710071, 0x00710071,
0x00710071, 0x00710071, 0x00710071, 0x00710071,
0x00710071, 0x007100D0, 0x00D000D0, 0x00D00004,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
};
const unsigned int __wlower_mapC[128] = {
0x00000001, 0x00020003, 0x00040005, 0x00060007,
0x00080009, 0x000A000B, 0x000C000D, 0x000E000F,
0x00100011, 0x00120013, 0x00140015, 0x00160017,
0x00180019, 0x001A001B, 0x001C001D, 0x001E001F,
0x00200021, 0x00220023, 0x00240025, 0x00260027,
0x00280029, 0x002A002B, 0x002C002D, 0x002E002F,
0x00300031, 0x00320033, 0x00340035, 0x00360037,
0x00380039, 0x003A003B, 0x003C003D, 0x003E003F,
0x00400061, 0x00620063, 0x00640065, 0x00660067,
0x00680069, 0x006A006B, 0x006C006D, 0x006E006F,
0x00700071, 0x00720073, 0x00740075, 0x00760077,
0x00780079, 0x007A005B, 0x005C005D, 0x005E005F,
0x00600061, 0x00620063, 0x00640065, 0x00660067,
0x00680069, 0x006A006B, 0x006C006D, 0x006E006F,
0x00700071, 0x00720073, 0x00740075, 0x00760077,
0x00780079, 0x007A007B, 0x007C007D, 0x007E007F,
0x00800081, 0x00820083, 0x00840085, 0x00860087,
0x00880089, 0x008A008B, 0x008C008D, 0x008E008F,
0x00900091, 0x00920093, 0x00940095, 0x00960097,
0x00980099, 0x009A009B, 0x009C009D, 0x009E009F,
0x00A000A1, 0x00A200A3, 0x00A400A5, 0x00A600A7,
0x00A800A9, 0x00AA00AB, 0x00AC00AD, 0x00AE00AF,
0x00B000B1, 0x00B200B3, 0x00B400B5, 0x00B600B7,
0x00B800B9, 0x00BA00BB, 0x00BC00BD, 0x00BE00BF,
0x00C000C1, 0x00C200C3, 0x00C400C5, 0x00C600C7,
0x00C800C9, 0x00CA00CB, 0x00CC00CD, 0x00CE00CF,
0x00D000D1, 0x00D200D3, 0x00D400D5, 0x00D600D7,
0x00D800D9, 0x00DA00DB, 0x00DC00DD, 0x00DE00DF,
0x00E000E1, 0x00E200E3, 0x00E400E5, 0x00E600E7,
0x00E800E9, 0x00EA00EB, 0x00EC00ED, 0x00EE00EF,
0x00F000F1, 0x00F200F3, 0x00F400F5, 0x00F600F7,
0x00F800F9, 0x00FA00FB, 0x00FC00FD, 0x00FE00FF,
};
const unsigned int __wupper_mapC[128] = {
0x00000001, 0x00020003, 0x00040005, 0x00060007,
0x00080009, 0x000A000B, 0x000C000D, 0x000E000F,
0x00100011, 0x00120013, 0x00140015, 0x00160017,
0x00180019, 0x001A001B, 0x001C001D, 0x001E001F,
0x00200021, 0x00220023, 0x00240025, 0x00260027,
0x00280029, 0x002A002B, 0x002C002D, 0x002E002F,
0x00300031, 0x00320033, 0x00340035, 0x00360037,
0x00380039, 0x003A003B, 0x003C003D, 0x003E003F,
0x00400041, 0x00420043, 0x00440045, 0x00460047,
0x00480049, 0x004A004B, 0x004C004D, 0x004E004F,
0x00500051, 0x00520053, 0x00540055, 0x00560057,
0x00580059, 0x005A005B, 0x005C005D, 0x005E005F,
0x00600041, 0x00420043, 0x00440045, 0x00460047,
0x00480049, 0x004A004B, 0x004C004D, 0x004E004F,
0x00500051, 0x00520053, 0x00540055, 0x00560057,
0x00580059, 0x005A007B, 0x007C007D, 0x007E007F,
0x00800081, 0x00820083, 0x00840085, 0x00860087,
0x00880089, 0x008A008B, 0x008C008D, 0x008E008F,
0x00900091, 0x00920093, 0x00940095, 0x00960097,
0x00980099, 0x009A009B, 0x009C009D, 0x009E009F,
0x00A000A1, 0x00A200A3, 0x00A400A5, 0x00A600A7,
0x00A800A9, 0x00AA00AB, 0x00AC00AD, 0x00AE00AF,
0x00B000B1, 0x00B200B3, 0x00B400B5, 0x00B600B7,
0x00B800B9, 0x00BA00BB, 0x00BC00BD, 0x00BE00BF,
0x00C000C1, 0x00C200C3, 0x00C400C5, 0x00C600C7,
0x00C800C9, 0x00CA00CB, 0x00CC00CD, 0x00CE00CF,
0x00D000D1, 0x00D200D3, 0x00D400D5, 0x00D600D7,
0x00D800D9, 0x00DA00DB, 0x00DC00DD, 0x00DE00DF,
0x00E000E1, 0x00E200E3, 0x00E400E5, 0x00E600E7,
0x00E800E9, 0x00EA00EB, 0x00EC00ED, 0x00EE00EF,
0x00F000F1, 0x00F200F3, 0x00F400F5, 0x00F600F7,
0x00F800F9, 0x00FA00FB, 0x00FC00FD, 0x00FE00FF,
};

View File

@@ -0,0 +1,160 @@
#include <wchar.h>
size_t wcslen(const wchar_t* str) {
const wchar_t* p = str - 1;
size_t len = -1;
do {
len++;
} while (*++p != 0);
return len;
}
wchar_t* wcscpy(wchar_t* dest, const wchar_t* src) {
const wchar_t* s = src - 1;
wchar_t* d = dest - 1;
wchar_t c;
do {
c = *++s;
*++d = c;
} while (c != 0);
return dest;
}
wchar_t* wcsncpy(wchar_t* dest, const wchar_t* src, size_t num) {
const wchar_t* s = src - 1;
wchar_t* d = dest - 1;
wchar_t c;
size_t n = num + 1;
while (--n != 0) {
c = *++s;
*++d = c;
if (c == 0) {
while (--n != 0) {
*++d = 0;
}
break;
}
}
return dest;
}
wchar_t* wcscat(wchar_t* dest, const wchar_t* src) {
const wchar_t* s = src - 1;
wchar_t* d = dest - 1;
while (*++d != 0)
;
d--;
do {
*++d = *++s;
} while (*s != 0);
return dest;
}
wchar_t* wcsncat(wchar_t* dest, const wchar_t* src, size_t num) {
const wchar_t* s = src - 1;
wchar_t* d = dest - 1;
wchar_t c;
size_t n;
while (*++d != 0)
;
d--;
n = num + 1;
while (--n != 0) {
c = *++s;
*++d = c;
if (c == 0) {
d--;
break;
}
}
*++d = 0;
return dest;
}
int wcsncmp(const wchar_t* s1, const wchar_t* s2, size_t num) {
wchar_t c2;
wchar_t c1;
const wchar_t* p1;
const wchar_t* p2;
size_t n;
p1 = s1 - 1;
p2 = s2 - 1;
n = num + 1;
while (--n != 0) {
c1 = *++p1;
c2 = *++p2;
if (c1 != c2) {
return (int)(c1 - c2);
}
if (c1 == 0) {
break;
}
}
return 0;
}
wchar_t* wcschr(wchar_t* ws, wchar_t wc) {
wchar_t* p = ws - 1;
wchar_t ch;
while ((ch = *++p) != 0) {
if (ch == wc) {
return p;
}
}
if (wc == 0) {
return p;
}
return 0;
}
wchar_t* wcsstr(const wchar_t* s1, const wchar_t* s2) {
const wchar_t* p1;
wchar_t c;
wchar_t c1;
wchar_t c2;
c = *s2;
p1 = s1 - 1;
if (c == 0) {
return (wchar_t*)s1;
}
while ((c1 = *++p1) != 0) {
if (c1 == c) {
wchar_t ic1;
const wchar_t* ps1;
const wchar_t* p2;
ps1 = p1 - 1;
p2 = s2 - 1;
do {
ic1 = *++ps1;
c2 = *++p2;
if (ic1 != c2) {
break;
}
} while (ic1 != 0);
if (c2 == 0) {
return (wchar_t*)p1;
}
}
}
return 0;
}

View File

@@ -57,6 +57,46 @@ void RFLiInitCtrlBuf(MEMiHeapHead* sysHeap) {
}
}
int RFLiGetControllerData(RFLiCharInfo* dst, s32 chan, u8 index, BOOL hiddenAvailable) {
RFLiCtrlManager* manager;
RFLiCtrlBuffer* buffer;
u16 flag;
RFLi_ASSERTLINE_RANGE(chan, 0, WPAD_MAX_CONTROLLERS, 1412);
RFLi_ASSERTLINE_RANGE(index, 0, RFL_MAX_CTRL_BUFFER, 1413);
if (chan < 0 || chan >= WPAD_MAX_CONTROLLERS) {
return FALSE;
}
if (index >= RFL_MAX_CTRL_BUFFER) {
return FALSE;
}
manager = RFLiGetCtrlBufManager();
if (manager == NULL) {
return FALSE;
}
if (!manager->mIsLoaded[chan]) {
return FALSE;
}
flag = (1 << index);
buffer = manager->mBuffer[chan];
if (!RFLiIsValidID((RFLCreateID*)&buffer->mData[index].createID)) {
return FALSE;
}
if (!hiddenAvailable && (buffer->mSecretFlag & flag) != 0) {
return FALSE;
}
RFLiConvertRaw2Info(&buffer->mData[index], dst);
return TRUE;
}
BOOL RFLiCheckCtrlBufferCore(const RFLiCtrlBuffer* buffer, u8 index, RFLiCtrlCheckType type) {
u16 flag = (1 << index);
@@ -771,46 +811,6 @@ int RFLiSetControllerData(const RFLiCharInfo* src, s32 chan, u8 index) {
return setDataCore_(src, chan, index, FALSE);
}
int RFLiGetControllerData(RFLiCharInfo* dst, s32 chan, u8 index, BOOL hiddenAvailable) {
RFLiCtrlManager* manager;
RFLiCtrlBuffer* buffer;
u16 flag;
RFLi_ASSERTLINE_RANGE(chan, 0, WPAD_MAX_CONTROLLERS, 1412);
RFLi_ASSERTLINE_RANGE(index, 0, RFL_MAX_CTRL_BUFFER, 1413);
if (chan < 0 || chan >= WPAD_MAX_CONTROLLERS) {
return FALSE;
}
if (index >= RFL_MAX_CTRL_BUFFER) {
return FALSE;
}
manager = RFLiGetCtrlBufManager();
if (manager == NULL) {
return FALSE;
}
if (!manager->mIsLoaded[chan]) {
return FALSE;
}
flag = (1 << index);
buffer = manager->mBuffer[chan];
if (!RFLiIsValidID((RFLCreateID*)&buffer->mData[index].createID)) {
return FALSE;
}
if (!hiddenAvailable && (buffer->mSecretFlag & flag) != 0) {
return FALSE;
}
RFLiConvertRaw2Info(&buffer->mData[index], dst);
return TRUE;
}
RFLErrcode RFLUnloadController(s32 chan) {
RFLi_ASSERTLINE_RANGE(chan, 0, WPAD_MAX_CONTROLLERS, 1461);

View File

@@ -55,7 +55,7 @@ typedef struct AXFX_REVERBHI_EXP {
f32 sendGain; // 0x144
} AXFX_REVERBHI_EXP;
u32 AXFXReverbHiExpGetMemSize(const AXFX_REVERBHI_EXP* fx);
u32 AXFXReverbHiExpGetMemSize(AXFX_REVERBHI_EXP* fx);
BOOL AXFXReverbHiExpInit(AXFX_REVERBHI_EXP* fx);
void AXFXReverbHiExpShutdown(AXFX_REVERBHI_EXP* fx);
BOOL AXFXReverbHiExpSettings(AXFX_REVERBHI_EXP* fx);

View File

@@ -0,0 +1,447 @@
#include <private/axfx.h>
#include <revolution/AXFX.h>
#include <revolution/MEM.h>
#include <revolution/OS.h>
#include <math.h>
#include <string.h>
static BOOL __AllocDelayLine(AXFX_REVERBHI_EXP* fx);
static void __BzeroDelayLines(AXFX_REVERBHI_EXP* fx);
static void __FreeDelayLine(AXFX_REVERBHI_EXP* fx);
static BOOL __InitParams(AXFX_REVERBHI_EXP* fx);
static u32 __EarlySizeTable[8][3] = {{157, 479, 829}, {317, 809, 1117}, {479, 941, 1487}, {641, 1259, 1949},
{797, 1667, 2579}, {967, 1901, 2903}, {1123, 2179, 3413}, {1279, 2477, 3889}};
static f32 __EarlyCoefTable[8][3] = {{0.4f, -1.0f, 0.3f}, {0.5f, -0.95f, 0.3f}, {0.6f, -0.9f, 0.3f}, {0.75f, -0.85f, 0.3f},
{-0.9f, 0.8f, 0.3f}, {-1.0f, 0.7f, 0.3f}, {-1.0f, 0.7f, 0.3f}, {-1.0f, 0.7f, 0.3f}};
static u32 __FilterSizeTable[7][8] = {{1789, 1999, 2333, 433, 149, 47, 73, 67}, {149, 293, 449, 251, 103, 47, 73, 67},
{947, 1361, 1531, 433, 137, 47, 73, 67}, {1279, 1531, 1973, 509, 149, 47, 73, 67},
{1531, 1847, 2297, 563, 179, 47, 73, 67}, {1823, 2357, 2693, 571, 137, 47, 73, 67},
{1823, 2357, 2693, 571, 179, 47, 73, 67}};
u32 AXFXReverbHiExpGetMemSize(AXFX_REVERBHI_EXP* fx) {
u32 sum = 0;
u32 i = 0;
sum += __EarlySizeTable[7][2];
sum += (int)(fx->preDelayTimeMax * 32000);
for (i = 0; i < 5; i++) {
sum += __FilterSizeTable[6][i];
}
sum *= 3;
for (i = 5; i < 8; i++) {
sum += __FilterSizeTable[6][i];
}
sum *= 4;
return sum;
}
BOOL AXFXReverbHiExpInit(AXFX_REVERBHI_EXP* fx) {
u32 ch, i;
BOOL result = TRUE;
BOOL mask = OSDisableInterrupts();
fx->active = 1;
if (fx->preDelayTimeMax < 0.0f) {
AXFXReverbHiExpShutdown(fx);
OSRestoreInterrupts(mask);
return FALSE;
}
fx->earlyMaxLength = __EarlySizeTable[8 - 1][2];
fx->preDelayMaxLength = (u32)(fx->preDelayTimeMax * 32000);
for (i = 0; i < 3; i++) {
fx->combMaxLength[i] = __FilterSizeTable[6][i];
}
for (i = 0; i < 2; i++) {
fx->allpassMaxLength[i] = __FilterSizeTable[6][3 + i];
}
for (ch = 0; ch < 3; ch++) {
fx->lastAllpassMaxLength[ch] = __FilterSizeTable[6][5 + ch];
}
result = __AllocDelayLine(fx);
if (result == FALSE) {
AXFXReverbHiExpShutdown(fx);
OSRestoreInterrupts(mask);
return FALSE;
}
__BzeroDelayLines(fx);
result = __InitParams(fx);
if (result == FALSE) {
AXFXReverbHiExpShutdown(fx);
OSRestoreInterrupts(mask);
return FALSE;
}
fx->active &= ~1;
OSRestoreInterrupts(mask);
return TRUE;
}
BOOL AXFXReverbHiExpSettings(AXFX_REVERBHI_EXP* fx) {
BOOL mask = OSDisableInterrupts();
fx->active = fx->active | 1;
AXFXReverbHiExpShutdown(fx);
if (!AXFXReverbHiExpInit(fx)) {
AXFXReverbHiExpShutdown(fx);
OSRestoreInterrupts(mask);
return FALSE;
} else {
fx->active |= 2;
fx->active &= ~1;
OSRestoreInterrupts(mask);
return TRUE;
}
}
void AXFXReverbHiExpShutdown(AXFX_REVERBHI_EXP* fx) {
BOOL mask = OSDisableInterrupts();
fx->active |= 1;
__FreeDelayLine(fx);
OSRestoreInterrupts(mask);
}
void AXFXReverbHiExpCallback(AXFX_BUFFERUPDATE* bufferUpdate, AXFX_REVERBHI_EXP* fx) {
u32 ch, i;
u32 samp;
s32* input[3];
f32 data;
f32 output[3];
f32* earlyLine;
f32 earlyOut;
f32* preDelayLine;
f32 preDelayOut;
f32 filterOut;
f32* combLine;
f32 combOutOne;
f32* allpass;
f32 outTmp;
f32 allpassIn;
f32 allpassCoef;
f32 lpfOut;
f32 lpfCoef1;
f32 lpfCoef2;
f32 fusedOut[3];
f32 fusedGain;
f32 crosstalkGain;
f32 crosstalkL;
f32 crosstalkR;
f32 crosstalkS;
s32* inBusData[3];
s32* outBusData[3];
if (fx->active != 0) {
fx->active &= ~2;
return;
}
input[0] = bufferUpdate->left;
input[1] = bufferUpdate->right;
input[2] = bufferUpdate->surround;
if (fx->busIn != NULL) {
inBusData[0] = fx->busIn->left;
inBusData[1] = fx->busIn->right;
inBusData[2] = fx->busIn->surround;
}
if (fx->busOut != NULL) {
outBusData[0] = fx->busOut->left;
outBusData[1] = fx->busOut->right;
outBusData[2] = fx->busOut->surround;
}
lpfCoef1 = 1.0f - fx->lpfCoef;
lpfCoef2 = fx->lpfCoef;
allpassCoef = fx->allpassCoef;
fusedGain = fx->fusedGain * 0.6f;
crosstalkGain = fx->crosstalk * 0.5f;
for (samp = 0; samp < 96; samp++) {
for (ch = 0; ch < 3; ch++) {
if (fx->busIn != NULL) {
data = (f32)(*(input[ch]) + *(inBusData[ch]++));
} else {
data = (f32)(*input[ch]);
}
earlyLine = fx->earlyLine[ch];
earlyOut = earlyLine[fx->earlyPos[0]] * fx->earlyCoef[0] + earlyLine[fx->earlyPos[1]] * fx->earlyCoef[1] +
earlyLine[fx->earlyPos[2]] * fx->earlyCoef[2];
earlyLine[fx->earlyPos[2]] = data;
if (fx->preDelayLength != 0) {
preDelayLine = fx->preDelayLine[ch];
preDelayOut = preDelayLine[fx->preDelayPos];
preDelayLine[fx->preDelayPos] = data;
} else {
preDelayOut = data;
}
filterOut = 0.0f;
for (i = 0; i < 3; i++) {
combLine = fx->combLine[ch][i];
combOutOne = combLine[fx->combPos[i]];
combLine[fx->combPos[i]] = preDelayOut + (combOutOne * fx->combCoef[i]);
filterOut += combOutOne;
}
for (i = 0; i < 2; i++) {
allpass = fx->allpassLine[ch][i];
outTmp = allpass[fx->allpassPos[i]];
allpassIn = filterOut + outTmp * allpassCoef;
allpass[fx->allpassPos[i]] = allpassIn;
filterOut = outTmp - allpassIn * allpassCoef;
}
lpfOut = lpfCoef1 * filterOut + lpfCoef2 * fx->lastLpfOut[ch];
fx->lastLpfOut[ch] = lpfOut;
allpass = fx->lastAllpassLine[ch];
outTmp = allpass[fx->lastAllpassPos[ch]];
allpassIn = lpfOut + outTmp * allpassCoef;
allpass[fx->lastAllpassPos[ch]] = allpassIn;
fusedOut[ch] = outTmp - allpassIn * allpassCoef;
if (++fx->lastAllpassPos[ch] >= fx->lastAllpassLength[ch]) {
fx->lastAllpassPos[ch] = 0;
}
fusedOut[ch] *= fusedGain;
fusedOut[ch] += earlyOut;
}
crosstalkL = fusedOut[1] + fusedOut[2];
crosstalkR = fusedOut[0] + fusedOut[2];
crosstalkS = fusedOut[0] + fusedOut[1];
output[0] = fusedOut[0] + crosstalkL * crosstalkGain;
output[1] = fusedOut[1] + crosstalkR * crosstalkGain;
output[2] = fusedOut[2] + crosstalkS * crosstalkGain;
*(input[0]++) = (s32)(output[0] * fx->outGain);
*(input[1]++) = (s32)(output[1] * fx->outGain);
*(input[2]++) = (s32)(output[2] * fx->outGain);
if (fx->busOut != NULL) {
*(outBusData[0]++) = (s32)(output[0] * fx->sendGain);
*(outBusData[1]++) = (s32)(output[1] * fx->sendGain);
*(outBusData[2]++) = (s32)(output[2] * fx->sendGain);
}
for (i = 0; i < 3; i++) {
if (++fx->earlyPos[i] >= fx->earlyLength) {
fx->earlyPos[i] = 0;
}
}
if (fx->preDelayLength != 0) {
if (++fx->preDelayPos >= fx->preDelayLength) {
fx->preDelayPos = 0;
}
}
for (i = 0; i < 3; i++) {
if (++fx->combPos[i] >= fx->combLength[i]) {
fx->combPos[i] = 0;
}
}
for (i = 0; i < 2; i++) {
if (++fx->allpassPos[i] >= fx->allpassLength[i]) {
fx->allpassPos[i] = 0;
}
}
}
}
static BOOL __AllocDelayLine(AXFX_REVERBHI_EXP* fx) {
u32 ch, i;
for (ch = 0; ch < 3; ch++) {
fx->earlyLine[ch] = (f32*)__AXFXAlloc(sizeof(f32) * fx->earlyMaxLength);
if (fx->earlyLine[ch] == NULL)
return FALSE;
if (fx->preDelayMaxLength != 0) {
fx->preDelayLine[ch] = (f32*)__AXFXAlloc(sizeof(f32) * fx->preDelayMaxLength);
if (fx->preDelayLine[ch] == NULL)
return FALSE;
} else {
fx->preDelayLine[ch] = NULL;
}
for (i = 0; i < 3; i++) {
fx->combLine[ch][i] = (f32*)__AXFXAlloc(sizeof(f32) * fx->combMaxLength[i]);
if (fx->combLine[ch][i] == NULL)
return FALSE;
}
for (i = 0; i < 2; i++) {
fx->allpassLine[ch][i] = (f32*)__AXFXAlloc(sizeof(f32) * fx->allpassMaxLength[i]);
if (fx->allpassLine[ch][i] == NULL)
return FALSE;
}
fx->lastAllpassLine[ch] = (f32*)__AXFXAlloc(sizeof(f32) * fx->lastAllpassMaxLength[ch]);
if (fx->lastAllpassLine[ch] == NULL)
return FALSE;
}
return TRUE;
}
static void __BzeroDelayLines(AXFX_REVERBHI_EXP* fx) {
u32 ch, i;
for (ch = 0; ch < 3; ch++) {
if (fx->earlyLine[ch] != NULL) {
memset(fx->earlyLine[ch], 0, sizeof(f32) * fx->earlyMaxLength);
}
if (fx->preDelayLine[ch] != NULL) {
memset(fx->preDelayLine[ch], 0, sizeof(f32) * fx->preDelayMaxLength);
}
for (i = 0; i < 3; i++) {
if (fx->combLine[ch][i] != NULL) {
memset(fx->combLine[ch][i], 0, sizeof(f32) * fx->combMaxLength[i]);
}
}
for (i = 0; i < 2; i++) {
if (fx->allpassLine[ch][i] != NULL) {
memset(fx->allpassLine[ch][i], 0, sizeof(f32) * fx->allpassMaxLength[i]);
}
}
if (fx->lastAllpassLine[ch] != NULL) {
memset(fx->lastAllpassLine[ch], 0, sizeof(f32) * fx->lastAllpassMaxLength[ch]);
}
}
}
static void __FreeDelayLine(AXFX_REVERBHI_EXP* fx) {
u32 ch, i;
for (ch = 0; ch < 3; ch++) {
if (fx->earlyLine[ch] != NULL) {
__AXFXFree(fx->earlyLine[ch]);
fx->earlyLine[ch] = NULL;
}
if (fx->preDelayLine[ch] != NULL) {
__AXFXFree(fx->preDelayLine[ch]);
fx->preDelayLine[ch] = NULL;
}
for (i = 0; i < 3; i++) {
if (fx->combLine[ch][i] != NULL) {
__AXFXFree(fx->combLine[ch][i]);
fx->combLine[ch][i] = NULL;
}
}
for (i = 0; i < 2; i++) {
if (fx->allpassLine[ch][i] != NULL) {
__AXFXFree(fx->allpassLine[ch][i]);
fx->allpassLine[ch][i] = NULL;
}
}
if (fx->lastAllpassLine[ch] != NULL) {
__AXFXFree(fx->lastAllpassLine[ch]);
fx->lastAllpassLine[ch] = NULL;
}
}
}
DECOMP_FORCE_LITERAL(AXFXReverbHiExp_c, -3.0f, 10.0);
static BOOL __InitParams(AXFX_REVERBHI_EXP* reverb) {
u32 ch, i;
if (reverb->earlyMode >= 8)
return FALSE;
if (reverb->preDelayTime < 0.0f || reverb->preDelayTime > reverb->preDelayTimeMax)
return FALSE;
if (reverb->fusedMode >= 6)
return FALSE;
if (reverb->fusedTime < 0.0f)
return FALSE;
if (reverb->coloration < 0.0f || reverb->coloration > 1.0f)
return FALSE;
if (reverb->damping < 0.0f || reverb->damping > 1.0f)
return FALSE;
if (reverb->crosstalk < 0.0f || reverb->crosstalk > 1.0f)
return FALSE;
if (reverb->earlyGain < 0.0f || reverb->earlyGain > 1.0f)
return FALSE;
if (reverb->fusedGain < 0.0f || reverb->fusedGain > 1.0f)
return FALSE;
if (reverb->outGain < 0.0f || reverb->outGain > 1.0f)
return FALSE;
if (reverb->sendGain < 0.0f || reverb->sendGain > 1.0f)
return FALSE;
reverb->earlyLength = __EarlySizeTable[reverb->earlyMode][2];
for (i = 0; i < 3; i++) {
reverb->earlyPos[i] = reverb->earlyLength - __EarlySizeTable[reverb->earlyMode][i];
reverb->earlyCoef[i] = __EarlyCoefTable[reverb->earlyMode][i] * reverb->earlyGain * 0.6f;
}
reverb->preDelayPos = 0;
reverb->preDelayLength = (u32)(reverb->preDelayTime * (f32)32000);
for (i = 0; i < 3; i++) {
reverb->combPos[i] = 0;
reverb->combLength[i] = __FilterSizeTable[reverb->fusedMode][i];
reverb->combCoef[i] = pow(10.0f, (-3.0f * (f32)(reverb->combLength[i]) / (f32)(reverb->fusedTime * 32000)));
}
for (i = 0; i < 2; i++) {
reverb->allpassPos[i] = 0;
reverb->allpassLength[i] = __FilterSizeTable[reverb->fusedMode][3 + i];
}
for (ch = 0; ch < 3; ch++) {
reverb->lastAllpassPos[ch] = 0;
reverb->lastAllpassLength[ch] = __FilterSizeTable[reverb->fusedMode][5 + ch];
}
reverb->allpassCoef = reverb->coloration;
reverb->lpfCoef = 1.0f - reverb->damping;
if (reverb->lpfCoef > 0.95f)
reverb->lpfCoef = 0.95f;
for (ch = 0; ch < 3; ch++) {
reverb->lastLpfOut[ch] = 0.0f;
}
return TRUE;
}

View File

@@ -0,0 +1,8 @@
#include <revolution/fa.h>
extern s32 pfstub_fclose(FAFILE* stream);
FAError FAFclose(FAFILE* stream) {
s32 error = pfstub_fclose(stream);
return (-error | error) >> 31;
}

View File

@@ -0,0 +1,8 @@
#include <revolution/fa.h>
extern s32 pfstub_finfo(FAFILE* stream, FAFileInfo* info);
FAError FAFinfo(FAFILE* stream, FAFileInfo* info) {
s32 error = pfstub_finfo(stream, info);
return (-error | error) >> 31;
}

View File

@@ -0,0 +1,2 @@
int FADiskInitializedPadding;
int FADiskInitialized;

View File

@@ -0,0 +1,10 @@
typedef int s32;
extern s32 PFDIR_closedir(void* dir);
extern s32 PFAPI_convertReturnValue(s32 err);
s32 pf2_closedir(void* dir) {
s32 err = PFDIR_closedir(dir);
err = PFAPI_convertReturnValue(err);
return err;
}

View File

@@ -0,0 +1,10 @@
#include <revolution/fa.h>
extern s32 PFVOL_errnum(void);
extern s32 PFAPI_convertError(s32 error);
FAError pf2_errnum() {
s32 error = PFVOL_errnum();
error = PFAPI_convertError(error);
return error;
}

View File

@@ -0,0 +1,10 @@
#include <revolution/fa.h>
extern s32 PFFILE_feof(FAFILE* stream);
extern s32 PFAPI_convertReturnValue4feof(s32 error);
FAError pf2_feof(FAFILE* stream) {
s32 error = PFFILE_feof(stream);
error = PFAPI_convertReturnValue4feof(error);
return error;
}

View File

@@ -0,0 +1,10 @@
#include <revolution/fa.h>
extern s32 PFFILE_ferror(FAFILE* stream);
extern s32 PFAPI_convertError(s32 error);
FAError pf2_ferror(FAFILE* stream) {
s32 error = PFFILE_ferror(stream);
error = PFAPI_convertError(error);
return error;
}

View File

@@ -0,0 +1,12 @@
#include <revolution/fa.h>
extern s32 PFFILE_flock(FAFILE* stream, s32 mode);
extern s32 PFAPI_convertReturnValue(s32 error);
FAError pf2_flock(FAFILE* stream, s32 mode) {
s32 error;
mode |= 8;
error = PFFILE_flock(stream, mode);
error = PFAPI_convertReturnValue(error);
return error;
}

View File

@@ -66,6 +66,7 @@ void __OSEVStart();
void __OSEVEnd();
#define __OSEVSize ((u32)__OSEVEnd - (u32)__OSEVStart)
void __OSEVSetNumber();
void __OSDBJumpTarget();
void __DBVECTOR();
@@ -795,7 +796,7 @@ static asm void __OSDBJump() {
#ifdef __MWERKS__
nofralloc
entry __OSDBJUMPSTART
bla OS_ADDR_DB_INTEGRATOR_HOOK
bla __OSDBJumpTarget
entry __OSDBJUMPEND
#endif // __MWERKS__
// clang-format on
@@ -831,6 +832,7 @@ entry __OSEVStart
mflr r3
stw r3, OSContext.lr(r4)
mfctr r3
entry __OSDBJumpTarget
stw r3, OSContext.ctr(r4)
mfxer r3
stw r3, OSContext.xer(r4)

View File

@@ -1,3 +1,4 @@
#define IPL_CHANNEL_TITLE_NOVTABLE
#include <revolution/types.h>
#define vu8 u8
#include "system/iplChannelManager.h"
@@ -19,113 +20,196 @@
#include <private/os.h>
#include <private/wpad.h>
#pragma dont_instantiate ipl::math::HermiteIntp<float>
#undef IPL_CHANNEL_TITLE_NOVTABLE
// :)
#define PREV_LOADED_INDEX (1 - mLoadedIndex)
namespace ipl {
namespace scene {
ESTicketView ChannelTitle::msTicketView;
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[];
// clang-format off
const char* ChannelTitle::mscBtnNames[BTN_MAX] = {
"B_BtnA",
"B_BtnB",
};
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";
const char* ChannelTitle::mscChangeName[] = {
"Change"
};
const char* ChannelTitle::mscAnimGroups[ANIM_GRP_MAX+1] = {
"G_FocusBtnA",
"G_FocusBtnB",
"G_SelectBtnA",
"G_SelectBtnB",
"G_OnOffBtnA",
"G_OnOffBtnB",
"G_ChangeTextA",
"G_ChangeTextB",
NULL // ?
};
const char* ChannelTitle::mscAnimNames[ANIM_MAX] = {
"my_ChTop_a_FocusBtnA_off.brlan",
"my_ChTop_a_FocusBtn_on.brlan",
"my_ChTop_a_SelectBtn_Ac.brlan",
"my_ChTop_a_OffBtn.brlan",
"my_ChTop_a_OnBtn.brlan",
"my_ChTop_a_ChangeTextOut.brlan",
"my_ChTop_a_ChangeTextIn.brlan",
"my_ChTop_a_ChangeIn.brlan",
"my_ChTop_a_ChangeRoop.brlan",
"my_ChTop_a_ChangeOut.brlan"
};
const char* ChannelTitle::mscBannerAnims[BANNER_ANIM_MAX] = {
"banner.brlan",
"banner_Start.brlan",
"banner_Loop.brlan"
};
const char* ChannelTitle::mscDiskGroups[DISK_ANIM_GRP_MAX] = {
"G_Comment0",
"G_Wii",
"G_GC",
// Not including the unused "G_DVD"
"G_DiskIn",
const char* scAnimGroups[8+1] = {
lbl_8164E768,
lbl_8164E774,
lbl_8164E780,
lbl_8164E78D,
lbl_8164E79A,
lbl_8164E7A6,
lbl_8164E7B2,
lbl_8164E7C0,
NULL
};
const char* ChannelTitle::mscDiskAnimNames[DISK_ANIM_MAX] = {
"my_DiskCh_a_Start.brlan",
"my_DiskCh_a_DiskStart.brlan",
"my_DiskCh_a_DiskLoop.brlan",
"my_DiskCh_a_DiskEnd.brlan",
"my_DiskCh_a_DiskLost.brlan",
"my_DiskCh_a_DiskIn.brlan",
"my_DiskCh_a_DiskEject.brlan",
"my_DiskCh_a_Unknown.brlan",
"my_DiskCh_a_UnknownLoop.brlan",
"my_DiskCh_a_UnknwnEject.brlan"
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";
const char* scAnimNames[10] = {
lbl_8164E7F4,
lbl_8164E813,
lbl_8164E830,
lbl_8164E84E,
lbl_8164E866,
lbl_8164E87D,
lbl_8164E89C,
lbl_8164E8BA,
lbl_8164E8D4,
lbl_8164E8F0
};
const char* ChannelTitle::mscDiskLytFile[] = {
"my_DiskCh_a.brlyt"
extern "C" char lbl_8164E934[] = "banner.brlan";
extern "C" char lbl_8164E941[] = "banner_Start.brlan";
extern "C" char lbl_8164E954[] = "banner_Loop.brlan";
const char* scBannerAnims[3] = {
lbl_8164E934,
lbl_8164E941,
lbl_8164E954
};
const char* ChannelTitle::mscGCAnimGroups[] = {
"G_Back"
extern "C" char lbl_8164E974[] = "G_Comment0";
extern "C" char lbl_8164E97F[] = "G_DiskIn";
const char* scDiskGroups[5] = {
lbl_8164E974,
lbl_81696A34,
lbl_81696A3A,
lbl_8164E97F,
NULL
};
const char* ChannelTitle::mscGCAnimNames[] = {
"my_GCTop_a_BackLoop.brlan"
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";
const char* scDiskAnimNames[10] = {
lbl_8164E99C,
lbl_8164E9B4,
lbl_8164E9D0,
lbl_8164E9EB,
lbl_8164EA05,
lbl_8164EA20,
lbl_8164EA39,
lbl_8164EA55,
lbl_8164EA6F,
lbl_8164EA8D
};
static const char* scWidePanes[3][4] = {
extern "C" char lbl_8164EAD4[] = "my_DiskCh_a.brlyt";
extern "C" char lbl_8164EAE6[] = "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 lbl_81696A28[] = "Change";
extern "C" const char* lbl_81696A30[] = {
lbl_81696A28,
};
extern "C" char lbl_81696A34[] = "G_Wii";
extern "C" char lbl_81696A3A[] = "G_GC";
const char* scLayoutNames[] = {
lbl_8164EAD4,
};
extern "C" char lbl_81696A44[] = "G_Back";
const char* scGCAnimGroups[] = {
lbl_81696A44,
};
const char* scGCAnimNames[] = {
lbl_8164EAE6,
};
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,
};
#pragma pop
const char* scWidePanes[3][4] = {
{
"Fre_a",
"Fre_d",
"Fre_i",
"Fre_l",
lbl_81696A54,
lbl_81696A5A,
lbl_81696A60,
lbl_81696A66,
}, {
"Fre_e",
"Fre_f",
"Fre_g",
"Fre_h",
lbl_81696A6C,
lbl_81696A72,
lbl_81696A78,
lbl_81696A7E,
}, {
"Fre_b",
"Fre_c",
"Fre_j",
"Fre_k",
lbl_81696A84,
lbl_81696A8A,
lbl_81696A90,
lbl_81696A96,
}
};
const char* ChannelTitle::mscButtonTextName[BTN_MAX] = {
"T_BtnA",
"T_BtnB"
};
static const f32 cfChanThumbOfss[2][2] = {
{
64.0f,
@@ -137,9 +221,6 @@ namespace ipl {
}
};
// Titles:
// Tiger Woods PGA Tour 08
// Tiger Woods PGA Tour 07
static const ESTitleId scSoundSizeSkipTitles[] = {
'RT8\0',
'RT7\0'
@@ -260,12 +341,12 @@ namespace ipl {
}
}
setMessage(mpLayout->FindPaneByName(mscButtonTextName[0]), MESG_CMN_WII_MENU);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[0]), MESG_CMN_WII_MENU);
if (System::getChannelManager()->checkNeedUpdate(mChanPage, mChanIndex)) {
setMessage(mpLayout->FindPaneByName(mscButtonTextName[BTN_B]), MESG_CHAN_TTL_BTN_UPDATE);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_TTL_BTN_UPDATE);
} else {
setMessage(mpLayout->FindPaneByName(mscButtonTextName[BTN_B]), MESG_CMN_START);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CMN_START);
}
if (isEnableToExecute(mChanPage, mChanIndex)) {
@@ -273,43 +354,43 @@ namespace ipl {
}
mpGrpAnims[ANIM_GRP_FOCUS_BTN_A][ANIM_BTM_FOCUS_IN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_BTM_FOCUS_IN], mscAnimGroups[ANIM_GRP_FOCUS_BTN_A], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_BTM_FOCUS_IN], scAnimGroups[ANIM_GRP_FOCUS_BTN_A], false, false);
mpGrpAnims[ANIM_GRP_FOCUS_BTN_A][ANIM_BTM_FOCUS_OUT] =
mpLayout->bindToGroup(mscAnimNames[ANIM_BTM_FOCUS_OUT], mscAnimGroups[ANIM_GRP_FOCUS_BTN_A], false);
mpLayout->bindToGroup(scAnimNames[ANIM_BTM_FOCUS_OUT], scAnimGroups[ANIM_GRP_FOCUS_BTN_A], false);
if (mpChanSelScn->mStartType == ChannelSelect::START_FROM_CHJUMP && isEnableToExecute(mChanPage, mChanIndex)) {
mpGrpAnims[ANIM_GRP_FOCUS_BTN_B][ANIM_BTM_FOCUS_IN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_BTM_FOCUS_IN], mscAnimGroups[ANIM_GRP_FOCUS_BTN_B], false);
mpLayout->bindToGroup(scAnimNames[ANIM_BTM_FOCUS_IN], scAnimGroups[ANIM_GRP_FOCUS_BTN_B], false);
mpGrpAnims[ANIM_GRP_FOCUS_BTN_B][ANIM_BTM_FOCUS_OUT] =
mpLayout->bindToGroup(mscAnimNames[ANIM_BTM_FOCUS_OUT], mscAnimGroups[ANIM_GRP_FOCUS_BTN_B], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_BTM_FOCUS_OUT], scAnimGroups[ANIM_GRP_FOCUS_BTN_B], false, false);
} else {
mpGrpAnims[ANIM_GRP_FOCUS_BTN_B][ANIM_BTM_FOCUS_IN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_BTM_FOCUS_IN], mscAnimGroups[ANIM_GRP_FOCUS_BTN_B], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_BTM_FOCUS_IN], scAnimGroups[ANIM_GRP_FOCUS_BTN_B], false, false);
mpGrpAnims[ANIM_GRP_FOCUS_BTN_B][ANIM_BTM_FOCUS_OUT] = mpLayout->bindToGroup(
mscAnimNames[ANIM_BTM_FOCUS_OUT], mscAnimGroups[ANIM_GRP_FOCUS_BTN_B], false, isEnableToExecute(mChanPage, mChanIndex));
scAnimNames[ANIM_BTM_FOCUS_OUT], scAnimGroups[ANIM_GRP_FOCUS_BTN_B], false, isEnableToExecute(mChanPage, mChanIndex));
}
mpGrpAnims[ANIM_GRP_SELECT_BTN_A][ANIM_SELECT_BTN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_SELECT_BTN], mscAnimGroups[ANIM_GRP_SELECT_BTN_A], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_SELECT_BTN], scAnimGroups[ANIM_GRP_SELECT_BTN_A], false, false);
mpGrpAnims[ANIM_GRP_SELECT_BTN_B][ANIM_SELECT_BTN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_SELECT_BTN], mscAnimGroups[ANIM_GRP_SELECT_BTN_B], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_SELECT_BTN], scAnimGroups[ANIM_GRP_SELECT_BTN_B], false, false);
mpGrpAnims[ANIM_GRP_ONOFF_BTN_A][ANIM_OFF_BTN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_OFF_BTN], mscAnimGroups[ANIM_GRP_ONOFF_BTN_A], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_OFF_BTN], scAnimGroups[ANIM_GRP_ONOFF_BTN_A], false, false);
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_OFF_BTN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_OFF_BTN], mscAnimGroups[ANIM_GRP_ONOFF_BTN_B], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_OFF_BTN], scAnimGroups[ANIM_GRP_ONOFF_BTN_B], false, false);
mpGrpAnims[ANIM_GRP_ONOFF_BTN_A][ANIM_ON_BTN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_ON_BTN], mscAnimGroups[ANIM_GRP_ONOFF_BTN_A], false, false);
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_ON_BTN] = mpLayout->bindToGroup(mscAnimNames[ANIM_ON_BTN], mscAnimGroups[ANIM_GRP_ONOFF_BTN_B],
mpLayout->bindToGroup(scAnimNames[ANIM_ON_BTN], scAnimGroups[ANIM_GRP_ONOFF_BTN_A], false, false);
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_ON_BTN] = mpLayout->bindToGroup(scAnimNames[ANIM_ON_BTN], scAnimGroups[ANIM_GRP_ONOFF_BTN_B],
false, !isEnableToExecute(mChanPage, mChanIndex));
for (int i = ANIM_GRP_CHANGE_BTN_A; i <= ANIM_GRP_CHANGE_BTN_B; i++) {
for (int j = ANIM_CHANGE_TEXT_IN; j <= ANIM_CHANGE_TEXT_OUT; j++) {
mpGrpAnims[i][j] = mpLayout->bindToGroup(mscAnimNames[j], mscAnimGroups[i], false, false);
mpGrpAnims[i][j] = mpLayout->bindToGroup(scAnimNames[j], scAnimGroups[i], false, false);
}
}
for (int i = ANIM_CHANGE_IN; i <= ANIM_CHANGE_OUT; i++) {
mpChangeAnims[i] = mpLayout->bind(mscAnimNames[i], mscChangeName[0], false, false);
mpChangeAnims[i] = mpLayout->bind(scAnimNames[i], lbl_81696A30[0], false, false);
}
mpLayout->finishBinding();
@@ -319,8 +400,8 @@ namespace ipl {
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
mpGui->setAllComponentTriggerTarget(false);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(mscBtnNames[BTN_A]))->setTriggerTarget(true);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(mscBtnNames[BTN_B]))->setTriggerTarget(true);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_A]))->setTriggerTarget(true);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(lbl_81696A20[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");
@@ -336,7 +417,7 @@ namespace ipl {
updateLockedMsg(LOCKED_MSG_AUTO);
dispTimeLimitWindow();
mpDiskBnrLayout = new layout::Object(getSceneHeap(), mpDiskBnrFile, "arc", mscDiskLytFile[0]);
mpDiskBnrLayout = new layout::Object(getSceneHeap(), mpDiskBnrFile, "arc", scLayoutNames[0]);
bindDiskAnms();
@@ -773,7 +854,7 @@ namespace ipl {
nw4r::ut::Rect drawRect(mDispTrans.x - mpChanSelScn->mChanThumbOff_X, mDispTrans.y + mpChanSelScn->mChanThumbOff_Y,
mDispTrans.x + mpChanSelScn->mChanThumbOff_X, mDispTrans.y - mpChanSelScn->mChanThumbOff_Y);
GXColor textureColor = {255, 255, 255, 255};
GXColor textureColor = {255, 255, 255, 0};
textureColor.a = (u8)mpZoomAnim->get();
utility::Graphics::drawTexture(drawRect, mpCapture->getGXTex(), textureColor, 1);
@@ -952,7 +1033,7 @@ namespace ipl {
} else if (mpGCBannerFile != NULL && lytFile == mpGCBannerFile) {
if (mpGCBannerLyt == NULL) {
mpGCBannerLyt = layout::Object::create(System::getMem2App(), 0x40000, lytFile, "arc", "my_GCTop_a.brlyt");
mpGCBannerAnim = mpGCBannerLyt->bindToGroup(mscGCAnimNames[0], mscGCAnimGroups[0], false);
mpGCBannerAnim = mpGCBannerLyt->bindToGroup(scGCAnimNames[0], scGCAnimGroups[0], false);
mpGCBannerLyt->finishBinding();
mpGCBannerLyt->adjustHeap();
}
@@ -1106,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(mscButtonTextName[BTN_B]), MESG_CHAN_SEL_UPDATE_BTN, false);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_SEL_UPDATE_BTN, false);
} else {
setMessage(mpLayout->FindPaneByName(mscButtonTextName[BTN_B]), MESG_CHAN_SEL_START_BTN, false);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[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();
@@ -1771,18 +1852,18 @@ namespace ipl {
void ChannelTitle::bindChanBaseAnms() {
for (int i = 0; i < BANNER_ANIM_MAX; i++) {
if (mpChanBannerLyt->searchFile(mscBannerAnims[i])) {
if (mpChanBannerLyt->searchFile(scBannerAnims[i])) {
if (i == 0) {
mpChanBannerAnims[i] = mpChanBannerLyt->bind(mscBannerAnims[i]);
mpChanBannerAnims[i] = mpChanBannerLyt->bind(scBannerAnims[i]);
mpChanBannerAnims[i]->setAnmType(ANIM_TYPE_LOOP);
} else if (i == 1) {
mpChanBannerAnims[i] = mpChanBannerLyt->bind(mscBannerAnims[i]);
mpChanBannerAnims[i] = mpChanBannerLyt->bind(scBannerAnims[i]);
mpChanBannerAnims[i]->setAnmType(ANIM_TYPE_FORWARD);
} else {
if (mpChanBannerAnims[BANNER_ANIM_START] == NULL) {
mpChanBannerAnims[i] = mpChanBannerLyt->bind(mscBannerAnims[i], true);
mpChanBannerAnims[i] = mpChanBannerLyt->bind(scBannerAnims[i], true);
} else {
mpChanBannerAnims[i] = mpChanBannerLyt->bind(mscBannerAnims[i], false);
mpChanBannerAnims[i] = mpChanBannerLyt->bind(scBannerAnims[i], false);
}
mpChanBannerAnims[i]->setAnmType(ANIM_TYPE_LOOP);
}
@@ -1795,9 +1876,9 @@ namespace ipl {
void ChannelTitle::bindDiskAnms() {
memset(mpDiskBnrAnims, 0, sizeof(mpDiskBnrAnims));
mpDiskBnrAnims[DISK_ANIM_GRP_ALL][DISK_ANIM_START] = mpDiskBnrLayout->bind(mscDiskAnimNames[DISK_ANIM_START]);
mpDiskBnrAnims[DISK_ANIM_GRP_ALL][DISK_ANIM_START] = mpDiskBnrLayout->bind(scDiskAnimNames[DISK_ANIM_START]);
mpDiskBnrAnims[DISK_ANIM_GRP_COMMENT][DISK_ANIM_START] =
mpDiskBnrLayout->bindToGroup(mscDiskAnimNames[DISK_ANIM_START], mscDiskGroups[DISK_ANIM_GRP_COMMENT], false, false);
mpDiskBnrLayout->bindToGroup(scDiskAnimNames[DISK_ANIM_START], scDiskGroups[DISK_ANIM_GRP_COMMENT], false, false);
for (int i = DISK_ANIM_GRP_COMMENT; i <= DISK_ANIM_GRP_GC; i++) {
for (int j = DISK_ANIM_DISK_START; j <= DISK_ANIM_DISK_IN; j++) {
@@ -1805,16 +1886,16 @@ namespace ipl {
break;
}
mpDiskBnrAnims[i][j] = mpDiskBnrLayout->bindToGroup(mscDiskAnimNames[j], mscDiskGroups[i], false, false);
mpDiskBnrAnims[i][j] = mpDiskBnrLayout->bindToGroup(scDiskAnimNames[j], scDiskGroups[i], false, false);
}
}
for (int i = DISK_ANIM_DISK_EJECT; i <= DISK_ANIM_UNKNOWN_EJECT; i++) {
mpDiskBnrAnims[DISK_ANIM_GRP_ALL][i] = mpDiskBnrLayout->bind(mscDiskAnimNames[i], false);
mpDiskBnrAnims[DISK_ANIM_GRP_ALL][i] = mpDiskBnrLayout->bind(scDiskAnimNames[i], false);
}
mpDiskBnrAnims[DISK_ANIM_GRP_DISK_IN][DISK_ANIM_DISK_IN] =
mpDiskBnrLayout->bindToGroup(mscDiskAnimNames[DISK_ANIM_DISK_IN], mscDiskGroups[DISK_ANIM_GRP_DISK_IN], false, false);
mpDiskBnrLayout->bindToGroup(scDiskAnimNames[DISK_ANIM_DISK_IN], scDiskGroups[DISK_ANIM_GRP_DISK_IN], false, false);
}
void ChannelTitle::updateDiskState(int page, int index) {
@@ -1847,8 +1928,9 @@ namespace ipl {
bool noDisk = BS2State == bs2::IPL_STATE_NO_DISK;
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(mscDiskGroups[DISK_ANIM_GRP_COMMENT]);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter();
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(scDiskGroups[DISK_ANIM_GRP_COMMENT]);
nw4r::lyt::Group*& groupAlias = group;
for (nw4r::lyt::PaneLinkList::Iterator it = groupAlias->GetPaneList().GetBeginIter(); it != groupAlias->GetPaneList().GetEndIter();
it++) {
it->mTarget->SetVisible(noDisk);
}
@@ -1867,9 +1949,10 @@ namespace ipl {
!mpDiskBnrAnims[DISK_ANIM_GRP_COMMENT][DISK_ANIM_START]->isPlaying()) {
mDiskState = DISK_STATE_IDLE;
if (BS2State == bs2::IPL_STATE_NO_DISK) {
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(mscDiskGroups[DISK_ANIM_GRP_COMMENT]);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter();
it != group->GetPaneList().GetEndIter(); it++) {
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(scDiskGroups[DISK_ANIM_GRP_COMMENT]);
nw4r::lyt::Group*& groupAlias = group;
for (nw4r::lyt::PaneLinkList::Iterator it = groupAlias->GetPaneList().GetBeginIter();
it != groupAlias->GetPaneList().GetEndIter(); it++) {
it->mTarget->SetVisible(true);
}
}
@@ -1927,8 +2010,9 @@ namespace ipl {
case DISK_STATE_INTERRUPT_EJECT: {
if (!mpDiskBnrAnims[DISK_ANIM_GRP_WII][DISK_ANIM_DISK_END]->isPlaying() &&
!mpDiskBnrAnims[DISK_ANIM_GRP_GC][DISK_ANIM_DISK_END]->isPlaying()) {
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(mscDiskGroups[DISK_ANIM_GRP_COMMENT]);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter();
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(scDiskGroups[DISK_ANIM_GRP_COMMENT]);
nw4r::lyt::Group*& groupAlias = group;
for (nw4r::lyt::PaneLinkList::Iterator it = groupAlias->GetPaneList().GetBeginIter(); it != groupAlias->GetPaneList().GetEndIter();
it++) {
it->mTarget->SetVisible(true);
}
@@ -2039,8 +2123,9 @@ namespace ipl {
mpDiskBnrAnims[DISK_ANIM_GRP_ALL][DISK_ANIM_UNKNOWN_LOOP]->stop();
mpDiskBnrAnims[DISK_ANIM_GRP_ALL][DISK_ANIM_UNKNOWN_EJECT]->play();
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(mscDiskGroups[DISK_ANIM_GRP_COMMENT]);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter();
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(scDiskGroups[DISK_ANIM_GRP_COMMENT]);
nw4r::lyt::Group*& groupAlias = group;
for (nw4r::lyt::PaneLinkList::Iterator it = groupAlias->GetPaneList().GetBeginIter(); it != groupAlias->GetPaneList().GetEndIter();
it++) {
it->mTarget->SetVisible(true);
}
@@ -2379,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(mscBtnNames[BTN_B]));
mpGui->initPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_B]));
mbHovered[BTN_B] = FALSE;
}
unk_0x8C = 1;
@@ -2417,11 +2502,9 @@ namespace ipl {
}
void ChannelTitle::setMessage(nw4r::lyt::Pane* targetPane, u32 msgId, bool alloc) {
static const int LENGTH = 255;
wchar_t msg[LENGTH + 1];
wcsncpy(msg, System::getMessage(msgId), LENGTH + 1);
msg[LENGTH] = 0;
wchar_t msg[255 + 1];
wcsncpy(msg, System::getMessage(msgId), 255 + 1);
msg[255] = 0;
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(targetPane);
if (alloc) {
@@ -2602,12 +2685,12 @@ namespace ipl {
ESTitleId titleId = System::getChannelManager()->getTitleID(chanTtl->mChanPage, chanTtl->mChanIndex);
int ticketIdx = System::getChannelManager()->getChannel(chanTtl->mChanPage, chanTtl->mChanIndex).ticketIdx;
ESError err = utility::ESMisc::GetTicketView(System::getMem2App(), titleId, &msTicketView, ticketIdx);
ESError err = utility::ESMisc::GetTicketView(System::getMem2App(), titleId, &msTicketView.view, ticketIdx);
if (err != ES_ERR_OK) {
IPLErrorLogAndDisplay(MESG_ERR_FILE, "ES", err, 4789);
}
if (chanTtl->isTimeLimitedTicket(&msTicketView, &chanTtl->mTimeLimitRemain)) {
if (chanTtl->isTimeLimitedTicket(&msTicketView.view, &chanTtl->mTimeLimitRemain)) {
chanTtl->mLimitType = LIMIT_TYPE_TIME;
} else {
chanTtl->mLimitType = LIMIT_TYPE_COUNT;
@@ -2739,12 +2822,12 @@ namespace ipl {
break;
}
if (con->downTrg(controller::BTN_INTERACT)) {
if (strcmp(paneName, ChannelTitle::mscBtnNames[ChannelTitle::BTN_A]) == 0) {
if (strcmp(paneName, lbl_81696A20[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, ChannelTitle::mscBtnNames[ChannelTitle::BTN_B]) == 0) {
} else if (strcmp(paneName, lbl_81696A20[ChannelTitle::BTN_B]) == 0) {
if (mpInstance->unk_0x8C != 2) {
snd::getSystem()->startSE("WIPL_SE_GRAY_BUTTON");
} else {
@@ -2758,7 +2841,7 @@ namespace ipl {
}
case ::gui::EventHandler::ON_POINT: {
for (int i = 0; i < ChannelTitle::BTN_MAX; i++) {
if (strcmp(paneName, ChannelTitle::mscBtnNames[i]) == 0) {
if (strcmp(paneName, lbl_81696A20[i]) == 0) {
if (i == 0 || mpInstance->unk_0x8C > 0) {
mpInstance->mbHovered[i]++;
if (mpInstance->mbHovered[i] <= TRUE) {
@@ -2774,7 +2857,7 @@ namespace ipl {
}
case ::gui::EventHandler::ON_LEFT: {
for (int i = 0; i < ChannelTitle::BTN_MAX; i++) {
if (strcmp(paneName, ChannelTitle::mscBtnNames[i]) == 0) {
if (strcmp(paneName, lbl_81696A20[i]) == 0) {
if (i == 0 || mpInstance->unk_0x8C > 0) {
mpInstance->mbHovered[i]--;
if (mpInstance->mbHovered[i] <= FALSE) {