diff options
| author | Maide <34639600+Kelebek1@users.noreply.github.com> | 2021-09-02 16:27:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-02 11:27:26 -0400 |
| commit | 1f4973d9b4fbb39b01bf2e60564991c19dad2f1e (patch) | |
| tree | cf51a229bfd9e06427946b71ab4a1a65379a266d /src/code/code_8012EC80.c | |
| parent | b3816cd26bd4a58a5ee4a8f822f3c46a9e7c91d4 (diff) | |
En_Kgy (#244)
* En_Kgy
* NBS
* PR
* PR
* PR
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); } } |