diff options
| author | Caladius <Caladius@users.noreply.github.com> | 2025-10-15 12:39:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-15 12:39:07 -0400 |
| commit | da767c966d1102fa2dfe8f78627400ab23f4634c (patch) | |
| tree | af78ae7191c499b00f4808d86c7d318b724db46b /mm/2s2h/Rando/ConvertItem.cpp | |
| parent | f2ae53313b2ca4046743d0d6befa09a325129888 (diff) | |
[Rando] Shuffle Swim (#1087)
* Shuffle Swim + Central Logic
* East Logic
* Great Bay Temple (hopefully)
* North Logic
* Pirates Logic (Hopefully)
* South Logic
* West Logic
* Fix Termina Field Logic
* Fix Great Bay Temple Logic
* Feedback Changes
* Split Southern Swamp North
* Update Swamp and GBC logic
* missed one
* Feedback Updates
* fix syntax
* Split Marine Lab Exterior from GBC
* replace Bronze Scale wording in Menu.
* Additional logic pass for swim ability
* Mimic Deku hop failure event when touching water
Separate Woodfall owl statue platform into own region
* Import Model
* Add to 2ship.o2r
* Add Model Selector
* Update Model
* Clean remove model for replacement
* Import new model extract from Dana
* Testing
* pathing change
* Pushing for someone to look at the model crash issue.
* Enable DrawAbilityItem to take in multiple items when more get added. This is ready to go.
* Feedback Changes
* clang
* Revert "clang"
This reverts commit e09482f8b83c39f4678a9c349ed9061f2e002251.
* Undo clang for once lol
* Do not skip pushing Mikau if no swim ability
* How did I mess that up
* Fix changes
* clang bullsh*t
---------
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
Diffstat (limited to 'mm/2s2h/Rando/ConvertItem.cpp')
| -rw-r--r-- | mm/2s2h/Rando/ConvertItem.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/2s2h/Rando/ConvertItem.cpp b/mm/2s2h/Rando/ConvertItem.cpp index 0c635b518..f2d7142fb 100644 --- a/mm/2s2h/Rando/ConvertItem.cpp +++ b/mm/2s2h/Rando/ConvertItem.cpp @@ -238,6 +238,7 @@ bool Rando::IsItemObtainable(RandoItemId randoItemId, RandoCheckId randoCheckId) case RI_FROG_CYAN: case RI_FROG_PINK: case RI_FROG_WHITE: + case RI_ABILITY_SWIM: if (hasObtainedCheck) { return false; } |