diff --git a/worlds/ror2/Locations.py b/worlds/ror2/Locations.py
index b3de5cff..d1e62386 100644
--- a/worlds/ror2/Locations.py
+++ b/worlds/ror2/Locations.py
@@ -13,9 +13,9 @@ base_location_table = {
     "Level Four": None,
     "Level Five": None
 }
-# 37006 - 37106
+# 37006 - 37506
 item_pickups = {
-    f"ItemPickup{i}": 37005+i for i in range(1, 101)
+    f"ItemPickup{i}": 37005+i for i in range(1, 501)
 }
 
 location_table = {**base_location_table, **item_pickups}
diff --git a/worlds/ror2/Options.py b/worlds/ror2/Options.py
index 233d97f8..d9bfc275 100644
--- a/worlds/ror2/Options.py
+++ b/worlds/ror2/Options.py
@@ -6,13 +6,13 @@ class TotalLocations(Range):
     """Number of location checks which are added to the Risk of Rain playthrough."""
     displayname = "Total Locations"
     range_start = 10
-    range_end = 100
+    range_end = 500
     default = 20
 
 
 class TotalRevivals(Range):
-    """Number of `Dio's Best Friend` item put in the item pool."""
-    displayname = "Total Revivals Available"
+    """Total Percentage of `Dio's Best Friend` item put in the item pool."""
+    displayname = "Total Percentage Revivals Available"
     range_start = 0
     range_end = 10
     default = 4
@@ -166,4 +166,4 @@ ror2_options: typing.Dict[str, type(Option)] = {
     "item_weights":         ItemWeights,
     "item_pool_presets":    ItemPoolPresetToggle,
     **ror2_weights
-}
\ No newline at end of file
+}
diff --git a/worlds/ror2/__init__.py b/worlds/ror2/__init__.py
index 410c40dd..1ac6e9d4 100644
--- a/worlds/ror2/__init__.py
+++ b/worlds/ror2/__init__.py
@@ -73,12 +73,12 @@ class RiskOfRainWorld(World):
         itempool = []
 
         # Add revive items for the player
-        itempool += ["Dio's Best Friend"] * self.world.total_revivals[self.player]
+        itempool += ["Dio's Best Friend"] * int(self.world.total_revivals[self.player] / 100 * self.world.total_locations[self.player])
 
         # Fill remaining items with randomly generated junk
         itempool += self.world.random.choices(list(junk_pool.keys()), weights=list(junk_pool.values()),
                                               k=self.world.total_locations[self.player] -
-                                                self.world.total_revivals[self.player])
+                                                int(self.world.total_revivals[self.player] / 100 * self.world.total_locations[self.player]))
 
         # Convert itempool into real items
         itempool = list(map(lambda name: self.create_item(name), itempool))