summaryrefslogtreecommitdiff
path: root/soh/src/code
diff options
context:
space:
mode:
authorSirius902 <10891979+Sirius902@users.noreply.github.com>2022-04-17 08:26:49 -0700
committerGitHub <noreply@github.com>2022-04-17 11:26:49 -0400
commitfe6dbd2a5b38e63db5fde84091a68803892cc0f1 (patch)
tree39bbf0ed04d16849826c20939ef1bd79aaa80ddd /soh/src/code
parenta11038f51555aa57e82ae241fc52e3164e937512 (diff)
MM Bunny Hood enhancement (#181)
Allow bunny hood in boss rooms Use math instead of array Allow other masks with enhancement because why not
Diffstat (limited to 'soh/src/code')
-rw-r--r--soh/src/code/z_parameter.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 1653cdaaf..dc96ba133 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -919,7 +919,11 @@ void func_80083108(GlobalContext* globalCtx) {
if (interfaceCtx->restrictions.tradeItems != 0) {
for (i = 1; i < 4; i++) {
- if ((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
+ if ((CVar_GetS32("gMMBunnyHood", 0) != 0)
+ && (gSaveContext.equips.buttonItems[i] >= ITEM_MASK_KEATON)
+ && (gSaveContext.equips.buttonItems[i] <= ITEM_MASK_TRUTH)) {
+ gSaveContext.buttonStatus[i] = BTN_ENABLED;
+ } else if ((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
(gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK)) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
sp28 = 1;