mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-10 21:48:17 -05:00
Code Issues Projects Releases Wiki Activity

Fix Piece of Heart sound (#1862) (#1876)

Browse Source
This commit is contained in:
mergify[bot] 2022-10-31 22:23:41 +01:00 committed by GitHub
parent b1bb8fe8c0
commit 6c30d7a435
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -12564,12 +12564,12 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) {
Audio_PlaySoundGeneral(NA_SE_SY_GET_BOXITEM, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); Audio_PlaySoundGeneral(NA_SE_SY_GET_BOXITEM, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
} else { } else {
if ((giEntry.itemId == ITEM_HEART_CONTAINER) || if ((giEntry.itemId == ITEM_HEART_CONTAINER) ||
((giEntry.itemId == ITEM_HEART_PIECE) && ((giEntry.itemId == ITEM_HEART_PIECE_2) &&
((gSaveContext.inventory.questItems & 0xF0000000) == 0x40000000))) { ((gSaveContext.inventory.questItems & 0xF0000000) == 0x40000000))) {
temp1 = NA_BGM_HEART_GET | 0x900; temp1 = NA_BGM_HEART_GET | 0x900;
} else { } else {
temp1 = temp2 = temp1 = temp2 =
(giEntry.itemId == ITEM_HEART_PIECE) ? NA_BGM_SMALL_ITEM_GET : NA_BGM_ITEM_GET | 0x900; (giEntry.itemId == ITEM_HEART_PIECE_2) ? NA_BGM_SMALL_ITEM_GET : NA_BGM_ITEM_GET | 0x900;
} }
Audio_PlayFanfare(temp1); Audio_PlayFanfare(temp1);
} }