mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-18 00:00:35 -05:00
Code Issues Projects Releases Wiki Activity

handle angry happy mask throwing link out in entrance randomizer (#2578)

Browse Source
This commit is contained in:
Adam Bird 2023-03-04 00:30:20 -05:00 committed by GitHub
parent a5bf135541
commit 0a67e42f6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View File

@ -13,6 +13,7 @@
#include "objects/object_mastergolon/object_mastergolon.h" #include "objects/object_mastergolon/object_mastergolon.h"
#include "objects/object_masterzoora/object_masterzoora.h" #include "objects/object_masterzoora/object_masterzoora.h"
#include "objects/object_masterkokirihead/object_masterkokirihead.h" #include "objects/object_masterkokirihead/object_masterkokirihead.h"
#include "soh/Enhancements/randomizer/randomizer_entrance.h"
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4)
@ -934,7 +935,12 @@ void EnOssan_State_StartConversation(EnOssan* this, PlayState* play, Player* pla
EnOssan_TryPaybackMask(this, play); EnOssan_TryPaybackMask(this, play);
return; return;
case OSSAN_HAPPY_STATE_ANGRY: case OSSAN_HAPPY_STATE_ANGRY:
play->nextEntranceIndex = 0x1D1; // In ER, handle happy mask throwing link out with not enough rupees
if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES)) {
play->nextEntranceIndex = Entrance_OverrideNextIndex(0x1D1);
} else {
play->nextEntranceIndex = 0x1D1;
}
play->sceneLoadFlag = 0x14; play->sceneLoadFlag = 0x14;
play->fadeTransition = 0x2E; play->fadeTransition = 0x2E;
return; return;