Mega evolution may change order #1914
Closed
Conversation
This file contains 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
Yeah, that's actually the whole point of the Issue ticket you just linked. To add a config so the user can choose their preferred Mega Evolution turn order behavior; Gen. 6's or Gen. 7's 👀 |
ExpoSeed
reviewed
Nov 17, 2021
src/battle_main.c
Outdated
| @@ -104,6 +104,7 @@ static void RunTurnActionsFunctions(void); | |||
| static void SetActionsAndBattlersTurnOrder(void); | |||
| static void sub_803CDF8(void); | |||
| static bool8 AllAtActionConfirmed(void); | |||
| static void CheckIfTurnOrderMustChangeAfterMega(void) | |||
There was a problem hiding this comment.
Suggested change
| static void CheckIfTurnOrderMustChangeAfterMega(void) | |
| static void CheckIfTurnOrderMustChangeAfterMega(void); |
LOuroboros
reviewed
Nov 17, 2021
include/constants/battle_config.h
Outdated
| @@ -92,6 +92,9 @@ | |||
| #define GEN_8 5 | |||
| #endif | |||
|
|
|||
| // Mega Evolution settings | |||
| #define B_MEGA_INFO_CHANGE_ORDER GEN_7 // In gen6, mega evolving doesn't change the turn order the turn you mega evolve. This is fixed in gen 7 | |||
There was a problem hiding this comment.
Suggested change
| #define B_MEGA_INFO_CHANGE_ORDER GEN_7 // In gen6, mega evolving doesn't change the turn order the turn you mega evolve. This is fixed in gen 7 | |
| #define B_MEGA_EVOLUTION_TURN_ORDER GEN_7 // In Gen7, a Pokémon's Speed after Mega Evolution is used to determine turn order, not its Speed before. |
LOuroboros
reviewed
Nov 17, 2021
src/battle_main.c
Outdated
| @@ -4687,7 +4688,39 @@ static void CheckMegaEvolutionBeforeTurn(void) | |||
| } | |||
| } | |||
| } | |||
| if (B_MEGA_EVO_CHANGE_ORDER <= GEN_6) | |||
There was a problem hiding this comment.
Suggested change
| if (B_MEGA_EVO_CHANGE_ORDER <= GEN_6) | |
| if (B_MEGA_EVOLUTION_TURN_ORDER <= GEN_6) |
AsparagusEduardo
pushed a commit
that referenced
this pull request
Aug 31, 2023
Added newer decomp projects to readme
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
#535 raises a problem with mega evolution.
This PR should solve it.
EDIT: After several tests, this works the intended way. However, it may be interesting ti include other turn order calculation in this PR. For example:
-Weather is sandstorm, double battle, start of a turn
-Cacturn' sand rush is active
-One mon switches-out/another switches in, with drizzle
-Drizzle is triggered, sand rush shouldn't be considered this turn, but with the current system it is, because an action during the battle phase changed the turn order, but it wasn't recalculated.
Same logic can be applied with tailwind used in double battles, and possibly other scenari I haven't thought about.
This is a change brought in gen 8. Should this be done in another PR?