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

trying to figure out fairy get item animations

Browse source
This commit is contained in:
briaguya 2022-05-30 13:24:20 -04:00
commit b80b28cda2
2 changed files with 47 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
soh/soh/Enhancements/randomizer.cpp
View file

@ -1828,6 +1828,11 @@ RandomizerCheck Randomizer::GetCheckFromActor(s16 sceneNum, s16 actorId, s16 act
case 262: case 262:
return ZF_ICEBERG_FREESTANDING_POH; return ZF_ICEBERG_FREESTANDING_POH;
} }
case 61:
switch(actorId) {
case 11:
return HC_GREAT_FAIRY_REWARD;
}
} }
return UNKNOWN_CHECK; return UNKNOWN_CHECK;

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

@ -211,19 +211,37 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx) {
// todo ensure we're seting givingReward based on if the check has been checked, // todo ensure we're seting givingReward based on if the check has been checked,
// not based on if the spell is in inventory // not based on if the spell is in inventory
case FAIRY_SPELL_FARORES_WIND: case FAIRY_SPELL_FARORES_WIND:
// if (gSaveContext.n64ddFlag) {
// 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;
// } else {
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:
// if (gSaveContext.n64ddFlag) {
// s32 getItemId = GetRandomizedItemId(GI_DINS_FIRE, this->actor.id, this->actor.params, globalCtx->sceneNum);
// func_8002F434(&this->actor, globalCtx, getItemId, 100.0f, 50.0f);
// return;
// } else {
if (!(gSaveContext.itemGetInf[1] & 0x200)) { if (!(gSaveContext.itemGetInf[1] & 0x200)) {
givingReward = true; givingReward = true;
} }
// }
break; break;
case FAIRY_SPELL_NAYRUS_LOVE: case FAIRY_SPELL_NAYRUS_LOVE:
// if (gSaveContext.n64ddFlag) {
// s32 getItemId = GetRandomizedItemId(GI_NAYRUS_LOVE, this->actor.id, this->actor.params, globalCtx->sceneNum);
// func_8002F434(&this->actor, globalCtx, getItemId, 100.0f, 50.0f);
// return;
// } else {
if (!(gSaveContext.itemGetInf[1] & 0x400)) { if (!(gSaveContext.itemGetInf[1] & 0x400)) {
givingReward = true; givingReward = true;
} }
// }
break; break;
} }
} else { } else {
@ -262,14 +280,29 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx) {
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) {
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;
}
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) {
s32 getItemId = GetRandomizedItemId(GI_DINS_FIRE, this->actor.id, this->actor.params, globalCtx->sceneNum);
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) {
s32 getItemId = GetRandomizedItemId(GI_NAYRUS_LOVE, this->actor.id, this->actor.params, globalCtx->sceneNum);
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;