Version 1.3.0 #2447
Merged
Version 1.3.0 #2447
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
Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.
The "x was hit with recoil!" message was appearing when the target was immune due to protection or an ability - this should fix that and handle any other cases where 0 damage is dealt.
Make these effects endure one hit of a multi strike move, not all of them.
Bug Bite's effect should only occur on the final strike of Parental Bond (which can also be the first strike if it KO's the target).
This removes the need to have separate move effects for Twineedle, Double Iron Bash, and any custom two strike moves.
Had a define in a comment, which offset all the new move effects and misaligned their battle scripts.
Removing move effects above the ones that have stat change animations causes the wrong stat change to be shown, so I've reordered the list to fix that.
This reverts commit be51860.
Fixed it properly this time!
This is now checked in SetMoveEffect instead of in each move that should behave this way. Some effects will need to be redone to make them play nice with this change, but some just work as is.
Now works properly with and without Parental Bond. It wasn't broken before, but its interaction with Parental Bond was.
Only scatters coins on the first hit of Parental Bond.
Not sure if this should hit twice. If not, this works.
Dragon Tail, Natural Gift, Spit Up all hit twice now. Could maybe use isparentalbondlaststrike instead of some of the other checks too.
Bide no longer gets stuck in a loop, but also doesn't strike twice.
Add animation data provided by Mr. Dollsteak for all gen 1-6 Pokémon (barring megas).
GF Header and Modern Builds
Fixed Bad Dream's ability popup message
GF Header and Modern Builds
Updated CanTeleport
Misc: -Made the ability pop up stick around until the ability's effect ends just like in ORAS. -Updated sText_BadDreamsDmg accordingly while I was at it.
Redo Bug Bite
Config for Dark Void being only usable by Darkrai
Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System
Optimized Bad Dreams' code
Fixed indentation in ScrCmd_faceplayer
…_20221030 # Conflicts: # src/pokemon_storage_system.c
# Conflicts: # src/rom_header_gf.c
…20221030 Support for Porymap 5.0.0 (pret merge 2022-10-30)
|
Set as draft until #2448 is fixed. |
Uncommented level up moves
Issue #2448 Haven't tested extensively, but regular Berries work and Bug Bite w/ Berries also works. I believe this line was missing by accident (you can look at the merged Bug Bite PR #2433 to see that this line was deleted and never replaced).
Fix Berries that were broken after Bug Bite fix
|
Issue fixed, ready for merge. |
ghoulslash
approved these changes
Nov 18, 2022
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.
Changelog preview
Added
Changed
Fixed
Pret merges
Cleanup
New Contributors
Full Changelog: expansion/1.2.0...expansion/1.3.0
Discord contact info
AsparagusEduardo#6051