summaryrefslogtreecommitdiff
path: root/mm/src/code
diff options
context:
space:
mode:
authoranthony-barricelli <104381450+anthony-barricelli@users.noreply.github.com>2026-07-03 11:28:20 -0400
committerGitHub <noreply@github.com>2026-07-03 10:28:20 -0500
commit1c35785ea36892c0baaaa766cb6a2268dadc805a (patch)
tree12fe93a70dabf2a13bf96044263459095ebc3d3e /mm/src/code
parented0eb99b0e476e7eea55617f67e220082a345a9d (diff)
New Features: No random drops + No heart/healing drops (#1547)
* no random drops * no heart/fairy drops * add item spawns to prevent soft locks * remove redundancies, use collectible vb behavior for hearts * feedback -- move vb check
Diffstat (limited to 'mm/src/code')
-rw-r--r--mm/src/code/z_en_item00.c6
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) {