Change to setting from default setting

OoTRandomizer · Nov 5, 2024 · 9779092 · 9779092
1 parent 53a6bad
commit 9779092
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 27 deletions.
diff --git a/ASM/build/asm_symbols.txt b/ASM/build/asm_symbols.txt
diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm
@@ -4168,5 +4168,4 @@ DemoEffect_DrawJewel_AfterHook:
 .include "hacks/ovl_obj_mure3.asm"
 .include "hacks/z_parameter.asm"
 .include "hacks/z_file_choose.asm"
-.include "hacks/ovl_en_sth.asm"
 .include "hacks/ovl_en_ssh.asm"
diff --git a/ASM/src/hacks/ovl_en_sth.asm b/ASM/src/hacks/ovl_en_sth.asm
diff --git a/ItemPool.py b/ItemPool.py
@@ -671,6 +671,10 @@ def get_pool_core(world: World) -> tuple[list[str], dict[str, Item]]:
         elif location.scene == 0x54 and location.vanilla_item == 'Rupees (50)':
             shuffle_item = world.settings.shuffle_frog_song_rupees
 
+        #100 Gold Skulltula Reward
+        elif location.scene == 0x50 and location.vanilla_item == 'Rupees (200)':
+            shuffle_item = world.settings.shuffle_100_skulltula_rupee
+
         # Hyrule Loach Reward
         elif location.scene == 0x49 and location.vanilla_item == 'Rupees (50)':
             shuffle_item = world.settings.shuffle_loach_reward != 'off'

diff --git a/Patches.py b/Patches.py
@@ -1853,6 +1853,9 @@ def update_scrub_text(message: bytearray, text_replacement: list[str], default_p
     if world.settings.tcg_requires_lens:
         rom.write_byte(rom.sym('TCG_REQUIRES_LENS'), 0x01)
 
+    if world.settings.shuffle_100_skulltula_rupee: # Set flag for recieving 100 skulltula reward if the setting is on
+        rom.write_int16(0xEA7164, 0x8000)
+
     if world.settings.shuffle_pots != 'off': # Update the first BK door in ganon's castle to use a separate flag so it can be unlocked to get to the pots
         patch_ganons_tower_bk_door(rom, 0x15) # Using flag 0x15 for the door. GBK doors normally use 0x14.
     locked_doors = get_doors_to_unlock(rom, world)

diff --git a/SettingsList.py b/SettingsList.py
@@ -2420,6 +2420,20 @@ class SettingInfos:
         },
     )
 
+    shuffle_100_skulltula_rupee = Checkbutton(
+        gui_text       = 'Shuffle 100 Skulltula Reward',
+        gui_tooltip    = '''\
+            Enabling this adds the repeatable Huge Rupee reward
+            from the Skulltula house to the item pool. This is obtained
+            by collection all 100 gold skulltulas. 
+        ''',
+        default        = False,
+        shared         = True,
+        gui_params     = {
+            'randomize_key': 'randomize_settings',
+        },
+    )
+
     shuffle_loach_reward = Combobox(
         gui_text       = 'Shuffle Hyrule Loach Reward',
         gui_tooltip    = '''\

diff --git a/data/generated/rom_patch.txt b/data/generated/rom_patch.txt
diff --git a/data/presets_default.json b/data/presets_default.json
@@ -87,6 +87,7 @@
         "shuffle_beans": false,
         "shuffle_expensive_merchants": false,
         "shuffle_frog_song_rupees": false,
+        "shuffle_100_skulltula_rupee": false,
         "shuffle_loach_reward": "off",
         "shuffle_individual_ocarina_notes": false,
         "shuffle_dungeon_rewards": "reward",
@@ -107,7 +108,6 @@
             "Deku Theater Mask of Truth",
             "Kak 40 Gold Skulltula Reward",
             "Kak 50 Gold Skulltula Reward",
-            "Kak 100 Gold Skulltula Reward",
             "GF HBA 1500 Points"
         ],
         "allowed_tricks": [],
@@ -285,6 +285,7 @@
         "shuffle_beans": false,
         "shuffle_expensive_merchants": false,
         "shuffle_frog_song_rupees": false,
+        "shuffle_100_skulltula_rupee": false,
         "shuffle_loach_reward": "off",
         "shuffle_individual_ocarina_notes": false,
         "shuffle_dungeon_rewards": "reward",
@@ -302,8 +303,7 @@
         "enhance_map_compass": false,
         "logic_no_night_tokens_without_suns_song": false,
         "disabled_locations": [
-            "Deku Theater Mask of Truth",
-            "Kak 100 Gold Skulltula Reward"
+            "Deku Theater Mask of Truth"
         ],
         "allowed_tricks": [
             "logic_grottos_without_agony",
@@ -490,6 +490,7 @@
         "shuffle_beans": false,
         "shuffle_expensive_merchants": false,
         "shuffle_frog_song_rupees": false,
+        "shuffle_100_skulltula_rupee": false,
         "shuffle_loach_reward": "off",
         "shuffle_individual_ocarina_notes": false,
         "shuffle_dungeon_rewards": "reward",
@@ -507,8 +508,7 @@
         "enhance_map_compass": false,
         "logic_no_night_tokens_without_suns_song": false,
         "disabled_locations": [
-            "Deku Theater Mask of Truth",
-            "Kak 100 Gold Skulltula Reward"
+            "Deku Theater Mask of Truth"
         ],
         "allowed_tricks": [
             "logic_fewer_tunic_requirements",
@@ -700,6 +700,7 @@
         "shuffle_beans": false,
         "shuffle_expensive_merchants": false,
         "shuffle_frog_song_rupees": false,
+        "shuffle_100_skulltula_rupee": false,
         "shuffle_loach_reward": "off",
         "shuffle_individual_ocarina_notes": false,
         "shuffle_dungeon_rewards": "reward",
@@ -717,8 +718,7 @@
         "enhance_map_compass": false,
         "logic_no_night_tokens_without_suns_song": false,
         "disabled_locations": [
-            "Deku Theater Mask of Truth",
-            "Kak 100 Gold Skulltula Reward"
+            "Deku Theater Mask of Truth"
         ],
         "allowed_tricks": [
             "logic_fewer_tunic_requirements",
@@ -915,6 +915,7 @@
         "shuffle_beans": false,
         "shuffle_expensive_merchants": false,
         "shuffle_frog_song_rupees": false,
+        "shuffle_100_skulltula_rupee": false,
         "shuffle_loach_reward": "off",
         "shuffle_individual_ocarina_notes": false,
         "shuffle_dungeon_rewards": "reward",
@@ -935,7 +936,6 @@
             "Deku Theater Mask of Truth",
             "Kak 40 Gold Skulltula Reward",
             "Kak 50 Gold Skulltula Reward",
-            "Kak 100 Gold Skulltula Reward",
             "GF HBA 1500 Points"
         ],
         "allowed_tricks": [
@@ -1123,6 +1123,7 @@
         "shuffle_beans": false,
         "shuffle_expensive_merchants": false,
         "shuffle_frog_song_rupees": false,
+        "shuffle_100_skulltula_rupee": false,
         "shuffle_loach_reward": "off",
         "shuffle_individual_ocarina_notes": false,
         "shuffle_dungeon_rewards": "reward",
@@ -1142,8 +1143,7 @@
         "disabled_locations": [
             "Deku Theater Mask of Truth",
             "Kak 40 Gold Skulltula Reward",
-            "Kak 50 Gold Skulltula Reward",
-            "Kak 100 Gold Skulltula Reward"
+            "Kak 50 Gold Skulltula Reward"
         ],
         "allowed_tricks": [
             "logic_fewer_tunic_requirements",
@@ -1359,6 +1359,7 @@
         "shuffle_beans": true,
         "shuffle_expensive_merchants": true,
         "shuffle_frog_song_rupees": true,
+        "shuffle_100_skulltula_rupee": true,
         "shuffle_loach_reward": "vanilla",
         "shuffle_individual_ocarina_notes": true,
         "shuffle_dungeon_rewards": "anywhere",
@@ -1721,6 +1722,7 @@
         "shuffle_beans": false,
         "shuffle_expensive_merchants": false,
         "shuffle_frog_song_rupees": false,
+        "shuffle_100_skulltula_rupee": false,
         "shuffle_loach_reward": "off",
         "shuffle_individual_ocarina_notes": false,
         "shuffle_dungeon_rewards": "reward",
@@ -1741,8 +1743,7 @@
             "Deku Theater Mask of Truth",
             "ZR Frogs Ocarina Game",
             "Kak 40 Gold Skulltula Reward",
-            "Kak 50 Gold Skulltula Reward",
-            "Kak 100 Gold Skulltula Reward"
+            "Kak 50 Gold Skulltula Reward"
         ],
         "allowed_tricks": [
             "logic_grottos_without_agony",
@@ -1920,6 +1921,7 @@
         "shuffle_beans": false,
         "shuffle_expensive_merchants": false,
         "shuffle_frog_song_rupees": false,
+        "shuffle_100_skulltula_rupee": false,
         "shuffle_loach_reward": "off",
         "shuffle_individual_ocarina_notes": false,
         "shuffle_dungeon_rewards": "reward",
@@ -1947,8 +1949,7 @@
             "Ganons Castle Deku Scrub Center-Left",
             "Ganons Castle Deku Scrub Center-Right",
             "Ganons Castle Deku Scrub Right",
-            "Ganons Castle Deku Scrub Left",
-            "Kak 100 Gold Skulltula Reward"
+            "Ganons Castle Deku Scrub Left"
         ],
         "allowed_tricks": [
             "logic_fewer_tunic_requirements",
@@ -2150,6 +2151,7 @@
         "shuffle_beans": false,
         "shuffle_expensive_merchants": false,
         "shuffle_frog_song_rupees": false,
+        "shuffle_100_skulltula_rupee": false,
         "shuffle_loach_reward": "off",
         "shuffle_individual_ocarina_notes": false,
         "shuffle_dungeon_rewards": "reward",
@@ -2169,8 +2171,7 @@
         "disabled_locations": [
             "Deku Theater Mask of Truth",
             "Kak 40 Gold Skulltula Reward",
-            "Kak 50 Gold Skulltula Reward",
-            "Kak 100 Gold Skulltula Reward"
+            "Kak 50 Gold Skulltula Reward"
         ],
         "allowed_tricks": [
             "logic_fewer_tunic_requirements",
@@ -2359,6 +2360,7 @@
         "shuffle_beans": true,
         "shuffle_expensive_merchants": true,
         "shuffle_frog_song_rupees": true,
+        "shuffle_100_skulltula_rupee": false,
         "shuffle_loach_reward": "off",
         "shuffle_individual_ocarina_notes": false,
         "shuffle_dungeon_rewards": "reward",
@@ -2375,9 +2377,7 @@
         "silver_rupee_pouches": [],
         "enhance_map_compass": false,
         "logic_no_night_tokens_without_suns_song": false,
-        "disabled_locations": [
-            "Kak 100 Gold Skulltula Reward"
-        ],
+        "disabled_locations": [],
         "allowed_tricks": [],
         "starting_equipment": [],
         "starting_inventory": [

diff --git a/data/settings_mapping.json b/data/settings_mapping.json
@@ -209,6 +209,7 @@
             "shuffle_beans",
             "shuffle_expensive_merchants",
             "shuffle_frog_song_rupees",
+            "shuffle_100_skulltula_rupee",
             "shuffle_loach_reward",
             "shuffle_individual_ocarina_notes"
           ]