From 83a1e0256e969a2c96c5007c4c26512d3c910b48 Mon Sep 17 00:00:00 2001 From: robojumper Date: Thu, 4 Dec 2025 22:53:07 +0100 Subject: [PATCH] Small cleanup --- include/d/lyt/d_lyt_mini_game.h | 42 ++++++++++++++++----------------- src/d/lyt/d_lyt_mini_game.cpp | 36 ++++++++++++++-------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/include/d/lyt/d_lyt_mini_game.h b/include/d/lyt/d_lyt_mini_game.h index b8dfb374..cf877a76 100644 --- a/include/d/lyt/d_lyt_mini_game.h +++ b/include/d/lyt/d_lyt_mini_game.h @@ -536,18 +536,18 @@ private: public: dLytMiniGame_c() - : field_0x0068(false), - field_0x0069(false), - field_0x006A(false), - field_0x006B(false), - field_0x006C(false), - field_0x006D(false), - mVariant(1), - field_0x3864(0), - field_0x3865(0), + : 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(0), - field_0x3868(0) {} + field_0x3867(false), + field_0x3868(false) {} virtual ~dLytMiniGame_c() {} virtual int create() override; @@ -634,12 +634,12 @@ private: void fn_802963E0(); void fn_80296480(); - /* 0x0068 */ bool field_0x0068; - /* 0x0069 */ bool field_0x0069; - /* 0x006A */ bool field_0x006A; - /* 0x006B */ bool field_0x006B; - /* 0x006C */ bool field_0x006C; - /* 0x006D */ bool field_0x006D; + /* 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; @@ -656,11 +656,11 @@ private: /* 0x209C */ dLytMiniGameTime_c mTime; /* 0x2894 */ dLytMiniGameBugs_c mBugs; /* 0x33E4 */ dLytMiniGamePumpkin_c mPumpkin; - /* 0x3864 */ u8 field_0x3864; - /* 0x3865 */ u8 field_0x3865; + /* 0x3864 */ bool field_0x3864; + /* 0x3865 */ bool field_0x3865; /* 0x3866 */ bool field_0x3866; - /* 0x3867 */ u8 field_0x3867; - /* 0x3868 */ u8 field_0x3868; + /* 0x3867 */ bool field_0x3867; + /* 0x3868 */ bool field_0x3868; }; #endif diff --git a/src/d/lyt/d_lyt_mini_game.cpp b/src/d/lyt/d_lyt_mini_game.cpp index 11f79c97..a348099f 100644 --- a/src/d/lyt/d_lyt_mini_game.cpp +++ b/src/d/lyt/d_lyt_mini_game.cpp @@ -3699,8 +3699,8 @@ void dLytMiniGame_c::setDisplayedPoints(s32 points) { case VARIANT_13: mScore.setScore(points); break; case VARIANT_11: mScore.setScore(points); - field_0x3864 = 1; - field_0x3865 = 0; + field_0x3864 = true; + field_0x3865 = false; break; } } @@ -4032,15 +4032,15 @@ void dLytMiniGame_c::fn_80296000() { void dLytMiniGame_c::fn_80296070() { if (fn_80295DB0()) { - if (field_0x3864 == 1) { + if (field_0x3864 == true) { s32 score = mScore.getScore(); s32 rupeeDiff = dLytMeter_c::getRupeeDifference(); if (score != 0) { if (rupeeDiff != 0) { - field_0x3865 = 1; + field_0x3865 = true; } - if (field_0x3865 == 1 && rupeeDiff < score) { + if (field_0x3865 == true && rupeeDiff < score) { mScore.setScore(rupeeDiff); } } @@ -4128,7 +4128,7 @@ void dLytMiniGame_c::fn_80296330() { mTime.startIn(); } - if (isFadingOut() && field_0x3866 == 1) { + if (isFadingOut() && field_0x3866 == true) { mTime.startOut(); } } @@ -4187,23 +4187,23 @@ void dLytMiniGame_c::init() { bool dLytMiniGame_c::loadData(const char *name, s32 slot) { bool loadRequest = false; switch (slot) { - case SLOT_MINI_GAME: loadRequest = field_0x0068; break; - case SLOT_MINI_GAME_SCORE: loadRequest = field_0x0069; break; - case SLOT_MINI_GAME_TIME: loadRequest = field_0x006A; break; - case SLOT_MINI_GAME_BUGS: loadRequest = field_0x006B; break; - case SLOT_MINI_GAME_PUMPKIN: loadRequest = field_0x006C; break; - case SLOT_MINI_GAME_SCORE_SD: loadRequest = field_0x006D; break; + case SLOT_MINI_GAME: loadRequest = mLoadRequestStart; break; + case SLOT_MINI_GAME_SCORE: loadRequest = mLoadRequestScore; break; + case SLOT_MINI_GAME_TIME: loadRequest = mLoadRequestTime; break; + case SLOT_MINI_GAME_BUGS: loadRequest = mLoadRequestBugs; break; + case SLOT_MINI_GAME_PUMPKIN: loadRequest = mLoadRequestPumpkin; break; + case SLOT_MINI_GAME_SCORE_SD: loadRequest = mLoadRequestScoreSd; break; } if (!loadRequest) { LayoutArcManager::GetInstance()->loadLayoutArcFromDisk(name, nullptr); switch (slot) { - case SLOT_MINI_GAME: field_0x0068 = true; break; - case SLOT_MINI_GAME_SCORE: field_0x0069 = true; break; - case SLOT_MINI_GAME_TIME: field_0x006A = true; break; - case SLOT_MINI_GAME_BUGS: field_0x006B = true; break; - case SLOT_MINI_GAME_PUMPKIN: field_0x006C = true; break; - case SLOT_MINI_GAME_SCORE_SD: field_0x006D = true; break; + case SLOT_MINI_GAME: mLoadRequestStart = true; break; + case SLOT_MINI_GAME_SCORE: mLoadRequestScore = true; break; + case SLOT_MINI_GAME_TIME: mLoadRequestTime = true; break; + case SLOT_MINI_GAME_BUGS: mLoadRequestBugs = true; break; + case SLOT_MINI_GAME_PUMPKIN: mLoadRequestPumpkin = true; break; + case SLOT_MINI_GAME_SCORE_SD: mLoadRequestScoreSd = true; break; } return true; }