upcoming merge (but with 2 failing tests) #2
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
* RandomChance macro, contact ability chance config * Unify config, add shed skin
* Fix caught wild pokemon not restoring their used held item * Actually we can use the same struct
* Contrary stat drop anim with Spectral Thief * Are you happy now agbcc? I hope I w
* Tests for Corrosion, Acrobatics, Hone Claws, Hurricane * First review feedback * Re-review feedback * Update acrobatics.c * Review feedback, Sky Drop? * Separate Sky Drop test
Fix build on NixOS and add instructions to INSTALL.md
Co-authored-by: AlexOn1ine <[email protected]>
Fix pokeemerald-expansion reference in INSTALL.md
* Fix fury cutter scaling up to 640 power * Replace three instances of int i with one int turn * dynamic test
* apply safe switching to trainer doubles battles - with a config * get rid of the config * make it compile
* Don't assume bash is at /bin/bash * Add NixOS install instructions * Add support for LF line endings to gbagfx --------- Co-authored-by: leo60228 <[email protected]> Co-authored-by: Martin Griffin <[email protected]> Co-authored-by: Alex Nash <[email protected]>
* Fix Toxic Chain file acting up * Fix item dupe glitch
* consolidated gimmick checks, triggers, communication, and activation; updated test runner * fixed improper use of .usableGimmick * cleaning up battle_dynamax.c, changing function args to u32s * fixed '#ifdef TESTING' causing errors * updated z-moves to use gimmick interface, pared down redundancies; no AI/tests * added support for z-moves in tests, consolidated gimmick fields * removed ShouldUseMaxMove and .usingMaxMove * renamed TryChangeZIndicator, updated z move display * added several z-move tests and fixed various z-move interactions; fixed z-move category calc * fixed useless battler arg in GetTypeBasedZMove * added basic test check for bad Z-Move or Mega usage * reworked test runner gimmick functionality; added support for Ultra Burst + Z-Move to test Light That Burns the Sky * fixed gimmick test logic; fixed damage category override * fixed mega rayquaza test fail * consolidated gimmick indicator logic; added graphics to gGimmicksInfo * removed TeraData struct * reimplemented AI logic for Z-Moves; no changes * updated Z-Move and Ultra Burst trigger gfx * added testrunner check for multiple gimmick use * fixed duplicate z-move call in test * reorganized data/graphics/gimmicks.h * added signature Z-Move ability tests; implemented Guardian of Alola * fixed bad test update * fixed Thousand Arrows not affecting Tera Flying; clean-up * fixed -ate tests * fixed tera tests * fixed tera tests really * fixed last batch of tests * fixed -ate mega test again * code review * code review pt.2 * tweaked CanTera again * dynamax flag only required for player
… same turn (#4864) * Multiple switch-ins after fainting * empty new lines * Fix failing tests
* simple button config for the move description menu * change from preproc to normal if
Co-authored-by: Hedara <[email protected]>
* Move relearner now displays move category * Update move_relearner.c * Update move_relearner.c * Address reviews
Fix two small text errors in follower dialogue
* Changed type1 and type2 in gBattleMons to match gSpeciesInfo * Changed monType1 and monType2 to monTypes to match gSpeciesInfo
…eemerald into pretmerge7aug
…089) * Fix switch AI bug * Forgot to save a file lol * Fix infinite loop test compatibility
Co-authored-by: Bassoonian <[email protected]>
Co-authored-by: Hedara <[email protected]>
* Dynamic Hidden Power Types * Dynamic Ivy Cudgel is summary screens * Dynamic Move types * missed unnecessary comment that got left in * format cleanup, return cleanup, added Tera Blast and Tera Starstorm, Revelation dance fix-> now displays live type update when tera is selected during battle before move selection * forgot to revert config defaults * Update src/pokemon.c Co-authored-by: Alex <[email protected]> * if block spaces/ raging bull fix/ more condensing on checks/ reallocating config check/ tera blast fix (was displaying tera blast type on non tera'd mons in party when battler was tera'd) * revert configs * added Hail check to Weather Ball * Fixed agbcc compile/brackets/u32 changes * Quick fix to ensure Judgment/Techno Blast/Natural Gift are not affected by -ate abilities * Update src/pokemon_summary_screen.c --------- Co-authored-by: Alex <[email protected]>
* Converted default names to COMPOUND_STRINGs * Moved new game strings out to main_menu
* Turned Berry Blender NPC names into COMPOUND_STRINGS * Moved more berry blender unused text to the unused text section * Moved more Berry Blender text to Compound Strings * Revert "Moved more Berry Blender text to Compound Strings" This reverts commit d46c3f9. * Removed unused Berry Blender text
* Made perfect IV count into a granular setting * Fixed optional parameter comment in SPECIES_NONE
# Conflicts: # src/battle_controller_player.c
# Conflicts: # data/battle_scripts_1.s # include/battle_scripts.h # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c
AsparagusEduardo
changed the base branch from
upcoming
to
unify_battlescript_end
AlexOn1ine
approved these changes
Aug 10, 2024
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
Images
Issue(s) that this PR fixes
People who collaborated with me in this PR
Feature(s) this PR does NOT handle:
Discord contact info