From d9d664f7ba46426bc1b996ddcf1d15349b2d6b68 Mon Sep 17 00:00:00 2001
From: StructuralMike <66819228+StructuralMike@users.noreply.github.com>
Date: Fri, 19 Mar 2021 17:29:45 +0100
Subject: [PATCH] minor cleanup

---
 BaseClasses.py |  2 +-
 Rom.py         | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 464037b7..04fa0904 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -687,7 +687,7 @@ class CollectionState(object):
     # In the future, this can be used to check if the player starts without bombs
     def can_use_bombs(self, player):
         StartingBombs = True
-        return (StartingBombs or self.has('Bomb Upgrade (+10)', player))
+        return StartingBombs or self.has('Bomb Upgrade (+10)', player)
 
     def can_hit_crystal(self, player):
         return (self.can_use_bombs(player)
diff --git a/Rom.py b/Rom.py
index 0311c013..9d4ab125 100644
--- a/Rom.py
+++ b/Rom.py
@@ -948,16 +948,6 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
 
     difficulty = world.difficulty_requirements[player]
 
-    #Shift magic consumption costs if not starting with magic
-    StartingMagic = True
-    if not StartingMagic:
-        for item in magic_cost:
-            magic_cost[item][1][2] = magic_cost[item][1][1]
-            magic_cost[item][1][1] = magic_cost[item][1][0]
-            magic_cost[item][1][0] = 0x81
-        # Cape consumpion is a cost/X tick thing
-        magic_cost['Magic Cape Residual'][1][0] = 0x01
-
     #Write magic consumption rates to rom
     for _,values in magic_cost.items():
         rom.write_bytes(values[0], values[1])