mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-21 06:48:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Shuffle Silver: fix gtg room setting room cleared instead of flag (#7084)

Browse Source
This commit is contained in:
Philip Dubé
2026-08-16 18:38:51 +00:00
committed by GitHub
parent 38acd5a177
commit 17a7fde003
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/randomizer/ShuffleSilver.cpp
+13 -11
View File
@@ -221,14 +221,7 @@ s8 Randomizer::SilverTotal(RandomizerGet rg) {
: 5;
}
bool IsSilverCleared(s16 switchFlag) {
RandomizerGet rg = SilverFromSwitchFlag(switchFlag);
return *Randomizer::SilverFieldFromSaveContext(&gSaveContext, rg) >= Randomizer::SilverTotal(rg);
}
bool IsSilverCleared(RandomizerGet rg) {
auto test = *Randomizer::SilverFieldFromSaveContext(&gSaveContext, rg);
auto test2 = Randomizer::SilverTotal(rg);
return *Randomizer::SilverFieldFromSaveContext(&gSaveContext, rg) >= Randomizer::SilverTotal(rg);
}
@@ -254,6 +247,14 @@ extern "C" void EnGSwitch_RandomizerDraw(Actor* thisx, PlayState* play) {
}
}
static void SetSilverCleared(EnGSwitch* silver) {
if (gPlayState->sceneNum == SCENE_GERUDO_TRAINING_GROUND && silver->actor.room == 2) {
Flags_SetTempClear(gPlayState, silver->actor.room);
Flags_SetClear(gPlayState, silver->actor.room);
}
Flags_SetSwitch(gPlayState, silver->switchFlag);
}
void RegisterShuffleSilver() {
bool shouldRegister = IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_SILVER);
@@ -271,8 +272,8 @@ void RegisterShuffleSilver() {
COND_VB_SHOULD(VB_SILVER_COUNT_CHECK, shouldRegister, {
EnGSwitch* silver = va_arg(args, EnGSwitch*);
*should = false;
if (IsSilverCleared(silver->switchFlag)) {
Flags_SetSwitch(gPlayState, silver->switchFlag);
if (IsSilverCleared(SilverFromSwitchFlag(silver->switchFlag))) {
SetSilverCleared(silver);
Actor_Kill(&silver->actor);
}
});
@@ -288,8 +289,9 @@ void RegisterShuffleSilver() {
*should = false;
silver->actor.draw = EnGSwitch_RandomizerDraw;
}
} else if (silver->type == ENGSWITCH_SILVER_TRACKER && IsSilverCleared(silver->switchFlag)) {
Flags_SetSwitch(gPlayState, silver->switchFlag);
} else if (silver->type == ENGSWITCH_SILVER_TRACKER &&
IsSilverCleared(SilverFromSwitchFlag(silver->switchFlag))) {
SetSilverCleared(silver);
*should = true;
}
});
soh/soh/Enhancements/randomizer/ShuffleSilver.h
-1
View File
@@ -7,6 +7,5 @@
bool IsSilverInPool(RandomizerGet rg);
RandomizerGet SilverFromSwitchFlag(s16 switchFlag);
bool IsSilverCleared(s16 switchFlag);
bool IsSilverCleared(RandomizerGet rg);
bool IsSilver(RandomizerGet rg);