From e36bab167b77aed9e56069ad2f0b831f84889ea1 Mon Sep 17 00:00:00 2001 From: robojumper Date: Fri, 5 Dec 2025 15:49:53 +0100 Subject: [PATCH] One more function name --- config/SOUE01/symbols.txt | 2 +- include/d/lyt/d_lyt_mini_game.h | 2 +- src/d/lyt/d_lyt_mini_game.cpp | 26 ++++++++++++++------------ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index bbcf250a..4e1d59e5 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -15466,7 +15466,7 @@ isBugCollected__14dLytMiniGame_cCFl = .text:0x80295D70; // type:function size:0x fn_80295D80__14dLytMiniGame_cFv = .text:0x80295D80; // type:function size:0x4 fn_80295D90__14dLytMiniGame_cFl = .text:0x80295D90; // type:function size:0x4 getPumpkin__14dLytMiniGame_cFRC7mVec3_clb = .text:0x80295DA0; // type:function size:0x8 -fn_80295DB0__14dLytMiniGame_cFv = .text:0x80295DB0; // type:function size:0x60 +isDisplayingResult__14dLytMiniGame_cFv = .text:0x80295DB0; // type:function size:0x60 isInEvent__14dLytMiniGame_cCFv = .text:0x80295E10; // type:function size:0x34 isPopupOpen__14dLytMiniGame_cCFv = .text:0x80295E50; // type:function size:0x54 isPopupOpenExceptHelp__14dLytMiniGame_cCFv = .text:0x80295EB0; // type:function size:0x54 diff --git a/include/d/lyt/d_lyt_mini_game.h b/include/d/lyt/d_lyt_mini_game.h index 70172130..36006a03 100644 --- a/include/d/lyt/d_lyt_mini_game.h +++ b/include/d/lyt/d_lyt_mini_game.h @@ -611,7 +611,7 @@ private: void fn_80295D80(); void fn_80295D90(s32 points); void getPumpkin(const mVec3_c &pumpkinPos, s32 unk, bool doubleScore); - bool fn_80295DB0(); + bool isDisplayingResult(); bool isInEvent() const; bool isPopupOpen() const; bool isPopupOpenExceptHelp() const; diff --git a/src/d/lyt/d_lyt_mini_game.cpp b/src/d/lyt/d_lyt_mini_game.cpp index c2ad20a9..2ebd7250 100644 --- a/src/d/lyt/d_lyt_mini_game.cpp +++ b/src/d/lyt/d_lyt_mini_game.cpp @@ -3657,7 +3657,7 @@ void dLytMiniGame_c::scoreRelatedInit() { case VARIANT_SPIRAL_CHARGE_TUTORIAL: case VARIANT_PUMPKIN_ARCHERY: mScore.fn_80291410(); break; case VARIANT_FUN_FUN_ISLAND: - if (fn_80295DB0()) { + if (isDisplayingResult()) { mScore.startAlphaIn(); } else { mScore.fn_80291410(); @@ -3673,7 +3673,7 @@ void dLytMiniGame_c::scoreRelatedInit() { void dLytMiniGame_c::endScoreResult() { switch (mVariant) { case VARIANT_FUN_FUN_ISLAND: - if (fn_80295DB0()) { + if (isDisplayingResult()) { mScore.startAlphaOut(); } else { mScore.startOut(); @@ -3691,7 +3691,7 @@ void dLytMiniGame_c::setDisplayedPoints(s32 points) { case VARIANT_SPIRAL_CHARGE_TUTORIAL: case VARIANT_PUMPKIN_ARCHERY: mScore.setScore(points); break; case VARIANT_FUN_FUN_ISLAND: - fn_80295DB0(); + isDisplayingResult(); mScore.setScore(points); break; case VARIANT_THRILL_DIGGER: mScore.fn_80291D40(points); break; @@ -3945,7 +3945,7 @@ void dLytMiniGame_c::getPumpkin(const mVec3_c &pumpkinPos, s32 unk, bool doubleS } // cannot be const... -bool dLytMiniGame_c::fn_80295DB0() { +bool dLytMiniGame_c::isDisplayingResult() { bool ret = false; switch (mVariant) { case VARIANT_BAMBOO_CUTTING_RESULT: @@ -4002,7 +4002,7 @@ bool dLytMiniGame_c::isFadingOut() const { } void dLytMiniGame_c::executeBambooCutting() { - if (fn_80295DB0()) { + if (isDisplayingResult()) { // nothing } else { if (isPopupOpen()) { @@ -4018,7 +4018,7 @@ void dLytMiniGame_c::executeBambooCutting() { } void dLytMiniGame_c::executeFunFunIsland() { - if (fn_80295DB0()) { + if (isDisplayingResult()) { mScore.setResultMode(true); } else { mScore.setResultMode(false); @@ -4031,7 +4031,7 @@ void dLytMiniGame_c::executeFunFunIsland() { } void dLytMiniGame_c::executeThrillDigger() { - if (fn_80295DB0()) { + if (isDisplayingResult()) { if (field_0x3864 == true) { s32 score = mScore.getScore(); s32 rupeeDiff = dLytMeter_c::getRupeeDifference(); @@ -4059,7 +4059,7 @@ void dLytMiniGame_c::executeThrillDigger() { } void dLytMiniGame_c::executeInsectCapture() { - if (fn_80295DB0()) { + if (isDisplayingResult()) { // nothing } else { if (isInEvent() || isPopupOpen()) { @@ -4098,7 +4098,9 @@ void dLytMiniGame_c::executeSpiralChargeTutorial() { } void dLytMiniGame_c::executePumpkinArchery() { - if (!fn_80295DB0()) { + if (isDisplayingResult()) { + // nothing + } else { if (isPopupOpen()) { mScore.startOutTemp(); mTime.startOutTemp(); @@ -4115,7 +4117,7 @@ void dLytMiniGame_c::executePumpkinArchery() { } void dLytMiniGame_c::executeRollercoaster() { - if (fn_80295DB0()) { + if (isDisplayingResult()) { // nothing } else { if (isInEvent() || isPopupOpen()) { @@ -4136,7 +4138,7 @@ void dLytMiniGame_c::executeRollercoaster() { // These two do the same thing void dLytMiniGame_c::executeBossRush() { - if (fn_80295DB0()) { + if (isDisplayingResult()) { // nothing } else { if (isInEvent() || isPopupOpen()) { @@ -4156,7 +4158,7 @@ void dLytMiniGame_c::executeBossRush() { } void dLytMiniGame_c::executeTrialTimeAttack() { - if (fn_80295DB0()) { + if (isDisplayingResult()) { // nothing } else { if (isInEvent() || isPopupOpen()) {