mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-07 04:54:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

z_parameter.c: remaining functions, do action documentation, gfx cleanup (#1652)

Browse Source 
* Parameter last functions

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Documentation for do actions and various gfx

* Suggested changes

* f prefix for texture scale numbers

* Player_SetBButtonAmmo

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
Tharo
2024-07-02 22:47:37 +01:00
committed by GitHub
parent eccbbd47dc
commit 6629597f82
27 changed files with 644 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_inventory.c
+4 -4
View File
@@ -478,10 +478,10 @@ s32 Inventory_GetBtnBItem(PlayState* play) {
} 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) {
if (play->interfaceCtx.bButtonDoAction != 0) {
return play->interfaceCtx.bButtonDoAction;
}
//! @bug "Weird B": If the B button is empty and there's a B do action text displaying, pressing B will use the
//! item with the same id as the current do action. It's unclear what this code was originally intended for.
if (play->interfaceCtx.bButtonPlayerDoActionActive && play->interfaceCtx.bButtonPlayerDoAction != 0) {
return play->interfaceCtx.bButtonPlayerDoAction;
}
return ITEM_NONE;
} else {