From cc6e55c8e25026c614b1fdecfc61ac32cb779345 Mon Sep 17 00:00:00 2001 From: Zunawe Date: Sun, 17 Nov 2024 19:31:33 -0800 Subject: [PATCH 1/2] Pokemon Emerald: Exclude sacred ash post champion --- worlds/pokemon_emerald/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/worlds/pokemon_emerald/__init__.py b/worlds/pokemon_emerald/__init__.py index a87f93ece56b..fe3a5d6b0501 100644 --- a/worlds/pokemon_emerald/__init__.py +++ b/worlds/pokemon_emerald/__init__.py @@ -288,6 +288,12 @@ def exclude_locations(location_names: List[str]): "Safari Zone SE - Hidden Item in South Grass 2", "Safari Zone SE - Item in Grass", ]) + + # Sacred ash is on Navel Rock, which is locked behind the event tickets + if not self.options.event_tickets.value: + exclude_locations([ + "Navel Rock Top - Hidden Item Sacred Ash", + ]) elif self.options.goal == Goal.option_steven: exclude_locations([ "Meteor Falls 1F - Rival Steven", From cc1e95c92f09e9ad74bb9850e06871521cfdc724 Mon Sep 17 00:00:00 2001 From: Zunawe Date: Mon, 2 Dec 2024 17:11:35 -0800 Subject: [PATCH 2/2] Pokemon Emerald: Remove .value from toggle option check --- worlds/pokemon_emerald/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/pokemon_emerald/__init__.py b/worlds/pokemon_emerald/__init__.py index fe3a5d6b0501..ab18c68eb3c6 100644 --- a/worlds/pokemon_emerald/__init__.py +++ b/worlds/pokemon_emerald/__init__.py @@ -290,7 +290,7 @@ def exclude_locations(location_names: List[str]): ]) # Sacred ash is on Navel Rock, which is locked behind the event tickets - if not self.options.event_tickets.value: + if not self.options.event_tickets: exclude_locations([ "Navel Rock Top - Hidden Item Sacred Ash", ])