diff options
| author | OtherBlue <93625085+OtherBlue@users.noreply.github.com> | 2026-06-22 02:09:41 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-06-22 05:09:41 +0000 |
| commit | cb215ede878fa8c135a3f2bcf202f59e8893957e (patch) | |
| tree | f2ec2de67ee39a7ea682a1a8845a3edaf0478d0f /soh/src | |
| parent | fd696b5e52f0e471f03938e9d9d5b79ab18b9eb8 (diff) | |
Custom Bottle Contents (#6780)
Diffstat (limited to 'soh/src')
| -rw-r--r-- | soh/src/code/z_player_lib.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 63684cc5f..a440c9348 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -693,7 +693,9 @@ void Player_UpdateBottleHeld(PlayState* play, Player* this, s32 item, s32 action this->heldItemAction = actionParam; } - this->itemAction = actionParam; + if (GameInteractor_Should(VB_PLAYER_UPDATE_BOTTLE_HELD, true, this)) { + this->itemAction = actionParam; + } } void Player_ReleaseLockOn(Player* this) { @@ -1833,8 +1835,10 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve OPEN_DISPS(play->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetEnvColor(POLY_XLU_DISP++, bottleColor->r, bottleColor->g, bottleColor->b, 0); - gSPDisplayList(POLY_XLU_DISP++, sBottleDLists[(gSaveContext.linkAge)]); + if (GameInteractor_Should(VB_PLAYER_DRAW_BOTTLE, true, this, play)) { + gDPSetEnvColor(POLY_XLU_DISP++, bottleColor->r, bottleColor->g, bottleColor->b, 0); + gSPDisplayList(POLY_XLU_DISP++, sBottleDLists[gSaveContext.linkAge]); + } CLOSE_DISPS(play->state.gfxCtx); } |