github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-14 02:27:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

typo

Browse source
This commit is contained in:
Demur Rumed 2025-07-03 04:05:24 +00:00
commit 1f091530ff
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
soh/soh/Enhancements/randomizer/randomizer_entrance.c
View file

@ -673,14 +673,14 @@ void Entrance_OverrideWeatherState() {
// In ER, Adult should be placed at the fortress entrance when getting caught in the fortress without a hookshot,
// instead of being thrown in the valley Child should always be thrown in the stream when caught in the valley, and
// placed at the fortress entrance from valley when caught in the fortress
void Entrance_OverrideGeurdoGuardCapture(void) {
void Entrance_OverrideGerudoGuardCapture(void) {
if (LINK_IS_CHILD) {
gPlayState->nextEntranceIndex = ENTR_GERUDO_VALLEY_1; // Geurdo Valley thrown out
gPlayState->nextEntranceIndex = ENTR_GERUDO_VALLEY_1; // Gerudo Valley thrown out
}
if ((LINK_IS_CHILD || Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) &&
gPlayState->nextEntranceIndex == ENTR_GERUDO_VALLEY_1) { // Geurdo Valley thrown out
if (gPlayState->sceneNum != SCENE_GERUDO_VALLEY) { // Geurdo Valley
gPlayState->nextEntranceIndex == ENTR_GERUDO_VALLEY_1) { // Gerudo Valley thrown out
if (gPlayState->sceneNum != SCENE_GERUDO_VALLEY) { // Gerudo Valley
gPlayState->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_EAST_EXIT; // Gerudo Fortress
}
}

2
soh/soh/Enhancements/randomizer/randomizer_entrance.h
View file

@ -47,7 +47,7 @@ void Entrance_SetWarpSongEntrance(void);
void Entrance_OverrideBlueWarp(void);
void Entrance_HandleEponaState(void);
void Entrance_OverrideWeatherState(void);
void Entrance_OverrideGeurdoGuardCapture(void);
void Entrance_OverrideGerudoGuardCapture(void);
void Entrance_OverrideSpawnScene(int32_t sceneNum, int32_t spawn);
int32_t Entrance_OverrideSpawnSceneRoom(int32_t sceneNum, int32_t spawn, int32_t room);
void Entrance_EnableFW(void);

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);