summaryrefslogtreecommitdiff
path: root/soh/src/code
diff options
context:
space:
mode:
authorinspectredc <78732756+inspectredc@users.noreply.github.com>2023-10-16 00:10:24 +0100
committerGitHub <noreply@github.com>2023-10-15 18:10:24 -0500
commitfe90ad0268efbe78fbd73b5567a35563339aa94f (patch)
treefe73fb2ffc27b1c2d17f75bdcb7bee6c70e4a3bb /soh/src/code
parent3ed976e6af694f4b67ecda6bc1cd2acdb137385e (diff)
MM Bunny Hood effect separated from ability to equip as adult (#3253)
* adult separator * use cross instead of checkmark Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * suggested load fix --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
Diffstat (limited to 'soh/src/code')
-rw-r--r--soh/src/code/z_play.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index dfafbb7ff..fb4628834 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -653,7 +653,7 @@ void Play_Init(GameState* thisx) {
Fault_AddClient(&D_801614B8, ZeldaArena_Display, NULL, NULL);
// In order to keep bunny hood equipped on first load, we need to pre-set the age reqs for the item and slot
- if (CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA || CVarGetInteger("gTimelessEquipment", 0)) {
+ if ((CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA && CVarGetInteger("gAdultBunnyHood", 0)) || CVarGetInteger("gTimelessEquipment", 0)) {
gItemAgeReqs[ITEM_MASK_BUNNY] = 9;
if(INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_MASK_BUNNY)
gSlotAgeReqs[SLOT_TRADE_CHILD] = 9;