Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Uproar attack battle script (#7715)

Browse Source
This commit is contained in:
Alex 2025-09-10 22:07:43 +02:00 committed by GitHub
parent 44c886e1c9
commit 05ed9f0d39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/battle_scripts_1.s
View File

@ -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

1
include/battle_scripts.h
View File

@ -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[];

2
src/data/battle_move_effects.h
View File

@ -826,7 +826,7 @@ const struct BattleMoveEffect gBattleMoveEffects[NUM_BATTLE_MOVE_EFFECTS] =
[EFFECT_UPROAR] =
{
.battleScript = BattleScript_EffectUproar,
.battleScript = BattleScript_EffectHit,
.battleTvScore = 4,
},