From 1c42679f0e59c94de4679dcf3d99b1e49e8b24be Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:18:15 -0500 Subject: [PATCH] cleanup(SDChannelObj): name address-suffixed C helpers Rename iplSDChannelObj_813E* helpers to semantic names (setHeaps, createBaseLayout, getLocalizedName, etc.) across the unit, callers, header, and symbols.txt. Byte-identical: ok + sha1 26116613f624061ba99c8d1a299aaa6efa85670d; unit still ~90% code / ~99.99% fuzzy. --- config/43U/symbols.txt | 70 +++--- .../sdChannelSelect/iplSDChannelSelect.h | 30 +-- src/scene/sdChannelSelect/iplSDChannelObj.cpp | 232 +++++++++--------- .../sdChannelSelect/iplSDChannelSelect.cpp | 64 ++--- .../sdChannelTitle/iplSDChannelTitle.cpp | 22 +- 5 files changed, 209 insertions(+), 209 deletions(-) diff --git a/config/43U/symbols.txt b/config/43U/symbols.txt index f3e8fb72..d3725c67 100644 --- a/config/43U/symbols.txt +++ b/config/43U/symbols.txt @@ -4685,42 +4685,42 @@ copyFrom__Q33ipl5scene22SDChannelSelectCommandFRCQ33ipl5scene22SDChannelSelectCo @20@__dt__Q33ipl5scene15SDChannelSelectFv = .text:0x813E2F24; // type:function size:0x8 __ct__Q33ipl5scene12SDChannelObjFPQ23EGG4Heapii = .text:0x813E2F2C; // type:function size:0x130 __dt__Q33ipl5scene12SDChannelObjFv = .text:0x813E305C; // type:function size:0xA8 -iplSDChannelObj_813E3104 = .text:0x813E3104; // type:function size:0x18 -iplSDChannelObj_813E311C = .text:0x813E311C; // type:function size:0xC -iplSDChannelObj_813E3128 = .text:0x813E3128; // type:function size:0x50 -iplSDChannelObj_813E3178 = .text:0x813E3178; // type:function size:0x8 -iplSDChannelObj_813E3180 = .text:0x813E3180; // type:function size:0xAC -iplSDChannelObj_813E322C = .text:0x813E322C; // type:function size:0x9C -iplSDChannelObj_813E32C8 = .text:0x813E32C8; // type:function size:0x3C -iplSDChannelObj_813E3304 = .text:0x813E3304; // type:function size:0x8 -iplSDChannelObj_813E330C = .text:0x813E330C; // type:function size:0x14 +iplSDChannelObj_activateIfIdle = .text:0x813E3104; // type:function size:0x18 +iplSDChannelObj_setHeaps = .text:0x813E311C; // type:function size:0xC +iplSDChannelObj_getOrAllocThumbnailData = .text:0x813E3128; // type:function size:0x50 +iplSDChannelObj_setPane = .text:0x813E3178; // type:function size:0x8 +iplSDChannelObj_setLayoutFile = .text:0x813E3180; // type:function size:0xAC +iplSDChannelObj_calc = .text:0x813E322C; // type:function size:0x9C +iplSDChannelObj_drawBase = .text:0x813E32C8; // type:function size:0x3C +iplSDChannelObj_drawPage = .text:0x813E3304; // type:function size:0x8 +iplSDChannelObj_drawDialog = .text:0x813E330C; // type:function size:0x14 getTranslate__Q33ipl5scene12SDChannelObjCFv = .text:0x813E3320; // type:function size:0x10 -iplSDChannelObj_813E3330 = .text:0x813E3330; // type:function size:0x24 -iplSDChannelObj_813E3354 = .text:0x813E3354; // type:function size:0x98 -iplSDChannelObj_813E33EC = .text:0x813E33EC; // type:function size:0x94 -iplSDChannelObj_813E3480 = .text:0x813E3480; // type:function size:0x60 -iplSDChannelObj_813E34E0 = .text:0x813E34E0; // type:function size:0x8 -iplSDChannelObj_813E34E8 = .text:0x813E34E8; // type:function size:0x4C -iplSDChannelObj_813E3534 = .text:0x813E3534; // type:function size:0x4C -iplSDChannelObj_813E3580 = .text:0x813E3580; // type:function size:0x2D8 -iplSDChannelObj_813E3858 = .text:0x813E3858; // type:function size:0xC8 -iplSDChannelObj_813E3920 = .text:0x813E3920; // type:function size:0x164 -iplSDChannelObj_813E3A84 = .text:0x813E3A84; // type:function size:0x98 -iplSDChannelObj_813E3B1C = .text:0x813E3B1C; // type:function size:0x84 -iplSDChannelObj_813E3BA0 = .text:0x813E3BA0; // type:function size:0xB8 -iplSDChannelObj_813E3C58 = .text:0x813E3C58; // type:function size:0x44 -iplSDChannelObj_813E3C9C = .text:0x813E3C9C; // type:function size:0x19C -iplSDChannelObj_813E3E38 = .text:0x813E3E38; // type:function size:0xF0 -iplSDChannelObj_813E3F28 = .text:0x813E3F28; // type:function size:0x4C -iplSDChannelObj_813E3F74 = .text:0x813E3F74; // type:function size:0xEC -iplSDChannelObj_813E4060 = .text:0x813E4060; // type:function size:0xDC -iplSDChannelObj_813E413C = .text:0x813E413C; // type:function size:0x2D4 -iplSDChannelObj_813E4410 = .text:0x813E4410; // type:function size:0x148 -iplSDChannelObj_813E4558 = .text:0x813E4558; // type:function size:0x1AC -iplSDChannelObj_813E4704 = .text:0x813E4704; // type:function size:0x118 -iplSDChannelObj_813E481C = .text:0x813E481C; // type:function size:0x18C -iplSDChannelObj_813E49A8 = .text:0x813E49A8; // type:function size:0xAC -iplSDChannelObj_813E4A54 = .text:0x813E4A54; // type:function size:0x168 +iplSDChannelObj_hasAppMeta = .text:0x813E3330; // type:function size:0x24 +iplSDChannelObj_startAppear = .text:0x813E3354; // type:function size:0x98 +iplSDChannelObj_startDisappear = .text:0x813E33EC; // type:function size:0x94 +iplSDChannelObj_setSelected = .text:0x813E3480; // type:function size:0x60 +iplSDChannelObj_playPageHide = .text:0x813E34E0; // type:function size:0x8 +iplSDChannelObj_resetPageAnim = .text:0x813E34E8; // type:function size:0x4C +iplSDChannelObj_resetDialogAnim = .text:0x813E3534; // type:function size:0x4C +iplSDChannelObj_applyLanguageGroups = .text:0x813E3580; // type:function size:0x2D8 +iplSDChannelObj_createBaseLayout = .text:0x813E3858; // type:function size:0xC8 +iplSDChannelObj_createIconLayout = .text:0x813E3920; // type:function size:0x164 +iplSDChannelObj_createMenuLayout = .text:0x813E3A84; // type:function size:0x98 +iplSDChannelObj_syncLayoutsToPane = .text:0x813E3B1C; // type:function size:0x84 +iplSDChannelObj_createPageLayout = .text:0x813E3BA0; // type:function size:0xB8 +iplSDChannelObj_setPageTranslate = .text:0x813E3C58; // type:function size:0x44 +iplSDChannelObj_setPageAnim = .text:0x813E3C9C; // type:function size:0x19C +iplSDChannelObj_updatePageAnim = .text:0x813E3E38; // type:function size:0xF0 +iplSDChannelObj_playPageAnimator = .text:0x813E3F28; // type:function size:0x4C +iplSDChannelObj_createDialogLayout = .text:0x813E3F74; // type:function size:0xEC +iplSDChannelObj_getLocalizedName = .text:0x813E4060; // type:function size:0xDC +iplSDChannelObj_setBalloonText = .text:0x813E413C; // type:function size:0x2D4 +iplSDChannelObj_positionDialog = .text:0x813E4410; // type:function size:0x148 +iplSDChannelObj_setDialogAnim = .text:0x813E4558; // type:function size:0x1AC +iplSDChannelObj_updateDialogAnim = .text:0x813E4704; // type:function size:0x118 +iplSDChannelObj_findNewMessageGroup = .text:0x813E481C; // type:function size:0x18C +iplSDChannelObj_updateNewMessage = .text:0x813E49A8; // type:function size:0xAC +iplSDChannelObj_checkNewMessage = .text:0x813E4A54; // type:function size:0x168 __ct__Q33ipl5scene14SDChannelTitleFPQ23EGG4HeapPQ33ipl5scene15SDChannelSelect = .text:0x813E4BBC; // type:function size:0x1F4 __dt__Q33ipl5scene14SDChannelTitleFv = .text:0x813E4DB0; // type:function size:0x70 prepare__Q33ipl5scene14SDChannelTitleFv = .text:0x813E4E20; // type:function size:0x4C diff --git a/include/scene/sdChannelSelect/iplSDChannelSelect.h b/include/scene/sdChannelSelect/iplSDChannelSelect.h index 15b04ac3..2e566cf3 100644 --- a/include/scene/sdChannelSelect/iplSDChannelSelect.h +++ b/include/scene/sdChannelSelect/iplSDChannelSelect.h @@ -81,22 +81,22 @@ namespace ipl { void* mpThumbnailData; NandSDWorker::SDAppMetaEntry mAppMeta; }; - extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel); - extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap, + extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel); + extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap, EGG::ExpHeap* secondHeap); - extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel); - extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel); - extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel); - extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane); - extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile); - extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel); - extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel); - extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int state); - extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int state); - extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool selected); - extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int enabled); - extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel); - extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel); + extern "C" void iplSDChannelObj_calc(SDChannelObj* channel); + extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel); + extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel); + extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane); + extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile); + extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel); + extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel); + extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int state); + extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int state); + extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool selected); + extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int enabled); + extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel); + extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel); union SDChannelSelectCommandArguments { u32 values[3]; diff --git a/src/scene/sdChannelSelect/iplSDChannelObj.cpp b/src/scene/sdChannelSelect/iplSDChannelObj.cpp index 30000fe0..66f00a27 100644 --- a/src/scene/sdChannelSelect/iplSDChannelObj.cpp +++ b/src/scene/sdChannelSelect/iplSDChannelObj.cpp @@ -49,42 +49,42 @@ namespace ipl { }; static const f32 scThumbnailOffsets[][2] = {{64.0f, 48.0f}, {85.0f, 48.0f}}; - extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel) NO_INLINE; - extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap, + extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel) NO_INLINE; + extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap, EGG::ExpHeap* secondHeap) NO_INLINE; - extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel) NO_INLINE; - extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane) NO_INLINE; - extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile) NO_INLINE; - extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel) NO_INLINE; - extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel) NO_INLINE; - extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel) NO_INLINE; - extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel) NO_INLINE; - extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel) NO_INLINE; - extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int request) NO_INLINE; - extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int request) NO_INLINE; - extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool request) NO_INLINE; - extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel) NO_INLINE; - extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int request) NO_INLINE; - extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, bool request) NO_INLINE; - extern "C" void iplSDChannelObj_813E3580(const layout::Object* layout) NO_INLINE; - extern "C" void iplSDChannelObj_813E3858(SDChannelObj* channel) NO_INLINE; - extern "C" f32 iplSDChannelObj_813E3920(SDChannelObj* channel) NO_INLINE; - extern "C" f32 iplSDChannelObj_813E3A84(SDChannelObj* channel) NO_INLINE; - extern "C" void iplSDChannelObj_813E3B1C(SDChannelObj* channel) NO_INLINE; - extern "C" void iplSDChannelObj_813E3BA0(SDChannelObj* channel) NO_INLINE; - extern "C" void iplSDChannelObj_813E3C58(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE; - extern "C" void iplSDChannelObj_813E3C9C(SDChannelObj* channel, int request) NO_INLINE; - extern "C" void iplSDChannelObj_813E3E38(SDChannelObj* channel) NO_INLINE; - extern "C" void iplSDChannelObj_813E3F28(SDChannelObj* channel, int request) NO_INLINE; - extern "C" void iplSDChannelObj_813E3F74(SDChannelObj* channel) NO_INLINE; - extern "C" const wchar_t* iplSDChannelObj_813E4060(SDChannelObj* channel, int index) NO_INLINE; - extern "C" void iplSDChannelObj_813E413C(SDChannelObj* channel, const wchar_t* text) NO_INLINE; - extern "C" void iplSDChannelObj_813E4410(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE; - extern "C" void iplSDChannelObj_813E4558(SDChannelObj* channel, int request) NO_INLINE; - extern "C" void iplSDChannelObj_813E4704(SDChannelObj* channel) NO_INLINE; - extern "C" void iplSDChannelObj_813E481C(SDChannelObj* channel, layout::Object* layout) NO_INLINE; - extern "C" void iplSDChannelObj_813E49A8(SDChannelObj* channel) NO_INLINE; - extern "C" BOOL iplSDChannelObj_813E4A54(SDChannelObj* channel) NO_INLINE; + extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel) NO_INLINE; + extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane) NO_INLINE; + extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile) NO_INLINE; + extern "C" void iplSDChannelObj_calc(SDChannelObj* channel) NO_INLINE; + extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel) NO_INLINE; + extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel) NO_INLINE; + extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel) NO_INLINE; + extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel) NO_INLINE; + extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int request) NO_INLINE; + extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int request) NO_INLINE; + extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool request) NO_INLINE; + extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel) NO_INLINE; + extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int request) NO_INLINE; + extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, bool request) NO_INLINE; + extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) NO_INLINE; + extern "C" void iplSDChannelObj_createBaseLayout(SDChannelObj* channel) NO_INLINE; + extern "C" f32 iplSDChannelObj_createIconLayout(SDChannelObj* channel) NO_INLINE; + extern "C" f32 iplSDChannelObj_createMenuLayout(SDChannelObj* channel) NO_INLINE; + extern "C" void iplSDChannelObj_syncLayoutsToPane(SDChannelObj* channel) NO_INLINE; + extern "C" void iplSDChannelObj_createPageLayout(SDChannelObj* channel) NO_INLINE; + extern "C" void iplSDChannelObj_setPageTranslate(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE; + extern "C" void iplSDChannelObj_setPageAnim(SDChannelObj* channel, int request) NO_INLINE; + extern "C" void iplSDChannelObj_updatePageAnim(SDChannelObj* channel) NO_INLINE; + extern "C" void iplSDChannelObj_playPageAnimator(SDChannelObj* channel, int request) NO_INLINE; + extern "C" void iplSDChannelObj_createDialogLayout(SDChannelObj* channel) NO_INLINE; + extern "C" const wchar_t* iplSDChannelObj_getLocalizedName(SDChannelObj* channel, int index) NO_INLINE; + extern "C" void iplSDChannelObj_setBalloonText(SDChannelObj* channel, const wchar_t* text) NO_INLINE; + extern "C" void iplSDChannelObj_positionDialog(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE; + extern "C" void iplSDChannelObj_setDialogAnim(SDChannelObj* channel, int request) NO_INLINE; + extern "C" void iplSDChannelObj_updateDialogAnim(SDChannelObj* channel) NO_INLINE; + extern "C" void iplSDChannelObj_findNewMessageGroup(SDChannelObj* channel, layout::Object* layout) NO_INLINE; + extern "C" void iplSDChannelObj_updateNewMessage(SDChannelObj* channel) NO_INLINE; + extern "C" BOOL iplSDChannelObj_checkNewMessage(SDChannelObj* channel) NO_INLINE; SDChannelObj::SDChannelObj(EGG::Heap* heap, int page, int index) : mpHeap(heap), mpDialogHeap(NULL), mpChannelHeap(NULL), mState(0), mPage(page), mIndex(index), @@ -112,42 +112,42 @@ namespace ipl { if (mpDialogLayout != NULL) delete mpDialogLayout; } - extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel) { + extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel) { if (channel->mState == 0) channel->mState = 2; } - extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap, + extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap, EGG::ExpHeap* secondHeap) { channel->mpDialogHeap = firstHeap; channel->mpChannelHeap = secondHeap; } - extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel) { + extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel) { if (channel->mpThumbnailData == NULL) channel->mpThumbnailData = new (channel->mpHeap, 32) u8[0x19000]; return channel->mpThumbnailData; } - extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane) { + extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane) { channel->mpPane = pane; } - extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile) { + extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile) { if (!SDChannelSelect::isChannelReady(channel)) { channel->mpLayoutFile = layoutFile; if (channel->mpPageLayout == NULL) - iplSDChannelObj_813E3BA0(channel); + iplSDChannelObj_createPageLayout(channel); if (channel->mpDialogLayout == NULL) - iplSDChannelObj_813E3F74(channel); + iplSDChannelObj_createDialogLayout(channel); if (channel->mState == 2 || channel->mState == 1 && channel->mpPaneAnimator->isFinished()) { - iplSDChannelObj_813E3858(channel); + iplSDChannelObj_createBaseLayout(channel); channel->mState = 3; } } } - extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel) { + extern "C" void iplSDChannelObj_calc(SDChannelObj* channel) { switch (channel->mState) { case 0: channel->mState = 2; @@ -157,25 +157,25 @@ namespace ipl { break; channel->mState = 2; case 2: - iplSDChannelObj_813E3858(channel); + iplSDChannelObj_createBaseLayout(channel); channel->mState = 3; break; case 3: - iplSDChannelObj_813E3B1C(channel); + iplSDChannelObj_syncLayoutsToPane(channel); break; } } - extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel) { + extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel) { if (SDChannelSelect::isChannelReady(channel)) channel->mpBaseLayout->draw(); } - extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel) { + extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel) { channel->mpPageLayout->draw(); } - extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel) { + extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel) { if (channel->mpDialogLayout != NULL) channel->mpDialogLayout->draw(); } @@ -184,14 +184,14 @@ namespace ipl { return (nw4r::math::VEC3&)mpBaseLayout->GetRootPane()->GetTranslate(); } - extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel) { + extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel) { if (channel->mStateFlags == 0 || channel->mStateFlags == 3) return true; else return false; } - extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int request) { + extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int request) { if (request & 0x10000U) { channel->mAnimationState = 0; } else if (request & 0x20000U) { @@ -201,14 +201,14 @@ namespace ipl { } if (!(request & 1)) { - iplSDChannelObj_813E3C9C(channel, 1); + iplSDChannelObj_setPageAnim(channel, 1); } if (!(request & 2)) { - iplSDChannelObj_813E4558(channel, 1); + iplSDChannelObj_setDialogAnim(channel, 1); } } - extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int request) { + extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int request) { if (request & 0x10000U) { channel->mAnimationState = 0; } else if (request & 0x20000U) { @@ -218,44 +218,44 @@ namespace ipl { } if (!(request & 1)) { - iplSDChannelObj_813E3C9C(channel, 3); + iplSDChannelObj_setPageAnim(channel, 3); } if (!(request & 2)) { - iplSDChannelObj_813E4558(channel, 4); + iplSDChannelObj_setDialogAnim(channel, 4); } } - extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool request) { + extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool request) { if (request) { - iplSDChannelObj_813E3C9C(channel, 1); + iplSDChannelObj_setPageAnim(channel, 1); channel->mAnimationState = 1; } else { - iplSDChannelObj_813E3C9C(channel, 0); + iplSDChannelObj_setPageAnim(channel, 0); channel->mAnimationState = 0; } - iplSDChannelObj_813E4558(channel, 0); + iplSDChannelObj_setDialogAnim(channel, 0); } - extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel) { - iplSDChannelObj_813E3C9C(channel, 4); + extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel) { + iplSDChannelObj_setPageAnim(channel, 4); } - extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int request) { - iplSDChannelObj_813E3C9C(channel, 0); + extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int request) { + iplSDChannelObj_setPageAnim(channel, 0); if (request) { channel->mAnimationState = 0; } } - extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, bool request) { - iplSDChannelObj_813E4558(channel, 0); + extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, bool request) { + iplSDChannelObj_setDialogAnim(channel, 0); if (request) { channel->mAnimationState = 0; } } - extern "C" void iplSDChannelObj_813E3580(const layout::Object* layout) { + extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) { int lang = System::getLanguage(); const char* langGroup = scLangGroups[lang]; char availableLanguages[10][4] = {}; @@ -319,18 +319,18 @@ namespace ipl { } } - extern "C" void iplSDChannelObj_813E3858(SDChannelObj* channel) { + extern "C" void iplSDChannelObj_createBaseLayout(SDChannelObj* channel) { bool adjust = false; if (channel->mpDialogLayout == NULL) - iplSDChannelObj_813E3F74(channel); + iplSDChannelObj_createDialogLayout(channel); f32 frame; - if (iplSDChannelObj_813E3330(channel)) - frame = iplSDChannelObj_813E3920(channel); + if (iplSDChannelObj_hasAppMeta(channel)) + frame = iplSDChannelObj_createIconLayout(channel); else { - frame = iplSDChannelObj_813E3A84(channel); + frame = iplSDChannelObj_createMenuLayout(channel); adjust = true; } - iplSDChannelObj_813E3B1C(channel); + iplSDChannelObj_syncLayoutsToPane(channel); if (channel->mpBaseAnimator != NULL) channel->mpBaseAnimator->play(); channel->mpBaseLayout->finishBinding(); @@ -340,11 +340,11 @@ namespace ipl { channel->mpBaseLayout->adjustHeap(); } - extern "C" f32 iplSDChannelObj_813E3920(SDChannelObj* channel) { + extern "C" f32 iplSDChannelObj_createIconLayout(SDChannelObj* channel) { f32 frame = 0.0f; channel->mpBaseLayout = layout::Object::create(channel->mpHeap, 0x8000, channel->mpThumbnailData, "arc", "icon.brlyt"); - iplSDChannelObj_813E3580(channel->mpBaseLayout); + iplSDChannelObj_applyLanguageGroups(channel->mpBaseLayout); if (channel->mpBaseLayout->searchFile("icon.brlan")) channel->mpBaseAnimator = channel->mpBaseLayout->bind("icon.brlan"); else if (channel->mpBaseLayout->searchFile("icon_Whole.brlan")) @@ -357,30 +357,30 @@ namespace ipl { frame = minimum + (System::getRndm()->get_u16() % (u16)(maximum - minimum)); } if (channel->mStateFlags == 0) { - iplSDChannelObj_813E481C(channel, channel->mpBaseLayout); + iplSDChannelObj_findNewMessageGroup(channel, channel->mpBaseLayout); channel->mNewMessageState = 1; } return frame; } - extern "C" f32 iplSDChannelObj_813E3A84(SDChannelObj* channel) { + extern "C" f32 iplSDChannelObj_createMenuLayout(SDChannelObj* channel) { channel->mpBaseLayout = layout::Object::create(channel->mpHeap, 0x8000, channel->mpLayoutFile, "arc", "mn_SdcardMenu_d.brlyt"); channel->mpBaseAnimator = channel->mpBaseLayout->bind("mn_SdcardMenu_d.brlan"); return System::getRndm()->get_u16() % 2000; } - extern "C" void iplSDChannelObj_813E3B1C(SDChannelObj* channel) { - iplSDChannelObj_813E49A8(channel); + extern "C" void iplSDChannelObj_syncLayoutsToPane(SDChannelObj* channel) { + iplSDChannelObj_updateNewMessage(channel); nw4r::math::VEC3 position(0, 0, 0); MTXMultVec(channel->mpPane->GetGlobalMtx(), position, position); channel->mpBaseLayout->GetRootPane()->SetTranslate(position); channel->mpBaseLayout->calc(); - iplSDChannelObj_813E3C58(channel, position); - iplSDChannelObj_813E4410(channel, position); + iplSDChannelObj_setPageTranslate(channel, position); + iplSDChannelObj_positionDialog(channel, position); } - extern "C" void iplSDChannelObj_813E3BA0(SDChannelObj* channel) { + extern "C" void iplSDChannelObj_createPageLayout(SDChannelObj* channel) { channel->mpPageLayout = new (channel->mpDialogHeap, 4) layout::Object(channel->mpDialogHeap, channel->mpLayoutFile, "arc", "my_IplTop_d.brlyt"); @@ -388,17 +388,17 @@ namespace ipl { channel->mpPageAnimators[i] = channel->mpPageLayout->bind(scCursorAnims[i], scCursur, false); } - iplSDChannelObj_813E3C9C(channel, 0); + iplSDChannelObj_setPageAnim(channel, 0); channel->mpPageLayout->finishBinding(); } - extern "C" void iplSDChannelObj_813E3C58(SDChannelObj* channel, const nw4r::math::VEC3& vec) { + extern "C" void iplSDChannelObj_setPageTranslate(SDChannelObj* channel, const nw4r::math::VEC3& vec) { channel->mpPageLayout->GetRootPane()->SetTranslate(vec); - iplSDChannelObj_813E3E38(channel); + iplSDChannelObj_updatePageAnim(channel); channel->mpPageLayout->calc(); } - extern "C" void iplSDChannelObj_813E3C9C(SDChannelObj* channel, int request) { + extern "C" void iplSDChannelObj_setPageAnim(SDChannelObj* channel, int request) { if (request == 0) { channel->mPageAnimation = 0; channel->mPageAnimationFrame = 0; @@ -413,14 +413,14 @@ namespace ipl { channel->mPageAnimation = 4; channel->mPageAnimationFrame = 0; channel->mpPageLayout->GetRootPane()->SetVisible(true); - iplSDChannelObj_813E3F28(channel, 2); + iplSDChannelObj_playPageAnimator(channel, 2); } else { switch (channel->mPageAnimation) { case 0: { if (request == 1) { channel->mPageAnimation = 1; channel->mpPageLayout->GetRootPane()->SetVisible(true); - iplSDChannelObj_813E3F28(channel, 1); + iplSDChannelObj_playPageAnimator(channel, 1); } break; } @@ -437,7 +437,7 @@ namespace ipl { case 2: { if (request == 3) { channel->mPageAnimation = 3; - iplSDChannelObj_813E3F28(channel, 0); + iplSDChannelObj_playPageAnimator(channel, 0); } break; } @@ -453,7 +453,7 @@ namespace ipl { } } - extern "C" void iplSDChannelObj_813E3E38(SDChannelObj* channel) { + extern "C" void iplSDChannelObj_updatePageAnim(SDChannelObj* channel) { switch (channel->mPageAnimation) { case 1: { if (!channel->mpPageAnimators[1]->isPlaying()) { @@ -472,7 +472,7 @@ namespace ipl { break; } if (prev == 3) { - iplSDChannelObj_813E3C9C(channel, 3); + iplSDChannelObj_setPageAnim(channel, 3); channel->mPageAnimationFrame = 0; } } @@ -481,46 +481,46 @@ namespace ipl { case 3: { if (!channel->mpPageAnimators[0]->isPlaying()) { int prev = channel->mPageAnimationFrame; - iplSDChannelObj_813E3C9C(channel, 0); + iplSDChannelObj_setPageAnim(channel, 0); if (prev == 1) { - iplSDChannelObj_813E3C9C(channel, 1); + iplSDChannelObj_setPageAnim(channel, 1); } } break; } case 4: { if (!channel->mpPageAnimators[2]->isPlaying()) { - iplSDChannelObj_813E3C9C(channel, 0); + iplSDChannelObj_setPageAnim(channel, 0); } break; } } } - extern "C" void iplSDChannelObj_813E3F28(SDChannelObj* channel, int request) { + extern "C" void iplSDChannelObj_playPageAnimator(SDChannelObj* channel, int request) { channel->mpPageAnimators[request]->setAnmType(ANIM_TYPE_FORWARD); channel->mpPageAnimators[request]->play(); } - extern "C" void iplSDChannelObj_813E3F74(SDChannelObj* channel) { - if (!iplSDChannelObj_813E3330(channel)) { + extern "C" void iplSDChannelObj_createDialogLayout(SDChannelObj* channel) { + if (!iplSDChannelObj_hasAppMeta(channel)) { channel->mpDialogLayout = NULL; return; } channel->mpDialogLayout = new (channel->mpChannelHeap, 4) layout::Object(channel->mpChannelHeap, channel->mpLayoutFile, "arc", "my_IplTopBalloon_a.brlyt"); if (channel->mStateFlags == 0) - iplSDChannelObj_813E413C(channel, iplSDChannelObj_813E4060(channel, 0)); + iplSDChannelObj_setBalloonText(channel, iplSDChannelObj_getLocalizedName(channel, 0)); else if (channel->mStateFlags == 3) - iplSDChannelObj_813E413C(channel, scUnknownName); + iplSDChannelObj_setBalloonText(channel, scUnknownName); else - iplSDChannelObj_813E413C(channel, L""); + iplSDChannelObj_setBalloonText(channel, L""); channel->mpDialogAnimator = channel->mpDialogLayout->bind("my_IplTopBalloon_a_BalloonInOut.brlan"); - iplSDChannelObj_813E4558(channel, 0); + iplSDChannelObj_setDialogAnim(channel, 0); channel->mpDialogLayout->finishBinding(); } - extern "C" const wchar_t* iplSDChannelObj_813E4060(SDChannelObj* channel, int index) { + extern "C" const wchar_t* iplSDChannelObj_getLocalizedName(SDChannelObj* channel, int index) { if (channel->mAppMeta.metaHdr.names[System::getLanguage()][index][0] != 0) return channel->mAppMeta.metaHdr.names[System::getLanguage()][index]; const u32* languages = scLangLookup[System::getRegion()]; @@ -533,7 +533,7 @@ namespace ipl { return channel->mAppMeta.metaHdr.names[languages[0]][index]; } - extern "C" void iplSDChannelObj_813E413C(SDChannelObj* channel, const wchar_t* text) { + extern "C" void iplSDChannelObj_setBalloonText(SDChannelObj* channel, const wchar_t* text) { nw4r::lyt::TextBox* textPane = nw4r::ut::DynamicCast(channel->mpDialogLayout->FindPaneByName(scBalloon)); @@ -585,7 +585,7 @@ namespace ipl { channel->mpDialogLayout->FindPaneByName(scBase)->SetSize(newSize); } - extern "C" void iplSDChannelObj_813E4410(SDChannelObj* channel, const nw4r::math::VEC3& vec) { + extern "C" void iplSDChannelObj_positionDialog(SDChannelObj* channel, const nw4r::math::VEC3& vec) { if (channel->mpDialogLayout != NULL) { nw4r::lyt::Size size; @@ -611,12 +611,12 @@ namespace ipl { const nw4r::math::VEC3 pos(vec.x + horizontalOffset, vec.y + verticalOffset, 0.0f); channel->mpDialogLayout->GetRootPane()->SetTranslate(pos); - iplSDChannelObj_813E4704(channel); + iplSDChannelObj_updateDialogAnim(channel); channel->mpDialogLayout->calc(); } } - extern "C" void iplSDChannelObj_813E4558(SDChannelObj* channel, int request) { + extern "C" void iplSDChannelObj_setDialogAnim(SDChannelObj* channel, int request) { if (channel->mpDialogLayout != NULL) { if (request == 0) { channel->mDialogState = 0; @@ -676,11 +676,11 @@ namespace ipl { } } - extern "C" void iplSDChannelObj_813E4704(SDChannelObj* channel) { + extern "C" void iplSDChannelObj_updateDialogAnim(SDChannelObj* channel) { switch (channel->mDialogState) { case 1: { if ((reinterpret_cast(channel->mDialogTimer) += 1) >= 20.0f) { - iplSDChannelObj_813E4558(channel, 2); + iplSDChannelObj_setDialogAnim(channel, 2); break; } } @@ -690,9 +690,9 @@ namespace ipl { case 2: { if (!channel->mpDialogLayout->isPlaying(0)) { int prev = channel->mDialogFrame; - iplSDChannelObj_813E4558(channel, 3); + iplSDChannelObj_setDialogAnim(channel, 3); if (prev == 4) { - iplSDChannelObj_813E4558(channel, 4); + iplSDChannelObj_setDialogAnim(channel, 4); channel->mDialogFrame = 0; } } @@ -701,9 +701,9 @@ namespace ipl { case 4: { if (!channel->mpDialogLayout->isPlaying(0)) { int prev = channel->mDialogFrame; - iplSDChannelObj_813E4558(channel, 0); + iplSDChannelObj_setDialogAnim(channel, 0); if (prev == 1) { - iplSDChannelObj_813E4558(channel, 1); + iplSDChannelObj_setDialogAnim(channel, 1); } } break; @@ -711,7 +711,7 @@ namespace ipl { } } - extern "C" void iplSDChannelObj_813E481C(SDChannelObj* channel, layout::Object* layout) { + extern "C" void iplSDChannelObj_findNewMessageGroup(SDChannelObj* channel, layout::Object* layout) { char groupName[20]; char** lookup; nw4r::lyt::Group* group; @@ -752,11 +752,11 @@ namespace ipl { } } - extern "C" void iplSDChannelObj_813E49A8(SDChannelObj* channel) { + extern "C" void iplSDChannelObj_updateNewMessage(SDChannelObj* channel) { if (System::getNwc24Manager() != NULL) { switch (channel->mNewMessageState) { case 1: { - if (iplSDChannelObj_813E4A54(channel)) { + if (iplSDChannelObj_checkNewMessage(channel)) { channel->mNewMessageState = 2; channel->mNewMessageFrame = 0; } @@ -772,7 +772,7 @@ namespace ipl { } } - extern "C" BOOL iplSDChannelObj_813E4A54(SDChannelObj* channel) { + extern "C" BOOL iplSDChannelObj_checkNewMessage(SDChannelObj* channel) { if (System::getNwc24Manager() == NULL || !System::getNwc24Manager()->getNewTitleTbl(NULL)) { return FALSE; } diff --git a/src/scene/sdChannelSelect/iplSDChannelSelect.cpp b/src/scene/sdChannelSelect/iplSDChannelSelect.cpp index 3fa5dbcd..cae1725d 100644 --- a/src/scene/sdChannelSelect/iplSDChannelSelect.cpp +++ b/src/scene/sdChannelSelect/iplSDChannelSelect.cpp @@ -113,7 +113,7 @@ namespace ipl { - extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, int enabled); + extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, int enabled); SDChannelSelect::SDChannelSelect(EGG::Heap* heap) : FaderSceneBase(heap), @@ -213,7 +213,7 @@ namespace ipl { SDChannelObj* channel = NULL; while (channel = static_cast(nw4r::ut::List_GetNext(&mChannelObjects, channel)), channel != NULL) { - iplSDChannelObj_813E3104(channel); + iplSDChannelObj_activateIfIdle(channel); } } @@ -602,7 +602,7 @@ namespace ipl { mpCurrentLoadedChannel = loadedChannel; mpSDWorker->get_sd_app_meta_async( static_cast(notice.titleId), - static_cast(iplSDChannelObj_813E3128(loadedChannel)), + static_cast(iplSDChannelObj_getOrAllocThumbnailData(loadedChannel)), &loadedChannel->mAppMeta); mWorkerCommand = 3; } @@ -845,9 +845,9 @@ namespace ipl { SDChannelObj* completed = mpCurrentLoadedChannel; completed->mStateFlags = 0; completed->mState = 2; - DCFlushRange(iplSDChannelObj_813E3128(mpCurrentLoadedChannel), 0x19000); + DCFlushRange(iplSDChannelObj_getOrAllocThumbnailData(mpCurrentLoadedChannel), 0x19000); } else { - memcpy(iplSDChannelObj_813E3128(mpCurrentLoadedChannel), + memcpy(iplSDChannelObj_getOrAllocThumbnailData(mpCurrentLoadedChannel), mpCorruptIconFile->getBuffer(), mpCorruptIconFile->getLength()); memset(&mpCurrentLoadedChannel->mAppMeta, 0, sizeof(mpCurrentLoadedChannel->mAppMeta)); SDChannelObj* completed = mpCurrentLoadedChannel; @@ -1835,9 +1835,9 @@ namespace ipl { int channelIndex = channel->getIndex(); if (channelPage == mCurrentPage) { if (mState != 5 || channelIndex != mCurrentChannelIndex) { - iplSDChannelObj_813E34E8(channel, 1); + iplSDChannelObj_resetPageAnim(channel, 1); } - iplSDChannelObj_813E3534(channel, 1); + iplSDChannelObj_resetDialogAnim(channel, 1); } } @@ -2059,19 +2059,19 @@ namespace ipl { } void SDChannelSelect::updateChannelObject(SDChannelObj* channel) { - iplSDChannelObj_813E3104(channel); - iplSDChannelObj_813E311C(channel, mpDialogHeap, mpChannelHeap); - iplSDChannelObj_813E3178(channel, + iplSDChannelObj_activateIfIdle(channel); + iplSDChannelObj_setHeaps(channel, mpDialogHeap, mpChannelHeap); + iplSDChannelObj_setPane(channel, getChannelBasePane(channel->getPage(), channel->getIndex(), mCurrentPage)); - iplSDChannelObj_813E3180(channel, mpLayoutFile); + iplSDChannelObj_setLayoutFile(channel, mpLayoutFile); } void SDChannelSelect::calcChannelObjects() { SDChannelObj* channel = NULL; while (channel = static_cast(nw4r::ut::List_GetNext(&mChannelObjects, channel)), channel != NULL) { - iplSDChannelObj_813E322C(channel); + iplSDChannelObj_calc(channel); } } @@ -2086,9 +2086,9 @@ namespace ipl { } setChannelScissor(channel); - iplSDChannelObj_813E32C8(channel); + iplSDChannelObj_drawBase(channel); - if (iplSDChannelObj_813E3330(channel)) { + if (iplSDChannelObj_hasAppMeta(channel)) { switch (mState) { case 15: case 16: @@ -2154,7 +2154,7 @@ namespace ipl { while (channel = static_cast(nw4r::ut::List_GetNext(&mChannelObjects, channel)), channel != NULL) { if (hasChannelObject(channel->getPage(), channel->getIndex())) { - iplSDChannelObj_813E3304(channel); + iplSDChannelObj_drawPage(channel); } } @@ -2162,7 +2162,7 @@ namespace ipl { while (channel = static_cast(nw4r::ut::List_GetNext(&mChannelObjects, channel)), channel != NULL) { if (hasChannelObject(channel->getPage(), channel->getIndex())) { - iplSDChannelObj_813E330C(channel); + iplSDChannelObj_drawDialog(channel); } } } @@ -2296,7 +2296,7 @@ namespace ipl { nw4r::ut::List_GetNext(&mChannelObjects, channel)), channel != NULL) { int titleIndex = channel->getPage() * MAX_CHANNEL_INDEX + channel->getIndex(); - if (!iplSDChannelObj_813E3330(channel) && mpChannelTitleIds[titleIndex] != 0 && + if (!iplSDChannelObj_hasAppMeta(channel) && mpChannelTitleIds[titleIndex] != 0 && mbNeedsRefresh) { channel->mStateFlags = 2; } @@ -2391,7 +2391,7 @@ namespace ipl { while (channel = static_cast( nw4r::ut::List_GetNext(&mChannelObjects, channel)), channel != NULL) { - if (iplSDChannelObj_813E3330(channel)) { + if (iplSDChannelObj_hasAppMeta(channel)) { SDChannelObj* previous = static_cast( nw4r::ut::List_GetPrev(&mChannelObjects, channel)); nw4r::ut::List_Remove(&mChannelObjects, channel); @@ -2418,7 +2418,7 @@ namespace ipl { nw4r::ut::List_GetNext(&mChannelObjects, channel)), channel != NULL) { int channelIndex = channel->mPage * 12 + channel->mIndex; - if (!iplSDChannelObj_813E3330(channel) && + if (!iplSDChannelObj_hasAppMeta(channel) && mpChannelTitleIds[channelIndex] != 0) { channel->mStateFlags = 2; } @@ -2634,7 +2634,7 @@ namespace ipl { initPageAnimations( math::VEC3((nw4r::math::VEC3&)channel->mpBaseLayout->GetRootPane()->GetTranslate()), 0); - iplSDChannelObj_813E34E0(channel); + iplSDChannelObj_playPageHide(channel); SDButton* button = static_cast(System::getSceneManager()->getScene(0x24)); if (mbLeftArrowVisible) { @@ -2982,7 +2982,7 @@ namespace ipl { while (channel = static_cast( nw4r::ut::List_GetNext(&mChannelObjects, channel)), channel != NULL) { - iplSDChannelObj_813E34E8(channel, 1); + iplSDChannelObj_resetPageAnim(channel, 1); } for (int index = 0; index < MAX_CHANNEL_INDEX; ++index) { @@ -3004,7 +3004,7 @@ namespace ipl { while (channel = static_cast( nw4r::ut::List_GetNext(&mChannelObjects, channel)), channel != NULL) { - iplSDChannelObj_813E34E8(channel, 1); + iplSDChannelObj_resetPageAnim(channel, 1); } for (int index = 0; index < MAX_CHANNEL_INDEX; ++index) { @@ -3066,10 +3066,10 @@ namespace ipl { } else { SDChannelObj* destination = findChannelObject(mDestinationPage, mDestinationIndex); - iplSDChannelObj_813E3178( + iplSDChannelObj_setPane( static_cast(mpCurrentChannel), getChannelBasePane(mDestinationPage, mDestinationIndex, mCurrentPage)); - iplSDChannelObj_813E3178( + iplSDChannelObj_setPane( destination, getChannelBasePane(mSourcePage, mSourceIndex, mCurrentPage)); SDChannelObj* current; @@ -3083,8 +3083,8 @@ namespace ipl { destination->mPage = sourcePage; destination->mIndex = sourceIndex; - iplSDChannelObj_813E322C(static_cast(mpCurrentChannel)); - iplSDChannelObj_813E322C(destination); + iplSDChannelObj_calc(static_cast(mpCurrentChannel)); + iplSDChannelObj_calc(destination); mpCurrentChannel = transitionAnimator; destination->mpBaseAnimator->setCurrentFrame(mpHelpLayout->getCurrentFrame()); @@ -3208,7 +3208,7 @@ namespace ipl { if (isChannelMoveTarget(mCurrentPage, index) || (mCurrentPage == mSourcePage && index == mSourceIndex)) { SDChannelObj* channel = findChannelObject(mCurrentPage, index); - iplSDChannelObj_813E3354(channel, 2); + iplSDChannelObj_startAppear(channel, 2); snd::getSystem()->startSE("WIPL_SE_CH_TARGETTING"); controller->rumble(1); } @@ -3217,7 +3217,7 @@ namespace ipl { if (isChannelMoveTarget(mCurrentPage, index) || (mCurrentPage == mSourcePage && index == mSourceIndex)) { SDChannelObj* channel = findChannelObject(mCurrentPage, index); - iplSDChannelObj_813E33EC(channel, 2); + iplSDChannelObj_startDisappear(channel, 2); } break; default: @@ -3297,7 +3297,7 @@ namespace ipl { int channelPage = channel->getPage(); int channelIndex = channel->getIndex(); bool selected = channelPage == page && channelIndex == index; - iplSDChannelObj_813E3480(channel, selected); + iplSDChannelObj_setSelected(channel, selected); } snd::getSystem()->startSEwithPos("WIPL_SE_CH_HOLD", mPointerPosition.x); @@ -3333,7 +3333,7 @@ namespace ipl { SDChannelObj* channel = NULL; while (channel = static_cast(nw4r::ut::List_GetNext(&mChannelObjects, channel)), channel != NULL) { - iplSDChannelObj_813E34E8(channel, 1); + iplSDChannelObj_resetPageAnim(channel, 1); } for (int index = 0; index < MAX_CHANNEL_INDEX; ++index) { @@ -3432,14 +3432,14 @@ namespace ipl { break; case ::gui::EventHandler::ON_POINT: if (mpScene->mState == 1 && SDChannelSelect::isChannelReady(channel)) { - iplSDChannelObj_813E3354(channel, 0); + iplSDChannelObj_startAppear(channel, 0); snd::getSystem()->startSE("WIPL_SE_CH_TARGETTING"); controller->rumble(1); } break; case ::gui::EventHandler::ON_LEFT: if (mpScene->mState == 1 && SDChannelSelect::isChannelReady(channel)) { - iplSDChannelObj_813E33EC(channel, 0); + iplSDChannelObj_startDisappear(channel, 0); } break; } diff --git a/src/scene/sdChannelTitle/iplSDChannelTitle.cpp b/src/scene/sdChannelTitle/iplSDChannelTitle.cpp index 8a5dd0bc..fad540d7 100644 --- a/src/scene/sdChannelTitle/iplSDChannelTitle.cpp +++ b/src/scene/sdChannelTitle/iplSDChannelTitle.cpp @@ -134,8 +134,8 @@ public: SDChannelTitle* mpScene; }; -extern "C" void iplSDChannelObj_813E3580(layout::Object* layout); -extern "C" const wchar_t* iplSDChannelObj_813E4060(SDChannelObj* channel, int nameIndex); +extern "C" void iplSDChannelObj_applyLanguageGroups(layout::Object* layout); +extern "C" const wchar_t* iplSDChannelObj_getLocalizedName(SDChannelObj* channel, int nameIndex); extern "C" bool iplSDChannelTitle_startZoomFade(SDChannelTitle* scene); extern "C" void iplSDChannelTitle_rebuildBannerLayout(SDChannelTitle* scene); extern "C" void iplSDChannelTitle_setPaneMessage(SDChannelTitle* scene, nw4r::lyt::Pane* pane, u32 message, bool allocate); @@ -401,8 +401,8 @@ FaderSceneCommand SDChannelTitle::calcFadeout() { } title; title.id = channel->mAppMeta.titleId; wchar_t names[2][21]; - memcpy(names[0], iplSDChannelObj_813E4060(channel, 0), sizeof(names[0])); - memcpy(names[1], iplSDChannelObj_813E4060(channel, 1), sizeof(names[1])); + memcpy(names[0], iplSDChannelObj_getLocalizedName(channel, 0), sizeof(names[0])); + memcpy(names[1], iplSDChannelObj_getLocalizedName(channel, 1), sizeof(names[1])); union MakerCode { u16 code; char bytes[2]; @@ -537,7 +537,7 @@ extern "C" void iplSDChannelTitle_createBannerLayout(SDChannelTitle* scene) { if (scene->mpBannerFiles[scene->mLoadedIndex] && scene->mpBannerFiles[scene->mLoadedIndex]->checkData() == 1) { scene->mpBannerLayout = layout::Object::create(scene->mpBannerHeap, 0x40000, scene->mpBannerFiles[scene->mLoadedIndex], "arc", "banner.brlyt"); - iplSDChannelObj_813E3580(scene->mpBannerLayout); + iplSDChannelObj_applyLanguageGroups(scene->mpBannerLayout); iplSDChannelTitle_bindBannerAnimations(scene); } else { scene->mpBannerLayout = NULL; @@ -552,15 +552,15 @@ extern "C" void iplSDChannelTitle_createIconLayout(SDChannelTitle* scene) { SDChannelObj* channel = scene->mpChannelSelect->findChannelObject(scene->mPage, scene->mIndex); if (channel) { scene->mpIconLayout = layout::Object::create(scene->mpIconHeap, 0x8000, - iplSDChannelObj_813E3128(channel), "arc", "icon.brlyt"); - iplSDChannelObj_813E3580(scene->mpIconLayout); + iplSDChannelObj_getOrAllocThumbnailData(channel), "arc", "icon.brlyt"); + iplSDChannelObj_applyLanguageGroups(scene->mpIconLayout); if (scene->mpIconLayout->searchFile("icon.brlan")) { scene->mpIconLayout->bind("icon.brlan")->play(); } else if (scene->mpIconLayout->searchFile("icon_Whole.brlan")) { scene->mpIconLayout->bind("icon_Whole.brlan")->play(); } if (channel->mStateFlags == 0) { - static_cast(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(iplSDChannelObj_813E4060(channel, 0)); + static_cast(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(iplSDChannelObj_getLocalizedName(channel, 0)); } else { static_cast(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(sMissingTitle); } @@ -611,7 +611,7 @@ extern "C" void iplSDChannelTitle_updateChangeState(SDChannelTitle* scene) { ++scene->mChangeFrame; if ((!scene->mpBannerFiles[1 - scene->mLoadedIndex] || scene->mpBannerFiles[1 - scene->mLoadedIndex]->isFinished()) && (!scene->mpSoundFiles[1 - scene->mLoadedIndex] || scene->mpSoundFiles[1 - scene->mLoadedIndex]->isFinished()) && - iplSDChannelObj_813E3330(channel) && scene->mChangeFrame > 10 && + iplSDChannelObj_hasAppMeta(channel) && scene->mChangeFrame > 10 && (!scene->mScriptEnabled || scene->mScriptState == 4)) { if (scene->mpBannerFiles[scene->mLoadedIndex]) { delete scene->mpBannerFiles[scene->mLoadedIndex]; @@ -972,7 +972,7 @@ extern "C" void iplSDChannelTitle_tryLaunchSelected(SDChannelTitle* scene) { scene->mState = 1; } else { SDChannelObj* channel = scene->mpChannelSelect->findChannelObject(scene->mPage, scene->mIndex); - if (iplSDChannelObj_813E3330(channel)) { + if (iplSDChannelObj_hasAppMeta(channel)) { iplSDChannelTitle_beginLaunch(scene, channel); } } @@ -1264,7 +1264,7 @@ extern "C" void iplSDChannelTitle_setPageAndIndex(SDChannelTitle* scene, int pag SDChannelObj* channel = scene->mpChannelSelect->findChannelObject(scene->mPage, scene->mIndex); scene->mPosition.x = SDChannelSelect::getChannelPanePosition(scene->mpChannelSelect, scene->mIndex).x; scene->mPosition.y = SDChannelSelect::getChannelPanePosition(scene->mpChannelSelect, scene->mIndex).y; - if (iplSDChannelObj_813E3330(channel)) { + if (iplSDChannelObj_hasAppMeta(channel)) { iplSDChannelTitle_beginLaunch(scene, channel); } else { scene->mState = 28;