diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2022-07-11 23:43:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-11 23:43:46 -0400 |
| commit | 87506f7c1979c4dea1e1a99e3d7ba80f5ec289f0 (patch) | |
| tree | d57a7bc22be8ee8b782bb566e4ef5e5454236228 /src/code/code_8012EC80.c | |
| parent | cd5de59431cb50ad4111298a66d5916c7874fd07 (diff) | |
`z_player_lib`: Part 1 (#688)
* fix some symbols and file splits
* PLAYER_STATE macros
* Move over a few functions
* AP functions and update struct
* another small bunch
* Add player_lib prototypes
* A few more functions
* Some fixes and add stuff to actorfixer
* format
* bss
* Elliptic's review
* Engineer's review
* Some renames and cleanups
* bss
* A bit of cleaning up
* Player_DrawZoraShield
* format
* actorfixer, bss and format
* Forgot to merge master again
* Rename some LinkGoron dlists
* PlayerMeleeWeaponAnimation enum
* format
* actorfixer, bss and format
* more bss
* actorfixer
* format
* actorfixer and format
* bss
* Update src/code/z_player_lib.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* sEnvironmentTextTriggers
* Update include/z64save.h
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/code/z_player_lib.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/code/z_player_lib.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/code/z_player_lib.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* breman mask march comment
* fix
* fixes
* bss
* RESPAWN_MODE_RETURN
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* format
* Engineer's review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_player_lib.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update include/z64player.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* format
* unused mwas
* fixes
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Diffstat (limited to 'src/code/code_8012EC80.c')
| -rw-r--r-- | src/code/code_8012EC80.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c index ea3c30aa6..e7ff5b7bf 100644 --- a/src/code/code_8012EC80.c +++ b/src/code/code_8012EC80.c @@ -481,8 +481,8 @@ s32 Inventory_GetBtnBItem(PlayState* play) { return ITEM_NONE; } else if (CUR_FORM_EQUIP(EQUIP_SLOT_B) == ITEM_NONE) { if (play->interfaceCtx.unk_21C != 0) { - if (play->interfaceCtx.unk_21E != 0) { - return play->interfaceCtx.unk_21E; + if (play->interfaceCtx.bButtonDoAction != 0) { + return play->interfaceCtx.bButtonDoAction; } } return ITEM_NONE; |