mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-26 14:31:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

95%

Browse Source
This commit is contained in:
robojumper
2025-12-04 22:49:27 +01:00
parent f8c9af7dc6
commit 22cff3e05d
12 changed files with 971 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/REL/d/t/d_t_sword_battle_game.cpp
+7 -7
View File
@@ -68,12 +68,12 @@ int dTgSwordBattleGame_c::actorExecuteInEvent() {
} break;
case 'cndn': {
if (advance) {
dLytMiniGame_c::GetInstance()->fn_80295940();
dLytMiniGame_c::GetInstance()->startCountdown();
} else if (dLytMiniGame_c::GetInstance()->fn_80295AB0()) {
} else if (dLytMiniGame_c::GetInstance()->isStartCountdownDone()) {
dLytMiniGame_c::GetInstance()->timeRelatedExecute();
dLytMiniGame_c::GetInstance()->setHighscore(getBossHighscore());
dLytMiniGame_c::GetInstance()->fn_80295CB0(true);
dLytMiniGame_c::GetInstance()->setShowBestTime(true);
mTimer.initUpCounter();
field_0x1A8 = true;
field_0x1AC = true;
@@ -83,8 +83,8 @@ int dTgSwordBattleGame_c::actorExecuteInEvent() {
} break;
case 'fnsh': {
if (advance) {
dLytMiniGame_c::GetInstance()->fn_80295980();
} else if (dLytMiniGame_c::GetInstance()->fn_80295AD0()) {
dLytMiniGame_c::GetInstance()->startFinish();
} else if (dLytMiniGame_c::GetInstance()->isFinishAnimDone()) {
mEventRelated.advanceNext();
}
ret = SUCCEEDED;
@@ -112,7 +112,7 @@ int dTgSwordBattleGame_c::actorExecuteInEvent() {
setInBossRushFlag();
setCurrentBossNumber(mBossNumber + 1);
if (MinigameManager::endMinigame(MinigameManager::BOSS_RUSH)) {
dLytMiniGame_c::GetInstance()->fn_80295980();
dLytMiniGame_c::GetInstance()->startFinish();
dLytMiniGame_c::GetInstance()->timeRelated();
}
}
@@ -163,7 +163,7 @@ void dTgSwordBattleGame_c::finalizeState_Manage() {}
void dTgSwordBattleGame_c::init() {
if (MinigameManager::GetInstance()->checkInBossRush()) {
createBase(fProfile::LYT_MINI_GAME, this, 8, OTHER);
createBase(fProfile::LYT_MINI_GAME, this, dLytMiniGame_c::VARIANT_BOSS_RUSH, OTHER);
}
mTimer.vt_0x0C();
src/d/d_message.cpp
+33 -11
View File
@@ -437,9 +437,7 @@ bool dFlow_c::handleEventInternal(const MsbFlowInfo *element) {
dMessage_c::getInstance()->setInMapEvent(true);
dMessage_c::getInstance()->clearLightPillarRelatedArgs();
if (dLytControlGame_c::getInstance()->isStateNotNormalOrInEvent()) {
dLytControlGame_c::getInstance()->openMapEvent(
mapEvent, arg1, arg2
);
dLytControlGame_c::getInstance()->openMapEvent(mapEvent, arg1, arg2);
}
} else {
dLytMap_c::GetInstance()->queueMapEvent(mapEvent, arg1, arg2);
@@ -1196,28 +1194,52 @@ void dFlow_c::createLytMiniGame() {
if (dLytMiniGame_c::GetInstance() == nullptr) {
switch (dMessage_c::getInstance()->getMiniGameVariant()) {
case 0:
dBase_c::createBase(fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), 11, fBase_c::OTHER);
dBase_c::createBase(
fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), dLytMiniGame_c::VARIANT_11,
fBase_c::OTHER
);
break;
case 1:
dBase_c::createBase(fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), 10, fBase_c::OTHER);
dBase_c::createBase(
fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), dLytMiniGame_c::VARIANT_10,
fBase_c::OTHER
);
break;
case 2:
dBase_c::createBase(fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), 12, fBase_c::OTHER);
dBase_c::createBase(
fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), dLytMiniGame_c::VARIANT_12,
fBase_c::OTHER
);
break;
case 3:
dBase_c::createBase(fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), 14, fBase_c::OTHER);
dBase_c::createBase(
fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), dLytMiniGame_c::VARIANT_14,
fBase_c::OTHER
);
break;
case 4:
dBase_c::createBase(fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), 13, fBase_c::OTHER);
dBase_c::createBase(
fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), dLytMiniGame_c::VARIANT_13,
fBase_c::OTHER
);
break;
case 5:
dBase_c::createBase(fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), 2, fBase_c::OTHER);
dBase_c::createBase(
fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), dLytMiniGame_c::VARIANT_FUN_FUN_ISLAND,
fBase_c::OTHER
);
break;
case 6:
dBase_c::createBase(fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), 16, fBase_c::OTHER);
dBase_c::createBase(
fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), dLytMiniGame_c::VARIANT_16,
fBase_c::OTHER
);
break;
case 7:
dBase_c::createBase(fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), 15, fBase_c::OTHER);
dBase_c::createBase(
fProfile::LYT_MINI_GAME, dLytControlGame_c::getInstance(), dLytMiniGame_c::VARIANT_15,
fBase_c::OTHER
);
break;
}
}
src/d/lyt/d_lyt_mini_game.cpp
+714 -74
View File
File diff suppressed because it is too large Load Diff
src/d/lyt/meter/d_lyt_meter.cpp
+1 -1
View File
@@ -581,7 +581,7 @@ bool dLytMeterMain_c::fn_800C9FE0() {
return false;
}
bool dLytMeterMain_c::fn_800CA040() {
bool dLytMeterMain_c::isPopupOpen() {
if (mHelpOpen || isInModeMap() || isInModePause()) {
return true;
}