diff --git a/DoorShuffle.py b/DoorShuffle.py
index 3531328d..fccd78ee 100644
--- a/DoorShuffle.py
+++ b/DoorShuffle.py
@@ -913,7 +913,7 @@ def enable_new_entrances(region, connections, potentials, enabled, world, player
 
 
 def inverted_aga_check(entrances_map, connections, potentials, enabled, world, player):
-    if world.mode[player] == 'inverted':
+    if world.is_atgt_swapped(player):
         if 'Agahnims Tower' in entrances_map.keys() or aga_tower_enabled(enabled):
             for region in list(potentials.keys()):
                 if region.name == 'Hyrule Castle Ledge':
diff --git a/source/item/FillUtil.py b/source/item/FillUtil.py
index a0cdbea1..68524fbf 100644
--- a/source/item/FillUtil.py
+++ b/source/item/FillUtil.py
@@ -202,7 +202,7 @@ def district_item_pool_config(world):
         scale_factors = defaultdict(int)
         scale_total = 0
         for p in range(1, world.players + 1):
-            ent = 'Agahnims Tower' if world.is_tile_swapped(0x1b, player) and world.is_tile_swapped(0x1b, player) else 'Ganons Tower'
+            ent = 'Agahnims Tower' if world.is_atgt_swapped(player) else 'Ganons Tower'
             dungeon = world.get_entrance(ent, p).connected_region.dungeon
             if dungeon:
                 scale = world.crystals_needed_for_gt[p]