github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-23 06:35:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip items from fairies

Browse source
This commit is contained in:
briaguya 2022-05-30 15:24:42 -04:00
commit eb2262e05b
1 changed files with 59 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

72
soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
View file

@ -193,15 +193,40 @@ void BgDyYoseizo_CheckMagicAcquired(BgDyYoseizo* this, GlobalContext* globalCtx)
return; return;
} }
} }
if(gSaveContext.n64ddFlag) {
GivePlayerBlargRandoReward(this, GET_PLAYER(globalCtx), globalCtx);
return;
}
func_8002DF54(globalCtx, &this->actor, 1); func_8002DF54(globalCtx, &this->actor, 1);
this->actionFunc = BgDyYoseizo_ChooseType; this->actionFunc = BgDyYoseizo_ChooseType;
} }
} }
u8 blargSuccess;
void GivePlayerBlargRandoReward(BgDyYoseizo* this, Player* player, GlobalContext* globalCtx) {
GetItemID getItemId = GetRandomizedItemIdFromKnownCheck(HC_GREAT_FAIRY_REWARD, GI_NONE);
if (blargSuccess && !Player_InBlockingCsMode(globalCtx, GET_PLAYER(globalCtx))) {
globalCtx->sceneLoadFlag = 0x14;
globalCtx->fadeTransition = 7;
gSaveContext.nextTransition = 3;
// gSaveContext.eventChkInf[5] |= 0x200;
globalCtx->nextEntranceIndex = 0x0594;
gSaveContext.nextCutsceneIndex = 0; //Actor_Kill(&this->actor);
} else if (!blargSuccess) {
blargSuccess = func_8002F434(&this->actor, globalCtx, getItemId, 10000.0f, 100.0f);
}
}
void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx) { void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx) {
s32 givingReward; s32 givingReward;
// if(!gSaveContext.n64ddFlag) {
func_8002DF54(globalCtx, &this->actor, 1); func_8002DF54(globalCtx, &this->actor, 1);
// }
// "Mode" // "Mode"
osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n" VT_RST, globalCtx->msgCtx.ocarinaMode); osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n" VT_RST, globalCtx->msgCtx.ocarinaMode);
givingReward = false; givingReward = false;
@ -216,9 +241,11 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx) {
// func_8002F434(&this->actor, globalCtx, getItemId, 100.0f, 50.0f); // func_8002F434(&this->actor, globalCtx, getItemId, 100.0f, 50.0f);
// return; // return;
// } else { // } else {
if (gSaveContext.n64ddFlag) {
if (!(gSaveContext.itemGetInf[1] & 0x100)) { if (!(gSaveContext.itemGetInf[1] & 0x100)) {
givingReward = true; givingReward = true;
} }
}
// } // }
break; break;
case FAIRY_SPELL_DINS_FIRE: case FAIRY_SPELL_DINS_FIRE:
@ -275,34 +302,37 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx) {
} }
} }
if (givingReward) { if (givingReward && !gSaveContext.n64ddFlag) {
if (gSaveContext.sceneSetupIndex < 4) { if (gSaveContext.sceneSetupIndex < 4) {
if (globalCtx->sceneNum != SCENE_DAIYOUSEI_IZUMI) { if (globalCtx->sceneNum != SCENE_DAIYOUSEI_IZUMI) {
switch (this->fountainType) { switch (this->fountainType) {
case FAIRY_SPELL_FARORES_WIND: case FAIRY_SPELL_FARORES_WIND:
if (gSaveContext.n64ddFlag) { // if (gSaveContext.n64ddFlag) {
s32 getItemId = GetRandomizedItemId(GI_FARORES_WIND, this->actor.id, this->actor.params, globalCtx->sceneNum); // givingReward = false;
func_8002F434(&this->actor, globalCtx, getItemId, 100.0f, 50.0f); // s32 getItemId = GetRandomizedItemId(GI_FARORES_WIND, this->actor.id, this->actor.params, globalCtx->sceneNum);
return; // func_8002F434(&this->actor, globalCtx, getItemId, 100.0f, 50.0f);
} // return;
// }
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGreatFairyFaroresWindCs); globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGreatFairyFaroresWindCs);
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
break; break;
case FAIRY_SPELL_DINS_FIRE: case FAIRY_SPELL_DINS_FIRE:
if (gSaveContext.n64ddFlag) { // if (gSaveContext.n64ddFlag) {
s32 getItemId = GetRandomizedItemId(GI_DINS_FIRE, this->actor.id, this->actor.params, globalCtx->sceneNum); // givingReward = false;
func_8002F434(&this->actor, globalCtx, getItemId, 100.0f, 50.0f); // s32 getItemId = GetRandomizedItemId(GI_DINS_FIRE, this->actor.id, this->actor.params, globalCtx->sceneNum);
return; // func_8002F434(&this->actor, globalCtx, getItemId, 100.0f, 50.0f);
} // return;
// }
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGreatFairyDinsFireCs); globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGreatFairyDinsFireCs);
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
break; break;
case FAIRY_SPELL_NAYRUS_LOVE: case FAIRY_SPELL_NAYRUS_LOVE:
if (gSaveContext.n64ddFlag) { // if (gSaveContext.n64ddFlag) {
s32 getItemId = GetRandomizedItemId(GI_NAYRUS_LOVE, this->actor.id, this->actor.params, globalCtx->sceneNum); // givingReward = false;
func_8002F434(&this->actor, globalCtx, getItemId, 100.0f, 50.0f); // s32 getItemId = GetRandomizedItemId(GI_NAYRUS_LOVE, this->actor.id, this->actor.params, globalCtx->sceneNum);
return; // func_8002F434(&this->actor, globalCtx, getItemId, 100.0f, 50.0f);
} // return;
// }
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGreatFairyNayrusLoveCs); globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGreatFairyNayrusLoveCs);
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
break; break;
@ -329,12 +359,20 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx) {
} }
globalCtx->envCtx.unk_BF = 2; globalCtx->envCtx.unk_BF = 2;
if(!gSaveContext.n64ddFlag) {
if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) {
OnePointCutscene_Init(globalCtx, 8603, -99, NULL, MAIN_CAM); OnePointCutscene_Init(globalCtx, 8603, -99, NULL, MAIN_CAM);
} else { } else {
OnePointCutscene_Init(globalCtx, 8604, -99, NULL, MAIN_CAM); OnePointCutscene_Init(globalCtx, 8604, -99, NULL, MAIN_CAM);
}; };
} else {
if (gSaveContext.n64ddFlag) {
givingReward = false;
s32 getItemId = GetRandomizedItemId(GI_FARORES_WIND, this->actor.id, this->actor.params, globalCtx->sceneNum);
func_8002F434(&this->actor, globalCtx, getItemId, 100.0f, 50.0f);
return;
}
}
Audio_PlayActorSound2(&this->actor, NA_SE_EV_GREAT_FAIRY_APPEAR); Audio_PlayActorSound2(&this->actor, NA_SE_EV_GREAT_FAIRY_APPEAR);
this->actor.draw = BgDyYoseizo_Draw; this->actor.draw = BgDyYoseizo_Draw;