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

Merge pull request #25 from MelonSpeedruns/melon-randomizer

Browse source 
saria done
This commit is contained in:
briaguya 2022-05-31 17:11:04 -04:00 • committed by GitHub
commit d10378b244
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
View file

@ -387,6 +387,9 @@ s32 func_80AF5DFC(EnSa* this, GlobalContext* globalCtx) {
return 1; return 1;
} }
if (globalCtx->sceneNum == SCENE_SPOT05 && (gSaveContext.eventChkInf[4] & 1)) { if (globalCtx->sceneNum == SCENE_SPOT05 && (gSaveContext.eventChkInf[4] & 1)) {
if (Flags_GetTreasure(globalCtx, 0x1F)) {
return 2;
}
return CHECK_QUEST_ITEM(QUEST_SONG_SARIA) ? 2 : 5; return CHECK_QUEST_ITEM(QUEST_SONG_SARIA) ? 2 : 5;
} }
if (globalCtx->sceneNum == SCENE_SPOT04 && !CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) { if (globalCtx->sceneNum == SCENE_SPOT04 && !CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
@ -614,10 +617,30 @@ void func_80AF67D0(EnSa* this, GlobalContext* globalCtx) {
} }
} }
void GivePlayerRandoRewardSaria(EnSa* saria, GlobalContext* globalCtx, RandomizerCheck check) {
Player* player = GET_PLAYER(globalCtx);
if (!Player_InBlockingCsMode(globalCtx, GET_PLAYER(globalCtx))) {
if (!Flags_GetTreasure(globalCtx, 0x1F) &&
gSaveContext.eventChkInf[4] & 1) {
GetItemID getItemId = GetRandomizedItemIdFromKnownCheck(check, GI_SARIAS_SONG);
if (func_8002F434(&saria->actor, globalCtx, getItemId, 100000.0f, 100000.0f) == true) {
Flags_SetTreasure(globalCtx, 0x1F);
}
}
}
}
void func_80AF683C(EnSa* this, GlobalContext* globalCtx) { void func_80AF683C(EnSa* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx); Player* player = GET_PLAYER(globalCtx);
if (!(player->actor.world.pos.z >= -2220.0f) && !Gameplay_InCsMode(globalCtx)) { if (!(player->actor.world.pos.z >= -2220.0f) && !Gameplay_InCsMode(globalCtx)) {
if (gSaveContext.n64ddFlag) {
GivePlayerRandoRewardSaria(this, globalCtx, SONG_FROM_SARIA);
return;
}
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(spot05_scene_Cs_005730); globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(spot05_scene_Cs_005730);
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
this->actionFunc = func_80AF68E4; this->actionFunc = func_80AF68E4;