From e31b2fd9a4f7eca335638ff733749f1ae6525604 Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Sun, 10 Sep 2023 18:52:46 +0100 Subject: [PATCH] Bunny hood Equip Swap Fix in Scene Transition (#3152) * test? no clue why this section was added * committing to commit the commit --- soh/src/overlays/actors/ovl_player_actor/z_player.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index 89caad5bc..7b45e6f54 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -9687,14 +9687,6 @@ void Player_Init(Actor* thisx, PlayState* play2) { sMaskMemory = PLAYER_MASK_NONE; } this->currentMask = sMaskMemory; - for (uint16_t cSlotIndex = 0; cSlotIndex < ARRAY_COUNT(gSaveContext.equips.cButtonSlots); cSlotIndex++) { - if (gSaveContext.equips.cButtonSlots[cSlotIndex] == SLOT_TRADE_CHILD && - (gItemAgeReqs[gSaveContext.equips.buttonItems[cSlotIndex + 1]] != 9 && LINK_IS_ADULT && - !CVarGetInteger("gTimelessEquipment", 0))) { - gSaveContext.equips.cButtonSlots[cSlotIndex] = SLOT_NONE; - gSaveContext.equips.buttonItems[cSlotIndex + 1] = ITEM_NONE; - } - } } Player_InitCommon(this, play, gPlayerSkelHeaders[((void)0, gSaveContext.linkAge)]); this->giObjectSegment = (void*)(((uintptr_t)ZELDA_ARENA_MALLOC_DEBUG(0x3008) + 8) & ~0xF);