github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 13:00:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix loop order + reorder case for clarity (#5044)

Browse source
This commit is contained in:
Eric Hoey 2025-02-12 15:21:43 -05:00 • committed by GitHub
commit 126c3b532f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View file

@ -1467,6 +1467,18 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
} }
break; break;
} }
case VB_HAVE_OCARINA_NOTE_A4: {
if (!Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT)) {
*should = false;
}
break;
}
case VB_HAVE_OCARINA_NOTE_B4: {
if (!Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT)) {
*should = false;
}
break;
}
case VB_HAVE_OCARINA_NOTE_D4: { case VB_HAVE_OCARINA_NOTE_D4: {
if (!Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A)) { if (!Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A)) {
*should = false; *should = false;
@ -1485,21 +1497,9 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
} }
break; break;
} }
case VB_HAVE_OCARINA_NOTE_B4: {
if (!Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT)) {
*should = false;
}
break;
}
case VB_HAVE_OCARINA_NOTE_A4: {
if (!Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT)) {
*should = false;
}
break;
}
case VB_SKIP_SCARECROWS_SONG: { case VB_SKIP_SCARECROWS_SONG: {
int ocarinaButtonCount = 0; int ocarinaButtonCount = 0;
for (int i = VB_HAVE_OCARINA_NOTE_D4; i <= VB_HAVE_OCARINA_NOTE_A4; i++) { for (int i = VB_HAVE_OCARINA_NOTE_A4; i <= VB_HAVE_OCARINA_NOTE_F4; i++) {
if (GameInteractor_Should((GIVanillaBehavior)i, true)) { if (GameInteractor_Should((GIVanillaBehavior)i, true)) {
ocarinaButtonCount++; ocarinaButtonCount++;
} }