mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-24 06:41:52 -05:00
Code Issues Projects Releases Wiki Activity

Fix special case with the "WINNER" heart

Browse Source 
The "WINNER" heart is its own unique item rather than just another piece of heart, so it needed its own check to make it consistent with other pieces of heart
This commit is contained in:
Sarge-117 2022-07-25 12:43:36 -07:00
parent 5ad90bf71b
commit c6cd0f5e03
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
soh/src/overlays/actors/ovl_En_Si/z_en_si.c
View File

@ -180,10 +180,14 @@ void Audio_PlayFanfare_Rando() {
} else { } else {
temp1 = (getItemId == GI_HEART_PIECE) ? NA_BGM_SMALL_ITEM_GET : NA_BGM_ITEM_GET | 0x900; temp1 = (getItemId == GI_HEART_PIECE) ? NA_BGM_SMALL_ITEM_GET : NA_BGM_ITEM_GET | 0x900;
} }
// If we get a skulltula token, play "get small item" // If we get a skulltula token or the "WINNER" heart, play "get small item"
if (getItemId == GI_SKULL_TOKEN) { if (getItemId == GI_SKULL_TOKEN || getItemId == GI_HEART_PIECE_WIN) {
temp1 = NA_BGM_SMALL_ITEM_GET | 0x900; temp1 = NA_BGM_SMALL_ITEM_GET | 0x900;
} }
// But if the "WINNER" heart is the 4th heart piece collected, play "get heart container"
if (getItemId == GI_HEART_PIECE_WIN && ((gSaveContext.inventory.questItems & 0xF0000000) == 0x40000000)) {
temp1 = NA_BGM_HEART_GET | 0x900;
}
// If the setting is toggled on and we get special quest items (longer fanfares): // If the setting is toggled on and we get special quest items (longer fanfares):
if (CVar_GetS32("gRandoQuestItemFanfares", 0) != 0) { if (CVar_GetS32("gRandoQuestItemFanfares", 0) != 0) {
// If we get a medallion, play the "get a medallion" fanfare // If we get a medallion, play the "get a medallion" fanfare

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

@ -12702,10 +12702,15 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) {
// Restore appropriate item fanfares in rando when we're obtaining items outside of their normal contexts // Restore appropriate item fanfares in rando when we're obtaining items outside of their normal contexts
if (gSaveContext.n64ddFlag) { if (gSaveContext.n64ddFlag) {
// If we get a skulltula token, play "get small item" (for tokensanity) // If we get a skulltula token (in tokensanity) or the "WINNER" heart, play "get small item"
if (this->getItemId == GI_SKULL_TOKEN) { if (this->getItemId == GI_SKULL_TOKEN || this->getItemId == GI_HEART_PIECE_WIN) {
temp1 = NA_BGM_SMALL_ITEM_GET | 0x900; temp1 = NA_BGM_SMALL_ITEM_GET | 0x900;
} }
// But if the "WINNER" heart is the 4th heart piece collected, play "get heart container"
if (this->getItemId == GI_HEART_PIECE_WIN &&
((gSaveContext.inventory.questItems & 0xF0000000) == 0x40000000)) {
temp1 = NA_BGM_HEART_GET | 0x900;
}
// If the setting is toggled on and we get special quest items (longer fanfares): // If the setting is toggled on and we get special quest items (longer fanfares):
if (CVar_GetS32("gRandoQuestItemFanfares", 0) != 0) { if (CVar_GetS32("gRandoQuestItemFanfares", 0) != 0) {
// If we get a medallion, play the "get a medallion" fanfare // If we get a medallion, play the "get a medallion" fanfare