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

Can always bribe the Hyrule Castle guard in randomiser. (#6129)

Browse Source
This commit is contained in:
Pepper0ni
2026-01-11 05:02:37 +00:00
committed by GitHub
parent cd8bd69c6e
commit 31eefd57df
3 changed files with 65 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
View File

@@ -262,6 +262,14 @@ typedef enum {
// - `*EnShopnuts` // - `*EnShopnuts`
VB_BUSINESS_SCRUB_DESPAWN, VB_BUSINESS_SCRUB_DESPAWN,
// #### `result`
// ```c
// true
// ```
// #### `args`
// - `*EnHeishi2`
VB_CAN_BRIBE_HEISHI2,
// #### `result` // #### `result`
// ```c // ```c
// true // true

12
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View File

@@ -57,6 +57,7 @@ extern "C" {
#include "src/overlays/actors/ovl_Fishing/z_fishing.h" #include "src/overlays/actors/ovl_Fishing/z_fishing.h"
#include "src/overlays/actors/ovl_En_Mk/z_en_mk.h" #include "src/overlays/actors/ovl_En_Mk/z_en_mk.h"
#include "src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h" #include "src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h"
#include "src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h"
#include "draw.h" #include "draw.h"
static ObjectExtension::Register<DnsItemEntry> RegisterDnsItemEntryOverride; static ObjectExtension::Register<DnsItemEntry> RegisterDnsItemEntryOverride;
@@ -842,6 +843,8 @@ void RandomizerOnDialogMessageHandler() {
} }
} }
extern "C" void func_80A5475C(EnHeishi2* CastleGuard, PlayState* play);
void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs) { void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs) {
va_list args; va_list args;
va_copy(args, originalArgs); va_copy(args, originalArgs);
@@ -948,6 +951,15 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
} }
break; break;
} }
case VB_CAN_BRIBE_HEISHI2: {
EnHeishi2* guard = va_arg(args, EnHeishi2*);
guard->actor.textId = 0x7072;
guard->unk_300 = TEXT_STATE_CHOICE;
guard->unk_30E = 1;
guard->actionFunc = func_80A5475C;
*should = false;
break;
}
case VB_GIVE_ITEM_MASTER_SWORD: case VB_GIVE_ITEM_MASTER_SWORD:
if (RAND_GET_OPTION(RSK_SHUFFLE_MASTER_SWORD) || RAND_GET_OPTION(RSK_STARTING_MASTER_SWORD)) { if (RAND_GET_OPTION(RSK_SHUFFLE_MASTER_SWORD) || RAND_GET_OPTION(RSK_STARTING_MASTER_SWORD)) {
*should = false; *should = false;

88
soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
View File

@@ -189,52 +189,54 @@ void func_80A531E4(EnHeishi2* this, PlayState* play) {
void func_80A53278(EnHeishi2* this, PlayState* play) { void func_80A53278(EnHeishi2* this, PlayState* play) {
this->unk_30B = 0; this->unk_30B = 0;
this->unk_30E = 0; this->unk_30E = 0;
if (Text_GetFaceReaction(play, 5) != 0) { if (GameInteractor_Should(VB_CAN_BRIBE_HEISHI2, true, this)) {
this->actor.textId = Text_GetFaceReaction(play, 5); if (Text_GetFaceReaction(play, 5) != 0) {
this->unk_30B = 1; this->actor.textId = Text_GetFaceReaction(play, 5);
this->unk_300 = TEXT_STATE_DONE; this->unk_30B = 1;
this->actionFunc = func_80A5475C; this->unk_300 = TEXT_STATE_DONE;
} else if ((Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) && this->actionFunc = func_80A5475C;
(Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) && } else if ((Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) &&
(Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP))) { (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) &&
// "Get all spiritual stones!" (Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP))) {
osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 全部の精霊石GET！ ☆☆☆☆☆ \n" VT_RST); // "Get all spiritual stones!"
this->unk_300 = TEXT_STATE_DONE; osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 全部の精霊石GET！ ☆☆☆☆☆ \n" VT_RST);
this->actor.textId = 0x7006; this->unk_300 = TEXT_STATE_DONE;
this->actionFunc = func_80A5475C; this->actor.textId = 0x7006;
} else if (!IS_DAY) { this->actionFunc = func_80A5475C;
// "Sleep early for children!" } else if (!IS_DAY) {
osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 子供ははやくネロ！ ☆☆☆☆☆ \n" VT_RST); // "Sleep early for children!"
this->unk_300 = TEXT_STATE_DONE; osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 子供ははやくネロ！ ☆☆☆☆☆ \n" VT_RST);
this->actor.textId = 0x7002; this->unk_300 = TEXT_STATE_DONE;
this->actionFunc = func_80A5475C; this->actor.textId = 0x7002;
this->actionFunc = func_80A5475C;
} else if (this->unk_30C != 0) {
// "Anything passes"
osSyncPrintf(VT_FGCOL(BLUE) " ☆☆☆☆☆ なんでも通るよ ☆☆☆☆☆ \n" VT_RST);
this->unk_300 = TEXT_STATE_DONE;
this->actor.textId = 0x7099;
this->actionFunc = func_80A5475C;
} else if (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_POCKET_EGG)) {
if (this->unk_30E == 0) {
// "Start under the first sleeve!"
osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆☆☆☆ １回目袖の下開始！ ☆☆☆☆☆ \n" VT_RST);
this->actor.textId = 0x7071;
this->unk_30E = 1;
} else {
// "Start under the second sleeve!"
osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆☆☆☆ ２回目袖の下開始！ ☆☆☆☆☆ \n" VT_RST);
this->actor.textId = 0x7072;
}
this->unk_300 = TEXT_STATE_CHOICE;
this->actionFunc = func_80A5475C;
} else if (this->unk_30C != 0) {
// "Anything passes"
osSyncPrintf(VT_FGCOL(BLUE) " ☆☆☆☆☆ なんでも通るよ ☆☆☆☆☆ \n" VT_RST);
this->unk_300 = TEXT_STATE_DONE;
this->actor.textId = 0x7099;
this->actionFunc = func_80A5475C;
} else if (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_POCKET_EGG)) {
if (this->unk_30E == 0) {
// "Start under the first sleeve!"
osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆☆☆☆ １回目袖の下開始！ ☆☆☆☆☆ \n" VT_RST);
this->actor.textId = 0x7071;
this->unk_30E = 1;
} else { } else {
// "Start under the second sleeve!" // "That's okay"
osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆☆☆☆ ２回目袖の下開始！ ☆☆☆☆☆ \n" VT_RST); osSyncPrintf(VT_FGCOL(CYAN) " ☆☆☆☆☆ それはとおらんよぉ ☆☆☆☆☆ \n" VT_RST);
this->actor.textId = 0x7072; this->unk_300 = TEXT_STATE_DONE;
this->actor.textId = 0x7029;
this->actionFunc = func_80A5475C;
} }
this->unk_300 = TEXT_STATE_CHOICE;
this->actionFunc = func_80A5475C;
} else {
// "That's okay"
osSyncPrintf(VT_FGCOL(CYAN) " ☆☆☆☆☆ それはとおらんよぉ ☆☆☆☆☆ \n" VT_RST);
this->unk_300 = TEXT_STATE_DONE;
this->actor.textId = 0x7029;
this->actionFunc = func_80A5475C;
} }
} }