diff options
| author | Reppan <72985260+Jepvid@users.noreply.github.com> | 2026-06-29 21:13:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-06-29 19:13:39 +0000 |
| commit | 55b804a6735bf5d6da9bf34ef07d9384e55d7234 (patch) | |
| tree | 7020326aa1b7fc1aeba9864c9c02fc6bc9047c43 /soh/src | |
| parent | 68d4c6049eaf289ef464199d01211490e717b317 (diff) | |
Add Easy Butterfly Fairy Cvar (#6833)
Diffstat (limited to 'soh/src')
| -rw-r--r-- | soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c index f7a171bd0..5b9bd12a3 100644 --- a/soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -338,14 +338,16 @@ void EnButte_FollowLink(EnButte* this, PlayState* play) { distSqFromHome = Math3D_Dist2DSq(this->actor.world.pos.x, this->actor.world.pos.z, this->actor.home.pos.x, this->actor.home.pos.z); - if (!((player->heldItemAction == PLAYER_IA_DEKU_STICK) && (fabsf(player->actor.speedXZ) < 1.8f) && - (this->swordDownTimer <= 0) && (distSqFromHome < SQ(320.0f)))) { - EnButte_SetupFlyAround(this); - } else if (distSqFromHome > SQ(240.0f)) { - distSqFromSword = Math3D_Dist2DSq(player->meleeWeaponInfo[0].tip.x, player->meleeWeaponInfo[0].tip.z, - this->actor.world.pos.x, this->actor.world.pos.z); - if (distSqFromSword < SQ(60.0f)) { - EnButte_SetupTransformIntoFairy(this); + if (GameInteractor_Should(VB_SPAWN_BUTTERFLY_FAIRY_EASY, true, this)) { + if (!((player->heldItemAction == PLAYER_IA_DEKU_STICK) && (fabsf(player->actor.speedXZ) < 1.8f) && + (this->swordDownTimer <= 0) && (distSqFromHome < SQ(320.0f)))) { + EnButte_SetupFlyAround(this); + } else if (distSqFromHome > SQ(240.0f)) { + distSqFromSword = Math3D_Dist2DSq(player->meleeWeaponInfo[0].tip.x, player->meleeWeaponInfo[0].tip.z, + this->actor.world.pos.x, this->actor.world.pos.z); + if (distSqFromSword < SQ(60.0f)) { + EnButte_SetupTransformIntoFairy(this); + } } } } |