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

Merge pull request #5776 from A-Green-Spoon/tweak/gerudo-jail-swap

Browse Source 
Prevent hideout guards from asking to throw Link in jail
This commit is contained in:
Malkierian
2025-09-11 08:43:00 -07:00
committed by GitHub
parent f7ab811c20 e9f1296781
commit 524ba26034
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1486,7 +1486,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
break; break;
} }
case VB_GERUDO_GUARD_SET_ACTION_AFTER_TALK: case VB_GERUDO_GUARD_SET_ACTION_AFTER_TALK:
if (gPlayState->msgCtx.choiceIndex == 0) { if (gPlayState->msgCtx.choiceIndex == 0 && gPlayState->sceneNum == SCENE_GERUDOS_FORTRESS) {
EnGe2* enGe2 = va_arg(args, EnGe2*); EnGe2* enGe2 = va_arg(args, EnGe2*);
EnGe2_SetupCapturePlayer(enGe2, gPlayState); EnGe2_SetupCapturePlayer(enGe2, gPlayState);
*should = false; *should = false;

3
soh/soh/OTRGlobals.cpp
View File

@@ -2512,7 +2512,8 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
} else if (textId == TEXT_BIG_POE_COLLECTED_RANDO) { } else if (textId == TEXT_BIG_POE_COLLECTED_RANDO) {
messageEntry = messageEntry =
CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId, MF_AUTO_FORMAT); CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId, MF_AUTO_FORMAT);
} else if (textId == TEXT_GERUDO_GUARD_FRIENDLY && player->talkActor->id == ACTOR_EN_GE2) { } else if (textId == TEXT_GERUDO_GUARD_FRIENDLY && player->talkActor->id == ACTOR_EN_GE2 &&
gPlayState->sceneNum == SCENE_GERUDOS_FORTRESS) {
// TODO_TRANSLATE Translate into french and german // TODO_TRANSLATE Translate into french and german
messageEntry = CustomMessage("Want me to throw you in jail?&\x1B#Yes please&No thanks#", { QM_GREEN }); messageEntry = CustomMessage("Want me to throw you in jail?&\x1B#Yes please&No thanks#", { QM_GREEN });
messageEntry.AutoFormat(); messageEntry.AutoFormat();