diff options
| author | Philip Dubé <serprex@users.noreply.github.com> | 2025-06-11 21:38:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-11 14:38:12 -0700 |
| commit | af99ef8e07e5d19f9750b53cbd6024b314a046e3 (patch) | |
| tree | 824c0aef3f87960f117585b60a2c00f4d5e6435b /soh/src/code | |
| parent | dbc2ff09b5bfe845055161e28ca6510649aad3ef (diff) | |
Hookify TreesDropSticks (#5566)
* Hookify TreesDropSticks
* fix off by one
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_en_item00.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c index 040549466..b6bf5ecdf 100644 --- a/soh/src/code/z_en_item00.c +++ b/soh/src/code/z_en_item00.c @@ -4,8 +4,8 @@ #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #include "textures/icon_item_static/icon_item_static.h" #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh/OTRGlobals.h" #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/OTRGlobals.h" #define FLAGS 0 @@ -1536,7 +1536,7 @@ s16 func_8001F404(s16 dropId) { if (LINK_IS_ADULT) { if (dropId == ITEM00_SEEDS) { dropId = ITEM00_ARROWS_SMALL; - } else if ((dropId == ITEM00_STICK) && !(CVarGetInteger(CVAR_ENHANCEMENT("TreesDropSticks"), 0))) { + } else if (GameInteractor_Should(VB_PREVENT_ADULT_STICK, dropId == ITEM00_STICK)) { dropId = ITEM00_RUPEE_GREEN; } } else { |