[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>

1 files changed, 4 insertions, 0 deletions

diff --git a/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp b/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp
index 668f5e7ba..93b9621bd 100644
--- a/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp
+++ b/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp
@@ -245,6 +245,10 @@ void Rando::MiscBehavior::OnFileCreate(s16 fileNum) {
                     }
                 }
 
+                if (RANDO_SAVE_OPTIONS[RO_SHUFFLE_SWIM] == RO_GENERIC_YES) {
+                    itemPool.push_back(RI_ABILITY_SWIM);
+                }
+
                 // Remove starting items from the pool (but only one per entry in startingItems)
                 for (RandoItemId startingItem : startingItems) {
                     auto it = std::find(itemPool.begin(), itemPool.end(), startingItem);