diff options
| author | Philip Dubé <159546+serprex@users.noreply.github.com> | 2026-07-08 13:58:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-08 13:58:23 +0000 |
| commit | 3a12eeaa7140348f6175208e564e55e6375e42e3 (patch) | |
| tree | bc08f875bc4eb257696d8ded72469708bbaba949 /soh/src | |
| parent | 10cde0b8ad01a9d853179171ef59b3b8711ad400 (diff) | |
cleanup lake hylia swim spawn hook (#6887)
Diffstat (limited to 'soh/src')
| -rw-r--r-- | soh/src/overlays/actors/ovl_player_actor/z_player.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index 85997712a..4a9b529ac 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -6638,10 +6638,9 @@ s32 Player_SetStartingMovement(PlayState* play, Player* this, f32 arg2) { ySurface = this->actor.world.pos.y; if (WaterBox_GetSurface1(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &ySurface, - &waterbox) && - GameInteractor_Should(VB_LAKE_HYLIA_PREVENT_DOMAIN_SWIM, true, this)) { + &waterbox)) { ySurface -= this->actor.world.pos.y; - if (this->ageProperties->unk_24 <= ySurface) { + if (GameInteractor_Should(VB_PLAYER_SPAWN_SWIMMING, this->ageProperties->unk_24 <= ySurface, this)) { Player_SetupAction(play, this, Player_Action_8084D7C4, 0); Player_AnimChangeLoopSlowMorph(play, this, &gPlayerAnim_link_swimer_swim); this->stateFlags1 |= PLAYER_STATE1_IN_WATER | PLAYER_STATE1_IN_CUTSCENE; |