Pokemon Emerald: Un-exclude locations that must contain progression #2840
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this fixing or adding?
Caused/revealed by #2655 and found in the recent beta test. If one or more of the badge/hm locations is excluded, when Emerald's
pre_fill
tries to place shuffled badges or HMs onto those locations, it ignores them, doesn't place every badge/hm, and causes a lot of locations/items to become inaccessible. I thought settingallow_excluded=True
would protect against this, but I think I misunderstood what it does.This will prevent those locations from being excluded just before trying to give them to
fill_restrictive
, which will catch both the automatic exclusion of a couple post-goal locations in Petalburg and the manual exclusion by players.The same problem seems to appear if you exclude a location that Emerald converts to unrandomized event locations, like badges or key items like bikes.
How was this tested?
Generated a few seeds before and after the change with either
norman
goal andshuffle
badges or manually excluding a badge location withshuffle
badges. Also forvanilla
badges with a badge location manually excluded. Seeds that fail without the change don't fail with the change.