Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2024-12-01 01:00:33 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix some challengeResult2D

Browse Source
This commit is contained in:
HeartPiece 2023-02-06 20:22:42 +11:00
parent 187bd93ebb
commit 803bedf094
3 changed files with 232 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
include/Morimura/Challenge.h
View File

@ -203,7 +203,7 @@ struct TChallengeResult : public TTestBase {
f32 _0C; // _0C
};
virtual ~TChallengeResult() { } // _08 (weak)
virtual ~TChallengeResult(); // _08
virtual void doCreate(JKRArchive*); // _4C
virtual bool doUpdate(); // _58
virtual void doUpdateFadeoutFinish(); // _64
@ -218,6 +218,26 @@ struct TChallengeResult : public TTestBase {
void fadeEffect();
void setDebugHeapParent(JKRHeap*);
static bool mForceDemoStart;
static u8 mTestStageId; // could be a u16, unsure
static JKRHeap* mDebugHeapParent; // could be a different heap type
static JKRHeap* mDebugHeap; // could be a different heap type
static JUTTexture* mLeafTexture; // could be a different texture type (ResTIMG*?)
static JUTTexture* mFlowerTexture; // could be a different texture type (ResTIMG*?)
static JUTTexture* mRedFlowerTexture; // could be a different texture type (ResTIMG*?)
static f32 mMoveSpeed; // 12.0f
static f32 mAngRate; // 0.3f
static f32 mAngVelMax; // 20.0f
static f32 mAccel; // 0.1f
static bool mTestDemo; // true
static bool mComplete; // true
static u16 mTestRankInOrder; // 0xFFFF
static f32 mFlashInterval; // 40.0f
static f32 mDemoSpeedUpRate; // 2.0f
static f32 mDemoSpeedUpMax; // 3.0f
static GXColor mFlashColor; // 255, 255, 0, 255
// _00 = VTBL1
// _18 = VTBL2
// _00-_78 = TTestBase
@ -227,40 +247,54 @@ struct TChallengeResult : public TTestBase {
ebi::Save::TMgr* mSaveMgr; // _84
Controller* mControls; // _88
DispMemberChallengeResult* mDisp; // _8C
og::Screen::CallBack_CounterRV* mCounters[11]; // _90
og::Screen::CallBack_CounterRV* _90; // _90
og::Screen::CallBack_CounterRV* _94; // _94
og::Screen::CallBack_CounterRV* _98; // _98
og::Screen::CallBack_CounterRV* _9C; // _9C
og::Screen::CallBack_CounterRV* _A0; // _A0
og::Screen::CallBack_CounterRV* _A4[3]; // _A4
og::Screen::CallBack_CounterRV* _B0[3]; // _B0
J2DPictureEx* mScissorPic; // _BC
J2DPane* mPaneList[6]; // _C0
TMovePane* mMovePane[3];
J2DPane* mScorePane[3];
Vector2f mPosList1[3];
Vector2f mPoslist2[3];
f32 _120;
f32 _124;
VectorUnit mVecUnit[4]; // _128
f32 _168[4];
f32 mMoveTimer; // _178
int _17C[4];
J2DScreen* mScreens[5]; // _18C
TOffsetMsgSet* mMesgOffs; // _1A0
efx2d::T2DCavecompLoop* mEfxCompLoop; // _1A4
int _1A8;
int mPokoscore;
int mTotalScore;
int mPokos;
int mTimeBonus;
int mPikiCount;
int score0;
u8 mFlags[4];
int mDemoState;
int _1CC[5];
bool mIsSaveOpen;
int _1E4;
u8 _1E8;
u8 _1E9;
f32 mTimer; // _1EC
f32 mSpeed;
f32 mTimer2;
Game::ChallengeGame::StageList* mStageList; // _1F8
J2DPane* _C0; // _C0
J2DPane* _C4; // _C4
J2DPane* _C8; // _C8
J2DPane* _CC; // _CC
J2DPane* _D0; // _D0
J2DPane* _D4; // _D4
TMovePane* mMovePane[3]; // _D8
J2DPane* mScorePane[3]; // _E4
Vector2f mPosList1[3]; // _F0
Vector2f mPosList2[3]; // _108
f32 _120; // _120
f32 _124; // _124
VectorUnit mVecUnit[4]; // _128
VectorUnit _168; // _168
f32 mMoveTimer; // _178
int _17C[3]; // _17C
int _188; // _188
J2DScreen* mScreens[5]; // _18C
TOffsetMsgSet* mMesgOffs; // _1A0
efx2d::T2DCavecompLoop* mEfxCompLoop; // _1A4
int _1A8; // _1A8
int mPokoscore; // _1AC
int mTotalScore; // _1B0
int mPokos; // _1B4
int mBonuses[3]; // _1B8, time bonus, piki count, score0
u8 mFlags[4]; // _1C4
int mDemoState; // _1C8
int _1CC[2]; // _1CC
f32 _1D4; // _1D4
f32 _1D8; // _1D8
u16 _1DC; // _1DC
u16 _1DE; // _1DE
bool mIsSaveOpen; // _1E0
int _1E4; // _1E4
u8 _1E8; // _1E8
u8 _1E9; // _1E9
f32 mTimer; // _1EC
f32 mSpeed; // _1F0
f32 mTimer2; // _1F4
Game::ChallengeGame::StageList* mStageList; // _1F8
};
struct TChallengeSelect : public TTestBase {

8
include/Morimura/mrUtil.h
View File

@ -78,6 +78,8 @@ struct TCounterRV : public og::Screen::CallBack_CounterRV {
void startScaleAnim();
void reset();
inline void getColor(JUtility::TColor& color) { color.set(mColor); }
// _00 = VTBL
// _00-_A8 = og::Screen::CallBack_CounterRV
JUtility::TColor mColor; // _A8
@ -156,12 +158,6 @@ struct TMovePane {
int mCounter; // _40
u32 _44; // _44, unknown
u32 _48; // _48, unknown
static f32 mMoveSpeed;
static f32 mDemoSpeedUpRate;
static f32 mAccel;
static f32 mAngRate;
static f32 mAngVelMax;
};
struct THuWhitePaneSet : public J2DPictureEx {

380
src/plugProjectMorimuraU/challengeResult2D.cpp
View File

@ -621,6 +621,29 @@
static const char name[] = "challengeResult2D";
namespace Morimura {
bool TChallengeResult::mForceDemoStart = false;
u8 TChallengeResult::mTestStageId = 0;
JKRHeap* TChallengeResult::mDebugHeapParent = nullptr;
JKRHeap* TChallengeResult::mDebugHeap = nullptr;
JUTTexture* TChallengeResult::mLeafTexture = nullptr;
JUTTexture* TChallengeResult::mFlowerTexture = nullptr;
JUTTexture* TChallengeResult::mRedFlowerTexture = nullptr;
f32 TChallengeResult::mMoveSpeed = 12.0f;
f32 TChallengeResult::mAngRate = 0.3f;
f32 TChallengeResult::mAngVelMax = 20.0f;
f32 TChallengeResult::mAccel = 0.1f;
bool TChallengeResult::mTestDemo = true;
bool TChallengeResult::mComplete = true;
u16 TChallengeResult::mTestRankInOrder = 0xFFFF;
f32 TChallengeResult::mFlashInterval = 40.0f;
f32 TChallengeResult::mDemoSpeedUpRate = 2.0f;
f32 TChallengeResult::mDemoSpeedUpMax = 3.0f;
GXColor TChallengeResult::mFlashColor = { 255, 255, 0, 255 };
const int cRandArray[] = { 0, 1, 2, 0, 2, 1, 1, 0, 2, 1, 2, 0, 2, 1, 0, 2, 0, 1, 0 };
/*
* --INFO--
* Address: 80393348
@ -715,6 +738,11 @@ void TChallengeResultDemoScreen::draw(Graphics& gfx, J2DPerspGraph* graf)
}
}
// these almost certainly go in setComplete below once it gets made
static const u32 Tribon00 = 'Tribon00';
static const u32 Tribon01 = 'Tribon01';
static const u32 Tribon02 = 'Tribon02';
/*
* --INFO--
* Address: ........
@ -729,10 +757,19 @@ void TChallengeResultDemoScreen::startDemo()
* --INFO--
* Address: ........
* Size: 0000CC
* NB: This is just a guess to get the ribon u64s in rodata.
* Should be tweaked when needed in TChallengeResult::setInfo.
*/
void TChallengeResultDemoScreen::setComplete(bool)
void TChallengeResultDemoScreen::setComplete(bool isComplete)
{
// UNUSED FUNCTION
mAnimPane1 = nullptr;
TChallengeResult::mComplete = isComplete;
u64 ribons[] = { 'Tribon00', 'Tribon01', 'Tribon02' };
for (int i = 0; i < 3; i++) {
J2DPane* pane = mScreenObj->search(ribons[i]);
P2ASSERTLINE(224, pane);
pane->setMsgID('1_00467');
}
}
/*
@ -765,10 +802,7 @@ void TMovePane::setPane(J2DPane* pane)
P2ASSERTLINE(271, pane);
mPane = pane;
mPane->setBasePosition(J2DPOS_Center);
// this should be an inline but it wont match
f32 y = pane->mOffset.y;
mPanePosition.x = pane->mOffset.x;
mPanePosition.y = y;
mPanePosition = JGeometry::TVec2f(pane->mOffset);
reset();
}
@ -800,7 +834,8 @@ void TMovePane::update()
}
mPane->setOffset(mPaneGoal.x, mPaneGoal.y);
mPane->setAngle(roundAng(TAU - mAngle) * 360.0f / TAU);
f32 ang = roundAng(TAU - mAngle); // needed to load floats in right order lol
mPane->setAngle(ang * 360.0f / TAU);
if (mCounter > 0) {
mCounter++;
}
@ -814,11 +849,11 @@ void TMovePane::update()
void TMovePane::move()
{
turn();
mAngleSin = pikmin2_sinf(mAngle) * mMoveSpeed * mDemoSpeedUpRate;
mAngleCos = -pikmin2_cosf(mAngle) * mMoveSpeed * mDemoSpeedUpRate;
mAngleSin = pikmin2_sinf(mAngle) * TChallengeResult::mMoveSpeed * TChallengeResult::mDemoSpeedUpRate;
mAngleCos = -pikmin2_cosf(mAngle) * TChallengeResult::mMoveSpeed * TChallengeResult::mDemoSpeedUpRate;
f32 x = (mAngleSin - mVelocity.x) * mAccel * mDemoSpeedUpRate;
f32 y = (mAngleCos - mVelocity.y) * mAccel * mDemoSpeedUpRate;
f32 x = (mAngleSin - mVelocity.x) * TChallengeResult::mAccel * TChallengeResult::mDemoSpeedUpRate;
f32 y = (mAngleCos - mVelocity.y) * TChallengeResult::mAccel * TChallengeResult::mDemoSpeedUpRate;
x += mVelocity.x;
y += mVelocity.y;
mVelocity.x = x;
@ -939,9 +974,10 @@ lbl_803939AC:
*/
void TMovePane::turn()
{
f32 calc = getAngDist() * mAngRate * mDemoSpeedUpRate;
if (FABS(calc) > mAngVelMax * PI * mDemoSpeedUpRate) {
calc = calc > 0.0f ? (PI * mAngVelMax) : -(PI * mAngVelMax);
f32 calc = getAngDist() * TChallengeResult::mAngRate * TChallengeResult::mDemoSpeedUpRate;
f32 limit = PI * (DEG2RAD * (TChallengeResult::mAngVelMax * TChallengeResult::mDemoSpeedUpRate));
if (FABS(calc) > limit) {
calc = calc > 0.0f ? limit : -limit;
}
mAngle = roundAng(mAngle + calc);
/*
@ -1017,8 +1053,8 @@ bool TMovePane::hosei()
mAngleSin = 0.0f;
mAngleCos = 0.0f;
mVelocity = 0.0f;
f32 x = (mOffset.x - mPaneGoal.x) * 0.05f * mDemoSpeedUpRate;
f32 y = (mOffset.y - mPaneGoal.y) * 0.05f * mDemoSpeedUpRate;
f32 x = (mOffset.x - mPaneGoal.x) * 0.05f * TChallengeResult::mDemoSpeedUpRate;
f32 y = (mOffset.y - mPaneGoal.y) * 0.05f * TChallengeResult::mDemoSpeedUpRate;
mPaneGoal.x += x;
mPaneGoal.y += y;
if (FABS(x) < 0.05f && FABS(y) < 0.05f) {
@ -1189,7 +1225,7 @@ lbl_80393CA0:
*/
void TMovePane::rolling()
{
mAngle += 0.5f * mDemoSpeedUpRate;
mAngle += 0.5f * TChallengeResult::mDemoSpeedUpRate;
if (mAngle > TAU) {
mAngle -= TAU;
}
@ -1492,10 +1528,11 @@ void TCounterRV::update()
og::Screen::CallBack_CounterRV::update();
for (int i = 0; i < mCounterLimit; i++) {
og::Screen::CounterKeta* keta = mCounters[i];
P2ASSERTLINE(557, keta);
volatile JUtility::TColor color = mColor;
volatile JUtility::TColor color2 = mColor;
keta->mPicture->setWhite(mColor);
J2DPicture* pic = keta->mPicture;
P2ASSERTLINE(557, pic);
JUtility::TColor white;
getColor(white);
pic->setWhite(white);
}
/*
stwu r1, -0x30(r1)
@ -1718,206 +1755,113 @@ void TClearTexture::getEffectPosition(Vector2f&)
*/
TChallengeResult::TChallengeResult()
: TTestBase("challengeResult")
, mResultDemoScreen(nullptr)
, mResultScreen(nullptr)
, mSaveMgr(nullptr)
, mControls(nullptr)
, mDisp(nullptr)
, _90(nullptr)
, _94(nullptr)
, _98(nullptr)
, _9C(nullptr)
, _A0(nullptr)
, mScissorPic(nullptr)
, _C0(nullptr)
, _C4(nullptr)
, _C8(nullptr)
, _CC(nullptr)
, _D0(nullptr)
, _D4(nullptr)
{
mResultDemoScreen = nullptr;
mResultScreen = nullptr;
mSaveMgr = nullptr;
mControls = nullptr;
mDisp = nullptr;
/*
stwu r1, -0x10(r1)
mflr r0
lis r4, lbl_80494884@ha
stw r0, 0x14(r1)
addi r4, r4, lbl_80494884@l
stw r31, 0xc(r1)
mr r31, r3
bl __ct__Q28Morimura9TTestBaseFPc
lis r4, __vt__Q28Morimura16TChallengeResult@ha
li r0, 0
addi r4, r4, __vt__Q28Morimura16TChallengeResult@l
lis r3, "__ct__10Vector2<f>Fv"@ha
stw r4, 0(r31)
addi r5, r4, 0x10
addi r4, r3, "__ct__10Vector2<f>Fv"@l
addi r3, r31, 0xf0
stw r5, 0x18(r31)
li r5, 0
li r6, 8
li r7, 3
stw r0, 0x7c(r31)
stw r0, 0x80(r31)
stw r0, 0x84(r31)
stw r0, 0x88(r31)
stw r0, 0x8c(r31)
stw r0, 0x90(r31)
stw r0, 0x94(r31)
stw r0, 0x98(r31)
stw r0, 0x9c(r31)
stw r0, 0xa0(r31)
stw r0, 0xbc(r31)
stw r0, 0xc0(r31)
stw r0, 0xc4(r31)
stw r0, 0xc8(r31)
stw r0, 0xcc(r31)
stw r0, 0xd0(r31)
stw r0, 0xd4(r31)
bl __construct_array
lis r4, "__ct__10Vector2<f>Fv"@ha
addi r3, r31, 0x108
addi r4, r4, "__ct__10Vector2<f>Fv"@l
li r5, 0
li r6, 8
li r7, 3
bl __construct_array
lis r4, __ct__Q38Morimura16TChallengeResult10VectorUnitFv@ha
addi r3, r31, 0x128
addi r4, r4, __ct__Q38Morimura16TChallengeResult10VectorUnitFv@l
li r5, 0
li r6, 0x10
li r7, 4
bl __construct_array
li r9, 0
li r5, 6
stw r9, 0x1a0(r31)
li r4, 1
li r3, -1
lfs f1, lbl_8051F084@sda21(r2)
stw r9, 0x1a4(r31)
li r0, 3
mr r10, r9
mr r11, r9
stw r9, 0x1a8(r31)
stw r9, 0x1ac(r31)
stw r9, 0x1b0(r31)
stb r9, 0x1c4(r31)
stb r9, 0x1c5(r31)
stb r9, 0x1c6(r31)
stb r9, 0x1c7(r31)
sth r5, 0x1dc(r31)
sth r4, 0x1de(r31)
stb r9, 0x1e0(r31)
stw r3, 0x1e4(r31)
stb r9, 0x1e8(r31)
stb r9, 0x1e9(r31)
stfs f1, 0x1ec(r31)
stfs f1, 0x1f4(r31)
stw r9, 0x1f8(r31)
lfs f0, mDemoSpeedUpRate__Q28Morimura16TChallengeResult@sda21(r13)
stfs f0, 0x1f0(r31)
mtctr r0
mMesgOffs = nullptr;
mEfxCompLoop = nullptr;
_1A8 = 0;
mPokoscore = 0;
mTotalScore = 0;
lbl_80394454:
addi r0, r10, 0xa4
addi r3, r10, 0xb0
stwx r9, r31, r0
addi r0, r10, 0x17c
addi r8, r10, 0x1b8
addi r7, r11, 0xf0
stwx r9, r31, r3
addi r6, r11, 0xf4
addi r5, r11, 0x108
addi r4, r11, 0x10c
stwx r9, r31, r0
addi r3, r10, 0xd8
addi r0, r10, 0xe4
addi r10, r10, 4
stwx r9, r31, r8
addi r11, r11, 8
stfsx f1, r31, r7
stfsx f1, r31, r6
stfsx f1, r31, r5
stfsx f1, r31, r4
stwx r9, r31, r3
stwx r9, r31, r0
bdnz lbl_80394454
stw r9, 0x17c(r31)
li r3, 0x14
lfs f0, lbl_8051F084@sda21(r2)
stw r9, 0x180(r31)
lfs f12, lbl_8051F0F0@sda21(r2)
stw r9, 0x184(r31)
lfs f11, lbl_8051F0F4@sda21(r2)
stw r9, 0x188(r31)
lfs f10, lbl_8051F0F8@sda21(r2)
stw r9, 0x18c(r31)
lfs f9, lbl_8051F0FC@sda21(r2)
stw r9, 0x190(r31)
lfs f8, lbl_8051F100@sda21(r2)
stw r9, 0x194(r31)
lfs f7, lbl_8051F104@sda21(r2)
stw r9, 0x198(r31)
lfs f6, lbl_8051F108@sda21(r2)
stw r9, 0x19c(r31)
lfs f5, lbl_8051F10C@sda21(r2)
stfs f0, 0x120(r31)
lfs f4, lbl_8051F110@sda21(r2)
stfs f0, 0x124(r31)
lfs f3, lbl_8051F114@sda21(r2)
stfs f0, 0x178(r31)
lfs f2, lbl_8051F118@sda21(r2)
stfs f0, 0x1d4(r31)
lfs f1, lbl_8051F11C@sda21(r2)
stfs f0, 0x1d8(r31)
lfs f0, lbl_8051F120@sda21(r2)
stfs f12, 0x128(r31)
stfs f11, 0x12c(r31)
stfs f10, 0x130(r31)
stfs f11, 0x134(r31)
stfs f9, 0x138(r31)
stfs f11, 0x13c(r31)
stfs f8, 0x140(r31)
stfs f11, 0x144(r31)
stfs f7, 0x148(r31)
stfs f11, 0x14c(r31)
stfs f6, 0x150(r31)
stfs f11, 0x154(r31)
stfs f5, 0x158(r31)
stfs f4, 0x15c(r31)
stfs f3, 0x160(r31)
stfs f4, 0x164(r31)
stfs f2, 0x168(r31)
stfs f1, 0x16c(r31)
stfs f0, 0x170(r31)
stfs f1, 0x174(r31)
bl __nw__FUl
cmplwi r3, 0
beq lbl_803945E4
lis r5, __vt__Q25efx2d7TBaseIF@ha
lis r4, __vt__Q25efx2d5TBase@ha
addi r0, r5, __vt__Q25efx2d7TBaseIF@l
lis r6, __vt__18JPAEmitterCallBack@ha
stw r0, 0(r3)
addi r0, r4, __vt__Q25efx2d5TBase@l
lis r5, __vt__Q25efx2d8TForever@ha
lis r4, __vt__Q25efx2d15T2DCavecompLoop@ha
stw r0, 0(r3)
li r9, 0
addi r7, r5, __vt__Q25efx2d8TForever@l
addi r4, r4, __vt__Q25efx2d15T2DCavecompLoop@l
stb r9, 4(r3)
addi r8, r6, __vt__18JPAEmitterCallBack@l
addi r6, r7, 0x18
li r5, 0xc
stb r9, 5(r3)
addi r0, r4, 0x18
stw r8, 8(r3)
stw r7, 0(r3)
stw r6, 8(r3)
sth r5, 0xc(r3)
stw r9, 0x10(r3)
stw r4, 0(r3)
stw r0, 8(r3)
for (int i = 0; i < 4; i++) {
mFlags[i] = 0;
}
lbl_803945E4:
stw r3, 0x1a4(r31)
mr r3, r31
lwz r0, 0x14(r1)
lwz r31, 0xc(r1)
mtlr r0
addi r1, r1, 0x10
blr
*/
_1DC = 6;
_1DE = 1;
mIsSaveOpen = false;
_1E4 = -1;
_1E8 = 0;
_1E9 = 0;
mTimer = 0.0f;
mTimer2 = 0.0f;
mStageList = nullptr;
mSpeed = mDemoSpeedUpRate;
for (int i = 0; i < 3; i++) {
_A4[i] = nullptr;
_B0[i] = nullptr;
_17C[i] = nullptr;
mBonuses[i] = 0;
mPosList1[i] = Vector2f(0.0f);
mPosList2[i] = Vector2f(0.0f);
mMovePane[i] = nullptr;
mScorePane[i] = nullptr;
}
_17C[0] = 0;
_17C[1] = 0;
_17C[2] = 0;
_188 = 0;
for (int i = 0; i < 5; i++) {
mScreens[i] = nullptr;
}
_120 = 0.0f;
_124 = 0.0f;
mMoveTimer = 0.0f;
_1D4 = 0.0f;
_1D8 = 0.0f;
mVecUnit[0]._00 = 225.0f;
mVecUnit[0]._04 = 250.0f;
mVecUnit[0]._08 = 40.0f;
mVecUnit[0]._0C = 250.0f;
mVecUnit[1]._00 = 405.0f;
mVecUnit[1]._04 = 250.0f;
mVecUnit[1]._08 = 240.0f;
mVecUnit[1]._0C = 250.0f;
mVecUnit[2]._00 = 585.0f;
mVecUnit[2]._04 = 250.0f;
mVecUnit[2]._08 = 430.0f;
mVecUnit[2]._0C = 250.0f;
mVecUnit[3]._00 = 440.0f;
mVecUnit[3]._04 = 170.0f;
mVecUnit[3]._08 = 200.0f;
mVecUnit[3]._0C = 170.0f;
_168._00 = 70.0f;
_168._04 = 30.0f;
_168._08 = -115.0f;
_168._0C = 30.0f;
mEfxCompLoop = new efx2d::T2DCavecompLoop;
}
/*
* --INFO--
* Address: 80394604
* Size: 0000F4
*/
TChallengeResult::~TChallengeResult()
{
if (mDebugHeap) {
mDisp->mHeap->freeAll();
mDebugHeap->destroy();
}
mDebugHeap = nullptr;
}
/*