Rando: More Misc. Hints (#2930)
* commit constipation * fix inconsistencies between 3d and soh settings * Add RSK check for Saria; Sheik now tells you other reqs for ganon * Translations (thanks Purple and Timmy_GamerNepgear); Retain Saria's "face-to-face" text in rando if you're too close * fix scene renames for sheik * whoops * Undo LA hint setting erasure from conflict * Clarified Sheik text IDs; Clarified final frogs hint * Fixed Sheik text ID assignment; Fixed Saria's messages in `OTRGlobals` * Added hint locs for sheik and saria * Set up hook for Sheik spawn; Sheik no longer cheats with room transitions; Enforced text IDs on saria msg function * Set up hook for Sheik spawn; Sheik no longer cheats with room transitions; Enforced text IDs on saria msg function * Update soh/soh/SaveManager.cpp Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * nice.gif Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * got ahead of myself * Conquered and divided; simplified stuff * nitpicking Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * the little things i stg --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
This commit is contained in:
@@ -155,6 +155,9 @@ u16 ElfMessage_GetSariaText(PlayState* play) {
|
||||
|
||||
if (!LINK_IS_ADULT) {
|
||||
if (Actor_FindNearby(play, &player->actor, ACTOR_EN_SA, 4, 800.0f) == NULL) {
|
||||
if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
|
||||
return 0x161;
|
||||
}
|
||||
msgs = sChildSariaMsgs;
|
||||
} else {
|
||||
return 0x0160; // Special text about Saria preferring to talk to you face-to-face
|
||||
|
||||
Reference in New Issue
Block a user