atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

matcha gotcha

Browse source
This commit is contained in:
Alex 2023-11-19 12:37:55 +01:00 committed by Nephrite
parent 1dadc79b8b
commit ba6d223f17
4 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/battle_scripts_1.s
View file

@ -436,7 +436,6 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit @ EFFECT_POPULATION_BOMB
.4byte BattleScript_EffectMortalSpin @ EFFECT_MORTAL_SPIN
.4byte BattleScript_EffectSaltCure @ EFFECT_SALT_CURE
.4byte BattleScript_EffectMatchaGotcha @ EFFECT_MATCHA_GOTCHA
.4byte BattleScript_EffectSyrupBomb @ EFFECT_SYRUP_BOMB
.4byte BattleScript_EffectHit @ EFFECT_IVY_CUDGEL
.4byte BattleScript_EffectMaxMove @ EFFECT_MAX_MOVE
@ -469,10 +468,6 @@ BattleScript_SyrupBombEndTurn::
BattleScript_SyrupBombTurnDmgEnd:
end2
BattleScript_EffectMatchaGotcha::
setmoveeffect MOVE_EFFECT_BURN
goto BattleScript_EffectAbsorb
BattleScript_EffectSaltCure:
call BattleScript_EffectHit_Ret
tryfaintmon BS_TARGET

11
include/constants/battle_move_effects.h
View file

@ -413,12 +413,11 @@
#define EFFECT_POPULATION_BOMB 407
#define EFFECT_MORTAL_SPIN 408
#define EFFECT_SALT_CURE 409
#define EFFECT_MATCHA_GOTCHA 410
#define EFFECT_SYRUP_BOMB 411
#define EFFECT_IVY_CUDGEL 412
#define EFFECT_MAX_MOVE 413
#define EFFECT_GLAIVE_RUSH 414
#define EFFECT_SYRUP_BOMB 410
#define EFFECT_IVY_CUDGEL 411
#define EFFECT_MAX_MOVE 412
#define EFFECT_GLAIVE_RUSH 413
#define NUM_BATTLE_MOVE_EFFECTS 415
#define NUM_BATTLE_MOVE_EFFECTS 414
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

6
src/data/battle_moves.h
View file

@ -14406,12 +14406,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
[MOVE_MATCHA_GOTCHA] =
{
.effect = EFFECT_MATCHA_GOTCHA,
.effect = EFFECT_ABSORB,
.power = 80,
.type = TYPE_GRASS,
.accuracy = 90,
.pp = 15,
.secondaryEffectChance = 20,
.target = MOVE_TARGET_BOTH,
.priority = 0,
.split = SPLIT_SPECIAL,
@ -14419,6 +14418,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.thawsUser = TRUE,
.metronomeBanned = TRUE,
.healBlockBanned = B_EXTRAPOLATED_MOVE_FLAGS,
ADDITIONAL_EFFECTS(
SECONDARY_EFFECT(MOVE_EFFECT_BURN, 20)
)
},
[MOVE_SYRUP_BOMB] =

3
test/battle/move_effect/matcha_gotcha.c
View file

@ -3,7 +3,8 @@
ASSUMPTIONS
{
ASSUME(gBattleMoves[MOVE_MATCHA_GOTCHA].effect == EFFECT_MATCHA_GOTCHA);
ASSUME(gBattleMoves[MOVE_MATCHA_GOTCHA].effect == EFFECT_ABSORB);
ASSUME(gBattleMoves[MOVE_MATCHA_GOTCHA].additionalEffects[0].moveEffect == MOVE_EFFECT_BURN);
}
SINGLE_BATTLE_TEST("Matcha Gotcha inflicts burn 20% of the time")