diff options
| author | inspectredc <78732756+inspectredc@users.noreply.github.com> | 2023-10-21 00:40:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-20 18:40:10 -0500 |
| commit | e6445e0ce3b71c4db2e3a177054cffee1d3c5930 (patch) | |
| tree | 3fef6624342b7f27ec747eb8a75e69e19569170d /soh/src/code | |
| parent | 35b4357776cec4d042359a6787dad59744e4cd88 (diff) | |
Age Requirement Docs (#3277)
* age req docs
* move macros
* use decomp names
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_play.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index 3181b741c..817c90ecf 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -9,6 +9,7 @@ #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/randomizer/randomizer_entrance.h" #include <overlays/actors/ovl_En_Niw/z_en_niw.h> +#include <overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h> #include "soh/Enhancements/enhancementTypes.h" #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" @@ -654,12 +655,12 @@ 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("gAdultBunnyHood", 0)) || CVarGetInteger("gTimelessEquipment", 0)) { - gItemAgeReqs[ITEM_MASK_BUNNY] = 9; + gItemAgeReqs[ITEM_MASK_BUNNY] = AGE_REQ_NONE; if(INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_MASK_BUNNY) - gSlotAgeReqs[SLOT_TRADE_CHILD] = 9; + gSlotAgeReqs[SLOT_TRADE_CHILD] = AGE_REQ_NONE; } else { - gItemAgeReqs[ITEM_MASK_BUNNY] = gSlotAgeReqs[SLOT_TRADE_CHILD] = 1; + gItemAgeReqs[ITEM_MASK_BUNNY] = gSlotAgeReqs[SLOT_TRADE_CHILD] = AGE_REQ_CHILD; } func_800304DC(play, &play->actorCtx, play->linkActorEntry); |