Merge branch 'main' into beta

BaseClasses.py

@@ -1409,7 +1409,7 @@ class CollectionState(object):
     def can_hit_stunned_ganon(self, player):
         ganon_item = self.world.ganon_item[player]
         if ganon_item == "silver":
-            return self.has("Silver Arroys", player) and self.can_shoot_arrows(player)
+            return self.has("Silver Arrows", player) and self.can_shoot_arrows(player)
         elif ganon_item == "boomerang":
             return self.has("Blue Boomerang", player) or self.has("Red Boomerang", player)
         elif ganon_item == "hookshot":

Main.py

@@ -346,7 +346,7 @@ def main(args, seed=None, fish=None):
             cap_shop = world.get_region('Capacity Upgrade', player).shop
             potion = {
                 'item': "Orange Potion",
-                'price': 1000,
+                'price': 500,
                 'max': 0,
                 'replacement': None,
                 'replacement_price': 0,

Rom.py

@@ -85,7 +85,7 @@ from Utils import int16_as_bytes, int32_as_bytes, local_path, snes_to_pc
 from Versions import DRVersion, GKVersion, ORVersion
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '589a044786a63d98aff0e44b51a6a339'
+RANDOMIZERBASEHASH = 'd80446af9eeb1726d2b6c1303bec1226'
 
 
 class JsonRom(object):

Text.py

@@ -2054,6 +2054,6 @@ class TextTable(object):
         text['ganon_phase_3_silvers'] = CompressedTextMapper.convert("Oh no! Silver! My one true weakness!")
         text['murahdahla'] = CompressedTextMapper.convert("Hello @. I\nam Murahdahla, brother of\nSahasrahla and Aginah. Behold the power of\ninvisibility.\n{PAUSE3}\n… … …\nWait! You can see me? I knew I should have\nhidden in a hollow tree.")
         text['mastersword_pedestal_goal'] = CompressedTextMapper.convert("To claim thy reward, you must present all 3 Pendants of Virtue.")
-        text['orange_potion_refill'] = CompressedTextMapper.convert("This rare orange potion will give you infinite magic, but only until you die or quit the game.")
+        text['orange_potion_refill'] = CompressedTextMapper.convert("This rare orange potion will give you unlimited magic, but only until you die or quit the game.")
         text['end_pad_data'] = bytearray([0xFB])
         text['terminator'] = bytearray([0xFF, 0xFF])