Merge pull request #279 from robojumper/d_lyt_mini_game

d_lyt_mini_game
This commit is contained in:
robojumper
2025-12-08 16:30:13 +01:00
committed by GitHub
22 changed files with 5315 additions and 391 deletions
+1
View File
@@ -53,6 +53,7 @@ public:
return checkFlag(flag);
}
static void setFlag(s32 id);
static bool checkTreasureTempCollect(u16 itemId);
void setItemPosition(const mVec3_c &);
void getItemFromBWheelItem();
+22 -8
View File
@@ -202,6 +202,20 @@ protected:
};
class dMessage_c : public dBase_c {
public:
enum Minigame_e {
MG_THRILL_DIGGER = 0,
MG_BAMBOO_CUTTING,
MG_INSECT_CAPTURE,
MG_ROLLERCOASTER,
MG_PUMPKIN_ARCHERY,
MG_FUN_FUN_ISLAND,
MG_TRIAL_TIME_ATTACK,
MG_BOSS_RUSH,
MG_NONE,
};
public:
dMessage_c();
virtual ~dMessage_c() {
@@ -276,23 +290,23 @@ public:
}
void setMiniGameVariant(s32 v) {
mMiniGameVariant = v;
mMinigameVariant = v;
}
s32 getMiniGameVariant() const {
return mMiniGameVariant;
return mMinigameVariant;
}
void setField_0x344(s32 v) {
field_0x344 = v;
}
u8 getField_0x340() const {
return field_0x340;
bool hasSetMinigameResult() const {
return mHasSetMinigameResult;
}
void setField_0x340(u8 v) {
field_0x340 = v;
void setHasSetMinigameResult(bool v) {
mHasSetMinigameResult = v;
}
static bool isValidTextLabel(const char *name);
@@ -376,8 +390,8 @@ private:
/* 0x334 */ u32 mMinigameResultPoints;
/* 0x338 */ u32 mMinigameTime;
/* 0x33C */ s32 mMiniGameVariant;
/* 0x340 */ u8 field_0x340;
/* 0x33C */ s32 mMinigameVariant;
/* 0x340 */ bool mHasSetMinigameResult;
/* 0x344 */ s32 field_0x344;
};
+9
View File
@@ -11,6 +11,7 @@
#include "f/f_profile_name.h"
#include "m/m2d.h"
#include "m/m_angle.h"
#include "m/m_fader_base.h"
#include "m/m_vec.h"
#include "s/s_FPhase.h"
#include "s/s_State.hpp"
@@ -210,6 +211,14 @@ public:
return mFader.isSettled();
}
bool isFadingOut() const {
return mFader.isStatus(mFaderBase_c::FADING_OUT);
}
bool isFadingIn() const {
return mFader.isStatus(mFaderBase_c::FADING_IN);
}
f32 targetingScreenFn_801BBEC0() const {
return mScreen1.fn_801BBEC0();
}
+5
View File
@@ -11,6 +11,7 @@
#include "egg/gfx/eggScreen.h"
#include "m/m_allocator.h"
#include "m/m_dvd.h"
#include "m/m_fader_base.h"
#include "nw4r/g3d/g3d_camera.h"
#include "s/s_FPhase.h"
#include "s/s_State.hpp"
@@ -176,6 +177,10 @@ public:
return mFader.isSettled();
}
bool isFadingOut() const {
return mFader.isStatus(mFaderBase_c::FADING_OUT);
}
bool isInLastBoss() const {
return mIsInLastBoss;
}
+6
View File
@@ -5,6 +5,7 @@
#include "m/m2d.h"
#include "nw4r/lyt/lyt_pane.h"
#include "nw4r/lyt/lyt_picture.h"
#include "nw4r/lyt/lyt_types.h"
class dTextBox_c;
class dWindow_c;
@@ -260,6 +261,11 @@ struct AnmGroupBase_c {
return (mFlags & ANMGROUP_FLAG_ENABLE) != 0;
}
// Not sure
inline u8 isEnabled_() const {
return (mFlags & ANMGROUP_FLAG_ENABLE);
}
inline bool isStop() const {
return mpFrameCtrl->isStop();
}
+634 -20
View File
@@ -2,35 +2,587 @@
#define D_LYT_MINI_GAME_H
#include "common.h"
#include "d/d_base.h"
#include "d/lyt/d2d.h"
#include "d/lyt/d_textbox.h"
#include "m/m_vec.h"
#include "nw4r/lyt/lyt_pane.h"
class dLytMiniGame_c {
/** 2D UI - Mini Game - Pumpkin score popup */
class dLytMiniGamePumpkinParts_c {
public:
dLytMiniGamePumpkinParts_c() : field_0x154(false), mHasPlayedDoubleScoreSound(false) {}
virtual ~dLytMiniGamePumpkinParts_c() {}
bool build(d2d::ResAccIf_c *resAcc);
bool remove();
bool execute();
bool draw();
void init();
void setPumpkinPos(const mVec3_c &pos);
void getPoint(u8 combo, bool doubleScore);
bool isActive() const;
private:
void resetPattern();
void setPattern(s32 pat);
void startGetPoint();
void startDoubleScore();
void stopDoubleScore();
void resetGetPoint();
void resetDoubleScore();
/* 0x004 */ d2d::LytBase_c mLyt;
/* 0x094 */ d2d::AnmGroup_c mAnm[3];
/* 0x154 */ bool field_0x154;
/* 0x158 */ mVec3_c mPumpkinWorldPos;
/* 0x164 */ mVec3_c mPumpkinScreenPos;
/* 0x170 */ mVec2_c field_0x170;
/* 0x178 */ bool mHasPlayedDoubleScoreSound;
};
/** 2D UI - Mini Game - Pumpkin score popups */
class dLytMiniGamePumpkin_c {
public:
dLytMiniGamePumpkin_c() : field_0x478(10), mCombo(0) {}
virtual ~dLytMiniGamePumpkin_c() {}
bool build(d2d::ResAccIf_c *resAcc);
bool remove();
bool execute();
bool draw();
void init();
void getPoint(const mVec3_c &pumpkinPos, s32 unk, bool doubleScore);
void calcCombo(s32 unk);
private:
static dLytMiniGamePumpkin_c *sInstance;
/* 0x004 */ dLytMiniGamePumpkinParts_c mParts[3];
/* 0x478 */ s32 field_0x478;
/* 0x47C */ s32 mCombo;
};
/** 2D UI - Mini Game - Bug Heaven */
class dLytMiniGameBugs_c {
public:
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);
bool remove();
bool execute();
bool draw();
void init();
enum BugIndex_e {
DEKU_HORNET,
BLESSED_BUTTERFLY,
GERUDO_DRAGONFLY,
STARRY_FIREFLY,
WOODLAND_RHINO_BEETLE,
VOLCANIC_LADYBUG,
SAND_CICADA,
SKY_STAG_BEETLE,
FARON_GRASSHOPPER,
SKYLOFT_MANTIS,
LANAYRU_ANT,
ELDIN_ROLLER,
};
void startAllIconsIn();
void setBugsNumLevel(u8 level) {
mBugsNumLevel = level;
}
void setBug(s32 slot, s32 bugIndex);
void collectBug(s32 slot);
void startBugsFlash();
bool isSlotIconOnEndReached(s32 slot) const;
bool isSlotBugCollected(s32 slot) const;
void startOut();
void startIn();
void startOutTemp();
private:
bool isSlotIconOnEnabled(s32 slot) const;
void resetBugIconsIn();
void resetIn();
void resetOut();
void resetBugIconsOn();
void resetBugIconsTex();
void resetBugIconsFlash();
void stopBugIconsIn();
void stopIn();
void stopOut();
void stopBugIconOn(s32);
void stopBugIconsFlash();
bool isIconInEndReached() const;
bool isInEndReached() const;
bool isOutEndReached() const;
bool isSlotOnEndReached(s32 slot) const;
bool isBug0Flashing() const;
bool areAllBugIconsOn() const;
static dLytMiniGameBugs_c *sInstance;
/* 0x004 */ d2d::LytBase_c mLyt;
/* 0x094 */ d2d::AnmGroup_c mAnm[42];
/* 0xB14 */ s32 mBugItemIds[10];
/* 0xB3C */ bool mBugIconsInEnded;
/* 0xB3D */ bool mInTriggered;
/* 0xB3E */ bool mBugCollected[10];
/* 0xB48 */ bool mBugIconsFlashStarted;
/* 0xB49 */ u8 mBugsNumLevel; ///< 0 = 5 bugs, 1 = 10 bugs
/* 0xB4A */ u8 mBugsNum;
/* 0xB4B */ bool field_0xB4B;
/* 0xB4C */ bool field_0xB4C;
};
/** 2D UI - Mini Game - Time */
class dLytMiniGameTime_c {
public:
enum Variant_e {
TIME_VARIANT_INSECT_CAPTURE,
TIME_VARIANT_SPIRAL_CHARGE_TUTORIAL,
TIME_VARIANT_PUMPKIN_ARCHERY,
TIME_VARIANT_ROLLERCOASTER,
TIME_VARIANT_BOSS_RUSH,
TIME_VARIANT_TRIAL_TIME_ATTACK,
};
public:
dLytMiniGameTime_c()
: field_0x7D4(0),
mCurrentTimerValueMilliSeconds(0),
mCurrentTimerValueSeconds(0),
mLastTimerValueSeconds(0),
mTimeFormat(0),
mHighestDigitIndex(0),
field_0x7EC(false),
field_0x7ED(false),
mResultMode(false),
mVariant(0),
field_0x7F4(0),
mIsVisible(false) {}
virtual ~dLytMiniGameTime_c() {}
bool build(d2d::ResAccIf_c *resAcc);
bool remove();
bool execute();
bool draw();
void init();
void setVariant(s32 var) {
mVariant = var;
}
void setResultMode(bool v) {
mResultMode = v;
}
void fn_8028DD80();
void startOut();
void startIn();
void startOutTemp();
void startFinish();
void startAlphaIn();
void startAlphaOut();
void setTimerValueInMilliSeconds(s32 time);
void setTimerSecondsValueInMilliSeconds(s32 time);
void setBestTime(s32 time);
void setShowBestTime(bool show);
private:
enum TimeFormat_e {
TIMER_LONG,
TIMER_SECONDS,
};
void startLoop();
void updateLongTimer();
void updateSecondsTimer();
void saveSecondsTimer();
void resetIn();
void resetOut();
void resetAlphaIn();
void resetAlphaOut();
void resetDigits();
void resetPosition();
void resetShowBestTime();
void resetFinish();
void resetLoop();
void initSignChange();
void stopIn();
void stopOut();
void stopAlphaIn();
void stopAlphaOut();
void stopFinish();
void stopLoop();
bool isInEndReached() const;
bool isOutEndReached() const;
bool isAlphaInEndReached() const;
bool isAlphaOutEndReached() const;
bool isFinishEndReached() const;
void setHighestDigitIndex(u8);
void setSignChange(u32);
void setTimePosition(bool);
void setBestHasSixDigits(bool);
void setDigit(s32 digitIndex, s32 number);
void setDigitBest(s32 digitIndex, s32 number);
static dLytMiniGameTime_c *sInstance;
/* 0x004 */ d2d::LytBase_c mLyt;
/* 0x094 */ d2d::AnmGroup_c mAnm[29];
/* 0x7D4 */ u8 field_0x7D4;
/* 0x7D8 */ s32 mCurrentTimerValueMilliSeconds;
/* 0x7DC */ s32 mCurrentTimerValueSeconds;
/* 0x7E0 */ s32 mLastTimerValueSeconds;
/* 0x7E4 */ u8 mTimeFormat;
/* 0x7E8 */ s32 mHighestDigitIndex;
/* 0x7EC */ bool field_0x7EC;
/* 0x7ED */ bool field_0x7ED;
/* 0x7EE */ bool mResultMode;
/* 0x7F0 */ s32 mVariant;
/* 0x7F4 */ u8 field_0x7F4;
/* 0x7F5 */ bool mIsVisible;
};
/** 2D UI - Mini Game - Start / Finish Popup */
class dLytMiniGameStart_c {
public:
dLytMiniGameStart_c() : mIsVisible(false) {}
virtual ~dLytMiniGameStart_c() {}
bool build(d2d::ResAccIf_c *resAcc);
bool remove();
bool execute();
bool draw();
void init();
void startCountdown();
void startCountdown120();
void startFinish();
void startTimeup();
bool isCountdownEndReached() const;
bool isFinishEndReached() const;
bool isTimeupEndReached() const;
private:
void resetPlayedSounds();
void resetCountdown();
void resetFinish();
void resetStart();
void stopCountdown();
void stopFinish();
void stopTimeup();
bool checkCountdown3();
bool checkCountdown2();
bool checkCountdown1();
bool checkStart();
bool checkFinish();
bool checkTimeup();
static dLytMiniGameStart_c *sInstance;
/* 0x004 */ d2d::LytBase_c mLyt;
/* 0x094 */ d2d::AnmGroup_c mAnm[3];
/* 0x154 */ bool mPlayedSounds[6];
/* 0x15A */ bool mIsVisible;
};
/** 2D UI - Mini Game - Score counter */
class dLytMiniGameScore_c {
public:
enum Variant_e {
SCORE_VARIANT_BAMBOO_CUTTING,
SCORE_VARIANT_FUN_FUN_ISLAND,
SCORE_VARIANT_THRILL_DIGGER,
SCORE_VARIANT_PUMPKIN_ARCHERY,
SCORE_VARIANT_SPIRAL_CHARGE_TUTORIAL,
};
public:
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),
mResultMode(false),
mVariant(SCORE_VARIANT_BAMBOO_CUTTING),
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);
bool remove();
bool execute();
bool draw();
void init();
void setVariant(s32 var) {
mVariant = var;
}
void setResultMode(bool v) {
mResultMode = v;
}
void setField_0x828(bool v) {
field_0x828 = v;
}
s32 getScore() const {
return mScore;
}
void startIn();
void startOut();
void startOutTemp();
void setScore(s32 score);
void fn_80291410();
void startAlphaIn();
void startAlphaOut();
void fn_80291D40(s32 score);
void fn_80291ED0(s32);
void startFinish();
private:
void startGetScore();
void startLoop();
void fn_80291BC0();
bool hasIncreasedScore() const;
bool hasDecreasedScore() const;
void fn_80291EF0();
void increaseScore(s32);
void fn_80292040();
s32 calcNumDigits();
void realizePosition();
void setDigit(s32 digitIndex, s32 number);
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 loadTextVariant(s32 variant);
void fn_80293410();
void fn_80293450(s32);
static dLytMiniGameScore_c *sInstance;
/* 0x004 */ d2d::LytBase_c mLyt;
/* 0x094 */ d2d::AnmGroup_c mAnm[26];
/* 0x714 */ nw4r::lyt::Pane *mpPanes[20];
/* 0x764 */ f32 mFloats[26];
/* 0x7CC */ dTextBox_c *mpTextBoxes[3];
/* 0x7D8 */ s32 mScore;
/* 0x7DC */ s32 mLastScore;
/* 0x7E0 */ s32 mHighestDigitIndex;
/* 0x7E4 */ UNKWORD field_0x7E4;
/* 0x7E8 */ f32 field_0x7E8;
/* 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;
/* 0x808 */ s32 field_0x808;
/* 0x80C */ s32 field_0x80C;
/* 0x810 */ s32 field_0x810;
/* 0x814 */ bool field_0x814;
/* 0x815 */ bool field_0x815;
/* 0x816 */ bool mResultMode;
/* 0x818 */ s32 mVariant;
/* 0x81C */ s32 field_0x81C;
/* 0x820 */ bool field_0x820;
/* 0x824 */ s32 field_0x824;
/* 0x828 */ bool field_0x828;
/* 0x829 */ bool field_0x829;
/* 0x82C */ UNKWORD field_0x82C;
/* 0x830 */ s32 field_0x830;
/* 0x834 */ f32 field_0x834[3][2];
/* 0x84C */ bool mIsVisible;
};
/** 2D UI - Mini Game - Fun Fun Island score */
class dLytMiniGameScoreSd_c {
public:
dLytMiniGameScoreSd_c() : field_0x1D4(0), mIsVisible(false) {}
virtual ~dLytMiniGameScoreSd_c() {}
bool build(d2d::ResAccIf_c *resAcc);
bool remove();
bool execute();
bool draw();
void init();
void setScoreUp(s32 score);
void setScoreDown(s32 score);
private:
static dLytMiniGameScoreSd_c *sInstance;
void setScoreInternal(s32 score);
void setHighestDigitIndex(s32);
void setDigit(s32 digitIndex, s32 number);
void resetScoreUp();
void resetScoreDown();
void resetDigits();
void resetPosition();
void startScoreUp();
void startScoreDown();
void stopScoreUp();
void stopScoreDown();
bool isScoreUpEndReached() const;
bool isScoreDownEndReached() 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 {
public:
enum Variant_e {
VARIANT_0,
VARIANT_BAMBOO_CUTTING,
VARIANT_FUN_FUN_ISLAND,
VARIANT_THRILL_DIGGER,
VARIANT_INSECT_CAPTURE,
VARIANT_SPIRAL_CHARGE_TUTORIAL,
VARIANT_PUMPKIN_ARCHERY,
VARIANT_ROLLERCOASTER,
VARIANT_BOSS_RUSH,
VARIANT_TRIAL_TIME_ATTACK,
// These are created by dFlow_c and correspond to above entries.
// They also cause things to behave a bit differently. What is the purpose
// of these special variants?
VARIANT_BAMBOO_CUTTING_RESULT,
VARIANT_THRILL_DIGGER_RESULT,
VARIANT_INSECT_CAPTURE_RESULT,
VARIANT_PUMPKIN_ARCHERY_RESULT,
VARIANT_ROLLERCOASTER_RESULT,
VARIANT_BOSS_RUSH_RESULT,
VARIANT_TRIAL_TIME_ATTACK_RESULT,
};
private:
enum Slot_e {
SLOT_MINI_GAME,
SLOT_MINI_GAME_SCORE,
SLOT_MINI_GAME_TIME,
SLOT_MINI_GAME_BUGS,
SLOT_MINI_GAME_PUMPKIN,
SLOT_MINI_GAME_SCORE_SD,
};
public:
dLytMiniGame_c()
: mLoadRequestStart(false),
mLoadRequestScore(false),
mLoadRequestTime(false),
mLoadRequestBugs(false),
mLoadRequestPumpkin(false),
mLoadRequestScoreSd(false),
mVariant(VARIANT_BAMBOO_CUTTING),
field_0x3864(false),
field_0x3865(false),
field_0x3866(false),
field_0x3867(false),
field_0x3868(false) {}
virtual ~dLytMiniGame_c() {}
virtual int create() override;
virtual int doDelete() override;
virtual int execute() override;
virtual int draw() override;
static dLytMiniGame_c *GetInstance() {
return sInstance;
}
/** Updates some window */
void fn_80295940();
/** ??? */
void fn_80295980();
/** Checks to see if in BAMBOO_CUTTING .. BOSS_RUSH and returns some boolean (start?) */
bool fn_80295AB0();
/** Checks to see if in BAMBOO_CUTTING .. BOSS_RUSH and returns some boolean (end?) */
bool fn_80295AD0();
void startCountdown();
void startFinish();
void startTimeup();
void setHighscore(s32 time);
bool isStartCountdownDone();
bool isFinishAnimDone();
bool isTimeupAnimDone();
/** GUESS: sets the start for the high score? */
void fn_80295CB0(bool);
void setScoreUp(s32 score);
void setScoreDown(s32);
void timeRelatedExecute();
void scoreRelatedExecute();
void setBestTime(s32 time);
void setShowBestTime(bool);
void timeRelatedInit();
void scoreRelatedInit();
void setDisplayedTime(s32 time);
void setDisplayedPoints(s32 time);
void setDisplayedPoints(s32 points);
void timeRelated();
void scoreRelated();
void endTimeResult();
void endScoreResult();
void fn_80295900(s32);
/** GUESS: Assumption based on function caller */
void setComplete() {
@@ -38,10 +590,72 @@ public:
}
private:
u8 _0x0000[0x3866 - 0x0000];
bool field_0x3866;
static dLytMiniGame_c *sInstance;
bool isLoading(const char *name) const;
bool loadData(const char *name, s32 slot);
void unloadData(const char *name);
void attachLoadedData(const char *name, d2d::ResAccIf_c &resAcc);
void init();
void startBugsAllIconsIn();
void set5Bugs();
void set10Bugs();
void reInitBugs();
void setBug(s32 slot, s32 bugIndex);
void collectBug(s32 slot);
void startBugsFlash();
bool isBugIconOnEndReached(s32 slot) const;
bool isBugCollected(s32 slot) const;
void fn_80295D80();
void fn_80295D90(s32 points);
void getPumpkin(const mVec3_c &pumpkinPos, s32 unk, bool doubleScore);
bool isDisplayingResult();
bool isInEvent() const;
bool isPopupOpen() const;
bool isPopupOpenExceptHelp() const;
bool isFadingOut() const;
void executeBambooCutting();
void executeFunFunIsland();
void executeThrillDigger();
void executeInsectCapture();
void executeSpiralChargeTutorial();
void executePumpkinArchery();
void executeRollercoaster();
// These two do the same thing
void executeBossRush();
void executeTrialTimeAttack();
/* 0x0068 */ bool mLoadRequestStart;
/* 0x0069 */ bool mLoadRequestScore;
/* 0x006A */ bool mLoadRequestTime;
/* 0x006B */ bool mLoadRequestBugs;
/* 0x006C */ bool mLoadRequestPumpkin;
/* 0x006D */ bool mLoadRequestScoreSd;
/* 0x0070 */ d2d::ResAccIf_c mResAccStart;
/* 0x03E0 */ d2d::ResAccIf_c mResAccScore;
/* 0x0750 */ d2d::ResAccIf_c mResAccTime;
/* 0x0AC0 */ d2d::ResAccIf_c mResAccBugs;
/* 0x0E30 */ d2d::ResAccIf_c mResAccPumpkin;
/* 0x11A0 */ d2d::ResAccIf_c mResAccScoreSd;
/* 0x1510 */ s32 mVariant;
/* 0x1514 */ dLytMiniGameScore_c mScore;
/* 0x1D64 */ dLytMiniGameScoreSd_c mScoreSd;
/* 0x1F40 */ dLytMiniGameStart_c mStart;
/* 0x209C */ dLytMiniGameTime_c mTime;
/* 0x2894 */ dLytMiniGameBugs_c mBugs;
/* 0x33E4 */ dLytMiniGamePumpkin_c mPumpkin;
/* 0x3864 */ bool field_0x3864;
/* 0x3865 */ bool field_0x3865;
/* 0x3866 */ bool field_0x3866;
/* 0x3867 */ bool field_0x3867;
/* 0x3868 */ bool field_0x3868;
};
#endif
+17 -1
View File
@@ -93,7 +93,7 @@ public:
bool fn_800C9F70();
bool fn_800C9FE0();
bool fn_800CA040();
bool isPopupOpen();
bool isInMapEvent();
bool fn_800D5380(u8);
@@ -402,6 +402,14 @@ public:
}
}
static s32 getRupeeDifference() {
if (sInstance != nullptr) {
return sInstance->mMain.mRupy.getRupeeDifference();
} else {
return 0;
}
}
static void setField_0x13B61(u8 val) {
if (sInstance != nullptr) {
sInstance->field_0x13B61 = val;
@@ -452,6 +460,14 @@ public:
}
}
static bool isPopupOpen() {
if (sInstance != nullptr) {
return sInstance->mMain.isPopupOpen();
} else {
return false;
}
}
static bool getfn_800D97A0() {
if (sInstance != nullptr) {
return sInstance->fn_800D97A0();
+2 -1
View File
@@ -117,10 +117,11 @@ public:
mSize = size;
}
s32 getRupeeDifference() const;
private:
bool updateDisplayedAmount(bool suppressSound);
bool hasChangeInRupees() const;
s32 getRupeeDifference() const;
void setDigit(s32 index, s32 digit);
void executeDigitJump();
void executeDigitBlink(s32 amount);
+2 -2
View File
@@ -56,13 +56,13 @@ public:
bool holdDowsingNearestSound();
bool playSirenCountdownSound(s32 timer);
bool playMinigameCountdownSound();
bool playMinigameCountdownSound(s32 timer); ///< timer is unused
bool playMinigameTimeUpSound(s32 timer);
bool playMinigameStartSound();
bool playMinigameFinishSound();
bool playMinigameFinishWhistleSound();
bool playMinigameScoreUpSound(s32 param);
bool playMinigameScoreDownSound();
bool playMinigameScoreDownSound(s32 score);
bool playMinigameMusasabiSound(s32 count);
bool playSkbSound(u32 soundId);
+3 -3
View File
@@ -20,9 +20,9 @@ namespace d3d {
bool create(EGG::Heap *);
f32 fn_80016960(mVec3_c &, const mVec3_c &pos);
bool fn_80016A90(const mVec3_c &pos);
void fn_80016B60(mVec3_c &, const mVec3_c &pos);
f32 worldToScreen(mVec3_c &result, const mVec3_c &worldPos);
bool isOnScreen(const mVec3_c &worldPos);
void screenToWorld(mVec3_c &result, const mVec3_c &screenPos);
void createLightTextures();
class AnmMdlWrapper : public m3d::mdlAnmChr {
+3
View File
@@ -34,6 +34,9 @@ public:
static bool checkInBossRush() {
return isInMinigameState(BOSS_RUSH);
}
static bool checkInFunFunIsland() {
return isInMinigameState(FUN_FUN_ISLAND);
}
private:
MinigameManager() {}