mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-13 12:38:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Custom Bottle Contents (#6780)

Browse Source
This commit is contained in:
OtherBlue
2026-06-22 02:09:41 -03:00
committed by GitHub
parent fd696b5e52
commit cb215ede87
4 changed files with 104 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_player_lib.c
+7 -3
View File
@@ -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);
}