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

remove some commented out code

Browse source
This commit is contained in:
briaguya 2022-05-30 17:09:54 -04:00
commit ae8fa55bb8
1 changed files with 0 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,8 +31,6 @@ void BgDyYoseizo_Update(Actor* thisx, GlobalContext* globalCtx);
void BgDyYoseizo_Draw(Actor* thisx, GlobalContext* globalCtx); void BgDyYoseizo_Draw(Actor* thisx, GlobalContext* globalCtx);
void BgDyYoseizo_CheckMagicAcquired(BgDyYoseizo* this, GlobalContext* globalCtx); void BgDyYoseizo_CheckMagicAcquired(BgDyYoseizo* this, GlobalContext* globalCtx);
// void GivePlayerRandoRewardGreatFairy(BgDyYoseizo* this, GlobalContext* globalCtx);
void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx); void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx);
void BgDyYoseizo_SetupSpinGrow_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx); void BgDyYoseizo_SetupSpinGrow_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx);
void BgDyYoseizo_SpinGrow_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx); void BgDyYoseizo_SpinGrow_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx);
@ -73,19 +71,11 @@ u8 successGreatFairy;
void GivePlayerRandoRewardGreatFairy(BgDyYoseizo* this, GlobalContext* globalCtx) { void GivePlayerRandoRewardGreatFairy(BgDyYoseizo* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx); Player* player = GET_PLAYER(globalCtx);
GetItemID getItemId = GetRandomizedItemId(GI_NONE, this->actor.id, this->fountainType + 1, globalCtx->sceneNum); GetItemID getItemId = GetRandomizedItemId(GI_NONE, this->actor.id, this->fountainType + 1, globalCtx->sceneNum);
// GetItemID getItemId = GetRandomizedItemIdFromKnownCheck(HC_GREAT_FAIRY_REWARD, GI_NONE);
if (successGreatFairy && !Player_InBlockingCsMode(globalCtx, GET_PLAYER(globalCtx))) { if (successGreatFairy && !Player_InBlockingCsMode(globalCtx, GET_PLAYER(globalCtx))) {
Flags_SetTreasure(globalCtx, this->fountainType + 1); Flags_SetTreasure(globalCtx, this->fountainType + 1);
successGreatFairy = 0; successGreatFairy = 0;
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
// globalCtx->sceneLoadFlag = 0x14;
// globalCtx->fadeTransition = 7;
// gSaveContext.nextTransition = 3;
// // gSaveContext.eventChkInf[5] |= 0x200;
// globalCtx->nextEntranceIndex = 0x0594;
// gSaveContext.nextCutsceneIndex = 0;
} else if (!successGreatFairy) { } else if (!successGreatFairy) {
successGreatFairy = func_8002F434(&this->actor, globalCtx, getItemId, 10000.0f, 100.0f); successGreatFairy = func_8002F434(&this->actor, globalCtx, getItemId, 10000.0f, 100.0f);
} }
@ -96,21 +86,6 @@ void BgDyYoseizo_Init(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2; GlobalContext* globalCtx = globalCtx2;
BgDyYoseizo* this = (BgDyYoseizo*)thisx; BgDyYoseizo* this = (BgDyYoseizo*)thisx;
// if(gSaveContext.n64ddFlag) {
// GivePlayerBlargRandoReward(this, GET_PLAYER(globalCtx), globalCtx);
// return;
// }
// if(gSaveContext.n64ddFlag) {
// if(Flags_GetCollectible(globalCtx, this->fountainType)) {
// gSaveContext.healthAccumulator = 0x140;
// Magic_Fill(globalCtx);
// Actor_Kill(&this->actor);
// } else {
// this->actionFunc = GivePlayerBlargRandoReward;
// }
// return;
// }
this->fountainType = globalCtx->curSpawn; this->fountainType = globalCtx->curSpawn;
if (this->fountainType < 0) { if (this->fountainType < 0) {