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

Merge branch 'develop' into aManchipelago

Browse Source
This commit is contained in:
aMannus
2025-10-18 20:52:01 +02:00
parent e4c9bbfdf9 c806f23494
commit 5c0517af6f
20 changed files with 243 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
View File

@@ -247,7 +247,7 @@ void EnGe1_KickPlayer(EnGe1* this, PlayState* play) {
}
if (IS_RANDO) {
Entrance_OverrideGeurdoGuardCapture();
Entrance_OverrideGerudoGuardCapture();
}
play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST);

4
soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
View File

@@ -255,7 +255,7 @@ void EnGe2_CaptureClose(EnGe2* this, PlayState* play) {
}
if (IS_RANDO) {
Entrance_OverrideGeurdoGuardCapture();
Entrance_OverrideGerudoGuardCapture();
}
play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST);
@@ -285,7 +285,7 @@ void EnGe2_CaptureCharge(EnGe2* this, PlayState* play) {
}
if (IS_RANDO) {
Entrance_OverrideGeurdoGuardCapture();
Entrance_OverrideGerudoGuardCapture();
}
play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST);

2
soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
View File

@@ -1576,7 +1576,7 @@ void EnGeldB_Draw(Actor* thisx, PlayState* play) {
}
if (IS_RANDO) {
Entrance_OverrideGeurdoGuardCapture();
Entrance_OverrideGerudoGuardCapture();
}
play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST);