mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-08-13 17:03:47 -04:00
Code Issues Projects Releases Wiki Activity

Makes sure we aren't using getItemEntry when not randoed.

Browse Source
This commit is contained in:
Christopher Leggett 2022-08-15 02:17:06 -04:00
parent 9c59624d64
commit 6b4f300eda
No known key found for this signature in database
GPG Key ID: 22E7784811D1BD98
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soh/src/code/z_en_item00.c
View File

@ -511,7 +511,8 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
if ((gSaveContext.n64ddFlag || getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) {
getItem = Randomizer_GetRandomizedItem(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
func_8002F554(&this->actor, globalCtx, getItem.getItemId);
getItemId = getItem.getItemId;
func_8002F554(&this->actor, globalCtx, getItemId);
GET_PLAYER(globalCtx)->getItemEntry = getItem;
}
@ -886,8 +887,9 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
if (gSaveContext.n64ddFlag) {
getItem = Randomizer_GetRandomizedItem(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
GET_PLAYER(globalCtx)->getItemEntry = getItem;
getItemId = getItem.getItemId;
}
func_8002F554(&this->actor, globalCtx, getItem.getItemId);
func_8002F554(&this->actor, globalCtx, getItemId);
}
switch (*params) {