From f3c811d29865e9445341fc3300a107b9e686e608 Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Thu, 30 Mar 2023 20:26:35 +1100 Subject: `z_parameter`: Buttons (part 9) (#1192) * import button docs * cleanup * sync timer val * add flag comments * Update src/code/z_parameter.c Co-authored-by: Derek Hensley * Update src/code/z_parameter.c Co-authored-by: Derek Hensley * Update src/code/z_parameter.c Co-authored-by: Derek Hensley * fix merge master --------- Co-authored-by: Derek Hensley --- src/code/code_8012EC80.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/code/code_8012EC80.c') diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c index fb6f0743d..d120da618 100644 --- a/src/code/code_8012EC80.c +++ b/src/code/code_8012EC80.c @@ -474,7 +474,7 @@ u16 gSceneIdsPerRegion[REGION_MAX][27] = { s32 Inventory_GetBtnBItem(PlayState* play) { if (gSaveContext.buttonStatus[0] == BTN_DISABLED) { return ITEM_NONE; - } else if (gSaveContext.unk_1015 == ITEM_NONE) { + } else if (gSaveContext.bButtonStatus == BTN_DISABLED) { return ITEM_NONE; } else if (CUR_FORM_EQUIP(EQUIP_SLOT_B) == ITEM_NONE) { if (play->interfaceCtx.unk_21C != 0) { -- cgit v1.2.3