diff options
| author | Eblo <7004497+Eblo@users.noreply.github.com> | 2026-07-20 10:39:22 -0400 |
|---|---|---|
| committer | Eblo <7004497+Eblo@users.noreply.github.com> | 2026-07-20 10:39:22 -0400 |
| commit | 33ebf0f683c7261ce433784b658e45064e445344 (patch) | |
| tree | 876b3428655cb2eb6249004442b2e0757eb03f37 /mm/src/code | |
| parent | 6b741aec3b904204c899441a834cebfd9e8d75e1 (diff) | |
| parent | ed47d2ec9874104a9ec619c91ce72c065152b25c (diff) | |
Merge remote-tracking branch 'upstream/develop' into decomp-cherry-pick-the-squeakuel
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_en_item00.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/src/code/z_en_item00.c b/mm/src/code/z_en_item00.c index 6567dd295..925fd8644 100644 --- a/mm/src/code/z_en_item00.c +++ b/mm/src/code/z_en_item00.c @@ -1337,9 +1337,6 @@ u8 sDropTableAmounts[DROP_TABLE_SIZE * DROP_TABLE_NUMBER] = { }; void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnPos, s16 params) { - if (!(GameInteractor_Should(VB_DROP_COLLECTIBLE, true, *spawnPos, params))) { - return; - } EnItem00* spawnedActor; u8 dropId; @@ -1353,6 +1350,9 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP if (params < 0x101) { dropId = sDropTable[params + dropTableIndex]; dropQuantity = sDropTableAmounts[params + dropTableIndex]; + if (!(GameInteractor_Should(VB_DROP_COLLECTIBLE, true, *spawnPos, dropId))) { + return; + } if (dropId == ITEM00_MASK) { switch (GET_PLAYER_FORM) { |