Merge pull request Roman971#73 from fenhl/foolish-silver-rupees-v2

Add more conditionally foolish items
fenhl · Apr 14, 2023 · b15c1a0 · b15c1a0
2 parents 62094ec + 70fe503
commit b15c1a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ASM/c/item_table.c b/ASM/c/item_table.c
@@ -253,7 +253,6 @@ item_row_t item_table[] = {
     [0x00D5] = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x9019, 0x0197, 0x7E, no_upgrade, give_bombchus, 10, -1, NULL), // Bombchu Bag (10)
     [0x00D6] = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x9019, 0x0197, 0x7E, no_upgrade, give_bombchus,  5, -1, NULL), // Bombchu Bag (5)
 
-
     [0x00D7] = ITEM_ROW(0x4D,      SILVER_CHEST, 0x85, -1, 0x901B, 0x0198, 0x72, no_upgrade, give_silver_rupee, DODONGO_ID, 0x00, resolve_text_silver_rupees), // Silver Rupee (Dodongos Cavern Staircase)
     [0x00D8] = ITEM_ROW(0x4D,      SILVER_CHEST, 0x85, -1, 0x901C, 0x0198, 0x72, no_upgrade, give_silver_rupee, ICE_ID,     0x01, resolve_text_silver_rupees), // Silver Rupee (Ice Cavern Spinning Scythe)
     [0x00D9] = ITEM_ROW(0x4D,      SILVER_CHEST, 0x85, -1, 0x901D, 0x0198, 0x72, no_upgrade, give_silver_rupee, ICE_ID,     0x02, resolve_text_silver_rupees), // Silver Rupee (Ice Cavern Push Block)

diff --git a/World.py b/World.py
@@ -1265,6 +1265,8 @@ def update_useless_areas(self, spoiler):
             exclude_item_list.append('Silver Rupee Pouch (Spirit Temple Sun Block)')
         if self.settings.shuffle_pots in ('off', 'overworld') and self.settings.trials == 0:
             # These silver rupees only lock pots and trial completion
+            exclude_item_list.append('Silver Rupee (Ganons Castle Light Trial)')
+            exclude_item_list.append('Silver Rupee Pouch (Ganons Castle Light Trial)')
             exclude_item_list.append('Silver Rupee (Ganons Castle Fire Trial)')
             exclude_item_list.append('Silver Rupee Pouch (Ganons Castle Fire Trial)')
             exclude_item_list.append('Silver Rupee (Ganons Castle Shadow Trial)')
@@ -1273,6 +1275,10 @@ def update_useless_areas(self, spoiler):
             exclude_item_list.append('Silver Rupee Pouch (Ganons Castle Water Trial)')
             exclude_item_list.append('Silver Rupee (Ganons Castle Forest Trial)')
             exclude_item_list.append('Silver Rupee Pouch (Ganons Castle Forest Trial)')
+            if self.dungeon_mq['Ganons Castle'] and self.settings.shuffle_freestanding_items in ('off', 'overworld') and not self.shuffle_silver_rupees:
+                # MQ Ganon small keys only lock pots, freestanding recovery hearts, silver rupees, and trial completion
+                exclude_item_list.append('Small Key (Ganons Castle)')
+                exclude_item_list.append('Small Key Ring (Ganons Castle)')
 
         for i in self.item_hint_type_overrides['barren']:
             if i in exclude_item_list: