mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Realized I had the bgm conditions wrong.

This commit is contained in:
Christopher Leggett 2022-08-13 12:13:46 -04:00
parent 105eac4e53
commit 9ed7feb30a
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
1 changed files with 3 additions and 1 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

@ -12566,7 +12566,8 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) {
}
Player_SetPendingFlag(this, globalCtx);
if (this->getItemEntry.objectId != OBJECT_INVALID) {
if (this->getItemEntry.objectId == OBJECT_INVALID) {
// Use this if player does not have a getItemEntry
if (giEntry.modIndex == MOD_NONE) {
if (((this->getItemId >= GI_RUPEE_GREEN) && (this->getItemId <= GI_RUPEE_RED)) ||
((this->getItemId >= GI_RUPEE_PURPLE) && (this->getItemId <= GI_RUPEE_GOLD)) ||
@ -12596,6 +12597,7 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) {
Audio_PlayFanfare(NA_BGM_ITEM_GET | 0x900);
}
} else {
// Use this if we do have a getItemEntry
if (giEntry.modIndex == MOD_NONE) {
if (((giEntry.itemId >= ITEM_RUPEE_GREEN) && (giEntry.itemId <= ITEM_RUPEE_RED)) ||
((giEntry.itemId >= ITEM_RUPEE_PURPLE) && (giEntry.itemId <= ITEM_RUPEE_GOLD)) ||