diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 0c74162e81..72d09d33a3 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -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 diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index f403a79254..13f910c7ec 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -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 diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 14755a4cf9..3a72842f49 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -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] = diff --git a/test/battle/move_effect/matcha_gotcha.c b/test/battle/move_effect/matcha_gotcha.c index f1b76b5fcc..4071f7ca2f 100644 --- a/test/battle/move_effect/matcha_gotcha.c +++ b/test/battle/move_effect/matcha_gotcha.c @@ -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")