diff options
| author | Philip Dubé <159546+serprex@users.noreply.github.com> | 2026-08-09 15:46:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-09 15:46:51 +0000 |
| commit | bf7177256a0b0e774fc9b468f3e5da599f461d8f (patch) | |
| tree | 6c1df0d262b2d36fcc8b85027b35edcb0720e354 /soh/src/code | |
| parent | 0254c1f3a4893ad724e6806748f1323f24c60ab7 (diff) | |
FixFlexDrops (#7047)
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_en_item00.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c index 237745a01..cd2e0bd17 100644 --- a/soh/src/code/z_en_item00.c +++ b/soh/src/code/z_en_item00.c @@ -1727,15 +1727,17 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP params = 0xA * 0x10; dropTableIndex = 0x0; dropId = ITEM00_MAGIC_SMALL; - } else if (!LINK_IS_ADULT && (AMMO(ITEM_SLINGSHOT) < 6)) { + } else if (GameInteractor_Should(VB_FLEX_DROP_AMMO, !LINK_IS_ADULT && (AMMO(ITEM_SLINGSHOT) < 6), + ITEM00_SEEDS)) { params = 0xA * 0x10; dropTableIndex = 0x0; dropId = ITEM00_SEEDS; - } else if (LINK_IS_ADULT && (AMMO(ITEM_BOW) < 6)) { + } else if (GameInteractor_Should(VB_FLEX_DROP_AMMO, LINK_IS_ADULT && (AMMO(ITEM_BOW) < 6), + ITEM00_ARROWS_MEDIUM)) { params = 0xA * 0x10; dropTableIndex = 0x0; dropId = ITEM00_ARROWS_MEDIUM; - } else if (AMMO(ITEM_BOMB) < 6) { + } else if (GameInteractor_Should(VB_FLEX_DROP_AMMO, AMMO(ITEM_BOMB) < 6, ITEM00_BOMBS_A)) { params = 0xD * 0x10; dropTableIndex = 0x0; dropId = ITEM00_BOMBS_A; |