Adds some gen9 moves #3147
Merged
Adds some gen9 moves #3147
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
DizzyEggg
requested changes
Jul 18, 2023
data/battle_scripts_1.s
Outdated
| @@ -432,6 +432,22 @@ gBattleScriptsForMoveEffects:: | |||
| .4byte BattleScript_EffectInfernalParade @ EFFECT_INFERNAL_PARADE | |||
| .4byte BattleScript_EffectTakeHeart @ EFFECT_TAKE_HEART | |||
| .4byte BattleScript_EffectAxeKick @ EFFECT_AXE_KICK | |||
| .4byte BattleScript_EffectHit @ EFFECT_COLLISION_COURSE | |||
| .4byte BattleScript_EffectSpinOut @ EFFECT_SPIN_OUT | |||
test/move_effect_make_it_rain.c
Outdated
| ASSUME(gBattleMoves[MOVE_MAKE_IT_RAIN].effect == EFFECT_MAKE_IT_RAIN); | ||
| } | ||
|
|
||
| SINGLE_BATTLE_TEST("Make It Rain lowers special attack by 1 stage1") |
There was a problem hiding this comment.
This test should also have comparisions of dmg, to see if the the damage dealt after the stat loss is lower than before.
DizzyEggg
requested changes
Jul 19, 2023
data/battle_scripts_1.s
Outdated
| waitmessage B_WAIT_TIME_LONG | ||
| resultmessage | ||
| waitmessage B_WAIT_TIME_LONG | ||
| return |
src/battle_util.c
Outdated
| @@ -9484,6 +9484,10 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move | |||
| finalModifier = uq4_12_multiply(finalModifier, UQ_4_12(1.5)); | |||
| } | |||
|
|
|||
| // Collision Course, Electro Drift | |||
| if (gBattleMoves[move].effect == EFFECT_COLLISION_COURSE && typeEffectivenessModifier >= UQ_4_12(2.0)) | |||
| finalModifier = uq4_12_multiply(finalModifier, UQ_4_12(1.33)); | |||
There was a problem hiding this comment.
Showdown says it actually boosts by 1.3333 instead of 1.33.
https://dex.pokemonshowdown.com/moves/collisioncourse
There was a problem hiding this comment.
Changed to 1.3333.
DizzyEggg
approved these changes
Jul 19, 2023
|
@AsparagusEduardo Should it go to upcoming or master actually? 🤔 |
They're new move effects, so into upcoming they go. |
This was referenced Jul 19, 2023
Closed
Merged
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
Adds:
EFFECT_COLLISION_COURSEEFFECT_SPIN_OUTEFFECT_MAKE_IT_RAINThe
EFFECT_MAKE_IT_RAINscript is basically a copy from Lunos but in doing so I also cleaned up some existing code, included the effect insIgnoredPowerfulMoveEffectsand added a Test for all three effects.Also changed a score value when checking for Contrary to avoid situation like this:
I think that +3 should be enough when Contrary is present.
And I removed
EFFECT_OVERHEATfrom HPAware. I don't think it is needed there since it is already present insIgnoredPowerfulMoveEffectsIssue(s) that this PR fixes
Fixes #2492
Fixes #2501
Fixes #2502
Fixes #2503
Discord contact info
rainonline