modern: merge upcoming #24
Merged
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
…, Malodor, Stun Shock, Gold Rush, Cuddle, Terror, Meltdown, Smite
* Seed RNG before setUp Co-authored-by: Martin Griffin <[email protected]>
* Snow weather animation * Update battle_anim_scripts.s * Apply changes from review
* Fixed duplicated test names * Test improvements for Jaboca, Kee and Rowap Berries Co-authored-by: Alex <[email protected]> * Lansat Berry test improvements Co-authored-by: Alex <[email protected]> * Jaboca Berry/Bug Bite interaction test Co-authored-by: Alex <[email protected]> --------- Co-authored-by: Alex <[email protected]>
TODO: Detect illegal opcodes in the test runner because mgba-rom-test evaluates them very slowly, making the TIMEOUT mechanism effectively realtime.
Silences a warning about an invalid pointer when building with modern.
* Made Reflect Type handle 3rd types Misc: -Turned VARIOUS_TRY_REFLECT_TYPE into a callnative (BS_TryReflectType) -Introduced a macro to to check for typeless Pokémon (Pokémon who have Mystery in all 3 type slots) in battle. -Made the new BS_TryReflectType take into account the forms for Arceus and Silvally, rather than just their default form.
* Mon animation names * Moved indicator code so it follows the same standards as the other indicators * Whitespace * Fixed modern compile * Fixed issue that caused Low Key Toxtricity learning Amped moves when Gigantamaxed
* Fixed Aegislash test not being properly made. * Added conditions to BattleSetup_StartLegendaryBattle switch
# Conflicts: # asm/macros/battle_script.inc # src/battle_script_commands.c
Fix Purifying Salt to be immune to statuses from secondary effects.
AsparagusEduardo
merged commit 73365ba
into
AsparagusEduardo:RHH/pr/upcoming/modern
1 check passed
AsparagusEduardo
pushed a commit
that referenced
this pull request
Apr 19, 2024
Implement mosaic graphic feature
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.
That's a lot of commits, but I'm pretty sure they're all supposed to be there and it's just that
upcominghas been very busy (we didn't squash Dynamax?!) 😅