mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-01 01:39:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

One more function name

Browse Source
This commit is contained in:
robojumper
2025-12-05 15:49:53 +01:00
parent 17c3ad4bb0
commit e36bab167b
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/symbols.txt
+1 -1
View File
@@ -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
include/d/lyt/d_lyt_mini_game.h
+1 -1
View File
@@ -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;
src/d/lyt/d_lyt_mini_game.cpp
+14 -12
View File
@@ -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()) {