Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-27 21:20:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adds Tidy Up + minor Dragon Cheer follow up (#4136)

Browse Source 
* Adds Tidy Up + minor Dragon Cheer follow up

* improve tidy up script

* Add IncreaseTidyUpScore function

* remove useless calls

* 2 small tests and a correction for IncreasyTidyUpScore
This commit is contained in:
Alex
2024-02-18 20:00:36 +01:00
committed by GitHub
parent 7694628296
commit cd596fdd80
15 changed files with 248 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
data/battle_scripts_1.s
View File

@@ -20,6 +20,23 @@
.section script_data, "aw", %progbits
BattleScript_EffectTidyUp::
attackcanceler
attackstring
pause B_WAIT_TIME_MED
ppreduce
waitstate
trytidyup FALSE, BattleScript_EffectTidyUpDoMoveAnimation
goto BattleScript_EffectDragonDanceFromStatUp
BattleScript_EffectTidyUpDoMoveAnimation::
attackanimation
waitanimation
trytidyup TRUE, NULL
printstring STRINGID_TIDYINGUPCOMPLETE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_EffectDragonDanceFromStatUp
BattleScript_EffectUpperHand::
attackcanceler
tryupperhand BattleScript_FailedFromAtkString
@@ -5460,6 +5477,7 @@ BattleScript_EffectDragonDance::
attackcanceler
attackstring
ppreduce
BattleScript_EffectDragonDanceFromStatUp::
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_DragonDanceDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_DragonDanceDoMoveAnim::