This commit is contained in:
robojumper
2025-12-02 23:13:37 +01:00
parent f6d4e45c1a
commit ba810ccc9e
3 changed files with 729 additions and 365 deletions
+63 -63
View File
@@ -15361,78 +15361,78 @@ fn_80291640__19dLytMiniGameScore_cFv = .text:0x80291640; // type:function size:0
fn_80291740__19dLytMiniGameScore_cFv = .text:0x80291740; // type:function size:0xEC
startAlphaIn__19dLytMiniGameScore_cFv = .text:0x80291830; // type:function size:0xD0
startAlphaOut__19dLytMiniGameScore_cFv = .text:0x80291900; // type:function size:0x60
fn_80291960__19dLytMiniGameScore_cFv = .text:0x80291960; // type:function size:0xD0
fn_80291A30__19dLytMiniGameScore_cFv = .text:0x80291A30; // type:function size:0x110
startGetScore__19dLytMiniGameScore_cFv = .text:0x80291960; // type:function size:0xD0
startFinish__19dLytMiniGameScore_cFv = .text:0x80291A30; // type:function size:0x110
startLoop__19dLytMiniGameScore_cFv = .text:0x80291B40; // type:function size:0x54
fn_80291BA0__19dLytMiniGameScore_cFl = .text:0x80291BA0; // type:function size:0x14
setScore__19dLytMiniGameScore_cFl = .text:0x80291BA0; // type:function size:0x14
fn_80291BC0__19dLytMiniGameScore_cFv = .text:0x80291BC0; // type:function size:0x178
fn_80291D40__19dLytMiniGameScore_cFl = .text:0x80291D40; // type:function size:0x10C
fn_80291E50 = .text:0x80291E50; // type:function size:0x34
fn_80291E90 = .text:0x80291E90; // type:function size:0x34
fn_80291ED0 = .text:0x80291ED0; // type:function size:0x14
fn_80291EF0 = .text:0x80291EF0; // type:function size:0x138
fn_80292030 = .text:0x80292030; // type:function size:0xC
fn_80292040 = .text:0x80292040; // type:function size:0x68
fn_802920B0 = .text:0x802920B0; // type:function size:0x54
fn_80292110 = .text:0x80292110; // type:function size:0x8C
fn_802921A0 = .text:0x802921A0; // type:function size:0x9C
fn_80292240 = .text:0x80292240; // type:function size:0xC
fn_80292250 = .text:0x80292250; // type:function size:0x98
fn_802922F0 = .text:0x802922F0; // type:function size:0x90
fn_80292380 = .text:0x80292380; // type:function size:0x80
fn_80292400 = .text:0x80292400; // type:function size:0x80
fn_80292480 = .text:0x80292480; // type:function size:0x80
fn_80292500 = .text:0x80292500; // type:function size:0x90
fn_80292590 = .text:0x80292590; // type:function size:0x80
fn_80292610 = .text:0x80292610; // type:function size:0x100
fn_80292710 = .text:0x80292710; // type:function size:0x170
fn_80292880 = .text:0x80292880; // type:function size:0x8C
fn_80292910 = .text:0x80292910; // type:function size:0xC
fn_80292920 = .text:0x80292920; // type:function size:0xC
fn_80292930 = .text:0x80292930; // type:function size:0xC
fn_80292940 = .text:0x80292940; // type:function size:0xC
fn_80292950 = .text:0x80292950; // type:function size:0x64
fn_802929C0 = .text:0x802929C0; // type:function size:0x7C
fn_80292A40 = .text:0x80292A40; // type:function size:0xC
fn_80292A50 = .text:0x80292A50; // type:function size:0x44
fn_80292AA0 = .text:0x80292AA0; // type:function size:0x44
fn_80292AF0 = .text:0x80292AF0; // type:function size:0x44
fn_80292B40 = .text:0x80292B40; // type:function size:0x44
fn_80292B90 = .text:0x80292B90; // type:function size:0x44
fn_80292BE0 = .text:0x80292BE0; // type:function size:0x44
fn_80292C30 = .text:0x80292C30; // type:function size:0x764
fn_802933A0 = .text:0x802933A0; // type:function size:0x6C
fn_80293410 = .text:0x80293410; // type:function size:0x34
fn_80293450 = .text:0x80293450; // type:function size:0x2A0
hasIncreasedScore__19dLytMiniGameScore_cCFv = .text:0x80291E50; // type:function size:0x34
hasDecreasedScore__19dLytMiniGameScore_cCFv = .text:0x80291E90; // type:function size:0x34
fn_80291ED0__19dLytMiniGameScore_cFl = .text:0x80291ED0; // type:function size:0x14
fn_80291EF0__19dLytMiniGameScore_cFv = .text:0x80291EF0; // type:function size:0x138
increaseScore__19dLytMiniGameScore_cFl = .text:0x80292030; // type:function size:0xC
fn_80292040__19dLytMiniGameScore_cFv = .text:0x80292040; // type:function size:0x68
calcNumDigits__19dLytMiniGameScore_cFv = .text:0x802920B0; // type:function size:0x54
realizePosition__19dLytMiniGameScore_cFv = .text:0x80292110; // type:function size:0x8C
setDigit__19dLytMiniGameScore_cFll = .text:0x802921A0; // type:function size:0x9C
saveScore__19dLytMiniGameScore_cFv = .text:0x80292240; // type:function size:0xC
resetIn__19dLytMiniGameScore_cFv = .text:0x80292250; // type:function size:0x98
resetDigits__19dLytMiniGameScore_cFv = .text:0x802922F0; // type:function size:0x90
resetOut__19dLytMiniGameScore_cFv = .text:0x80292380; // type:function size:0x80
resetAlphaIn__19dLytMiniGameScore_cFv = .text:0x80292400; // type:function size:0x80
resetAlphaOut__19dLytMiniGameScore_cFv = .text:0x80292480; // type:function size:0x80
resetSetPosition__19dLytMiniGameScore_cFv = .text:0x80292500; // type:function size:0x90
resetRupeeChange__19dLytMiniGameScore_cFv = .text:0x80292590; // type:function size:0x80
resetGetScore__19dLytMiniGameScore_cFv = .text:0x80292610; // type:function size:0x100
resetFinish__19dLytMiniGameScore_cFv = .text:0x80292710; // type:function size:0x170
resetLoop__19dLytMiniGameScore_cFv = .text:0x80292880; // type:function size:0x8C
stopIn__19dLytMiniGameScore_cFv = .text:0x80292910; // type:function size:0xC
stopOut__19dLytMiniGameScore_cFv = .text:0x80292920; // type:function size:0xC
stopAlphaIn__19dLytMiniGameScore_cFv = .text:0x80292930; // type:function size:0xC
stopAlphaOut__19dLytMiniGameScore_cFv = .text:0x80292940; // type:function size:0xC
stopGetScore__19dLytMiniGameScore_cFv = .text:0x80292950; // type:function size:0x64
stopFinish__19dLytMiniGameScore_cFv = .text:0x802929C0; // type:function size:0x7C
stopLoop__19dLytMiniGameScore_cFv = .text:0x80292A40; // type:function size:0xC
isInEndReached__19dLytMiniGameScore_cCFv = .text:0x80292A50; // type:function size:0x44
isOutEndReached__19dLytMiniGameScore_cCFv = .text:0x80292AA0; // type:function size:0x44
isAlphaInEndReached__19dLytMiniGameScore_cCFv = .text:0x80292AF0; // type:function size:0x44
isAlphaOutEndReached__19dLytMiniGameScore_cCFv = .text:0x80292B40; // type:function size:0x44
isGetScoreEndReached__19dLytMiniGameScore_cCFv = .text:0x80292B90; // type:function size:0x44
isFinishEndReached__19dLytMiniGameScore_cCFv = .text:0x80292BE0; // type:function size:0x44
fn_80292C30__19dLytMiniGameScore_cFv = .text:0x80292C30; // type:function size:0x764
loadTextVariant__19dLytMiniGameScore_cFl = .text:0x802933A0; // type:function size:0x6C
fn_80293410__19dLytMiniGameScore_cFv = .text:0x80293410; // type:function size:0x34
fn_80293450__19dLytMiniGameScore_cFl = .text:0x80293450; // type:function size:0x2A0
build__21dLytMiniGameScoreSd_cFPQ23d2d10ResAccIf_c = .text:0x802936F0; // type:function size:0xC8
remove__21dLytMiniGameScoreSd_cFv = .text:0x802937C0; // type:function size:0x74
execute__21dLytMiniGameScoreSd_cFv = .text:0x80293840; // type:function size:0xF0
draw__21dLytMiniGameScoreSd_cFv = .text:0x80293930; // type:function size:0x48
init__21dLytMiniGameScoreSd_cFv = .text:0x80293980; // type:function size:0xA8
fn_80293A30 = .text:0x80293A30; // type:function size:0x60
fn_80293A90 = .text:0x80293A90; // type:function size:0x60
fn_80293AF0 = .text:0x80293AF0; // type:function size:0xC0
fn_80293BB0 = .text:0x80293BB0; // type:function size:0xA8
fn_80293C60 = .text:0x80293C60; // type:function size:0xE0
fn_80293D40 = .text:0x80293D40; // type:function size:0x80
fn_80293DC0 = .text:0x80293DC0; // type:function size:0x80
fn_80293E40 = .text:0x80293E40; // type:function size:0x88
fn_80293ED0 = .text:0x80293ED0; // type:function size:0x74
fn_80293F50 = .text:0x80293F50; // type:function size:0x54
fn_80293FB0 = .text:0x80293FB0; // type:function size:0x54
fn_80294010 = .text:0x80294010; // type:function size:0xC
fn_80294020 = .text:0x80294020; // type:function size:0xC
fn_80294030 = .text:0x80294030; // type:function size:0x44
fn_80294080 = .text:0x80294080; // type:function size:0x44
fn_80293A30__21dLytMiniGameScoreSd_cFv = .text:0x80293A30; // type:function size:0x60
fn_80293A90__21dLytMiniGameScoreSd_cFv = .text:0x80293A90; // type:function size:0x60
fn_80293AF0__21dLytMiniGameScoreSd_cFl = .text:0x80293AF0; // type:function size:0xC0
fn_80293BB0__21dLytMiniGameScoreSd_cFv = .text:0x80293BB0; // type:function size:0xA8
fn_80293C60__21dLytMiniGameScoreSd_cFv = .text:0x80293C60; // type:function size:0xE0
fn_80293D40__21dLytMiniGameScoreSd_cFv = .text:0x80293D40; // type:function size:0x80
fn_80293DC0__21dLytMiniGameScoreSd_cFv = .text:0x80293DC0; // type:function size:0x80
fn_80293E40__21dLytMiniGameScoreSd_cFv = .text:0x80293E40; // type:function size:0x88
fn_80293ED0__21dLytMiniGameScoreSd_cFv = .text:0x80293ED0; // type:function size:0x74
fn_80293F50__21dLytMiniGameScoreSd_cFv = .text:0x80293F50; // type:function size:0x54
fn_80293FB0__21dLytMiniGameScoreSd_cFv = .text:0x80293FB0; // type:function size:0x54
fn_80294010__21dLytMiniGameScoreSd_cFv = .text:0x80294010; // type:function size:0xC
fn_80294020__21dLytMiniGameScoreSd_cFv = .text:0x80294020; // type:function size:0xC
fn_80294030__21dLytMiniGameScoreSd_cCFv = .text:0x80294030; // type:function size:0x44
fn_80294080__21dLytMiniGameScoreSd_cCFv = .text:0x80294080; // type:function size:0x44
dLytMiniGame_c_classInit__Fv = .text:0x802940D0; // type:function size:0x380
fn_80294450 = .text:0x80294450; // type:function size:0x74
fn_802944D0 = .text:0x802944D0; // type:function size:0x74
fn_80294550 = .text:0x80294550; // type:function size:0x74
fn_802945D0 = .text:0x802945D0; // type:function size:0x74
fn_80294650 = .text:0x80294650; // type:function size:0x74
fn_802946D0 = .text:0x802946D0; // type:function size:0x6C
fn_80294740 = .text:0x80294740; // type:function size:0x74
fn_802947C0 = .text:0x802947C0; // type:function size:0x68
__dt__19dLytMiniGameScore_cFv = .text:0x80294450; // type:function size:0x74
__dt__21dLytMiniGameScoreSd_cFv = .text:0x802944D0; // type:function size:0x74
__dt__19dLytMiniGameStart_cFv = .text:0x80294550; // type:function size:0x74
__dt__18dLytMiniGameTime_cFv = .text:0x802945D0; // type:function size:0x74
__dt__18dLytMiniGameBugs_cFv = .text:0x80294650; // type:function size:0x74
__ct__26dLytMiniGamePumpkinParts_cFv = .text:0x802946D0; // type:function size:0x6C
__dt__26dLytMiniGamePumpkinParts_cFv = .text:0x80294740; // type:function size:0x74
__dt__21dLytMiniGamePumpkin_cFv = .text:0x802947C0; // type:function size:0x68
LytMiniGame__init = .text:0x80294830; // type:function size:0xA94
LytMiniGame__destructRes = .text:0x802952D0; // type:function size:0x31C
fn_802955F0 = .text:0x802955F0; // type:function size:0xD4
+111 -56
View File
@@ -11,7 +11,7 @@
/** 2D UI - Mini Game - Pumpkin score popup */
class dLytMiniGamePumpkinParts_c {
public:
dLytMiniGamePumpkinParts_c() {}
dLytMiniGamePumpkinParts_c() : field_0x154(false), mHasPlayedDoubleScoreSound(false) {}
virtual ~dLytMiniGamePumpkinParts_c() {}
bool build(d2d::ResAccIf_c *resAcc);
@@ -45,7 +45,7 @@ private:
/** 2D UI - Mini Game - Pumpkin score popups */
class dLytMiniGamePumpkin_c {
public:
dLytMiniGamePumpkin_c() {}
dLytMiniGamePumpkin_c() : field_0x478(10), mCombo(0) {}
virtual ~dLytMiniGamePumpkin_c() {}
bool build(d2d::ResAccIf_c *resAcc);
@@ -68,7 +68,14 @@ private:
/** 2D UI - Mini Game - Bug Heaven */
class dLytMiniGameBugs_c {
public:
dLytMiniGameBugs_c() {}
dLytMiniGameBugs_c()
: mBugIconsInEnded(false),
mInTriggered(false),
mBugIconsFlashStarted(false),
mBugsNumLevel(1),
mBugsNum(10),
field_0xB4B(false),
field_0xB4C(true) {}
virtual ~dLytMiniGameBugs_c() {}
bool build(d2d::ResAccIf_c *resAcc);
@@ -139,7 +146,19 @@ private:
/** 2D UI - Mini Game - Time */
class dLytMiniGameTime_c {
public:
dLytMiniGameTime_c() {}
dLytMiniGameTime_c()
: field_0x7D4(0),
mCurrentTimerValueMilliSeconds(0),
mCurrentTimerValueSeconds(0),
mLastTimerValueSeconds(0),
mTimerVariant(0),
mHighestDigitIndex(0),
field_0x7EC(false),
field_0x7ED(false),
field_0x7EE(false),
field_0x7F0(0),
field_0x7F4(0),
mIsVisible(false) {}
virtual ~dLytMiniGameTime_c() {}
bool build(d2d::ResAccIf_c *resAcc);
@@ -218,7 +237,7 @@ private:
/** 2D UI - Mini Game - Start / Finish Popup */
class dLytMiniGameStart_c {
public:
dLytMiniGameStart_c() {}
dLytMiniGameStart_c() : mIsVisible(false) {}
virtual ~dLytMiniGameStart_c() {}
bool build(d2d::ResAccIf_c *resAcc);
@@ -260,7 +279,34 @@ private:
/** 2D UI - Mini Game - Score counter */
class dLytMiniGameScore_c {
public:
dLytMiniGameScore_c() {}
dLytMiniGameScore_c()
: mScore(0),
mLastScore(0),
mHighestDigitIndex(0),
field_0x7E4(0),
field_0x7E8(0.0f),
field_0x7EC(-2),
field_0x7F0(0),
field_0x7F4(0),
field_0x7F8(-1),
field_0x7FC(1),
field_0x800(0),
field_0x804(false),
field_0x808(0),
field_0x80C(0),
field_0x810(0),
field_0x814(false),
field_0x815(false),
field_0x816(false),
field_0x818(0),
field_0x81C(0),
field_0x820(false),
field_0x824(0),
field_0x828(false),
field_0x829(false),
field_0x82C(0),
field_0x830(1),
mIsVisible(false) {}
virtual ~dLytMiniGameScore_c() {}
bool build(d2d::ResAccIf_c *resAcc);
@@ -276,47 +322,47 @@ private:
void fn_80291740();
void startAlphaIn();
void startAlphaOut();
void fn_80291960();
void fn_80291A30();
void startGetScore();
void startFinish();
void startLoop();
void fn_80291BA0(s32 score);
void setScore(s32 score);
void fn_80291BC0();
void fn_80291D40(s32 arg);
bool fn_80291E50() const;
void fn_80291E90();
void fn_80291ED0();
bool hasIncreasedScore() const;
bool hasDecreasedScore() const;
void fn_80291ED0(s32);
void fn_80291EF0();
void fn_80292030(s32);
void increaseScore(s32);
void fn_80292040();
void fn_802920B0();
void fn_80292110();
s32 calcNumDigits();
void realizePosition();
void setDigit(s32 digitIndex, s32 number);
void fn_80292240();
void fn_80292250();
void fn_802922F0();
void fn_80292380();
void fn_80292400();
void fn_80292480();
void fn_80292500();
void fn_80292590();
void fn_80292610();
void fn_80292710();
void fn_80292880();
void fn_80292910();
void fn_80292920();
bool fn_80292930() const;
void fn_80292940();
void fn_80292950();
void fn_802929C0();
void fn_80292A40();
bool fn_80292A50() const;
bool fn_80292AA0() const;
bool fn_80292AF0() const;
bool fn_80292B40() const;
bool fn_80292B90() const;
bool fn_80292BE0() const;
void saveScore();
void resetIn();
void resetDigits();
void resetOut();
void resetAlphaIn();
void resetAlphaOut();
void resetSetPosition();
void resetRupeeChange();
void resetGetScore();
void resetFinish();
void resetLoop();
void stopIn();
void stopOut();
void stopAlphaIn();
void stopAlphaOut();
void stopGetScore();
void stopFinish();
void stopLoop();
bool isInEndReached() const;
bool isOutEndReached() const;
bool isAlphaInEndReached() const;
bool isAlphaOutEndReached() const;
bool isGetScoreEndReached() const;
bool isFinishEndReached() const;
void fn_80292C30();
void fn_802933A0(s32 variant);
void loadTextVariant(s32 variant);
void fn_80293410();
void fn_80293450(s32);
@@ -331,15 +377,16 @@ private:
/* 0x7CC */ dTextBox_c *mpTextBoxes[3];
/* 0x7D8 */ s32 field_0x7D8;
/* 0x7DC */ UNKWORD field_0x7DC;
/* 0x7E0 */ s32 field_0x7E0;
/* 0x7D8 */ s32 mScore;
/* 0x7DC */ s32 mLastScore;
/* 0x7E0 */ s32 mHighestDigitIndex;
/* 0x7E4 */ UNKWORD field_0x7E4;
/* 0x7E8 */ f32 field_0x7E8;
/* 0x7EC */ u8 _0x7EC[0x7FC - 0x7EC];
/* 0x7EC */ s32 field_0x7EC;
/* 0x7F0 */ s32 field_0x7F0;
/* 0x7F4 */ s32 field_0x7F4;
/* 0x7F8 */ s32 field_0x7F8;
/* 0x7FC */ s32 field_0x7FC;
/* 0x800 */ s32 field_0x800;
/* 0x804 */ bool field_0x804;
@@ -364,7 +411,7 @@ private:
/** 2D UI - Mini Game - Fun Fun Island score */
class dLytMiniGameScoreSd_c {
public:
dLytMiniGameScoreSd_c() {}
dLytMiniGameScoreSd_c() : field_0x1D4(0), mIsVisible(false) {}
virtual ~dLytMiniGameScoreSd_c() {}
bool build(d2d::ResAccIf_c *resAcc);
@@ -378,7 +425,7 @@ private:
void fn_80293A30();
void fn_80293A90();
void fn_80293AF0();
void fn_80293AF0(s32);
void fn_80293BB0();
void fn_80293C60();
void fn_80293D40();
@@ -389,11 +436,14 @@ private:
void fn_80293FB0();
void fn_80294010();
void fn_80294020();
void fn_80294030();
void fn_80294080();
bool fn_80294030() const;
bool fn_80294080() const;
/* 0x004 */ d2d::LytBase_c mLyt;
/* 0x094 */ d2d::AnmGroup_c mAnm[5];
/* 0x1D4 */ s32 field_0x1D4;
/* 0x1D8 */ bool mIsVisible;
/* 0x1D9 */ bool field_0x1D9;
};
class dLytMiniGame_c : public dBase_c {
@@ -405,7 +455,12 @@ public:
field_0x006B(0),
field_0x006C(0),
field_0x006D(0),
field_0x1510(1) {}
field_0x1510(1),
field_0x3864(0),
field_0x3865(0),
field_0x3866(false),
field_0x3867(0),
field_0x3868(0) {}
virtual ~dLytMiniGame_c() {}
static dLytMiniGame_c *GetInstance() {
@@ -465,11 +520,11 @@ private:
/* 0x209C */ dLytMiniGameTime_c mTime;
/* 0x2894 */ dLytMiniGameBugs_c mBugs;
/* 0x33E4 */ dLytMiniGamePumpkin_c mPumpkin;
// TODO
u8 _0x___[0xA];
bool field_0x3866;
/* 0x3864 */ u8 field_0x3864;
/* 0x3865 */ u8 field_0x3865;
/* 0x3866 */ bool field_0x3866;
/* 0x3867 */ u8 field_0x3867;
/* 0x3868 */ u8 field_0x3868;
};
#endif
File diff suppressed because it is too large Load Diff