From 90e7b0ff2c348c6af5145d72a147d768ed3cd029 Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:33:24 -0500 Subject: [PATCH 01/16] iplSensitivity: suppress inline Rect dtor weak (#641) Define IPL_CONTROLLER_TRIVIAL_RECT_DTOR so this TU no longer emits ~nw4r::ut::Rect. Compiled .text becomes byte-identical to the extract (1112 bytes). Matching still blocked on .sdata2 layout (48 vs 56). Co-authored-by: linker --- src/scene/setting/iplSensitivity.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/scene/setting/iplSensitivity.cpp b/src/scene/setting/iplSensitivity.cpp index 348300a0..ff04393d 100644 --- a/src/scene/setting/iplSensitivity.cpp +++ b/src/scene/setting/iplSensitivity.cpp @@ -1,3 +1,7 @@ +#define IPL_CONTROLLER_TRIVIAL_RECT_DTOR +#include +#undef IPL_CONTROLLER_TRIVIAL_RECT_DTOR + #include "system/iplSystem.h" #include "system/iplNand.h" #include "utility/iplGraphics.h" -- 2.49.1 From e9dd012c09c45c2fee5da09765b93ebc97cce1ce Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:33:31 -0500 Subject: [PATCH 02/16] cleanup(zmtkey): name Zi8MapKeyCode helper (#642) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename Zi8_81484484 (OEM/private-use wchar → key index) to Zi8MapKeyCode. Byte-identical: ok + sha1 26116613f624061ba99c8d1a299aaa6efa85670d; unit still ~67.1% code / ~99.85% fuzzy. --- config/43U/symbols.txt | 2 +- libs/RVLMiddleware/eZiText/src/clib/zmtkey.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/43U/symbols.txt b/config/43U/symbols.txt index f3e8fb72..6016e7c6 100644 --- a/config/43U/symbols.txt +++ b/config/43U/symbols.txt @@ -7284,7 +7284,7 @@ Zi8_814834AC = .text:0x814834AC; // type:function size:0x55C Zi8GetKOcandidates = .text:0x81483A08; // type:function size:0xA74 Zi8LogError = .text:0x8148447C; // type:function size:0x4 Zi8ReplaceLastError = .text:0x81484480; // type:function size:0x4 -Zi8_81484484 = .text:0x81484484; // type:function size:0x80 +Zi8MapKeyCode = .text:0x81484484; // type:function size:0x80 ziNumKeysWithChars = .text:0x81484504; // type:function size:0xC4 scope:local Zi8getKeyLayout = .text:0x814845C8; // type:function size:0x2D8 Zi8ChangeCharCase = .text:0x814848A0; // type:function size:0x48C diff --git a/libs/RVLMiddleware/eZiText/src/clib/zmtkey.c b/libs/RVLMiddleware/eZiText/src/clib/zmtkey.c index 3aa1ed53..d42221f9 100644 --- a/libs/RVLMiddleware/eZiText/src/clib/zmtkey.c +++ b/libs/RVLMiddleware/eZiText/src/clib/zmtkey.c @@ -8,7 +8,7 @@ ziU16 Zi8GetTableCount(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data); ziU32 Zi8GetTableAddress(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data); ziU8 Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data); -ziBool Zi8_81484484(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) { +ziBool Zi8MapKeyCode(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) { if (character == 0xeffa) { *output = 0; } else if ((character >= 0xeff1) && (character <= 0xeff9)) { @@ -58,7 +58,7 @@ ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, zi *chars = 0; if (ZI_WORK->userKeys[language] != 0) { customTable = ZI_WORK->userKeys[language]; - if (!Zi8_81484484(key, &key, __zi8_work_data)) { + if (!Zi8MapKeyCode(key, &key, __zi8_work_data)) { return 0; } keyChars = customTable->lower[key]; @@ -87,7 +87,7 @@ tables_ready: Zi8ReplaceLastError(0x962, __zi8_work_data); return 0; } - if (!Zi8_81484484(key, &key, __zi8_work_data) || (key >= numKeys)) { + if (!Zi8MapKeyCode(key, &key, __zi8_work_data) || (key >= numKeys)) { Zi8ReplaceLastError(300, __zi8_work_data); return 0; } -- 2.49.1 From 94c03497ff131e3d911d833ddf8e08c6f8ee0cee Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:33:42 -0500 Subject: [PATCH 03/16] cleanup(SDChannelObj): name address-suffixed C helpers (#636) 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 6016e7c6..8a977019 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; -- 2.49.1 From 1dde229702dc69a8951a8e09af3d3fc5a5e12a5f Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:33:58 -0500 Subject: [PATCH 04/16] cleanup(sdChannelSelect): drop unused iplSDChannelSelect_813DD240 decl (#643) The real path is collectTitlesFromNandUsage; this extern was never called. Build still OK; DOL sha1 unchanged. --- src/scene/sdChannelSelect/iplSDChannelSelect.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/scene/sdChannelSelect/iplSDChannelSelect.cpp b/src/scene/sdChannelSelect/iplSDChannelSelect.cpp index cae1725d..210f359b 100644 --- a/src/scene/sdChannelSelect/iplSDChannelSelect.cpp +++ b/src/scene/sdChannelSelect/iplSDChannelSelect.cpp @@ -107,11 +107,6 @@ namespace ipl { - extern "C" bool iplSDChannelSelect_813DD240( - SDChannelSelect* scene, const s32* requiredBytes, const s32* requiredBlocks, - ESTitleId* titleIds, char* titleNames, u32* titleCount); - - extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, int enabled); -- 2.49.1 From 196b14aa58936cd3c091456569c802acd1a12ae0 Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:34:25 -0500 Subject: [PATCH 05/16] cleanup(CDBDatabase): prefix Matching asm L_* labels with function names (#644) Rename 169 bare address labels inside the seven Search* asm functions to FunctionName_L_, matching the nand_drv style, so local branches are readable without changing codegen. Verified: ninja build/43U/ok; CDBDatabase 100%/100%; DOL sha1 unchanged. --- libs/RevoEX/src/cdb/CDBDatabase.c | 836 +++++++++++++++--------------- 1 file changed, 418 insertions(+), 418 deletions(-) diff --git a/libs/RevoEX/src/cdb/CDBDatabase.c b/libs/RevoEX/src/cdb/CDBDatabase.c index e004eefe..40bd18bc 100644 --- a/libs/RevoEX/src/cdb/CDBDatabase.c +++ b/libs/RevoEX/src/cdb/CDBDatabase.c @@ -372,40 +372,40 @@ asm CDBErr CDBDatabaseSearchCallCallback() { bl CDBLock lwz r3, 0x8(r31) cmpwi r3, 0x0 - beq L_81487C78 + beq CDBDatabaseSearchCallCallback_L_81487C78 addis r3, r3, 0x1 lwz r31, -0x3ff0(r3) - b L_81487C7C - L_81487C78: + b CDBDatabaseSearchCallCallback_L_81487C7C + CDBDatabaseSearchCallCallback_L_81487C78: li r31, 0x0 - L_81487C7C: + CDBDatabaseSearchCallCallback_L_81487C7C: bl CDBUnlock mr r3, r29 addi r4, r30, 0x8 bl CDBDatabaseSearchConditionsIsMatch cmpwi r3, 0x0 - beq L_81487D0C + beq CDBDatabaseSearchCallCallback_L_81487D0C lwz r0, 0x24(r29) cmpwi r0, 0x0 - beq L_81487CCC + beq CDBDatabaseSearchCallCallback_L_81487CCC rlwinm. r0, r31, 0, 30, 30 - beq L_81487CB4 + beq CDBDatabaseSearchCallCallback_L_81487CB4 mr r3, r30 bl CDBRecordOpen - b L_81487CBC - L_81487CB4: + b CDBDatabaseSearchCallCallback_L_81487CBC + CDBDatabaseSearchCallCallback_L_81487CB4: mr r3, r30 bl CDBRecordOpenReadOnly - L_81487CBC: + CDBDatabaseSearchCallCallback_L_81487CBC: cmpwi r3, 0x20 - bne L_81487CD0 + bne CDBDatabaseSearchCallCallback_L_81487CD0 li r3, 0x0 - b L_81487D10 - L_81487CCC: + b CDBDatabaseSearchCallCallback_L_81487D10 + CDBDatabaseSearchCallCallback_L_81487CCC: li r3, 0x0 - L_81487CD0: + CDBDatabaseSearchCallCallback_L_81487CD0: cmpwi r3, 0x0 - bne L_81487D10 + bne CDBDatabaseSearchCallCallback_L_81487D10 lwz r12, 0x18(r29) mr r4, r30 lwz r3, 0x1c(r29) @@ -414,14 +414,14 @@ asm CDBErr CDBDatabaseSearchCallCallback() { stw r3, 0x20(r29) lwz r0, 0x38(r30) cmpwi r0, 0x0 - beq L_81487D0C + beq CDBDatabaseSearchCallCallback_L_81487D0C mr r3, r30 bl CDBRecordClose - b L_81487D0C - b L_81487D10 - L_81487D0C: + b CDBDatabaseSearchCallCallback_L_81487D0C + b CDBDatabaseSearchCallCallback_L_81487D10 + CDBDatabaseSearchCallCallback_L_81487D0C: li r3, 0x0 - L_81487D10: + CDBDatabaseSearchCallCallback_L_81487D10: lwz r0, 0x24(r1) lwz r31, 0x1c(r1) lwz r30, 0x18(r1) @@ -468,10 +468,10 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { stw r0, 0xcc(r1) addi r0, r25, 0x1328 stw r0, 0xc8(r1) - bne L_81487DBC + bne CDBDatabaseSearchRecordLayer_L_81487DBC li r3, 0x1 - b L_81488410 - L_81487DBC: + b CDBDatabaseSearchRecordLayer_L_81488410 + CDBDatabaseSearchRecordLayer_L_81487DBC: addi r3, r1, 0x68 li r4, 0x0 bl CDBRecordKeyInitByOnlyDate @@ -481,30 +481,30 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { bl CDBRecordKeyArrayInit lwz r0, 0x14(r19) cmpwi r0, 0x0 - bne L_81487DF8 + bne CDBDatabaseSearchRecordLayer_L_81487DF8 addi r3, r1, 0x18 bl CDBRecordKeyArraySetReverse addi r3, r1, 0x68 li r4, -0x1 bl CDBRecordKeyInitByOnlyDate - L_81487DF8: + CDBDatabaseSearchRecordLayer_L_81487DF8: bl CDBLock lwz r3, 0x10(r1) lwz r3, 0x8(r3) cmpwi r3, 0x0 - beq L_81487E18 + beq CDBDatabaseSearchRecordLayer_L_81487E18 addis r3, r3, 0x1 lwz r14, -0x3ff0(r3) - b L_81487E1C - L_81487E18: + b CDBDatabaseSearchRecordLayer_L_81487E1C + CDBDatabaseSearchRecordLayer_L_81487E18: li r14, 0x0 - L_81487E1C: + CDBDatabaseSearchRecordLayer_L_81487E1C: bl CDBUnlock cmpwi r14, 0x0 - bne L_81487E30 + bne CDBDatabaseSearchRecordLayer_L_81487E30 li r3, 0x1b - b L_81488410 - L_81487E30: + b CDBDatabaseSearchRecordLayer_L_81488410 + CDBDatabaseSearchRecordLayer_L_81487E30: clrlwi r0, r15, 31 li r27, 0x0 stw r0, 0xd4(r1) @@ -513,13 +513,13 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { li r15, 0x1 stw r0, 0xd0(r1) li r14, 0x0 - b L_81488404 - L_81487E54: + b CDBDatabaseSearchRecordLayer_L_81488404 + CDBDatabaseSearchRecordLayer_L_81487E54: lwz r0, 0xd4(r1) li r27, 0x1 stw r14, 0x20(r1) cmpwi r0, 0x0 - beq L_81488094 + beq CDBDatabaseSearchRecordLayer_L_81488094 lwz r3, 0xcc(r1) mr r4, r20 mr r5, r21 @@ -533,17 +533,17 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { mr r3, r29 li r5, 0x1 bl CDBFSFindFirst - b L_8148807C - L_81487EA0: + b CDBDatabaseSearchRecordLayer_L_8148807C + CDBDatabaseSearchRecordLayer_L_81487EA0: mr r3, r29 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_81488074 + beq CDBDatabaseSearchRecordLayer_L_81488074 mr r3, r29 bl CDBFindDataGetName bl CDBFSIsMCGCDirNameOnSD cmpwi r3, 0x0 - beq L_81488074 + beq CDBDatabaseSearchRecordLayer_L_81488074 mr r3, r29 bl CDBFindDataGetName mr r9, r3 @@ -560,17 +560,17 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { mr r3, r28 li r5, 0x1 bl CDBFSFindFirst - b L_8148805C - L_81487F08: + b CDBDatabaseSearchRecordLayer_L_8148805C + CDBDatabaseSearchRecordLayer_L_81487F08: mr r3, r28 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_81488054 + beq CDBDatabaseSearchRecordLayer_L_81488054 mr r3, r28 bl CDBFindDataGetName bl CDBFSIsTypeDirNameOnSD cmpwi r3, 0x0 - beq L_81488054 + beq CDBDatabaseSearchRecordLayer_L_81488054 mr r3, r28 bl CDBFindDataGetName mr r16, r3 @@ -591,17 +591,17 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { mr r4, r25 li r5, 0x1 bl CDBFSFindFirst - b L_8148803C - L_81487F80: + b CDBDatabaseSearchRecordLayer_L_8148803C + CDBDatabaseSearchRecordLayer_L_81487F80: mr r3, r30 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - bne L_81488034 + bne CDBDatabaseSearchRecordLayer_L_81488034 mr r3, r30 bl CDBFindDataGetName bl CDBFSIsCDBFileOnSD cmpwi r3, 0x0 - beq L_81488034 + beq CDBDatabaseSearchRecordLayer_L_81488034 mr r3, r28 bl CDBFindDataGetName mr r17, r3 @@ -620,7 +620,7 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { bl CDBRecordKeyCompare lwz r0, 0x24(r1) mullw. r0, r0, r3 - ble L_81488034 + ble CDBDatabaseSearchRecordLayer_L_81488034 addi r3, r1, 0x18 addi r4, r1, 0x98 bl CDBRecordKeyArrayDicFind @@ -628,51 +628,51 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { addi r3, r1, 0x18 bl CDBRecordKeyArrayEnd cmplw r16, r3 - bne L_81488034 + bne CDBDatabaseSearchRecordLayer_L_81488034 addi r3, r1, 0x18 bl CDBRecordKeyArrayFull cmpwi r3, 0x0 - beq L_81488024 + beq CDBDatabaseSearchRecordLayer_L_81488024 li r27, 0x0 - L_81488024: + CDBDatabaseSearchRecordLayer_L_81488024: stw r15, 0xc0(r1) addi r3, r1, 0x18 addi r4, r1, 0x98 bl CDBRecordKeyArrayDicInsert - L_81488034: + CDBDatabaseSearchRecordLayer_L_81488034: mr r3, r30 bl CDBFSFindNext - L_8148803C: + CDBDatabaseSearchRecordLayer_L_8148803C: mr r3, r30 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_81487F80 + beq CDBDatabaseSearchRecordLayer_L_81487F80 mr r3, r30 bl CDBFSFindClose - L_81488054: + CDBDatabaseSearchRecordLayer_L_81488054: mr r3, r28 bl CDBFSFindNext - L_8148805C: + CDBDatabaseSearchRecordLayer_L_8148805C: mr r3, r28 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_81487F08 + beq CDBDatabaseSearchRecordLayer_L_81487F08 mr r3, r28 bl CDBFSFindClose - L_81488074: + CDBDatabaseSearchRecordLayer_L_81488074: mr r3, r29 bl CDBFSFindNext - L_8148807C: + CDBDatabaseSearchRecordLayer_L_8148807C: mr r3, r29 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_81487EA0 + beq CDBDatabaseSearchRecordLayer_L_81487EA0 mr r3, r29 bl CDBFSFindClose - L_81488094: + CDBDatabaseSearchRecordLayer_L_81488094: lwz r0, 0xd0(r1) cmpwi r0, 0x0 - beq L_814882F4 + beq CDBDatabaseSearchRecordLayer_L_814882F4 lwz r3, 0xcc(r1) mr r4, r20 mr r5, r21 @@ -686,17 +686,17 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { mr r3, r29 li r5, 0x2 bl CDBFSFindFirst - b L_814882DC - L_814880D8: + b CDBDatabaseSearchRecordLayer_L_814882DC + CDBDatabaseSearchRecordLayer_L_814880D8: mr r3, r29 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_814882D4 + beq CDBDatabaseSearchRecordLayer_L_814882D4 mr r3, r29 bl CDBFindDataGetName bl CDBFSIsMCGCDirNameOnSD cmpwi r3, 0x0 - beq L_814882D4 + beq CDBDatabaseSearchRecordLayer_L_814882D4 mr r3, r29 bl CDBFindDataGetName addi r0, r19, 0x28 @@ -714,17 +714,17 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { mr r3, r28 li r5, 0x2 bl CDBFSFindFirst - b L_814882BC - L_81488144: + b CDBDatabaseSearchRecordLayer_L_814882BC + CDBDatabaseSearchRecordLayer_L_81488144: mr r3, r28 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_814882B4 + beq CDBDatabaseSearchRecordLayer_L_814882B4 mr r3, r28 bl CDBFindDataGetName bl CDBFSIsTypeDirNameOnSD cmpwi r3, 0x0 - beq L_814882B4 + beq CDBDatabaseSearchRecordLayer_L_814882B4 mr r3, r28 bl CDBFindDataGetName mr r16, r3 @@ -746,17 +746,17 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { mr r4, r25 li r5, 0x2 bl CDBFSFindFirst - b L_8148829C - L_814881C0: + b CDBDatabaseSearchRecordLayer_L_8148829C + CDBDatabaseSearchRecordLayer_L_814881C0: mr r3, r30 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - bne L_81488294 + bne CDBDatabaseSearchRecordLayer_L_81488294 mr r3, r30 bl CDBFindDataGetName bl CDBFSIsCDBFileOnSD cmpwi r3, 0x0 - beq L_81488294 + beq CDBDatabaseSearchRecordLayer_L_81488294 mr r3, r28 bl CDBFindDataGetName mr r16, r3 @@ -775,15 +775,15 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { bl CDBConvKeyStrToEpochValue lwz r0, 0x14(r1) cmplw r31, r0 - bgt L_81488294 + bgt CDBDatabaseSearchRecordLayer_L_81488294 cmplw r0, r26 - bgt L_81488294 + bgt CDBDatabaseSearchRecordLayer_L_81488294 addi r3, r1, 0x98 addi r4, r1, 0x68 bl CDBRecordKeyCompare lwz r0, 0x24(r1) mullw. r0, r0, r3 - ble L_81488294 + ble CDBDatabaseSearchRecordLayer_L_81488294 addi r3, r1, 0x18 addi r4, r1, 0x98 bl CDBRecordKeyArrayDicFind @@ -791,58 +791,58 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { addi r3, r1, 0x18 bl CDBRecordKeyArrayEnd cmplw r16, r3 - bne L_81488294 + bne CDBDatabaseSearchRecordLayer_L_81488294 addi r3, r1, 0x18 bl CDBRecordKeyArrayFull cmpwi r3, 0x0 - beq L_81488284 + beq CDBDatabaseSearchRecordLayer_L_81488284 li r27, 0x0 - L_81488284: + CDBDatabaseSearchRecordLayer_L_81488284: stw r18, 0xc0(r1) addi r3, r1, 0x18 addi r4, r1, 0x98 bl CDBRecordKeyArrayDicInsert - L_81488294: + CDBDatabaseSearchRecordLayer_L_81488294: mr r3, r30 bl CDBFSFindNext - L_8148829C: + CDBDatabaseSearchRecordLayer_L_8148829C: mr r3, r30 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_814881C0 + beq CDBDatabaseSearchRecordLayer_L_814881C0 mr r3, r30 bl CDBFSFindClose - L_814882B4: + CDBDatabaseSearchRecordLayer_L_814882B4: mr r3, r28 bl CDBFSFindNext - L_814882BC: + CDBDatabaseSearchRecordLayer_L_814882BC: mr r3, r28 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_81488144 + beq CDBDatabaseSearchRecordLayer_L_81488144 mr r3, r28 bl CDBFSFindClose - L_814882D4: + CDBDatabaseSearchRecordLayer_L_814882D4: mr r3, r29 bl CDBFSFindNext - L_814882DC: + CDBDatabaseSearchRecordLayer_L_814882DC: mr r3, r29 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_814880D8 + beq CDBDatabaseSearchRecordLayer_L_814880D8 mr r3, r29 bl CDBFSFindClose - L_814882F4: + CDBDatabaseSearchRecordLayer_L_814882F4: addi r3, r1, 0x18 bl CDBRecordKeyArrayEmpty cmpwi r3, 0x0 - bne L_8148840C + bne CDBDatabaseSearchRecordLayer_L_8148840C lwz r0, 0x14(r19) cmpwi r0, 0x1 - bne L_8148838C + bne CDBDatabaseSearchRecordLayer_L_8148838C li r16, 0x0 - b L_81488378 - L_81488318: + b CDBDatabaseSearchRecordLayer_L_81488378 + CDBDatabaseSearchRecordLayer_L_81488318: mr r4, r16 addi r3, r1, 0x18 bl CDBRecordKeyArrayAt @@ -856,31 +856,31 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { addi r5, r1, 0x28 bl CDBDatabaseSearchCallCallback cmpwi r3, 0x0 - beq L_81488354 - b L_81488410 - L_81488354: + beq CDBDatabaseSearchRecordLayer_L_81488354 + b CDBDatabaseSearchRecordLayer_L_81488410 + CDBDatabaseSearchRecordLayer_L_81488354: mr r4, r17 addi r3, r1, 0x68 bl CDBRecordKeyCopy lwz r0, 0x20(r19) cmpwi r0, 0x0 - bne L_81488374 + bne CDBDatabaseSearchRecordLayer_L_81488374 li r3, 0x0 - b L_81488410 - L_81488374: + b CDBDatabaseSearchRecordLayer_L_81488410 + CDBDatabaseSearchRecordLayer_L_81488374: addi r16, r16, 0x1 - L_81488378: + CDBDatabaseSearchRecordLayer_L_81488378: addi r3, r1, 0x18 bl CDBRecordKeyArraySize cmpw r16, r3 - blt L_81488318 - b L_81488404 - L_8148838C: + blt CDBDatabaseSearchRecordLayer_L_81488318 + b CDBDatabaseSearchRecordLayer_L_81488404 + CDBDatabaseSearchRecordLayer_L_8148838C: addi r3, r1, 0x18 bl CDBRecordKeyArraySize subi r16, r3, 0x1 - b L_814883FC - L_8148839C: + b CDBDatabaseSearchRecordLayer_L_814883FC + CDBDatabaseSearchRecordLayer_L_8148839C: mr r4, r16 addi r3, r1, 0x18 bl CDBRecordKeyArrayAt @@ -894,28 +894,28 @@ asm CDBErr CDBDatabaseSearchRecordLayer() { addi r5, r1, 0x28 bl CDBDatabaseSearchCallCallback cmpwi r3, 0x0 - beq L_814883D8 - b L_81488410 - L_814883D8: + beq CDBDatabaseSearchRecordLayer_L_814883D8 + b CDBDatabaseSearchRecordLayer_L_81488410 + CDBDatabaseSearchRecordLayer_L_814883D8: mr r4, r17 addi r3, r1, 0x68 bl CDBRecordKeyCopy lwz r0, 0x20(r19) cmpwi r0, 0x0 - bne L_814883F8 + bne CDBDatabaseSearchRecordLayer_L_814883F8 li r3, 0x0 - b L_81488410 - L_814883F8: + b CDBDatabaseSearchRecordLayer_L_81488410 + CDBDatabaseSearchRecordLayer_L_814883F8: subi r16, r16, 0x1 - L_814883FC: + CDBDatabaseSearchRecordLayer_L_814883FC: cmpwi r16, 0x0 - bge L_8148839C - L_81488404: + bge CDBDatabaseSearchRecordLayer_L_8148839C + CDBDatabaseSearchRecordLayer_L_81488404: cmpwi r27, 0x0 - beq L_81487E54 - L_8148840C: + beq CDBDatabaseSearchRecordLayer_L_81487E54 + CDBDatabaseSearchRecordLayer_L_8148840C: li r3, 0x0 - L_81488410: + CDBDatabaseSearchRecordLayer_L_81488410: addi r11, r1, 0x120 bl _restgpr_14 lwz r0, 0x124(r1) @@ -955,22 +955,22 @@ asm CDBErr CDBDatabaseSearchMinuteLayer() { bl CDBIntArrayInit lwz r0, 0x14(r20) cmpwi r0, 0x0 - bne L_814884A8 + bne CDBDatabaseSearchMinuteLayer_L_814884A8 addi r3, r1, 0x10 bl CDBIntArraySetReverse li r0, 0x3c stw r0, 0x8(r1) - L_814884A8: + CDBDatabaseSearchMinuteLayer_L_814884A8: clrlwi r30, r25, 31 rlwinm r29, r25, 0, 30, 30 li r26, 0x0 li r31, 0x0 - b L_814887A4 - L_814884BC: + b CDBDatabaseSearchMinuteLayer_L_814887A4 + CDBDatabaseSearchMinuteLayer_L_814884BC: cmpwi r30, 0x0 stw r31, 0x18(r1) li r26, 0x1 - beq L_8148858C + beq CDBDatabaseSearchMinuteLayer_L_8148858C mr r3, r27 mr r4, r21 mr r5, r22 @@ -983,17 +983,17 @@ asm CDBErr CDBDatabaseSearchMinuteLayer() { mr r4, r27 li r5, 0x1 bl CDBFSFindFirst - b L_81488574 - L_81488500: + b CDBDatabaseSearchMinuteLayer_L_81488574 + CDBDatabaseSearchMinuteLayer_L_81488500: mr r3, r28 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_8148856C + beq CDBDatabaseSearchMinuteLayer_L_8148856C mr r3, r28 bl CDBFindDataGetName bl CDBFSIsMinuteDirName cmpwi r3, 0x0 - beq L_8148856C + beq CDBDatabaseSearchMinuteLayer_L_8148856C mr r3, r28 bl CDBFindDataGetName bl atoi @@ -1003,29 +1003,29 @@ asm CDBErr CDBDatabaseSearchMinuteLayer() { bl CDBIntCompare lwz r0, 0x1c(r1) mullw. r0, r0, r3 - ble L_8148856C + ble CDBDatabaseSearchMinuteLayer_L_8148856C addi r3, r1, 0x10 bl CDBIntArrayFull cmpwi r3, 0x0 - beq L_81488560 + beq CDBDatabaseSearchMinuteLayer_L_81488560 li r26, 0x0 - L_81488560: + CDBDatabaseSearchMinuteLayer_L_81488560: addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicInsert - L_8148856C: + CDBDatabaseSearchMinuteLayer_L_8148856C: mr r3, r28 bl CDBFSFindNext - L_81488574: + CDBDatabaseSearchMinuteLayer_L_81488574: mr r3, r28 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_81488500 + beq CDBDatabaseSearchMinuteLayer_L_81488500 mr r3, r28 bl CDBFSFindClose - L_8148858C: + CDBDatabaseSearchMinuteLayer_L_8148858C: cmpwi r29, 0x0 - beq L_81488674 + beq CDBDatabaseSearchMinuteLayer_L_81488674 mr r3, r27 mr r4, r21 mr r5, r22 @@ -1038,17 +1038,17 @@ asm CDBErr CDBDatabaseSearchMinuteLayer() { mr r4, r27 li r5, 0x2 bl CDBFSFindFirst - b L_8148865C - L_814885C8: + b CDBDatabaseSearchMinuteLayer_L_8148865C + CDBDatabaseSearchMinuteLayer_L_814885C8: mr r3, r28 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_81488654 + beq CDBDatabaseSearchMinuteLayer_L_81488654 mr r3, r28 bl CDBFindDataGetName bl CDBFSIsMinuteDirName cmpwi r3, 0x0 - beq L_81488654 + beq CDBDatabaseSearchMinuteLayer_L_81488654 mr r3, r28 bl CDBFindDataGetName bl atoi @@ -1058,7 +1058,7 @@ asm CDBErr CDBDatabaseSearchMinuteLayer() { bl CDBIntCompare lwz r0, 0x1c(r1) mullw. r0, r0, r3 - ble L_81488654 + ble CDBDatabaseSearchMinuteLayer_L_81488654 addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicFind @@ -1066,37 +1066,37 @@ asm CDBErr CDBDatabaseSearchMinuteLayer() { addi r3, r1, 0x10 bl CDBIntArrayEnd cmplw r18, r3 - bne L_81488654 + bne CDBDatabaseSearchMinuteLayer_L_81488654 addi r3, r1, 0x10 bl CDBIntArrayFull cmpwi r3, 0x0 - beq L_81488648 + beq CDBDatabaseSearchMinuteLayer_L_81488648 li r26, 0x0 - L_81488648: + CDBDatabaseSearchMinuteLayer_L_81488648: addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicInsert - L_81488654: + CDBDatabaseSearchMinuteLayer_L_81488654: mr r3, r28 bl CDBFSFindNext - L_8148865C: + CDBDatabaseSearchMinuteLayer_L_8148865C: mr r3, r28 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_814885C8 + beq CDBDatabaseSearchMinuteLayer_L_814885C8 mr r3, r28 bl CDBFSFindClose - L_81488674: + CDBDatabaseSearchMinuteLayer_L_81488674: addi r3, r1, 0x10 bl CDBIntArrayEmpty cmpwi r3, 0x0 - bne L_814887AC + bne CDBDatabaseSearchMinuteLayer_L_814887AC lwz r0, 0x14(r20) cmpwi r0, 0x1 - bne L_8148871C + bne CDBDatabaseSearchMinuteLayer_L_8148871C li r17, 0x0 - b L_81488708 - L_81488698: + b CDBDatabaseSearchMinuteLayer_L_81488708 + CDBDatabaseSearchMinuteLayer_L_81488698: mr r4, r17 addi r3, r1, 0x10 bl CDBIntArrayAt @@ -1114,31 +1114,31 @@ asm CDBErr CDBDatabaseSearchMinuteLayer() { addi r9, r1, 0x20 bl CDBDatabaseSearchRecordLayer cmpwi r3, 0x0 - beq L_814886E4 - b L_814887B0 - L_814886E4: + beq CDBDatabaseSearchMinuteLayer_L_814886E4 + b CDBDatabaseSearchMinuteLayer_L_814887B0 + CDBDatabaseSearchMinuteLayer_L_814886E4: lwz r0, 0x20(r20) cmpwi r0, 0x0 - bne L_814886F8 + bne CDBDatabaseSearchMinuteLayer_L_814886F8 li r3, 0x0 - b L_814887B0 - L_814886F8: + b CDBDatabaseSearchMinuteLayer_L_814887B0 + CDBDatabaseSearchMinuteLayer_L_814886F8: mr r4, r18 addi r3, r1, 0x8 bl CDBIntCopy addi r17, r17, 0x1 - L_81488708: + CDBDatabaseSearchMinuteLayer_L_81488708: addi r3, r1, 0x10 bl CDBIntArraySize cmpw r17, r3 - blt L_81488698 - b L_814887A4 - L_8148871C: + blt CDBDatabaseSearchMinuteLayer_L_81488698 + b CDBDatabaseSearchMinuteLayer_L_814887A4 + CDBDatabaseSearchMinuteLayer_L_8148871C: addi r3, r1, 0x10 bl CDBIntArraySize subi r18, r3, 0x1 - b L_8148879C - L_8148872C: + b CDBDatabaseSearchMinuteLayer_L_8148879C + CDBDatabaseSearchMinuteLayer_L_8148872C: mr r4, r18 addi r3, r1, 0x10 bl CDBIntArrayAt @@ -1156,28 +1156,28 @@ asm CDBErr CDBDatabaseSearchMinuteLayer() { addi r9, r1, 0x20 bl CDBDatabaseSearchRecordLayer cmpwi r3, 0x0 - beq L_81488778 - b L_814887B0 - L_81488778: + beq CDBDatabaseSearchMinuteLayer_L_81488778 + b CDBDatabaseSearchMinuteLayer_L_814887B0 + CDBDatabaseSearchMinuteLayer_L_81488778: lwz r0, 0x20(r20) cmpwi r0, 0x0 - bne L_8148878C + bne CDBDatabaseSearchMinuteLayer_L_8148878C li r3, 0x0 - b L_814887B0 - L_8148878C: + b CDBDatabaseSearchMinuteLayer_L_814887B0 + CDBDatabaseSearchMinuteLayer_L_8148878C: mr r4, r17 addi r3, r1, 0x8 bl CDBIntCopy subi r18, r18, 0x1 - L_8148879C: + CDBDatabaseSearchMinuteLayer_L_8148879C: cmpwi r18, 0x0 - bge L_8148872C - L_814887A4: + bge CDBDatabaseSearchMinuteLayer_L_8148872C + CDBDatabaseSearchMinuteLayer_L_814887A4: cmpwi r26, 0x0 - beq L_814884BC - L_814887AC: + beq CDBDatabaseSearchMinuteLayer_L_814884BC + CDBDatabaseSearchMinuteLayer_L_814887AC: li r3, 0x0 - L_814887B0: + CDBDatabaseSearchMinuteLayer_L_814887B0: addi r11, r1, 0x170 bl _restgpr_17 lwz r0, 0x174(r1) @@ -1216,22 +1216,22 @@ asm CDBErr CDBDatabaseSearchHourLayer() { bl CDBIntArrayInit lwz r0, 0x14(r21) cmpwi r0, 0x0 - bne L_81488844 + bne CDBDatabaseSearchHourLayer_L_81488844 addi r3, r1, 0x10 bl CDBIntArraySetReverse li r0, 0x18 stw r0, 0x8(r1) - L_81488844: + CDBDatabaseSearchHourLayer_L_81488844: clrlwi r30, r25, 31 rlwinm r29, r25, 0, 30, 30 li r26, 0x0 li r31, 0x0 - b L_81488B30 - L_81488858: + b CDBDatabaseSearchHourLayer_L_81488B30 + CDBDatabaseSearchHourLayer_L_81488858: cmpwi r30, 0x0 stw r31, 0x18(r1) li r26, 0x1 - beq L_81488924 + beq CDBDatabaseSearchHourLayer_L_81488924 mr r3, r27 mr r4, r22 mr r5, r23 @@ -1243,17 +1243,17 @@ asm CDBErr CDBDatabaseSearchHourLayer() { mr r4, r27 li r5, 0x1 bl CDBFSFindFirst - b L_8148890C - L_81488898: + b CDBDatabaseSearchHourLayer_L_8148890C + CDBDatabaseSearchHourLayer_L_81488898: mr r3, r28 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_81488904 + beq CDBDatabaseSearchHourLayer_L_81488904 mr r3, r28 bl CDBFindDataGetName bl CDBFSIsHourDirName cmpwi r3, 0x0 - beq L_81488904 + beq CDBDatabaseSearchHourLayer_L_81488904 mr r3, r28 bl CDBFindDataGetName bl atoi @@ -1263,29 +1263,29 @@ asm CDBErr CDBDatabaseSearchHourLayer() { bl CDBIntCompare lwz r0, 0x1c(r1) mullw. r0, r0, r3 - ble L_81488904 + ble CDBDatabaseSearchHourLayer_L_81488904 addi r3, r1, 0x10 bl CDBIntArrayFull cmpwi r3, 0x0 - beq L_814888F8 + beq CDBDatabaseSearchHourLayer_L_814888F8 li r26, 0x0 - L_814888F8: + CDBDatabaseSearchHourLayer_L_814888F8: addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicInsert - L_81488904: + CDBDatabaseSearchHourLayer_L_81488904: mr r3, r28 bl CDBFSFindNext - L_8148890C: + CDBDatabaseSearchHourLayer_L_8148890C: mr r3, r28 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_81488898 + beq CDBDatabaseSearchHourLayer_L_81488898 mr r3, r28 bl CDBFSFindClose - L_81488924: + CDBDatabaseSearchHourLayer_L_81488924: cmpwi r29, 0x0 - beq L_81488A08 + beq CDBDatabaseSearchHourLayer_L_81488A08 mr r3, r27 mr r4, r22 mr r5, r23 @@ -1297,17 +1297,17 @@ asm CDBErr CDBDatabaseSearchHourLayer() { mr r4, r27 li r5, 0x2 bl CDBFSFindFirst - b L_814889F0 - L_8148895C: + b CDBDatabaseSearchHourLayer_L_814889F0 + CDBDatabaseSearchHourLayer_L_8148895C: mr r3, r28 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_814889E8 + beq CDBDatabaseSearchHourLayer_L_814889E8 mr r3, r28 bl CDBFindDataGetName bl CDBFSIsHourDirName cmpwi r3, 0x0 - beq L_814889E8 + beq CDBDatabaseSearchHourLayer_L_814889E8 mr r3, r28 bl CDBFindDataGetName bl atoi @@ -1317,7 +1317,7 @@ asm CDBErr CDBDatabaseSearchHourLayer() { bl CDBIntCompare lwz r0, 0x1c(r1) mullw. r0, r0, r3 - ble L_814889E8 + ble CDBDatabaseSearchHourLayer_L_814889E8 addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicFind @@ -1325,37 +1325,37 @@ asm CDBErr CDBDatabaseSearchHourLayer() { addi r3, r1, 0x10 bl CDBIntArrayEnd cmplw r19, r3 - bne L_814889E8 + bne CDBDatabaseSearchHourLayer_L_814889E8 addi r3, r1, 0x10 bl CDBIntArrayFull cmpwi r3, 0x0 - beq L_814889DC + beq CDBDatabaseSearchHourLayer_L_814889DC li r26, 0x0 - L_814889DC: + CDBDatabaseSearchHourLayer_L_814889DC: addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicInsert - L_814889E8: + CDBDatabaseSearchHourLayer_L_814889E8: mr r3, r28 bl CDBFSFindNext - L_814889F0: + CDBDatabaseSearchHourLayer_L_814889F0: mr r3, r28 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_8148895C + beq CDBDatabaseSearchHourLayer_L_8148895C mr r3, r28 bl CDBFSFindClose - L_81488A08: + CDBDatabaseSearchHourLayer_L_81488A08: addi r3, r1, 0x10 bl CDBIntArrayEmpty cmpwi r3, 0x0 - bne L_81488B38 + bne CDBDatabaseSearchHourLayer_L_81488B38 lwz r0, 0x14(r21) cmpwi r0, 0x1 - bne L_81488AAC + bne CDBDatabaseSearchHourLayer_L_81488AAC li r18, 0x0 - b L_81488A98 - L_81488A2C: + b CDBDatabaseSearchHourLayer_L_81488A98 + CDBDatabaseSearchHourLayer_L_81488A2C: mr r4, r18 addi r3, r1, 0x10 bl CDBIntArrayAt @@ -1372,31 +1372,31 @@ asm CDBErr CDBDatabaseSearchHourLayer() { addi r8, r1, 0x20 bl CDBDatabaseSearchMinuteLayer cmpwi r3, 0x0 - beq L_81488A74 - b L_81488B3C - L_81488A74: + beq CDBDatabaseSearchHourLayer_L_81488A74 + b CDBDatabaseSearchHourLayer_L_81488B3C + CDBDatabaseSearchHourLayer_L_81488A74: lwz r0, 0x20(r21) cmpwi r0, 0x0 - bne L_81488A88 + bne CDBDatabaseSearchHourLayer_L_81488A88 li r3, 0x0 - b L_81488B3C - L_81488A88: + b CDBDatabaseSearchHourLayer_L_81488B3C + CDBDatabaseSearchHourLayer_L_81488A88: mr r4, r19 addi r3, r1, 0x8 bl CDBIntCopy addi r18, r18, 0x1 - L_81488A98: + CDBDatabaseSearchHourLayer_L_81488A98: addi r3, r1, 0x10 bl CDBIntArraySize cmpw r18, r3 - blt L_81488A2C - b L_81488B30 - L_81488AAC: + blt CDBDatabaseSearchHourLayer_L_81488A2C + b CDBDatabaseSearchHourLayer_L_81488B30 + CDBDatabaseSearchHourLayer_L_81488AAC: addi r3, r1, 0x10 bl CDBIntArraySize subi r19, r3, 0x1 - b L_81488B28 - L_81488ABC: + b CDBDatabaseSearchHourLayer_L_81488B28 + CDBDatabaseSearchHourLayer_L_81488ABC: mr r4, r19 addi r3, r1, 0x10 bl CDBIntArrayAt @@ -1413,28 +1413,28 @@ asm CDBErr CDBDatabaseSearchHourLayer() { addi r8, r1, 0x20 bl CDBDatabaseSearchMinuteLayer cmpwi r3, 0x0 - beq L_81488B04 - b L_81488B3C - L_81488B04: + beq CDBDatabaseSearchHourLayer_L_81488B04 + b CDBDatabaseSearchHourLayer_L_81488B3C + CDBDatabaseSearchHourLayer_L_81488B04: lwz r0, 0x20(r21) cmpwi r0, 0x0 - bne L_81488B18 + bne CDBDatabaseSearchHourLayer_L_81488B18 li r3, 0x0 - b L_81488B3C - L_81488B18: + b CDBDatabaseSearchHourLayer_L_81488B3C + CDBDatabaseSearchHourLayer_L_81488B18: mr r4, r18 addi r3, r1, 0x8 bl CDBIntCopy subi r19, r19, 0x1 - L_81488B28: + CDBDatabaseSearchHourLayer_L_81488B28: cmpwi r19, 0x0 - bge L_81488ABC - L_81488B30: + bge CDBDatabaseSearchHourLayer_L_81488ABC + CDBDatabaseSearchHourLayer_L_81488B30: cmpwi r26, 0x0 - beq L_81488858 - L_81488B38: + beq CDBDatabaseSearchHourLayer_L_81488858 + CDBDatabaseSearchHourLayer_L_81488B38: li r3, 0x0 - L_81488B3C: + CDBDatabaseSearchHourLayer_L_81488B3C: addi r11, r1, 0xb0 bl _restgpr_18 lwz r0, 0xb4(r1) @@ -1474,22 +1474,22 @@ asm CDBErr CDBDatabaseSearchDayLayer() { bl CDBIntArrayInit lwz r0, 0x14(r18) cmpwi r0, 0x0 - bne L_81488BD4 + bne CDBDatabaseSearchDayLayer_L_81488BD4 addi r3, r1, 0x10 bl CDBIntArraySetReverse li r0, 0x20 stw r0, 0x8(r1) - L_81488BD4: + CDBDatabaseSearchDayLayer_L_81488BD4: clrlwi r30, r21, 31 rlwinm r29, r21, 0, 30, 30 li r24, 0x0 li r31, 0x0 - b L_81488F20 - L_81488BE8: + b CDBDatabaseSearchDayLayer_L_81488F20 + CDBDatabaseSearchDayLayer_L_81488BE8: cmpwi r30, 0x0 stw r31, 0x18(r1) li r24, 0x1 - beq L_81488CB0 + beq CDBDatabaseSearchDayLayer_L_81488CB0 mr r3, r25 mr r4, r19 mr r5, r20 @@ -1500,17 +1500,17 @@ asm CDBErr CDBDatabaseSearchDayLayer() { mr r4, r25 li r5, 0x1 bl CDBFSFindFirst - b L_81488C98 - L_81488C24: + b CDBDatabaseSearchDayLayer_L_81488C98 + CDBDatabaseSearchDayLayer_L_81488C24: mr r3, r26 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_81488C90 + beq CDBDatabaseSearchDayLayer_L_81488C90 mr r3, r26 bl CDBFindDataGetName bl CDBFSIsDayDirName cmpwi r3, 0x0 - beq L_81488C90 + beq CDBDatabaseSearchDayLayer_L_81488C90 mr r3, r26 bl CDBFindDataGetName bl atoi @@ -1520,29 +1520,29 @@ asm CDBErr CDBDatabaseSearchDayLayer() { bl CDBIntCompare lwz r0, 0x1c(r1) mullw. r0, r0, r3 - ble L_81488C90 + ble CDBDatabaseSearchDayLayer_L_81488C90 addi r3, r1, 0x10 bl CDBIntArrayFull cmpwi r3, 0x0 - beq L_81488C84 + beq CDBDatabaseSearchDayLayer_L_81488C84 li r24, 0x0 - L_81488C84: + CDBDatabaseSearchDayLayer_L_81488C84: addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicInsert - L_81488C90: + CDBDatabaseSearchDayLayer_L_81488C90: mr r3, r26 bl CDBFSFindNext - L_81488C98: + CDBDatabaseSearchDayLayer_L_81488C98: mr r3, r26 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_81488C24 + beq CDBDatabaseSearchDayLayer_L_81488C24 mr r3, r26 bl CDBFSFindClose - L_81488CB0: + CDBDatabaseSearchDayLayer_L_81488CB0: cmpwi r29, 0x0 - beq L_81488D90 + beq CDBDatabaseSearchDayLayer_L_81488D90 mr r3, r25 mr r4, r19 mr r5, r20 @@ -1553,17 +1553,17 @@ asm CDBErr CDBDatabaseSearchDayLayer() { mr r4, r25 li r5, 0x2 bl CDBFSFindFirst - b L_81488D78 - L_81488CE4: + b CDBDatabaseSearchDayLayer_L_81488D78 + CDBDatabaseSearchDayLayer_L_81488CE4: mr r3, r26 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_81488D70 + beq CDBDatabaseSearchDayLayer_L_81488D70 mr r3, r26 bl CDBFindDataGetName bl CDBFSIsDayDirName cmpwi r3, 0x0 - beq L_81488D70 + beq CDBDatabaseSearchDayLayer_L_81488D70 mr r3, r26 bl CDBFindDataGetName bl atoi @@ -1573,7 +1573,7 @@ asm CDBErr CDBDatabaseSearchDayLayer() { bl CDBIntCompare lwz r0, 0x1c(r1) mullw. r0, r0, r3 - ble L_81488D70 + ble CDBDatabaseSearchDayLayer_L_81488D70 addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicFind @@ -1581,37 +1581,37 @@ asm CDBErr CDBDatabaseSearchDayLayer() { addi r3, r1, 0x10 bl CDBIntArrayEnd cmplw r27, r3 - bne L_81488D70 + bne CDBDatabaseSearchDayLayer_L_81488D70 addi r3, r1, 0x10 bl CDBIntArrayFull cmpwi r3, 0x0 - beq L_81488D64 + beq CDBDatabaseSearchDayLayer_L_81488D64 li r24, 0x0 - L_81488D64: + CDBDatabaseSearchDayLayer_L_81488D64: addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicInsert - L_81488D70: + CDBDatabaseSearchDayLayer_L_81488D70: mr r3, r26 bl CDBFSFindNext - L_81488D78: + CDBDatabaseSearchDayLayer_L_81488D78: mr r3, r26 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_81488CE4 + beq CDBDatabaseSearchDayLayer_L_81488CE4 mr r3, r26 bl CDBFSFindClose - L_81488D90: + CDBDatabaseSearchDayLayer_L_81488D90: addi r3, r1, 0x10 bl CDBIntArrayEmpty cmpwi r3, 0x0 - bne L_81488F28 + bne CDBDatabaseSearchDayLayer_L_81488F28 lwz r0, 0x14(r18) cmpwi r0, 0x1 - bne L_81488E68 + bne CDBDatabaseSearchDayLayer_L_81488E68 li r27, 0x0 - b L_81488E54 - L_81488DB4: + b CDBDatabaseSearchDayLayer_L_81488E54 + CDBDatabaseSearchDayLayer_L_81488DB4: mr r4, r27 addi r3, r1, 0x10 bl CDBIntArrayAt @@ -1622,14 +1622,14 @@ asm CDBErr CDBDatabaseSearchDayLayer() { bl CDBMakeCDBDateDayEnd lwz r0, 0x0(r18) cmplw r3, r0 - blt L_81488E44 + blt CDBDatabaseSearchDayLayer_L_81488E44 lwz r5, 0x0(r28) mr r3, r23 mr r4, r22 bl CDBMakeCDBDateDayBegin lwz r0, 0x4(r18) cmplw r0, r3 - blt L_81488E44 + blt CDBDatabaseSearchDayLayer_L_81488E44 lwz r4, 0x0(r28) addi r3, r1, 0x20 bl CDBConvDayValueToDayStr @@ -1641,31 +1641,31 @@ asm CDBErr CDBDatabaseSearchDayLayer() { addi r7, r1, 0x20 bl CDBDatabaseSearchHourLayer cmpwi r3, 0x0 - beq L_81488E30 - b L_81488F2C - L_81488E30: + beq CDBDatabaseSearchDayLayer_L_81488E30 + b CDBDatabaseSearchDayLayer_L_81488F2C + CDBDatabaseSearchDayLayer_L_81488E30: lwz r0, 0x20(r18) cmpwi r0, 0x0 - bne L_81488E44 + bne CDBDatabaseSearchDayLayer_L_81488E44 li r3, 0x0 - b L_81488F2C - L_81488E44: + b CDBDatabaseSearchDayLayer_L_81488F2C + CDBDatabaseSearchDayLayer_L_81488E44: mr r4, r28 addi r3, r1, 0x8 bl CDBIntCopy addi r27, r27, 0x1 - L_81488E54: + CDBDatabaseSearchDayLayer_L_81488E54: addi r3, r1, 0x10 bl CDBIntArraySize cmpw r27, r3 - blt L_81488DB4 - b L_81488F20 - L_81488E68: + blt CDBDatabaseSearchDayLayer_L_81488DB4 + b CDBDatabaseSearchDayLayer_L_81488F20 + CDBDatabaseSearchDayLayer_L_81488E68: addi r3, r1, 0x10 bl CDBIntArraySize subi r28, r3, 0x1 - b L_81488F18 - L_81488E78: + b CDBDatabaseSearchDayLayer_L_81488F18 + CDBDatabaseSearchDayLayer_L_81488E78: mr r4, r28 addi r3, r1, 0x10 bl CDBIntArrayAt @@ -1676,14 +1676,14 @@ asm CDBErr CDBDatabaseSearchDayLayer() { bl CDBMakeCDBDateDayEnd lwz r0, 0x0(r18) cmplw r3, r0 - blt L_81488F08 + blt CDBDatabaseSearchDayLayer_L_81488F08 lwz r5, 0x0(r27) mr r3, r23 mr r4, r22 bl CDBMakeCDBDateDayBegin lwz r0, 0x4(r18) cmplw r0, r3 - blt L_81488F08 + blt CDBDatabaseSearchDayLayer_L_81488F08 lwz r4, 0x0(r27) addi r3, r1, 0x20 bl CDBConvDayValueToDayStr @@ -1695,28 +1695,28 @@ asm CDBErr CDBDatabaseSearchDayLayer() { addi r7, r1, 0x20 bl CDBDatabaseSearchHourLayer cmpwi r3, 0x0 - beq L_81488EF4 - b L_81488F2C - L_81488EF4: + beq CDBDatabaseSearchDayLayer_L_81488EF4 + b CDBDatabaseSearchDayLayer_L_81488F2C + CDBDatabaseSearchDayLayer_L_81488EF4: lwz r0, 0x20(r18) cmpwi r0, 0x0 - bne L_81488F08 + bne CDBDatabaseSearchDayLayer_L_81488F08 li r3, 0x0 - b L_81488F2C - L_81488F08: + b CDBDatabaseSearchDayLayer_L_81488F2C + CDBDatabaseSearchDayLayer_L_81488F08: mr r4, r27 addi r3, r1, 0x8 bl CDBIntCopy subi r28, r28, 0x1 - L_81488F18: + CDBDatabaseSearchDayLayer_L_81488F18: cmpwi r28, 0x0 - bge L_81488E78 - L_81488F20: + bge CDBDatabaseSearchDayLayer_L_81488E78 + CDBDatabaseSearchDayLayer_L_81488F20: cmpwi r24, 0x0 - beq L_81488BE8 - L_81488F28: + beq CDBDatabaseSearchDayLayer_L_81488BE8 + CDBDatabaseSearchDayLayer_L_81488F28: li r3, 0x0 - L_81488F2C: + CDBDatabaseSearchDayLayer_L_81488F2C: addi r11, r1, 0x100 bl _restgpr_17 lwz r0, 0x104(r1) @@ -1752,22 +1752,22 @@ asm CDBErr CDBDatabaseSearchMonthLayer() { bl CDBIntArrayInit lwz r0, 0x14(r22) cmpwi r0, 0x0 - bne L_81488FB4 + bne CDBDatabaseSearchMonthLayer_L_81488FB4 addi r3, r1, 0x10 bl CDBIntArraySetReverse li r0, 0xc stw r0, 0x8(r1) - L_81488FB4: + CDBDatabaseSearchMonthLayer_L_81488FB4: clrlwi r30, r24, 31 rlwinm r29, r24, 0, 30, 30 li r26, 0x0 li r31, 0x0 - b L_814892E0 - L_81488FC8: + b CDBDatabaseSearchMonthLayer_L_814892E0 + CDBDatabaseSearchMonthLayer_L_81488FC8: cmpwi r30, 0x0 stw r31, 0x18(r1) li r26, 0x1 - beq L_8148908C + beq CDBDatabaseSearchMonthLayer_L_8148908C mr r3, r27 mr r4, r23 li r5, 0x1 @@ -1777,17 +1777,17 @@ asm CDBErr CDBDatabaseSearchMonthLayer() { mr r4, r27 li r5, 0x1 bl CDBFSFindFirst - b L_81489074 - L_81489000: + b CDBDatabaseSearchMonthLayer_L_81489074 + CDBDatabaseSearchMonthLayer_L_81489000: mr r3, r28 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_8148906C + beq CDBDatabaseSearchMonthLayer_L_8148906C mr r3, r28 bl CDBFindDataGetName bl CDBFSIsMonthDirName cmpwi r3, 0x0 - beq L_8148906C + beq CDBDatabaseSearchMonthLayer_L_8148906C mr r3, r28 bl CDBFindDataGetName bl atoi @@ -1797,29 +1797,29 @@ asm CDBErr CDBDatabaseSearchMonthLayer() { bl CDBIntCompare lwz r0, 0x1c(r1) mullw. r0, r0, r3 - ble L_8148906C + ble CDBDatabaseSearchMonthLayer_L_8148906C addi r3, r1, 0x10 bl CDBIntArrayFull cmpwi r3, 0x0 - beq L_81489060 + beq CDBDatabaseSearchMonthLayer_L_81489060 li r26, 0x0 - L_81489060: + CDBDatabaseSearchMonthLayer_L_81489060: addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicInsert - L_8148906C: + CDBDatabaseSearchMonthLayer_L_8148906C: mr r3, r28 bl CDBFSFindNext - L_81489074: + CDBDatabaseSearchMonthLayer_L_81489074: mr r3, r28 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_81489000 + beq CDBDatabaseSearchMonthLayer_L_81489000 mr r3, r28 bl CDBFSFindClose - L_8148908C: + CDBDatabaseSearchMonthLayer_L_8148908C: cmpwi r29, 0x0 - beq L_81489168 + beq CDBDatabaseSearchMonthLayer_L_81489168 mr r3, r27 mr r4, r23 addi r6, r22, 0x28 @@ -1829,17 +1829,17 @@ asm CDBErr CDBDatabaseSearchMonthLayer() { mr r4, r27 li r5, 0x2 bl CDBFSFindFirst - b L_81489150 - L_814890BC: + b CDBDatabaseSearchMonthLayer_L_81489150 + CDBDatabaseSearchMonthLayer_L_814890BC: mr r3, r28 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_81489148 + beq CDBDatabaseSearchMonthLayer_L_81489148 mr r3, r28 bl CDBFindDataGetName bl CDBFSIsMonthDirName cmpwi r3, 0x0 - beq L_81489148 + beq CDBDatabaseSearchMonthLayer_L_81489148 mr r3, r28 bl CDBFindDataGetName bl atoi @@ -1849,7 +1849,7 @@ asm CDBErr CDBDatabaseSearchMonthLayer() { bl CDBIntCompare lwz r0, 0x1c(r1) mullw. r0, r0, r3 - ble L_81489148 + ble CDBDatabaseSearchMonthLayer_L_81489148 addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicFind @@ -1857,37 +1857,37 @@ asm CDBErr CDBDatabaseSearchMonthLayer() { addi r3, r1, 0x10 bl CDBIntArrayEnd cmplw r20, r3 - bne L_81489148 + bne CDBDatabaseSearchMonthLayer_L_81489148 addi r3, r1, 0x10 bl CDBIntArrayFull cmpwi r3, 0x0 - beq L_8148913C + beq CDBDatabaseSearchMonthLayer_L_8148913C li r26, 0x0 - L_8148913C: + CDBDatabaseSearchMonthLayer_L_8148913C: addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicInsert - L_81489148: + CDBDatabaseSearchMonthLayer_L_81489148: mr r3, r28 bl CDBFSFindNext - L_81489150: + CDBDatabaseSearchMonthLayer_L_81489150: mr r3, r28 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_814890BC + beq CDBDatabaseSearchMonthLayer_L_814890BC mr r3, r28 bl CDBFSFindClose - L_81489168: + CDBDatabaseSearchMonthLayer_L_81489168: addi r3, r1, 0x10 bl CDBIntArrayEmpty cmpwi r3, 0x0 - bne L_814892E8 + bne CDBDatabaseSearchMonthLayer_L_814892E8 lwz r0, 0x14(r22) cmpwi r0, 0x1 - bne L_81489234 + bne CDBDatabaseSearchMonthLayer_L_81489234 li r19, 0x0 - b L_81489220 - L_8148918C: + b CDBDatabaseSearchMonthLayer_L_81489220 + CDBDatabaseSearchMonthLayer_L_8148918C: mr r4, r19 addi r3, r1, 0x10 bl CDBIntArrayAt @@ -1897,13 +1897,13 @@ asm CDBErr CDBDatabaseSearchMonthLayer() { bl CDBMakeCDBDateMonthEnd lwz r0, 0x0(r22) cmplw r3, r0 - blt L_81489210 + blt CDBDatabaseSearchMonthLayer_L_81489210 lwz r4, 0x0(r20) mr r3, r25 bl CDBMakeCDBDateMonthBegin lwz r0, 0x4(r22) cmplw r0, r3 - blt L_81489210 + blt CDBDatabaseSearchMonthLayer_L_81489210 lwz r4, 0x0(r20) addi r3, r1, 0x20 bl CDBConvMonthValueToMonthStr @@ -1914,31 +1914,31 @@ asm CDBErr CDBDatabaseSearchMonthLayer() { addi r6, r1, 0x20 bl CDBDatabaseSearchDayLayer cmpwi r3, 0x0 - beq L_814891FC - b L_814892EC - L_814891FC: + beq CDBDatabaseSearchMonthLayer_L_814891FC + b CDBDatabaseSearchMonthLayer_L_814892EC + CDBDatabaseSearchMonthLayer_L_814891FC: lwz r0, 0x20(r22) cmpwi r0, 0x0 - bne L_81489210 + bne CDBDatabaseSearchMonthLayer_L_81489210 li r3, 0x0 - b L_814892EC - L_81489210: + b CDBDatabaseSearchMonthLayer_L_814892EC + CDBDatabaseSearchMonthLayer_L_81489210: mr r4, r20 addi r3, r1, 0x8 bl CDBIntCopy addi r19, r19, 0x1 - L_81489220: + CDBDatabaseSearchMonthLayer_L_81489220: addi r3, r1, 0x10 bl CDBIntArraySize cmpw r19, r3 - blt L_8148918C - b L_814892E0 - L_81489234: + blt CDBDatabaseSearchMonthLayer_L_8148918C + b CDBDatabaseSearchMonthLayer_L_814892E0 + CDBDatabaseSearchMonthLayer_L_81489234: addi r3, r1, 0x10 bl CDBIntArraySize subi r20, r3, 0x1 - b L_814892D8 - L_81489244: + b CDBDatabaseSearchMonthLayer_L_814892D8 + CDBDatabaseSearchMonthLayer_L_81489244: mr r4, r20 addi r3, r1, 0x10 bl CDBIntArrayAt @@ -1948,13 +1948,13 @@ asm CDBErr CDBDatabaseSearchMonthLayer() { bl CDBMakeCDBDateMonthEnd lwz r0, 0x0(r22) cmplw r3, r0 - blt L_814892C8 + blt CDBDatabaseSearchMonthLayer_L_814892C8 lwz r4, 0x0(r19) mr r3, r25 bl CDBMakeCDBDateMonthBegin lwz r0, 0x4(r22) cmplw r0, r3 - blt L_814892C8 + blt CDBDatabaseSearchMonthLayer_L_814892C8 lwz r4, 0x0(r19) addi r3, r1, 0x20 bl CDBConvMonthValueToMonthStr @@ -1965,28 +1965,28 @@ asm CDBErr CDBDatabaseSearchMonthLayer() { addi r6, r1, 0x20 bl CDBDatabaseSearchDayLayer cmpwi r3, 0x0 - beq L_814892B4 - b L_814892EC - L_814892B4: + beq CDBDatabaseSearchMonthLayer_L_814892B4 + b CDBDatabaseSearchMonthLayer_L_814892EC + CDBDatabaseSearchMonthLayer_L_814892B4: lwz r0, 0x20(r22) cmpwi r0, 0x0 - bne L_814892C8 + bne CDBDatabaseSearchMonthLayer_L_814892C8 li r3, 0x0 - b L_814892EC - L_814892C8: + b CDBDatabaseSearchMonthLayer_L_814892EC + CDBDatabaseSearchMonthLayer_L_814892C8: mr r4, r19 addi r3, r1, 0x8 bl CDBIntCopy subi r20, r20, 0x1 - L_814892D8: + CDBDatabaseSearchMonthLayer_L_814892D8: cmpwi r20, 0x0 - bge L_81489244 - L_814892E0: + bge CDBDatabaseSearchMonthLayer_L_81489244 + CDBDatabaseSearchMonthLayer_L_814892E0: cmpwi r26, 0x0 - beq L_81488FC8 - L_814892E8: + beq CDBDatabaseSearchMonthLayer_L_81488FC8 + CDBDatabaseSearchMonthLayer_L_814892E8: li r3, 0x0 - L_814892EC: + CDBDatabaseSearchMonthLayer_L_814892EC: addi r11, r1, 0xb0 bl _restgpr_19 lwz r0, 0xb4(r1) @@ -2010,10 +2010,10 @@ asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions mr r25, r4 mr r26, r5 addi r28, r6, 0x430c - bne L_8148933C + bne CDBDatabaseSearchYearLayer_L_8148933C li r3, 0x1 - b L_81489664 - L_8148933C: + b CDBDatabaseSearchYearLayer_L_81489664 + CDBDatabaseSearchYearLayer_L_8148933C: li r0, 0x0 addi r3, r1, 0x10 stw r0, 0x8(r1) @@ -2022,36 +2022,36 @@ asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions bl CDBIntArrayInit lwz r0, 0x14(r25) cmpwi r0, 0x0 - bne L_81489370 + bne CDBDatabaseSearchYearLayer_L_81489370 addi r3, r1, 0x10 bl CDBIntArraySetReverse li r0, 0x270f stw r0, 0x8(r1) - L_81489370: + CDBDatabaseSearchYearLayer_L_81489370: clrlwi r30, r26, 31 rlwinm r29, r26, 0, 30, 30 li r27, 0x0 li r31, 0x0 - b L_81489658 - L_81489384: + b CDBDatabaseSearchYearLayer_L_81489658 + CDBDatabaseSearchYearLayer_L_81489384: cmpwi r30, 0x0 stw r31, 0x18(r1) li r27, 0x1 - beq L_81489430 + beq CDBDatabaseSearchYearLayer_L_81489430 mr r3, r28 li r4, 0x1 bl CDBFSFindFirstRoot - b L_81489418 - L_814893A4: + b CDBDatabaseSearchYearLayer_L_81489418 + CDBDatabaseSearchYearLayer_L_814893A4: mr r3, r28 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_81489410 + beq CDBDatabaseSearchYearLayer_L_81489410 mr r3, r28 bl CDBFindDataGetName bl CDBFSIsYearDirName cmpwi r3, 0x0 - beq L_81489410 + beq CDBDatabaseSearchYearLayer_L_81489410 mr r3, r28 bl CDBFindDataGetName bl atoi @@ -2061,44 +2061,44 @@ asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions bl CDBIntCompare lwz r0, 0x1c(r1) mullw. r0, r0, r3 - ble L_81489410 + ble CDBDatabaseSearchYearLayer_L_81489410 addi r3, r1, 0x10 bl CDBIntArrayFull cmpwi r3, 0x0 - beq L_81489404 + beq CDBDatabaseSearchYearLayer_L_81489404 li r27, 0x0 - L_81489404: + CDBDatabaseSearchYearLayer_L_81489404: addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicInsert - L_81489410: + CDBDatabaseSearchYearLayer_L_81489410: mr r3, r28 bl CDBFSFindNext - L_81489418: + CDBDatabaseSearchYearLayer_L_81489418: mr r3, r28 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_814893A4 + beq CDBDatabaseSearchYearLayer_L_814893A4 mr r3, r28 bl CDBFSFindClose - L_81489430: + CDBDatabaseSearchYearLayer_L_81489430: cmpwi r29, 0x0 - beq L_814894F8 + beq CDBDatabaseSearchYearLayer_L_814894F8 mr r3, r28 addi r5, r25, 0x28 li r4, 0x2 bl CDBFSFindFirstRootEx - b L_814894E0 - L_8148944C: + b CDBDatabaseSearchYearLayer_L_814894E0 + CDBDatabaseSearchYearLayer_L_8148944C: mr r3, r28 bl CDBFindDataIsDirectory cmpwi r3, 0x0 - beq L_814894D8 + beq CDBDatabaseSearchYearLayer_L_814894D8 mr r3, r28 bl CDBFindDataGetName bl CDBFSIsYearDirName cmpwi r3, 0x0 - beq L_814894D8 + beq CDBDatabaseSearchYearLayer_L_814894D8 mr r3, r28 bl CDBFindDataGetName bl atoi @@ -2108,7 +2108,7 @@ asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions bl CDBIntCompare lwz r0, 0x1c(r1) mullw. r0, r0, r3 - ble L_814894D8 + ble CDBDatabaseSearchYearLayer_L_814894D8 addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicFind @@ -2116,37 +2116,37 @@ asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions addi r3, r1, 0x10 bl CDBIntArrayEnd cmplw r23, r3 - bne L_814894D8 + bne CDBDatabaseSearchYearLayer_L_814894D8 addi r3, r1, 0x10 bl CDBIntArrayFull cmpwi r3, 0x0 - beq L_814894CC + beq CDBDatabaseSearchYearLayer_L_814894CC li r27, 0x0 - L_814894CC: + CDBDatabaseSearchYearLayer_L_814894CC: addi r3, r1, 0x10 addi r4, r1, 0xc bl CDBIntArrayDicInsert - L_814894D8: + CDBDatabaseSearchYearLayer_L_814894D8: mr r3, r28 bl CDBFSFindNext - L_814894E0: + CDBDatabaseSearchYearLayer_L_814894E0: mr r3, r28 bl CDBFindDataIsEnd cmpwi r3, 0x0 - beq L_8148944C + beq CDBDatabaseSearchYearLayer_L_8148944C mr r3, r28 bl CDBFSFindClose - L_814894F8: + CDBDatabaseSearchYearLayer_L_814894F8: addi r3, r1, 0x10 bl CDBIntArrayEmpty cmpwi r3, 0x0 - bne L_81489660 + bne CDBDatabaseSearchYearLayer_L_81489660 lwz r0, 0x14(r25) cmpwi r0, 0x1 - bne L_814895B8 + bne CDBDatabaseSearchYearLayer_L_814895B8 li r22, 0x0 - b L_814895A4 - L_8148951C: + b CDBDatabaseSearchYearLayer_L_814895A4 + CDBDatabaseSearchYearLayer_L_8148951C: mr r4, r22 addi r3, r1, 0x10 bl CDBIntArrayAt @@ -2155,12 +2155,12 @@ asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions bl CDBMakeCDBDateYearEnd lwz r0, 0x0(r25) cmplw r3, r0 - blt L_81489594 + blt CDBDatabaseSearchYearLayer_L_81489594 lwz r3, 0x0(r23) bl CDBMakeCDBDateYearBegin lwz r0, 0x4(r25) cmplw r0, r3 - blt L_81489594 + blt CDBDatabaseSearchYearLayer_L_81489594 lwz r4, 0x0(r23) addi r3, r1, 0x40 bl CDBConvYearValueToYearStr @@ -2170,31 +2170,31 @@ asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions addi r5, r1, 0x40 bl CDBDatabaseSearchMonthLayer cmpwi r3, 0x0 - beq L_81489580 - b L_81489664 - L_81489580: + beq CDBDatabaseSearchYearLayer_L_81489580 + b CDBDatabaseSearchYearLayer_L_81489664 + CDBDatabaseSearchYearLayer_L_81489580: lwz r0, 0x20(r25) cmpwi r0, 0x0 - bne L_81489594 + bne CDBDatabaseSearchYearLayer_L_81489594 li r3, 0x0 - b L_81489664 - L_81489594: + b CDBDatabaseSearchYearLayer_L_81489664 + CDBDatabaseSearchYearLayer_L_81489594: mr r4, r23 addi r3, r1, 0x8 bl CDBIntCopy addi r22, r22, 0x1 - L_814895A4: + CDBDatabaseSearchYearLayer_L_814895A4: addi r3, r1, 0x10 bl CDBIntArraySize cmpw r22, r3 - blt L_8148951C - b L_81489658 - L_814895B8: + blt CDBDatabaseSearchYearLayer_L_8148951C + b CDBDatabaseSearchYearLayer_L_81489658 + CDBDatabaseSearchYearLayer_L_814895B8: addi r3, r1, 0x10 bl CDBIntArraySize subi r23, r3, 0x1 - b L_81489650 - L_814895C8: + b CDBDatabaseSearchYearLayer_L_81489650 + CDBDatabaseSearchYearLayer_L_814895C8: mr r4, r23 addi r3, r1, 0x10 bl CDBIntArrayAt @@ -2203,12 +2203,12 @@ asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions bl CDBMakeCDBDateYearEnd lwz r0, 0x0(r25) cmplw r3, r0 - blt L_81489640 + blt CDBDatabaseSearchYearLayer_L_81489640 lwz r3, 0x0(r22) bl CDBMakeCDBDateYearBegin lwz r0, 0x4(r25) cmplw r0, r3 - blt L_81489640 + blt CDBDatabaseSearchYearLayer_L_81489640 lwz r4, 0x0(r22) addi r3, r1, 0x40 bl CDBConvYearValueToYearStr @@ -2218,28 +2218,28 @@ asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions addi r5, r1, 0x40 bl CDBDatabaseSearchMonthLayer cmpwi r3, 0x0 - beq L_8148962C - b L_81489664 - L_8148962C: + beq CDBDatabaseSearchYearLayer_L_8148962C + b CDBDatabaseSearchYearLayer_L_81489664 + CDBDatabaseSearchYearLayer_L_8148962C: lwz r0, 0x20(r25) cmpwi r0, 0x0 - bne L_81489640 + bne CDBDatabaseSearchYearLayer_L_81489640 li r3, 0x0 - b L_81489664 - L_81489640: + b CDBDatabaseSearchYearLayer_L_81489664 + CDBDatabaseSearchYearLayer_L_81489640: mr r4, r22 addi r3, r1, 0x8 bl CDBIntCopy subi r23, r23, 0x1 - L_81489650: + CDBDatabaseSearchYearLayer_L_81489650: cmpwi r23, 0x0 - bge L_814895C8 - L_81489658: + bge CDBDatabaseSearchYearLayer_L_814895C8 + CDBDatabaseSearchYearLayer_L_81489658: cmpwi r27, 0x0 - beq L_81489384 - L_81489660: + beq CDBDatabaseSearchYearLayer_L_81489384 + CDBDatabaseSearchYearLayer_L_81489660: li r3, 0x0 - L_81489664: + CDBDatabaseSearchYearLayer_L_81489664: addi r11, r1, 0x90 bl _restgpr_22 lwz r0, 0x94(r1) -- 2.49.1 From 0d9d3d10814b70216220a96fb69e4bbc82f8b369 Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:35:07 -0500 Subject: [PATCH 06/16] cleanup(runtime): prefix Matching asm L_* labels with function names (#645) Rename 65 bare address labels in Runtime helpers (__div2u/__div2i/__mod*, __cvt_*, __shr2i) to FunctionName_L_ for readability; codegen unchanged. Verified: ninja build/43U/ok; runtime 100%/100%; DOL sha1 unchanged. --- libs/Runtime/src/runtime.c | 276 ++++++++++++++++++------------------- 1 file changed, 138 insertions(+), 138 deletions(-) diff --git a/libs/Runtime/src/runtime.c b/libs/Runtime/src/runtime.c index f8b96566..6f996530 100644 --- a/libs/Runtime/src/runtime.c +++ b/libs/Runtime/src/runtime.c @@ -313,18 +313,18 @@ asm void __div2u() { cmpwi r3, 0x0 cntlzw r0, r3 cntlzw r9, r4 - bne L_815F9538 + bne __div2u_L_815F9538 addi r0, r9, 0x20 -L_815F9538: +__div2u_L_815F9538: cmpwi r5, 0x0 cntlzw r9, r5 cntlzw r10, r6 - bne L_815F954C + bne __div2u_L_815F954C addi r9, r10, 0x20 -L_815F954C: +__div2u_L_815F954C: cmpw r0, r9 subfic r10, r0, 0x40 - bgt L_815F9604 + bgt __div2u_L_815F9604 addi r9, r9, 0x1 subfic r9, r9, 0x40 add r0, r0, r9 @@ -332,49 +332,49 @@ L_815F954C: mtctr r9 cmpwi r9, 0x20 subi r7, r9, 0x20 - blt L_815F9584 + blt __div2u_L_815F9584 srw r8, r3, r7 li r7, 0x0 - b L_815F9598 -L_815F9584: + b __div2u_L_815F9598 +__div2u_L_815F9584: srw r8, r4, r9 subfic r7, r9, 0x20 slw r7, r3, r7 or r8, r8, r7 srw r7, r3, r9 -L_815F9598: +__div2u_L_815F9598: cmpwi r0, 0x20 subic r9, r0, 0x20 - blt L_815F95B0 + blt __div2u_L_815F95B0 slw r3, r4, r9 li r4, 0x0 - b L_815F95C4 -L_815F95B0: + b __div2u_L_815F95C4 +__div2u_L_815F95B0: slw r3, r3, r0 subfic r9, r0, 0x20 srw r9, r4, r9 or r3, r3, r9 slw r4, r4, r0 -L_815F95C4: +__div2u_L_815F95C4: li r10, -0x1 addic r7, r7, 0x0 -L_815F95CC: +__div2u_L_815F95CC: adde r4, r4, r4 adde r3, r3, r3 adde r8, r8, r8 adde r7, r7, r7 subfc r0, r6, r8 subfe. r9, r5, r7 - blt L_815F95F4 + blt __div2u_L_815F95F4 mr r8, r0 mr r7, r9 addic r0, r10, 0x1 -L_815F95F4: - bdnz L_815F95CC +__div2u_L_815F95F4: + bdnz __div2u_L_815F95CC adde r4, r4, r4 adde r3, r3, r3 blr -L_815F9604: +__div2u_L_815F9604: li r4, 0x0 li r3, 0x0 blr @@ -385,32 +385,32 @@ asm void __div2i() { #ifdef __MWERKS__ stwu r1, -0x10(r1) clrrwi. r9, r3, 31 - beq L_815F9624 + beq __div2i_L_815F9624 subfic r4, r4, 0x0 subfze r3, r3 -L_815F9624: +__div2i_L_815F9624: stw r9, 0x8(r1) clrrwi. r10, r5, 31 - beq L_815F9638 + beq __div2i_L_815F9638 subfic r6, r6, 0x0 subfze r5, r5 -L_815F9638: +__div2i_L_815F9638: stw r10, 0xc(r1) cmpwi r3, 0x0 cntlzw r0, r3 cntlzw r9, r4 - bne L_815F9650 + bne __div2i_L_815F9650 addi r0, r9, 0x20 -L_815F9650: +__div2i_L_815F9650: cmpwi r5, 0x0 cntlzw r9, r5 cntlzw r10, r6 - bne L_815F9664 + bne __div2i_L_815F9664 addi r9, r10, 0x20 -L_815F9664: +__div2i_L_815F9664: cmpw r0, r9 subfic r10, r0, 0x40 - bgt L_815F9738 + bgt __div2i_L_815F9738 addi r9, r9, 0x1 subfic r9, r9, 0x40 add r0, r0, r9 @@ -418,60 +418,60 @@ L_815F9664: mtctr r9 cmpwi r9, 0x20 subi r7, r9, 0x20 - blt L_815F969C + blt __div2i_L_815F969C srw r8, r3, r7 li r7, 0x0 - b L_815F96B0 -L_815F969C: + b __div2i_L_815F96B0 +__div2i_L_815F969C: srw r8, r4, r9 subfic r7, r9, 0x20 slw r7, r3, r7 or r8, r8, r7 srw r7, r3, r9 -L_815F96B0: +__div2i_L_815F96B0: cmpwi r0, 0x20 subic r9, r0, 0x20 - blt L_815F96C8 + blt __div2i_L_815F96C8 slw r3, r4, r9 li r4, 0x0 - b L_815F96DC -L_815F96C8: + b __div2i_L_815F96DC +__div2i_L_815F96C8: slw r3, r3, r0 subfic r9, r0, 0x20 srw r9, r4, r9 or r3, r3, r9 slw r4, r4, r0 -L_815F96DC: +__div2i_L_815F96DC: li r10, -0x1 addic r7, r7, 0x0 -L_815F96E4: +__div2i_L_815F96E4: adde r4, r4, r4 adde r3, r3, r3 adde r8, r8, r8 adde r7, r7, r7 subfc r0, r6, r8 subfe. r9, r5, r7 - blt L_815F970C + blt __div2i_L_815F970C mr r8, r0 mr r7, r9 addic r0, r10, 0x1 -L_815F970C: - bdnz L_815F96E4 +__div2i_L_815F970C: + bdnz __div2i_L_815F96E4 adde r4, r4, r4 adde r3, r3, r3 lwz r9, 0x8(r1) lwz r10, 0xc(r1) xor. r7, r9, r10 - beq L_815F9734 + beq __div2i_L_815F9734 cmpwi r9, 0x0 subfic r4, r4, 0x0 subfze r3, r3 -L_815F9734: - b L_815F9740 -L_815F9738: +__div2i_L_815F9734: + b __div2i_L_815F9740 +__div2i_L_815F9738: li r4, 0x0 li r3, 0x0 -L_815F9740: +__div2i_L_815F9740: addi r1, r1, 0x10 blr #endif @@ -482,18 +482,18 @@ asm void __mod2u() { cmpwi r3, 0x0 cntlzw r0, r3 cntlzw r9, r4 - bne L_815F975C + bne __mod2u_L_815F975C addi r0, r9, 0x20 -L_815F975C: +__mod2u_L_815F975C: cmpwi r5, 0x0 cntlzw r9, r5 cntlzw r10, r6 - bne L_815F9770 + bne __mod2u_L_815F9770 addi r9, r10, 0x20 -L_815F9770: +__mod2u_L_815F9770: cmpw r0, r9 subfic r10, r0, 0x40 - bgt L_815F9828 + bgt __mod2u_L_815F9828 addi r9, r9, 0x1 subfic r9, r9, 0x40 add r0, r0, r9 @@ -501,49 +501,49 @@ L_815F9770: mtctr r9 cmpwi r9, 0x20 subi r7, r9, 0x20 - blt L_815F97A8 + blt __mod2u_L_815F97A8 srw r8, r3, r7 li r7, 0x0 - b L_815F97BC -L_815F97A8: + b __mod2u_L_815F97BC +__mod2u_L_815F97A8: srw r8, r4, r9 subfic r7, r9, 0x20 slw r7, r3, r7 or r8, r8, r7 srw r7, r3, r9 -L_815F97BC: +__mod2u_L_815F97BC: cmpwi r0, 0x20 subic r9, r0, 0x20 - blt L_815F97D4 + blt __mod2u_L_815F97D4 slw r3, r4, r9 li r4, 0x0 - b L_815F97E8 -L_815F97D4: + b __mod2u_L_815F97E8 +__mod2u_L_815F97D4: slw r3, r3, r0 subfic r9, r0, 0x20 srw r9, r4, r9 or r3, r3, r9 slw r4, r4, r0 -L_815F97E8: +__mod2u_L_815F97E8: li r10, -0x1 addic r7, r7, 0x0 -L_815F97F0: +__mod2u_L_815F97F0: adde r4, r4, r4 adde r3, r3, r3 adde r8, r8, r8 adde r7, r7, r7 subfc r0, r6, r8 subfe. r9, r5, r7 - blt L_815F9818 + blt __mod2u_L_815F9818 mr r8, r0 mr r7, r9 addic r0, r10, 0x1 -L_815F9818: - bdnz L_815F97F0 +__mod2u_L_815F9818: + bdnz __mod2u_L_815F97F0 mr r4, r8 mr r3, r7 blr -L_815F9828: +__mod2u_L_815F9828: blr #endif } @@ -551,30 +551,30 @@ L_815F9828: asm void __mod2i() { #ifdef __MWERKS__ cmpwi cr7, r3, 0x0 - bge cr7, L_815F983C + bge cr7, __mod2i_L_815F983C subfic r4, r4, 0x0 subfze r3, r3 -L_815F983C: +__mod2i_L_815F983C: cmpwi r5, 0x0 - bge L_815F984C + bge __mod2i_L_815F984C subfic r6, r6, 0x0 subfze r5, r5 -L_815F984C: +__mod2i_L_815F984C: cmpwi r3, 0x0 cntlzw r0, r3 cntlzw r9, r4 - bne L_815F9860 + bne __mod2i_L_815F9860 addi r0, r9, 0x20 -L_815F9860: +__mod2i_L_815F9860: cmpwi r5, 0x0 cntlzw r9, r5 cntlzw r10, r6 - bne L_815F9874 + bne __mod2i_L_815F9874 addi r9, r10, 0x20 -L_815F9874: +__mod2i_L_815F9874: cmpw r0, r9 subfic r10, r0, 0x40 - bgt L_815F9928 + bgt __mod2i_L_815F9928 addi r9, r9, 0x1 subfic r9, r9, 0x40 add r0, r0, r9 @@ -582,52 +582,52 @@ L_815F9874: mtctr r9 cmpwi r9, 0x20 subi r7, r9, 0x20 - blt L_815F98AC + blt __mod2i_L_815F98AC srw r8, r3, r7 li r7, 0x0 - b L_815F98C0 -L_815F98AC: + b __mod2i_L_815F98C0 +__mod2i_L_815F98AC: srw r8, r4, r9 subfic r7, r9, 0x20 slw r7, r3, r7 or r8, r8, r7 srw r7, r3, r9 -L_815F98C0: +__mod2i_L_815F98C0: cmpwi r0, 0x20 subic r9, r0, 0x20 - blt L_815F98D8 + blt __mod2i_L_815F98D8 slw r3, r4, r9 li r4, 0x0 - b L_815F98EC -L_815F98D8: + b __mod2i_L_815F98EC +__mod2i_L_815F98D8: slw r3, r3, r0 subfic r9, r0, 0x20 srw r9, r4, r9 or r3, r3, r9 slw r4, r4, r0 -L_815F98EC: +__mod2i_L_815F98EC: li r10, -0x1 addic r7, r7, 0x0 -L_815F98F4: +__mod2i_L_815F98F4: adde r4, r4, r4 adde r3, r3, r3 adde r8, r8, r8 adde r7, r7, r7 subfc r0, r6, r8 subfe. r9, r5, r7 - blt L_815F991C + blt __mod2i_L_815F991C mr r8, r0 mr r7, r9 addic r0, r10, 0x1 -L_815F991C: - bdnz L_815F98F4 +__mod2i_L_815F991C: + bdnz __mod2i_L_815F98F4 mr r4, r8 mr r3, r7 -L_815F9928: - bge cr7, L_815F9934 +__mod2i_L_815F9928: + bge cr7, __mod2i_L_815F9934 subfic r4, r4, 0x0 subfze r3, r3 -L_815F9934: +__mod2i_L_815F9934: blr #endif } @@ -668,9 +668,9 @@ asm void __shr2i() { slw r10, r3, r8 or r4, r4, r10 sraw r10, r3, r9 - ble L_815F99A0 + ble __shr2i_L_815F99A0 or r4, r4, r10 -L_815F99A0: +__shr2i_L_815F99A0: sraw r3, r3, r5 blr #endif @@ -680,13 +680,13 @@ asm void __cvt_sll_dbl() { #ifdef __MWERKS__ stwu r1, -0x10(r1) clrrwi. r5, r3, 31 - beq L_815F99BC + beq __cvt_sll_dbl_L_815F99BC subfic r4, r4, 0x0 subfze r3, r3 -L_815F99BC: +__cvt_sll_dbl_L_815F99BC: or. r7, r3, r4 li r6, 0x0 - beq L_815F9A44 + beq __cvt_sll_dbl_L_815F9A44 cntlzw r7, r3 cntlzw r8, r4 extlwi r9, r7, 5, 26 @@ -705,22 +705,22 @@ L_815F99BC: clrlwi r7, r4, 21 cmpwi r7, 0x400 addi r6, r6, 0x43e - blt L_815F9A2C - bgt L_815F9A20 + blt __cvt_sll_dbl_L_815F9A2C + bgt __cvt_sll_dbl_L_815F9A20 rlwinm. r7, r4, 0, 20, 20 - beq L_815F9A2C -L_815F9A20: + beq __cvt_sll_dbl_L_815F9A2C +__cvt_sll_dbl_L_815F9A20: addic r4, r4, 0x800 addze r3, r3 addze r6, r6 -L_815F9A2C: +__cvt_sll_dbl_L_815F9A2C: rotrwi r4, r4, 11 rlwimi r4, r3, 21, 0, 10 extrwi r3, r3, 20, 1 slwi r6, r6, 20 or r3, r6, r3 or r3, r5, r3 -L_815F9A44: +__cvt_sll_dbl_L_815F9A44: stw r3, 0x8(r1) stw r4, 0xc(r1) lfd f1, 0x8(r1) @@ -734,7 +734,7 @@ asm void __cvt_ull_dbl() { stwu r1, -0x10(r1) or. r7, r3, r4 li r6, 0x0 - beq L_815F9AE0 + beq __cvt_ull_dbl_L_815F9AE0 cntlzw r7, r3 cntlzw r8, r4 extlwi r9, r7, 5, 26 @@ -753,21 +753,21 @@ asm void __cvt_ull_dbl() { clrlwi r7, r4, 21 cmpwi r7, 0x400 addi r6, r6, 0x43e - blt L_815F9ACC - bgt L_815F9AC0 + blt __cvt_ull_dbl_L_815F9ACC + bgt __cvt_ull_dbl_L_815F9AC0 rlwinm. r7, r4, 0, 20, 20 - beq L_815F9ACC -L_815F9AC0: + beq __cvt_ull_dbl_L_815F9ACC +__cvt_ull_dbl_L_815F9AC0: addic r4, r4, 0x800 addze r3, r3 addze r6, r6 -L_815F9ACC: +__cvt_ull_dbl_L_815F9ACC: rotrwi r4, r4, 11 rlwimi r4, r3, 21, 0, 10 extrwi r3, r3, 20, 1 slwi r6, r6, 20 or r3, r6, r3 -L_815F9AE0: +__cvt_ull_dbl_L_815F9AE0: stw r3, 0x8(r1) stw r4, 0xc(r1) lfd f1, 0x8(r1) @@ -781,7 +781,7 @@ asm void __cvt_ull_flt() { stwu r1, -0x10(r1) or. r7, r3, r4 li r6, 0x0 - beq L_815F9B7C + beq __cvt_ull_flt_L_815F9B7C cntlzw r7, r3 cntlzw r8, r4 extlwi r9, r7, 5, 26 @@ -800,21 +800,21 @@ asm void __cvt_ull_flt() { clrlwi r7, r4, 21 cmpwi r7, 0x400 addi r6, r6, 0x43e - blt L_815F9B68 - bgt L_815F9B5C + blt __cvt_ull_flt_L_815F9B68 + bgt __cvt_ull_flt_L_815F9B5C rlwinm. r7, r4, 0, 20, 20 - beq L_815F9B68 -L_815F9B5C: + beq __cvt_ull_flt_L_815F9B68 +__cvt_ull_flt_L_815F9B5C: addic r4, r4, 0x800 addze r3, r3 addze r6, r6 -L_815F9B68: +__cvt_ull_flt_L_815F9B68: rotrwi r4, r4, 11 rlwimi r4, r3, 21, 0, 10 extrwi r3, r3, 20, 1 slwi r6, r6, 20 or r3, r6, r3 -L_815F9B7C: +__cvt_ull_flt_L_815F9B7C: stw r3, 0x8(r1) stw r4, 0xc(r1) lfd f1, 0x8(r1) @@ -832,17 +832,17 @@ asm void __cvt_dbl_usll() { lwz r4, 0xc(r1) extrwi r5, r3, 11, 1 cmplwi r5, 0x3ff - bge L_815F9BBC + bge __cvt_dbl_usll_L_815F9BBC li r3, 0x0 li r4, 0x0 - b L_815F9C58 -L_815F9BBC: + b __cvt_dbl_usll_L_815F9C58 +__cvt_dbl_usll_L_815F9BBC: mr r6, r3 clrlwi r3, r3, 12 oris r3, r3, 0x10 subi r5, r5, 0x433 cmpwi r5, 0x0 - bge L_815F9BFC + bge __cvt_dbl_usll_L_815F9BFC neg r5, r5 subfic r8, r5, 0x20 subic r9, r5, 0x20 @@ -852,21 +852,21 @@ L_815F9BBC: srw r10, r3, r9 or r4, r4, r10 srw r3, r3, r5 - b L_815F9C48 -L_815F9BFC: + b __cvt_dbl_usll_L_815F9C48 +__cvt_dbl_usll_L_815F9BFC: cmpwi r5, 0xa - ble+ L_815F9C28 + ble+ __cvt_dbl_usll_L_815F9C28 clrrwi. r6, r6, 31 - beq L_815F9C18 + beq __cvt_dbl_usll_L_815F9C18 lis r3, 0x8000 li r4, 0x0 - b L_815F9C58 -L_815F9C18: + b __cvt_dbl_usll_L_815F9C58 +__cvt_dbl_usll_L_815F9C18: lis r3, 0x7fff ori r3, r3, 0xffff li r4, -0x1 - b L_815F9C58 -L_815F9C28: + b __cvt_dbl_usll_L_815F9C58 +__cvt_dbl_usll_L_815F9C28: subfic r8, r5, 0x20 subic r9, r5, 0x20 slw r3, r3, r5 @@ -875,12 +875,12 @@ L_815F9C28: slw r10, r4, r9 or r3, r3, r10 slw r4, r4, r5 -L_815F9C48: +__cvt_dbl_usll_L_815F9C48: clrrwi. r6, r6, 31 - beq L_815F9C58 + beq __cvt_dbl_usll_L_815F9C58 subfic r4, r4, 0x0 subfze r3, r3 -L_815F9C58: +__cvt_dbl_usll_L_815F9C58: addi r1, r1, 0x10 blr #endif @@ -894,19 +894,19 @@ asm void __cvt_dbl_ull() { lwz r4, 0xc(r1) extrwi r5, r3, 11, 1 cmplwi r5, 0x3ff - bge L_815F9C88 -L_815F9C7C: + bge __cvt_dbl_ull_L_815F9C88 +__cvt_dbl_ull_L_815F9C7C: li r3, 0x0 li r4, 0x0 - b L_815F9D00 -L_815F9C88: + b __cvt_dbl_ull_L_815F9D00 +__cvt_dbl_ull_L_815F9C88: clrrwi. r6, r3, 31 - bne L_815F9C7C + bne __cvt_dbl_ull_L_815F9C7C clrlwi r3, r3, 12 oris r3, r3, 0x10 subi r5, r5, 0x433 cmpwi r5, 0x0 - bge L_815F9CCC + bge __cvt_dbl_ull_L_815F9CCC neg r5, r5 subfic r8, r5, 0x20 subic r9, r5, 0x20 @@ -916,14 +916,14 @@ L_815F9C88: srw r10, r3, r9 or r4, r4, r10 srw r3, r3, r5 - b L_815F9D00 -L_815F9CCC: + b __cvt_dbl_ull_L_815F9D00 +__cvt_dbl_ull_L_815F9CCC: cmpwi r5, 0xb - ble+ L_815F9CE0 + ble+ __cvt_dbl_ull_L_815F9CE0 li r3, -0x1 li r4, -0x1 - b L_815F9D00 -L_815F9CE0: + b __cvt_dbl_ull_L_815F9D00 +__cvt_dbl_ull_L_815F9CE0: subfic r8, r5, 0x20 subic r9, r5, 0x20 slw r3, r3, r5 @@ -932,7 +932,7 @@ L_815F9CE0: slw r10, r4, r9 or r3, r3, r10 slw r4, r4, r5 -L_815F9D00: +__cvt_dbl_ull_L_815F9D00: addi r1, r1, 0x10 blr #endif -- 2.49.1 From 17be3b014bf3a8cf6b3fb41ae74b95b990adafcf Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:35:13 -0500 Subject: [PATCH 07/16] cleanup(ChannelSelect): name updateDiskState asm labels (#646) Rename address-suffixed local labels and jumptable_8164DE80 inside the carefully Equivalent updateDiskState asm to case*/done semantic names. symbols.txt updated for the jumptable; codegen unchanged. Verified: ninja build/43U/ok; ~96.37% code / ~99.76% fuzzy; DOL sha1 unchanged. --- config/43U/symbols.txt | 2 +- src/scene/channelSelect/iplChannelSelect.cpp | 114 +++++++++---------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/config/43U/symbols.txt b/config/43U/symbols.txt index 8a977019..48c41ee4 100644 --- a/config/43U/symbols.txt +++ b/config/43U/symbols.txt @@ -15942,7 +15942,7 @@ lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37 lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD scPaneName_N_GCIcon = .data:0x8164DE64; // type:object size:0x9 data:string scPaneName_N_DiscUpdateIcon = .data:0x8164DE6D; // type:object size:0x11 data:string -jumptable_8164DE80 = .data:0x8164DE80; // type:object size:0x1C scope:local +updateDiskState_jumptable = .data:0x8164DE80; // type:object size:0x1C scope:local scSE_WSD_SELECT = .data:0x8164DE9C; // type:object size:0xB data:string lbl_8164DEA7 = .data:0x8164DEA7; // type:object size:0x10 data:string lbl_8164DEB7 = .data:0x8164DEB7; // type:object size:0x114 diff --git a/src/scene/channelSelect/iplChannelSelect.cpp b/src/scene/channelSelect/iplChannelSelect.cpp index eb51ed5d..ef7660db 100644 --- a/src/scene/channelSelect/iplChannelSelect.cpp +++ b/src/scene/channelSelect/iplChannelSelect.cpp @@ -92,7 +92,7 @@ namespace ipl { extern "C" void List_GetNth__Q24nw4r2utFPCQ34nw4r2ut4ListUs(); extern "C" void getChannelBasePane__Q33ipl5scene13ChannelSelectFi(); extern "C" void initPane__Q33ipl3gui11PaneManagerFPQ34nw4r3lyt4Pane(); - extern "C" void* jumptable_8164DE80[]; + extern "C" void* updateDiskState_jumptable[]; extern "C" void getCurrentChannel__Q33ipl7channel7ManagerFPiPi(); extern "C" void calcNormalRestart__Q33ipl5scene13ChannelSelectFv(); extern "C" void _savegpr_28(); @@ -857,7 +857,7 @@ namespace ipl { extern "C" char scPaneName_N_GCIcon[] = "N_GCIcon"; extern "C" char scPaneName_N_DiscUpdateIcon[] = "N_DiscUpdateIcon"; - extern "C" void* jumptable_8164DE80[7] = { + extern "C" void* updateDiskState_jumptable[7] = { (void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x4C), (void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x21C), (void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x284), @@ -1346,18 +1346,18 @@ namespace ipl { lwz r4, 0xa8(r28) cmplwi r0, 0x6 lwz r27, 0x4(r4) - bgt updateDiskState_813AD2C8 - lis r4, jumptable_8164DE80@ha + bgt updateDiskState_done + lis r4, updateDiskState_jumptable@ha slwi r0, r0, 2 - addi r4, r4, jumptable_8164DE80@l + addi r4, r4, updateDiskState_jumptable@l lwzx r4, r4, r0 mtctr r4 bctr - updateDiskState_813ACF94: + updateDiskState_case0: lwz r4, 0xa4(r3) lwz r0, 0x14(r4) cmpwi r0, 0x1 - beq updateDiskState_813AD2C8 + beq updateDiskState_done lwz r3, 0x94(r3) lis r29, scPaneName_N_GCIcon@ha addi r4, r29, scPaneName_N_GCIcon@l @@ -1381,7 +1381,7 @@ namespace ipl { li r4, 0x0 bl SetVisible__Q34nw4r3lyt4PaneFb cmpwi r27, 0x5 - bne updateDiskState_813AD078 + bne updateDiskState_case0_diskState3 lwz r4, 0xc0(r31) lwz r3, 0x84(r28) subi r4, r4, 0xf @@ -1391,32 +1391,32 @@ namespace ipl { lwz r0, 0xc0(r31) mr r27, r3 cmpwi r0, 0xf - bne updateDiskState_813AD03C + bne updateDiskState_case0_afterThumb lwz r3, 0xa8(r28) addi r4, r31, 0xf8 addi r5, r31, 0xfc bl getDiskInfo__Q33ipl3bs27ManagerFPPcPPc - updateDiskState_813AD03C: + updateDiskState_case0_afterThumb: cmpwi r27, 0x0 - beq updateDiskState_813AD050 + beq updateDiskState_case0_afterLayout lwz r3, 0x90(r31) mr r4, r27 bl createDiskLayout__Q33ipl5scene10ChannelObjFPv - updateDiskState_813AD050: + updateDiskState_case0_afterLayout: lbz r0, 0xf4(r31) cmpwi r0, 0x0 - bne updateDiskState_813AD064 + bne updateDiskState_case0_afterDiskIn mr r3, r31 bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv - updateDiskState_813AD064: + updateDiskState_case0_afterDiskIn: li r3, 0x0 li r0, 0x1 stb r3, 0xf4(r31) stw r0, 0xf0(r31) - b updateDiskState_813AD2C8 - updateDiskState_813AD078: + b updateDiskState_done + updateDiskState_case0_diskState3: cmpwi r27, 0x3 - bne updateDiskState_813AD134 + bne updateDiskState_case0_diskState6 lwz r3, 0x84(r28) li r0, 0x0 addi r4, r29, scPaneName_N_GCIcon@l @@ -1444,7 +1444,7 @@ namespace ipl { bl setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object lwz r3, 0x98(r31) cmpwi r3, 0x0 - beq updateDiskState_813AD10C + beq updateDiskState_case0_state3_afterAnim li r0, 0x2 stw r0, 0x18(r3) lwz r28, 0x98(r31) @@ -1452,45 +1452,45 @@ namespace ipl { bl initFrame__Q33ipl7utility15FrameControllerFv li r0, 0x1 stw r0, 0x14(r28) - updateDiskState_813AD10C: + updateDiskState_case0_state3_afterAnim: lbz r0, 0xf4(r31) cmpwi r0, 0x0 - bne updateDiskState_813AD120 + bne updateDiskState_case0_state3_afterDiskIn mr r3, r31 bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv - updateDiskState_813AD120: + updateDiskState_case0_state3_afterDiskIn: li r3, 0x0 li r0, 0x1 stb r3, 0xf4(r31) stw r0, 0xf0(r31) - b updateDiskState_813AD2C8 - updateDiskState_813AD134: + b updateDiskState_done + updateDiskState_case0_diskState6: cmpwi r27, 0x6 - bne updateDiskState_813AD2C8 + bne updateDiskState_done lbz r0, 0xf4(r31) cmpwi r0, 0x0 - bne updateDiskState_813AD150 + bne updateDiskState_case0_state6_afterDiskIn mr r3, r31 bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv - updateDiskState_813AD150: + updateDiskState_case0_state6_afterDiskIn: li r3, 0x0 li r0, 0x4 stb r3, 0xf4(r31) stw r0, 0xf0(r31) - b updateDiskState_813AD2C8 - updateDiskState_813AD164: + b updateDiskState_done + updateDiskState_case1: lwz r4, 0x8c(r3) lwz r0, 0x14(r4) cmpwi r0, 0x1 - beq updateDiskState_813AD2C8 + beq updateDiskState_done lwz r3, 0x90(r3) bl resetDiskTitleName__Q33ipl5scene10ChannelObjFv cmpwi r27, 0x5 - bne updateDiskState_813AD1C0 + bne updateDiskState_case1_setState3 lwz r3, 0x90(r31) lwz r3, 0x34(r3) cmpwi r3, 0x0 - beq updateDiskState_813AD1B4 + beq updateDiskState_case1_setState2 li r0, 0x2 stw r0, 0x18(r3) lwz r3, 0x90(r31) @@ -1499,85 +1499,85 @@ namespace ipl { bl initFrame__Q33ipl7utility15FrameControllerFv li r0, 0x1 stw r0, 0x14(r27) - updateDiskState_813AD1B4: + updateDiskState_case1_setState2: li r0, 0x2 stw r0, 0xf0(r31) - b updateDiskState_813AD2C8 - updateDiskState_813AD1C0: + b updateDiskState_done + updateDiskState_case1_setState3: li r0, 0x3 stw r0, 0xf0(r31) - b updateDiskState_813AD2C8 - updateDiskState_813AD1CC: + b updateDiskState_done + updateDiskState_case2: cmpwi r27, 0x5 - bne updateDiskState_813AD1E4 + bne updateDiskState_case2_doOut lwz r4, 0x84(r28) lbz r0, 0x1b81(r4) cmpwi r0, 0x0 - beq updateDiskState_813AD2C8 - updateDiskState_813AD1E4: + beq updateDiskState_done + updateDiskState_case2_doOut: lwz r3, 0xa0(r3) lwz r0, 0x14(r3) cmpwi r0, 0x1 - beq updateDiskState_813AD2C8 + beq updateDiskState_done mr r3, r31 bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv lwz r3, 0x90(r31) bl changeDisk__Q33ipl5scene10ChannelObjFv li r0, 0x6 stw r0, 0xf0(r31) - b updateDiskState_813AD2C8 - updateDiskState_813AD210: + b updateDiskState_done + updateDiskState_case3: cmpwi r27, 0x3 - bne updateDiskState_813AD228 + bne updateDiskState_case3_doOut lwz r4, 0x84(r28) lbz r0, 0x1b81(r4) cmpwi r0, 0x0 - beq updateDiskState_813AD2C8 - updateDiskState_813AD228: + beq updateDiskState_done + updateDiskState_case3_doOut: lwz r3, 0xa0(r3) lwz r0, 0x14(r3) cmpwi r0, 0x1 - beq updateDiskState_813AD2C8 + beq updateDiskState_done mr r3, r31 bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv lwz r3, 0x90(r31) bl changeDisk__Q33ipl5scene10ChannelObjFv li r0, 0x6 stw r0, 0xf0(r31) - b updateDiskState_813AD2C8 - updateDiskState_813AD254: + b updateDiskState_done + updateDiskState_case4: lwz r4, 0x8c(r3) lwz r0, 0x14(r4) cmpwi r0, 0x1 - beq updateDiskState_813AD2C8 + beq updateDiskState_done li r0, 0x5 stw r0, 0xf0(r3) - b updateDiskState_813AD2C8 - updateDiskState_813AD270: + b updateDiskState_done + updateDiskState_case5: cmpwi r27, 0x6 - beq updateDiskState_813AD2C8 + beq updateDiskState_done lwz r4, 0xa0(r3) lwz r0, 0x14(r4) cmpwi r0, 0x1 - beq updateDiskState_813AD2C8 + beq updateDiskState_done bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv lwz r3, 0x90(r31) bl changeDisk__Q33ipl5scene10ChannelObjFv li r0, 0x6 stw r0, 0xf0(r31) - b updateDiskState_813AD2C8 - updateDiskState_813AD2A0: + b updateDiskState_done + updateDiskState_case6: lwz r4, 0x8c(r3) lwz r0, 0x14(r4) cmpwi r0, 0x1 - beq updateDiskState_813AD2C8 + beq updateDiskState_done lwz r3, 0x90(r3) bl destroyDiskLayout__Q33ipl5scene10ChannelObjFv lwz r3, 0x90(r31) bl resetDiskTitleName__Q33ipl5scene10ChannelObjFv li r0, 0x0 stw r0, 0xf0(r31) - updateDiskState_813AD2C8: + updateDiskState_done: addi r11, r1, 0x20 bl _restgpr_27 lwz r0, 0x24(r1) -- 2.49.1 From abf047831a33981e824fdea61ccf638a9c35cd3d Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:35:19 -0500 Subject: [PATCH 08/16] cleanup(tiInputForm): rename scInputForm0_7111111F to DegToFIdx (#647) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0.7111111f is 256/360 (degrees → nw4r SinFIdx units). Drop the digit-heavy name that looked like an address suffix. Verified: ninja build/43U/ok; fuzzy unchanged; DOL sha1 unchanged. --- config/43U/symbols.txt | 2 +- src/keyboard/tiInputForm.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/43U/symbols.txt b/config/43U/symbols.txt index 48c41ee4..7b395be0 100644 --- a/config/43U/symbols.txt +++ b/config/43U/symbols.txt @@ -20622,7 +20622,7 @@ scInputForm640F = .sdata2:0x81694D2C; // type:object size:0x4 align:4 data:float scInputFormF32ConvertMagic = .sdata2:0x81694D30; // type:object size:0x8 align:8 data:double scInputFormOneF = .sdata2:0x81694D38; // type:object size:0x4 align:4 data:float scInputFormHalfF = .sdata2:0x81694D3C; // type:object size:0x4 align:4 data:float -scInputForm0_7111111F = .sdata2:0x81694D40; // type:object size:0x4 align:4 data:float +scInputFormDegToFIdxF = .sdata2:0x81694D40; // type:object size:0x4 align:4 data:float scInputForm150F = .sdata2:0x81694D44; // type:object size:0x4 align:4 data:float scInputForm30F = .sdata2:0x81694D48; // type:object size:0x4 align:4 data:float scInputForm50F = .sdata2:0x81694D4C; // type:object size:0x4 align:4 data:float diff --git a/src/keyboard/tiInputForm.cpp b/src/keyboard/tiInputForm.cpp index 6883a003..b5408084 100644 --- a/src/keyboard/tiInputForm.cpp +++ b/src/keyboard/tiInputForm.cpp @@ -391,7 +391,7 @@ extern "C" const f32 scInputForm640F = 640.0f; extern "C" const f64 scInputFormF32ConvertMagic = 4503601774854144.0; extern "C" const f32 scInputFormOneF = 1.0f; extern "C" const f32 scInputFormHalfF = 0.5f; -extern "C" const f32 scInputForm0_7111111F = 0.7111111f; +extern "C" const f32 scInputFormDegToFIdxF = 0.7111111f; extern "C" const f32 scInputForm150F = 150.0f; extern "C" const f32 scInputForm30F = 30.0f; extern "C" const f32 scInputForm50F = 50.0f; -- 2.49.1 From 9acdd7f8dcd3e5841ddc1d8a6e871eb9ca577464 Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:37:02 -0500 Subject: [PATCH 09/16] cleanup(WDScan): name OUI sdata/sdata2 padding bytes (#648) Rename leftover lbl_* pad bytes that sit between the RSN/WPA OUI triples (and after scWpaFindOui*) so force_active and locals match the existing sc* naming. --- config/43U/config.yml | 4 ++-- libs/RevoEX/src/wd/WDScan.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/43U/config.yml b/config/43U/config.yml index e524bda7..17096fbc 100644 --- a/config/43U/config.yml +++ b/config/43U/config.yml @@ -29,8 +29,8 @@ force_active: - strspn - strcspn - padding__Q23ipl5scene - - lbl_81695063 - - lbl_81695067 + - scRsnOuiPad + - scWpaOuiPad - __vt__Q49textinput6extend4memo19NigaoeEventObserver # textinput::toolbar::csPaneToAnimation points one past the end of csAninationFile. diff --git a/libs/RevoEX/src/wd/WDScan.c b/libs/RevoEX/src/wd/WDScan.c index a188eccd..ff909a5e 100644 --- a/libs/RevoEX/src/wd/WDScan.c +++ b/libs/RevoEX/src/wd/WDScan.c @@ -13,22 +13,22 @@ const u8 scRsnOui0 = 0; const u8 scRsnOui1 = 0x0F; const u8 scRsnOui2 = 0xAC; -const u8 lbl_81695063 = 0; +const u8 scRsnOuiPad = 0; const u8 scWpaOui0 = 0; const u8 scWpaOui1 = 0x50; const u8 scWpaOui2 = 0xF2; -const u8 lbl_81695067 = 0; +const u8 scWpaOuiPad = 0; #pragma pop #pragma push #pragma section sconst_type ".sdata" const u8 scWpaFindOui0 = 0; const u8 scWpaFindOui1 = 0x50; const u8 scWpaFindOui2 = 0xF2; -const u8 lbl_81697D73 = 0; -const u8 lbl_81697D74 = 0; -const u8 lbl_81697D75 = 0; -const u8 lbl_81697D76 = 0; -const u8 lbl_81697D77 = 0; +const u8 scWpaFindOuiPad0 = 0; +const u8 scWpaFindOuiPad1 = 0; +const u8 scWpaFindOuiPad2 = 0; +const u8 scWpaFindOuiPad3 = 0; +const u8 scWpaFindOuiPad4 = 0; #pragma pop #define scRsnOui0 (*((volatile const u8*)&scRsnOui0)) -- 2.49.1 From c1b00d8a140f06ef757217d2a8e0e5556265e5bb Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:37:29 -0500 Subject: [PATCH 10/16] cleanup(Date): drop unused lbl_816948F0 sdata2 decl (#649) Bare extern was never referenced; scDateZeroF remains. Verified ok + sha1 26116613f624061ba99c8d1a299aaa6efa85670d. --- src/scene/calendar/iplDate.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scene/calendar/iplDate.cpp b/src/scene/calendar/iplDate.cpp index 46af79ce..a0a9b62a 100644 --- a/src/scene/calendar/iplDate.cpp +++ b/src/scene/calendar/iplDate.cpp @@ -313,7 +313,6 @@ namespace ipl { #pragma push #pragma section sconst_type ".sdata2" extern "C" const f32 scDateZeroF = 0.0f; - extern "C" const f32 lbl_816948F0; #pragma pop } // namespace scene } // namespace ipl -- 2.49.1 From 830e2f39209a2aad4b0d6bda2cb4fd4f7ada9b53 Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:37:35 -0500 Subject: [PATCH 11/16] cleanup(iplSound): name pitch/volume sdata2 float constants (#650) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit lbl_816946A8 → scSoundTwoF (2.0f), lbl_816946AC → scSoundOneF (1.0f), lbl_816946B0 → scSoundThirtyF (30.0f), lbl_816946B4 → scSoundSixtyF (60.0f). --- config/43U/symbols.txt | 8 ++++---- src/sound/iplSound.cpp | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/43U/symbols.txt b/config/43U/symbols.txt index 7b395be0..70b27d78 100644 --- a/config/43U/symbols.txt +++ b/config/43U/symbols.txt @@ -20244,10 +20244,10 @@ lbl_81694654 = .sdata2:0x81694654; // type:object size:0x4 align:4 data:float @10044 = .sdata2:0x8169469C; // type:object size:0x4 scope:local align:4 data:float lbl_816946A0 = .sdata2:0x816946A0; // type:object size:0x4 align:4 data:float scSoundZeroF = .sdata2:0x816946A4; // type:object size:0x4 align:4 data:float -lbl_816946A8 = .sdata2:0x816946A8; // type:object size:0x4 align:4 data:float -lbl_816946AC = .sdata2:0x816946AC; // type:object size:0x4 align:4 data:float -lbl_816946B0 = .sdata2:0x816946B0; // type:object size:0x4 align:4 data:float -lbl_816946B4 = .sdata2:0x816946B4; // type:object size:0x4 align:4 data:float +scSoundTwoF = .sdata2:0x816946A8; // type:object size:0x4 align:4 data:float +scSoundOneF = .sdata2:0x816946AC; // type:object size:0x4 align:4 data:float +scSoundThirtyF = .sdata2:0x816946B0; // type:object size:0x4 align:4 data:float +scSoundSixtyF = .sdata2:0x816946B4; // type:object size:0x4 align:4 data:float lbl_816946B8 = .sdata2:0x816946B8; // type:object size:0x8 align:8 data:double lbl_816946C0 = .sdata2:0x816946C0; // type:object size:0x8 align:8 data:double lbl_816946C8 = .sdata2:0x816946C8; // type:object size:0x8 align:8 data:double diff --git a/src/sound/iplSound.cpp b/src/sound/iplSound.cpp index 9537b1b6..c2b5eaad 100644 --- a/src/sound/iplSound.cpp +++ b/src/sound/iplSound.cpp @@ -20,10 +20,10 @@ extern "C" { extern "C" void _seBlk__Q23ipl3snd(); extern "C" nw4r::snd::SoundHandle* _mainBGMHandle__Q23ipl3snd; extern "C" const f32 scSoundZeroF; -extern "C" const f32 lbl_816946AC; -extern "C" const f32 lbl_816946A8; -extern "C" const f32 lbl_816946B0; -extern "C" const f32 lbl_816946B4; +extern "C" const f32 scSoundOneF; +extern "C" const f32 scSoundTwoF; +extern "C" const f32 scSoundThirtyF; +extern "C" const f32 scSoundSixtyF; extern "C" { void _savegpr_29(); void pauseOffSE__Q33ipl3snd6SystemFv(); @@ -500,21 +500,21 @@ namespace snd { if (block->handle.detail_GetAttachedSound() != NULL) { block->handle.detail_GetAttachedSound()->SetPan(pan); } - f32 pitch = lbl_816946A8 * y / rect.right; - if (lbl_816946AC < pitch) { - pitch = lbl_816946AC; + f32 pitch = scSoundTwoF * y / rect.right; + if (scSoundOneF < pitch) { + pitch = scSoundOneF; } if (block->handle.detail_GetAttachedSound() != NULL) { block->handle.detail_GetAttachedSound()->SetVolume(pitch, 0); } - if (lbl_816946B0 < y) { - f32 pitch2 = y / lbl_816946B0; + if (scSoundThirtyF < y) { + f32 pitch2 = y / scSoundThirtyF; if (block->handle.detail_GetAttachedSound() != NULL) { block->handle.detail_GetAttachedSound()->SetPitch(pitch2); } - } else if (lbl_816946B4 < y) { + } else if (scSoundSixtyF < y) { if (block->handle.detail_GetAttachedSound() != NULL) { - block->handle.detail_GetAttachedSound()->SetPitch(lbl_816946A8); + block->handle.detail_GetAttachedSound()->SetPitch(scSoundTwoF); } } return (int)block; -- 2.49.1 From 98d03059bde883a5aafb88528e56aa11efb0c76e Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:37:42 -0500 Subject: [PATCH 12/16] cleanup(iplBoardObject): rename Cos/Sin Ghidra locals (#651) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit dVar2 → cosF, dVar3 → sinF in BoardObject::stt_stand. Co-authored-by: coah --- src/scene/board/iplBoardObject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scene/board/iplBoardObject.cpp b/src/scene/board/iplBoardObject.cpp index 80820ffb..2c7b6f5a 100644 --- a/src/scene/board/iplBoardObject.cpp +++ b/src/scene/board/iplBoardObject.cpp @@ -486,12 +486,12 @@ namespace ipl { void BoardObject::stt_stand() { f32 degrees = mStandData.unk_0x0C * 30.0f + 30.0f; - f32 dVar2 = nw4r::math::CosFIdx(degrees * 0.7111111f); + f32 cosF = nw4r::math::CosFIdx(degrees * 0.7111111f); degrees = mStandData.unk_0x0C * 30.0f + 30.0f; - f32 dVar3 = nw4r::math::SinFIdx(degrees * 0.7111111f); + f32 sinF = nw4r::math::SinFIdx(degrees * 0.7111111f); math::VEC2 standPos; - __ct__Q33ipl4math4VEC2Fff(&standPos, dVar3 * 160.0f, dVar2 * 160.0f); + __ct__Q33ipl4math4VEC2Fff(&standPos, sinF * 160.0f, cosF * 160.0f); mBoardPos = (((mStandData.pos * (f32)(10 - mStandData.unk_0x08)) + (standPos * mStandData.unk_0x08)) / 10.0f); if ((mStandData.unk_0x08 += 1) > 10) { -- 2.49.1 From d99950fc880645caa5c249a5f062a7bccbb6de75 Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:38:09 -0500 Subject: [PATCH 13/16] cleanup(tiCandidateBox): drop unused sdata2 float decls (#652) Removed seven bare extern lbl_81694D* decls that were never referenced. Verified ok + sha1 26116613f624061ba99c8d1a299aaa6efa85670d. --- src/keyboard/tiCandidateBox.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/keyboard/tiCandidateBox.cpp b/src/keyboard/tiCandidateBox.cpp index cbf69544..fd69bb0e 100644 --- a/src/keyboard/tiCandidateBox.cpp +++ b/src/keyboard/tiCandidateBox.cpp @@ -5,13 +5,6 @@ #include -extern "C" const f32 lbl_81694D90; -extern "C" const f32 lbl_81694DA8; -extern "C" const f32 lbl_81694DAC; -extern "C" const f32 lbl_81694DB0; -extern "C" const f32 lbl_81694DB4; -extern "C" const f32 lbl_81694DBC; -extern "C" const double lbl_81694DC8; extern "C" void _savegpr_24(); extern "C" void _restgpr_24(); extern "C" void GetFont__Q34nw4r3lyt8TextBoxCFv(); -- 2.49.1 From 2dcd44847a6ef76ccdb3602d4e26628d0042165b Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:40:10 -0500 Subject: [PATCH 14/16] Restore SD title switch block emission order --- src/scene/sdChannelTitle/iplSDChannelTitle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scene/sdChannelTitle/iplSDChannelTitle.cpp b/src/scene/sdChannelTitle/iplSDChannelTitle.cpp index 8a5dd0bc..7f684622 100644 --- a/src/scene/sdChannelTitle/iplSDChannelTitle.cpp +++ b/src/scene/sdChannelTitle/iplSDChannelTitle.cpp @@ -311,9 +311,9 @@ FaderSceneCommand SDChannelTitle::calcNormal() { case 18: if (SCCheckStatus() != 1) { mState = 21; } break; case 19: iplSDChannelTitle_startCopyProgress(this); break; case 20: iplSDChannelTitle_updateCopyPrepare(this); break; + case 23: iplSDChannelTitle_updateMemoryCalc(this); break; case 21: iplSDChannelTitle_updateEnqueueNotice(this); break; case 22: iplSDChannelTitle_updateCopyProgress(this); break; - case 23: iplSDChannelTitle_updateMemoryCalc(this); break; case 24: iplSDChannelTitle_loadTitleBanner(this); break; case 25: iplSDChannelTitle_updateBannerLoad(this); break; case 26: iplSDChannelTitle_showCopyError(this); break; -- 2.49.1 From 3eb5d8faee2a8e241e1a9decb16c651abda7e85a Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:40:21 -0500 Subject: [PATCH 15/16] cleanup(iplAOSSThread): name stack sentinel like RakuStack (#653) Replace *(u32*)(mpStackBuffer + 0x3FC0) with AOSSStack::sentinel. Co-authored-by: coah --- src/scene/setting/iplAOSSThread.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/scene/setting/iplAOSSThread.cpp b/src/scene/setting/iplAOSSThread.cpp index 66175428..e2b02b55 100644 --- a/src/scene/setting/iplAOSSThread.cpp +++ b/src/scene/setting/iplAOSSThread.cpp @@ -64,6 +64,11 @@ namespace ipl { static s32 sAOSSState; static s32 sAOSSUnk; + struct AOSSStack { + u32 storage[4080]; + u32 sentinel; + }; + class AOSSThread : public utility::ut_thread { public: AOSSThread(EGG::Heap* heap); @@ -84,7 +89,7 @@ namespace ipl { private: s32 mState; // 0x32C s32 mThreadPriority; // 0x330 - u8* mpStackBuffer; // 0x334 + AOSSStack* mpStack; // 0x334 u8* mpHeapBuffer; // 0x338 MEMHeapHandle mpExpHeap; // 0x33C AOSSConfig mAoss; // 0x340 @@ -94,7 +99,7 @@ namespace ipl { mpExpHeap = NULL; sAOSSState = 0; mpHeapBuffer = (u8*)heap->alloc(0x40000, 0x20); - mpStackBuffer = (u8*)heap->alloc(0x1000, 0x20); + mpStack = (AOSSStack*)heap->alloc(0x1000, 0x20); } void AOSSThread::destroy(int flag) { @@ -137,8 +142,8 @@ namespace ipl { mThreadPriority = OSGetThreadPriority(OSGetCurrentThread()) - 2; sAOSSState = 1; SOInit(&config); - memset(mpStackBuffer, 0, 4); - Create(mpStackBuffer, 0x1000, mThreadPriority, TRUE); + memset(mpStack, 0, 4); + Create(mpStack, 0x1000, mThreadPriority, TRUE); OSRestoreInterrupts(level); return 1; @@ -178,7 +183,7 @@ namespace ipl { mAoss.unk_0x04 = 4; NETGetWirelessMacAddress(mAoss.mac); - *(u32*)(mpStackBuffer + 0x3FC0) = 0x97654321; + mpStack->sentinel = 0x97654321; mState = AOSSi_Init(&mAoss); AOSSi_EndLocal(); -- 2.49.1 From 51b78ed7dad0d24f059cf38fa3e4ea384858cde3 Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:40:27 -0500 Subject: [PATCH 16/16] cleanup(iplBalloon): name fade/align/margin fields (#654) Rename TextBalloon unk_ members and ctor/setPos params. Co-authored-by: coah --- include/scene/textBalloon/iplBalloon.h | 16 +++++----- src/scene/textBalloon/iplBalloon.cpp | 44 +++++++++++++------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/include/scene/textBalloon/iplBalloon.h b/include/scene/textBalloon/iplBalloon.h index 8dd197ba..794fb47c 100644 --- a/include/scene/textBalloon/iplBalloon.h +++ b/include/scene/textBalloon/iplBalloon.h @@ -14,8 +14,8 @@ namespace ipl { WAIT_UNTIL_FADE_IN = 15 }; - TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& unk2, - f32 unk3 = 120.0f, f32 unk4 = 30.0f); + TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& initialPos, + f32 margin16x9 = 120.0f, f32 margin4x3 = 30.0f); ~TextBalloon(); void calc(); @@ -31,7 +31,7 @@ namespace ipl { void fadeout(); void fadeoutForce(); - void setPos(const math::VEC3& pos, bool unk0, int unk1); + void setPos(const math::VEC3& pos, bool use16x9X, int hAlign); void updatePos(const math::VEC3& pos); void set_translate(const math::VEC3& trans); @@ -50,7 +50,7 @@ namespace ipl { undefined4 unk_0x00; undefined4 unk_0x04; - BOOL unk_0x08; + BOOL mbWaitingFadeIn; // 0x08 layout::Object* mpLayout; // 0x0C @@ -60,10 +60,10 @@ namespace ipl { u32 mTextLen; // 0x18 math::VEC3 mBalloonPos; // 0x1C - undefined4 unk_0x28; - undefined unk_0x2C; - f32 unk_0x30; - f32 unk_0x34; + undefined4 mHAlign; // 0x28 + undefined mbUse16x9X; // 0x2C + f32 mMargin16x9; // 0x30 + f32 mMargin4x3; // 0x34 int mWaitUntilFadeIn; // 0x38 diff --git a/src/scene/textBalloon/iplBalloon.cpp b/src/scene/textBalloon/iplBalloon.cpp index 39f70cd5..b8b102e2 100644 --- a/src/scene/textBalloon/iplBalloon.cpp +++ b/src/scene/textBalloon/iplBalloon.cpp @@ -10,9 +10,9 @@ namespace ipl { namespace scene { - TextBalloon::TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const math::VEC3& unk2, - f32 unk3, f32 unk4) - : unk_0x08(FALSE), mpText(NULL), mTextLen(0), mBalloonPos(unk2), unk_0x28(0), unk_0x2C(1), unk_0x30(unk3), unk_0x34(unk4), + TextBalloon::TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const math::VEC3& initialPos, + f32 margin16x9, f32 margin4x3) + : mbWaitingFadeIn(FALSE), mpText(NULL), mTextLen(0), mBalloonPos(initialPos), mHAlign(0), mbUse16x9X(1), mMargin16x9(margin16x9), mMargin4x3(margin4x3), mWaitUntilFadeIn(0) { mpLayout = new (heap, 4) layout::Object(heap, layoutFile, directory, fileName); mpLayout->bind("my_IplTopBalloon_a_BalloonInOut.brlan"); @@ -31,7 +31,7 @@ namespace ipl { void TextBalloon::calc() { mpLayout->calc(); - switch (unk_0x08) { + switch (mbWaitingFadeIn) { case TRUE: { break; } @@ -73,7 +73,7 @@ namespace ipl { balloonPane->SetVisible(false); - unk_0x08 = FALSE; + mbWaitingFadeIn = FALSE; } void TextBalloon::fadein() { @@ -81,7 +81,7 @@ namespace ipl { mpLayout->FindPaneByName("N_Balloon")->SetVisible(false); mWaitUntilFadeIn = 0; - unk_0x08 = TRUE; + mbWaitingFadeIn = TRUE; set_textbox(mpText); set_translate(mBalloonPos); @@ -91,17 +91,17 @@ namespace ipl { void TextBalloon::fadeinNoSetTextbox() { if (mpText != NULL) { mWaitUntilFadeIn = 0; - unk_0x08 = TRUE; + mbWaitingFadeIn = TRUE; set_translate(mBalloonPos); } } - void TextBalloon::setPos(const math::VEC3& pos, bool unk0, int unk1) { + void TextBalloon::setPos(const math::VEC3& pos, bool use16x9X, int hAlign) { mBalloonPos = pos; - unk_0x28 = unk1; - unk_0x2C = unk0; + mHAlign = hAlign; + mbUse16x9X = use16x9X; nw4r::ut::Rect proj16x9; nw4r::ut::Rect proj4x3; @@ -109,7 +109,7 @@ namespace ipl { System::getProjectionRect(&proj16x9); System::getProjectionRect4x3(&proj4x3); - if (unk_0x2C == 0) { + if (mbUse16x9X == 0) { mBalloonPos.x *= proj4x3.GetWidth() / proj16x9.GetWidth(); } } @@ -122,7 +122,7 @@ namespace ipl { System::getProjectionRect(&proj16x9); System::getProjectionRect4x3(&proj4x3); - if (unk_0x2C == 0) { + if (mbUse16x9X == 0) { mBalloonPos.x *= proj4x3.GetWidth() / proj16x9.GetWidth(); } @@ -133,27 +133,27 @@ namespace ipl { if (mWaitUntilFadeIn++ > WAIT_UNTIL_FADE_IN) { anm_fadein(); snd::getSystem()->startSE("WIPL_SE_BALLOON"); - unk_0x08 = FALSE; + mbWaitingFadeIn = FALSE; } } void TextBalloon::fadeout() { - if (!unk_0x08) { + if (!mbWaitingFadeIn) { mpLayout->setAnmType(ANIM_TYPE_BACKWARD); mpLayout->start(); } - unk_0x08 = FALSE; + mbWaitingFadeIn = FALSE; } void TextBalloon::fadeoutForce() { - if (!unk_0x08) { + if (!mbWaitingFadeIn) { if (mpLayout->getAnim()->getAnmType() == ANIM_TYPE_FORWARD) { mpLayout->getAnim()->setAnmType(ANIM_TYPE_BACKWARD); mpLayout->getAnim()->restart(); } - } else if (unk_0x08 == TRUE) { + } else if (mbWaitingFadeIn == TRUE) { mWaitUntilFadeIn = 0; - unk_0x08 = FALSE; + mbWaitingFadeIn = FALSE; } } @@ -167,9 +167,9 @@ namespace ipl { f32 temp0; if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) { - temp0 = unk_0x30; + temp0 = mMargin16x9; } else { - temp0 = unk_0x34; + temp0 = mMargin4x3; } nw4r::lyt::Pane* balloonPane = mpLayout->FindPaneByName("N_Balloon"); @@ -181,7 +181,7 @@ namespace ipl { System::getProjectionRect(&proj16x9); System::getProjectionRect4x3(&proj4x3); - switch (unk_0x28) { + switch (mHAlign) { case 1: { temp1 = get_size("W_Base")->width / 2; break; @@ -192,7 +192,7 @@ namespace ipl { } } - if (unk_0x2C == 0) { + if (mbUse16x9X == 0) { temp1 *= proj4x3.GetWidth() / proj16x9.GetWidth(); } -- 2.49.1