Compare commits

..

1 Commits

Author SHA1 Message Date
coah
928026a802 cleanup(ErrorHandler): name set() arg storage fields
Rename unused debug-ish stash fields to match ErrorHandler::set params:
- unk_0x14 → mArg1 (char[4] from arg1)
- unk_0x0C → mArg2
- unk_0x10 → mArg3

Verified: ErrorHandler 100%/100%, build/43U/ok, DOL sha1
26116613f624061ba99c8d1a299aaa6efa85670d
2026-10-02 14:06:29 -05:00
4 changed files with 35 additions and 35 deletions

View File

@@ -62,17 +62,17 @@ namespace ipl {
void start_left_event(const char* paneName); void start_left_event(const char* paneName);
void start_trig_event(const char* paneName); void start_trig_event(const char* paneName);
typedef struct CmdEntry { typedef struct Unk {
int command; // 0x00 int command; // 0x00
u32 msgID; // 0x04 u32 msgID; // 0x04
} CmdEntry; } Unk;
CmdEntry mCmdQueue[64]; Unk unk_0x64[64];
int mQueueCapacity; int unk_0x264;
int mQueueCount; int unk_0x268;
int mQueueRead; int unk_0x26C;
int mQueueWrite; int unk_0x270;
int mSettingArg; // 0x274 int mSettingArg; // 0x274

View File

@@ -60,9 +60,9 @@ namespace ipl {
int mMessageID; // 0x08 int mMessageID; // 0x08
int unk_0x0C; int mArg2;
int unk_0x10; int mArg3;
char unk_0x14[4]; char mArg1[4];
u8* mpArcData; // 0x18 u8* mpArcData; // 0x18
u32 mArcSize; // 0x1C u32 mArcSize; // 0x1C

View File

@@ -15,10 +15,10 @@ namespace ipl {
// clang-format on // clang-format on
SettingButton::SettingButton(EGG::Heap* heap, int arg) : FaderSceneBase(heap), ::gui::EventHandler() { SettingButton::SettingButton(EGG::Heap* heap, int arg) : FaderSceneBase(heap), ::gui::EventHandler() {
mQueueCapacity = 64; unk_0x264 = 64;
mQueueCount = 0; unk_0x268 = 0;
mQueueRead = 0; unk_0x26C = 0;
mQueueWrite = 0; unk_0x270 = 0;
mSettingArg = arg; mSettingArg = arg;
mpLayout = NULL; mpLayout = NULL;
mpLayoutFile = NULL; mpLayoutFile = NULL;
@@ -81,9 +81,9 @@ namespace ipl {
FaderSceneCommand SettingButton::calcNormal() { FaderSceneCommand SettingButton::calcNormal() {
if (!mpLayout->getAnim(ANIM_ALPHA_IN)->isPlaying() && !mpLayout->getAnim(ANIM_ALPHA_OUT)->isPlaying() && if (!mpLayout->getAnim(ANIM_ALPHA_IN)->isPlaying() && !mpLayout->getAnim(ANIM_ALPHA_OUT)->isPlaying() &&
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && mQueueCount != 0) { !mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && unk_0x268 != 0) {
CmdEntry entry = mCmdQueue[mQueueRead]; Unk unk = unk_0x64[unk_0x26C];
switch (entry.command) { switch (unk.command) {
case CMD_SHOW_BTN: { case CMD_SHOW_BTN: {
showBtn(); showBtn();
break; break;
@@ -93,16 +93,16 @@ namespace ipl {
break; break;
} }
case CMD_SET_TEXT: { case CMD_SET_TEXT: {
setText(entry.msgID); setText(unk.msgID);
break; break;
} }
} }
if (mQueueCount != 0) { if (unk_0x268 != 0) {
if (++mQueueRead >= mQueueCapacity) { if (++unk_0x26C >= unk_0x264) {
mQueueRead = 0; unk_0x26C = 0;
} }
mQueueCount--; unk_0x268--;
} }
} }
@@ -225,16 +225,16 @@ namespace ipl {
} }
void SettingButton::reserve(int command, u32 msgId) { void SettingButton::reserve(int command, u32 msgId) {
if (mQueueCapacity != mQueueCount) { if (unk_0x264 != unk_0x268) {
int writeIdx = mQueueWrite; int unk = unk_0x270;
mCmdQueue[writeIdx].command = command; unk_0x64[unk].command = command;
mCmdQueue[writeIdx].msgID = msgId; unk_0x64[unk].msgID = msgId;
mQueueWrite++; unk_0x270++;
if (mQueueWrite >= mQueueCapacity) { if (unk_0x270 >= unk_0x264) {
mQueueWrite = 0; unk_0x270 = 0;
} }
mQueueCount++; unk_0x268++;
} }
} }

View File

@@ -43,13 +43,13 @@ namespace ipl {
mMessageID = msgId; mMessageID = msgId;
// Debug related? (seems to be incomplete; unused) // Debug related? (seems to be incomplete; unused)
unk_0x0C = arg2; mArg2 = arg2;
unk_0x10 = arg3; mArg3 = arg3;
if (arg1) { if (arg1) {
strncpy(unk_0x14, arg1, sizeof(unk_0x14)); strncpy(mArg1, arg1, sizeof(mArg1));
unk_0x14[sizeof(unk_0x14) - 1] = 0; mArg1[sizeof(mArg1) - 1] = 0;
} else { } else {
memset(unk_0x14, 0, sizeof(unk_0x14)); memset(mArg1, 0, sizeof(mArg1));
} }
curThread = OSGetCurrentThread(); curThread = OSGetCurrentThread();