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

more cleanup

Browse source
This commit is contained in:
briaguya 2022-05-30 17:15:05 -04:00
commit 0021688a95
1 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -737,7 +737,6 @@ void BgDyYoseizo_Give_Reward(BgDyYoseizo* this, GlobalContext* globalCtx) {
(globalCtx->csCtx.npcActions[0]->action < 13)) { (globalCtx->csCtx.npcActions[0]->action < 13)) {
actionIndex = globalCtx->csCtx.npcActions[0]->action - 10; actionIndex = globalCtx->csCtx.npcActions[0]->action - 10;
// todo figure out which checks to use here
switch (actionIndex) { switch (actionIndex) {
case FAIRY_UPGRADE_MAGIC: case FAIRY_UPGRADE_MAGIC:
gSaveContext.magicAcquired = true; gSaveContext.magicAcquired = true;
@ -792,21 +791,8 @@ void BgDyYoseizo_Give_Reward(BgDyYoseizo* this, GlobalContext* globalCtx) {
gSaveContext.healthAccumulator = 0x140; gSaveContext.healthAccumulator = 0x140;
Interface_ChangeAlpha(9); Interface_ChangeAlpha(9);
gSaveContext.itemGetInf[1] |= sItemGetFlags[actionIndex]; gSaveContext.itemGetInf[1] |= sItemGetFlags[actionIndex];
if(gSaveContext.n64ddFlag) {
switch(sItemIds[actionIndex]) {
case ITEM_DINS_FIRE:
Item_Give(globalCtx, GetItemidFromGetitemid(GetRandomizedItemIdFromKnownCheck(OGC_GREAT_FAIRY_REWARD, GI_DINS_FIRE)));
break;
case ITEM_FARORES_WIND:
Item_Give(globalCtx, GetItemidFromGetitemid(GetRandomizedItemIdFromKnownCheck(ZF_GREAT_FAIRY_REWARD, GI_FARORES_WIND)));
break;
case ITEM_NAYRUS_LOVE:
Item_Give(globalCtx, GetItemidFromGetitemid(GetRandomizedItemIdFromKnownCheck(COLOSSUS_GREAT_FAIRY_REWARD, GI_NAYRUS_LOVE)));
}
} else {
Item_Give(globalCtx, sItemIds[actionIndex]); Item_Give(globalCtx, sItemIds[actionIndex]);
} }
}
} else { } else {
this->item->actor.world.pos.x = player->actor.world.pos.x; this->item->actor.world.pos.x = player->actor.world.pos.x;
this->item->actor.world.pos.y = this->item->actor.world.pos.y =