nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Skip walking away cutscene when freeing Gorons (#4639)

Browse Source 
* Skip walking away cutscene when freeing Gorons

* Revert a change too far

* Restore Goron walking out animation
This commit is contained in:
Jordan Longstaff
2024-12-12 10:25:07 -05:00
committed by GitHub
parent 16d69e4a28
commit 2e71a826b2
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
View File

@@ -1919,7 +1919,9 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
switch (this->goronState) {
case 0: // Wake up
if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
EnGo2_GoronFireCamera(this, play);
if (GameInteractor_Should(VB_PLAY_GORON_FREE_CS, true)) {
EnGo2_GoronFireCamera(this, play);
}
play->msgCtx.msgMode = MSGMODE_PAUSED;
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_2);
this->waypoint = 1;
@@ -1939,7 +1941,9 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
(f32)((Math_SinS(this->actor.world.rot.y) * -30.0f) + this->actor.world.pos.x);
player->actor.world.pos.z =
(f32)((Math_CosS(this->actor.world.rot.y) * -30.0f) + this->actor.world.pos.z);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
if (GameInteractor_Should(VB_PLAY_GORON_FREE_CS, true)) {
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
}
Audio_PlayFanfare(NA_BGM_APPEAR);
}
break;
@@ -1975,8 +1979,10 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
}
case 4: // Finalize walking away
Message_CloseTextbox(play);
EnGo2_GoronFireClearCamera(this, play);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
if (GameInteractor_Should(VB_PLAY_GORON_FREE_CS, true)) {
EnGo2_GoronFireClearCamera(this, play);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
}
Actor_Kill(&this->actor);
break;
case 1: