Prepare default pot contents, fix/add dungeons

aMannus · Jan 5, 2024 · a61594d · a61594d
1 parent 350d521
commit a61594d
Show file tree

Hide file tree

Showing 2 changed files with 462 additions and 6 deletions.
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -754,27 +754,27 @@ void GenerateItemPool() {
   // Shuffle Pots
   if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_OFF)) {
     for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) {
-      ctx->PlaceItemInLocation(loc, RG_GREEN_RUPEE, false, true);
+      ctx->PlaceItemInLocation(loc, Rando::StaticData::GetLocation(loc)->GetVanillaItem(), false, true);
     }
   } else if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_DUNGEONS)) {
     for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) {
       if (Rando::StaticData::GetLocation(loc)->IsOverworld()) {
-        ctx->PlaceItemInLocation(loc, RG_GREEN_RUPEE, false, true);
+        ctx->PlaceItemInLocation(loc, Rando::StaticData::GetLocation(loc)->GetVanillaItem(), false, true);
       } else {
-        AddItemToMainPool(RG_GREEN_RUPEE);
+        AddItemToMainPool(Rando::StaticData::GetLocation(loc)->GetVanillaItem());
       }
     }
   } else if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_OVERWORLD)) {
     for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) {
       if (Rando::StaticData::GetLocation(loc)->IsDungeon()) {
-        ctx->PlaceItemInLocation(loc, RG_GREEN_RUPEE, false, true);
+        ctx->PlaceItemInLocation(loc, Rando::StaticData::GetLocation(loc)->GetVanillaItem(), false, true);
       } else {
-        AddItemToMainPool(RG_GREEN_RUPEE);
+        AddItemToMainPool(Rando::StaticData::GetLocation(loc)->GetVanillaItem());
       }
     }
   } else {
     for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) {
-      AddItemToMainPool(RG_GREEN_RUPEE);
+      AddItemToMainPool(Rando::StaticData::GetLocation(loc)->GetVanillaItem());
     }
   }