Skip to content

Adding in 2 missing locations #2525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dotzo wants to merge 3 commits into
base: Dev
Choose a base branch
from
+15 −4
Open

Adding in 2 missing locations #2525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
790fea9
Adding in 2 missing locations
dotzo Jan 31, 2026
0f4d474
remove comma
dotzo Feb 1, 2026
3129b54
stupid commas
dotzo Feb 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions LocationList.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2503,6 +2503,9 @@ def shop_address(shop_id: int, shelf_id: int) -> int:
("Ganons Castle MQ Water Trial Silver Rupee Red Ice", ("SilverRupee", 0x0D, (3,0,10), None, 'Silver Rupee (Ganons Castle Water Trial)', ("Ganon's Castle MQ", "Master Quest", "Silver Rupees",))),
("Ganons Castle MQ Water Trial Silver Rupee Above Void", ("SilverRupee", 0x0D, (3,0,11), None, 'Silver Rupee (Ganons Castle Water Trial)', ("Ganon's Castle MQ", "Master Quest", "Silver Rupees",))),

# Ganon's Castle MQ Wonderitems
("Ganons Castle MQ Shadow Trial Explosives Wonderitem", ("Wonderitem", 0x0D, (12,0,13), None, 'Deku Nuts (5)', ("Ganon's Castle MQ", "Master Quest", "Wonderitems",))),

# Ganon's Castle Shared
("Ganons Tower Boss Key Chest", ("Chest", 0x0A, 0x0B, None, 'Boss Key (Ganons Castle)', ("Ganon's Tower", "Vanilla Dungeons", "Master Quest", "Chests",))),

Expand Down Expand Up @@ -2545,6 +2548,7 @@ def shop_address(shop_id: int, shelf_id: int) -> int:
("Fairy Pot", ("Drop", None, None, None, 'Fairy', None)),
("Free Fairies", ("Drop", None, None, None, 'Fairy', None)),
("Wall Fairy", ("Drop", None, None, None, 'Fairy', None)),
("Bombable Fairy", ("Drop", None, None, None, 'Fairy', None)),
("Butterfly Fairy", ("Drop", None, None, None, 'Fairy', None)),
("Gossip Stone Fairy", ("Drop", None, None, None, 'Fairy', None)),
("Bean Plant Fairy", ("Drop", None, None, None, 'Fairy', None)),
Expand Down
5 changes: 4 additions & 1 deletion data/Glitched World/Ganons Castle MQ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,10 @@
"locations": {
"Ganons Castle MQ Shadow Trial Silver Rupee Moving Platform": "True",
"Ganons Castle MQ Shadow Trial Silver Rupee Bomb Flower": "True",
"Ganons Castle MQ Shadow Trial Silver Rupee First Beamos": "True"
"Ganons Castle MQ Shadow Trial Silver Rupee First Beamos": "True",
"Ganons Castle MQ Shadow Trial Explosives Wonderitem": "
at('Ganons Castle Shadow Trial', can_use(Bow)) or
has_explosives or Progressive_Strength_Upgrade or can_use(Dins_Fire) or can_gdv"
},
"exits": {
"Ganons Castle Shadow Trial Second Gap": "Hover_Boots or has_fire_source or logic_shadow_trial_mq"
Expand Down
3 changes: 2 additions & 1 deletion data/Glitched World/Jabu Jabus Belly MQ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@
"Jabu Jabus Belly MQ Falling Like Like Room Pot 1": "True",
"Jabu Jabus Belly MQ Falling Like Like Room Pot 2": "True",
"Jabu Jabus Belly MQ Hallway Small Crate 1": "True",
"Jabu Jabus Belly MQ Hallway Small Crate 2": "True"
"Jabu Jabus Belly MQ Hallway Small Crate 2": "True",
"Bombable Fairy": "has_bottle and has_explosives"
},
"exits": {
"Jabu Jabus After Right Tentacle": "Jabu_Jabus_Belly_Right_Tentacle_Cleared"
Expand Down
4 changes: 3 additions & 1 deletion data/World/Ganons Castle MQ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@
"locations": {
"Ganons Castle MQ Shadow Trial Silver Rupee Moving Platform": "True",
"Ganons Castle MQ Shadow Trial Silver Rupee Bomb Flower": "True",
"Ganons Castle MQ Shadow Trial Silver Rupee First Beamos": "True"
"Ganons Castle MQ Shadow Trial Silver Rupee First Beamos": "True",
"Ganons Castle MQ Shadow Trial Explosives Wonderitem": "
has_explosives or Bow or Progressive_Strength_Upgrade or can_use(Dins_Fire)"
},
"exits": {
"Ganons Castle Shadow Trial Second Gap": "Hover_Boots or has_fire_source or logic_shadow_trial_mq"
Expand Down
3 changes: 2 additions & 1 deletion data/World/Jabu Jabus Belly MQ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@
"Jabu Jabus Belly MQ Falling Like-Like Room Explosives Wonderitem 2": "has_explosives",
"Jabu Jabus Belly MQ Falling Like-Like Room Explosives Wonderitem 3": "has_explosives",
"Jabu Jabus Belly MQ Hallway Small Crate 1": "True",
"Jabu Jabus Belly MQ Hallway Small Crate 2": "True"
"Jabu Jabus Belly MQ Hallway Small Crate 2": "True",
"Bombable Fairy": "has_bottle"
},
"exits": {
"Jabu Jabus Belly Past Big Octo": "Sticks or (can_use(Dins_Fire) and Kokiri_Sword)"
Expand Down