Bugfix: mass outbreak encounters are not replaced by regular encounters if they are blocked by a repel#2289
Closed
FosterProgramming wants to merge 2 commits intopret:masterfrom
Closed
Conversation
…rs if they are blocked by a repel
Comment on lines
+615
to
+624
| #ifdef BUGFIX | ||
| // The bugfix prevents the game from trying to get a regular tall grass encounter on the same tile the repel blocked a mass outbreak encounter | ||
| if (DoMassOutbreakEncounterTest() == TRUE) | ||
| { | ||
| if (!SetUpMassOutbreakEncounter(WILD_CHECK_REPEL | WILD_CHECK_KEEN_EYE)) | ||
| return FALSE; | ||
| BattleSetup_StartWildBattle(); | ||
| return TRUE; | ||
| } | ||
| #else |
Member
There was a problem hiding this comment.
Preprocessor directives shouldn't add indentation levels (i.e., if one side were evaluated you should be left with correctly indented code)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This is super niche and could arguably be considered a feature not a bug. When you step on a new tall grass tile and the game decides to give you a wild encounter, it will in this order:
If you have a repel active and a pokemon with higher level than the chosen encounter, the encounter is skipped and you won't get an encounter until you step on another tile and happen to roll an encounter with a level high enough to bypass your repel EXCEPT for mass outbreak encounters which are bugged (arguably) and will still roll the local encounter table if you blocked the encounter with a repel.
So I added a preproc to fix that
Discord contact info
Jamie (foster_harmony)