mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-26 03:12:18 -05:00
Code Issues Projects Releases Wiki Activity

Fix: Override jail capture for the Gerudo fighter (#2413)

Browse Source 
* handle overriding gerudo capture for the fighter

* add entrance include
This commit is contained in:
Adam Bird 2023-01-27 18:36:38 -05:00 committed by GitHub
parent 9fe7839f9a
commit 0aab836d1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/randomizer/randomizer_entrance.c
View File

@ -659,7 +659,7 @@ void Entrance_OverrideWeatherState() {
// 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 // 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_OverrideGeurdoGuardCapture(void) {
if (LINK_IS_CHILD) { if (LINK_IS_CHILD) {
gPlayState->nextEntranceIndex = 0x1A5; gPlayState->nextEntranceIndex = 0x1A5; // Geurdo Valley thrown out
} }
if ((LINK_IS_CHILD || Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) && if ((LINK_IS_CHILD || Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) &&

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

@ -6,6 +6,7 @@
#include "z_en_geldb.h" #include "z_en_geldb.h"
#include "objects/object_geldb/object_geldb.h" #include "objects/object_geldb/object_geldb.h"
#include "soh/Enhancements/randomizer/randomizer_entrance.h"
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4)
@ -1570,6 +1571,11 @@ void EnGeldB_Draw(Actor* thisx, PlayState* play) {
} else { } else {
play->nextEntranceIndex = 0x3B4; play->nextEntranceIndex = 0x3B4;
} }
if (gSaveContext.n64ddFlag) {
Entrance_OverrideGeurdoGuardCapture();
}
play->fadeTransition = 0x26; play->fadeTransition = 0x26;
play->sceneLoadFlag = 0x14; play->sceneLoadFlag = 0x14;
} }