Updated Dynamax branch to Upcoming + Fixes #3
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
Correct KEY_INTR_ENABLE
Handful of fixes related to MAX_MON_MOVES
…3218) * Add missing absorbing abilities to FindMonThatAbsorbsOpponentsMove * Use array to match ability to absorbing type Previous implementation involving piggybacking on a conditional in a bit of a messy fashion to check for each ability type, this should be more readable and more easily modified by a novice. This is almost exactly BuffelSaft's inclement emerald implementation. * Minor syntax fixes
* some gActiveBattler related fixes * fix IsBattleSEPlaying gActiveBattler->battlerId --------- Co-authored-by: ghoulslash <[email protected]>
Co-authored-by: sbird <[email protected]>
The battle script was originally making an extra call to attackcanceler and attackstring pointlessly whenever there was a jump to BattleScript_EffectBatonPass. This commit addresses that by relocating BattleScript_EffectTeleport's own calls to attackcanceler and attackstring.
* initial commit * done * clean up
* Run assumptions on all runners * Make i const in battle tests This avoids the pitfall of using i in a PARAMETRIZEd test and confusing the runner.
* Fix Wall Werror errors * fix hgss pokedex modern errors * tests build on modern * learnset change * Update src/battle_ai_util.c Co-authored-by: Philipp AUER <[email protected]> * Update src/battle_anim_new.c Co-authored-by: Philipp AUER <[email protected]> * Update src/debug.c Co-authored-by: Philipp AUER <[email protected]> * Update src/debug.c Co-authored-by: Philipp AUER <[email protected]> * Update src/pokedex_plus_hgss.c Co-authored-by: Philipp AUER <[email protected]> * review changes * unused cmd args * various args back --------- Co-authored-by: Philipp AUER <[email protected]>
* Catch OOM in tests * Alias gBattleTestRunnerState with sBackupMapData Reverts #3398 "Fix Broken Move Anims in Tests" which moved the AI logs to statically-allocated EWRAM_DATA instead of being part of gBattleTestRunnerState.
* Tests for 6 more abilities * Fix most of Egg's comments * Update Purifying Salt and Leaf Guard * Parenthesis fixes
* Fix Kee Berry and Custap Berry + Tests * add missing assumes * fix wrong test files * fix new line
…ld terrain intro text (#3410)
# Conflicts: # include/battle.h # include/constants/battle_move_effects.h # include/constants/battle_string_ids.h # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c
AgustinGDLV
pushed a commit
that referenced
this pull request
Feb 22, 2024
* SaveBlock3 in sector footers * Update load_save.c Since mgriffin is currently not available I took the liberty to edit the file. Hope it's fine. * SaveBlock3 in debug menu (#3) --------- Co-authored-by: DizzyEggg <[email protected]> Co-authored-by: Alex <[email protected]> Co-authored-by: psf <[email protected]>
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.
Description
ca101e9 - Updated AI to use non-dynamax HP (Leech Seed, Nightmare, Trap Damage, Hail, Sandstorm
6e1d4b4 - Fixed compile on modern + tests
c0540a3 - Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
3cb29f8 - gBattleCommunication ids
c61d187 - Removed hard-coded order for sGMaxMoveTable + failsafe for sMaxMoveTable
1acc0ba - Style fixes
4d4d566 - Undid flag
f830b07 - GMAX -> GIGANTAMAX
92a0b04 - Applied trigger fix from upstream
644fba2 - Gigantamax Flag
070ce21 - Fixed Max Overgrowth test
8f4c1e9 - Frostbite NonDynamaxMaxHP to mimic Burn
ed2d28b - Fixed erroneous species and item checks for Dynamax
0a84072 - Fixed 2 protection tests
Discord contact info