Compare commits

..

3 Commits

Author SHA1 Message Date
coah
7001b7bd6f cleanup(ChannelSelect): rename pane/SE string labels
Rename lbl_* pane and sound-effect string symbols to scPaneName_/scSE_
names; add missing WSD_SELECT definition. Build stays byte-identical.
2026-10-01 17:28:37 -05:00
github-actions[bot]
37724c57d6 docs: update progress [skip ci] 2026-10-01 22:27:32 +00:00
coah
1a32db7bdc fix: update iplSDChannelSelect caller missed by #496 rename (#554) 2026-10-01 17:26:54 -05:00
5 changed files with 66 additions and 65 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.37% | 87.69% | 61.93% | 91.37% |
| 99.37% | 87.71% | 61.93% | 92.05% |
units 917/1027 complete, functions 12211/12563 matched.
units 917/1027 complete, functions 12213/12563 matched.
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
<!-- progress:end -->

View File

@@ -15940,19 +15940,19 @@ lbl_8164DCDF = .data:0x8164DCDF; // type:object size:0x35
jumptable_8164DD14 = .data:0x8164DD14; // type:object size:0x6C scope:local
lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37
lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD
lbl_8164DE64 = .data:0x8164DE64; // type:object size:0x9 data:string
lbl_8164DE6D = .data:0x8164DE6D; // type:object size:0x11 data:string
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
lbl_8164DE9C = .data:0x8164DE9C; // type:object size:0xB data:string
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
lbl_8164DFCB = .data:0x8164DFCB; // type:object size:0x16 data:string
lbl_8164DFE1 = .data:0x8164DFE1; // type:object size:0x10 data:string
lbl_8164DFF1 = .data:0x8164DFF1; // type:object size:0xF data:string
lbl_8164E000 = .data:0x8164E000; // type:object size:0x14 data:string
scSE_WIPL_SE_CH_TARGETTING = .data:0x8164DFCB; // type:object size:0x16 data:string
scSE_WIPL_SE_CH_HOLD = .data:0x8164DFE1; // type:object size:0x10 data:string
scSE_WIPL_SE_CH_SET = .data:0x8164DFF1; // type:object size:0xF data:string
scSE_WIPL_SE_CH_NOT_MOVE = .data:0x8164E000; // type:object size:0x14 data:string
lbl_8164E014 = .data:0x8164E014; // type:object size:0x10 data:string
lbl_8164E024 = .data:0x8164E024; // type:object size:0x14 data:string
lbl_8164E038 = .data:0x8164E038; // type:object size:0xF data:string
scSE_WIPL_SE_GRAY_BUTTON = .data:0x8164E024; // type:object size:0x14 data:string
scSE_WIPL_SE_DECIDE = .data:0x8164E038; // type:object size:0xF data:string
__vt__Q33ipl4math29HermiteIntp<Q33ipl4math4VEC3> = .data:0x8164E048; // type:object size:0x20
__vt__Q33ipl5scene27CsChanSelSDMenuEventHandler = .data:0x8164E068; // type:object size:0x1C
__vt__Q33ipl5scene27CsChanSelButtonEventHandler = .data:0x8164E084; // type:object size:0x1C
@@ -20050,8 +20050,8 @@ lbl_816932D0 = .data:0x816932D0; // type:object size:0x48 data:string
lbl_81693318 = .data:0x81693318; // type:object size:0xA data:string
lbl_81693324 = .data:0x81693324; // type:object size:0x15 data:string
@466 = .data:0x81693340; // type:object size:0xD scope:local data:string
scCntCacheStrs = .data:0x81693350; // type:object size:0xD0
scCntCacheTitleDataFmt = .data:0x81693420; // type:object size:0x16 data:string
lbl_81693350 = .data:0x81693350; // type:object size:0xD0
lbl_81693420 = .data:0x81693420; // type:object size:0x16 data:string
__vt__Q23EGG9Allocator = .data:0x81693438; // type:object size:0x14
__vt__Q23EGG9ArcPlayer = .data:0x81693450; // type:object size:0x54
__vt__Q23EGG20SimpleAudioMgrWithFx = .data:0x816934A8; // type:object size:0x78
@@ -23109,7 +23109,7 @@ lbl_816983EC = .sdata:0x816983EC; // type:object size:0x6 data:string
__KBDVersion = .sdata:0x816985C8; // type:object size:0x4 data:4byte
__KPRVersion = .sdata:0x816985D0; // type:object size:0x4 data:4byte
__CNTCACHEVersion = .sdata:0x816985D8; // type:object size:0x4 data:4byte
scCntCacheSpaceNl = .sdata:0x816985DC; // type:object size:0x3 data:string
lbl_816985DC = .sdata:0x816985DC; // type:object size:0x3 data:string
@428 = .sdata:0x816985E0; // type:object size:0x4 scope:local data:string
@429 = .sdata:0x816985E4; // type:object size:0x3 scope:local data:string
@442 = .sdata:0x816985E7; // type:object size:0x8 scope:local data:string

View File

@@ -7,7 +7,7 @@
#include <stdlib.h>
#include <string.h>
char scCntCacheStrs[0xd0] = {
char lbl_81693350[0xd0] = {
0x3c, 0x3c, 0x20, 0x52, 0x56, 0x4c, 0x5f, 0x53, 0x44, 0x4b, 0x20, 0x2d, 0x20, 0x43, 0x4e, 0x54,
0x43, 0x41, 0x43, 0x48, 0x45, 0x20, 0x09, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x62,
0x75, 0x69, 0x6c, 0x64, 0x3a, 0x20, 0x41, 0x70, 0x72, 0x20, 0x32, 0x30, 0x20, 0x32, 0x30, 0x31,
@@ -22,12 +22,12 @@ char scCntCacheStrs[0xd0] = {
0x74, 0x20, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00,
0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x00
};
char scCntCacheTitleDataFmt[0x16] = {
char lbl_81693420[0x16] = {
0x2f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x2f, 0x25, 0x30, 0x38, 0x78, 0x2f, 0x25, 0x30, 0x38, 0x78,
0x2f, 0x64, 0x61, 0x74, 0x61, 0x00,
};
const char* __CNTCACHEVersion = scCntCacheStrs;
char scCntCacheSpaceNl[3] = {0x20, 0x0a, 0x00};
const char* __CNTCACHEVersion = lbl_81693350;
char lbl_816985DC[3] = {0x20, 0x0a, 0x00};
extern void _savegpr_23();
extern void _restgpr_23();
@@ -72,9 +72,9 @@ asm void CNTCACHEClear() {
mr r11, r12
stw r0, 4(r12)
bl _savegpr_23
lis r30, scCntCacheStrs@ha
lis r30, lbl_81693350@ha
lis r3, _CNTCACHEMutex@ha
addi r30, r30, scCntCacheStrs@l
addi r30, r30, lbl_81693350@l
li r29, 0
addi r3, r3, _CNTCACHEMutex@l
bl OSLockMutex
@@ -146,7 +146,7 @@ L_184:
stb r31, 0(r4)
subf r23, r24, r4
mr r3, r24
la r4, scCntCacheSpaceNl
la r4, lbl_816985DC
bl strtok
cmpwi r3, 0
mr r29, r3
@@ -246,7 +246,7 @@ asm void _CNTCACHEDeleteTitle() {
stwu r1, -0x20(r1)
mflr r0
li r3, 0
la r4, scCntCacheSpaceNl
la r4, lbl_816985DC
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
stw r30, 0x18(r1)
@@ -284,7 +284,7 @@ L_350:
bl ES_DeleteTitleContent
L_364:
li r3, 0
la r4, scCntCacheSpaceNl
la r4, lbl_816985DC
bl strtok
L_370:
cmpwi r3, 0
@@ -305,10 +305,10 @@ asm int _CNTCACHEIsTitleRemovable(ESTitleId titleId) {
subfic r11, r11, -0x2100
stwux r1, r1, r11
mflr r0
lis r5, scCntCacheTitleDataFmt@ha
lis r5, lbl_81693420@ha
stw r0, 4(r12)
li r0, 1
addi r5, r5, scCntCacheTitleDataFmt@l
addi r5, r5, lbl_81693420@l
stw r31, -4(r12)
stw r30, -8(r12)
mr r30, r3
@@ -403,7 +403,7 @@ asm void _CNTCACHEDeleteContent() {
stw r0, 4(r12)
bl _savegpr_26
li r3, 0
la r4, scCntCacheSpaceNl
la r4, lbl_816985DC
bl strtok
li r31, 0
li r4, 0
@@ -441,10 +441,10 @@ asm void _CNTCACHEDeleteContent() {
rlwinm. r0, r3, 0, 0x1b, 0x1b
beq L_6f0
li r3, 0
la r4, scCntCacheSpaceNl
la r4, lbl_816985DC
bl strtok
li r26, 1
lis r27, scCntCacheTitleDataFmt@ha
lis r27, lbl_81693420@ha
b L_6e8
L_5b0:
stw r31, errno(r0)
@@ -488,7 +488,7 @@ L_5e8:
li r0, -1
stw r26, 0x20(r1)
addi r3, r1, 0x40
addi r5, r27, scCntCacheTitleDataFmt@l
addi r5, r27, lbl_81693420@l
stw r26, 0x24(r1)
and r6, r30, r0
and r7, r29, r0
@@ -529,7 +529,7 @@ L_6d4:
bdnz L_5e8
L_6dc:
li r3, 0
la r4, scCntCacheSpaceNl
la r4, lbl_816985DC
bl strtok
L_6e8:
cmpwi r3, 0

View File

@@ -131,15 +131,15 @@ namespace ipl {
extern "C" char mscBasePaneNames__Q33ipl5scene13ChannelSelect[];
extern "C" char mscClockPaneNames__Q33ipl5scene13ChannelSelect[];
extern "C" u32 mscMaskPaneName__Q33ipl5scene13ChannelSelect;
extern "C" char lbl_8164DFE1[];
extern "C" char lbl_8164DE64[];
extern "C" char lbl_8164DE6D[];
extern "C" char lbl_8164DE9C[];
extern "C" char lbl_8164DFCB[];
extern "C" char lbl_8164DFF1[];
extern "C" char lbl_8164E000[];
extern "C" char lbl_8164E024[];
extern "C" char lbl_8164E038[];
extern "C" char scSE_WIPL_SE_CH_HOLD[];
extern "C" char scPaneName_N_GCIcon[];
extern "C" char scPaneName_N_DiscUpdateIcon[];
extern "C" char scSE_WSD_SELECT[];
extern "C" char scSE_WIPL_SE_CH_TARGETTING[];
extern "C" char scSE_WIPL_SE_CH_SET[];
extern "C" char scSE_WIPL_SE_CH_NOT_MOVE[];
extern "C" char scSE_WIPL_SE_GRAY_BUTTON[];
extern "C" char scSE_WIPL_SE_DECIDE[];
extern "C" void draw__Q33ipl6layout6ObjectFPQ34nw4r3lyt4Pane();
extern "C" void SetVisible__Q34nw4r3lyt4PaneFb();
extern "C" void drawChannelThumbnails__Q33ipl5scene13ChannelSelectFv();
@@ -855,8 +855,8 @@ namespace ipl {
mpDiskInOutLyt->finishBinding();
}
extern "C" char lbl_8164DE64[] = "N_GCIcon";
extern "C" char lbl_8164DE6D[] = "N_DiscUpdateIcon";
extern "C" char scPaneName_N_GCIcon[] = "N_GCIcon";
extern "C" char scPaneName_N_DiscUpdateIcon[] = "N_DiscUpdateIcon";
extern "C" void* jumptable_8164DE80[7] = {
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x4C),
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x21C),
@@ -1359,8 +1359,8 @@ namespace ipl {
cmpwi r0, 0x1
beq updateDiskState_813AD2C8
lwz r3, 0x94(r3)
lis r29, lbl_8164DE64@ha
addi r4, r29, lbl_8164DE64@l
lis r29, scPaneName_N_GCIcon@ha
addi r4, r29, scPaneName_N_GCIcon@l
li r5, 0x1
lwz r3, 0x14(r3)
lwz r12, 0x0(r3)
@@ -1370,8 +1370,8 @@ namespace ipl {
li r4, 0x1
bl SetVisible__Q34nw4r3lyt4PaneFb
lwz r3, 0x94(r31)
lis r30, lbl_8164DE6D@ha
addi r4, r30, lbl_8164DE6D@l
lis r30, scPaneName_N_DiscUpdateIcon@ha
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
li r5, 0x1
lwz r3, 0x14(r3)
lwz r12, 0x0(r3)
@@ -1419,7 +1419,7 @@ namespace ipl {
bne updateDiskState_813AD134
lwz r3, 0x84(r28)
li r0, 0x0
addi r4, r29, lbl_8164DE64@l
addi r4, r29, scPaneName_N_GCIcon@l
li r5, 0x1
stb r0, 0x1b81(r3)
lwz r3, 0x94(r31)
@@ -1431,7 +1431,7 @@ namespace ipl {
li r4, 0x0
bl SetVisible__Q34nw4r3lyt4PaneFb
lwz r3, 0x94(r31)
addi r4, r30, lbl_8164DE6D@l
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
li r5, 0x1
lwz r3, 0x14(r3)
lwz r12, 0x0(r3)
@@ -2087,10 +2087,11 @@ namespace ipl {
mpMoveLytDrop->getAnim()->initAnmFrame();
}
extern "C" char lbl_8164DFCB[] = "WIPL_SE_CH_TARGETTING";
extern "C" char lbl_8164DFE1[] = "WIPL_SE_CH_HOLD";
extern "C" char lbl_8164DFF1[] = "WIPL_SE_CH_SET";
extern "C" char lbl_8164E000[] = "WIPL_SE_CH_NOT_MOVE";
extern "C" char scSE_WSD_SELECT[] = "WSD_SELECT";
extern "C" char scSE_WIPL_SE_CH_TARGETTING[] = "WIPL_SE_CH_TARGETTING";
extern "C" char scSE_WIPL_SE_CH_HOLD[] = "WIPL_SE_CH_HOLD";
extern "C" char scSE_WIPL_SE_CH_SET[] = "WIPL_SE_CH_SET";
extern "C" char scSE_WIPL_SE_CH_NOT_MOVE[] = "WIPL_SE_CH_NOT_MOVE";
void ChannelSelect::calcNormalGrab() {
Button* button = getButton();
@@ -2167,7 +2168,7 @@ namespace ipl {
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
mpGui->initPane(getChannelBasePane(i));
}
snd::getSystem()->startSE(lbl_8164DE9C);
snd::getSystem()->startSE(scSE_WSD_SELECT);
return;
}
}
@@ -2193,7 +2194,7 @@ namespace ipl {
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
mpGui->initPane(getChannelBasePane(i));
}
snd::getSystem()->startSE(lbl_8164DE9C);
snd::getSystem()->startSE(scSE_WSD_SELECT);
return;
}
}
@@ -2357,7 +2358,7 @@ namespace ipl {
case ::gui::EventHandler::ON_POINT: {
if (isReleasableArea(mCurrentPage, id) || (mCurrentPage == mMoveOldPage && id == mMoveOldIndex)) {
searchList(mCurrentPage, id)->onPoint(2);
snd::getSystem()->startSE(lbl_8164DFCB);
snd::getSystem()->startSE(scSE_WIPL_SE_CH_TARGETTING);
con->rumble(1);
break;
}
@@ -2438,7 +2439,7 @@ namespace ipl {
mbModuleSceneChange = true;
unk_0x185 = true;
snd::getSystem()->startSEwithPos(lbl_8164DFE1, mDragPos.x);
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_HOLD, mDragPos.x);
mState = STATE_NORMAL_GRAB;
}
@@ -2450,13 +2451,13 @@ namespace ipl {
mpMoveLytDrop->GetRootPane()->SetTranslate(translate);
mpMoveLytDrop->getAnim(0)->play();
snd::getSystem()->startSEwithPos(lbl_8164DFF1, mDragPos.x);
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_SET, mDragPos.x);
mpMoveLytMask->getAnim(1)->play();
mState = STATE_NORMAL_MOVE_CHAN_IN;
} else {
snd::getSystem()->startSEwithPos(lbl_8164E000, mDragPos.x);
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_NOT_MOVE, mDragPos.x);
mState = STATE_NORMAL_RELEASE_WAIT;
}
@@ -2519,8 +2520,8 @@ namespace ipl {
}
}
extern "C" char lbl_8164E024[] = "WIPL_SE_GRAY_BUTTON";
extern "C" char lbl_8164E038[] = "WIPL_SE_DECIDE";
extern "C" char scSE_WIPL_SE_GRAY_BUTTON[] = "WIPL_SE_GRAY_BUTTON";
extern "C" char scSE_WIPL_SE_DECIDE[] = "WIPL_SE_DECIDE";
void ChannelSelectEventHandler::onEvent(u32 compId, u32 event, void* data) {
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
@@ -2561,7 +2562,7 @@ namespace ipl {
case ::gui::EventHandler::ON_POINT: {
if (mpInstance->mState == ChannelSelect::STATE_NORMAL && chanObj->isValid()) {
chanObj->onPoint(0);
snd::getSystem()->startSE(lbl_8164DFCB);
snd::getSystem()->startSE(scSE_WIPL_SE_CH_TARGETTING);
con->rumble(1);
}
break;
@@ -2599,13 +2600,13 @@ namespace ipl {
if (System::isSafeMode()) {
System::getDialog()->callBtn0(MESG_CHAN_SEL_SAFE_MODE, 180);
mpInstance->mState = ChannelSelect::STATE_NORMAL_SAFE_MODE_DIALOG;
snd::getSystem()->startSE(lbl_8164E024);
snd::getSystem()->startSE(scSE_WIPL_SE_GRAY_BUTTON);
} else {
mpInstance->setSomething();
mpInstance->mState = ChannelSelect::STATE_START_BOARD_SCENE;
mpInstance->tryToStartBoardScene();
TVRCManager::getHandle()->setEnable(FALSE);
snd::getSystem()->startSE(lbl_8164E038);
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
}
} else if (Button::cmpButtonName(paneName, Button::BTN_SETTING) == 0) {
button->setEventHandler(NULL);
@@ -2615,7 +2616,7 @@ namespace ipl {
System::getFader()->fadeOut();
TVRCManager::getHandle()->setEnable(FALSE);
mpInstance->mState = ChannelSelect::STATE_START_SETTING_SCENE;
snd::getSystem()->startSE(lbl_8164E038);
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
} else if (Button::cmpButtonName(paneName, Button::BTN_ARROW_LEFT) == 0 && mpInstance->mCurrentPage > 0) {
button->animation(Button::IDANIM_ARROW_LEFT_SELECT);
mpInstance->preparePageScrolling(ChannelSelect::STATE_PREP_LEFT_PAGE_SCROLL);
@@ -2650,7 +2651,7 @@ namespace ipl {
System::getFader()->fadeOut();
TVRCManager::getHandle()->setEnable(FALSE);
mpInstance->mState = ChannelSelect::STATE_START_SD_MENU_SCENE;
snd::getSystem()->startSE(lbl_8164E038);
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
}
}
break;

View File

@@ -571,7 +571,7 @@ namespace ipl {
mWorkerCommand = 11;
break;
case 12:
mpSDWorker->iplNandSD_81348EA8(
mpSDWorker->check_sd_app_titles_async(
command.arguments.pointers[0], command.arguments.pointers[1],
command.arguments.pointers[2]);
mWorkerCommand = 12;