Merged in DR v1.2.0.13

Main.py

@@ -36,7 +36,9 @@ from source.overworld.EntranceShuffle2 import link_entrances_new
 from source.tools.BPS import create_bps_from_data
 from source.classes.CustomSettings import CustomSettings
 
-__version__ = '1.2.0.12u'
+version_number = '1.2.0.13'
+version_branch = '-u'
+__version__ = f'{version_number}{version_branch}'
 
 from source.classes.BabelFish import BabelFish
 
@@ -265,6 +267,7 @@ def main(args, seed=None, fish=None):
         set_rules(world, player)
 
     district_item_pool_config(world)
+    fill_specific_items(world)
     for player in range(1, world.players + 1):
         if world.shopsanity[player]:
             sell_potions(world, player)
@@ -277,8 +280,6 @@ def main(args, seed=None, fish=None):
     if args.print_custom_yaml:
         world.settings.record_item_pool(world)
     dungeon_tracking(world)
-    fill_specific_items(world)
-
     logger.info(world.fish.translate("cli", "cli", "placing.dungeon.prizes"))
 
     fill_prizes(world)