diff options
Diffstat (limited to 'mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipPushingMikau.cpp')
| -rw-r--r-- | mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipPushingMikau.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipPushingMikau.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipPushingMikau.cpp index 8c2c7d4c9..1eb1cd16f 100644 --- a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipPushingMikau.cpp +++ b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipPushingMikau.cpp @@ -1,6 +1,8 @@ #include "public/bridge/consolevariablebridge.h" #include "2s2h/GameInteractor/GameInteractor.h" #include "2s2h/ShipInit.hpp" +#include "2s2h/Rando/Rando.h" +#include "2s2h/Rando/Logic/Logic.h" extern "C" { #include "functions.h" @@ -11,6 +13,10 @@ extern "C" { void RegisterSkipPushingMikau() { COND_ID_HOOK(ShouldActorInit, ACTOR_EN_ZOG, CVAR, [](Actor* actor, bool* should) { + if (IS_RANDO && !CAN_USE_ABILITY(SWIM)) { + // This skip would circumvent logical requirements if the player cannot swim yet + return; + } Flags_SetWeekEventReg(WEEKEVENTREG_88_10); Flags_SetWeekEventReg(WEEKEVENTREG_29_20); Flags_SetWeekEventReg(WEEKEVENTREG_91_01); |
