Rando: Zelda sequence fixes #966

aMannus · 2022-07-28T10:03:57Z

Resolves #749

Changes made in this PR:

Skip Child Stealth is set to false when Skip Child Zelda is on, making Skip Child Stealth appear as off in the spoiler log when Skip Child Zelda is on.
Changed Child Stealth Skip to only trigger when Zelda has not been met yet.
Added flag to Skip Child Zelda option that reflects receiving Zelda's letter.
Changed conditionals used for deciding wether the guards should block Link's path after the crawlspace or not.

As a summary, this is the behaviour after these changes:

Vanilla game: Guards do not block the way even after meeting zelda, and will only block the way after the "Ocarina thrown into moat" cutscene has played. This didn't change and is vanilla behaviour.
Rando, only Skip Child Stealth enabled: Player will be placed at Zelda's Courtyard after going through the crawlspace. Trying this again when Zelda has already been met doesn't skip to Zelda's courtyard and Link is stopped by the guards instead. Guards will not stop Link when only the Ocarina in moat cutscene has been triggered, but Zelda hasn't been met.
Rando, only Skip Child Zelda is selected: Guards will immediately stop the player after going through the crawlspace.
Rando, both Skip Child Zelda and Skip Child Stealth are enabled: Player is immediately stopped by the guards, Skip Child Stealth shows up in spoiler log as not enabled.

All these scenarios have been tested ingame and confirmed working as stated above.

I hope it's not too confusing for someone else to review this. If anyone has any questions, please ask them.

briaguya-ai

i think the logic here looks solid, but there are a couple little things that'd be good to clean up before merging

briaguya-ai · 2022-08-01T04:39:52Z

soh/src/code/z_play.c

+    // eventChkInf[4] & 1 = Got Zelda's Letter
+    // eventChkInf[5] & 0x200 = Got Impa's reward
+    if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SKIP_CHILD_STEALTH) &&
+        !(gSaveContext.eventChkInf[4] & 1) && !(gSaveContext.eventChkInf[5] & 0x200)) {


might be nice to add a little more context to the rest of this if block via comments explaining what's happening

all of this makes me think it'd be awesome to replace all the entrance index magic numbers with nice names in an enum or something but for now just adding some comments here would go a long way

I'm going to be honest, I don't really know what the entrance values here are either, I just changed the conditional to trigger them. Do you happen to remember how this part worked, or do you want me to dive in and find out?

I don't remember off the top of my head, I can look into it later if you don't have time to dive in

briaguya-ai · 2022-08-01T04:41:37Z

soh/src/code/z_sram.c

@@ -790,6 +790,9 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) {
            gSaveContext.eventChkInf[1] |= (1 << 3);
            gSaveContext.eventChkInf[1] |= (1 << 4);

+            // Got Zelda's Letter
+            gSaveContext.eventChkInf[4] |= 1;


we're already doing this later with // make sure saria is at SFM (probably worth just updating that comment to explain that it's also the got zelda's letter flag. i'd probably change it to

// Set "Got Zelda's Letter" flag (also ensures saria is at SFM and TODO: what else does this flag do?)

I totally missed that. I'll change this.

briaguya-ai · 2022-08-01T04:51:00Z

soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c

+    // Rando'd but not met Zelda yet
+    bool randoNotMetZelda =
+        (gSaveContext.n64ddFlag) && !(gSaveContext.eventChkInf[5] & 0x200) && !(gSaveContext.eventChkInf[4] & 1);
+    // Rando'd and already met Zelda
+    bool randoMetZelda = (gSaveContext.n64ddFlag) && (gSaveContext.eventChkInf[5] & 0x200) && (gSaveContext.eventChkInf[4] & 1);


not sure how i feel about these

i get the desire to clean up the if statements, but i think combining the rando check and the met zelda check may be going a little too far

i also don't like there being 2 of them, i think ideally we'd have

if ((!rando && non-rando-logic) || (rando && !metZelda)) {

and

if((!rando && non-rando-logic) || (rando && metZelda)) {

I went back and forth quite a few times on how to handle this myself. I'll change it to what you suggested though, looks better than what I was doing.

Kenix3 · 2022-08-03T03:49:36Z

Any rando features for Zhora should go to rando-next rather than Zhora.

aMannus · 2022-08-03T07:11:16Z

Any rando features for Zhora should go to rando-next rather than Zhora.

This is a bugfix, not a new feature.

briaguya-ai · 2022-08-04T04:05:26Z

soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c

+    // eventChkInf[4] & 1 = Got Zelda's Letter
+    // eventChkInf[5] & 0x200 = Got item from impa
+    // eventChkInf[8] & 1 = Ocarina thrown in moat
+    bool rando = gSaveContext.n64ddFlag;


having this as a variable here isn't a good idea imo, if we want to move away from having n64ddflag used we should clean it up everywhere instead

That's fair, I'll change it back. That said, it might be an idea to make a helper function called Randomizer_IsActive() in the future that replaces all the n64dd flags to improve readability and make the n64dd flag less obscure. Not for this PR obviously but yeah.

briaguya-ai · 2022-08-04T05:14:47Z

This is a bugfix

so it should be pointed to rachael

aMannus · 2022-08-04T08:12:45Z

This is a bugfix

so it should be pointed to rachael

That's fair. I might have to make a new PR again because rebasing to rachael-develop has not worked well for me so far. I'll do that once I adressed the remaining open review comments.

aMannus · 2022-08-08T09:01:40Z

Closing because of rebasing being nearly impossible, new PR here: #1095

New PR also adressed everything from the review comments in this PR.

aMannus added 2 commits July 28, 2022 11:38

Fixed zelda sequence oddities

c990868

Fixed code inconsistency

980d559

briaguya-ai requested changes Aug 1, 2022

View reviewed changes

Adressed review comments

6a5429d

briaguya-ai reviewed Aug 4, 2022

View reviewed changes

aMannus closed this Aug 8, 2022

aMannus deleted the rando-zelda-sequence-fixes branch August 13, 2022 05:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rando: Zelda sequence fixes #966

Rando: Zelda sequence fixes #966

aMannus commented Jul 28, 2022 •

edited

Loading

briaguya-ai left a comment

briaguya-ai Aug 1, 2022

aMannus Aug 1, 2022

briaguya-ai Aug 1, 2022

briaguya-ai Aug 1, 2022

aMannus Aug 1, 2022

briaguya-ai Aug 1, 2022

aMannus Aug 1, 2022

Kenix3 commented Aug 3, 2022

aMannus commented Aug 3, 2022

briaguya-ai Aug 4, 2022

aMannus Aug 4, 2022

briaguya-ai commented Aug 4, 2022

aMannus commented Aug 4, 2022

aMannus commented Aug 8, 2022 •

edited

Loading

Rando: Zelda sequence fixes #966

Rando: Zelda sequence fixes #966

Conversation

aMannus commented Jul 28, 2022 • edited Loading

briaguya-ai left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Kenix3 commented Aug 3, 2022

aMannus commented Aug 3, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

briaguya-ai commented Aug 4, 2022

aMannus commented Aug 4, 2022

aMannus commented Aug 8, 2022 • edited Loading

aMannus commented Jul 28, 2022 •

edited

Loading

aMannus commented Aug 8, 2022 •

edited

Loading