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

Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows

This commit is contained in:
Sarge-117 2022-09-11 11:32:50 -07:00
parent aee6445a45 1eb6235ddc
commit 4db2f44f7b
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/code/z_sram.c
View File

@ -104,7 +104,7 @@ void GiveLinksPocketItem() {
gSaveContext.bgsFlag = true; gSaveContext.bgsFlag = true;
} }
Item_Give(NULL, getItemEntry.itemId); Item_Give(NULL, getItemEntry.itemId);
} else if (getItemEntry.modIndex == MOD_RANDOMIZER) { } else if (getItemEntry.modIndex == MOD_RANDOMIZER && getItemEntry.getItemId != RG_ICE_TRAP) {
Randomizer_Item_Give(NULL, getItemEntry); Randomizer_Item_Give(NULL, getItemEntry);
} }
} }
@ -406,7 +406,7 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) {
gSaveContext.bgsFlag = true; gSaveContext.bgsFlag = true;
} }
Item_Give(NULL, getItem.itemId); Item_Give(NULL, getItem.itemId);
} else if (getItem.modIndex == MOD_RANDOMIZER) { } else if (getItem.modIndex == MOD_RANDOMIZER && getItem.getItemId != RG_ICE_TRAP) {
Randomizer_Item_Give(NULL, getItem); Randomizer_Item_Give(NULL, getItem);
} }