diff options
| author | Caladius <Caladius@users.noreply.github.com> | 2025-10-29 12:57:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-29 12:57:28 -0400 |
| commit | e5db91da04b507c194c25fce45d5c87cb992123c (patch) | |
| tree | f803c43f41d7a41778e74a7be8a9c8745b27ef08 /mm/src/code | |
| parent | 83921dc012588c520efe0ed8c7ac1406806543c7 (diff) | |
[Rando] Enemy Drop Shuffle (#1282)
* Implement most of the Enemy Drops
* Fix Glitchless Generation
* Fix duplicate Logic Checks
* Add Slime Items and fix Linux Floating Point.
* Add Comment for Enemy Drops RC Sets
* Adds Leever and fixes Position Check issue.
* Adds GBC for Logic check
* Add Hiploop
* Adds Skullfish (Enemy only drops items inside GBT)
* Feedback Updates
* Updates
* Update to Switch for Actor Selection
* More Enemy Locations
* Fix Mini Baba and remove actors that dont drop items
* Update mm/2s2h/Rando/Logic/Logic.h
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Add case for ACTOR_BOSS_05 in Logic.h
* Update mm/2s2h/Rando/Types.h
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Clang format actor position
* Need swim for Bio Deku Baba
* Define RC_ENEMY_DROP_BIO_DEKU_BABA in checks
* GitHub spacing how dare you
* Update mm/2s2h/Rando/StaticData/Checks.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Types.h
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/StaticData/Checks.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Types.h
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/StaticData/Checks.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Types.h
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Apply suggestion from @Eblo
---------
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_en_item00.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mm/src/code/z_en_item00.c b/mm/src/code/z_en_item00.c index ec357c076..12233a36f 100644 --- a/mm/src/code/z_en_item00.c +++ b/mm/src/code/z_en_item00.c @@ -918,6 +918,10 @@ s16 func_800A7650(s16 dropId) { } Actor* Item_DropCollectible(PlayState* play, Vec3f* spawnPos, u32 params) { + if (!(GameInteractor_Should(VB_ENEMY_DROP_COLLECTIBLE, true, *spawnPos))) { + return; + } + s32 pad; Actor* spawnedActor = NULL; s32 newParamFF; @@ -1333,6 +1337,10 @@ u8 sDropTableAmounts[DROP_TABLE_SIZE * DROP_TABLE_NUMBER] = { }; void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnPos, s16 params) { + if (!(GameInteractor_Should(VB_ENEMY_DROP_COLLECTIBLE, true, *spawnPos))) { + return; + } + EnItem00* spawnedActor; u8 dropId; s32 dropQuantity; |