diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h index 97173caaee6..844e91c3723 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h @@ -302,6 +302,7 @@ typedef enum { /*** Play Cutscenes ***/ VB_PLAY_TRANSITION_CS, + VB_PLAY_GORON_FREE_CS, VB_PLAY_FIRE_ARROW_CS, // Vanilla condition: INV_CONTENT(ITEM_ARROW_FIRE) == ITEM_NONE VB_SPAWN_FIRE_ARROW, @@ -332,8 +333,6 @@ typedef enum { VB_PLAY_BOLERO_OF_FIRE_CS, VB_PLAY_SERENADE_OF_WATER_CS, VB_PLAY_EYEDROPS_CS, - // Opt: *EnGo2 - VB_PLAY_GORON_FREE_CS, // Opt: *EnOkarinaTag VB_PLAY_DRAIN_WELL_CS, // Opt: *EnOkarinaTag @@ -374,6 +373,7 @@ typedef enum { /*** Give Items ***/ + VB_FREEZE_ON_SKULL_TOKEN, // Opt: *EnBox VB_GIVE_ITEM_FROM_CHEST, // Opt: ItemID @@ -382,7 +382,6 @@ typedef enum { VB_GIVE_ITEM_FROM_ITEM_00, // Opt: *EnSi VB_GIVE_ITEM_SKULL_TOKEN, - VB_FREEZE_ON_SKULL_TOKEN, // Opt: *EnCow VB_GIVE_ITEM_FROM_COW, // Opt: *EnDns diff --git a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c index 246cbcd11c5..5084158409f 100644 --- a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -98,7 +98,7 @@ void func_80AFB768(EnSi* this, PlayState* play) { this->collider.base.ocFlags2 &= ~OC2_HIT_PLAYER; if (GameInteractor_Should(VB_GIVE_ITEM_SKULL_TOKEN, true, this)) { Item_Give(play, ITEM_SKULL_TOKEN); - if (GameInteractor_Should(VB_FREEZE_ON_SKULL_TOKEN, true, this)) { + if (GameInteractor_Should(VB_FREEZE_ON_SKULL_TOKEN, true)) { player->actor.freezeTimer = 10; } Message_StartTextbox(play, TEXT_GS_NO_FREEZE, NULL); @@ -124,7 +124,7 @@ void func_80AFB89C(EnSi* this, PlayState* play) { if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_HOOKSHOT_ATTACHED)) { if (GameInteractor_Should(VB_GIVE_ITEM_SKULL_TOKEN, true, this)) { Item_Give(play, ITEM_SKULL_TOKEN); - if (GameInteractor_Should(VB_FREEZE_ON_SKULL_TOKEN, true, this)) { + if (GameInteractor_Should(VB_FREEZE_ON_SKULL_TOKEN, true)) { player->actor.freezeTimer = 10; } Message_StartTextbox(play, TEXT_GS_NO_FREEZE, NULL); @@ -137,7 +137,7 @@ void func_80AFB89C(EnSi* this, PlayState* play) { void func_80AFB950(EnSi* this, PlayState* play) { Player* player = GET_PLAYER(play); - if (Message_GetState(&play->msgCtx) != TEXT_STATE_CLOSING && GameInteractor_Should(VB_FREEZE_ON_SKULL_TOKEN, true, this)) { + if (Message_GetState(&play->msgCtx) != TEXT_STATE_CLOSING && GameInteractor_Should(VB_FREEZE_ON_SKULL_TOKEN, true)) { player->actor.freezeTimer = 10; } else { SET_GS_FLAGS((this->actor.params & 0x1F00) >> 8, this->actor.params & 0xFF);