Compare commits

...

3 Commits

Author SHA1 Message Date
coah
7ae9099d96 cleanup(iplCalendar): name draw list and search-task flag
Rename the secondary date list used for draw order and the vBOOL that
tracks the jam search task.
2026-10-01 19:07:55 -05:00
coah
ded159048f cleanup(CDBAttr): name dirty / wiiIdDirty / wiiIdValid flags (#681)
Runtime flags after the attr buffer: lead dirty, wiiId-region dirty
(full write), and wiiId/attr loaded-valid.
2026-10-01 19:07:12 -05:00
coah
0ec86e7985 cleanup(jdec): name frame remX/remY remainder fields (#679)
Width/height leftover pixels after MCU tiling, set from remX/remY locals.
2026-10-01 19:06:45 -05:00
8 changed files with 43 additions and 43 deletions

View File

@@ -95,9 +95,9 @@ namespace ipl {
public:
nw4r::ut::List mDateList; // 0x84
nw4r::ut::List unk_0x90;
nw4r::ut::List mDrawList;
bool mbScrolling; // 0x9C
vBOOL unk_0xA0;
vBOOL mbSearchTaskRunning;
BOOL mbTaskCanceled; // 0xA4
vBOOL mbBackToBoardAlt; // 0xA8
bool mbAsian; // 0xAC

View File

@@ -64,8 +64,8 @@ typedef struct {
u16 mcuYCount; // 0x10
u16 mcuXCount2; // 0x12
u32 unk_0x14;
u8 unk_0x18;
u8 unk_0x19;
u8 remX; // 0x18
u8 remY; // 0x19
u8 compCount; // 0x1A
u8 scanCompCount; // 0x1B
u8 blockCount[4]; // 0x1C
@@ -143,8 +143,8 @@ struct TMCCJPEGDecWork_t {
u16 mcuYCount; // 0x1800
u16 mcuXCount2; // 0x1802
u32 unk_0x1804;
u8 unk_0x1808;
u8 unk_0x1809;
u8 remX; // 0x1808
u8 remY; // 0x1809
u8 compCount; // 0x180A
u8 scanCompCount; // 0x180B
u8 blockCount[4]; // 0x180C

View File

@@ -59,8 +59,8 @@ s32 TMCJPEGDEC_Setsize(TMCCJPEGDecWork* work) {
state->stepY = (state->scaleFactor + work->mcuXRem - 1) / state->scaleFactor;
state->jpegWidth = ((s32)(work->frameWidth + state->scaleFactor) - 1) / state->scaleFactor;
state->jpegHeight = (state->scaleFactor + work->frameHeight - 1) / state->scaleFactor;
state->stepXExt = (state->scaleFactor + work->unk_0x1808 - 1) / state->scaleFactor;
state->stepYExt = (state->scaleFactor + work->unk_0x1809 - 1) / state->scaleFactor;
state->stepXExt = (state->scaleFactor + work->remX - 1) / state->scaleFactor;
state->stepYExt = (state->scaleFactor + work->remY - 1) / state->scaleFactor;
state->dataSizeX = (state->stepXExt != 0) ? (state->maxX - 1) * state->stepX : (state->maxX + 1) * state->stepX;
state->dataSizeY = (state->stepYExt != 0) ? (state->maxY - 1) * state->stepY : (state->maxY + 1) * state->stepY;

View File

@@ -562,8 +562,8 @@ s32 TMCJPEGDEC_scan_varinit(TMCCJPEGDecWork* work) {
remX = p->frameWidth % p->mcuXCount;
remY = p->frameHeight % p->mcuXRem;
p->unk_0x18 = remX;
p->unk_0x19 = remY;
p->remX = remX;
p->remY = remY;
p->mcuYCount = p->mcuYCount + ((u8)remX != 0 ? 1 : 0);
p->mcuXCount2 = p->mcuXCount2 + ((u8)remY != 0 ? 1 : 0);
@@ -1919,8 +1919,8 @@ static s32 TMCJPEGDEC_parse_sof(TMCCJPEGDecWork* work) {
remX = fw - mcuCountX * mcuX;
remY = fh - mcuCountY * mcuY;
work->unk_0x1808 = remX;
work->unk_0x1809 = remY;
work->remX = remX;
work->remY = remY;
{
u16 xr = (remX != 0) ? 1 : 0;

View File

@@ -54,9 +54,9 @@ typedef struct _CDBAttrBuf {
typedef struct _CDBAttr {
CDBAttrBuf buf; // 0x00
BOOL unk_0x400; // 0x400
BOOL unk_0x404; // 0x404
BOOL unk_0x408; // 0x408
BOOL dirty; // 0x400
BOOL wiiIdDirty; // 0x404
BOOL wiiIdValid; // 0x408
} CDBAttr;
#pragma pack(pop)

View File

@@ -55,9 +55,9 @@ CDBErr CDBAttrCheckAttrBuf(CDBAttr* attr) {
void CDBAttrInit(CDBAttr* attr) {
memset(&attr->buf, 0, sizeof(CDBAttrBuf));
attr->unk_0x408 = FALSE;
attr->unk_0x400 = FALSE;
attr->unk_0x404 = FALSE;
attr->wiiIdValid = FALSE;
attr->dirty = FALSE;
attr->wiiIdDirty = FALSE;
}
CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate) {
@@ -89,7 +89,7 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
err = CDB_ERROR_OK;
attr->unk_0x400 = TRUE;
attr->dirty = TRUE;
}
if (err != CDB_ERROR_OK) {
@@ -98,11 +98,11 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
attrLastModifiedDate = lastModifiedDate;
memcpy(&attr->buf.lastModifiedDate, &attrLastModifiedDate, sizeof(u32));
attr->unk_0x400 = TRUE;
attr->dirty = TRUE;
attrModifiedCount = 0;
memcpy(&attr->buf.cdbID.modifiedCount, &attrModifiedCount, sizeof(u32));
attr->unk_0x400 = TRUE;
attr->dirty = TRUE;
GenCDBIdNumber(&cdbNum);
attrCdbIDNum = cdbNum;
@@ -110,12 +110,12 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
attrWiiID = CDBGetWiiId();
memcpy(&attr->buf.wiiId, &attrWiiID, sizeof(u64));
attr->unk_0x408 = TRUE;
attr->wiiIdValid = TRUE;
err = CDB_ERROR_OK;
attr->unk_0x400 = TRUE;
attr->unk_0x404 = TRUE;
attr->dirty = TRUE;
attr->wiiIdDirty = TRUE;
return err;
}
@@ -123,7 +123,7 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
CDBErr CDBAttrSetModifiedDate(CDBAttr* attr, u32 modifiedDate) {
u32 value = modifiedDate;
memcpy(&attr->buf.lastModifiedDate, &value, sizeof(u32));
attr->unk_0x400 = TRUE;
attr->dirty = TRUE;
return CDB_ERROR_OK;
}
@@ -131,7 +131,7 @@ CDBErr CDBAttrSetModifiedDate(CDBAttr* attr, u32 modifiedDate) {
CDBErr CDBAttrSetModifiedCount(CDBAttr* attr, u32 modifiedCount) {
u32 value = modifiedCount;
memcpy(&attr->buf.cdbID.modifiedCount, &value, sizeof(u32));
attr->unk_0x400 = TRUE;
attr->dirty = TRUE;
return CDB_ERROR_OK;
}
@@ -151,7 +151,7 @@ CDBErr CDBAttrGetIDNumber(CDBAttr* attr, CDBId* cdbID) {
CDBErr CDBAttrSetWiiId(CDBAttr* attr, u64 wiiId) {
u64 value = wiiId;
memcpy(&attr->buf.wiiId, &value, sizeof(u64));
attr->unk_0x404 = TRUE;
attr->wiiIdDirty = TRUE;
return CDB_ERROR_OK;
}

View File

@@ -21,7 +21,7 @@ CDBErr CDBRecordFileReadAttrBuf(CDBRecord* record) {
return err;
}
recordFile->attr.unk_0x408 = TRUE;
recordFile->attr.wiiIdValid = TRUE;
return CDB_ERROR_OK;
}
@@ -34,12 +34,12 @@ CDBErr CDBRecordFileWriteAttrBuf(CDBRecord* record) {
return CDB_ERROR_27;
}
if (recordFile->attr.unk_0x400 && !recordFile->attr.unk_0x404) {
if (recordFile->attr.dirty && !recordFile->attr.wiiIdDirty) {
err = CDBFWriteAttrOnlyLeadChunk(&recordFile->bridgeFile, &recordFile->attr, record->key.location);
if (err != CDB_ERROR_OK) {
return err;
}
} else if (recordFile->attr.unk_0x400 || recordFile->attr.unk_0x404) {
} else if (recordFile->attr.dirty || recordFile->attr.wiiIdDirty) {
err = CDBFWriteAttr(&recordFile->bridgeFile, &recordFile->attr, record->key.location);
if (err != CDB_ERROR_OK) {
return err;

View File

@@ -236,10 +236,10 @@ namespace ipl {
Calendar::Calendar(EGG::Heap* heap)
: FaderSceneBase(heap), ButtonEventHandlerBase(), mState(STATE_NORMAL), mPrevState(STATE_NORMAL), mpLayout(NULL), mpLayoutFile(NULL),
mpGroupAnim(NULL), mpInitAnim(NULL), mpBoardDate(NULL), mpSelectDate(NULL), mbScrolling(false), unk_0xA0(FALSE), mbTaskCanceled(FALSE),
mpGroupAnim(NULL), mpInitAnim(NULL), mpBoardDate(NULL), mpSelectDate(NULL), mbScrolling(false), mbSearchTaskRunning(FALSE), mbTaskCanceled(FALSE),
mbBackToBoardAlt(FALSE) {
nw4r::ut::List_Init(&mDateList, offsetof(Date, mNode1));
nw4r::ut::List_Init(&unk_0x90, offsetof(Date, mNode2));
nw4r::ut::List_Init(&mDrawList, offsetof(Date, mNode2));
mbAsian = System::getRegion() == SC_PRODUCT_AREA_JPN || (u32)System::getRegion() == SC_PRODUCT_AREA_KOR ||
(u32)System::getRegion() == SC_PRODUCT_AREA_CHN;
@@ -262,7 +262,7 @@ namespace ipl {
for (int i = 0; i < (DATE_COUNT * 2); i++) {
Date* date = new Date(getSceneHeap(), mpLayoutFile, "arc", "my_IplTop_f.brlyt");
if (i < DATE_COUNT) {
nw4r::ut::List_Append(&unk_0x90, date);
nw4r::ut::List_Append(&mDrawList, date);
}
nw4r::ut::List_Append(&mDateList, date);
}
@@ -382,10 +382,10 @@ namespace ipl {
}
} else {
for (u32 i = 0; i < DATE_COUNT; i++) {
((Date*)nw4r::ut::List_GetNth(&unk_0x90, i))->draw(false);
((Date*)nw4r::ut::List_GetNth(&mDrawList, i))->draw(false);
}
for (u32 i = 0; i < DATE_COUNT; i++) {
((Date*)nw4r::ut::List_GetNth(&unk_0x90, i))->draw(true);
((Date*)nw4r::ut::List_GetNth(&mDrawList, i))->draw(true);
}
}
}
@@ -425,8 +425,8 @@ namespace ipl {
}
void Calendar::onPointDate(Date* date) {
nw4r::ut::List_Remove(&unk_0x90, date);
nw4r::ut::List_Append(&unk_0x90, date);
nw4r::ut::List_Remove(&mDrawList, date);
nw4r::ut::List_Append(&mDrawList, date);
}
void Calendar::onTrigDate(Date* date) {
@@ -503,7 +503,7 @@ namespace ipl {
}
void Calendar::on_wait_task() {
if (unk_0xA0 == FALSE) {
if (mbSearchTaskRunning == FALSE) {
switch (mPrevState) {
case STATE_SCROLL_RIGHT: {
do_scroll_r();
@@ -535,7 +535,7 @@ namespace ipl {
mPrevState = mState;
mState = STATE_SCROLL_RIGHT;
if (unk_0xA0 == TRUE) {
if (mbSearchTaskRunning == TRUE) {
mbTaskCanceled = TRUE;
mPrevState = STATE_SCROLL_RIGHT;
mState = STATE_WAIT_TASK;
@@ -577,7 +577,7 @@ namespace ipl {
mPrevState = mState;
mState = STATE_SCROLL_LEFT;
if (unk_0xA0) {
if (mbSearchTaskRunning) {
mbTaskCanceled = TRUE;
mPrevState = STATE_SCROLL_LEFT;
mState = STATE_WAIT_TASK;
@@ -616,7 +616,7 @@ namespace ipl {
mPrevState = mState;
mState = STATE_DONE;
if (unk_0xA0 == TRUE) {
if (mbSearchTaskRunning == TRUE) {
OSReport("検索タスク終了要求\n"); // "Search task termination requested"
mbTaskCanceled = TRUE;
mPrevState = mState;
@@ -863,14 +863,14 @@ namespace ipl {
OSReport("タスク終了\n"); // Task end
calendar->unk_0xA0 = FALSE;
calendar->mbSearchTaskRunning = FALSE;
calendar->mbTaskCanceled = FALSE;
}
}
void Calendar::exec_search_task() {
OSReport("検索開始\n"); // Start search
unk_0xA0 = TRUE;
mbSearchTaskRunning = TRUE;
System::getTask1()->requestJam(search_task_, this, NULL);
}