mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bunny hood Equip Swap Fix in Scene Transition (#3152) 

* test?

no clue why this section was added

* committing to commit the commit
This commit is contained in:
inspectredc 2023-09-10 18:52:46 +01:00 committed by GitHub
parent 3d0075e6ef
commit e31b2fd9a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -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);