diff options
| author | Caladius <Caladius@users.noreply.github.com> | 2025-10-18 19:54:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-18 19:54:38 -0400 |
| commit | 44bda0fd55159248f6562adb54e0eb2cf8e0f0f5 (patch) | |
| tree | a7ea0230923c47413914fc6c0f7972139c1b2720 | |
| parent | 9fb7e51576aa18783fb4c4858b074555237a81d3 (diff) | |
Ok fine, dont shuffle swim.. see if i care! (#1292)
* Ok fine, dont shuffle swim.. see if i care!
* Revert Temp Fix and update OnFileCreate
* Fix syntax
| -rw-r--r-- | mm/2s2h/Rando/Logic/Logic.h | 2 | ||||
| -rw-r--r-- | mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mm/2s2h/Rando/Logic/Logic.h b/mm/2s2h/Rando/Logic/Logic.h index f759cd51b..aeec62449 100644 --- a/mm/2s2h/Rando/Logic/Logic.h +++ b/mm/2s2h/Rando/Logic/Logic.h @@ -98,7 +98,7 @@ extern std::unordered_map<RandoRegionId, RandoRegion> Regions; #define FOUND_ALL_FROGS \ (CHECK_WEEKEVENTREG(WEEKEVENTREG_33_01) && CHECK_WEEKEVENTREG(WEEKEVENTREG_32_40) && \ CHECK_WEEKEVENTREG(WEEKEVENTREG_32_80) && CHECK_WEEKEVENTREG(WEEKEVENTREG_33_02)) -#define CAN_USE_ABILITY(ability) (Flags_GetRandoInf(RI_ABILITY_##ability - RI_ABILITY_SWIM + RANDO_INF_OBTAINED_SWIM)) +#define CAN_USE_ABILITY(ability) Flags_GetRandoInf(RI_ABILITY_##ability - RI_ABILITY_SWIM + RANDO_INF_OBTAINED_SWIM) #define EVENT(randoEvent, condition) \ { \ diff --git a/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp b/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp index 21dd965e6..25041eee6 100644 --- a/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp +++ b/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp @@ -255,6 +255,8 @@ void Rando::MiscBehavior::OnFileCreate(s16 fileNum) { if (RANDO_SAVE_OPTIONS[RO_SHUFFLE_SWIM] == RO_GENERIC_YES) { itemPool.push_back(RI_ABILITY_SWIM); + } else { + Flags_SetRandoInf(RANDO_INF_OBTAINED_SWIM); } // Remove starting items from the pool (but only one per entry in startingItems) |