Compare commits

..

2 Commits

Author SHA1 Message Date
coah
bb1587520b cleanup(iplDate): name calendar date pane/string labels
Matching-only renames in scene/calendar/iplDate (+ symbols.txt).
2026-10-01 17:10:40 -05:00
coah
db8ff7e141 cleanup(www_window): name debug/error format strings (#507)
lbl_816962F8 → scWwwErrorQ, lbl_81643B40 → scWwwTexBufFmt,
lbl_81643B5E → scWwwNoBrowserWin.
2026-10-01 17:10:19 -05:00
5 changed files with 68 additions and 68 deletions

View File

@@ -5267,10 +5267,10 @@ start_focusout_anm__Q33ipl5scene13SettingSelectFi = .text:0x814093D0; // type:fu
start_selected_anm__Q33ipl5scene13SettingSelectFi = .text:0x81409480; // type:function size:0x274
is_stopped_all_anm__Q33ipl5scene13SettingSelectCFv = .text:0x814096F4; // type:function size:0x74
onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409768; // type:function size:0xFC
calc_exit_sequence__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
prepare_exit_abort__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
start_exit_fade__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
finish_exit_reboot__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
fn_81409864__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
fn_814098F4__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
fn_81409988__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
fn_814099EC__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409B84; // type:function size:0x58 scope:weak
@20@__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409BDC; // type:function size:0x8 scope:weak
@84@onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409BE4; // type:function size:0x8 scope:weak
@@ -14994,8 +14994,8 @@ __vt__Q37ext_ead3www14SurfaceManager = .data:0x81643AA0; // type:object size:0xC
@1183 = .data:0x81643AB8; // type:object size:0x21 scope:local data:string
__vt__Q37ext_ead3www9ut_thread = .data:0x81643ADC; // type:object size:0x28
lbl_81643B08 = .data:0x81643B08; // type:object size:0x38
lbl_81643B40 = .data:0x81643B40; // type:object size:0x1E data:string
lbl_81643B5E = .data:0x81643B5E; // type:object size:0x24 data:string
scWwwTexBufFmt = .data:0x81643B40; // type:object size:0x1E data:string
scWwwNoBrowserWin = .data:0x81643B5E; // type:object size:0x24 data:string
lbl_81643B82 = .data:0x81643B82; // type:object size:0x1B data:string
lbl_81643B9D = .data:0x81643B9D; // type:object size:0x2B data:string
lbl_81643BC8 = .data:0x81643BC8; // type:object size:0x12 data:string
@@ -15673,11 +15673,11 @@ lbl_8164C54E = .data:0x8164C54E; // type:object size:0x18
lbl_8164C566 = .data:0x8164C566; // type:object size:0xC
lbl_8164C572 = .data:0x8164C572; // type:object size:0xA
__vt__Q33ipl5scene8Calendar = .data:0x8164C57C; // type:object size:0xA4
lbl_8164C620 = .data:0x8164C620; // type:object size:0xB data:string
lbl_8164C62C = .data:0x8164C62C; // type:object size:0x14 data:4byte
lbl_8164C640 = .data:0x8164C640; // type:object size:0x12 data:string
lbl_8164C652 = .data:0x8164C652; // type:object size:0xB data:string
lbl_8164C65D = .data:0x8164C65D; // type:object size:0x13 data:string
scN_CalDay_r = .data:0x8164C620; // type:object size:0xB data:string
scDateAnimPaneNames = .data:0x8164C62C; // type:object size:0x14 data:4byte
scMyIplTopFBrlan = .data:0x8164C640; // type:object size:0x12 data:string
scN_CalDay_t = .data:0x8164C652; // type:object size:0xB data:string
scSEDateFocus = .data:0x8164C65D; // type:object size:0x13 data:string
__vt__Q33ipl5scene4Date = .data:0x8164C670; // type:object size:0x18
@12712 = .data:0x8164C688; // type:object size:0xC scope:local data:string
...data.0 = .data:0x8164C688; // type:label scope:local
@@ -21589,7 +21589,7 @@ lbl_816962DB = .sdata:0x816962DB; // type:object size:0x8 data:string
lbl_816962E3 = .sdata:0x816962E3; // type:object size:0x1
lbl_816962E4 = .sdata:0x816962E4; // type:object size:0x8 data:string
lbl_816962F0 = .sdata:0x816962F0; // type:object size:0x8 data:string
lbl_816962F8 = .sdata:0x816962F8; // type:object size:0x8 data:string
scWwwErrorQ = .sdata:0x816962F8; // type:object size:0x8 data:string
globalNames__Q23www9trasition = .sdata:0x81696300; // type:object size:0x8 scope:local
@1425 = .sdata:0x81696308; // type:object size:0x1 scope:local
gEnableDpd = .sdata:0x81696310; // type:object size:0x4 data:4byte
@@ -21785,11 +21785,11 @@ scPaneName_T_Stop = .sdata:0x816967B5; // type:object size:0x7 data:string
lbl_816967C0 = .sdata:0x816967C0; // type:object size:0x4 data:string
lbl_816967C4 = .sdata:0x816967C4; // type:object size:0x6 data:string
lbl_816967CA = .sdata:0x816967CA; // type:object size:0x7 data:string
lbl_816967D8 = .sdata:0x816967D8; // type:object size:0x6 data:string
lbl_816967DE = .sdata:0x816967DE; // type:object size:0x6 data:string
lbl_816967E4 = .sdata:0x816967E4; // type:object size:0x7 data:string
lbl_816967EB = .sdata:0x816967EB; // type:object size:0x7 data:string
lbl_816967F2 = .sdata:0x816967F2; // type:object size:0x6 data:string
scW_Cal = .sdata:0x816967D8; // type:object size:0x6 data:string
scT_Cal = .sdata:0x816967DE; // type:object size:0x6 data:string
scCal_Ac = .sdata:0x816967E4; // type:object size:0x7 data:string
scInfo_a = .sdata:0x816967EB; // type:object size:0x7 data:string
scB_Cal = .sdata:0x816967F2; // type:object size:0x6 data:string
@16087 = .sdata:0x816967F8; // type:object size:0x4 scope:local data:string
@16350 = .sdata:0x816967FC; // type:object size:0x7 scope:local data:string
@16351 = .sdata:0x81696803; // type:object size:0x7 scope:local data:string

View File

@@ -167,12 +167,12 @@ namespace ipl {
bool is_stopped_all_anm() const;
void calc_exit_sequence();
void fn_81409864();
void prepare_exit_abort();
void wait_decide_se();
void start_exit_fade();
void finish_exit_reboot();
void fn_814098F4();
void fn_unk_inline();
void fn_81409988();
void fn_814099EC();
int mState; // 0x60
int mPrevState; // 0x64

View File

@@ -12,11 +12,11 @@ namespace ext_ead {
}
}
extern "C" char lbl_816962F8[] = "ERROR?\n";
extern "C" char lbl_81643B40[] = " TextureBuffer_ %d:%d ptr:%p\n";
extern "C" char lbl_81643B5E[] = "INFO: cannot create browser window\n";
extern "C" char scWwwErrorQ[] = "ERROR?\n";
extern "C" char scWwwTexBufFmt[] = " TextureBuffer_ %d:%d ptr:%p\n";
extern "C" char scWwwNoBrowserWin[] = "INFO: cannot create browser window\n";
#define OSReport(...) OSReport(lbl_816962F8)
#define OSReport(...) OSReport(scWwwErrorQ)
#include "iplwww/www_window.h"
#undef OSReport
@@ -76,12 +76,12 @@ namespace ext_ead {
memset(mTexBufArr[i][j], 0, texBufSize);
DCStoreRange(mTexBufArr[i][j], texBufSize);
print::IPLWWWReport(print::WWW_DEBUG, lbl_81643B40, j, i, mTexBufArr[i][j]);
print::IPLWWWReport(print::WWW_DEBUG, scWwwTexBufFmt, j, i, mTexBufArr[i][j]);
}
}
if (WWWCreateBrowserWindow(mpBrowserThread->GetHandle(), &mpWwwWindow, 0)) {
print::IPLWWWReport(print::WWW_WARNING, lbl_81643B5E);
print::IPLWWWReport(print::WWW_WARNING, scWwwNoBrowserWin);
return NULL;
} else {
WWWRect rect = {0, 0, 0, 0};

View File

@@ -7,40 +7,40 @@
namespace ipl {
namespace scene {
extern "C" char lbl_816967D8[];
extern "C" char lbl_816967DE[];
extern "C" char lbl_816967E4[];
extern "C" char lbl_816967EB[];
extern "C" char lbl_816967F2[];
extern "C" char scW_Cal[];
extern "C" char scT_Cal[];
extern "C" char scCal_Ac[];
extern "C" char scInfo_a[];
extern "C" char scB_Cal[];
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8164C620[] = "N_CalDay_r";
extern "C" const char scN_CalDay_r[] = "N_CalDay_r";
#pragma pop
// clang-format off
extern "C" const char* lbl_8164C62C[Date::ANIM_PANE_MAX] = {
lbl_8164C620,
lbl_816967D8,
lbl_816967DE,
lbl_816967E4,
lbl_816967EB,
extern "C" const char* scDateAnimPaneNames[Date::ANIM_PANE_MAX] = {
scN_CalDay_r,
scW_Cal,
scT_Cal,
scCal_Ac,
scInfo_a,
};
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8164C640[] = "my_IplTop_f.brlan";
extern "C" const char lbl_8164C652[] = "N_CalDay_t";
extern "C" const char lbl_8164C65D[] = "WIPL_SE_DATE_FOCUS";
extern "C" const char scMyIplTopFBrlan[] = "my_IplTop_f.brlan";
extern "C" const char scN_CalDay_t[] = "N_CalDay_t";
extern "C" const char scSEDateFocus[] = "WIPL_SE_DATE_FOCUS";
#pragma pop
#pragma push
#pragma section const_type ".sdata"
extern "C" char lbl_816967D8[] = "W_Cal";
extern "C" char lbl_816967DE[] = "T_Cal";
extern "C" char lbl_816967E4[] = "Cal_Ac";
extern "C" char lbl_816967EB[] = "Info_a";
extern "C" char lbl_816967F2[] = "B_Cal";
extern "C" char scW_Cal[] = "W_Cal";
extern "C" char scT_Cal[] = "T_Cal";
extern "C" char scCal_Ac[] = "Cal_Ac";
extern "C" char scInfo_a[] = "Info_a";
extern "C" char scB_Cal[] = "B_Cal";
#pragma pop
static const Date::AnmFrame scAnmFrame[] = {
@@ -73,7 +73,7 @@ namespace ipl {
// Bind animations
for (int i = 0; i < ANIM_PANE_MAX; i++) {
mpPaneAnims[i] = mpLayout->bind(lbl_8164C640, lbl_8164C62C[i], false);
mpPaneAnims[i] = mpLayout->bind(scMyIplTopFBrlan, scDateAnimPaneNames[i], false);
}
mpLayout->finishBinding();
@@ -81,7 +81,7 @@ namespace ipl {
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL);
mpGui->setupScene(mpLayout);
mpGui->setAllComponentTriggerTarget(false);
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_816967F2), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scB_Cal), true);
// Init date
mpDate = new utility::Date();
@@ -128,19 +128,19 @@ namespace ipl {
}
void Date::setRotate(const nw4r::math::VEC3& vec) {
mpLayout->FindPaneByName(lbl_8164C652)->SetRotate(vec);
mpLayout->FindPaneByName(scN_CalDay_t)->SetRotate(vec);
}
void Date::setTranslate(const nw4r::math::VEC3& vec) {
mpLayout->FindPaneByName(lbl_8164C652)->SetTranslate(vec);
mpLayout->FindPaneByName(scN_CalDay_t)->SetTranslate(vec);
}
void Date::setVisible(bool visible) {
mpLayout->FindPaneByName(lbl_8164C62C[0])->SetVisible(visible);
mpLayout->FindPaneByName(scDateAnimPaneNames[0])->SetVisible(visible);
}
bool Date::getVisible() {
return mpLayout->FindPaneByName(lbl_8164C62C[0])->IsVisible();
return mpLayout->FindPaneByName(scDateAnimPaneNames[0])->IsVisible();
}
void Date::setAttribute(int attr) {
@@ -209,13 +209,13 @@ namespace ipl {
}
void Date::start_point_event(const char* paneName, controller::Interface* con) {
if (strcmp(paneName, lbl_816967F2) == 0) {
if (strcmp(paneName, scB_Cal) == 0) {
if (unk_0x3C == 0) {
static_cast<Calendar*>(System::getScene(SCENE_CALENDAR))->onPointDate(this);
onCmdRecv(1);
if (getVisible()) {
snd::getSystem()->startSE(lbl_8164C65D);
snd::getSystem()->startSE(scSEDateFocus);
if (con != NULL) {
con->rumble(1);
}
@@ -226,7 +226,7 @@ namespace ipl {
}
void Date::start_left_event(const char* paneName) {
if (strcmp(paneName, lbl_816967F2) == 0) {
if (strcmp(paneName, scB_Cal) == 0) {
if (unk_0x3C == 1) {
onCmdRecv(2);
}
@@ -262,7 +262,7 @@ namespace ipl {
numStr[index++] = 0;
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_8164C62C[2]));
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(scDateAnimPaneNames[2]));
pane->SetString(numStr);
}

View File

@@ -185,7 +185,7 @@ namespace ipl {
break;
}
case STATE_16: {
calc_exit_sequence();
fn_81409864();
break;
}
}
@@ -688,28 +688,28 @@ namespace ipl {
}
}
void SettingSelect::calc_exit_sequence() {
void SettingSelect::fn_81409864() {
switch (unk_0x94) {
case 0: {
prepare_exit_abort();
fn_814098F4();
break;
}
case 1: {
wait_decide_se();
fn_unk_inline();
break;
}
case 2: {
start_exit_fade();
fn_81409988();
break;
}
case 3: {
finish_exit_reboot();
fn_814099EC();
break;
}
}
}
void SettingSelect::prepare_exit_abort() {
void SettingSelect::fn_814098F4() {
if (System::getChannelManager()->isReady()) {
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
controller::Interface* con = System::getController(i);
@@ -724,20 +724,20 @@ namespace ipl {
}
}
void SettingSelect::wait_decide_se() {
void SettingSelect::fn_unk_inline() {
if (!snd::getSystem()->isSEActive("WIPL_SE_DECIDE")) {
unk_0x94 = 2;
}
}
void SettingSelect::start_exit_fade() {
void SettingSelect::fn_81409988() {
__WPADReconnect(TRUE);
snd::getSystem()->stopAllSound(20);
System::getFader()->fadeOut();
unk_0x94 = 3;
}
void SettingSelect::finish_exit_reboot() {
void SettingSelect::fn_814099EC() {
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN) {
while (WPADGetStatus() != 0 || System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8) {
snd::getSystem()->calc();