Compare commits

..

3 Commits

Author SHA1 Message Date
coah
6df592c03c cleanup(sdi_api): rename path/format string blob
lbl_81691748 -> __sdPathData (packed SD reset OSReport format +
slot0/slot1/slotw path strings used by ISD_InitCard).
2026-10-01 17:13:36 -05:00
coah
e2191ae933 cleanup(TVRC): name timing constants and file header (#509)
lbl_816945C8/D0/D8/E0 → scTvrcMsPerSec/NsecPerSec/One/FloatMagic;
lbl_81696230 → scTvrcFileHeader ("TVR0").
2026-10-01 17:11:51 -05:00
coah
7d77c095c0 cleanup(iplSystem): name ortho viewport float constants (#508)
lbl_81694424..38 → scOrthoLeft/Right/Bottom/Top and scWideOrthoLeft/Right.
2026-10-01 17:10:58 -05:00
5 changed files with 90 additions and 90 deletions

View File

@@ -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
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
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
__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
@@ -20016,7 +20016,7 @@ lbl_81691040 = .data:0x81691040; // type:object size:0x2D0
lbl_81691310 = .data:0x81691310; // type:object size:0x3B data:string
lbl_8169134C = .data:0x8169134C; // type:object size:0x3DC
st_uhs_msc_blk_func = .data:0x81691728; // type:object size:0x20
lbl_81691748 = .data:0x81691748; // type:object size:0x50
__sdPathData = .data:0x81691748; // type:object size:0x50
lbl_81691798 = .data:0x81691798; // type:object size:0x16 data:string
lbl_816917B0 = .data:0x816917B0; // type:object size:0xD data:string
lbl_816917C0 = .data:0x816917C0; // type:object size:0x15 data:string
@@ -20107,12 +20107,12 @@ gDBCommTable = .data:0x816943C8; // type:object size:0x28
lbl_81694410 = .sdata2:0x81694410; // type:object size:0x4 align:4 data:float
lbl_81694418 = .sdata2:0x81694418; // type:object size:0x8 align:8 data:double
lbl_81694420 = .sdata2:0x81694420; // type:object size:0x4 align:4 data:float
lbl_81694424 = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
lbl_81694428 = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
lbl_8169442C = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
lbl_81694430 = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
lbl_81694434 = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
lbl_81694438 = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
scOrthoLeft = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
scOrthoRight = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
scOrthoBottom = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
scOrthoTop = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
scWideOrthoLeft = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
scWideOrthoRight = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
lbl_81694440 = .sdata2:0x81694440; // type:object size:0x4 align:4 data:float
lbl_81694444 = .sdata2:0x81694444; // type:object size:0x4 align:4 data:float
lbl_81694448 = .sdata2:0x81694448; // type:object size:0x8 align:8 data:double
@@ -20201,10 +20201,10 @@ lbl_816945B0 = .sdata2:0x816945B0; // type:object size:0x4 align:4 data:float
lbl_816945B4 = .sdata2:0x816945B4; // type:object size:0x4 align:4 data:float
lbl_816945B8 = .sdata2:0x816945B8; // type:object size:0x8 align:8 data:double
lbl_816945C0 = .sdata2:0x816945C0; // type:object size:0x8 align:8 data:double
lbl_816945C8 = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
lbl_816945D0 = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
lbl_816945D8 = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
lbl_816945E0 = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
scTvrcMsPerSec = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
scTvrcNsecPerSec = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
scTvrcOne = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
scTvrcFloatMagic = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
lbl_816945E8 = .sdata2:0x816945E8; // type:object size:0x4 align:4 data:float
lbl_816945EC = .sdata2:0x816945EC; // type:object size:0x4 align:4 data:float
lbl_816945F0 = .sdata2:0x816945F0; // type:object size:0x4 align:4 data:float
@@ -21552,7 +21552,7 @@ lbl_8169622C = .sdata:0x8169622C; // type:object size:0x1 data:byte
lbl_8169622D = .sdata:0x8169622D; // type:object size:0x1 data:byte
lbl_8169622E = .sdata:0x8169622E; // type:object size:0x1 data:byte
lbl_8169622F = .sdata:0x8169622F; // type:object size:0x1 data:byte
lbl_81696230 = .sdata:0x81696230; // type:object size:0x5 data:string
scTvrcFileHeader = .sdata:0x81696230; // type:object size:0x5 data:string
TVRC_FILE_HEADER__7LibTVRC = .sdata:0x81696238; // type:object size:0x4 data:4byte
__tienHoseiNsec__7LibTVRC = .sdata:0x8169623C; // type:object size:0x4 data:4byte
_limitMilli__7LibTVRC = .sdata:0x81696240; // 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
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
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
@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

@@ -15,7 +15,7 @@
#define SD_SLOT_PATH_LENGTH 32
char lbl_81691748[] = " +++ SD RESET Failed: %d +++\n\0"
char __sdPathData[] = " +++ SD RESET Failed: %d +++\n\0"
"/dev/sdio/slot0\0/dev/sdio/slot1\0/dev/sdio/slotw";
typedef void (*SDCallbackFunc)(s32, void*);
@@ -73,7 +73,7 @@ IOSError __sdCb(s32 result, void* arg) {
switch (data->unk_0x0C) {
case 4: {
if (result != 0) {
OSReport(lbl_81691748, result);
OSReport(__sdPathData, result);
data->dev->SDDevRca = 0;
} else {
if (data->dev != NULL) {
@@ -570,7 +570,7 @@ ISD_Error ISD_UnmountCard(SDDev* dev) {
ISD_Error ISD_InitCard() {
static u8* lo;
char* paths = lbl_81691748;
char* paths = __sdPathData;
ISD_Error ret = SD_ERROR_SUCCESS;
BOOL enabled;

View File

@@ -7,40 +7,40 @@
namespace ipl {
namespace scene {
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[];
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[];
#pragma push
#pragma section const_type ".data"
extern "C" const char scN_CalDay_r[] = "N_CalDay_r";
extern "C" const char lbl_8164C620[] = "N_CalDay_r";
#pragma pop
// clang-format off
extern "C" const char* scDateAnimPaneNames[Date::ANIM_PANE_MAX] = {
scN_CalDay_r,
scW_Cal,
scT_Cal,
scCal_Ac,
scInfo_a,
extern "C" const char* lbl_8164C62C[Date::ANIM_PANE_MAX] = {
lbl_8164C620,
lbl_816967D8,
lbl_816967DE,
lbl_816967E4,
lbl_816967EB,
};
#pragma push
#pragma section const_type ".data"
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";
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";
#pragma pop
#pragma push
#pragma section const_type ".sdata"
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";
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";
#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(scMyIplTopFBrlan, scDateAnimPaneNames[i], false);
mpPaneAnims[i] = mpLayout->bind(lbl_8164C640, lbl_8164C62C[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(scB_Cal), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_816967F2), true);
// Init date
mpDate = new utility::Date();
@@ -128,19 +128,19 @@ namespace ipl {
}
void Date::setRotate(const nw4r::math::VEC3& vec) {
mpLayout->FindPaneByName(scN_CalDay_t)->SetRotate(vec);
mpLayout->FindPaneByName(lbl_8164C652)->SetRotate(vec);
}
void Date::setTranslate(const nw4r::math::VEC3& vec) {
mpLayout->FindPaneByName(scN_CalDay_t)->SetTranslate(vec);
mpLayout->FindPaneByName(lbl_8164C652)->SetTranslate(vec);
}
void Date::setVisible(bool visible) {
mpLayout->FindPaneByName(scDateAnimPaneNames[0])->SetVisible(visible);
mpLayout->FindPaneByName(lbl_8164C62C[0])->SetVisible(visible);
}
bool Date::getVisible() {
return mpLayout->FindPaneByName(scDateAnimPaneNames[0])->IsVisible();
return mpLayout->FindPaneByName(lbl_8164C62C[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, scB_Cal) == 0) {
if (strcmp(paneName, lbl_816967F2) == 0) {
if (unk_0x3C == 0) {
static_cast<Calendar*>(System::getScene(SCENE_CALENDAR))->onPointDate(this);
onCmdRecv(1);
if (getVisible()) {
snd::getSystem()->startSE(scSEDateFocus);
snd::getSystem()->startSE(lbl_8164C65D);
if (con != NULL) {
con->rumble(1);
}
@@ -226,7 +226,7 @@ namespace ipl {
}
void Date::start_left_event(const char* paneName) {
if (strcmp(paneName, scB_Cal) == 0) {
if (strcmp(paneName, lbl_816967F2) == 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(scDateAnimPaneNames[2]));
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_8164C62C[2]));
pane->SetString(numStr);
}

View File

@@ -10,10 +10,10 @@
#pragma sym on
extern "C" const f32 lbl_816945C8 = 1000.0f;
extern "C" const f64 lbl_816945D0 = 1000000000.0;
extern "C" const f64 lbl_816945D8 = 1.0;
extern "C" const f64 lbl_816945E0 = 4503599627370496.0;
extern "C" const f32 scTvrcMsPerSec = 1000.0f;
extern "C" const f64 scTvrcNsecPerSec = 1000000000.0;
extern "C" const f64 scTvrcOne = 1.0;
extern "C" const f64 scTvrcFloatMagic = 4503599627370496.0;
extern "C" BOOL _isInitialized__7LibTVRC;
extern "C" BOOL _isActive__7LibTVRC;
@@ -53,11 +53,11 @@ extern "C" void __FTVRCLoop1Handler__7LibTVRCFP7OSAlarmP9OSContext();
#pragma push
#pragma section data_type ".sdata"
extern "C" char lbl_81696230[5] = {'T', 'V', 'R', '0', '\0'};
extern "C" char scTvrcFileHeader[5] = {'T', 'V', 'R', '0', '\0'};
#pragma pop
namespace LibTVRC {
const char* TVRC_FILE_HEADER = lbl_81696230;
const char* TVRC_FILE_HEADER = scTvrcFileHeader;
u32 __tienHoseiNsec = 1100;
u32 _limitMilli = 400;
@@ -267,7 +267,7 @@ TVRCSendStartAsync_valid:
bne TVRCSendStartAsync_custom
lwz r6, _tvrcFile__7LibTVRC
lis r3, 2
lfs f1, lbl_816945C8
lfs f1, scTvrcMsPerSec
lis r4, 0x8000
lfs f0, 0xc(r6)
subi r0, r3, 0x17b8
@@ -309,7 +309,7 @@ TVRCSendStartAsync_no_repeat:
TVRCSendStartAsync_timing:
lfs f1, _onTimeRatio__7LibTVRC
lis r4, 0x8000
lfd f0, lbl_816945D0
lfd f0, scTvrcNsecPerSec
lis r27, 0x4330
lwz r0, 0xf8(r4)
lis r3, 2
@@ -321,7 +321,7 @@ TVRCSendStartAsync_timing:
divwu r26, r4, r0
fdiv f2, f1, f0
stw r27, 8(r1)
lfd f1, lbl_816945E0
lfd f1, scTvrcFloatMagic
stw r25, 0xc(r1)
lfd f0, 8(r1)
fsub f0, f0, f1
@@ -339,13 +339,13 @@ TVRCSendStartAsync_timing:
bl __div2i
lfs f2, _onTimeRatio__7LibTVRC
lis r28, _tickWait__7LibTVRC@ha
lfd f1, lbl_816945D8
lfd f1, scTvrcOne
addi r29, r28, _tickWait__7LibTVRC@l
lfd f0, lbl_816945D0
lfd f0, scTvrcNsecPerSec
fsub f3, f1, f2
lfs f2, _Hz__7LibTVRC
stw r25, 0x14(r1)
lfd f1, lbl_816945E0
lfd f1, scTvrcFloatMagic
fmul f3, f0, f3
stw r27, 0x10(r1)
lfd f0, 0x10(r1)

View File

@@ -39,12 +39,12 @@
extern "C" ipl::System::Arg smArg__Q23ipl6System;
extern "C" ipl::snd::System sSystem__Q23ipl3snd;
extern "C" void initOnMemory__Q33ipl3snd6SystemFPCvPQ23EGG4HeapUl();
extern "C" const f32 lbl_81694424;
extern "C" const f32 lbl_81694428;
extern "C" const f32 lbl_8169442C;
extern "C" const f32 lbl_81694430;
extern "C" const f32 lbl_81694434;
extern "C" const f32 lbl_81694438;
extern "C" const f32 scOrthoLeft;
extern "C" const f32 scOrthoRight;
extern "C" const f32 scOrthoBottom;
extern "C" const f32 scOrthoTop;
extern "C" const f32 scWideOrthoLeft;
extern "C" const f32 scWideOrthoRight;
extern "C" void* m_handle__Q23ipl11TVRCManager;
extern "C" void _savegpr_27();
extern "C" void _restgpr_27();
@@ -1139,7 +1139,7 @@ namespace ipl {
bl VISetBlack
lwz r3, 0xb0(r28)
li r0, 1
lfd f31, lbl_81694424-0xc
lfd f31, scOrthoLeft-0xc
lis r30, 0x4330
lbz r29, 0x3d(r3)
lis r31, sSystem__Q23ipl3snd@ha
@@ -1162,7 +1162,7 @@ namespace ipl {
bl makeRawData__Q33ipl7utility11JpegDecoderFv
warning_run_no_jpeg:
lwz r3, 0x74(r28)
lfs f1, lbl_81694424-0x14
lfs f1, scOrthoLeft-0x14
lwz r27, 0(r3)
stw r30, 8(r1)
fmr f2, f1
@@ -1170,7 +1170,7 @@ namespace ipl {
fmr f5, f1
lhz r0, 6(r27)
stw r3, 0xc(r1)
lfs f6, lbl_81694424-0x4
lfs f6, scOrthoLeft-0x4
lfd f0, 8(r1)
stw r0, 0x14(r1)
fsubs f3, f0, f31
@@ -1362,17 +1362,17 @@ namespace ipl {
}
void System::getProjectionRect4x3(nw4r::ut::Rect* rect) {
rect->left = *((volatile const f32*)&lbl_81694424);
rect->right = *((volatile const f32*)&lbl_81694428);
rect->bottom = *((volatile const f32*)&lbl_8169442C);
rect->top = *((volatile const f32*)&lbl_81694430);
rect->left = *((volatile const f32*)&scOrthoLeft);
rect->right = *((volatile const f32*)&scOrthoRight);
rect->bottom = *((volatile const f32*)&scOrthoBottom);
rect->top = *((volatile const f32*)&scOrthoTop);
}
void System::getProjectionRect16x9(nw4r::ut::Rect* rect) {
rect->left = *((volatile const f32*)&lbl_81694434);
rect->right = *((volatile const f32*)&lbl_81694438);
rect->bottom = *((volatile const f32*)&lbl_8169442C);
rect->top = *((volatile const f32*)&lbl_81694430);
rect->left = *((volatile const f32*)&scWideOrthoLeft);
rect->right = *((volatile const f32*)&scWideOrthoRight);
rect->bottom = *((volatile const f32*)&scOrthoBottom);
rect->top = *((volatile const f32*)&scOrthoTop);
}
GXRenderModeObj* System::getRenderModeObj() {
@@ -1516,11 +1516,11 @@ namespace ipl {
#ifdef __MWERKS__
#pragma force_active on
extern "C" const f32 lbl_81694424 = -304.0f;
extern "C" const f32 lbl_81694428 = 304.0f;
extern "C" const f32 lbl_8169442C = 228.0f;
extern "C" const f32 lbl_81694430 = -228.0f;
extern "C" const f32 lbl_81694434 = -416.0f;
extern "C" const f32 lbl_81694438 = 416.0f;
extern "C" const f32 scOrthoLeft = -304.0f;
extern "C" const f32 scOrthoRight = 304.0f;
extern "C" const f32 scOrthoBottom = 228.0f;
extern "C" const f32 scOrthoTop = -228.0f;
extern "C" const f32 scWideOrthoLeft = -416.0f;
extern "C" const f32 scWideOrthoRight = 416.0f;
#pragma force_active off
#endif