mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-26 10:41:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'get-item-rework' into get-item-rework-rando-next

Browse Source
This commit is contained in:
Christopher Leggett
2022-08-15 02:36:29 -04:00
parent a57d935996 6b4f300eda
commit bff5406e69
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_en_item00.c
+8 -2
View File
@@ -335,6 +335,7 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
f32 yOffset = 980.0f;
f32 shadowScale = 6.0f;
s32 getItemId = GI_NONE;
GetItemEntry getItem = (GetItemEntry)GET_ITEM_NONE;
s16 spawnParam8000 = this->actor.params & 0x8000;
s32 pad1;
@@ -509,8 +510,10 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
}
if ((gSaveContext.n64ddFlag || getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) {
getItemId = Randomizer_GetRandomizedItemId(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
getItem = Randomizer_GetRandomizedItem(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
getItemId = getItem.getItemId;
func_8002F554(&this->actor, globalCtx, getItemId);
GET_PLAYER(globalCtx)->getItemEntry = getItem;
}
EnItem00_SetupAction(this, func_8001E5C8);
@@ -702,6 +705,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
s16* params;
Actor* dynaActor;
s32 getItemId = GI_NONE;
GetItemEntry getItem = (GetItemEntry)GET_ITEM_NONE;
s16 sp3A = 0;
s16 i;
u32* temp;
@@ -881,7 +885,9 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
if ((getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) {
if (gSaveContext.n64ddFlag) {
getItemId = Randomizer_GetRandomizedItemId(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
getItem = Randomizer_GetRandomizedItem(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
GET_PLAYER(globalCtx)->getItemEntry = getItem;
getItemId = getItem.getItemId;
}
func_8002F554(&this->actor, globalCtx, getItemId);
}