mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-17 23:15:11 -05:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source 
Some optimizations per suggestions
This commit is contained in:
Sarge-117 2022-07-27 17:21:09 -07:00
parent 430d3275bc
commit 4e2da51c54
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12684,12 +12684,11 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) {
Message_StartTextbox(globalCtx, giEntry->textId, &this->actor); Message_StartTextbox(globalCtx, giEntry->textId, &this->actor);
Item_Give(globalCtx, giEntry->itemId); Item_Give(globalCtx, giEntry->itemId);
// In rando the fanfares are handled in z_en_si.c, so we can skip down a bit // In rando the fanfares are handled by a function in z_en_si.c
if (gSaveContext.n64ddFlag) { if (gSaveContext.n64ddFlag) {
goto RandoFanfareSkip; Audio_PlayFanfare_Rando(this->getItemId);
} }
else if (((this->getItemId >= GI_RUPEE_GREEN) && (this->getItemId <= GI_RUPEE_RED)) ||
if (((this->getItemId >= GI_RUPEE_GREEN) && (this->getItemId <= GI_RUPEE_RED)) ||
((this->getItemId >= GI_RUPEE_PURPLE) && (this->getItemId <= GI_RUPEE_GOLD)) || ((this->getItemId >= GI_RUPEE_PURPLE) && (this->getItemId <= GI_RUPEE_GOLD)) ||
((this->getItemId >= GI_RUPEE_GREEN_LOSE) && (this->getItemId <= GI_RUPEE_PURPLE_LOSE)) || ((this->getItemId >= GI_RUPEE_GREEN_LOSE) && (this->getItemId <= GI_RUPEE_PURPLE_LOSE)) ||
(this->getItemId == GI_HEART)) { (this->getItemId == GI_HEART)) {
@ -12704,15 +12703,9 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) {
else { else {
temp1 = temp2 = (this->getItemId == GI_HEART_PIECE) ? NA_BGM_SMALL_ITEM_GET : NA_BGM_ITEM_GET | 0x900; temp1 = temp2 = (this->getItemId == GI_HEART_PIECE) ? NA_BGM_SMALL_ITEM_GET : NA_BGM_ITEM_GET | 0x900;
} }
RandoFanfareSkip:
if (gSaveContext.n64ddFlag) {
Audio_PlayFanfare_Rando(this->getItemId);
} else {
Audio_PlayFanfare(temp1); Audio_PlayFanfare(temp1);
} }
} }
}
else { else {
if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CLOSING) { if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CLOSING) {
if (this->getItemId == GI_GAUNTLETS_SILVER && !gSaveContext.n64ddFlag) { if (this->getItemId == GI_GAUNTLETS_SILVER && !gSaveContext.n64ddFlag) {