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

Fixes a few more freestanding items that weren't covered.

This commit is contained in:
Christopher Leggett 2022-08-14 22:10:40 -04:00
parent c7388c39d8
commit a57d935996
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6110,7 +6110,8 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) {
} else {
giEntry = this->getItemEntry;
}
if ((giEntry.modIndex == MOD_NONE && this->getItemId < GI_MAX) ||
if ((giEntry.modIndex == MOD_NONE && (this->getItemId < GI_MAX ||
(giEntry.getItemId >= RG_KOKIRI_EMERALD && giEntry.getItemId <= RG_LIGHT_MEDALLION))) ||
(giEntry.modIndex == MOD_RANDOMIZER && this->getItemId < RG_MAX)) {
if ((interactedActor != &this->actor) && !iREG(67)) {
interactedActor->parent = &this->actor;