diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2026-03-01 19:57:59 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-01 19:57:59 -0600 |
| commit | 6965162a2f8e058a17d825310b5815722c0649a1 (patch) | |
| tree | ebd2bbe3dc41304be1e1d91f82d09f9f69fa7fac | |
| parent | 786202eaa8596e0337573de60a947af682a3c845 (diff) | |
Fix chu drops for flagged bomb drops (#1587)
| -rw-r--r-- | mm/2s2h/BenGui/BenMenu.cpp | 2 | ||||
| -rw-r--r-- | mm/2s2h/Enhancements/Equipment/ChuDrops.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mm/2s2h/BenGui/BenMenu.cpp b/mm/2s2h/BenGui/BenMenu.cpp index a07c7baa0..1a5ad515b 100644 --- a/mm/2s2h/BenGui/BenMenu.cpp +++ b/mm/2s2h/BenGui/BenMenu.cpp @@ -247,7 +247,7 @@ WidgetInfo& BenMenu::AddWidget(WidgetPath& pathInfo, std::string widgetName, Wid // clang-format on std::vector<std::string> contributors = { "ProxySaw", // "Garrett Cox", manual replacement - "Archez", // "Adam Bird", dupe + "Archez", // "Adam Bird", dupe "Eblo", "louist103", "balloondude2", diff --git a/mm/2s2h/Enhancements/Equipment/ChuDrops.cpp b/mm/2s2h/Enhancements/Equipment/ChuDrops.cpp index 40ddc2231..2ed0c4ae0 100644 --- a/mm/2s2h/Enhancements/Equipment/ChuDrops.cpp +++ b/mm/2s2h/Enhancements/Equipment/ChuDrops.cpp @@ -74,7 +74,8 @@ static void ChuDrop_Draw(Actor* actor, PlayState* play) { void RegisterChuDrops() { COND_ID_HOOK(ShouldActorInit, ACTOR_EN_ITEM00, CVAR, [](Actor* actor, bool* should) { - if (actor->params == ITEM00_BOMBS_0 || actor->params == ITEM00_BOMBS_A || actor->params == ITEM00_BOMBS_B) { + u8 params = actor->params & 0xFF; + if (params == ITEM00_BOMBS_0 || params == ITEM00_BOMBS_A || params == ITEM00_BOMBS_B) { if (rand() % 100 < 50) { *should = false; EnItem00* newItem = |