diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index b1b7c76616..af5f7aa49d 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3915,13 +3915,6 @@ BattleScript_NotAffectedAbilityPopUp:: waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd -BattleScript_EffectUproar:: - attackcanceler - accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE - jumpifvolatile BS_ATTACKER, VOLATILE_MULTIPLETURNS, BattleScript_UproarHit -BattleScript_UproarHit:: - goto BattleScript_HitFromCritCalc - BattleScript_EffectStockpile:: attackcanceler stockpile 0 diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 00bce64623..dc64b88e07 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -678,7 +678,6 @@ extern const u8 BattleScript_EffectSemiInvulnerable[]; extern const u8 BattleScript_EffectDefenseCurl[]; extern const u8 BattleScript_EffectSoftboiled[]; extern const u8 BattleScript_EffectFirstTurnOnly[]; -extern const u8 BattleScript_EffectUproar[]; extern const u8 BattleScript_EffectStockpile[]; extern const u8 BattleScript_EffectSpitUp[]; extern const u8 BattleScript_EffectSwallow[]; diff --git a/src/data/battle_move_effects.h b/src/data/battle_move_effects.h index 7c855ff1bd..3816548ba5 100644 --- a/src/data/battle_move_effects.h +++ b/src/data/battle_move_effects.h @@ -826,7 +826,7 @@ const struct BattleMoveEffect gBattleMoveEffects[NUM_BATTLE_MOVE_EFFECTS] = [EFFECT_UPROAR] = { - .battleScript = BattleScript_EffectUproar, + .battleScript = BattleScript_EffectHit, .battleTvScore = 4, },