Compare commits

...

6 Commits

Author SHA1 Message Date
coah
5c45fddea5 cleanup(NWC24MsgObj): rename unk_0x1C to crc
Copied from/to mailbox entry->crc in MBoxCtrl.
2026-10-02 14:03:08 -05:00
coah
3e279ef189 cleanup(eZiText): rename work unk_0x17F0 to dawgGroup (#856)
Holds NextDawgGroup() cursor in Matching zi8dawg.
2026-10-02 14:02:52 -05:00
coah
32417fe8a2 cleanup(eZiText): rename work unk_0x01 to countOnly (#855)
Assigned/compared with options->countOnly in zi8getc2.
2026-10-02 14:02:44 -05:00
coah
2d9e3ee14a cleanup(eZiText): rename work unk_0x1A to separator (#854)
Init to space (0x20); Matching zi8space emits it; zi8cgetc saves as separator.
2026-10-02 14:00:30 -05:00
coah
23db5e05e1 cleanup(CDBCryptBuf): rename unk_0x3EC00/04 to size/offset (#853)
Decrypt fills size; Matching CDBRecordFile uses offset for seek/tell/read.
2026-10-02 14:00:24 -05:00
coah
741c9263e3 cleanup(iplSDButton): rename unk_0x54 to mAnimWait (#852)
Same pattern as Button: wait flag while help-button click anim plays.
2026-10-02 14:00:18 -05:00
13 changed files with 47 additions and 47 deletions

View File

@@ -145,7 +145,7 @@ namespace ipl {
ANIM_MAX,
};
int unk_0x54;
int mAnimWait;
layout::Object* mpLayout; // 0x58
nand::LayoutFile* mpLayoutFile; // 0x5C

View File

@@ -205,7 +205,7 @@ typedef struct _ziUwdNode {
struct __zi8_work_data_s {
ziU8 unk_0x00;
ziU8 unk_0x01;
ziU8 countOnly; // 0x01
ziU8 unk_0x02[2];
ziLanguageEntry* langEntries; // 0x04
ziU8 unk_0x08;
@@ -219,7 +219,7 @@ struct __zi8_work_data_s {
ziU8 unk_0x17;
ziU8 subLanguage; // 0x18
ziU8 unk_0x19;
ziU16 unk_0x1A;
ziU16 separator; // 0x1A
ziU8 unk_0x1C[3];
ziU8 unk_0x1F;
ziU16 unk_0x20[0x40];
@@ -283,7 +283,7 @@ struct __zi8_work_data_s {
ziU16 unk_0x17EA;
ziU8 unk_0x17EC;
ziU8 unk_0x17ED[3];
ziU8* unk_0x17F0;
ziU8* dawgGroup; // 0x17F0
ziWChar unk_0x17F4[0x40]; // 0x17F4..0x1874
ziU16 unk_0x1874;
ziU8 unk_0x1876;

View File

@@ -18,7 +18,7 @@ static Zi8UInt Zi8SetFindCand(ziU8* foundCandidates, Zi8UInt ordinal, ziPtr work
}
ziWChar* ZiGetNextPhonetic(ziWChar* spelling, ziWChar* end ZI_NEED_WORK) {
while (*spelling && *spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360 && spelling < end) {
while (*spelling && *spelling != ZI_WORK->separator && *spelling != 0xF360 && spelling < end) {
++spelling;
}
if (!*spelling || spelling == end) {
@@ -37,8 +37,8 @@ int ZiPartialMatch(ziWChar* spelling, ziWChar* spellingEnd,
if (spelling == spellingEnd || candidate == candidateEnd || !*spelling || !*candidate) {
return 1;
}
while (*spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360) {
if (*candidate == ZI_WORK->unk_0x1A || *candidate == 0xF360) {
while (*spelling != ZI_WORK->separator && *spelling != 0xF360) {
if (*candidate == ZI_WORK->separator || *candidate == 0xF360) {
break;
}
if (*spelling != *candidate) {
@@ -2868,7 +2868,7 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
ziU8 count;
ziWChar spacedElements[256];
struct { ziWChar separator; } savedState;
savedState.separator = ZI_WORK->unk_0x1A;
savedState.separator = ZI_WORK->separator;
if (elementCount <= 1 || !charCount) {
return elementCount;
}
@@ -2881,9 +2881,9 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
if (spacedIndex == elementCount) {
return elementCount;
}
ZI_WORK->unk_0x1A = 0xF360;
ZI_WORK->separator = 0xF360;
Zi8ZHaddSpace(elements, elementCount, spacedElements, 256, __zi8_work_data);
ZI_WORK->unk_0x1A = savedState.separator;
ZI_WORK->separator = savedState.separator;
spacedIndex = elementIndex = count = 0;
while (charCount && elementIndex < elementCount) {
if (spacedElements[spacedIndex] == 0xF360) {

View File

@@ -306,7 +306,7 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
} else {
if (status == 0) {
ZI_WORK->unk_0x17EC = 0;
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
} else if (ZI_WORK->unk_0x17EC != 0) {
Zi8LogError(100, ZI_WORK);
goto finish_match;
@@ -316,30 +316,30 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
mode, status, reservedMode, 0, acceptPrefix, ZI_WORK);
} else {
while (ZI_WORK->unk_0x17F0 != 0) {
while (ZI_WORK->dawgGroup != 0) {
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
mode, status, reservedMode, ZI_WORK->dawgGroup,
acceptPrefix, ZI_WORK);
if ((ziU8)result != 0) break;
status = 0;
if (count <= 1 && language == 0x36) break;
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
}
}
if ((ziU8)result == 0 && status == 0 && mode == 1 && count == 1 && capacity >= 1) {
mode = 0;
ZI_WORK->unk_0x17EC = 1;
if (tableSize != 0) {
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
while (ZI_WORK->unk_0x17F0 != 0) {
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
while (ZI_WORK->dawgGroup != 0) {
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
mode, status, reservedMode, ZI_WORK->dawgGroup,
acceptPrefix, ZI_WORK) != 0) {
*output = *elements;
result = 1;
break;
}
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
}
} else {
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,

View File

@@ -339,11 +339,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
if ((parameters->elementCount == 1) && (parameters->firstCandidate == 0)) {
switch (parameters->language) {
case 1:
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
switch(ZI_WORK->unk_0x00) {
case '\0':
if (parameters->elements[0] == 0xEF04) {
ZI_WORK->unk_0x01 = options->countOnly;
ZI_WORK->countOnly = options->countOnly;
ZI_WORK->unk_0x00 = '\x01';
}
break;
@@ -400,11 +400,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
break;
case 0x11:
default:
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
switch(ZI_WORK->unk_0x00) {
case '\0':
if (parameters->elements[0] == 0xEFF2) {
ZI_WORK->unk_0x01 = options->countOnly;
ZI_WORK->countOnly = options->countOnly;
ZI_WORK->unk_0x00 = '\x01';
}
break;

View File

@@ -21,7 +21,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
ZI_WORK->unk_0x0A = 0xFF;
ZI_WORK->unk_0x10 = 0x64;
*(ziU16*)&ZI_WORK->unk_0x0C = 0xFFFF;
ZI_WORK->unk_0x1A = 0x20;
ZI_WORK->separator = 0x20;
ZI_WORK->unk_0x1C[2] = 0;
ZI_WORK->unk_0x1B30 = 0;
ZI_WORK->unk_0x1B3A = 0;

View File

@@ -68,7 +68,7 @@ ziU8 Zi8ZHaddSpace(ziWChar* src, ziU8 count, ziWChar* dst,
}
if (pdst[k - 1] != 0xF360 &&
(pdst[k - 1] < 0xF331 || pdst[k - 1] > 0xF335)) {
pdst[k++] = ZI_WORK->unk_0x1A;
pdst[k++] = ZI_WORK->separator;
}
psrc += i;
n -= i;

View File

@@ -13,8 +13,8 @@ typedef struct _CDBCryptBuf {
u32 buffer32[0xFB00];
}; // 0x00
u32 unk_0x3EC00;
u32 unk_0x3EC04;
u32 size; // 0x3EC00
u32 offset; // 0x3EC04
BOOL allocated; // 0x3EC08
u8 unk_0x3EC0C[0x34];
} CDBCryptBuf;

View File

@@ -31,7 +31,7 @@ typedef struct NWC24MsgObjPrivate {
u32 tag; // 0x14
u32 ledPattern; // 0x18
#if defined(NWC24_MBOX_CTRL) || defined(NWC24_MSG_COMMIT)
u32 unk_0x1C;
u32 crc; // 0x1C
#endif
#if defined(NWC24_MBOX_CTRL) || defined(NWC24_MSG_COMMIT)
union {

View File

@@ -164,7 +164,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
goto open_result_ready;
open_location_ok:
if (CDBFSSDIsMounted()) {
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
} else {
err = CDB_ERROR_SD_IS_NOT_MOUNTED;
}
@@ -174,7 +174,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
return err;
}
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
cryptBuf->offset = sizeof(CDBAttrBuf);
}
return CDB_ERROR_OK;
}
@@ -223,7 +223,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
goto result_ready;
location_ok:
if (CDBFSSDIsMounted()) {
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
} else {
result = CDB_ERROR_SD_IS_NOT_MOUNTED;
}
@@ -233,7 +233,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
return result;
}
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
cryptBuf->offset = sizeof(CDBAttrBuf);
}
return CDB_ERROR_OK;
}

View File

@@ -264,8 +264,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
CDBCryptBuf* cryptBuf = record->cryptBuf;
if (cryptBuf != NULL) {
u32 unk = cryptBuf->unk_0x3EC00 - cryptBuf->unk_0x3EC04;
if (cryptBuf->unk_0x3EC00 < unk) {
u32 unk = cryptBuf->size - cryptBuf->offset;
if (cryptBuf->size < unk) {
unk = 0;
}
@@ -274,8 +274,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
}
if (unk != 0) {
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->unk_0x3EC04], unk);
cryptBuf->unk_0x3EC04 += unk;
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->offset], unk);
cryptBuf->offset += unk;
}
if (readSize != NULL) {
@@ -300,16 +300,16 @@ CDBErr CDBRecordFileSeekData(CDBRecord* record, u32 offset, CDBSeek seek) {
if (cryptBuf != NULL) {
switch (seek) {
case CDB_SEEK_BEGIN: {
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
cryptBuf->unk_0x3EC04 += offset;
cryptBuf->offset = sizeof(CDBAttrBuf);
cryptBuf->offset += offset;
break;
}
case CDB_SEEK_END: {
cryptBuf->unk_0x3EC04 = (cryptBuf->unk_0x3EC00 - 1) - offset;
cryptBuf->offset = (cryptBuf->size - 1) - offset;
break;
}
case CDB_SEEK_CUR: {
cryptBuf->unk_0x3EC04 += offset;
cryptBuf->offset += offset;
break;
}
}
@@ -329,7 +329,7 @@ int CDBRecordFileTellData(CDBRecord* record) {
CDBCryptBuf* cryptBuf = record->cryptBuf;
if (cryptBuf != NULL) {
return cryptBuf->unk_0x3EC04 - sizeof(CDBAttrBuf);
return cryptBuf->offset - sizeof(CDBAttrBuf);
}
return CDBFTellData(&recordFile->bridgeFile, record->key.location);
}

View File

@@ -782,7 +782,7 @@ static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* ms
duplicateOffset = offset;
continue;
}
if (msg->unk_0x1C != 0 && entry->crc == msg->unk_0x1C && entry->type == msg->type && entry->length == msg->length &&
if (msg->crc != 0 && entry->crc == msg->crc && entry->type == msg->type && entry->length == msg->length &&
entry->flags == msg->unk_0x10 && (s32)entry->date == (s32)msg->date) {
duplicateId = entry->msgId;
duplicateOffset = offset;
@@ -959,7 +959,7 @@ static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entr
entry->flags = msg->unk_0x10;
entry->tag = msg->tag;
entry->ledPattern = msg->ledPattern;
entry->crc = msg->unk_0x1C;
entry->crc = msg->crc;
entry->fromIdHigh = msg->fromIdHigh;
entry->fromIdLow = msg->fromIdLow;
entry->date = msg->date;
@@ -1006,7 +1006,7 @@ static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* ms
msg->unk_0x10 = entry->flags;
msg->tag = entry->tag;
msg->ledPattern = entry->ledPattern;
msg->unk_0x1C = entry->crc;
msg->crc = entry->crc;
msg->fromIdHigh = entry->fromIdHigh;
msg->fromIdLow = entry->fromIdLow;
msg->date = entry->date;

View File

@@ -31,7 +31,7 @@ namespace ipl {
};
// clang-format on
SDButton::SDButton(EGG::Heap* heap) : Base(heap), unk_0x54(0) {
SDButton::SDButton(EGG::Heap* heap) : Base(heap), mAnimWait(0) {
setSceneParentFlags(SCN_PARENTFLAG_CALC | SCN_PARENTFLAG_DRAW);
for (int i = 0; i < 2; i++) {
@@ -114,10 +114,10 @@ namespace ipl {
}
void SDButton::calc() {
if (unk_0x54 == 1) {
if (mAnimWait == 1) {
if (!mpLayout->isPlaying(ANIM_HELP_BTN_ROLL_ON)) {
reset_gui();
unk_0x54 = 0;
mAnimWait = 0;
}
}
@@ -347,7 +347,7 @@ namespace ipl {
switch (animNo) {
case IDANIM_HELP_BTN_CLICK: {
anim = mpLayout->getAnim(ANIM_HELP_BTN_ROLL_ON);
unk_0x54 = 1;
mAnimWait = 1;
break;
}
case IDANIM_ARROW_RIGHT_CLICK: {