mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-26 10:08:51 -05:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips

Browse Source
This commit is contained in:
Sarge-117 2022-08-18 22:13:51 -07:00
commit 64b7dac91b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View File

@ -141,6 +141,9 @@ f32 DemoEffect_InterpolateCsFrames(GlobalContext* globalCtx, s32 csActionId) {
*/ */
void DemoEffect_InitJewel(GlobalContext* globalCtx, DemoEffect* this) { void DemoEffect_InitJewel(GlobalContext* globalCtx, DemoEffect* this) {
this->initDrawFunc = DemoEffect_DrawJewel; this->initDrawFunc = DemoEffect_DrawJewel;
if (gSaveContext.n64ddFlag && globalCtx->sceneNum == SCENE_BDAN) {
this->initDrawFunc = DemoEffect_DrawGetItem;
}
if (!LINK_IS_ADULT) { if (!LINK_IS_ADULT) {
this->initUpdateFunc = DemoEffect_UpdateJewelChild; this->initUpdateFunc = DemoEffect_UpdateJewelChild;
} else { } else {
@ -152,7 +155,7 @@ void DemoEffect_InitJewel(GlobalContext* globalCtx, DemoEffect* this) {
Actor_SetScale(&this->actor, 0.10f); Actor_SetScale(&this->actor, 0.10f);
} }
this->csActionId = 1; this->csActionId = 1;
this->actor.shape.rot.x = 16384; this->actor.shape.rot.x = (gSaveContext.n64ddFlag && globalCtx->sceneNum == SCENE_BDAN) ? 0 : 16384;
DemoEffect_InitJewelColor(this); DemoEffect_InitJewelColor(this);
this->jewel.alpha = 0; this->jewel.alpha = 0;
this->jewelCsRotation.x = this->jewelCsRotation.y = this->jewelCsRotation.z = 0; this->jewelCsRotation.x = this->jewelCsRotation.y = this->jewelCsRotation.z = 0;
@ -2083,6 +2086,10 @@ void DemoEffect_DrawGetItem(Actor* thisx, GlobalContext* globalCtx) {
this->getItem.isLoaded = 1; this->getItem.isLoaded = 1;
return; return;
} }
if (gSaveContext.n64ddFlag && globalCtx->sceneNum == SCENE_BDAN) {
GetItemID getItemID = Randomizer_GetItemIdFromKnownCheck(RC_BARINADE, RG_ZORA_SAPPHIRE);
this->getItem.drawId = Randomizer_GetItemModelFromId(getItemID);
}
func_8002EBCC(thisx, globalCtx, 0); func_8002EBCC(thisx, globalCtx, 0);
func_8002ED80(thisx, globalCtx, 0); func_8002ED80(thisx, globalCtx, 0);
GetItem_Draw(globalCtx, this->getItem.drawId); GetItem_Draw(globalCtx, this->getItem.drawId);