diff options
Diffstat (limited to 'src/code/code_8012EC80.c')
| -rw-r--r-- | src/code/code_8012EC80.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c index feec42940..084e91872 100644 --- a/src/code/code_8012EC80.c +++ b/src/code/code_8012EC80.c @@ -177,19 +177,18 @@ u16 gScenesPerRegion[11][27] = { s32 func_8012EC80(GlobalContext* globalCtx) { if (gSaveContext.buttonStatus[0] == BTN_DISABLED) { - return 0xFF; - } else if (gSaveContext.unk_1015 == 0xFF) { - return 0xFF; - } else if (gSaveContext.equips.buttonItems[((gSaveContext.playerForm == 4) ? 0 : gSaveContext.playerForm)][0] == - 0xFF) { + return ITEM_NONE; + } else if (gSaveContext.unk_1015 == ITEM_NONE) { + return ITEM_NONE; + } else if (CUR_FORM_EQUIP(EQUIP_SLOT_B) == ITEM_NONE) { if (globalCtx->interfaceCtx.unk_21C != 0) { if (globalCtx->interfaceCtx.unk_21E != 0) { return globalCtx->interfaceCtx.unk_21E; } } - return 0xFF; + return ITEM_NONE; } else { - return gSaveContext.equips.buttonItems[((gSaveContext.playerForm == 4) ? 0 : gSaveContext.playerForm)][0]; + return CUR_FORM_EQUIP(EQUIP_SLOT_B); } } |