Cleanup and fix item00 queues

aMannus · Aug 28, 2024 · 9bdfb56 · 9bdfb56
1 parent 34bca0b
commit 9bdfb56
Show file tree

Hide file tree

Showing 4 changed files with 564 additions and 577 deletions.
diff --git a/soh/soh/Enhancements/randomizer/ShufflePots.cpp b/soh/soh/Enhancements/randomizer/ShufflePots.cpp
@@ -46,16 +46,14 @@ uint8_t ObjTsubo_RandomizerHoldsItem(ObjTsubo* potActor, PlayState* play) {
     }
 }
 
-void ObjTsubo_RandomizerSpawnCollectible(ObjTsubo* potActor) {
-    EnItem00* item00 =
-        (EnItem00*)Item_DropCollectible2(gPlayState, &potActor->actor.world.pos, ITEM00_SOH_GIVE_ITEM_ENTRY);
+void ObjTsubo_RandomizerSpawnCollectible(ObjTsubo* potActor, PlayState* play) {
+    EnItem00* item00 = (EnItem00*)Item_DropCollectible2(play, &potActor->actor.world.pos, ITEM00_SOH_DUMMY);
     item00->randoInf = potActor->potIdentity.randomizerInf;
     item00->itemEntry =
         OTRGlobals::Instance->gRandomizer->GetItemFromKnownCheck(potActor->potIdentity.randomizerCheck, GI_NONE);
     item00->actor.draw = (ActorFunc)EnItem00_DrawRandomizedItem;
     item00->actor.velocity.y = 8.0f;
     item00->actor.speedXZ = 2.0f;
-    item00->actor.gravity = -0.9f;
     item00->actor.world.rot.y = Rand_CenteredFloat(65536.0f);
 }
 
@@ -68,29 +66,23 @@ void ObjTsubo_RandomizerInit(void* actorRef) {
 
     potActor->potIdentity =
         Randomizer_IdentifyPot(gPlayState->sceneNum, (s16)actor->world.pos.x, (s16)actor->world.pos.z);
-
-    if (ObjTsubo_RandomizerHoldsItem(potActor, gPlayState)) {
-        potActor->potIdentity.isShuffled = true;
-    } else {
-        potActor->potIdentity.isShuffled = false;
-    }
 }
 
 void PotOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* optionalArg) {
     ObjTsubo* potActor = static_cast<ObjTsubo*>(optionalArg);
 
     switch (id) {
         case VB_POT_DRAW: {
-            if (potActor->potIdentity.isShuffled) {
-                *should = false;
+            if (ObjTsubo_RandomizerHoldsItem(potActor, gPlayState)) {
                 potActor->actor.draw = (ActorFunc)ObjTsubo_RandomizerDraw;
+                *should = false;
             }
             break;
         }
         case VB_POT_DROP_ITEM: {
-            if (potActor->potIdentity.isShuffled) {
+            if (ObjTsubo_RandomizerHoldsItem(potActor, gPlayState)) {
+                ObjTsubo_RandomizerSpawnCollectible(potActor, gPlayState);
                 *should = false;
-                ObjTsubo_RandomizerSpawnCollectible(potActor);
             }
             break;
         }

diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
@@ -79,10 +79,6 @@ class SpoilerCollectionCheck {
     static auto RandomizerInf(const uint16_t flag) {
         return SpoilerCollectionCheck(SPOILER_CHK_RANDOMIZER_INF, 0x00, flag);
     }
-
-    static auto Pot(const uint8_t scene, const uint8_t flag) {
-        return SpoilerCollectionCheck(SPOILER_CHK_POT, scene, flag);
-    }
 };
 
 enum class LocationType {