Merge branch 'OriginOverworldShuffle' into OverworldShuffle

InitialSram.py

@@ -132,6 +132,16 @@ class InitialSram:
             equip[0x37B] = 1
             equip[0x36E] = 0x80
 
+        if startingstate.has('Return Old Man', player):
+            self._initial_sram_bytes[0x410] |= 0x01
+
+        if startingstate.has('Beat Agahnim 1', player):
+            self.pre_open_lumberjack()
+            if world.mode[player] == 'standard':
+                self.set_progress_indicator(0x80)
+            else:
+                self.set_progress_indicator(0x03)
+
         for item in world.precollected_items:
             if item.player != player:
                 continue
@@ -144,7 +154,8 @@ class InitialSram:
                              'L5 Net', 'L4 Net', 'L3 Net', 'L2 Net', 'L1 Net', 'Progressive Net',
                              'Mirror Shield', 'Red Shield', 'Blue Shield', 'Progressive Shield',
                              'Red Mail', 'Blue Mail', 'Progressive Armor',
-                             'Magic Upgrade (1/4)', 'Magic Upgrade (1/2)']:
+                             'Magic Upgrade (1/4)', 'Magic Upgrade (1/2)',
+                             'Return Old Man', 'Beat Agahnim 1']:
                 continue
 
             set_table = {'Book of Mudora': (0x34E, 1), 'Hammer': (0x34B, 1), 'Bug Catching Net': (0x34D, 1), 'Hookshot': (0x342, 1), 'Magic Mirror': (0x353, 2),