From d7febc01b4e67a8dd35d3c8b0eba4d3096776aa5 Mon Sep 17 00:00:00 2001 From: aMannus Date: Sun, 26 Feb 2023 23:32:00 +0100 Subject: [PATCH] Randomly unequip c-buttons, shield, unequip ocarina on dpad down --- soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c index fe39cea99..ace0d9752 100644 --- a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -1431,6 +1431,22 @@ void func_80A053F0(Actor* thisx, PlayState* play) { } else if (!(this->fairyFlags & 0x80)) { gSaveContext.naviTimer = 0; } + + if (Rand_ZeroOne() < 0.001f) { + player->currentShield = PLAYER_SHIELD_NONE; + } + + if (Rand_ZeroOne() < 0.0001f) { + gSaveContext.equips.buttonItems[1] = gSaveContext.equips.buttonItems[2] = + gSaveContext.equips.buttonItems[3] = ITEM_NONE; + gSaveContext.equips.buttonItems[4] = gSaveContext.equips.buttonItems[5] = + gSaveContext.equips.buttonItems[6] = gSaveContext.equips.buttonItems[7] = ITEM_NONE; + } + + if (gSaveContext.equips.buttonItems[5] == ITEM_OCARINA_FAIRY || + gSaveContext.equips.buttonItems[5] == ITEM_OCARINA_TIME) { + gSaveContext.equips.buttonItems[5] = ITEM_NONE; + } } }