Rando: Master Sword Shuffle #2981

stratomaster64 · 2023-06-11T22:58:04Z

Adds the Master Sword to the item pool, requiring Adult Link to be more creative in his offensive strategies until he finds it.
Because of this:

Sheik/Ganondorf will give you hints on where the Master Sword may be located.
Logic is updated to reflect new requirements.
If you manage to get to Ganon's boss fight without MS, the fight will not give it to you (which fixes a vanilla bug).
Swordless Link oddities have also been addressed.

Build Artifacts

stratomaster64 · 2023-06-12T00:43:37Z

Known issues so far:

Spoiler log doesn't see Master Sword as an item required to beat the game (for Ganon) and still assume you obtain the Master Sword by turning adult.
Two "Master Sword" entries are placed into the world, expected only one.
- Actually obtaining the Master Sword at these locations will present itself as a different item entirely (due to the GetItem enum for Master Sword). Removing the errant enum results in the "Master Sword" looking like a BGS (expected), but not actually giving the sword itself, instead giving bombs on the item slot.
Although starting as Adult Link correctly leaves you swordless until you obtain a sword, starting as child and turning adult still gives you the Master Sword.

"Master Sword" Items now actually give MS

updated GIMESSAGE (should stop crashing on non-Windows); re-added MS in item list

cihld -> adult no longer gives MS; ToT Master Sword now gives correct item

Add Master Sword GI draw func based on ToT MS object

Archez

Looking good so far. I've skipped over the locacc_xxx logic for now, hoping others can chime in there.

Something else that stands out, you most likely need to make changes in z_boss_ganon2 to prevent the player from getting a free MS sword. Could probably "kill" the spawned sword, or something.

soh/soh/Enhancements/randomizer/3drando/logic.cpp

soh/soh/Enhancements/randomizer/3drando/item_pool.cpp

soh/src/code/z_parameter.c

soh/src/code/z_sram.c

soh/src/code/z_parameter.c

Check Tracker changes; Gave RAND_INF and ice trap logic to ToT MS check; Fixed swordless behavior for HBA/fishing

inspectredc · 2023-06-14T02:33:31Z

We might want something along the lines of

if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) && gSaveContext.equips.buttonItems[0] == ITEM_NONE) {
    gSaveContext.equips.equipment = 0x1120;
} else {
    gSaveContext.equips.equipment = 0x1122;
}

where this section is

Shipwright/soh/src/code/z_parameter.c

Line 1440 in 778bf5a

gSaveContext.equips.equipment = 0x1122;

I think what this does is stops the master sword slot from being highlighted in the pause menu but please double check

stratomaster64 · 2023-06-14T17:44:07Z

We might want something along the lines of
if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) && gSaveContext.equips.buttonItems[0] == ITEM_NONE) {
    gSaveContext.equips.equipment = 0x1120;
} else {
    gSaveContext.equips.equipment = 0x1122;
}
where this section is

Shipwright/soh/src/code/z_parameter.c

Line 1440 in 778bf5a

gSaveContext.equips.equipment = 0x1122;

I think what this does is stops the master sword slot from being highlighted in the pause menu but please double check

Works as expected, will include in the next commit. Thanks!

Visual bug where box hovers over non-existent MS gone; Fixed RAND_INF check with ToT MS pedestal; Ganon no longer gives free MS

soh/src/code/z_parameter.c

stratomaster64 · 2023-06-15T04:19:24Z

@inspectredc Could you also look into the location access logic files to confirm that everything makes sense there? I mostly copied off 3d rando changes for their MS shuffle, except where you already modified logic for tricks.

inspectredc · 2023-06-15T04:55:31Z

@inspectredc Could you also look into the location access logic files to confirm that everything makes sense there? I mostly copied off 3d rando changes for their MS shuffle, except where you already modified logic for tricks.

Yeah will do that today 👍🏼

inspectredc

Few changes here, I realised when suggesting the hammer gold skull changes that it's definitely outside the scope of this PR to address those so feel free to not change them.

Mostly just adding some kokiri sword as adult checks here and there. If not hopefully I've left enough comments or it's clear enough as is

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp

Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>

getting master sword no longer highlights box

soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c

Pepe20129

Did a few randos and everything was functional; the only things I'd say are that when turning into adult, link visually pulls out the master sword and then stashes it away even if you don't have it, if it's possible I think it'd be better if either the sword was invisible or the animation was changed to another one (standing for example) and that in the ganon fight something similar happens where link visually takes out the sword even if you don't have it before ganon knocks it away

Those are just minor nitpicks tho and I think this is perfectly fine to merge

soh/soh/Enhancements/randomizer/randomizer.cpp

Archez

Looking good so far, very close to the finish line! I have provided a few more suggestions/fixes below.

Other than that, the only thing that still has me uneasy is all the swordless management, especially knowing there is still some issues with it regarding Epona. At the moment, I don't really have an idea on how to address that, so may just need to think on that for a bit.

soh/src/overlays/actors/ovl_player_actor/z_player.c

soh/src/code/z_play.c

Malkierian · 2023-10-11T03:54:58Z

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp

-                  EventAccess(&NutPot,           {[]{return NutPot || ((LogicSpiritTrialHookshot || CanUse(HOOKSHOT)) && HasBombchus && Bow && (MirrorShield || (SunlightArrows && CanUse(LIGHT_ARROWS))) && IsAdult);}}),
-                  EventAccess(&SpiritTrialClear, {[]{return CanUse(LIGHT_ARROWS)  && (MirrorShield || SunlightArrows) && HasBombchus && (LogicSpiritTrialHookshot || CanUse(HOOKSHOT));}}),
+                  EventAccess(&NutPot,           {[]{return NutPot || (((LogicSpiritTrialHookshot && CanJumpslash) || CanUse(HOOKSHOT)) && HasBombchus && CanUse(BOW) && (CanUse(MIRROR_SHIELD) || (SunlightArrows && CanUse(LIGHT_ARROWS))));}}),
+                  EventAccess(&SpiritTrialClear, {[]{return CanUse(LIGHT_ARROWS) && (CanUse(MIRROR_SHIELD) || SunlightArrows) && HasBombchus && ((LogicSpiritTrialHookshot && CanJumpslash) || CanUse(HOOKSHOT));}}),
                }, {
                  //Locations
                  LocationAccess(GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, {[]{return LogicSpiritTrialHookshot || CanUse(HOOKSHOT);}}),


So unless you can hit this thing's crystal switch with the hookshot, you might need to include logic conditions for having a sword as adult. I think it assumes right now that being able to use hookshot also means you have a sword, since you'd be adult, and a spin attack will hit it through the wall.

yeah the line would need to be
LocationAccess(GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, {[]{return (LogicSpiritTrialHookshot || CanUse(HOOKSHOT)) && CanJumpslash;}}),
I imagine

* better swordless handling with temp B * prevent auto save in fishing pond * prevent auto save during bombchu bowling

Archez · 2023-10-14T01:44:58Z

Copying description from stratomaster64#11 for visibility/history

This PR includes improvements for swordless state handling during minigames/epona by hijacking tempB with a "marker" value to allow us to restore the B button as empty without "disabling" the B button in the HUD. This should resolve all remaining issues with the HUD.
This also resolves child not having slingshot on B during child archery when swordless.

Additionally, an old swordless hack for child fishing can be removed in favor of the new handling, which should remove any possible cases that a kokiri sword is accidentally given to the player. This required preventing auto save in the fishing pond to avoid the fishing rod on B being saved to file.

A similar auto save restriction for bombchu bowling was needed. Shooting gallery did not have issues with auto save though.

The following scenarios have been tested:

Riding Epona without a sword or bow
Riding Epona with a sword but no bow
Riding Epona without a sword but with a bow
Pausing while on Epona
Saving while on Epona
Fishing as child or adult without a sword
Pausing while fishing
Saving while fishing
Game over while fishing
Playing shooting gallery as child or adult without a sword
Game over during shooting gallery
Playing bombchu bowling without a sword
Game over during bomchu bowling

Behind the scenes, rather than storing ITEM_NONE which is the same as BTN_DISABLED (255), I've elected to store ITEM_NONE_FE (254) so that we have a marker to know that we were swordless before and it doesn't dim/disabled the B button like (255) does.

garrettjoecox

Bravo. I know this one sat in the oven for a while but it's turned out great and playtested quite a lot.

As discussed in the discord we need to swap the instances of 0x72 for 0xE0, but assuming that is complete dropping an approval 👍

Archez

Beautiful! So excited to have this in. Thanks for working through the feedback.

If you get a chance, it would be nice to have something in the PR description listing roughly what was done for historical purposes, but not a blocker for merge 👍

The mother of all commits

a65f141

stratomaster64 requested review from inspectredc and Archez June 11, 2023 22:58

stratomaster64 and others added 6 commits June 11, 2023 21:07

Removed GI_SWORD_MASTER;

a2dbdd3

"Master Sword" Items now actually give MS

Removed dupe MS entries in item pool;

677a0a4

updated GIMESSAGE (should stop crashing on non-Windows); re-added MS in item list

Give Adult Link a freebie with shuffle MS on;

6775ba9

cihld -> adult no longer gives MS; ToT Master Sword now gives correct item

add master sword GI draw func based on ToT MS object

b3f0579

Merge pull request #8 from Archez/master-sword-gi-draw

88c8e7e

Add Master Sword GI draw func based on ToT MS object

Force MasterSword logic var to only update upon getting MS

7cb1ccc

stratomaster64 marked this pull request as ready for review June 12, 2023 23:09

Dorf funny line now activates with LA and MS in inv

4ee5d66

Archez requested changes Jun 13, 2023

View reviewed changes

garrettjoecox added this to the MacReady milestone Jun 13, 2023

Apply suggestions

778bf5a

inspectredc reviewed Jun 14, 2023

View reviewed changes

soh/src/code/z_parameter.c Outdated Show resolved Hide resolved

Updated RAND_INF;

5ff88c7

Check Tracker changes; Gave RAND_INF and ice trap logic to ToT MS check; Fixed swordless behavior for HBA/fishing

Merge branch 'HarbourMasters:develop' into mister-sword

0012f4b

ToT MS Check now works in check tracker;

b848eb9

Visual bug where box hovers over non-existent MS gone; Fixed RAND_INF check with ToT MS pedestal; Ganon no longer gives free MS

inspectredc reviewed Jun 14, 2023

View reviewed changes

soh/src/code/z_parameter.c Outdated Show resolved Hide resolved

inspectredc reviewed Jun 15, 2023

View reviewed changes

soh/src/code/z_parameter.c Outdated Show resolved Hide resolved

stratomaster64 and others added 2 commits June 15, 2023 00:14

adult equips no longer reset in MS shuffle

9a56086

Merge branch 'HarbourMasters:develop' into mister-sword

af1761d

inspectredc suggested changes Jun 15, 2023

View reviewed changes

stratomaster64 and others added 2 commits June 15, 2023 17:41

Apply (most) locacc review suggestions

f272589

Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>

Reorganized swordless check for interface to fit edge cases;

1c74cf4

getting master sword no longer highlights box

stratomaster64 and others added 11 commits September 17, 2023 00:34

Fixed build errors (hopefully)

4110667

Merge branch 'develop' into mister-sword

dc73dfb

Merge branch 'develop' into mister-sword

14cee45

Cleanup merge

8b9299d

get shit working again

f1d5a18

Merge branch 'develop' into mister-sword

da616eb

Tidied up remaining uses of DD flag as rando indicator

a0d897f

make master sword invisible and fix ms flag (#10)

c3ecfc8

Add text to sheik if go mode is obtained but barrier is still up

8147b1f

overhaul swordless behavior in func_80083108

e7f68de

reworked ToT MS Check to have an actual GI

a838fb9

Archez reviewed Oct 3, 2023

View reviewed changes

soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c Outdated Show resolved Hide resolved

Archez reviewed Oct 3, 2023

View reviewed changes

soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c Outdated Show resolved Hide resolved

stratomaster64 and others added 2 commits October 3, 2023 22:57

suggestions

0de9f5d

Merge branch 'develop' into mister-sword

d8def23

Pepe20129 approved these changes Oct 7, 2023

View reviewed changes

soh/soh/Enhancements/randomizer/randomizer.cpp Show resolved Hide resolved

stratomaster64 requested a review from garrettjoecox October 9, 2023 22:12

Archez reviewed Oct 11, 2023

View reviewed changes

soh/src/overlays/actors/ovl_player_actor/z_player.c Outdated Show resolved Hide resolved

soh/src/code/z_play.c Outdated Show resolved Hide resolved

Malkierian reviewed Oct 11, 2023

View reviewed changes

stratomaster64 and others added 3 commits October 11, 2023 19:24

Apply suggestions

05b9c12

Merge branch 'HarbourMasters:develop' into mister-sword

a281280

Better swordless handling with temp B (#11)

f23f39d

* better swordless handling with temp B * prevent auto save in fishing pond * prevent auto save during bombchu bowling

garrettjoecox approved these changes Oct 15, 2023

View reviewed changes

stratomaster64 and others added 2 commits October 16, 2023 17:59

enum fix

5616436

Merge branch 'develop' into mister-sword

f8f79b1

Archez approved these changes Oct 18, 2023

View reviewed changes

garrettjoecox merged commit 2eaed8d into HarbourMasters:develop Oct 22, 2023
8 checks passed

stratomaster64 deleted the mister-sword branch November 8, 2023 02:14

Archez mentioned this pull request Nov 29, 2023

Dying as young link in fishing minigame gives link fake kokiri sword. (Randomizer only) #2563

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rando: Master Sword Shuffle #2981

Rando: Master Sword Shuffle #2981

stratomaster64 commented Jun 11, 2023 •

edited

Loading

stratomaster64 commented Jun 12, 2023 •

edited

Loading

Archez left a comment

inspectredc commented Jun 14, 2023

stratomaster64 commented Jun 14, 2023

stratomaster64 commented Jun 15, 2023

inspectredc commented Jun 15, 2023

inspectredc left a comment

Pepe20129 left a comment •

edited

Loading

Archez left a comment

Malkierian Oct 11, 2023 •

edited

Loading

inspectredc Oct 11, 2023

Archez commented Oct 14, 2023

garrettjoecox left a comment

Archez left a comment

Rando: Master Sword Shuffle #2981

Rando: Master Sword Shuffle #2981

Conversation

stratomaster64 commented Jun 11, 2023 • edited Loading

Build Artifacts

stratomaster64 commented Jun 12, 2023 • edited Loading

Archez left a comment

Choose a reason for hiding this comment

inspectredc commented Jun 14, 2023

stratomaster64 commented Jun 14, 2023

stratomaster64 commented Jun 15, 2023

inspectredc commented Jun 15, 2023

inspectredc left a comment

Choose a reason for hiding this comment

Pepe20129 left a comment • edited Loading

Choose a reason for hiding this comment

Archez left a comment

Choose a reason for hiding this comment

Malkierian Oct 11, 2023 • edited Loading

Choose a reason for hiding this comment

inspectredc Oct 11, 2023

Choose a reason for hiding this comment

Archez commented Oct 14, 2023

garrettjoecox left a comment

Choose a reason for hiding this comment

Archez left a comment

Choose a reason for hiding this comment

stratomaster64 commented Jun 11, 2023 •

edited

Loading

stratomaster64 commented Jun 12, 2023 •

edited

Loading

Pepe20129 left a comment •

edited

Loading

Malkierian Oct 11, 2023 •

edited

Loading