diff options
| author | Archez <Archez@users.noreply.github.com> | 2024-10-31 00:27:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-31 00:27:20 -0400 |
| commit | 98fa5663b43dc8c2fa916c9711fd8df179906220 (patch) | |
| tree | a5e9bde2f837f62a9ad9a4a62ded5a4579597782 /soh/src/code/z_play.c | |
| parent | 6e024ed15d2b87bb6bd08e347414b728332bbf4b (diff) | |
Hookify more Entrance Rando handling (#4500)
* Hookify more entrance rando handling
* fix bad enums
Diffstat (limited to 'soh/src/code/z_play.c')
| -rw-r--r-- | soh/src/code/z_play.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index af53219e8..ae6d987a9 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -7,7 +7,6 @@ #include "soh/frame_interpolation.h" #include "soh/Enhancements/debugconsole.h" #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh/Enhancements/randomizer/randomizer_entrance.h" #include <overlays/actors/ovl_En_Niw/z_en_niw.h> #include <overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h> #include "soh/Enhancements/enhancementTypes.h" @@ -182,11 +181,6 @@ void Play_Destroy(GameState* thisx) { play->gameplayFrames = 0; } - // In ER, remove link from epona when entering somewhere that doesn't support epona - if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) { - Entrance_HandleEponaState(); - } - play->state.gfxCtx->callback = NULL; play->state.gfxCtx->callbackParam = 0; SREG(91) = 0; @@ -1867,10 +1861,6 @@ void Play_SpawnScene(PlayState* play, s32 sceneNum, s32 spawn) { } OTRPlay_SpawnScene(play, sceneNum, spawn); - - if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES)) { - Entrance_OverrideSpawnScene(sceneNum, spawn); - } } void func_800C016C(PlayState* play, Vec3f* src, Vec3f* dest) { |