Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2024-11-23 21:39:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

khDayEndResult fixes

Browse Source
This commit is contained in:
PikHacker 2024-05-16 01:35:40 -04:00
parent d0ce95216d
commit 95090b2658
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/recommended_todo.md
View File

@ -102,7 +102,7 @@
| File | Size (bytes) | File | Size (bytes) |
| ---- | ---- | ---- | ---- |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khCaveResult.cpp">khCaveResult.cpp</a> | 42208 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khFinalResult.cpp">khFinalResult.cpp</a> | 59951 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khDayEndResult.cpp">khDayEndResult.cpp</a> | 95909 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khWorldMap.cpp">khWorldMap.cpp</a> | 195273 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khDayEndResult.cpp">khDayEndResult.cpp</a> | 95685 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khWorldMap.cpp">khWorldMap.cpp</a> | 195273 |
### <section id="plugProjectMorimuraU">plugProjectMorimuraU</section>
| File | Size (bytes) | File | Size (bytes) |

29
src/plugProjectKonoU/khDayEndResult.cpp
View File

@ -1508,7 +1508,7 @@ void ObjDayEndResultIncP::statusDecPSlot()
}
}
}
static const int someDumbUnusedArray[0x40] = { 0 }; // not actually unused according to pikhacker
/**
* @note Address: 0x804077F0
* @note Size: 0x88
@ -1651,10 +1651,8 @@ void ObjDayEndResultMail::doCreate(JKRArchive* arc)
}
DispDayEndResult* dispResult = static_cast<DispDayEndResult*>(getDispMember());
mSaveMgr = ebi::Save::TMgr::createInstance();
ebi::Save::TMgr* mgr = mSaveMgr;
mgr->mSaveMenu.loadResource();
mgr->doLoadResource(JKRGetCurrentHeap());
mSaveMgr = ebi::Save::TMgr::createInstance();
mSaveMgr->doLoadMenuResource();
mSaveMgr->setControllers(getGamePad());
int day = dispResult->mMail.mDayCount;
@ -1665,33 +1663,34 @@ void ObjDayEndResultMail::doCreate(JKRArchive* arc)
setCallBackMessage(mScreenMain);
SceneDayEndResultMail* scene = static_cast<SceneDayEndResultMail*>(getOwner());
char* path;
if (dispResult->mMail.mHeap) {
mIconArchive = scene->mIconArchive;
mMailIconAnms = new MailIconAnm[20];
s8* data = scene->mMailFlags.byteView;
for (int i = 0; i < 20; i++) {
s8 id = scene->mMailFlags.byteView[i];
s8 id = data[i];
if (id == -1)
break;
if (id == -2) {
mMailIconAnms[i].mTIMG = nullptr;
mMailIconAnms[i].mIconCount = 0;
mMailIconAnms[i].mTIMG = nullptr;
} else {
char* path = scene->mTableData[id]->mFileName;
char buf[64];
path = scene->mTableData[id]->mFileName;
char buf[256] = { 0 };
do {
mMailIconAnms[i].mIconCount++;
sprintf(buf, "%s%003d.bti", path);
} while (JKRFileLoader::getGlbResource(buf, mIconArchive));
} while (JKRGetResource(buf, mIconArchive));
mMailIconAnms[i].mIconCount--;
if (mMailIconAnms[i].mIconCount) {
mMailIconAnms[i].mTIMG = new ResTIMG*[mMailIconAnms[i].mIconCount];
}
for (int j = 0; i < mMailIconAnms[i].mIconCount; j++) {
char buf2[64];
sprintf(buf2, "%s%003d.bti", path, j);
mMailIconAnms[i].mTIMG[j] = static_cast<ResTIMG*>(JKRFileLoader::getGlbResource(buf2, mIconArchive));
for (int j = 0; j < mMailIconAnms[i].mIconCount; j++) {
sprintf(buf, "%s%003d.bti", path, j);
mMailIconAnms[i].mTIMG[j] = JKRGetImageResource(buf, mIconArchive);
}
}
}