Skip to content

Masks & Bean restrictions #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Admentus64 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Masks & Bean restrictions #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ typedef struct InterfaceContext {
/* 0x026B */ u8 farores; // "m_wind"
/* 0x026C */ u8 dinsNayrus; // "m_magic"; din's fire and nayru's love
/* 0x026D */ u8 all; // "another"; enables all item restrictions
/* 0x026E */ u8 masks; // "m_mask"
} restrictions;
} InterfaceContext; // size = 0x270

Expand Down
47 changes: 39 additions & 8 deletions src/code/z_parameter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,8 +1079,7 @@ void func_80083108(PlayState* play) {

if (interfaceCtx->restrictions.tradeItems != 0) {
for (i = 1; i < 4; i++) {
if ((gSaveContext.save.info.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
(gSaveContext.save.info.equips.buttonItems[i] <= ITEM_CLAIM_CHECK)) {
if ( (gSaveContext.save.info.equips.buttonItems[i] >= ITEM_WEIRD_EGG && gSaveContext.save.info.equips.buttonItems[i] <= ITEM_ZELDAS_LETTER) || (gSaveContext.save.info.equips.buttonItems[i] >= ITEM_SOLD_OUT && gSaveContext.save.info.equips.buttonItems[i] <= ITEM_CLAIM_CHECK) || gSaveContext.save.info.equips.buttonItems[i] == ITEM_MAGIC_BEAN) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
sp28 = true;
}
Expand All @@ -1089,15 +1088,14 @@ void func_80083108(PlayState* play) {
}
}
for (i=0; i<4; i++)
if (Interface_GetItemFromDpad(i) >= ITEM_WEIRD_EGG && Interface_GetItemFromDpad(i) <= ITEM_CLAIM_CHECK) {
if ( (Interface_GetItemFromDpad(i) >= ITEM_WEIRD_EGG && Interface_GetItemFromDpad(i) <= ITEM_ZELDAS_LETTER) || (Interface_GetItemFromDpad(i) >= ITEM_SOLD_OUT && Interface_GetItemFromDpad(i) <= ITEM_CLAIM_CHECK) || Interface_GetItemFromDpad(i) == ITEM_MAGIC_BEAN) {
if (dpadStatus[i] == BTN_ENABLED)
sp28 = true;
dpadStatus[i] = BTN_DISABLED;
}
} else if (interfaceCtx->restrictions.tradeItems == 0) {
for (i = 1; i < 4; i++) {
if ((gSaveContext.save.info.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
(gSaveContext.save.info.equips.buttonItems[i] <= ITEM_CLAIM_CHECK)) {
if ( (gSaveContext.save.info.equips.buttonItems[i] >= ITEM_WEIRD_EGG && gSaveContext.save.info.equips.buttonItems[i] <= ITEM_ZELDAS_LETTER) || (gSaveContext.save.info.equips.buttonItems[i] >= ITEM_SOLD_OUT && gSaveContext.save.info.equips.buttonItems[i] <= ITEM_CLAIM_CHECK) || gSaveContext.save.info.equips.buttonItems[i] == ITEM_MAGIC_BEAN) {
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
sp28 = true;
}
Expand All @@ -1106,7 +1104,37 @@ void func_80083108(PlayState* play) {
}
}
for (i=0; i<4; i++)
if (Interface_GetItemFromDpad(i) >= ITEM_WEIRD_EGG && Interface_GetItemFromDpad(i) <= ITEM_CLAIM_CHECK) {
if ( (Interface_GetItemFromDpad(i) >= ITEM_WEIRD_EGG && Interface_GetItemFromDpad(i) <= ITEM_ZELDAS_LETTER) || (Interface_GetItemFromDpad(i) >= ITEM_SOLD_OUT && Interface_GetItemFromDpad(i) <= ITEM_CLAIM_CHECK) || Interface_GetItemFromDpad(i) == ITEM_MAGIC_BEAN) {
if (dpadStatus[i] == BTN_DISABLED)
sp28 = true;
dpadStatus[i] = BTN_ENABLED;
}
}

if (interfaceCtx->restrictions.masks != 0) {
for (i = 1; i < 4; i++) {
if (gSaveContext.save.info.equips.buttonItems[i] >= ITEM_MASK_KEATON && gSaveContext.save.info.equips.buttonItems[i] <= ITEM_MASK_TRUTH) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED)
sp28 = true;
gSaveContext.buttonStatus[i] = BTN_DISABLED;
}
}
for (i=0; i<4; i++)
if (Interface_GetItemFromDpad(i) >= ITEM_MASK_KEATON && Interface_GetItemFromDpad(i) <= ITEM_MASK_TRUTH) {
if (dpadStatus[i] == BTN_ENABLED)
sp28 = true;
dpadStatus[i] = BTN_DISABLED;
}
} else if (interfaceCtx->restrictions.masks == 0) {
for (i = 1; i < 4; i++) {
if (gSaveContext.save.info.equips.buttonItems[i] >= ITEM_MASK_KEATON && gSaveContext.save.info.equips.buttonItems[i] <= ITEM_MASK_TRUTH) {
if (gSaveContext.buttonStatus[i] == BTN_DISABLED)
sp28 = true;
gSaveContext.buttonStatus[i] = BTN_ENABLED;
}
}
for (i=0; i<4; i++)
if (Interface_GetItemFromDpad(i) >= ITEM_MASK_KEATON && Interface_GetItemFromDpad(i) <= ITEM_MASK_TRUTH) {
if (dpadStatus[i] == BTN_DISABLED)
sp28 = true;
dpadStatus[i] = BTN_ENABLED;
Expand Down Expand Up @@ -1303,6 +1331,7 @@ void func_80083108(PlayState* play) {
(gSaveContext.save.info.equips.buttonItems[i] != ITEM_NAYRUS_LOVE) &&
(gSaveContext.save.info.equips.buttonItems[i] != ITEM_OCARINA_FAIRY) &&
(gSaveContext.save.info.equips.buttonItems[i] != ITEM_OCARINA_OF_TIME) &&
(gSaveContext.save.info.equips.buttonItems[i] != ITEM_MAGIC_BEAN) &&
!((gSaveContext.save.info.equips.buttonItems[i] >= ITEM_BOTTLE_EMPTY) &&
(gSaveContext.save.info.equips.buttonItems[i] <= ITEM_BOTTLE_POE)) &&
!((gSaveContext.save.info.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
Expand Down Expand Up @@ -1354,6 +1383,7 @@ void Interface_SetSceneRestrictions(PlayState* play) {
interfaceCtx->restrictions.ocarina = 0;
interfaceCtx->restrictions.hookshot = 0;
interfaceCtx->restrictions.tradeItems = 0;
interfaceCtx->restrictions.masks = 0;
interfaceCtx->restrictions.bottles = 0;
interfaceCtx->restrictions.aButton = 0;
interfaceCtx->restrictions.bButton = 0;
Expand All @@ -1370,7 +1400,8 @@ void Interface_SetSceneRestrictions(PlayState* play) {
interfaceCtx->restrictions.bButton = (sRestrictionFlags[i].flags1 & 0x30) >> 4;
interfaceCtx->restrictions.aButton = (sRestrictionFlags[i].flags1 & 0x0C) >> 2;
interfaceCtx->restrictions.bottles = (sRestrictionFlags[i].flags1 & 0x03) >> 0;
interfaceCtx->restrictions.tradeItems = (sRestrictionFlags[i].flags2 & 0xC0) >> 6;
interfaceCtx->restrictions.tradeItems = (sRestrictionFlags[i].flags2 & 0x40) != 0;
interfaceCtx->restrictions.masks = (sRestrictionFlags[i].flags2 & 0x80) != 0;
interfaceCtx->restrictions.hookshot = (sRestrictionFlags[i].flags2 & 0x30) >> 4;
interfaceCtx->restrictions.ocarina = (sRestrictionFlags[i].flags2 & 0x0C) >> 2;
interfaceCtx->restrictions.warpSongs = (sRestrictionFlags[i].flags2 & 0x03) >> 0;
Expand All @@ -1397,7 +1428,7 @@ void Interface_SetSceneRestrictions(PlayState* play) {
i++;
} while (sRestrictionFlags[i].sceneId != 0xFF);

if (!interfaceCtx->restrictions.tradeItems)
if (interfaceCtx->restrictions.masks == 0)
GET_PLAYER(play)->currentMask = GET_MASK_AGE();
}

Expand Down