diff options
| author | Patrick12115 <115201185+Patrick12115@users.noreply.github.com> | 2025-09-17 20:39:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-17 17:39:30 -0700 |
| commit | 4bc2bb559205c0a68b082ddcb18e79ee09e769f9 (patch) | |
| tree | 3cf8f9adcb355e02348efd8e8519289b91eb68cc | |
| parent | 911c107b6ecb1e7596f5420fc4bd260890760fa1 (diff) | |
Wiggle (#5794)
| -rw-r--r-- | soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp b/soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp index c94c68511..eccfc3dc3 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp @@ -43,7 +43,7 @@ void ObjComb_RandomizerWait(ObjComb* objComb, PlayState* play) { objComb->unk_1B0 -= 50; const auto beehiveIdentity = ObjectExtension::GetInstance().Get<BeehiveIdentity>(&objComb->actor); - if (RAND_GET_OPTION(RSK_SHUFFLE_BEEHIVES) && beehiveIdentity == nullptr && + if (RAND_GET_OPTION(RSK_SHUFFLE_BEEHIVES) && beehiveIdentity != nullptr && !Flags_GetRandomizerInf(beehiveIdentity->randomizerInf)) { if (objComb->unk_1B0 <= -5000) { objComb->unk_1B0 = 1500; @@ -82,9 +82,11 @@ void ObjComb_RandomizerInit(void* actor) { void ObjComb_RandomizerUpdate(void* actor) { ObjComb* combActor = reinterpret_cast<ObjComb*>(actor); + PlayState* play = gPlayState; + combActor->unk_1B2 += 0x2EE0; + combActor->actionFunc(combActor, play); combActor->actor.shape.rot.x = - static_cast<int16_t>(Math_SinS(combActor->unk_1B2)) * CLAMP_MIN(combActor->unk_1B0, 0) + - combActor->actor.home.rot.x; + Math_SinS(combActor->unk_1B2) * CLAMP_MIN(combActor->unk_1B0, 0) + combActor->actor.home.rot.x; } void RegisterShuffleBeehives() { |