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

Link khUtil.cpp

Browse Source
This commit is contained in:
HeartPiece 2023-01-30 14:23:32 +11:00
parent c434020643
commit d22fbeb44c
6 changed files with 27 additions and 1271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1053
asm/plugProjectKonoU/khUtil.s
View File

File diff suppressed because it is too large Load Diff

2
docs/recommended_todo.md
View File

@ -137,7 +137,7 @@
### <section id="plugProjectKonoU">plugProjectKonoU</section>
| File | Size (bytes) | File | Size (bytes) |
| ---- | ---- | ---- | ---- |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khUtil.cpp">khUtil.cpp</a> | 9514 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khCaveResult.cpp">khCaveResult.cpp</a> | 63477 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khCaveResult.cpp">khCaveResult.cpp</a> | 63477 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khFinalResult.cpp">khFinalResult.cpp</a> | 74655 |
### <section id="plugProjectMorimuraU">plugProjectMorimuraU</section>
| File | Size (bytes) | File | Size (bytes) |

14
include/kh/khUtil.h
View File

@ -51,6 +51,18 @@ struct khUtilFadePane : public P2DScreen::CallBackNode {
static khUtilFadePane* create(P2DScreen::Mgr*, u64, u8);
inline void createNode(J2DPane* pane)
{
khPaneNode* currNode = &mPaneNode;
while (currNode->mNext) {
currNode = currNode->mNext;
}
khPaneNode* node = new khPaneNode(pane);
P2ASSERTLINE(64, node);
currNode->mNext = node;
}
// _00 = VTBL
// _00-_1C = P2DScreen::CallBackNode
khPaneNode mPaneNode; // _1C
@ -82,6 +94,8 @@ struct khUtilColorAnm : public P2DScreen::CallBackNode {
virtual void update(); // _10 (weak)
virtual void do_update() { } // _1C (weak)
inline JUtility::TColor& getColor(int id) const { return mColorList[id]; }
// _00 = VTBL
// _00-_1C = P2DScreen::Node
JUtility::TColor* mColorList; // _1C

2
src/plugProjectKonoU/Makefile
View File

@ -7,7 +7,7 @@ KONO_FILES:=\
$(BUILD_DIR)/src/plugProjectKonoU/khReadyGo.o\
$(BUILD_DIR)/src/plugProjectKonoU/khFinalFloor.o\
$(BUILD_DIR)/asm/plugProjectKonoU/khDayEndResult.o\
$(BUILD_DIR)/asm/plugProjectKonoU/khUtil.o\
$(BUILD_DIR)/src/plugProjectKonoU/khUtil.o\
$(BUILD_DIR)/asm/plugProjectKonoU/khFinalResult.o\
$(BUILD_DIR)/src/plugProjectKonoU/khPayDept.o\
$(BUILD_DIR)/src/plugProjectKonoU/khWinLose.o\

225
src/plugProjectKonoU/khUtil.cpp
View File

@ -157,77 +157,11 @@ bool khUtilFadePane::add(J2DPane* pane)
{
bool result = false;
if (pane) {
khPaneNode* node = &mPaneNode;
khPaneNode* node2;
while (node) {
node2 = node;
node = node2->mNext;
}
node = new khPaneNode(pane);
P2ASSERTLINE(64, node);
node2->mNext = node;
result = true;
createNode(pane);
result = true;
setInfAlpha(pane);
}
return result;
/*
stwu r1, -0x20(r1)
mflr r0
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
stw r30, 0x18(r1)
li r30, 0
stw r29, 0x14(r1)
or. r29, r4, r4
beq lbl_8040BDB0
addi r30, r3, 0x1c
b lbl_8040BD48
lbl_8040BD44:
mr r30, r0
lbl_8040BD48:
lwz r0, 8(r30)
cmplwi r0, 0
bne lbl_8040BD44
li r3, 0xc
bl __nw__FUl
or. r31, r3, r3
beq lbl_8040BD7C
lis r3, __vt__Q42kh6Screen14khUtilFadePane10khPaneNode@ha
li r0, 0
addi r3, r3, __vt__Q42kh6Screen14khUtilFadePane10khPaneNode@l
stw r3, 0(r31)
stw r29, 4(r31)
stw r0, 8(r31)
lbl_8040BD7C:
cmplwi r31, 0
bne lbl_8040BDA0
lis r3, lbl_80498CC8@ha
lis r5, lbl_80498CBC@ha
addi r3, r3, lbl_80498CC8@l
li r4, 0x40
addi r5, r5, lbl_80498CBC@l
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_8040BDA0:
stw r31, 8(r30)
mr r3, r29
li r30, 1
bl setInfAlpha__Q22kh6ScreenFP7J2DPane
lbl_8040BDB0:
lwz r0, 0x24(r1)
mr r3, r30
lwz r31, 0x1c(r1)
lwz r30, 0x18(r1)
lwz r29, 0x14(r1)
mtlr r0
addi r1, r1, 0x20
blr
*/
}
/*
@ -293,19 +227,19 @@ khUtilColorAnm::khUtilColorAnm(P2DScreen::Mgr* screen, u64 tag, int panes, int f
void khUtilColorAnm::update()
{
if (mUpdateMode) {
f32 calc = (mCounter * (mPaneNum - 1)) / (f32)mMaxFrame;
int id = calc;
JUtility::TColor col1 = mColorList[id + 1];
JUtility::TColor col2 = mColorList[id];
calc -= (f32)id;
f32 calc2 = 1.0f - calc;
f32 calc2, calc;
calc = (mCounter * (mPaneNum - 1)) / (f32)mMaxFrame;
JUtility::TColor col1 = getColor((int)calc);
JUtility::TColor col2 = getColor(((int)calc) + 1);
calc -= (int)calc;
calc2 = 1.0f - calc;
mColor1.r = (f32)col1.r * calc2 + (f32)col2.r * calc;
mColor1.g = (f32)col1.g * calc2 + (f32)col2.g * calc;
mColor1.b = (f32)col1.b * calc2 + (f32)col2.b * calc;
mColor1.a = (f32)col1.a * calc2 + (f32)col2.a * calc;
if (mCounter++ >= mMaxFrame) {
if (++mCounter >= mMaxFrame) {
mCounter = 0;
}
} else {
@ -313,147 +247,6 @@ void khUtilColorAnm::update()
mCounter = 0;
}
do_update();
/*
stwu r1, -0x90(r1)
mflr r0
stw r0, 0x94(r1)
lbz r0, 0x34(r3)
cmplwi r0, 0
beq lbl_8040C19C
lwz r4, 0x28(r3)
lis r6, 0x4330
lwz r5, 0x30(r3)
addi r4, r4, -1
lwz r0, 0x2c(r3)
mullw r4, r5, r4
stw r6, 0x10(r1)
xoris r0, r0, 0x8000
lfd f3, lbl_80520188@sda21(r2)
stw r0, 0x1c(r1)
lwz r8, 0x1c(r3)
xoris r0, r4, 0x8000
stw r6, 0x18(r1)
lfd f6, lbl_80520190@sda21(r2)
stw r0, 0x14(r1)
lfd f0, 0x18(r1)
lfd f1, 0x10(r1)
fsubs f0, f0, f3
stw r6, 0x28(r1)
fsubs f2, f1, f3
lfs f1, lbl_80520184@sda21(r2)
stw r6, 0x38(r1)
fdivs f8, f2, f0
stw r6, 0x50(r1)
stw r6, 0x30(r1)
stw r6, 0x68(r1)
stw r6, 0x48(r1)
stw r6, 0x60(r1)
fctiwz f0, f8
stfd f0, 0x20(r1)
lwz r7, 0x24(r1)
addi r0, r7, 1
slwi r5, r7, 2
slwi r4, r0, 2
xoris r0, r7, 0x8000
lwzx r4, r8, r4
stw r0, 0x2c(r1)
lwzx r0, r8, r5
stw r4, 8(r1)
lfd f0, 0x28(r1)
stw r0, 0xc(r1)
lbz r4, 8(r1)
fsubs f0, f0, f3
lbz r0, 9(r1)
stw r4, 0x3c(r1)
lbz r4, 0xc(r1)
fsubs f8, f8, f0
stw r0, 0x54(r1)
lfd f0, 0x38(r1)
lbz r0, 0xa(r1)
fsubs f7, f1, f8
stw r4, 0x34(r1)
fsubs f1, f0, f6
lbz r4, 0xd(r1)
stw r0, 0x6c(r1)
lfd f0, 0x50(r1)
fmuls f4, f1, f8
stw r4, 0x4c(r1)
lfd f2, 0x30(r1)
fsubs f1, f0, f6
lbz r0, 0xe(r1)
lfd f0, 0x68(r1)
fsubs f5, f2, f6
stw r0, 0x64(r1)
fmuls f2, f1, f8
lfd f3, 0x48(r1)
fsubs f0, f0, f6
lfd f1, 0x60(r1)
fsubs f3, f3, f6
fmadds f4, f5, f7, f4
fsubs f1, f1, f6
fmuls f0, f0, f8
fmadds f2, f3, f7, f2
fctiwz f3, f4
fmadds f0, f1, f7, f0
fctiwz f1, f2
stfd f3, 0x40(r1)
fctiwz f0, f0
stfd f1, 0x58(r1)
lwz r0, 0x44(r1)
stfd f0, 0x70(r1)
lwz r4, 0x5c(r1)
stb r0, 0x20(r3)
lwz r0, 0x74(r1)
stb r4, 0x21(r3)
stb r0, 0x22(r3)
lbz r0, 0xb(r1)
lbz r4, 0xf(r1)
stw r0, 0x84(r1)
stw r6, 0x80(r1)
lfd f0, 0x80(r1)
stw r4, 0x7c(r1)
fsubs f0, f0, f6
stw r6, 0x78(r1)
lfd f1, 0x78(r1)
fmuls f0, f0, f8
fsubs f1, f1, f6
fmadds f0, f1, f7, f0
fctiwz f0, f0
stfd f0, 0x88(r1)
lwz r0, 0x8c(r1)
stb r0, 0x23(r3)
lwz r4, 0x30(r3)
addi r4, r4, 1
stw r4, 0x30(r3)
lwz r0, 0x2c(r3)
cmpw r4, r0
blt lbl_8040C1C4
li r0, 0
stw r0, 0x30(r3)
b lbl_8040C1C4
lbl_8040C19C:
lbz r4, 0x24(r3)
li r0, 0
stb r4, 0x20(r3)
lbz r4, 0x25(r3)
stb r4, 0x21(r3)
lbz r4, 0x26(r3)
stb r4, 0x22(r3)
lbz r4, 0x27(r3)
stb r4, 0x23(r3)
stw r0, 0x30(r3)
lbl_8040C1C4:
lwz r12, 0(r3)
lwz r12, 0x1c(r12)
mtctr r12
bctrl
lwz r0, 0x94(r1)
mtlr r0
addi r1, r1, 0x90
blr
*/
}
} // namespace Screen

2
tools/progress.csv
View File

@ -373,3 +373,5 @@ You have 1992 out of 10000 Pokos and 63 out of 201 treasures.",2023-01-27 20:06:
You have 2001 out of 10000 Pokos and 63 out of 201 treasures.",2023-01-27 21:43:51.828198
2010,935536,0.20108882560906827,63,225993,0.31702475675311703,"
You have 2010 out of 10000 Pokos and 63 out of 201 treasures.",2023-01-28 23:41:07.099873
2018,939108,0.20185660930213364,63,226114,0.31719449650420284,"
You have 2018 out of 10000 Pokos and 63 out of 201 treasures.",2023-01-30 14:22:52.445188

1 code_count_in_pokos code_completion_in_bytes code_completion_in_percentage data_count_in_treasures data_completion_in_bytes data_completion_in_percentage sentence created_at
373
374
375
376
377