#3200 relevant but not quite the same, if yours gets merged first I'll just remove the equip changes from my script

Conflicts here, otherwise ready to merge

Updated now, hopefully managed to cover all the additions from MS shuffle.

One thing i did change from MS shuffle was a section in z_parameter where instead of reading

gSaveContext.equips.equipment = (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) && 
     gSaveContext.equips.buttonItems[0] == ITEM_NONE) ? 0x1120 :0x1122;

it now reads

gSaveContext.equips.equipment = (EQUIP_VALUE_SWORD_MASTER << (EQUIP_TYPE_SWORD * 4)) |
                                (EQUIP_VALUE_SHIELD_HYLIAN << (EQUIP_TYPE_SHIELD * 4)) |
                                (EQUIP_VALUE_TUNIC_KOKIRI << (EQUIP_TYPE_TUNIC * 4)) |
                                (EQUIP_VALUE_BOOTS_KOKIRI << (EQUIP_TYPE_BOOTS * 4));

if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) && 
    gSaveContext.equips.buttonItems[0] == ITEM_NONE) {
    gSaveContext.equips.equipment &= (u16) ~(0xF << (EQUIP_TYPE_SWORD * 4));
}

effectively doing the vanilla behaviour and then editing the value afterwards only for the master sword shuffle.

i did this because it was just neater to write out this way with the docs

One thing i did change from MS shuffle was a section in z_parameter where instead of reading
effectively doing the vanilla behaviour and then editing the value afterwards only for the master sword shuffle.

i did this because it was just neater to write out this way with the docs

I agree and like this change, especially the part about retaining the vanilla behavior and only applying the rando specific part after it. Helps with readability and keeps the vanilla code as untouched as possible 👍