summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-11-06 15:52:58 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2019-11-06 15:52:58 -0500
commitd97eb6353d7f21c28983642dc94033e04bfb488b (patch)
tree3598f0b0137929cf56956442c4a132495576eb08
parent629cb532d8886ba5874b137cab6f148e29a1e753 (diff)
Sync battle script documentation with Emerald, 1
Diffstat
-rw-r--r--data/battle_scripts_1.s2337
-rw-r--r--include/constants/battle.h4
-rw-r--r--include/constants/battle_script_commands.h7
-rw-r--r--src/battle_main.c2
-rw-r--r--src/battle_script_commands.c10
5 files changed, 1183 insertions, 1177 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 22cb8e7e6..5ef182b53 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -18,7 +18,7 @@
.section script_data, "aw", %progbits
.align 2
-gBattleScriptsForMoveEffects:: @ 81D65A8
+gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit
.4byte BattleScript_EffectSleep
.4byte BattleScript_EffectPoisonHit
@@ -57,7 +57,7 @@ gBattleScriptsForMoveEffects:: @ 81D65A8
.4byte BattleScript_EffectLightScreen
.4byte BattleScript_EffectTriAttack
.4byte BattleScript_EffectRest
- .4byte BattleScript_EffectOhko
+ .4byte BattleScript_EffectOHKO
.4byte BattleScript_EffectRazorWind
.4byte BattleScript_EffectSuperFang
.4byte BattleScript_EffectDragonRage
@@ -234,24 +234,24 @@ gBattleScriptsForMoveEffects:: @ 81D65A8
.4byte BattleScript_EffectDragonDance
.4byte BattleScript_EffectCamouflage
-BattleScript_EffectHit:: @ 81D6900
- jumpifnotmove MOVE_SURF, BattleScript_81D6926
- jumpifnostatus3 BS_TARGET, STATUS3_UNDERWATER, BattleScript_81D6926
+BattleScript_EffectHit::
+ jumpifnotmove MOVE_SURF, BattleScript_HitFromAtkCanceler
+ jumpifnostatus3 BS_TARGET, STATUS3_UNDERWATER, BattleScript_HitFromAtkCanceler
orword gHitMarker, HITMARKER_IGNORE_UNDERWATER
setbyte sDMG_MULTIPLIER, 2
-BattleScript_81D6926:: @ 81D6926
+BattleScript_HitFromAtkCanceler::
attackcanceler
-BattleScript_81D6927:: @ 81D6927
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
-BattleScript_81D692E:: @ 81D692E
+BattleScript_HitFromAccCheck::
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
+BattleScript_HitFromAtkString::
attackstring
ppreduce
-BattleScript_HitFromCritCalc:: @ 81D6930
+BattleScript_HitFromCritCalc::
critcalc
damagecalc
typecalc
adjustnormaldamage
-BattleScript_81D6934:: @ 81D6934
+BattleScript_HitFromAtkAnimation::
attackanimation
waitanimation
effectivenesssound
@@ -260,69 +260,69 @@ BattleScript_81D6934:: @ 81D6934
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
- waitmessage 64
+ waitmessage 0x40
resultmessage
- waitmessage 64
+ waitmessage 0x40
seteffectwithchance
tryfaintmon BS_TARGET, 0, NULL
-BattleScript_MoveEnd:: @ 81D694E
+BattleScript_MoveEnd::
moveendall
end
-BattleScript_81D6958:: @ 81D6958
+BattleScript_MakeMoveMissed::
orbyte gMoveResultFlags, MOVE_RESULT_MISSED
-BattleScript_81D695E:: @ 81D695E
+BattleScript_PrintMoveMissed::
attackstring
ppreduce
-BattleScript_MoveMissedPause:: @ 81D6960
- pause 32
-BattleScript_81D6963:: @ 81D6963
+BattleScript_MoveMissedPause::
+ pause 0x20
+BattleScript_MoveMissed::
effectivenesssound
resultmessage
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectSleep:: @ 81D696D
+BattleScript_EffectSleep::
attackcanceler
attackstring
ppreduce
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_81D69B0
- jumpifcantmakeasleep BattleScript_81D69CC
- jumpifstatus BS_TARGET, STATUS1_FREEZE | STATUS1_SLEEP | STATUS1_POISON | STATUS1_TOXIC_POISON | STATUS1_PARALYSIS | STATUS1_BURN, BattleScript_ButItFailed
+ jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_AlreadyAsleep
+ jumpifcantmakeasleep BattleScript_CantMakeAsleep
+ jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
- jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_81D8B39
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
setmoveeffect MOVE_EFFECT_SLEEP
seteffectprimary
goto BattleScript_MoveEnd
-BattleScript_81D69B0:: @ 81D69B0
- pause 32
+BattleScript_AlreadyAsleep::
+ pause 0x20
printstring STRINGID_PKMNALREADYASLEEP
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D69BE:: @ 81D69BE
- pause 32
+BattleScript_WasntAffected::
+ pause 0x20
printstring STRINGID_PKMNWASNTAFFECTED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D69CC:: @ 81D69CC
- pause 32
+BattleScript_CantMakeAsleep::
+ pause 0x20
printfromtable gUproarAwakeStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectPoisonHit:: @ 81D69DC
+BattleScript_EffectPoisonHit::
setmoveeffect MOVE_EFFECT_POISON
goto BattleScript_EffectHit
-BattleScript_EffectAbsorb:: @ 81D69E7
+BattleScript_EffectAbsorb::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
@@ -337,105 +337,105 @@ BattleScript_EffectAbsorb:: @ 81D69E7
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
- waitmessage 64
+ waitmessage 0x40
resultmessage
- waitmessage 64
+ waitmessage 0x40
negativedamage
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- jumpifability BS_TARGET, ABILITY_LIQUID_OOZE, BattleScript_81D6A23
+ jumpifability BS_TARGET, ABILITY_LIQUID_OOZE, BattleScript_AbsorbLiquidOoze
setbyte cMULTISTRING_CHOOSER, 0
- goto BattleScript_81D6A2B
+ goto BattleScript_AbsorbUpdateHp
-BattleScript_81D6A23:: @ 81D6A23
+BattleScript_AbsorbLiquidOoze::
manipulatedamage 0
setbyte cMULTISTRING_CHOOSER, 1
-BattleScript_81D6A2B:: @ 81D6A2B
+BattleScript_AbsorbUpdateHp::
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
- jumpifmovehadnoeffect BattleScript_81D6A42
+ jumpifmovehadnoeffect BattleScript_AbsorbTryFainting
printfromtable gLeechSeedDrainStringIds
- waitmessage 64
-BattleScript_81D6A42:: @ 81D6A42
+ waitmessage 0x40
+BattleScript_AbsorbTryFainting::
tryfaintmon BS_ATTACKER, 0, NULL
tryfaintmon BS_TARGET, 0, NULL
goto BattleScript_MoveEnd
-BattleScript_EffectBurnHit:: @ 81D6A55
+BattleScript_EffectBurnHit::
setmoveeffect MOVE_EFFECT_BURN
goto BattleScript_EffectHit
-BattleScript_EffectFreezeHit:: @ 81D6A60
+BattleScript_EffectFreezeHit::
setmoveeffect MOVE_EFFECT_FREEZE
goto BattleScript_EffectHit
-BattleScript_EffectParalyzeHit:: @ 81D6A6B
+BattleScript_EffectParalyzeHit::
setmoveeffect MOVE_EFFECT_PARALYSIS
goto BattleScript_EffectHit
-BattleScript_EffectExplosion:: @ 81D6A76
+BattleScript_EffectExplosion::
attackcanceler
attackstring
ppreduce
faintifabilitynotdamp
setatkhptozero
waitstate
- jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_81D6A91
- call BattleScript_81D6AE7
- goto BattleScript_81D6A93
+ jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop
+ call BattleScript_PreserveMissedBitDoMoveAnim
+ goto BattleScript_ExplosionLoop
-BattleScript_81D6A91:: @ 81D6A91
+BattleScript_ExplosionDoAnimStartLoop::
attackanimation
waitanimation
-BattleScript_81D6A93:: @ 81D6A93
+BattleScript_ExplosionLoop::
movevaluescleanup
critcalc
damagecalc
typecalc
adjustnormaldamage
- accuracycheck BattleScript_81D6ACC, ACC_CURR_MOVE
+ accuracycheck BattleScript_ExplosionMissed, ACC_CURR_MOVE
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
- waitmessage 64
+ waitmessage 0x40
resultmessage
- waitmessage 64
+ waitmessage 0x40
tryfaintmon BS_TARGET, 0, NULL
moveendto 16
- jumpifnexttargetvalid BattleScript_81D6A93
+ jumpifnexttargetvalid BattleScript_ExplosionLoop
tryfaintmon BS_ATTACKER, 0, NULL
end
-BattleScript_81D6ACC:: @ 81D6ACC
+BattleScript_ExplosionMissed::
effectivenesssound
resultmessage
- waitmessage 64
+ waitmessage 0x40
moveendto 16
- jumpifnexttargetvalid BattleScript_81D6A93
+ jumpifnexttargetvalid BattleScript_ExplosionLoop
tryfaintmon BS_ATTACKER, 0, NULL
end
-BattleScript_81D6AE7:: @ 81D6AE7
+BattleScript_PreserveMissedBitDoMoveAnim::
bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
attackanimation
waitanimation
orbyte gMoveResultFlags, MOVE_RESULT_MISSED
return
-BattleScript_EffectDreamEater:: @ 81D6AF6
+BattleScript_EffectDreamEater::
attackcanceler
- jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_81D6B0B
- jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_81D6B15
-BattleScript_81D6B0B:: @ 81D6B0B
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_DreamEaterNoEffect
+ jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_DreamEaterWorked
+BattleScript_DreamEaterNoEffect::
attackstring
ppreduce
- waitmessage 64
- goto BattleScript_81D69BE
+ waitmessage 0x40
+ goto BattleScript_WasntAffected
-BattleScript_81D6B15:: @ 81D6B15
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+BattleScript_DreamEaterWorked::
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
@@ -450,121 +450,121 @@ BattleScript_81D6B15:: @ 81D6B15
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
- waitmessage 64
+ waitmessage 0x40
resultmessage
- waitmessage 64
+ waitmessage 0x40
negativedamage
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
- jumpifmovehadnoeffect BattleScript_81D6B53
+ jumpifmovehadnoeffect BattleScript_DreamEaterTryFaintEnd
printstring STRINGID_PKMNDREAMEATEN
- waitmessage 64
-BattleScript_81D6B53:: @ 81D6B53
+ waitmessage 0x40
+BattleScript_DreamEaterTryFaintEnd::
tryfaintmon BS_TARGET, 0, NULL
goto BattleScript_MoveEnd
-BattleScript_EffectMirrorMove:: @ 81D6B5F
+BattleScript_EffectMirrorMove::
attackcanceler
attackstring
- pause 64
+ pause 0x40
trymirrormove
ppreduce
orbyte gMoveResultFlags, MOVE_RESULT_FAILED
printstring STRINGID_MIRRORMOVEFAILED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectAttackUp:: @ 81D6B77
+BattleScript_EffectAttackUp::
setstatchanger STAT_ATK, 1, FALSE
- goto BattleScript_81D6B9E
+ goto BattleScript_EffectStatUp
-BattleScript_EffectDefenseUp:: @ 81D6B82
+BattleScript_EffectDefenseUp::
setstatchanger STAT_DEF, 1, FALSE
- goto BattleScript_81D6B9E
+ goto BattleScript_EffectStatUp
-BattleScript_EffectSpecialAttackUp:: @ 81D6B8D
+BattleScript_EffectSpecialAttackUp::
setstatchanger STAT_SPATK, 1, FALSE
- goto BattleScript_81D6B9E
+ goto BattleScript_EffectStatUp
-BattleScript_EffectEvasionUp:: @ 81D6B98
+BattleScript_EffectEvasionUp::
setstatchanger STAT_EVASION, 1, FALSE
-BattleScript_81D6B9E:: @ 81D6B9E
+BattleScript_EffectStatUp::
attackcanceler
-BattleScript_81D6B9F:: @ 81D6B9F
+BattleScript_EffectStatUpAfterAtkCanceler::
attackstring
ppreduce
- statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D6BCC
- jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D6BBA
- pause 32
- goto BattleScript_81D6BC4
+ statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_StatUpEnd
+ jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_StatUpAttackAnim
+ pause 0x20
+ goto BattleScript_StatUpPrintString
-BattleScript_81D6BBA:: @ 81D6BBA
+BattleScript_StatUpAttackAnim::
attackanimation
waitanimation
-BattleScript_81D6BBC:: @ 81D6BBC
+BattleScript_StatUpPrintString::
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
-BattleScript_81D6BC4:: @ 81D6BC4
+BattleScript_StatUpPrintString::
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D6BCC:: @ 81D6BCC
+ waitmessage 0x40
+BattleScript_StatUpEnd::
goto BattleScript_MoveEnd
-BattleScript_StatUp:: @ 81D6BD1
+BattleScript_StatUp::
playanimation BS_EFFECT_BATTLER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_EffectAttackDown:: @ 81D6BE1
+BattleScript_EffectAttackDown::
setstatchanger STAT_ATK, 1, TRUE
- goto BattleScript_81D6C13
+ goto BattleScript_EffectStatDown
-BattleScript_EffectDefenseDown:: @ 81D6BEC
+BattleScript_EffectDefenseDown::
setstatchanger STAT_DEF, 1, TRUE
- goto BattleScript_81D6C13
+ goto BattleScript_EffectStatDown
-BattleScript_EffectSpeedDown:: @ 81D6BF7
+BattleScript_EffectSpeedDown::
setstatchanger STAT_SPEED, 1, TRUE
- goto BattleScript_81D6C13
+ goto BattleScript_EffectStatDown
-BattleScript_EffectAccuracyDown:: @ 81D6C02
+BattleScript_EffectAccuracyDown::
setstatchanger STAT_ACC, 1, TRUE
- goto BattleScript_81D6C13
+ goto BattleScript_EffectStatDown
-BattleScript_EffectEvasionDown:: @ 81D6C0D
+BattleScript_EffectEvasionDown::
setstatchanger STAT_EVASION, 1, TRUE
-BattleScript_81D6C13:: @ 81D6C13
+BattleScript_EffectStatDown::
attackcanceler
- jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_81D7DF0
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailedAtkStringPpReduce
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
- statbuffchange STAT_CHANGE_BS_PTR, BattleScript_81D6C5D
- jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 2, BattleScript_81D6C4B
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 3, BattleScript_81D6C5D
- pause 32
- goto BattleScript_81D6C55
+ statbuffchange STAT_CHANGE_BS_PTR, BattleScript_StatDownEnd
+ jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 2, BattleScript_StatDownDoAnim
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 3, BattleScript_StatDownEnd
+ pause 0x20
+ goto BattleScript_StatDownPrintString
-BattleScript_81D6C4B:: @ 81D6C4B
+BattleScript_StatDownDoAnim::
attackanimation
waitanimation
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
-BattleScript_81D6C55:: @ 81D6C55
+BattleScript_StatDownPrintString::
printfromtable gStatDownStringIds
- waitmessage 64
-BattleScript_81D6C5D:: @ 81D6C5D
+ waitmessage 0x40
+BattleScript_StatDownEnd::
goto BattleScript_MoveEnd
-BattleScript_StatDown:: @ 81D6C62
+BattleScript_StatDown::
playanimation BS_EFFECT_BATTLER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatDownStringIds
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_EffectHaze:: @ 81D6C72
+BattleScript_EffectHaze::
attackcanceler
attackstring
ppreduce
@@ -572,10 +572,10 @@ BattleScript_EffectHaze:: @ 81D6C72
waitanimation
normalisebuffs
printstring STRINGID_STATCHANGESGONE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectBide:: @ 81D6C83
+BattleScript_EffectBide::
attackcanceler
attackstring
ppreduce
@@ -585,45 +585,46 @@ BattleScript_EffectBide:: @ 81D6C83
setbide
goto BattleScript_MoveEnd
-BattleScript_EffectRampage:: @ 81D6C97
+BattleScript_EffectRampage::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
- jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_81D6CAB
+ jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_EffectRampage2
ppreduce
-BattleScript_81D6CAB:: @ 81D6CAB
+BattleScript_EffectRampage2::
confuseifrepeatingattackends
goto BattleScript_HitFromCritCalc
-BattleScript_EffectRoar:: @ 81D6CB1
+BattleScript_EffectRoar::
attackcanceler
attackstring
ppreduce
- jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_81D9408
- jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_81D8F27
+ jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
+ jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
forcerandomswitch BattleScript_ButItFailed
-BattleScript_EffectMultiHit:: @ 81D6CD9
+
+BattleScript_EffectMultiHit::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
setmultihitcounter 0
initmultihitstring
setbyte sMULTIHIT_EFFECT, 0
-BattleScript_81D6CEC:: @ 81D6CEC
- jumpifhasnohp BS_ATTACKER, BattleScript_81D6D82
- jumpifhasnohp BS_TARGET, BattleScript_81D6D63
- jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_81D6D0E
- jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_81D6D63
-BattleScript_81D6D0E:: @ 81D6D0E
+BattleScript_MultiHitLoop::
+ jumpifhasnohp BS_ATTACKER, BattleScript_MultiHitEnd
+ jumpifhasnohp BS_TARGET, BattleScript_MultiHitPrintStrings
+ jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoMultiHit
+ jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_MultiHitPrintStrings
+BattleScript_DoMultiHit::
movevaluescleanup
copybyte cEFFECT_CHOOSER, sMULTIHIT_EFFECT
critcalc
damagecalc
typecalc
- jumpifmovehadnoeffect BattleScript_81D6D60
+ jumpifmovehadnoeffect BattleScript_MultiHitNoMoreHits
adjustnormaldamage
attackanimation
waitanimation
@@ -633,32 +634,32 @@ BattleScript_81D6D0E:: @ 81D6D0E
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
- waitmessage 64
+ waitmessage 0x40
printstring STRINGID_EMPTYSTRING3
waitmessage 1
addbyte gBattleScripting + 12, 1
moveendto 16
- jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_81D6D63
- decrementmultihit BattleScript_81D6CEC
- goto BattleScript_81D6D63
+ jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
+ decrementmultihit BattleScript_MultiHitLoop
+ goto BattleScript_MultiHitPrintStrings
-BattleScript_81D6D60:: @ 81D6D60
- pause 32
-BattleScript_81D6D63:: @ 81D6D63
+BattleScript_MultiHitNoMoreHits::
+ pause 0x20
+BattleScript_MultiHitPrintStrings::
resultmessage
- waitmessage 64
- jumpifmovehadnoeffect BattleScript_81D6D82
+ waitmessage 0x40
+ jumpifmovehadnoeffect BattleScript_MultiHitEnd
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6
printstring STRINGID_HITXTIMES
- waitmessage 64
-BattleScript_81D6D82:: @ 81D6D82
+ waitmessage 0x40
+BattleScript_MultiHitEnd::
seteffectwithchance
tryfaintmon BS_TARGET, 0, NULL
moveendcase 2
moveendfrom 4
end
-BattleScript_EffectConversion:: @ 81D6D9D
+BattleScript_EffectConversion::
attackcanceler
attackstring
ppreduce
@@ -666,14 +667,14 @@ BattleScript_EffectConversion:: @ 81D6D9D
attackanimation
waitanimation
printstring STRINGID_PKMNCHANGEDTYPE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectFlinchHit:: @ 81D6DB2
+BattleScript_EffectFlinchHit::
setmoveeffect MOVE_EFFECT_FLINCH
goto BattleScript_EffectHit
-BattleScript_EffectRestoreHp:: @ 81D6DBD
+BattleScript_EffectRestoreHp::
attackcanceler
attackstring
ppreduce
@@ -684,118 +685,118 @@ BattleScript_EffectRestoreHp:: @ 81D6DBD
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_PKMNREGAINEDHEALTH
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectToxic:: @ 81D6DE0
+BattleScript_EffectToxic::
attackcanceler
attackstring
ppreduce
- jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_81D6E4F
+ jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus BS_TARGET, STATUS1_POISON, BattleScript_81D6E41
- jumpifstatus BS_TARGET, STATUS1_TOXIC_POISON, BattleScript_81D6E41
- jumpifstatus BS_TARGET, STATUS1_FREEZE | STATUS1_SLEEP | STATUS1_POISON | STATUS1_TOXIC_POISON | STATUS1_PARALYSIS | STATUS1_BURN, BattleScript_ButItFailed
- jumpiftype BS_TARGET, TYPE_POISON, BattleScript_81D7E04
- jumpiftype BS_TARGET, TYPE_STEEL, BattleScript_81D7E04
+ jumpifstatus BS_TARGET, STATUS1_POISON, BattleScript_AlreadyPoisoned
+ jumpifstatus BS_TARGET, STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
+ jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
+ jumpiftype BS_TARGET, TYPE_POISON, BattleScript_NotAffected
+ jumpiftype BS_TARGET, TYPE_STEEL, BattleScript_NotAffected
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
- jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_81D8B39
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
setmoveeffect MOVE_EFFECT_TOXIC
seteffectprimary
resultmessage
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D6E41:: @ 81D6E41
- pause 64
+BattleScript_AlreadyPoisoned::
+ pause 0x40
printstring STRINGID_PKMNALREADYPOISONED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D6E4F:: @ 81D6E4F
+BattleScript_ImmunityProtected::
copybyte gEffectBattler, gBattlerTarget
setbyte cMULTISTRING_CHOOSER, 0
call BattleScript_PSNPrevention
goto BattleScript_MoveEnd
-BattleScript_EffectPayDay:: @ 81D6E69
+BattleScript_EffectPayDay::
setmoveeffect MOVE_EFFECT_PAYDAY
goto BattleScript_EffectHit
-BattleScript_EffectLightScreen:: @ 81D6E74
+BattleScript_EffectLightScreen::
attackcanceler
attackstring
ppreduce
setlightscreen
- goto BattleScript_81D7172
+ goto BattleScript_PrintReflectLightScreenSafeguardString
-BattleScript_EffectTriAttack:: @ 81D6E7D
+BattleScript_EffectTriAttack::
setmoveeffect MOVE_EFFECT_TRI_ATTACK
goto BattleScript_EffectHit
-BattleScript_EffectRest:: @ 81D6E88
+BattleScript_EffectRest::
attackcanceler
attackstring
ppreduce
- jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_81D6EC2
- jumpifcantmakeasleep BattleScript_81D6EB2
+ jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_RestIsAlreadyAsleep
+ jumpifcantmakeasleep BattleScript_RestCantSleep
trysetrest BattleScript_AlreadyAtFullHp
- pause 32
+ pause 0x20
printfromtable gRestUsedStringIds
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_ATTACKER
waitstate
goto BattleScript_PresentHealTarget
-BattleScript_81D6EB2:: @ 81D6EB2
- pause 64
+BattleScript_RestCantSleep::
+ pause 0x40
printfromtable gUproarAwakeStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D6EC2:: @ 81D6EC2
- pause 32
+BattleScript_RestIsAlreadyAsleep::
+ pause 0x20
printstring STRINGID_PKMNALREADYASLEEP2
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectOhko:: @ 81D6ED0
+BattleScript_EffectOHKO::
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
typecalc
- jumpifmovehadnoeffect BattleScript_81D6934
- tryKO BattleScript_81D6EF1
+ jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation
+ tryKO BattleScript_KOFail
trysetdestinybondtohappen
- goto BattleScript_81D6934
+ goto BattleScript_HitFromAtkAnimation
-BattleScript_81D6EF1:: @ 81D6EF1
- pause 64
+BattleScript_KOFail::
+ pause 0x40
printfromtable gKOFailedStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectRazorWind:: @ 81D6F01
- jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_81D6F29
- jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_81D6F29
+BattleScript_EffectRazorWind::
+ jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
+ jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, 0
- call BattleScript_81D6F58
+ call BattleScriptFirstChargingTurn
goto BattleScript_MoveEnd
-BattleScript_81D6F29:: @ 81D6F29
+BattleScript_TwoTurnMovesSecondTurn::
attackcanceler
setmoveeffect MOVE_EFFECT_CHARGING
setbyte sB_ANIM_TURN, 1
clearstatusfromeffect BS_ATTACKER
orword gHitMarker, HITMARKER_NO_PPDEDUCT
- jumpifnotmove MOVE_SKY_ATTACK, BattleScript_81D6927
+ jumpifnotmove MOVE_SKY_ATTACK, BattleScript_HitFromAccCheck
setmoveeffect MOVE_EFFECT_FLINCH
- goto BattleScript_81D6927
+ goto BattleScript_HitFromAccCheck
-BattleScript_81D6F58:: @ 81D6F58
+BattleScriptFirstChargingTurn::
attackcanceler
printstring STRINGID_EMPTYSTRING3
ppreduce
@@ -806,63 +807,63 @@ BattleScript_81D6F58:: @ 81D6F58
seteffectprimary
copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID
printfromtable gFirstTurnOfTwoStringIds
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_EffectSuperFang:: @ 81D6F82
+BattleScript_EffectSuperFang::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
damagetohalftargethp
- goto BattleScript_81D6934
+ goto BattleScript_HitFromAtkAnimation
-BattleScript_EffectDragonRage:: @ 81D6F99
+BattleScript_EffectDragonRage::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
setword gBattleMoveDamage, 40
adjustsetdamage
- goto BattleScript_81D6934
+ goto BattleScript_HitFromAtkAnimation
-BattleScript_EffectTrap:: @ 81D6FC8
- jumpifnotmove MOVE_WHIRLPOOL, BattleScript_81D6FEE
- jumpifnostatus3 BS_TARGET, STATUS3_UNDERWATER, BattleScript_81D6FEE
+BattleScript_EffectTrap::
+ jumpifnotmove MOVE_WHIRLPOOL, BattleScript_DoWrapEffect
+ jumpifnostatus3 BS_TARGET, STATUS3_UNDERWATER, BattleScript_DoWrapEffect
orword gHitMarker, HITMARKER_IGNORE_UNDERWATER
setbyte sDMG_MULTIPLIER, 2
-BattleScript_81D6FEE:: @ 81D6FEE
+BattleScript_DoWrapEffect::
setmoveeffect MOVE_EFFECT_WRAP
goto BattleScript_EffectHit
-BattleScript_EffectDoubleHit:: @ 81D6FF9
+BattleScript_EffectDoubleHit::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
setmultihitcounter 2
initmultihitstring
setbyte sMULTIHIT_EFFECT, 0
- goto BattleScript_81D6CEC
+ goto BattleScript_MultiHitLoop
-BattleScript_EffectRecoilIfMiss:: @ 81D7011
+BattleScript_EffectRecoilIfMiss::
attackcanceler
- accuracycheck BattleScript_81D701E, ACC_CURR_MOVE
- goto BattleScript_81D692E
+ accuracycheck BattleScript_MoveMissedDoDamage, ACC_CURR_MOVE
+ goto BattleScript_HitFromAtkString
-BattleScript_81D701E:: @ 81D701E
+BattleScript_MoveMissedDoDamage::
attackstring
ppreduce
- pause 64
+ pause 0x40
resultmessage
- waitmessage 64
+ waitmessage 0x40
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd
printstring STRINGID_PKMNCRASHED
- waitmessage 64
+ waitmessage 0x40
damagecalc
typecalc
adjustnormaldamage
@@ -875,7 +876,7 @@ BattleScript_81D701E:: @ 81D701E
orbyte gMoveResultFlags, MOVE_RESULT_MISSED
goto BattleScript_MoveEnd
-BattleScript_EffectMist:: @ 81D7062
+BattleScript_EffectMist::
attackcanceler
attackstring
ppreduce
@@ -883,10 +884,10 @@ BattleScript_EffectMist:: @ 81D7062
attackanimation
waitanimation
printfromtable gMistUsedStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectFocusEnergy:: @ 81D7075
+BattleScript_EffectFocusEnergy::
attackcanceler
attackstring
ppreduce
@@ -895,59 +896,59 @@ BattleScript_EffectFocusEnergy:: @ 81D7075
attackanimation
waitanimation
printfromtable gFocusEnergyUsedStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectRecoil:: @ 81D7092
+BattleScript_EffectRecoil::
setmoveeffect MOVE_EFFECT_RECOIL_25 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
jumpifnotmove MOVE_STRUGGLE, BattleScript_EffectHit
incrementgamestat GAME_STAT_USED_STRUGGLE
goto BattleScript_EffectHit
-BattleScript_EffectConfuse:: @ 81D70AB
+BattleScript_EffectConfuse::
attackcanceler
attackstring
ppreduce
- jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_81D9460
+ jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus2 BS_TARGET, STATUS2_CONFUSION, BattleScript_81D70EA
+ jumpifstatus2 BS_TARGET, STATUS2_CONFUSION, BattleScript_AlreadyConfused
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
- jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_81D8B39
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
setmoveeffect MOVE_EFFECT_CONFUSION
seteffectprimary
resultmessage
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D70EA:: @ 81D70EA
- pause 32
+BattleScript_AlreadyConfused::
+ pause 0x20
printstring STRINGID_PKMNALREADYCONFUSED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectAttackUp2:: @ 81D70F8
+BattleScript_EffectAttackUp2::
setstatchanger STAT_ATK, 2, FALSE
- goto BattleScript_81D6B9E
+ goto BattleScript_EffectStatUp
-BattleScript_EffectDefenseUp2:: @ 81D7103
+BattleScript_EffectDefenseUp2::
setstatchanger STAT_DEF, 2, FALSE
- goto BattleScript_81D6B9E
+ goto BattleScript_EffectStatUp
-BattleScript_EffectSpeedUp2:: @ 81D710E
+BattleScript_EffectSpeedUp2::
setstatchanger STAT_SPEED, 2, FALSE
- goto BattleScript_81D6B9E
+ goto BattleScript_EffectStatUp
-BattleScript_EffectSpecialAttackUp2:: @ 81D7119
+BattleScript_EffectSpecialAttackUp2::
setstatchanger STAT_SPATK, 2, FALSE
- goto BattleScript_81D6B9E
+ goto BattleScript_EffectStatUp
-BattleScript_EffectSpecialDefenseUp2:: @ 81D7124
+BattleScript_EffectSpecialDefenseUp2::
setstatchanger STAT_SPDEF, 2, FALSE
- goto BattleScript_81D6B9E
+ goto BattleScript_EffectStatUp
-BattleScript_EffectTransform:: @ 81D712F
+BattleScript_EffectTransform::
attackcanceler
attackstring
ppreduce
@@ -955,187 +956,187 @@ BattleScript_EffectTransform:: @ 81D712F
attackanimation
waitanimation
printfromtable gTransformUsedStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectAttackDown2:: @ 81D7142
+BattleScript_EffectAttackDown2::
setstatchanger STAT_ATK, 2, TRUE
- goto BattleScript_81D6C13
+ goto BattleScript_EffectStatDown
-BattleScript_EffectDefenseDown2:: @ 81D714D
+BattleScript_EffectDefenseDown2::
setstatchanger STAT_DEF, 2, TRUE
- goto BattleScript_81D6C13
+ goto BattleScript_EffectStatDown
-BattleScript_EffectSpeedDown2:: @ 81D7158
+BattleScript_EffectSpeedDown2::
setstatchanger STAT_SPEED, 2, TRUE
- goto BattleScript_81D6C13
+ goto BattleScript_EffectStatDown
-BattleScript_EffectSpecialDefenseDown2:: @ 81D7163
+BattleScript_EffectSpecialDefenseDown2::
setstatchanger STAT_SPDEF, 2, TRUE
- goto BattleScript_81D6C13
+ goto BattleScript_EffectStatDown
-BattleScript_EffectReflect:: @ 81D716E
+BattleScript_EffectReflect::
attackcanceler
attackstring
ppreduce
setreflect
-BattleScript_81D7172:: @ 81D7172
+BattleScript_PrintReflectLightScreenSafeguardString::
attackanimation
waitanimation
printfromtable gReflectLightScreenSafeguardStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectPoison:: @ 81D7181
+BattleScript_EffectPoison::
attackcanceler
attackstring
ppreduce
- jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_81D6E4F
+ jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus BS_TARGET, STATUS1_POISON, BattleScript_81D6E41
- jumpifstatus BS_TARGET, STATUS1_TOXIC_POISON, BattleScript_81D6E41
- jumpiftype BS_TARGET, TYPE_POISON, BattleScript_81D7E04
- jumpiftype BS_TARGET, TYPE_STEEL, BattleScript_81D7E04
- jumpifstatus BS_TARGET, STATUS1_FREEZE | STATUS1_SLEEP | STATUS1_POISON | STATUS1_TOXIC_POISON | STATUS1_PARALYSIS | STATUS1_BURN, BattleScript_ButItFailed
+ jumpifstatus BS_TARGET, STATUS1_POISON, BattleScript_AlreadyPoisoned
+ jumpifstatus BS_TARGET, STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
+ jumpiftype BS_TARGET, TYPE_POISON, BattleScript_NotAffected
+ jumpiftype BS_TARGET, TYPE_STEEL, BattleScript_NotAffected
+ jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
- jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_81D8B39
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
setmoveeffect MOVE_EFFECT_POISON
seteffectprimary
resultmessage
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectParalyze:: @ 81D71E2
+BattleScript_EffectParalyze::
attackcanceler
attackstring
ppreduce
- jumpifability BS_TARGET, ABILITY_LIMBER, BattleScript_81D7245
+ jumpifability BS_TARGET, ABILITY_LIMBER, BattleScript_LimberProtected
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
typecalc
jumpifmovehadnoeffect BattleScript_ButItFailed
- jumpifstatus BS_TARGET, STATUS1_PARALYSIS, BattleScript_81D7237
- jumpifstatus BS_TARGET, STATUS1_FREEZE | STATUS1_SLEEP | STATUS1_POISON | STATUS1_TOXIC_POISON | STATUS1_PARALYSIS | STATUS1_BURN, BattleScript_ButItFailed
+ jumpifstatus BS_TARGET, STATUS1_PARALYSIS, BattleScript_AlreadyParalyzed
+ jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
- jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_81D8B39
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
setmoveeffect MOVE_EFFECT_PARALYSIS
seteffectprimary
resultmessage
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D7237:: @ 81D7237
- pause 32
+BattleScript_AlreadyParalyzed::
+ pause 0x20
printstring STRINGID_PKMNISALREADYPARALYZED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D7245:: @ 81D7245
+BattleScript_LimberProtected::
copybyte gEffectBattler, gBattlerTarget
setbyte cMULTISTRING_CHOOSER, 0
call BattleScript_PRLZPrevention
goto BattleScript_MoveEnd
-BattleScript_EffectAttackDownHit:: @ 81D725F
+BattleScript_EffectAttackDownHit::
setmoveeffect MOVE_EFFECT_ATK_MINUS_1
goto BattleScript_EffectHit
-BattleScript_EffectDefenseDownHit:: @ 81D726A
+BattleScript_EffectDefenseDownHit::
setmoveeffect MOVE_EFFECT_DEF_MINUS_1
goto BattleScript_EffectHit
-BattleScript_EffectSpeedDownHit:: @ 81D7275
+BattleScript_EffectSpeedDownHit::
setmoveeffect MOVE_EFFECT_SPD_MINUS_1
goto BattleScript_EffectHit
-BattleScript_EffectSpecialAttackDownHit:: @ 81D7280
+BattleScript_EffectSpecialAttackDownHit::
setmoveeffect MOVE_EFFECT_SP_ATK_MINUS_1
goto BattleScript_EffectHit
-BattleScript_EffectSpecialDefenseDownHit:: @ 81D728B
+BattleScript_EffectSpecialDefenseDownHit::
setmoveeffect MOVE_EFFECT_SP_DEF_MINUS_1
goto BattleScript_EffectHit
-BattleScript_EffectAccuracyDownHit:: @ 81D7296
+BattleScript_EffectAccuracyDownHit::
setmoveeffect MOVE_EFFECT_ACC_MINUS_1
goto BattleScript_EffectHit
-BattleScript_EffectSkyAttack:: @ 81D72A1
- jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_81D6F29
- jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_81D6F29
+BattleScript_EffectSkyAttack::
+ jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
+ jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, 3
- call BattleScript_81D6F58
+ call BattleScriptFirstChargingTurn
goto BattleScript_MoveEnd
-BattleScript_EffectConfuseHit:: @ 81D72C9
+BattleScript_EffectConfuseHit::
setmoveeffect MOVE_EFFECT_CONFUSION
goto BattleScript_EffectHit
-BattleScript_EffectTwineedle:: @ 81D72D4
+BattleScript_EffectTwineedle::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
- setbyte sMULTIHIT_EFFECT, 2
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
+ setbyte sMULTIHIT_EFFECT, MOVE_EFFECT_POISON
attackstring
ppreduce
setmultihitcounter 2
initmultihitstring
- goto BattleScript_81D6CEC
+ goto BattleScript_MultiHitLoop
-BattleScript_EffectSubstitute:: @ 81D72EC
+BattleScript_EffectSubstitute::
attackcanceler
ppreduce
attackstring
waitstate
- jumpifstatus2 BS_ATTACKER, STATUS2_SUBSTITUTE, BattleScript_81D7321
+ jumpifstatus2 BS_ATTACKER, STATUS2_SUBSTITUTE, BattleScript_AlreadyHasSubstitute
setsubstitute
- jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 1, BattleScript_81D730E
- pause 32
- goto BattleScript_81D7314
+ jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 1, BattleScript_SubstituteAnim
+ pause 0x20
+ goto BattleScript_SubstituteString
-BattleScript_81D730E:: @ 81D730E
+BattleScript_SubstituteAnim::
attackanimation
waitanimation
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
-BattleScript_81D7314:: @ 81D7314
+BattleScript_SubstituteString::
printfromtable gSubsituteUsedStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D7321:: @ 81D7321
- pause 32
+BattleScript_AlreadyHasSubstitute::
+ pause 0x20
printstring STRINGID_PKMNHASSUBSTITUTE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectRecharge:: @ 81D732F
+BattleScript_EffectRecharge::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
setmoveeffect MOVE_EFFECT_RECHARGE | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
- goto BattleScript_81D692E
+ goto BattleScript_HitFromAtkString
-BattleScript_MoveUsedMustRecharge:: @ 81D7342
+BattleScript_MoveUsedMustRecharge::
printstring STRINGID_PKMNMUSTRECHARGE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectRage:: @ 81D734D
+BattleScript_EffectRage::
attackcanceler
- accuracycheck BattleScript_81D7367, ACC_CURR_MOVE
+ accuracycheck BattleScript_RageMiss, ACC_CURR_MOVE
setmoveeffect MOVE_EFFECT_RAGE
seteffectprimary
- setmoveeffect MOVE_EFFECT_NOTHING_0
- goto BattleScript_81D692E
+ setmoveeffect 0
+ goto BattleScript_HitFromAtkString
-BattleScript_81D7367:: @ 81D7367
+BattleScript_RageMiss::
setmoveeffect MOVE_EFFECT_RAGE
clearstatusfromeffect BS_ATTACKER
- goto BattleScript_81D695E
+ goto BattleScript_PrintMoveMissed
-BattleScript_EffectMimic:: @ 81D7374
+BattleScript_EffectMimic::
attackcanceler
attackstring
ppreduce
@@ -1145,34 +1146,34 @@ BattleScript_EffectMimic:: @ 81D7374
attackanimation
waitanimation
printstring STRINGID_PKMNLEARNEDMOVE2
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectMetronome:: @ 81D739A
+BattleScript_EffectMetronome::
attackcanceler
attackstring
- pause 32
+ pause 0x20
attackanimation
waitanimation
setbyte sB_ANIM_TURN, 0
setbyte sB_ANIM_TARGETS_HIT, 0
metronome
-BattleScript_EffectLeechSeed:: @ 81D73AE
+BattleScript_EffectLeechSeed::
attackcanceler
attackstring
- pause 32
+ pause 0x20
ppreduce
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- accuracycheck BattleScript_81D73C5, ACC_CURR_MOVE
-BattleScript_81D73C5:: @ 81D73C5
+ accuracycheck BattleScript_DoLeechSeed, ACC_CURR_MOVE
+BattleScript_DoLeechSeed::
setseeded
attackanimation
waitanimation
printfromtable gLeechSeedStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectSplash:: @ 81D73D5
+BattleScript_EffectSplash::
attackcanceler
attackstring
ppreduce
@@ -1180,10 +1181,10 @@ BattleScript_EffectSplash:: @ 81D73D5
waitanimation
incrementgamestat GAME_STAT_USED_SPLASH
printstring STRINGID_BUTNOTHINGHAPPENED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectDisable:: @ 81D73E7
+BattleScript_EffectDisable::
attackcanceler
attackstring
ppreduce
@@ -1192,54 +1193,54 @@ BattleScript_EffectDisable:: @ 81D73E7
attackanimation
waitanimation
printstring STRINGID_PKMNMOVEWASDISABLED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectLevelDamage:: @ 81D7403
+BattleScript_EffectLevelDamage::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
dmgtolevel
adjustsetdamage
- goto BattleScript_81D6934
+ goto BattleScript_HitFromAtkAnimation
-BattleScript_EffectPsywave:: @ 81D741B
+BattleScript_EffectPsywave::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
psywavedamageeffect
adjustsetdamage
- goto BattleScript_81D6934
+ goto BattleScript_HitFromAtkAnimation
-BattleScript_EffectCounter:: @ 81D7433
+BattleScript_EffectCounter::
attackcanceler
- counterdamagecalculator BattleScript_81D7DF0
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ counterdamagecalculator BattleScript_ButItFailedAtkStringPpReduce
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc2
adjustsetdamage
- goto BattleScript_81D6934
+ goto BattleScript_HitFromAtkAnimation
-BattleScript_EffectEncore:: @ 81D7449
+BattleScript_EffectEncore::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
trysetencore BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNGOTENCORE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectPainSplit:: @ 81D7465
+BattleScript_EffectPainSplit::
attackcanceler
attackstring
ppreduce
@@ -1250,33 +1251,33 @@ BattleScript_EffectPainSplit:: @ 81D7465
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
- copyword gBattleMoveDamage, gBattleScripting
+ copyword gBattleMoveDamage, sPAINSPLIT_HP
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
printstring STRINGID_SHAREDPAIN
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectSnore:: @ 81D749C
+BattleScript_EffectSnore::
attackcanceler
- jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_81D74AE
+ jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_SnoreIsAsleep
attackstring
ppreduce
goto BattleScript_ButItFailed
-BattleScript_81D74AE:: @ 81D74AE
- jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_81D74C2
+BattleScript_SnoreIsAsleep::
+ jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoSnore
printstring STRINGID_PKMNFASTASLEEP
- waitmessage 64
+ waitmessage 0x40
statusanimation BS_ATTACKER
-BattleScript_81D74C2:: @ 81D74C2
+BattleScript_DoSnore::
attackstring
ppreduce
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
setmoveeffect MOVE_EFFECT_FLINCH
goto BattleScript_HitFromCritCalc
-BattleScript_EffectConversion2:: @ 81D74D6
+BattleScript_EffectConversion2::
attackcanceler
attackstring
ppreduce
@@ -1284,10 +1285,10 @@ BattleScript_EffectConversion2:: @ 81D74D6
attackanimation
waitanimation
printstring STRINGID_PKMNCHANGEDTYPE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectLockOn:: @ 81D74EB
+BattleScript_EffectLockOn::
attackcanceler
attackstring
ppreduce
@@ -1297,10 +1298,10 @@ BattleScript_EffectLockOn:: @ 81D74EB
attackanimation
waitanimation
printstring STRINGID_PKMNTOOKAIM
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectSketch:: @ 81D750D
+BattleScript_EffectSketch::
attackcanceler
attackstring
ppreduce
@@ -1309,34 +1310,34 @@ BattleScript_EffectSketch:: @ 81D750D
attackanimation
waitanimation
printstring STRINGID_PKMNSKETCHEDMOVE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectSleepTalk:: @ 81D752C
+BattleScript_EffectSleepTalk::
attackcanceler
jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_81D753E
attackstring
ppreduce
goto BattleScript_ButItFailed
-BattleScript_81D753E:: @ 81D753E
+BattleScript_81D753E::
printstring STRINGID_PKMNFASTASLEEP
- waitmessage 64
+ waitmessage 0x40
statusanimation BS_ATTACKER
attackstring
ppreduce
orword gHitMarker, HITMARKER_NO_PPDEDUCT
trychoosesleeptalkmove BattleScript_81D755E
- pause 64
+ pause 0x40
goto BattleScript_ButItFailed
-BattleScript_81D755E:: @ 81D755E
+BattleScript_81D755E::
attackanimation
waitanimation
setbyte sB_ANIM_TURN, 0
setbyte sB_ANIM_TARGETS_HIT, 0
jumptocalledmove 1
-BattleScript_EffectDestinyBond:: @ 81D756E
+BattleScript_EffectDestinyBond::
attackcanceler
attackstring
ppreduce
@@ -1344,14 +1345,14 @@ BattleScript_EffectDestinyBond:: @ 81D756E
attackanimation
waitanimation
printstring STRINGID_PKMNTRYINGTOTAKEFOE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectFlail:: @ 81D757F
+BattleScript_EffectFlail::
remaininghptopower
goto BattleScript_EffectHit
-BattleScript_EffectSpite:: @ 81D7585
+BattleScript_EffectSpite::
attackcanceler
attackstring
ppreduce
@@ -1360,10 +1361,10 @@ BattleScript_EffectSpite:: @ 81D7585
attackanimation
waitanimation
printstring STRINGID_PKMNREDUCEDPP
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectHealBell:: @ 81D75A1
+BattleScript_EffectHealBell::
attackcanceler
attackstring
ppreduce
@@ -1372,21 +1373,21 @@ BattleScript_EffectHealBell:: @ 81D75A1
attackanimation
waitanimation
printfromtable gPartyStatusHealStringIds
- waitmessage 64
+ waitmessage 0x40
jumpifnotmove MOVE_HEAL_BELL, BattleScript_81D75DE
jumpifbyte CMP_NO_COMMON_BITS, cMULTISTRING_CHOOSER, 1, BattleScript_81D75CD
printstring STRINGID_PKMNSXBLOCKSY
- waitmessage 64
-BattleScript_81D75CD:: @ 81D75CD
+ waitmessage 0x40
+BattleScript_81D75CD::
jumpifbyte CMP_NO_COMMON_BITS, cMULTISTRING_CHOOSER, 2, BattleScript_81D75DE
printstring STRINGID_PKMNSXBLOCKSY2
- waitmessage 64
-BattleScript_81D75DE:: @ 81D75DE
+ waitmessage 0x40
+BattleScript_81D75DE::
updatestatusicon BS_ATTACKER_WITH_PARTNER
waitstate
goto BattleScript_MoveEnd
-BattleScript_EffectTripleKick:: @ 81D75E6
+BattleScript_EffectTripleKick::
attackcanceler
attackstring
ppreduce
@@ -1394,12 +1395,12 @@ BattleScript_EffectTripleKick:: @ 81D75E6
setbyte gBattleScripting + 19, 0
initmultihitstring
setmultihit 3
-BattleScript_81D75F8:: @ 81D75F8
+BattleScript_81D75F8::
jumpifhasnohp BS_ATTACKER, BattleScript_81D76B7
jumpifhasnohp BS_TARGET, BattleScript_81D7679
jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_81D761A
jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_81D7679
-BattleScript_81D761A:: @ 81D761A
+BattleScript_81D761A::
accuracycheck BattleScript_81D7679, ACC_CURR_MOVE
movevaluescleanup
addbyte sTRIPLE_KICK_POWER, 10
@@ -1418,7 +1419,7 @@ BattleScript_81D761A:: @ 81D761A
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
- waitmessage 64
+ waitmessage 0x40
printstring STRINGID_EMPTYSTRING3
waitmessage 1
moveendto 16
@@ -1426,29 +1427,29 @@ BattleScript_81D761A:: @ 81D761A
decrementmultihit BattleScript_81D75F8
goto BattleScript_81D768D
-BattleScript_81D7679:: @ 81D7679
- pause 32
+BattleScript_81D7679::
+ pause 0x20
jumpifbyte CMP_EQUAL, gBattleScripting + 12, 0, BattleScript_81D768D
bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
-BattleScript_81D768D:: @ 81D768D
+BattleScript_81D768D::
resultmessage
- waitmessage 64
+ waitmessage 0x40
jumpifbyte CMP_EQUAL, gBattleScripting + 12, 0, BattleScript_81D76B7
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_81D76B7
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6
printstring STRINGID_HITXTIMES
- waitmessage 64
-BattleScript_81D76B7:: @ 81D76B7
+ waitmessage 0x40
+BattleScript_81D76B7::
seteffectwithchance
tryfaintmon BS_TARGET, 0, NULL
moveendfrom 14
end
-BattleScript_EffectThief:: @ 81D76C9
+BattleScript_EffectThief::
setmoveeffect MOVE_EFFECT_STEAL_ITEM
goto BattleScript_EffectHit
-BattleScript_EffectMeanLook:: @ 81D76D4
+BattleScript_EffectMeanLook::
attackcanceler
attackstring
ppreduce
@@ -1460,10 +1461,10 @@ BattleScript_EffectMeanLook:: @ 81D76D4
setmoveeffect MOVE_EFFECT_PREVENT_ESCAPE
seteffectprimary
printstring STRINGID_TARGETCANTESCAPENOW
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectNightmare:: @ 81D7706
+BattleScript_EffectNightmare::
attackcanceler
attackstring
ppreduce
@@ -1472,22 +1473,22 @@ BattleScript_EffectNightmare:: @ 81D7706
jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_81D772C
goto BattleScript_ButItFailed
-BattleScript_81D772C:: @ 81D772C
+BattleScript_81D772C::
attackanimation
waitanimation
setmoveeffect MOVE_EFFECT_NIGHTMARE
seteffectprimary
printstring STRINGID_PKMNFELLINTONIGHTMARE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectMinimize:: @ 81D7740
+BattleScript_EffectMinimize::
attackcanceler
setminimize
setstatchanger STAT_EVASION, 1, FALSE
- goto BattleScript_81D6B9F
+ goto BattleScript_EffectStatUpAfterAtkCanceler
-BattleScript_EffectCurse:: @ 81D774D
+BattleScript_EffectCurse::
jumpiftype2 BS_ATTACKER, TYPE_GHOST, BattleScript_81D77C5
attackcanceler
attackstring
@@ -1495,7 +1496,7 @@ BattleScript_EffectCurse:: @ 81D774D
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, 0, BattleScript_81D7772
jumpifstat BS_ATTACKER, CMP_NOT_EQUAL, STAT_ATK, 12, BattleScript_81D7772
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, 12, BattleScript_ButItFailed
-BattleScript_81D7772:: @ 81D7772
+BattleScript_81D7772::
copybyte gBattlerTarget, gBattlerAttacker
setbyte sB_ANIM_TURN, 1
attackanimation
@@ -1503,24 +1504,24 @@ BattleScript_81D7772:: @ 81D7772
setstatchanger STAT_SPEED, 1, TRUE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D7798
printfromtable gStatDownStringIds
- waitmessage 64
-BattleScript_81D7798:: @ 81D7798
+ waitmessage 0x40
+BattleScript_81D7798::
setstatchanger STAT_ATK, 1, FALSE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D77AC
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D77AC:: @ 81D77AC
+ waitmessage 0x40
+BattleScript_81D77AC::
setstatchanger STAT_DEF, 1, FALSE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D77C0
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D77C0:: @ 81D77C0
+ waitmessage 0x40
+BattleScript_81D77C0::
goto BattleScript_MoveEnd
-BattleScript_81D77C5:: @ 81D77C5
+BattleScript_81D77C5::
jumpifbytenotequal gBattlerAttacker, gBattlerTarget, BattleScript_81D77D6
getmovetarget BS_ATTACKER
-BattleScript_81D77D6:: @ 81D77D6
+BattleScript_81D77D6::
attackcanceler
attackstring
ppreduce
@@ -1534,11 +1535,11 @@ BattleScript_81D77D6:: @ 81D77D6
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_PKMNLAIDCURSE
- waitmessage 64
+ waitmessage 0x40
tryfaintmon BS_ATTACKER, 0, NULL
goto BattleScript_MoveEnd
-BattleScript_EffectProtect:: @ 81D7816
+BattleScript_EffectProtect::
attackcanceler
attackstring
ppreduce
@@ -1546,33 +1547,33 @@ BattleScript_EffectProtect:: @ 81D7816
attackanimation
waitanimation
printfromtable gProtectLikeUsedStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectSpikes:: @ 81D7829
+BattleScript_EffectSpikes::
attackcanceler
- trysetspikes BattleScript_81D7DF0
+ trysetspikes BattleScript_ButItFailedAtkStringPpReduce
attackstring
ppreduce
attackanimation
waitanimation
printstring STRINGID_SPIKESSCATTERED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectForesight:: @ 81D783E
+BattleScript_EffectForesight::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
setforesight
attackanimation
waitanimation
printstring STRINGID_PKMNIDENTIFIED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectPerishSong:: @ 81D7856
+BattleScript_EffectPerishSong::
attackcanceler
attackstring
ppreduce
@@ -1580,43 +1581,43 @@ BattleScript_EffectPerishSong:: @ 81D7856
attackanimation
waitanimation
printstring STRINGID_FAINTINTHREE
- waitmessage 64
+ waitmessage 0x40
setbyte sBATTLER, 0
-BattleScript_81D786C:: @ 81D786C
+BattleScript_81D786C::
jumpifability BS_SCRIPTING, ABILITY_SOUNDPROOF, BattleScript_81D788C
-BattleScript_81D7873:: @ 81D7873
+BattleScript_81D7873::
addbyte sBATTLER, 1
jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_81D786C
goto BattleScript_MoveEnd
-BattleScript_81D788C:: @ 81D788C
+BattleScript_81D788C::
printstring STRINGID_PKMNSXBLOCKSY2
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D7873
-BattleScript_EffectSandstorm:: @ 81D7897
+BattleScript_EffectSandstorm::
attackcanceler
attackstring
ppreduce
setsandstorm
goto BattleScript_81D7A14
-BattleScript_EffectRollout:: @ 81D78A0
+BattleScript_EffectRollout::
attackcanceler
attackstring
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_81D78AD
ppreduce
-BattleScript_81D78AD:: @ 81D78AD
+BattleScript_81D78AD::
accuracycheck BattleScript_81D78B4, ACC_CURR_MOVE
-BattleScript_81D78B4:: @ 81D78B4
+BattleScript_81D78B4::
typecalc2
rolloutdamagecalculation
goto BattleScript_HitFromCritCalc
-BattleScript_EffectSwagger:: @ 81D78BB
+BattleScript_EffectSwagger::
attackcanceler
- jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_81D6958
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_MakeMoveMissed
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
jumpifconfusedandstatmaxed 1, BattleScript_ButItFailed
@@ -1628,29 +1629,29 @@ BattleScript_EffectSwagger:: @ 81D78BB
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D78FE:: @ 81D78FE
- jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_81D9460
- jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_81D8B39
+ waitmessage 0x40
+BattleScript_81D78FE::
+ jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
setmoveeffect MOVE_EFFECT_CONFUSION
seteffectprimary
goto BattleScript_MoveEnd
-BattleScript_EffectFuryCutter:: @ 81D7919
+BattleScript_EffectFuryCutter::
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_81D7923, ACC_CURR_MOVE
-BattleScript_81D7923:: @ 81D7923
+BattleScript_81D7923::
furycuttercalc
critcalc
damagecalc
typecalc
jumpifmovehadnoeffect BattleScript_81D7923
adjustnormaldamage
- goto BattleScript_81D6934
+ goto BattleScript_HitFromAtkAnimation
-BattleScript_EffectAttract:: @ 81D7938
+BattleScript_EffectAttract::
attackcanceler
attackstring
ppreduce
@@ -1659,52 +1660,52 @@ BattleScript_EffectAttract:: @ 81D7938
attackanimation
waitanimation
printstring STRINGID_PKMNFELLINLOVE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectReturn:: @ 81D7954
+BattleScript_EffectReturn::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
happinesstodamagecalculation
- goto BattleScript_81D692E
+ goto BattleScript_HitFromAtkString
-BattleScript_EffectPresent:: @ 81D7962
+BattleScript_EffectPresent::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc
presentdamagecalculation
-BattleScript_EffectSafeguard:: @ 81D796E
+BattleScript_EffectSafeguard::
attackcanceler
attackstring
ppreduce
setsafeguard
- goto BattleScript_81D7172
+ goto BattleScript_PrintReflectLightScreenSafeguardString
-BattleScript_EffectThawHit:: @ 81D7977
+BattleScript_EffectThawHit::
setmoveeffect MOVE_EFFECT_BURN
goto BattleScript_EffectHit
-BattleScript_EffectMagnitude:: @ 81D7982
+BattleScript_EffectMagnitude::
attackcanceler
attackstring
ppreduce
selectfirstvalidtarget
magnitudedamagecalculation
- pause 32
+ pause 0x20
printstring STRINGID_MAGNITUDESTRENGTH
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D7B17
-BattleScript_EffectBatonPass:: @ 81D7995
+BattleScript_EffectBatonPass::
attackcanceler
attackstring
ppreduce
- jumpifcantswitch BS_ATTACKER | 0x80, BattleScript_ButItFailed
+ jumpifcantswitch BS_ATTACKER | ATK4F_DONT_CHECK_STATUSES, BattleScript_ButItFailed
attackanimation
waitanimation
- openpartyscreen 1, BattleScript_ButItFailed
+ openpartyscreen BS_ATTACKER, BattleScript_ButItFailed
switchoutabilities BS_ATTACKER
waitstate
switchhandleorder BS_ATTACKER, 2
@@ -1718,66 +1719,66 @@ BattleScript_EffectBatonPass:: @ 81D7995
switchineffects BS_ATTACKER
goto BattleScript_MoveEnd
-BattleScript_EffectRapidSpin:: @ 81D79C2
+BattleScript_EffectRapidSpin::
setmoveeffect MOVE_EFFECT_RAPIDSPIN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
-BattleScript_EffectSonicboom:: @ 81D79CD
+BattleScript_EffectSonicboom::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
setword gBattleMoveDamage, 20
adjustsetdamage
- goto BattleScript_81D6934
+ goto BattleScript_HitFromAtkAnimation
-BattleScript_EffectMorningSun:: @ 81D79FC
+BattleScript_EffectMorningSun::
attackcanceler
attackstring
ppreduce
recoverbasedonsunlight BattleScript_AlreadyAtFullHp
goto BattleScript_PresentHealTarget
-BattleScript_EffectHiddenPower:: @ 81D7A09
+BattleScript_EffectHiddenPower::
attackcanceler
hiddenpowercalc
- goto BattleScript_81D6927
+ goto BattleScript_HitFromAccCheck
-BattleScript_EffectRainDance:: @ 81D7A10
+BattleScript_EffectRainDance::
attackcanceler
attackstring
ppreduce
setrain
-BattleScript_81D7A14:: @ 81D7A14
+BattleScript_81D7A14::
attackanimation
waitanimation
printfromtable gMoveWeatherChangeStringIds
- waitmessage 64
+ waitmessage 0x40
call BattleScript_81D92DC
goto BattleScript_MoveEnd
-BattleScript_EffectSunnyDay:: @ 81D7A28
+BattleScript_EffectSunnyDay::
attackcanceler
attackstring
ppreduce
setsunny
goto BattleScript_81D7A14
-BattleScript_EffectDefenseUpHit:: @ 81D7A31
+BattleScript_EffectDefenseUpHit::
setmoveeffect MOVE_EFFECT_DEF_PLUS_1 | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit
-BattleScript_EffectAttackUpHit:: @ 81D7A3C
+BattleScript_EffectAttackUpHit::
setmoveeffect MOVE_EFFECT_ATK_PLUS_1 | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit
-BattleScript_EffectAllStatsUpHit:: @ 81D7A47
+BattleScript_EffectAllStatsUpHit::
setmoveeffect MOVE_EFFECT_ALL_STATS_UP | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit
-BattleScript_EffectBellyDrum:: @ 81D7A52
+BattleScript_EffectBellyDrum::
attackcanceler
attackstring
ppreduce
@@ -1788,10 +1789,10 @@ BattleScript_EffectBellyDrum:: @ 81D7A52
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_PKMNCUTHPMAXEDATTACK
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectPsychUp:: @ 81D7A74
+BattleScript_EffectPsychUp::
attackcanceler
attackstring
ppreduce
@@ -1799,58 +1800,58 @@ BattleScript_EffectPsychUp:: @ 81D7A74
attackanimation
waitanimation
printstring STRINGID_PKMNCOPIEDSTATCHANGES
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectMirrorCoat:: @ 81D7A89
+BattleScript_EffectMirrorCoat::
attackcanceler
- mirrorcoatdamagecalculator BattleScript_81D7DF0
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ mirrorcoatdamagecalculator BattleScript_ButItFailedAtkStringPpReduce
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc2
adjustsetdamage
- goto BattleScript_81D6934
+ goto BattleScript_HitFromAtkAnimation
-BattleScript_EffectSkullBash:: @ 81D7A9F
- jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_81D6F29
- jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_81D6F29
+BattleScript_EffectSkullBash::
+ jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
+ jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, 2
- call BattleScript_81D6F58
+ call BattleScriptFirstChargingTurn
setstatchanger STAT_DEF, 1, FALSE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D7AE9
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D7AE9
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D7AE9:: @ 81D7AE9
+ waitmessage 0x40
+BattleScript_81D7AE9::
goto BattleScript_MoveEnd
-BattleScript_EffectTwister:: @ 81D7AEE
+BattleScript_EffectTwister::
jumpifnostatus3 BS_TARGET, STATUS3_ON_AIR, BattleScript_81D7B08
orword gHitMarker, HITMARKER_IGNORE_ON_AIR
setbyte sDMG_MULTIPLIER, 2
-BattleScript_81D7B08:: @ 81D7B08
+BattleScript_81D7B08::
setmoveeffect MOVE_EFFECT_FLINCH
goto BattleScript_EffectHit
-BattleScript_EffectEarthquake:: @ 81D7B13
+BattleScript_EffectEarthquake::
attackcanceler
attackstring
ppreduce
selectfirstvalidtarget
-BattleScript_81D7B17:: @ 81D7B17
+BattleScript_81D7B17::
movevaluescleanup
jumpifnostatus3 BS_TARGET, STATUS3_UNDERGROUND, BattleScript_81D7B37
orword gHitMarker, HITMARKER_IGNORE_UNDERGROUND
setbyte sDMG_MULTIPLIER, 2
goto BattleScript_81D7B46
-BattleScript_81D7B37:: @ 81D7B37
+BattleScript_81D7B37::
bicword gHitMarker, HITMARKER_IGNORE_UNDERGROUND
setbyte sDMG_MULTIPLIER, 1
-BattleScript_81D7B46:: @ 81D7B46
+BattleScript_81D7B46::
accuracycheck BattleScript_81D7B7F, ACC_CURR_MOVE
critcalc
damagecalc
@@ -1864,9 +1865,9 @@ BattleScript_81D7B46:: @ 81D7B46
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
- waitmessage 64
+ waitmessage 0x40
resultmessage
- waitmessage 64
+ waitmessage 0x40
printstring STRINGID_EMPTYSTRING3
waitmessage 1
tryfaintmon BS_TARGET, 0, NULL
@@ -1874,17 +1875,17 @@ BattleScript_81D7B46:: @ 81D7B46
jumpifnexttargetvalid BattleScript_81D7B17
end
-BattleScript_81D7B7F:: @ 81D7B7F
- pause 32
+BattleScript_81D7B7F::
+ pause 0x20
typecalc
effectivenesssound
resultmessage
- waitmessage 64
+ waitmessage 0x40
moveendto 16
jumpifnexttargetvalid BattleScript_81D7B17
end
-BattleScript_EffectFutureSight:: @ 81D7B97
+BattleScript_EffectFutureSight::
attackcanceler
attackstring
ppreduce
@@ -1892,44 +1893,44 @@ BattleScript_EffectFutureSight:: @ 81D7B97
attackanimation
waitanimation
printfromtable gFutureMoveUsedStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectGust:: @ 81D7BAE
+BattleScript_EffectGust::
jumpifnostatus3 BS_TARGET, STATUS3_ON_AIR, BattleScript_EffectHit
orword gHitMarker, HITMARKER_IGNORE_ON_AIR
setbyte sDMG_MULTIPLIER, 2
goto BattleScript_EffectHit
-BattleScript_EffectFlinchMinimizeHit:: @ 81D7BCD
+BattleScript_EffectFlinchMinimizeHit::
jumpifnostatus3 BS_TARGET, STATUS3_MINIMIZED, BattleScript_81D7B08
setbyte sDMG_MULTIPLIER, 2
goto BattleScript_81D7B08
-BattleScript_EffectSolarbeam:: @ 81D7BE3
+BattleScript_EffectSolarbeam::
jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_81D7BFB
jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_81D7BFB
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, 96, BattleScript_81D7C23
-BattleScript_81D7BFB:: @ 81D7BFB
- jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_81D6F29
- jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_81D6F29
+BattleScript_81D7BFB::
+ jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
+ jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, 1
- call BattleScript_81D6F58
+ call BattleScriptFirstChargingTurn
goto BattleScript_MoveEnd
-BattleScript_81D7C23:: @ 81D7C23
+BattleScript_81D7C23::
orword gHitMarker, HITMARKER_CHARGING
setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
ppreduce
- goto BattleScript_81D6F29
+ goto BattleScript_TwoTurnMovesSecondTurn
-BattleScript_EffectThunder:: @ 81D7C39
+BattleScript_EffectThunder::
setmoveeffect MOVE_EFFECT_PARALYSIS
orword gHitMarker, HITMARKER_IGNORE_ON_AIR
goto BattleScript_EffectHit
-BattleScript_EffectTeleport:: @ 81D7C4D
+BattleScript_EffectTeleport::
attackcanceler
attackstring
ppreduce
@@ -1940,25 +1941,25 @@ BattleScript_EffectTeleport:: @ 81D7C4D
attackanimation
waitanimation
printstring STRINGID_PKMNFLEDFROMBATTLE
- waitmessage 64
+ waitmessage 0x40
setbyte gBattleOutcome, B_OUTCOME_PLAYER_TELEPORTED
goto BattleScript_MoveEnd
-BattleScript_EffectBeatUp:: @ 81D7C8A
+BattleScript_EffectBeatUp::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
- pause 32
+ pause 0x20
ppreduce
setbyte gBattleCommunication, 0
-BattleScript_81D7C9D:: @ 81D7C9D
+BattleScript_81D7C9D::
movevaluescleanup
trydobeatup BattleScript_81D7CE0, BattleScript_ButItFailed
printstring STRINGID_PKMNATTACK
critcalc
jumpifbyte CMP_NOT_EQUAL, gCritMultiplier, 2, BattleScript_81D7CB8
manipulatedamage 2
-BattleScript_81D7CB8:: @ 81D7CB8
+BattleScript_81D7CB8::
adjustnormaldamage
attackanimation
waitanimation
@@ -1968,17 +1969,17 @@ BattleScript_81D7CB8:: @ 81D7CB8
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
- waitmessage 64
+ waitmessage 0x40
resultmessage
- waitmessage 64
+ waitmessage 0x40
tryfaintmon BS_TARGET, 0, NULL
moveendto 16
goto BattleScript_81D7C9D
-BattleScript_81D7CE0:: @ 81D7CE0
+BattleScript_81D7CE0::
end
-BattleScript_EffectSemiInvulnerable:: @ 81D7CE1
+BattleScript_EffectSemiInvulnerable::
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_81D7D4F
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_81D7D4F
jumpifmove MOVE_FLY, BattleScript_81D7D3E
@@ -1987,22 +1988,22 @@ BattleScript_EffectSemiInvulnerable:: @ 81D7CE1
setbyte sTWOTURN_STRINGID, 5
goto BattleScript_81D7D44
-BattleScript_81D7D28:: @ 81D7D28
+BattleScript_81D7D28::
setbyte sTWOTURN_STRINGID, 7
goto BattleScript_81D7D44
-BattleScript_81D7D33:: @ 81D7D33
+BattleScript_81D7D33::
setbyte sTWOTURN_STRINGID, 6
goto BattleScript_81D7D44
-BattleScript_81D7D3E:: @ 81D7D3E
+BattleScript_81D7D3E::
setbyte sTWOTURN_STRINGID, 4
-BattleScript_81D7D44:: @ 81D7D44
- call BattleScript_81D6F58
+BattleScript_81D7D44::
+ call BattleScriptFirstChargingTurn
setsemiinvulnerablebit
goto BattleScript_MoveEnd
-BattleScript_81D7D4F:: @ 81D7D4F
+BattleScript_81D7D4F::
attackcanceler
setmoveeffect MOVE_EFFECT_CHARGING
setbyte sB_ANIM_TURN, 1
@@ -2010,85 +2011,85 @@ BattleScript_81D7D4F:: @ 81D7D4F
orword gHitMarker, HITMARKER_NO_PPDEDUCT
jumpifnotmove MOVE_BOUNCE, BattleScript_81D7D79
setmoveeffect MOVE_EFFECT_PARALYSIS
-BattleScript_81D7D79:: @ 81D7D79
+BattleScript_81D7D79::
accuracycheck BattleScript_81D7D86, ACC_CURR_MOVE
clearsemiinvulnerablebit
- goto BattleScript_81D692E
+ goto BattleScript_HitFromAtkString
-BattleScript_81D7D86:: @ 81D7D86
+BattleScript_81D7D86::
clearsemiinvulnerablebit
- goto BattleScript_81D695E
+ goto BattleScript_PrintMoveMissed
-BattleScript_EffectDefenseCurl:: @ 81D7D8C
+BattleScript_EffectDefenseCurl::
attackcanceler
attackstring
ppreduce
setdefensecurlbit
setstatchanger STAT_DEF, 1, FALSE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D7DA9
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D6BC4
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_StatUpPrintString
attackanimation
waitanimation
-BattleScript_81D7DA9:: @ 81D7DA9
- goto BattleScript_81D6BBC
+BattleScript_81D7DA9::
+ goto BattleScript_StatUpPrintString
-BattleScript_EffectSoftboiled:: @ 81D7DAE
+BattleScript_EffectSoftboiled::
attackcanceler
attackstring
ppreduce
tryhealhalfhealth BattleScript_AlreadyAtFullHp, BS_TARGET
-BattleScript_PresentHealTarget:: @ 81D7DB7
+BattleScript_PresentHealTarget::
attackanimation
waitanimation
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
printstring STRINGID_PKMNREGAINEDHEALTH
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_AlreadyAtFullHp:: @ 81D7DD1
- pause 32
+BattleScript_AlreadyAtFullHp::
+ pause 0x20
printstring STRINGID_PKMNHPFULL
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectFakeOut:: @ 81D7DDF
+BattleScript_EffectFakeOut::
attackcanceler
- jumpifnotfirstturn BattleScript_81D7DF0
+ jumpifnotfirstturn BattleScript_ButItFailedAtkStringPpReduce
setmoveeffect MOVE_EFFECT_FLINCH | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
-BattleScript_81D7DF0:: @ 81D7DF0
+BattleScript_ButItFailedAtkStringPpReduce::
attackstring
-BattleScript_81D7DF1:: @ 81D7DF1
+BattleScript_81D7DF1::
ppreduce
-BattleScript_ButItFailed:: @ 81D7DF2
- pause 32
+BattleScript_ButItFailed::
+ pause 0x20
orbyte gMoveResultFlags, MOVE_RESULT_FAILED
resultmessage
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D7E04:: @ 81D7E04
- pause 32
+BattleScript_NotAffected::
+ pause 0x20
orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
resultmessage
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectUproar:: @ 81D7E16
+BattleScript_EffectUproar::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
setmoveeffect MOVE_EFFECT_UPROAR | MOVE_EFFECT_AFFECTS_USER
attackstring
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_81D7E30
ppreduce
-BattleScript_81D7E30:: @ 81D7E30
+BattleScript_81D7E30::
nop
goto BattleScript_HitFromCritCalc
-BattleScript_EffectStockpile:: @ 81D7E36
+BattleScript_EffectStockpile::
attackcanceler
attackstring
ppreduce
@@ -2096,56 +2097,56 @@ BattleScript_EffectStockpile:: @ 81D7E36
attackanimation
waitanimation
printfromtable gStockpileUsedStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectSpitUp:: @ 81D7E49
+BattleScript_EffectSpitUp::
attackcanceler
jumpifbyte CMP_EQUAL, gBattleCommunication + 6, 1, BattleScript_81D7E78
attackstring
ppreduce
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
stockpiletobasedamage BattleScript_81D7E6A
typecalc
adjustsetdamage
- goto BattleScript_81D6934
+ goto BattleScript_HitFromAtkAnimation
-BattleScript_81D7E6A:: @ 81D7E6A
- pause 32
+BattleScript_81D7E6A::
+ pause 0x20
printstring STRINGID_FAILEDTOSPITUP
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D7E78:: @ 81D7E78
+BattleScript_81D7E78::
attackstring
ppreduce
- pause 64
+ pause 0x40
stockpiletobasedamage BattleScript_81D7E6A
resultmessage
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectSwallow:: @ 81D7E8B
+BattleScript_EffectSwallow::
attackcanceler
attackstring
ppreduce
stockpiletohpheal BattleScript_81D7E98
goto BattleScript_PresentHealTarget
-BattleScript_81D7E98:: @ 81D7E98
- pause 32
+BattleScript_81D7E98::
+ pause 0x20
printfromtable gSwallowFailStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectHail:: @ 81D7EA8
+BattleScript_EffectHail::
attackcanceler
attackstring
ppreduce
sethail
goto BattleScript_81D7A14
-BattleScript_EffectTorment:: @ 81D7EB1
+BattleScript_EffectTorment::
attackcanceler
attackstring
ppreduce
@@ -2154,13 +2155,13 @@ BattleScript_EffectTorment:: @ 81D7EB1
attackanimation
waitanimation
printstring STRINGID_PKMNSUBJECTEDTOTORMENT
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectFlatter:: @ 81D7ECD
+BattleScript_EffectFlatter::
attackcanceler
- jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_81D6958
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_MakeMoveMissed
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
jumpifconfusedandstatmaxed 4, BattleScript_ButItFailed
@@ -2172,44 +2173,44 @@ BattleScript_EffectFlatter:: @ 81D7ECD
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D7F10:: @ 81D7F10
- jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_81D9460
- jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_81D8B39
+ waitmessage 0x40
+BattleScript_81D7F10::
+ jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
setmoveeffect MOVE_EFFECT_CONFUSION
seteffectprimary
goto BattleScript_MoveEnd
-BattleScript_EffectWillOWisp:: @ 81D7F2B
+BattleScript_EffectWillOWisp::
attackcanceler
attackstring
ppreduce
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
jumpifstatus BS_TARGET, STATUS1_BURN, BattleScript_81D7F91
- jumpiftype BS_TARGET, TYPE_FIRE, BattleScript_81D7E04
+ jumpiftype BS_TARGET, TYPE_FIRE, BattleScript_NotAffected
jumpifability BS_TARGET, ABILITY_WATER_VEIL, BattleScript_81D7F77
- jumpifstatus BS_TARGET, STATUS1_FREEZE | STATUS1_SLEEP | STATUS1_POISON | STATUS1_TOXIC_POISON | STATUS1_PARALYSIS | STATUS1_BURN, BattleScript_ButItFailed
+ jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
- jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_81D8B39
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
setmoveeffect MOVE_EFFECT_BURN
seteffectprimary
goto BattleScript_MoveEnd
-BattleScript_81D7F77:: @ 81D7F77
+BattleScript_81D7F77::
copybyte gEffectBattler, gBattlerTarget
setbyte cMULTISTRING_CHOOSER, 0
call BattleScript_BRNPrevention
goto BattleScript_MoveEnd
-BattleScript_81D7F91:: @ 81D7F91
- pause 32
+BattleScript_81D7F91::
+ pause 0x20
printstring STRINGID_PKMNALREADYHASBURN
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectMemento:: @ 81D7F9F
+BattleScript_EffectMemento::
attackcanceler
jumpifbyte CMP_EQUAL, gBattleCommunication + 6, 1, BattleScript_81D8026
attackstring
@@ -2226,63 +2227,63 @@ BattleScript_EffectMemento:: @ 81D7F9F
statbuffchange STAT_CHANGE_BS_PTR, BattleScript_81D7FEC
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_81D7FEC
printfromtable gStatDownStringIds
- waitmessage 64
-BattleScript_81D7FEC:: @ 81D7FEC
+ waitmessage 0x40
+BattleScript_81D7FEC::
playstatchangeanimation BS_TARGET, BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO
setstatchanger STAT_SPATK, 2, TRUE
statbuffchange STAT_CHANGE_BS_PTR, BattleScript_81D800F
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_81D800F
printfromtable gStatDownStringIds
- waitmessage 64
-BattleScript_81D800F:: @ 81D800F
+ waitmessage 0x40
+BattleScript_81D800F::
tryfaintmon BS_ATTACKER, 0, NULL
goto BattleScript_MoveEnd
-BattleScript_81D801B:: @ 81D801B
+BattleScript_81D801B::
printstring STRINGID_BUTNOEFFECT
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D800F
-BattleScript_81D8026:: @ 81D8026
+BattleScript_81D8026::
attackstring
ppreduce
jumpifattackandspecialattackcannotfall BattleScript_81D802D
-BattleScript_81D802D:: @ 81D802D
+BattleScript_81D802D::
setatkhptozero
- pause 64
+ pause 0x40
effectivenesssound
resultmessage
- waitmessage 64
+ waitmessage 0x40
tryfaintmon BS_ATTACKER, 0, NULL
goto BattleScript_MoveEnd
-BattleScript_EffectFacade:: @ 81D8042
+BattleScript_EffectFacade::
jumpifstatus BS_ATTACKER, STATUS1_POISON | STATUS1_PARALYSIS | STATUS1_BURN | STATUS1_TOXIC_POISON, BattleScript_81D8051
goto BattleScript_EffectHit
-BattleScript_81D8051:: @ 81D8051
+BattleScript_81D8051::
setbyte sDMG_MULTIPLIER, 2
goto BattleScript_EffectHit
-BattleScript_EffectFocusPunch:: @ 81D805C
+BattleScript_EffectFocusPunch::
attackcanceler
- jumpifnodamage BattleScript_81D6927
+ jumpifnodamage BattleScript_HitFromAccCheck
ppreduce
printstring STRINGID_PKMNLOSTFOCUS
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectSmellingsalt:: @ 81D806E
+BattleScript_EffectSmellingsalt::
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_EffectHit
setmoveeffect MOVE_EFFECT_REMOVE_PARALYSIS | MOVE_EFFECT_CERTAIN
jumpifstatus BS_TARGET, STATUS1_PARALYSIS, BattleScript_81D808D
goto BattleScript_EffectHit
-BattleScript_81D808D:: @ 81D808D
+BattleScript_81D808D::
setbyte sDMG_MULTIPLIER, 2
goto BattleScript_EffectHit
-BattleScript_EffectFollowMe:: @ 81D8098
+BattleScript_EffectFollowMe::
attackcanceler
attackstring
ppreduce
@@ -2290,19 +2291,19 @@ BattleScript_EffectFollowMe:: @ 81D8098
attackanimation
waitanimation
printstring STRINGID_PKMNCENTERATTENTION
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectNaturePower:: @ 81D80A9
+BattleScript_EffectNaturePower::
attackcanceler
attackstring
- pause 32
+ pause 0x20
callterrainattack
printstring STRINGID_NATUREPOWERTURNEDINTO
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_EffectCharge:: @ 81D80B6
+BattleScript_EffectCharge::
attackcanceler
attackstring
ppreduce
@@ -2310,10 +2311,10 @@ BattleScript_EffectCharge:: @ 81D80B6
attackanimation
waitanimation
printstring STRINGID_PKMNCHARGINGPOWER
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectTaunt:: @ 81D80C7
+BattleScript_EffectTaunt::
attackcanceler
attackstring
ppreduce
@@ -2322,10 +2323,10 @@ BattleScript_EffectTaunt:: @ 81D80C7
attackanimation
waitanimation
printstring STRINGID_PKMNFELLFORTAUNT
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectHelpingHand:: @ 81D80E3
+BattleScript_EffectHelpingHand::
attackcanceler
attackstring
ppreduce
@@ -2333,10 +2334,10 @@ BattleScript_EffectHelpingHand:: @ 81D80E3
attackanimation
waitanimation
printstring STRINGID_PKMNREADYTOHELP
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectTrick:: @ 81D80F8
+BattleScript_EffectTrick::
attackcanceler
attackstring
ppreduce
@@ -2346,12 +2347,12 @@ BattleScript_EffectTrick:: @ 81D80F8
attackanimation
waitanimation
printstring STRINGID_PKMNSWITCHEDITEMS
- waitmessage 64
+ waitmessage 0x40
printfromtable gItemSwapStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectRolePlay:: @ 81D8126
+BattleScript_EffectRolePlay::
attackcanceler
attackstring
ppreduce
@@ -2360,10 +2361,10 @@ BattleScript_EffectRolePlay:: @ 81D8126
attackanimation
waitanimation
printstring STRINGID_PKMNCOPIEDFOE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectWish:: @ 81D8142
+BattleScript_EffectWish::
attackcanceler
attackstring
ppreduce
@@ -2372,7 +2373,7 @@ BattleScript_EffectWish:: @ 81D8142
waitanimation
goto BattleScript_MoveEnd
-BattleScript_EffectAssist:: @ 81D8152
+BattleScript_EffectAssist::
attackcanceler
attackstring
assistattackselect BattleScript_81D7DF1
@@ -2381,7 +2382,7 @@ BattleScript_EffectAssist:: @ 81D8152
setbyte sB_ANIM_TURN, 0
setbyte sB_ANIM_TARGETS_HIT, 0
jumptocalledmove 1
-BattleScript_EffectIngrain:: @ 81D8169
+BattleScript_EffectIngrain::
attackcanceler
attackstring
ppreduce
@@ -2389,25 +2390,25 @@ BattleScript_EffectIngrain:: @ 81D8169
attackanimation
waitanimation
printstring STRINGID_PKMNPLANTEDROOTS
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectSuperpower:: @ 81D817E
+BattleScript_EffectSuperpower::
setmoveeffect MOVE_EFFECT_ATK_DEF_DOWN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
-BattleScript_EffectMagicCoat:: @ 81D8189
+BattleScript_EffectMagicCoat::
attackcanceler
- trysetmagiccoat BattleScript_81D7DF0
+ trysetmagiccoat BattleScript_ButItFailedAtkStringPpReduce
attackstring
ppreduce
attackanimation
waitanimation
printstring STRINGID_PKMNSHROUDEDITSELF
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectRecycle:: @ 81D819E
+BattleScript_EffectRecycle::
attackcanceler
attackstring
ppreduce
@@ -2415,16 +2416,16 @@ BattleScript_EffectRecycle:: @ 81D819E
attackanimation
waitanimation
printstring STRINGID_XFOUNDONEY
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectRevenge:: @ 81D81B3
+BattleScript_EffectRevenge::
doubledamagedealtifdamaged
goto BattleScript_EffectHit
-BattleScript_EffectBrickBreak:: @ 81D81B9
+BattleScript_EffectBrickBreak::
attackcanceler
- accuracycheck BattleScript_81D695E, ACC_CURR_MOVE
+ accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
removelightscreenreflect
@@ -2434,13 +2435,13 @@ BattleScript_EffectBrickBreak:: @ 81D81B9
adjustnormaldamage
jumpifbyte CMP_EQUAL, sB_ANIM_TURN, 0, BattleScript_81D81D9
bicbyte gMoveResultFlags, MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE
-BattleScript_81D81D9:: @ 81D81D9
+BattleScript_81D81D9::
attackanimation
waitanimation
jumpifbyte CMP_LESS_THAN, sB_ANIM_TURN, 2, BattleScript_81D81EC
printstring STRINGID_THEWALLSHATTERED
- waitmessage 64
-BattleScript_81D81EC:: @ 81D81EC
+ waitmessage 0x40
+BattleScript_81D81EC::
typecalc2
effectivenesssound
hitanimation BS_TARGET
@@ -2448,43 +2449,43 @@ BattleScript_81D81EC:: @ 81D81EC
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
- waitmessage 64
+ waitmessage 0x40
resultmessage
- waitmessage 64
+ waitmessage 0x40
seteffectwithchance
tryfaintmon BS_TARGET, 0, NULL
goto BattleScript_MoveEnd
-BattleScript_EffectYawn:: @ 81D820A
+BattleScript_EffectYawn::
attackcanceler
attackstring
ppreduce
jumpifability BS_TARGET, ABILITY_VITAL_SPIRIT, BattleScript_81D824B
jumpifability BS_TARGET, ABILITY_INSOMNIA, BattleScript_81D824B
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_81D8B39
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
jumpifcantmakeasleep BattleScript_ButItFailed
setyawn BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNWASMADEDROWSY
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D824B:: @ 81D824B
+BattleScript_81D824B::
copybyte sBATTLER, sBATTLER_WITH_ABILITY
-BattleScript_81D8255:: @ 81D8255
- pause 32
+BattleScript_81D8255::
+ pause 0x20
printstring STRINGID_PKMNSXMADEITINEFFECTIVE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectKnockOff:: @ 81D8263
+BattleScript_EffectKnockOff::
setmoveeffect MOVE_EFFECT_KNOCK_OFF
goto BattleScript_EffectHit
-BattleScript_EffectEndeavor:: @ 81D826E
+BattleScript_EffectEndeavor::
attackcanceler
attackstring
ppreduce
@@ -2492,17 +2493,17 @@ BattleScript_EffectEndeavor:: @ 81D826E
copyword gHpDealt, gBattleMoveDamage
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
typecalc
- jumpifmovehadnoeffect BattleScript_81D6934
+ jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
copyword gBattleMoveDamage, gHpDealt
adjustsetdamage
- goto BattleScript_81D6934
+ goto BattleScript_HitFromAtkAnimation
-BattleScript_EffectEruption:: @ 81D82A9
+BattleScript_EffectEruption::
scaledamagebyhealthratio
goto BattleScript_EffectHit
-BattleScript_EffectSkillSwap:: @ 81D82AF
+BattleScript_EffectSkillSwap::
attackcanceler
attackstring
ppreduce
@@ -2511,10 +2512,10 @@ BattleScript_EffectSkillSwap:: @ 81D82AF
attackanimation
waitanimation
printstring STRINGID_PKMNSWAPPEDABILITIES
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectImprison:: @ 81D82CB
+BattleScript_EffectImprison::
attackcanceler
attackstring
ppreduce
@@ -2522,10 +2523,10 @@ BattleScript_EffectImprison:: @ 81D82CB
attackanimation
waitanimation
printstring STRINGID_PKMNSEALEDOPPONENTMOVE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectRefresh:: @ 81D82E0
+BattleScript_EffectRefresh::
attackcanceler
attackstring
ppreduce
@@ -2533,11 +2534,11 @@ BattleScript_EffectRefresh:: @ 81D82E0
attackanimation
waitanimation
printstring STRINGID_PKMNSTATUSNORMAL
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_ATTACKER
goto BattleScript_MoveEnd
-BattleScript_EffectGrudge:: @ 81D82F7
+BattleScript_EffectGrudge::
attackcanceler
attackstring
ppreduce
@@ -2545,22 +2546,22 @@ BattleScript_EffectGrudge:: @ 81D82F7
attackanimation
waitanimation
printstring STRINGID_PKMNWANTSGRUDGE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectSnatch:: @ 81D830C
+BattleScript_EffectSnatch::
attackcanceler
- trysetsnatch BattleScript_81D7DF0
+ trysetsnatch BattleScript_ButItFailedAtkStringPpReduce
attackstring
ppreduce
attackanimation
waitanimation
- pause 32
+ pause 0x20
printstring STRINGID_PKMNWAITSFORTARGET
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectLowKick:: @ 81D8324
+BattleScript_EffectLowKick::
attackcanceler
attackstring
ppreduce
@@ -2568,20 +2569,20 @@ BattleScript_EffectLowKick:: @ 81D8324
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
goto BattleScript_HitFromCritCalc
-BattleScript_EffectSecretPower:: @ 81D8334
+BattleScript_EffectSecretPower::
getsecretpowereffect
goto BattleScript_EffectHit
-BattleScript_EffectDoubleEdge:: @ 81D833A
+BattleScript_EffectDoubleEdge::
setmoveeffect MOVE_EFFECT_RECOIL_33 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
-BattleScript_EffectTeeterDance:: @ 81D8345
+BattleScript_EffectTeeterDance::
attackcanceler
attackstring
ppreduce
setbyte gBattlerTarget, 0
-BattleScript_81D834E:: @ 81D834E
+BattleScript_81D834E::
movevaluescleanup
setmoveeffect MOVE_EFFECT_CONFUSION
jumpifbyteequal gBattlerAttacker, gBattlerTarget, BattleScript_81D8394
@@ -2594,43 +2595,43 @@ BattleScript_81D834E:: @ 81D834E
waitanimation
seteffectprimary
resultmessage
- waitmessage 64
-BattleScript_81D8394:: @ 81D8394
+ waitmessage 0x40
+BattleScript_81D8394::
moveendto 16
addbyte gBattlerTarget, 1
jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_81D834E
end
-BattleScript_81D83B2:: @ 81D83B2
- pause 32
+BattleScript_81D83B2::
+ pause 0x20
printstring STRINGID_PKMNPREVENTSCONFUSIONWITH
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D8394
-BattleScript_81D83C0:: @ 81D83C0
- pause 32
+BattleScript_81D83C0::
+ pause 0x20
printstring STRINGID_PKMNUSEDSAFEGUARD
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D8394
-BattleScript_81D83CE:: @ 81D83CE
- pause 32
+BattleScript_81D83CE::
+ pause 0x20
printstring STRINGID_BUTITFAILED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D8394
-BattleScript_81D83DC:: @ 81D83DC
- pause 32
+BattleScript_81D83DC::
+ pause 0x20
printstring STRINGID_PKMNALREADYCONFUSED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D8394
-BattleScript_81D83EA:: @ 81D83EA
+BattleScript_81D83EA::
resultmessage
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D8394
-BattleScript_EffectMudSport:: @ 81D83F3
+BattleScript_EffectMudSport::
attackcanceler
attackstring
ppreduce
@@ -2638,28 +2639,28 @@ BattleScript_EffectMudSport:: @ 81D83F3
attackanimation
waitanimation
printfromtable gSportsUsedStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectPoisonFang:: @ 81D840A
+BattleScript_EffectPoisonFang::
setmoveeffect MOVE_EFFECT_TOXIC
goto BattleScript_EffectHit
-BattleScript_EffectWeatherBall:: @ 81D8415
+BattleScript_EffectWeatherBall::
setweatherballtype
goto BattleScript_EffectHit
-BattleScript_EffectOverheat:: @ 81D841B
+BattleScript_EffectOverheat::
setmoveeffect MOVE_EFFECT_SP_ATK_TWO_DOWN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
-BattleScript_EffectTickle:: @ 81D8426
+BattleScript_EffectTickle::
attackcanceler
attackstring
ppreduce
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, 0, BattleScript_81D843B
jumpifstat BS_TARGET, CMP_EQUAL, STAT_DEF, 0, BattleScript_81D8499
-BattleScript_81D843B:: @ 81D843B
+BattleScript_81D843B::
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
attackanimation
waitanimation
@@ -2670,31 +2671,31 @@ BattleScript_81D843B:: @ 81D843B
statbuffchange STAT_CHANGE_BS_PTR, BattleScript_81D8471
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D8471
printfromtable gStatDownStringIds
- waitmessage 64
-BattleScript_81D8471:: @ 81D8471
+ waitmessage 0x40
+BattleScript_81D8471::
playstatchangeanimation BS_TARGET, BIT_DEF, ATK48_STAT_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE
statbuffchange STAT_CHANGE_BS_PTR, BattleScript_81D8494
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D8494
printfromtable gStatDownStringIds
- waitmessage 64
-BattleScript_81D8494:: @ 81D8494
+ waitmessage 0x40
+BattleScript_81D8494::
goto BattleScript_MoveEnd
-BattleScript_81D8499:: @ 81D8499
- pause 32
+BattleScript_81D8499::
+ pause 0x20
orbyte gMoveResultFlags, MOVE_RESULT_FAILED
printstring STRINGID_STATSWONTDECREASE2
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectCosmicPower:: @ 81D84AD
+BattleScript_EffectCosmicPower::
attackcanceler
attackstring
ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, 12, BattleScript_81D84C2
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 12, BattleScript_81D85E7
-BattleScript_81D84C2:: @ 81D84C2
+BattleScript_81D84C2::
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, 0
@@ -2703,27 +2704,27 @@ BattleScript_81D84C2:: @ 81D84C2
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D84ED
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D84ED
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D84ED:: @ 81D84ED
+ waitmessage 0x40
+BattleScript_81D84ED::
setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D850C
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D850C
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D850C:: @ 81D850C
+ waitmessage 0x40
+BattleScript_81D850C::
goto BattleScript_MoveEnd
-BattleScript_EffectSkyUppercut:: @ 81D8511
+BattleScript_EffectSkyUppercut::
orword gHitMarker, HITMARKER_IGNORE_ON_AIR
goto BattleScript_EffectHit
-BattleScript_EffectBulkUp:: @ 81D851F
+BattleScript_EffectBulkUp::
attackcanceler
attackstring
ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 12, BattleScript_81D8534
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, 12, BattleScript_81D85E7
-BattleScript_81D8534:: @ 81D8534
+BattleScript_81D8534::
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, 0
@@ -2732,23 +2733,23 @@ BattleScript_81D8534:: @ 81D8534
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D855F
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D855F
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D855F:: @ 81D855F
+ waitmessage 0x40
+BattleScript_81D855F::
setstatchanger STAT_DEF, 1, FALSE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D857E
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D857E
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D857E:: @ 81D857E
+ waitmessage 0x40
+BattleScript_81D857E::
goto BattleScript_MoveEnd
-BattleScript_EffectCalmMind:: @ 81D8583
+BattleScript_EffectCalmMind::
attackcanceler
attackstring
ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, 12, BattleScript_81D8598
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 12, BattleScript_81D85E7
-BattleScript_81D8598:: @ 81D8598
+BattleScript_81D8598::
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, 0
@@ -2757,30 +2758,30 @@ BattleScript_81D8598:: @ 81D8598
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D85C3
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D85C3
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D85C3:: @ 81D85C3
+ waitmessage 0x40
+BattleScript_81D85C3::
setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D85E2
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D85E2
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D85E2:: @ 81D85E2
+ waitmessage 0x40
+BattleScript_81D85E2::
goto BattleScript_MoveEnd
-BattleScript_81D85E7:: @ 81D85E7
- pause 32
+BattleScript_81D85E7::
+ pause 0x20
orbyte gMoveResultFlags, MOVE_RESULT_FAILED
printstring STRINGID_STATSWONTINCREASE2
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_EffectDragonDance:: @ 81D85FB
+BattleScript_EffectDragonDance::
attackcanceler
attackstring
ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 12, BattleScript_81D8610
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, 12, BattleScript_81D85E7
-BattleScript_81D8610:: @ 81D8610
+BattleScript_81D8610::
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, 0
@@ -2789,17 +2790,17 @@ BattleScript_81D8610:: @ 81D8610
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D863B
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D863B
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D863B:: @ 81D863B
+ waitmessage 0x40
+BattleScript_81D863B::
setstatchanger STAT_SPEED, 1, FALSE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D865A
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D865A
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D865A:: @ 81D865A
+ waitmessage 0x40
+BattleScript_81D865A::
goto BattleScript_MoveEnd
-BattleScript_EffectCamouflage:: @ 81D865F
+BattleScript_EffectCamouflage::
attackcanceler
attackstring
ppreduce
@@ -2807,51 +2808,51 @@ BattleScript_EffectCamouflage:: @ 81D865F
attackanimation
waitanimation
printstring STRINGID_PKMNCHANGEDTYPE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_FaintAttacker:: @ 81D8674
+BattleScript_FaintAttacker::
playfaintcry BS_ATTACKER
- pause 64
+ pause 0x40
dofaintanimation BS_ATTACKER
cleareffectsonfaint BS_ATTACKER
printstring STRINGID_ATTACKERFAINTED
printstring STRINGID_EMPTYSTRING3
return
-BattleScript_FaintTarget:: @ 81D8684
+BattleScript_FaintTarget::
playfaintcry BS_TARGET
- pause 64
+ pause 0x40
dofaintanimation BS_TARGET
cleareffectsonfaint BS_TARGET
printstring STRINGID_TARGETFAINTED
printstring STRINGID_EMPTYSTRING3
return
-BattleScript_GiveExp:: @ 81D8694
+BattleScript_GiveExp::
setbyte sGIVEEXP_STATE, 0
getexp BS_TARGET
end2
-BattleScript_HandleFaintedMon:: @ 81D869D
+BattleScript_HandleFaintedMon::
atk24 BattleScript_81D87B8
jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_81D87B7
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_81D86E6
- jumpifword CMP_NO_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_81D86E6
+ jumpifword CMP_NO_COMMON_BITS, gHitMarker, HITMARKER_PLAYER_FAINTED, BattleScript_81D86E6
printstring STRINGID_USENEXTPKMN
setbyte gBattleCommunication, 0
yesnobox
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0, BattleScript_81D86E6
jumpifplayerran BattleScript_81D87B7
printstring STRINGID_CANTESCAPE2
-BattleScript_81D86E6:: @ 81D86E6
- openpartyscreen 3, BattleScript_81D87B7
+BattleScript_81D86E6::
+ openpartyscreen BS_FAINTED, BattleScript_81D87B7
switchhandleorder BS_FAINTED, 2
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_81D8792
jumpifbattletype BATTLE_TYPE_LINK, BattleScript_81D8792
jumpifbattletype BATTLE_TYPE_BATTLE_TOWER, BattleScript_81D8792
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_81D8792
- jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_81D8792
+ jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_PLAYER_FAINTED, BattleScript_81D8792
jumpifbyte CMP_EQUAL, sBATTLE_STYLE, 1, BattleScript_81D8792
jumpifcantswitch BS_PLAYER1, BattleScript_81D8792
printstring STRINGID_ENEMYABOUTTOSWITCHPKMN
@@ -2859,7 +2860,7 @@ BattleScript_81D86E6:: @ 81D86E6
yesnobox
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 1, BattleScript_81D8792
setatktoplayer0
- openpartyscreen 129, BattleScript_81D8792
+ openpartyscreen BS_ATTACKER | OPEN_PARTY_ALLOW_CANCEL, BattleScript_81D8792
switchhandleorder BS_ATTACKER, 2
jumpifbyte CMP_EQUAL, gBattleCommunication, 6, BattleScript_81D8792
atknameinbuff1
@@ -2880,7 +2881,7 @@ BattleScript_81D86E6:: @ 81D86E6
waitstate
switchineffects BS_ATTACKER
resetsentmonsvalue
-BattleScript_81D8792:: @ 81D8792
+BattleScript_81D8792::
drawpartystatussummary BS_FAINTED
getswitchedmondata BS_FAINTED
switchindataupdate BS_FAINTED
@@ -2893,16 +2894,16 @@ BattleScript_81D8792:: @ 81D8792
switchineffects BS_FAINTED
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_81D87B7
cancelallactions
-BattleScript_81D87B7:: @ 81D87B7
+BattleScript_81D87B7::
end2
-BattleScript_81D87B8:: @ 81D87B8
- openpartyscreen 5, BattleScript_81D87BE
-BattleScript_81D87BE:: @ 81D87BE
+BattleScript_81D87B8::
+ openpartyscreen BS_UNKNOWN_5, BattleScript_81D87BE
+BattleScript_81D87BE::
switchhandleorder BS_FAINTED, 0
- openpartyscreen 6, BattleScript_81D87EE
+ openpartyscreen BS_UNKNOWN_6, BattleScript_81D87EE
switchhandleorder BS_FAINTED, 0
-BattleScript_81D87CA:: @ 81D87CA
+BattleScript_81D87CA::
switchhandleorder BS_FAINTED, 2
drawpartystatussummary BS_FAINTED
getswitchedmondata BS_FAINTED
@@ -2914,90 +2915,90 @@ BattleScript_81D87CA:: @ 81D87CA
waitstate
switchineffects 5
jumpifbytenotequal gBattlerFainted, gBattlersCount, BattleScript_81D87CA
-BattleScript_81D87EE:: @ 81D87EE
+BattleScript_81D87EE::
end2
-BattleScript_LocalTrainerBattleWon:: @ 81D87EF
+BattleScript_LocalTrainerBattleWon::
printstring STRINGID_PLAYERDEFEATEDTRAINER1
trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1LOSETEXT
getmoneyreward BattleScript_81D87FD
-BattleScript_81D87FD:: @ 81D87FD
+BattleScript_81D87FD::
printstring STRINGID_PLAYERGOTMONEY
- waitmessage 64
-BattleScript_PayDayMoneyAndPickUpItems:: @ 81D8803
+ waitmessage 0x40
+BattleScript_PayDayMoneyAndPickUpItems::
givepaydaymoney
pickup
end2
-BattleScript_LocalBattleLost:: @ 81D8806
+BattleScript_LocalBattleLost::
jumpifbattletype BATTLE_TYPE_TRAINER_TOWER, BattleScript_81D8896
jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_81D886E
jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, 1024, BattleScript_81D886E
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_81D8876
-BattleScript_81D8839:: @ 81D8839
+BattleScript_81D8839::
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_81D885D
printstring STRINGID_PLAYERWHITEOUT
- waitmessage 64
+ waitmessage 0x40
getmoneyreward BattleScript_81D886F
printstring STRINGID_PLAYERWHITEOUT2
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D886E
-BattleScript_81D885D:: @ 81D885D
+BattleScript_81D885D::
printstring STRINGID_PLAYERLOSTAGAINSTENEMYTRAINER
- waitmessage 64
+ waitmessage 0x40
getmoneyreward BattleScript_81D886F
printstring STRINGID_PLAYERPAIDPRIZEMONEY
- waitmessage 64
-BattleScript_81D886E:: @ 81D886E
+ waitmessage 0x40
+BattleScript_81D886E::
end2
-BattleScript_81D886F:: @ 81D886F
+BattleScript_81D886F::
printstring STRINGID_PLAYERWHITEDOUT
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_81D8876:: @ 81D8876
+BattleScript_81D8876::
jumpifhasnohp BS_ATTACKER, BattleScript_81D8884
printstring STRINGID_TRAINER1MON1COMEBACK
- waitmessage 64
+ waitmessage 0x40
returnatktoball
waitstate
-BattleScript_81D8884:: @ 81D8884
+BattleScript_81D8884::
trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1WINTEXT
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D8839
end2
-BattleScript_81D8896:: @ 81D8896
+BattleScript_81D8896::
various8 BS_ATTACKER
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_81D88B4
printfromtable gDoubleBattleRecallStrings
- waitmessage 64
+ waitmessage 0x40
returnopponentmon1toball BS_ATTACKER
waitstate
returnopponentmon2toball BS_ATTACKER
waitstate
-BattleScript_81D88B4:: @ 81D88B4
+BattleScript_81D88B4::
trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1WINTEXT
jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_81D88CB
printstring STRINGID_TRAINER2NAME
-BattleScript_81D88CB:: @ 81D88CB
+BattleScript_81D88CB::
end2
-BattleScript_LinkBattleWonOrLost:: @ 81D88CC
+BattleScript_LinkBattleWonOrLost::
printstring STRINGID_BATTLEEND
- waitmessage 64
+ waitmessage 0x40
atk57
- waitmessage 64
+ waitmessage 0x40
end2
-gUnknown_81D88D7:: @ 81D88D7
+gUnknown_81D88D7::
printstring STRINGID_PLAYERDEFEATEDTRAINER1
trainerslidein BS_ATTACKER
waitstate
@@ -3005,54 +3006,54 @@ gUnknown_81D88D7:: @ 81D88D7
printstring STRINGID_TRAINER1LOSETEXT
jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_81D88FF
printstring STRINGID_TRAINER2CLASS
-BattleScript_81D88FF:: @ 81D88FF
+BattleScript_81D88FF::
pickup
end2
-BattleScript_SmokeBallEscape:: @ 81D8901
+BattleScript_SmokeBallEscape::
playanimation BS_ATTACKER, B_ANIM_SMOKEBALL_ESCAPE, NULL
printstring STRINGID_PKMNFLEDUSINGITS
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_RanAwayUsingMonAbility:: @ 81D890F
+BattleScript_RanAwayUsingMonAbility::
printstring STRINGID_PKMNFLEDUSING
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_GotAwaySafely:: @ 81D8916
+BattleScript_GotAwaySafely::
printstring STRINGID_GOTAWAYSAFELY
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_WildMonFled:: @ 81D891D
+BattleScript_WildMonFled::
printstring STRINGID_WILDPKMNFLED
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_PrintCantRunFromTrainer:: @ 81D8924
+BattleScript_PrintCantRunFromTrainer::
jumpifbattletype BATTLE_TYPE_FIRST_BATTLE, BattleScript_81D8936
printstring STRINGID_NORUNNINGFROMTRAINERS
end2
-BattleScript_81D8936:: @ 81D8936
+BattleScript_81D8936::
printstring STRINGID_DONTLEAVEBIRCH
end2
-BattleScript_PrintFailedToRunString:: @ 81D893A
+BattleScript_PrintFailedToRunString::
printfromtable gNoEscapeStringIds
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_PrintCantEscapeFromBattle:: @ 81D8943
+BattleScript_PrintCantEscapeFromBattle::
printselectionstringfromtable gNoEscapeStringIds
endselectionscript
-BattleScript_PrintFullBox:: @ 81D8949
+BattleScript_PrintFullBox::
printselectionstring STRINGID_BOXISFULL
endselectionscript
-BattleScript_ActionSwitch:: @ 81D894D
+BattleScript_ActionSwitch::
hpthresholds2 BS_ATTACKER
printstring STRINGID_RETURNMON
setbyte sDMG_MULTIPLIER, 2
@@ -3060,15 +3061,15 @@ BattleScript_ActionSwitch:: @ 81D894D
setmultihit 1
goto BattleScript_81D896F
-BattleScript_81D896D:: @ 81D896D
+BattleScript_81D896D::
setmultihit 2
-BattleScript_81D896F:: @ 81D896F
+BattleScript_81D896F::
jumpifnopursuitswitchdmg BattleScript_81D897C
swapattackerwithtarget
trysetdestinybondtohappen
call BattleScript_81D89AF
swapattackerwithtarget
-BattleScript_81D897C:: @ 81D897C
+BattleScript_81D897C::
decrementmultihit BattleScript_81D896F
switchoutabilities BS_ATTACKER
waitstate
@@ -3088,8 +3089,8 @@ BattleScript_81D897C:: @ 81D897C
moveendcase 15
end2
-BattleScript_81D89AF:: @ 81D89AF
- pause 32
+BattleScript_81D89AF::
+ pause 0x20
attackstring
ppreduce
critcalc
@@ -3104,23 +3105,23 @@ BattleScript_81D89AF:: @ 81D89AF
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
- waitmessage 64
+ waitmessage 0x40
resultmessage
- waitmessage 64
+ waitmessage 0x40
tryfaintmon BS_TARGET, 0, NULL
moveendfromto 3, 6
various4 BS_TARGET
jumpifbyte CMP_EQUAL, gBattleCommunication, 0, BattleScript_81D89F0
setbyte sGIVEEXP_STATE, 0
getexp BS_TARGET
-BattleScript_81D89F0:: @ 81D89F0
+BattleScript_81D89F0::
return
-BattleScript_Pausex20:: @ 81D89F1
- pause 32
+BattleScript_Pausex20::
+ pause 0x20
return
-BattleScript_LevelUp:: @ 81D89F5
+BattleScript_LevelUp::
fanfare MUS_FANFA1
printstring STRINGID_PKMNGREWTOLV
setbyte sLVLBOX_STATE, 0
@@ -3128,9 +3129,9 @@ BattleScript_LevelUp:: @ 81D89F5
handlelearnnewmove BattleScript_81D8A51, BattleScript_81D8A63, 1
goto BattleScript_81D8A1B
-BattleScript_81D8A11:: @ 81D8A11
+BattleScript_81D8A11::
handlelearnnewmove BattleScript_81D8A51, BattleScript_81D8A63, 0
-BattleScript_81D8A1B:: @ 81D8A1B
+BattleScript_81D8A1B::
buffermovetolearn
printstring STRINGID_TRYTOLEARNMOVE1
printstring STRINGID_TRYTOLEARNMOVE2
@@ -3145,40 +3146,40 @@ BattleScript_81D8A1B:: @ 81D8A1B
printstring STRINGID_DIDNOTLEARNMOVE
goto BattleScript_81D8A11
-BattleScript_81D8A48:: @ 81D8A48
+BattleScript_81D8A48::
printstring STRINGID_123POOF
printstring STRINGID_PKMNFORGOTMOVE
printstring STRINGID_ANDELLIPSIS
-BattleScript_81D8A51:: @ 81D8A51
+BattleScript_81D8A51::
buffermovetolearn
fanfare MUS_FANFA1
printstring STRINGID_PKMNLEARNEDMOVE
- waitmessage 64
+ waitmessage 0x40
updatechoicemoveonlvlup BS_ATTACKER
goto BattleScript_81D8A11
-BattleScript_81D8A63:: @ 81D8A63
+BattleScript_81D8A63::
return
-BattleScript_RainContinuesOrEnds:: @ 81D8A64
+BattleScript_RainContinuesOrEnds::
printfromtable gRainContinuesStringIds
- waitmessage 64
+ waitmessage 0x40
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D8A7E
playanimation BS_ATTACKER, B_ANIM_RAIN_CONTINUES, NULL
-BattleScript_81D8A7E:: @ 81D8A7E
+BattleScript_81D8A7E::
end2
-BattleScript_DamagingWeatherContinues:: @ 81D8A7F
+BattleScript_DamagingWeatherContinues::
printfromtable gSandStormHailContinuesStringIds
- waitmessage 64
+ waitmessage 0x40
playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
setbyte gBattleCommunication, 0
-BattleScript_81D8A97:: @ 81D8A97
+BattleScript_81D8A97::
copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 1
weatherdamage
jumpifword CMP_EQUAL, gBattleMoveDamage, NULL, BattleScript_81D8AD8
printfromtable gSandStormHailDmgStringIds
- waitmessage 64
+ waitmessage 0x40
orword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
effectivenesssound
hitanimation BS_ATTACKER
@@ -3186,54 +3187,54 @@ BattleScript_81D8A97:: @ 81D8A97
datahpupdate BS_ATTACKER
tryfaintmon BS_ATTACKER, 0, NULL
atk24 BattleScript_81D8AD8
-BattleScript_81D8AD8:: @ 81D8AD8
+BattleScript_81D8AD8::
jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_81D8AF7
addbyte gBattleCommunication, 1
jumpifbytenotequal gBattleCommunication, gBattlersCount, BattleScript_81D8A97
-BattleScript_81D8AF7:: @ 81D8AF7
+BattleScript_81D8AF7::
bicword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
end2
-BattleScript_SandStormHailEnds:: @ 81D8B01
+BattleScript_SandStormHailEnds::
printfromtable gSandStormHailEndStringIds
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_SunlightContinues:: @ 81D8B0A
+BattleScript_SunlightContinues::
printstring STRINGID_SUNLIGHTSTRONG
- waitmessage 64
+ waitmessage 0x40
playanimation BS_ATTACKER, B_ANIM_SUN_CONTINUES, NULL
end2
-BattleScript_SunlightFaded:: @ 81D8B18
+BattleScript_SunlightFaded::
printstring STRINGID_SUNLIGHTFADED
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_OverworldWeatherStarts:: @ 81D8B1F
+BattleScript_OverworldWeatherStarts::
printfromtable gWeatherContinuesStringIds
- waitmessage 64
+ waitmessage 0x40
playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
end3
-BattleScript_SideStatusWoreOff:: @ 81D8B32
+BattleScript_SideStatusWoreOff::
printstring STRINGID_PKMNSXWOREOFF
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_81D8B39:: @ 81D8B39
- pause 32
+BattleScript_SafeguardProtected::
+ pause 0x20
printstring STRINGID_PKMNUSEDSAFEGUARD
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_SafeguardEnds:: @ 81D8B43
- pause 32
+BattleScript_SafeguardEnds::
+ pause 0x20
printstring STRINGID_PKMNSAFEGUARDEXPIRED
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_LeechSeedTurnDrain:: @ 81D8B4D
+BattleScript_LeechSeedTurnDrain::
playanimation BS_ATTACKER, B_ANIM_LEECH_SEED_DRAIN, sB_ANIM_ARG1
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_ATTACKER
@@ -3244,30 +3245,30 @@ BattleScript_LeechSeedTurnDrain:: @ 81D8B4D
setbyte cMULTISTRING_CHOOSER, 3
goto BattleScript_81D8B85
-BattleScript_81D8B7F:: @ 81D8B7F
+BattleScript_81D8B7F::
setbyte cMULTISTRING_CHOOSER, 4
-BattleScript_81D8B85:: @ 81D8B85
+BattleScript_81D8B85::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
printfromtable gLeechSeedStringIds
- waitmessage 64
+ waitmessage 0x40
tryfaintmon BS_ATTACKER, 0, NULL
tryfaintmon BS_TARGET, 0, NULL
end2
-BattleScript_BideStoringEnergy:: @ 81D8BA9
+BattleScript_BideStoringEnergy::
printstring STRINGID_PKMNSTORINGENERGY
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_BideAttack:: @ 81D8BB4
+BattleScript_BideAttack::
attackcanceler
setmoveeffect MOVE_EFFECT_CHARGING
clearstatusfromeffect BS_ATTACKER
printstring STRINGID_PKMNUNLEASHEDENERGY
- waitmessage 64
- accuracycheck BattleScript_81D6963, ACC_CURR_MOVE
+ waitmessage 0x40
+ accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE
typecalc
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
copyword gBattleMoveDamage, sBIDE_DMG
@@ -3281,19 +3282,19 @@ BattleScript_BideAttack:: @ 81D8BB4
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
resultmessage
- waitmessage 64
+ waitmessage 0x40
tryfaintmon BS_TARGET, 0, NULL
goto BattleScript_MoveEnd
-BattleScript_BideNoEnergyToAttack:: @ 81D8BFC
+BattleScript_BideNoEnergyToAttack::
attackcanceler
setmoveeffect MOVE_EFFECT_CHARGING
clearstatusfromeffect BS_ATTACKER
printstring STRINGID_PKMNUNLEASHEDENERGY
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_ButItFailed
-BattleScript_SuccessForceOut:: @ 81D8C10
+BattleScript_SuccessForceOut::
attackanimation
waitanimation
switchoutabilities BS_TARGET
@@ -3302,7 +3303,7 @@ BattleScript_SuccessForceOut:: @ 81D8C10
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_81D8C2C
setbyte gBattleOutcome, B_OUTCOME_PLAYER_TELEPORTED
finishaction
-BattleScript_81D8C2C:: @ 81D8C2C
+BattleScript_81D8C2C::
getswitchedmondata BS_TARGET
switchindataupdate BS_TARGET
switchinanim BS_TARGET, 0
@@ -3311,46 +3312,46 @@ BattleScript_81D8C2C:: @ 81D8C2C
switchineffects BS_TARGET
goto BattleScript_MoveEnd
-BattleScript_MistProtected:: @ 81D8C3E
- pause 32
+BattleScript_MistProtected::
+ pause 0x20
printstring STRINGID_PKMNPROTECTEDBYMIST
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_RageIsBuilding:: @ 81D8C48
+BattleScript_RageIsBuilding::
printstring STRINGID_PKMNRAGEBUILDING
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_MoveUsedIsDisabled:: @ 81D8C4F
+BattleScript_MoveUsedIsDisabled::
printstring STRINGID_PKMNMOVEISDISABLED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_SelectingDisabledMove:: @ 81D8C5A
+BattleScript_SelectingDisabledMove::
printselectionstring STRINGID_PKMNMOVEISDISABLED
endselectionscript
-BattleScript_DisabledNoMore:: @ 81D8C5E
+BattleScript_DisabledNoMore::
printstring STRINGID_PKMNMOVEDISABLEDNOMORE
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_EncoredNoMore:: @ 81D8C65
+BattleScript_EncoredNoMore::
printstring STRINGID_PKMNENCOREENDED
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_DestinyBondTakesLife:: @ 81D8C6C
+BattleScript_DestinyBondTakesLife::
printstring STRINGID_PKMNTOOKFOE
- waitmessage 64
+ waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
tryfaintmon BS_ATTACKER, 0, NULL
return
-BattleScript_SpikesOnAttacker:: @ 81D8C87
+BattleScript_SpikesOnAttacker::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
@@ -3359,13 +3360,13 @@ BattleScript_SpikesOnAttacker:: @ 81D8C87
tryfaintmon BS_ATTACKER, 1, BattleScript_81D8CA8
return
-BattleScript_81D8CA8:: @ 81D8CA8
+BattleScript_81D8CA8::
setbyte sGIVEEXP_STATE, 0
getexp BS_ATTACKER
moveendall
goto BattleScript_HandleFaintedMon
-BattleScript_SpikesOnTarget:: @ 81D8CBE
+BattleScript_SpikesOnTarget::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
@@ -3374,13 +3375,13 @@ BattleScript_SpikesOnTarget:: @ 81D8CBE
tryfaintmon BS_TARGET, 1, BattleScript_81D8CDF
return
-BattleScript_81D8CDF:: @ 81D8CDF
+BattleScript_81D8CDF::
setbyte sGIVEEXP_STATE, 0
getexp BS_TARGET
moveendall
goto BattleScript_HandleFaintedMon
-BattleScript_SpikesOnFaintedBattler:: @ 81D8CF5
+BattleScript_SpikesOnFaintedBattler::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_FAINTED
datahpupdate BS_FAINTED
@@ -3389,197 +3390,197 @@ BattleScript_SpikesOnFaintedBattler:: @ 81D8CF5
tryfaintmon BS_FAINTED, 1, BattleScript_81D8D16
return
-BattleScript_81D8D16:: @ 81D8D16
+BattleScript_81D8D16::
setbyte sGIVEEXP_STATE, 0
getexp BS_FAINTED
moveendall
goto BattleScript_HandleFaintedMon
-BattleScript_81D8D2C:: @ 81D8D2C
+BattleScript_81D8D2C::
printstring STRINGID_PKMNHURTBYSPIKES
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_PerishSongTakesLife:: @ 81D8D33
+BattleScript_PerishSongTakesLife::
printstring STRINGID_PKMNPERISHCOUNTFELL
- waitmessage 64
+ waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
tryfaintmon BS_ATTACKER, 0, NULL
end2
-BattleScript_PerishSongCountGoesDown:: @ 81D8D4E
+BattleScript_PerishSongCountGoesDown::
printstring STRINGID_PKMNPERISHCOUNTFELL
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_AllStatsUp:: @ 81D8D55
+BattleScript_AllStatsUp::
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 12, BattleScript_81D8D82
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, 12, BattleScript_81D8D82
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, 12, BattleScript_81D8D82
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, 12, BattleScript_81D8D82
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 12, BattleScript_81D8DF0
-BattleScript_81D8D82:: @ 81D8D82
+BattleScript_81D8D82::
setbyte sSTAT_ANIM_PLAYED, 0
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0
setstatchanger STAT_ATK, 1, FALSE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D8DA0
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D8DA0:: @ 81D8DA0
+ waitmessage 0x40
+BattleScript_81D8DA0::
setstatchanger STAT_DEF, 1, FALSE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D8DB4
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D8DB4:: @ 81D8DB4
+ waitmessage 0x40
+BattleScript_81D8DB4::
setstatchanger STAT_SPEED, 1, FALSE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D8DC8
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D8DC8:: @ 81D8DC8
+ waitmessage 0x40
+BattleScript_81D8DC8::
setstatchanger STAT_SPATK, 1, FALSE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D8DDC
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D8DDC:: @ 81D8DDC
+ waitmessage 0x40
+BattleScript_81D8DDC::
setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D8DF0
printfromtable gStatUpStringIds
- waitmessage 64
-BattleScript_81D8DF0:: @ 81D8DF0
+ waitmessage 0x40
+BattleScript_81D8DF0::
return
-BattleScript_RapidSpinAway:: @ 81D8DF1
+BattleScript_RapidSpinAway::
rapidspinfree
return
-BattleScript_WrapFree:: @ 81D8DF3
+BattleScript_WrapFree::
printstring STRINGID_PKMNGOTFREE
- waitmessage 64
+ waitmessage 0x40
copybyte gBattlerTarget, sBATTLER
return
-BattleScript_LeechSeedFree:: @ 81D8E04
+BattleScript_LeechSeedFree::
printstring STRINGID_PKMNSHEDLEECHSEED
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_SpikesFree:: @ 81D8E0B
+BattleScript_SpikesFree::
printstring STRINGID_PKMNBLEWAWAYSPIKES
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_MonTookFutureAttack:: @ 81D8E12
+BattleScript_MonTookFutureAttack::
printstring STRINGID_PKMNTOOKATTACK
- waitmessage 64
+ waitmessage 0x40
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_81D8E2F
accuracycheck BattleScript_81D8E86, MOVE_FUTURE_SIGHT
goto BattleScript_81D8E36
-BattleScript_81D8E2F:: @ 81D8E2F
+BattleScript_81D8E2F::
accuracycheck BattleScript_81D8E86, MOVE_DOOM_DESIRE
-BattleScript_81D8E36:: @ 81D8E36
+BattleScript_81D8E36::
adjustnormaldamage2
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_81D8E4E
playanimation BS_ATTACKER, B_ANIM_FUTURE_SIGHT_HIT, NULL
goto BattleScript_81D8E55
-BattleScript_81D8E4E:: @ 81D8E4E
+BattleScript_81D8E4E::
playanimation BS_ATTACKER, B_ANIM_DOOM_DESIRE_HIT, NULL
-BattleScript_81D8E55:: @ 81D8E55
+BattleScript_81D8E55::
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
resultmessage
- waitmessage 64
+ waitmessage 0x40
tryfaintmon BS_TARGET, 0, NULL
atk24 BattleScript_81D8E6D
-BattleScript_81D8E6D:: @ 81D8E6D
+BattleScript_81D8E6D::
moveendcase 0
moveendfromto 11, 14
setbyte gMoveResultFlags, 0
end2
-BattleScript_81D8E86:: @ 81D8E86
- pause 32
+BattleScript_81D8E86::
+ pause 0x20
setbyte gMoveResultFlags, 0
orbyte gMoveResultFlags, MOVE_RESULT_FAILED
resultmessage
- waitmessage 64
+ waitmessage 0x40
setbyte gMoveResultFlags, 0
end2
-BattleScript_NoMovesLeft:: @ 81D8EA0
+BattleScript_NoMovesLeft::
printselectionstring STRINGID_PKMNHASNOMOVESLEFT
endselectionscript
-BattleScript_SelectingMoveWithNoPP:: @ 81D8EA4
+BattleScript_SelectingMoveWithNoPP::
printselectionstring STRINGID_NOPPLEFT
endselectionscript
-BattleScript_NoPPForMove:: @ 81D8EA8
+BattleScript_NoPPForMove::
attackstring
- pause 32
+ pause 0x20
printstring STRINGID_BUTNOPPLEFT
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_SelectingTormentedMove:: @ 81D8EB7
+BattleScript_SelectingTormentedMove::
printselectionstring STRINGID_PKMNCANTUSEMOVETORMENT
endselectionscript
printstring STRINGID_PKMNCANTUSEMOVETORMENT
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_SelectingNotAllowedMoveTaunt:: @ 81D8EC6
+BattleScript_SelectingNotAllowedMoveTaunt::
printselectionstring STRINGID_PKMNCANTUSEMOVETAUNT
endselectionscript
-BattleScript_MoveUsedIsTaunted:: @ 81D8ECA
+BattleScript_MoveUsedIsTaunted::
printstring STRINGID_PKMNCANTUSEMOVETAUNT
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_WishComesTrue:: @ 81D8ED5
+BattleScript_WishComesTrue::
trywish 1, BattleScript_81D8EFC
playanimation BS_TARGET, B_ANIM_WISH_HEAL, NULL
printstring STRINGID_PKMNWISHCAMETRUE
- waitmessage 64
+ waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
printstring STRINGID_PKMNREGAINEDHEALTH
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_81D8EFC:: @ 81D8EFC
+BattleScript_81D8EFC::
printstring STRINGID_PKMNWISHCAMETRUE
- waitmessage 64
- pause 32
+ waitmessage 0x40
+ pause 0x20
printstring STRINGID_PKMNHPFULL
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_IngrainTurnHeal:: @ 81D8F0C
+BattleScript_IngrainTurnHeal::
playanimation BS_ATTACKER, B_ANIM_INGRAIN_HEAL, NULL
printstring STRINGID_PKMNABSORBEDNUTRIENTS
- waitmessage 64
+ waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
end2
-BattleScript_81D8F27:: @ 81D8F27
- pause 32
+BattleScript_PrintMonIsRooted::
+ pause 0x20
printstring STRINGID_PKMNANCHOREDITSELF
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_AtkDefDown:: @ 81D8F35
+BattleScript_AtkDefDown::
setbyte sSTAT_ANIM_PLAYED, 0
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE | ATK48_DONT_CHECK_LOWER
playstatchangeanimation BS_ATTACKER, BIT_ATK, ATK48_STAT_NEGATIVE | ATK48_DONT_CHECK_LOWER
@@ -3587,176 +3588,176 @@ BattleScript_AtkDefDown:: @ 81D8F35
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_81D8F62
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D8F62
printfromtable gStatDownStringIds
- waitmessage 64
-BattleScript_81D8F62:: @ 81D8F62
+ waitmessage 0x40
+BattleScript_81D8F62::
playstatchangeanimation BS_ATTACKER, BIT_DEF, ATK48_STAT_NEGATIVE | ATK48_DONT_CHECK_LOWER
setstatchanger STAT_DEF, 1, TRUE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_81D8F85
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D8F85
printfromtable gStatDownStringIds
- waitmessage 64
-BattleScript_81D8F85:: @ 81D8F85
+ waitmessage 0x40
+BattleScript_81D8F85::
return
-BattleScript_KnockedOff:: @ 81D8F86
+BattleScript_KnockedOff::
playanimation BS_TARGET, B_ANIM_ITEM_KNOCKOFF, NULL
printstring STRINGID_PKMNKNOCKEDOFF
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_MoveUsedIsImprisoned:: @ 81D8F94
+BattleScript_MoveUsedIsImprisoned::
printstring STRINGID_PKMNCANTUSEMOVESEALED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_SelectingImprisonedMove:: @ 81D8F9F
+BattleScript_SelectingImprisonedMove::
printselectionstring STRINGID_PKMNCANTUSEMOVESEALED
endselectionscript
-BattleScript_GrudgeTakesPp:: @ 81D8FA3
+BattleScript_GrudgeTakesPp::
printstring STRINGID_PKMNLOSTPPGRUDGE
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_MagicCoatBounce:: @ 81D8FAA
+BattleScript_MagicCoatBounce::
attackstring
ppreduce
- pause 32
+ pause 0x20
printstring STRINGID_PKMNMOVEBOUNCED
- waitmessage 64
+ waitmessage 0x40
orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000
setmagiccoattarget BS_ATTACKER
return
-BattleScript_SnatchedMove:: @ 81D8FC2
+BattleScript_SnatchedMove::
attackstring
ppreduce
snatchsetbattlers
playanimation BS_TARGET, B_ANIM_SNATCH_MOVE, NULL
printstring STRINGID_PKMNSNATCHEDMOVE
- waitmessage 64
+ waitmessage 0x40
orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000
swapattackerwithtarget
return
-BattleScript_EnduredMsg:: @ 81D8FDD
+BattleScript_EnduredMsg::
printstring STRINGID_PKMNENDUREDHIT
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_OneHitKOMsg:: @ 81D8FE4
+BattleScript_OneHitKOMsg::
printstring STRINGID_ONEHITKO
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_SAtkDown2:: @ 81D8FEB
+BattleScript_SAtkDown2::
setbyte sSTAT_ANIM_PLAYED, 0
playstatchangeanimation BS_ATTACKER, BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO | ATK48_DONT_CHECK_LOWER
setstatchanger STAT_SPATK, 2, TRUE
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_81D9014
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_81D9014
printfromtable gStatDownStringIds
- waitmessage 64
-BattleScript_81D9014:: @ 81D9014
+ waitmessage 0x40
+BattleScript_81D9014::
return
-BattleScript_FocusPunchSetUp:: @ 81D9015
+BattleScript_FocusPunchSetUp::
printstring STRINGID_EMPTYSTRING3
waitmessage 1
playanimation BS_ATTACKER, B_ANIM_FOCUS_PUNCH_SETUP, NULL
printstring STRINGID_PKMNTIGHTENINGFOCUS
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_MoveUsedIsAsleep:: @ 81D9029
+BattleScript_MoveUsedIsAsleep::
printstring STRINGID_PKMNFASTASLEEP
- waitmessage 64
+ waitmessage 0x40
statusanimation BS_ATTACKER
goto BattleScript_MoveEnd
-BattleScript_MoveUsedWokeUp:: @ 81D9036
+BattleScript_MoveUsedWokeUp::
bicword gHitMarker, HITMARKER_x10
printfromtable gWokeUpStringIds
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_ATTACKER
return
-BattleScript_MonWokeUpInUproar:: @ 81D904A
+BattleScript_MonWokeUpInUproar::
printstring STRINGID_PKMNWOKEUPINUPROAR
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_ATTACKER
end2
-BattleScript_PoisonTurnDmg:: @ 81D9053
+BattleScript_PoisonTurnDmg::
printstring STRINGID_PKMNHURTBYPOISON
- waitmessage 64
-BattleScript_81D9059:: @ 81D9059
+ waitmessage 0x40
+BattleScript_81D9059::
statusanimation BS_ATTACKER
-BattleScript_81D905B:: @ 81D905B
+BattleScript_81D905B::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
tryfaintmon BS_ATTACKER, 0, NULL
atk24 BattleScript_81D9074
-BattleScript_81D9074:: @ 81D9074
+BattleScript_81D9074::
end2
-BattleScript_BurnTurnDmg:: @ 81D9075
+BattleScript_BurnTurnDmg::
printstring STRINGID_PKMNHURTBYBURN
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D9059
-BattleScript_MoveUsedIsFrozen:: @ 81D9080
+BattleScript_MoveUsedIsFrozen::
printstring STRINGID_PKMNISFROZEN
- waitmessage 64
+ waitmessage 0x40
statusanimation BS_ATTACKER
goto BattleScript_MoveEnd
-BattleScript_MoveUsedUnfroze:: @ 81D908D
+BattleScript_MoveUsedUnfroze::
printfromtable gGotDefrostedStringIds
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_ATTACKER
return
-BattleScript_DefrostedViaFireMove:: @ 81D9098
+BattleScript_DefrostedViaFireMove::
printstring STRINGID_PKMNWASDEFROSTED
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_TARGET
return
-BattleScript_MoveUsedIsParalyzed:: @ 81D90A1
+BattleScript_MoveUsedIsParalyzed::
printstring STRINGID_PKMNISPARALYZED
- waitmessage 64
+ waitmessage 0x40
statusanimation BS_ATTACKER
cancelmultiturnmoves BS_ATTACKER
goto BattleScript_MoveEnd
-BattleScript_MoveUsedFlinched:: @ 81D90B1
+BattleScript_MoveUsedFlinched::
printstring STRINGID_PKMNFLINCHED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_PrintUproarOverTurns:: @ 81D90BC
+BattleScript_PrintUproarOverTurns::
printfromtable gUproarOverTurnStringIds
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_ThrashConfuses:: @ 81D90C5
+BattleScript_ThrashConfuses::
chosenstatusanimation BS_ATTACKER, 1, STATUS2_CONFUSION
printstring STRINGID_PKMNFATIGUECONFUSION
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_MoveUsedIsConfused:: @ 81D90D3
+BattleScript_MoveUsedIsConfused::
printstring STRINGID_PKMNISCONFUSED
- waitmessage 64
+ waitmessage 0x40
status2animation BS_ATTACKER, STATUS2_CONFUSION
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_81D9115
-BattleScript_81D90EA:: @ 81D90EA
+BattleScript_81D90EA::
cancelmultiturnmoves BS_ATTACKER
adjustnormaldamage2
printstring STRINGID_ITHURTCONFUSION
- waitmessage 64
+ waitmessage 0x40
effectivenesssound
hitanimation BS_ATTACKER
waitstate
@@ -3764,243 +3765,243 @@ BattleScript_81D90EA:: @ 81D90EA
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
resultmessage
- waitmessage 64
+ waitmessage 0x40
tryfaintmon BS_ATTACKER, 0, NULL
goto BattleScript_MoveEnd
-BattleScript_81D9115:: @ 81D9115
+BattleScript_81D9115::
return
-BattleScript_MoveUsedIsConfusedNoMore:: @ 81D9116
+BattleScript_MoveUsedIsConfusedNoMore::
printstring STRINGID_PKMNHEALEDCONFUSION
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_PrintPayDayMoneyString:: @ 81D911D
+BattleScript_PrintPayDayMoneyString::
printstring STRINGID_PKMNPICKEDUPITEM
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_WrapTurnDmg:: @ 81D9124
+BattleScript_WrapTurnDmg::
playanimation BS_ATTACKER, B_ANIM_TURN_TRAP, sB_ANIM_ARG1
printstring STRINGID_PKMNHURTBY
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D905B
-BattleScript_WrapEnds:: @ 81D9136
+BattleScript_WrapEnds::
printstring STRINGID_PKMNFREEDFROM
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_MoveUsedIsInLove:: @ 81D913D
+BattleScript_MoveUsedIsInLove::
printstring STRINGID_PKMNINLOVE
- waitmessage 64
+ waitmessage 0x40
status2animation BS_ATTACKER, STATUS2_INFATUATION
return
-BattleScript_MoveUsedIsInLoveCantAttack:: @ 81D914A
+BattleScript_MoveUsedIsInLoveCantAttack::
printstring STRINGID_PKMNIMMOBILIZEDBYLOVE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_NightmareTurnDmg:: @ 81D9155
+BattleScript_NightmareTurnDmg::
printstring STRINGID_PKMNLOCKEDINNIGHTMARE
- waitmessage 64
+ waitmessage 0x40
status2animation BS_ATTACKER, STATUS2_NIGHTMARE
goto BattleScript_81D905B
-BattleScript_CurseTurnDmg:: @ 81D9166
+BattleScript_CurseTurnDmg::
printstring STRINGID_PKMNAFFLICTEDBYCURSE
- waitmessage 64
+ waitmessage 0x40
status2animation BS_ATTACKER, STATUS2_CURSED
goto BattleScript_81D905B
-BattleScript_TargetPRLZHeal:: @ 81D9177
+BattleScript_TargetPRLZHeal::
printstring STRINGID_PKMNHEALEDPARALYSIS
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_TARGET
return
-gUnknown_81D9180:: @ 81D9180
+gUnknown_81D9180::
printstring STRINGID_MONTOOSCAREDTOMOVE
- waitmessage 64
+ waitmessage 0x40
playanimation BS_ATTACKER, B_ANIM_MON_SCARED, NULL
goto BattleScript_MoveEnd
-gUnknown_81D9192:: @ 81D9192
+gUnknown_81D9192::
printstring STRINGID_GHOSTGETOUTGETOUT
playanimation BS_ATTACKER, B_ANIM_GHOST_GET_OUT, NULL
goto BattleScript_MoveEnd
-gUnknown_81D91A1:: @ 81D91A1
- pause 32
+gUnknown_81D91A1::
+ pause 0x20
printstring STRINGID_SILPHSCOPEUNVEILED
waitstate
playanimation BS_OPPONENT1, B_ANIM_SILPH_SCOPED, NULL
- pause 32
+ pause 0x20
printstring STRINGID_GHOSTWASMAROWAK
- waitmessage 64
+ waitmessage 0x40
end2
-BattleScript_MoveEffectSleep:: @ 81D91B9
+BattleScript_MoveEffectSleep::
statusanimation BS_EFFECT_BATTLER
printfromtable gFellAsleepStringIds
- waitmessage 64
-BattleScript_81D91C3:: @ 81D91C3
+ waitmessage 0x40
+BattleScript_81D91C3::
updatestatusicon BS_EFFECT_BATTLER
waitstate
return
-BattleScript_YawnMakesAsleep:: @ 81D91C7
+BattleScript_YawnMakesAsleep::
statusanimation BS_EFFECT_BATTLER
printstring STRINGID_PKMNFELLASLEEP
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_EFFECT_BATTLER
waitstate
makevisible BS_EFFECT_BATTLER
end2
-BattleScript_MoveEffectPoison:: @ 81D91D5
+BattleScript_MoveEffectPoison::
statusanimation BS_EFFECT_BATTLER
printfromtable gGotPoisonedStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D91C3
-BattleScript_MoveEffectBurn:: @ 81D91E4
+BattleScript_MoveEffectBurn::
statusanimation BS_EFFECT_BATTLER
printfromtable gGotBurnedStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D91C3
-BattleScript_MoveEffectFreeze:: @ 81D91F3
+BattleScript_MoveEffectFreeze::
statusanimation BS_EFFECT_BATTLER
printfromtable gGotFrozenStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D91C3
-BattleScript_MoveEffectParalysis:: @ 81D9202
+BattleScript_MoveEffectParalysis::
statusanimation BS_EFFECT_BATTLER
printfromtable gGotParalyzedStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D91C3
-BattleScript_MoveEffectUproar:: @ 81D9211
+BattleScript_MoveEffectUproar::
printstring STRINGID_PKMNCAUSEDUPROAR
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_MoveEffectToxic:: @ 81D9218
+BattleScript_MoveEffectToxic::
statusanimation BS_EFFECT_BATTLER
printstring STRINGID_PKMNBADLYPOISONED
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D91C3
-BattleScript_MoveEffectPayDay:: @ 81D9225
+BattleScript_MoveEffectPayDay::
printstring STRINGID_COINSSCATTERED
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_MoveEffectWrap:: @ 81D922C
+BattleScript_MoveEffectWrap::
printfromtable gWrappedStringIds
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_MoveEffectConfusion:: @ 81D9235
+BattleScript_MoveEffectConfusion::
chosenstatusanimation BS_EFFECT_BATTLER, 1, STATUS2_CONFUSION
printstring STRINGID_PKMNWASCONFUSED
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_MoveEffectRecoil:: @ 81D9243
+BattleScript_MoveEffectRecoil::
jumpifmove MOVE_STRUGGLE, BattleScript_81D9256
jumpifability BS_ATTACKER, ABILITY_ROCK_HEAD, BattleScript_81D9270
-BattleScript_81D9256:: @ 81D9256
+BattleScript_81D9256::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_PKMNHITWITHRECOIL
- waitmessage 64
+ waitmessage 0x40
tryfaintmon BS_ATTACKER, 0, NULL
-BattleScript_81D9270:: @ 81D9270
+BattleScript_81D9270::
return
-BattleScript_ItemSteal:: @ 81D9271
+BattleScript_ItemSteal::
playanimation BS_TARGET, B_ANIM_ITEM_STEAL, NULL
printstring STRINGID_PKMNSTOLEITEM
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_DrizzleActivates:: @ 81D927F
- pause 32
+BattleScript_DrizzleActivates::
+ pause 0x20
printstring STRINGID_PKMNMADEITRAIN
waitstate
playanimation BS_BATTLER_0, B_ANIM_RAIN_CONTINUES, NULL
call BattleScript_81D92DC
end3
-BattleScript_SpeedBoostActivates:: @ 81D9293
+BattleScript_SpeedBoostActivates::
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printstring STRINGID_PKMNRAISEDSPEED
- waitmessage 64
+ waitmessage 0x40
end3
-BattleScript_TraceActivates:: @ 81D92A1
- pause 32
+BattleScript_TraceActivates::
+ pause 0x20
printstring STRINGID_PKMNTRACED
- waitmessage 64
+ waitmessage 0x40
end3
-BattleScript_RainDishActivates:: @ 81D92AB
+BattleScript_RainDishActivates::
printstring STRINGID_PKMNSXRESTOREDHPALITTLE2
- waitmessage 64
+ waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
end3
-BattleScript_SandstreamActivates:: @ 81D92BF
- pause 32
+BattleScript_SandstreamActivates::
+ pause 0x20
printstring STRINGID_PKMNSXWHIPPEDUPSANDSTORM
waitstate
playanimation BS_BATTLER_0, B_ANIM_SANDSTORM_CONTINUES, NULL
call BattleScript_81D92DC
end3
-BattleScript_ShedSkinActivates:: @ 81D92D3
+BattleScript_ShedSkinActivates::
printstring STRINGID_PKMNSXCUREDYPROBLEM
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_ATTACKER
end3
-BattleScript_81D92DC:: @ 81D92DC
+BattleScript_81D92DC::
setbyte sBATTLER, 0
-BattleScript_81D92E2:: @ 81D92E2
+BattleScript_81D92E2::
trycastformdatachange
addbyte sBATTLER, 1
jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_81D92E2
return
-BattleScript_CastformChange:: @ 81D92F8
+BattleScript_CastformChange::
call BattleScript_81D92FE
end3
-BattleScript_81D92FE:: @ 81D92FE
+BattleScript_81D92FE::
docastformchangeanimation
waitstate
printstring STRINGID_PKMNTRANSFORMED
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_IntimidateActivatesEnd3:: @ 81D9307
+BattleScript_IntimidateActivatesEnd3::
call BattleScript_81D930D
end3
-BattleScript_81D930D:: @ 81D930D
- pause 32
-BattleScript_IntimidateActivates:: @ 81D9310
+BattleScript_81D930D::
+ pause 0x20
+BattleScript_IntimidateActivates::
setbyte gBattlerTarget, 0
setstatchanger STAT_ATK, 1, TRUE
-BattleScript_81D931C:: @ 81D931C
+BattleScript_81D931C::
trygetintimidatetarget BattleScript_81D936A
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_81D935F
jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_81D936B
@@ -4011,387 +4012,387 @@ BattleScript_81D931C:: @ 81D931C
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printstring STRINGID_PKMNCUTSATTACKWITH
- waitmessage 64
-BattleScript_81D935F:: @ 81D935F
+ waitmessage 0x40
+BattleScript_81D935F::
addbyte gBattlerTarget, 1
goto BattleScript_81D931C
-BattleScript_81D936A:: @ 81D936A
+BattleScript_81D936A::
return
-BattleScript_81D936B:: @ 81D936B
- pause 32
+BattleScript_81D936B::
+ pause 0x20
printstring STRINGID_PREVENTEDFROMWORKING
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D935F
-BattleScript_DroughtActivates:: @ 81D9379
- pause 32
+BattleScript_DroughtActivates::
+ pause 0x20
printstring STRINGID_PKMNSXINTENSIFIEDSUN
waitstate
playanimation BS_BATTLER_0, B_ANIM_SUN_CONTINUES, NULL
call BattleScript_81D92DC
end3
-BattleScript_TookAttack:: @ 81D938D
+BattleScript_TookAttack::
attackstring
- pause 32
+ pause 0x20
printstring STRINGID_PKMNSXTOOKATTACK
- waitmessage 64
+ waitmessage 0x40
orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED
return
-BattleScript_SturdyPreventsOHKO:: @ 81D93A1
- pause 32
+BattleScript_SturdyPreventsOHKO::
+ pause 0x20
printstring STRINGID_PKMNPROTECTEDBY
- pause 64
+ pause 0x40
goto BattleScript_MoveEnd
-BattleScript_DampStopsExplosion:: @ 81D93AF
- pause 32
+BattleScript_DampStopsExplosion::
+ pause 0x20
printstring STRINGID_PKMNPREVENTSUSAGE
- pause 64
+ pause 0x40
goto BattleScript_MoveEnd
-BattleScript_MoveHPDrain_PPLoss:: @ 81D93BD
+BattleScript_MoveHPDrain_PPLoss::
ppreduce
-BattleScript_MoveHPDrain:: @ 81D93BE
+BattleScript_MoveHPDrain::
attackstring
- pause 32
+ pause 0x20
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
printstring STRINGID_PKMNRESTOREDHPUSING
- waitmessage 64
+ waitmessage 0x40
orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
goto BattleScript_MoveEnd
-BattleScript_MonMadeMoveUseless_PPLoss:: @ 81D93E0
+BattleScript_MonMadeMoveUseless_PPLoss::
ppreduce
-BattleScript_MonMadeMoveUseless:: @ 81D93E1
+BattleScript_MonMadeMoveUseless::
attackstring
- pause 32
+ pause 0x20
printstring STRINGID_PKMNSXMADEYUSELESS
- waitmessage 64
+ waitmessage 0x40
orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
goto BattleScript_MoveEnd
-BattleScript_FlashFireBoost_PPLoss:: @ 81D93F6
+BattleScript_FlashFireBoost_PPLoss::
ppreduce
-BattleScript_FlashFireBoost:: @ 81D93F7
+BattleScript_FlashFireBoost::
attackstring
- pause 32
+ pause 0x20
printfromtable gFlashFireStringIds
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D9408:: @ 81D9408
- pause 32
+BattleScript_AbilityPreventsPhasingOut::
+ pause 0x20
printstring STRINGID_PKMNANCHORSITSELFWITH
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_AbilityNoStatLoss:: @ 81D9416
- pause 32
+BattleScript_AbilityNoStatLoss::
+ pause 0x20
printstring STRINGID_PKMNPREVENTSSTATLOSSWITH
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_BRNPrevention:: @ 81D9420
- pause 32
+BattleScript_BRNPrevention::
+ pause 0x20
printfromtable gBRNPreventionStringIds
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_PRLZPrevention:: @ 81D942C
- pause 32
+BattleScript_PRLZPrevention::
+ pause 0x20
printfromtable gPRLZPreventionStringIds
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_PSNPrevention:: @ 81D9438
- pause 32
+BattleScript_PSNPrevention::
+ pause 0x20
printfromtable gPSNPreventionStringIds
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_ObliviousPreventsAttraction:: @ 81D9444
- pause 32
+BattleScript_ObliviousPreventsAttraction::
+ pause 0x20
printstring STRINGID_PKMNPREVENTSROMANCEWITH
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_FlinchPrevention:: @ 81D9452
- pause 32
+BattleScript_FlinchPrevention::
+ pause 0x20
printstring STRINGID_PKMNSXPREVENTSFLINCHING
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_81D9460:: @ 81D9460
- pause 32
+BattleScript_OwnTempoPrevents::
+ pause 0x20
printstring STRINGID_PKMNPREVENTSCONFUSIONWITH
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_SoundproofProtected:: @ 81D946E
+BattleScript_SoundproofProtected::
attackstring
ppreduce
- pause 32
+ pause 0x20
printstring STRINGID_PKMNSXBLOCKSY
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_AbilityNoSpecificStatLoss:: @ 81D947E
- pause 32
+BattleScript_AbilityNoSpecificStatLoss::
+ pause 0x20
printstring STRINGID_PKMNSXPREVENTSYLOSS
- waitmessage 64
+ waitmessage 0x40
setbyte cMULTISTRING_CHOOSER, 3
return
-BattleScript_StickyHoldActivates:: @ 81D948E
- pause 32
+BattleScript_StickyHoldActivates::
+ pause 0x20
printstring STRINGID_PKMNSXMADEYINEFFECTIVE
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_MoveEnd
-BattleScript_ColorChangeActivates:: @ 81D949C
+BattleScript_ColorChangeActivates::
printstring STRINGID_PKMNCHANGEDTYPEWITH
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_RoughSkinActivates:: @ 81D94A3
+BattleScript_RoughSkinActivates::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_PKMNHURTSWITH
- waitmessage 64
+ waitmessage 0x40
tryfaintmon BS_ATTACKER, 0, NULL
return
-BattleScript_CuteCharmActivates:: @ 81D94BE
+BattleScript_CuteCharmActivates::
status2animation BS_ATTACKER, STATUS2_INFATUATION
printstring STRINGID_PKMNSXINFATUATEDY
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_ApplySecondaryEffect:: @ 81D94CB
+BattleScript_ApplySecondaryEffect::
waitstate
seteffectsecondary
return
-BattleScript_SynchronizeActivates:: @ 81D94CE
+BattleScript_SynchronizeActivates::
waitstate
seteffectprimary
return
-BattleScript_AbilityCuredStatus:: @ 81D94D1
+BattleScript_AbilityCuredStatus::
printstring STRINGID_PKMNSXCUREDITSYPROBLEM
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_SCRIPTING
return
-BattleScript_IgnoresWhileAsleep:: @ 81D94DA
+BattleScript_IgnoresWhileAsleep::
printstring STRINGID_PKMNIGNORESASLEEP
- waitmessage 64
+ waitmessage 0x40
moveendto 16
end
-BattleScript_IgnoresAndUsesRandomMove:: @ 81D94EA
+BattleScript_IgnoresAndUsesRandomMove::
printstring STRINGID_PKMNIGNOREDORDERS
- waitmessage 64
+ waitmessage 0x40
jumptocalledmove 0
-BattleScript_MoveUsedLoafingAround:: @ 81D94F2
+BattleScript_MoveUsedLoafingAround::
printfromtable gInobedientStringIds
- waitmessage 64
+ waitmessage 0x40
moveendto 16
end
-BattleScript_IgnoresAndFallsAsleep:: @ 81D9504
+BattleScript_IgnoresAndFallsAsleep::
printstring STRINGID_PKMNBEGANTONAP
- waitmessage 64
+ waitmessage 0x40
setmoveeffect MOVE_EFFECT_SLEEP | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
moveendto 16
end
-BattleScript_IgnoresAndHitsItself:: @ 81D951B
+BattleScript_IgnoresAndHitsItself::
printstring STRINGID_PKMNWONTOBEY
- waitmessage 64
+ waitmessage 0x40
goto BattleScript_81D90EA
-BattleScript_SubstituteFade:: @ 81D9526
+BattleScript_SubstituteFade::
playanimation BS_TARGET, B_ANIM_SUBSTITUTE_FADE, NULL
printstring STRINGID_PKMNSUBSTITUTEFADED
return
-BattleScript_BerryCurePrlzEnd2:: @ 81D9531
+BattleScript_BerryCurePrlzEnd2::
call BattleScript_BerryCureParRet
end2
-BattleScript_BerryCureParRet:: @ 81D9537
+BattleScript_BerryCureParRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMCUREDPARALYSIS
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
return
-BattleScript_BerryCurePsnEnd2:: @ 81D9549
+BattleScript_BerryCurePsnEnd2::
call BattleScript_BerryCurePsnRet
end2
-BattleScript_BerryCurePsnRet:: @ 81D954F
+BattleScript_BerryCurePsnRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMCUREDPOISON
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
return
-BattleScript_BerryCureBrnEnd2:: @ 81D9561
+BattleScript_BerryCureBrnEnd2::
call BattleScript_BerryCureBrnRet
end2
-BattleScript_BerryCureBrnRet:: @ 81D9567
+BattleScript_BerryCureBrnRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMHEALEDBURN
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
return
-BattleScript_BerryCureFrzEnd2:: @ 81D9579
+BattleScript_BerryCureFrzEnd2::
call BattleScript_BerryCureFrzRet
end2
-BattleScript_BerryCureFrzRet:: @ 81D957F
+BattleScript_BerryCureFrzRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMDEFROSTEDIT
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
return
-BattleScript_BerryCureSlpEnd2:: @ 81D9591
+BattleScript_BerryCureSlpEnd2::
call BattleScript_BerryCureSlpRet
end2
-BattleScript_BerryCureSlpRet:: @ 81D9597
+BattleScript_BerryCureSlpRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMWOKEIT
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
return
-BattleScript_BerryCureConfusionEnd2:: @ 81D95A9
+BattleScript_BerryCureConfusionEnd2::
call BattleScript_BerryCureConfusionRet
end2
-BattleScript_BerryCureConfusionRet:: @ 81D95AF
+BattleScript_BerryCureConfusionRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMSNAPPEDOUT
- waitmessage 64
+ waitmessage 0x40
removeitem BS_SCRIPTING
return
-BattleScript_BerryCureChosenStatusEnd2:: @ 81D95BF
+BattleScript_BerryCureChosenStatusEnd2::
call BattleScript_BerryCureChosenStatusRet
end2
-BattleScript_BerryCureChosenStatusRet:: @ 81D95C5
+BattleScript_BerryCureChosenStatusRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printfromtable gBerryEffectStringIds
- waitmessage 64
+ waitmessage 0x40
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
return
-BattleScript_WhiteHerbEnd2:: @ 81D95D9
+BattleScript_WhiteHerbEnd2::
call BattleScript_WhiteHerbRet
end2
-BattleScript_WhiteHerbRet:: @ 81D95DF
+BattleScript_WhiteHerbRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDSTATUS
- waitmessage 64
+ waitmessage 0x40
removeitem BS_SCRIPTING
return
-BattleScript_ItemHealHP_RemoveItem:: @ 81D95EF
+BattleScript_ItemHealHP_RemoveItem::
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
- waitmessage 64
+ waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
removeitem BS_ATTACKER
end2
-BattleScript_BerryPPHealEnd2:: @ 81D960C
+BattleScript_BerryPPHealEnd2::
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDPP
- waitmessage 64
+ waitmessage 0x40
removeitem BS_ATTACKER
end2
-BattleScript_ItemHealHP_End2:: @ 81D961C
+BattleScript_ItemHealHP_End2::
call BattleScript_ItemHealHP_Ret
end2
-BattleScript_ItemHealHP_Ret:: @ 81D9622
+BattleScript_ItemHealHP_Ret::
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHPALITTLE
- waitmessage 64
+ waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
return
-BattleScript_SelectingNotAllowedMoveChoiceItem:: @ 81D963D
+BattleScript_SelectingNotAllowedMoveChoiceItem::
printselectionstring STRINGID_ITEMALLOWSONLYYMOVE
endselectionscript
-BattleScript_HangedOnMsg:: @ 81D9641
+BattleScript_HangedOnMsg::
playanimation BS_TARGET, B_ANIM_HANGED_ON, NULL
printstring STRINGID_PKMNHUNGONWITHX
- waitmessage 64
+ waitmessage 0x40
return
-BattleScript_BerryConfuseHealEnd2:: @ 81D964F
+BattleScript_BerryConfuseHealEnd2::
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
- waitmessage 64
+ waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_FORXCOMMAYZ
- waitmessage 64
+ waitmessage 0x40
setmoveeffect MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
removeitem BS_ATTACKER
end2
-BattleScript_BerryStatRaiseEnd2:: @ 81D9679
+BattleScript_BerryStatRaiseEnd2::
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_81D9686
-BattleScript_81D9686:: @ 81D9686
+BattleScript_81D9686::
setbyte cMULTISTRING_CHOOSER, 4
call BattleScript_StatUp
removeitem BS_ATTACKER
end2
-BattleScript_BerryFocusEnergyEnd2:: @ 81D9694
+BattleScript_BerryFocusEnergyEnd2::
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNUSEDXTOGETPUMPED
- waitmessage 64
+ waitmessage 0x40
removeitem BS_ATTACKER
end2
-BattleScript_ActionSelectionItemsCantBeUsed:: @ 81D96A4
+BattleScript_ActionSelectionItemsCantBeUsed::
printselectionstring STRINGID_ITEMSCANTBEUSEDNOW
endselectionscript
-BattleScript_FlushMessageBox:: @ 81D96A8
+BattleScript_FlushMessageBox::
printstring STRINGID_EMPTYSTRING3
return
diff --git a/include/constants/battle.h b/include/constants/battle.h
index e025af630..2da89d815 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -169,14 +169,14 @@
#define HITMARKER_UNABLE_TO_USE_MOVE 0x00080000
#define HITMARKER_x100000 0x00100000
#define HITMARKER_x200000 0x00200000
-#define HITMARKER_x400000 0x00400000
+#define HITMARKER_PLAYER_FAINTED 0x00400000
#define HITMARKER_x800000 0x00800000
#define HITMARKER_GRUDGE 0x01000000
#define HITMARKER_OBEYS 0x02000000
#define HITMARKER_x4000000 0x04000000
#define HITMARKER_CHARGING 0x08000000
#define HITMARKER_FAINTED(battler) (gBitTable[battler] << 0x1C)
-#define HITMARKER_UNK(battler) (0x10000000 << battler)
+#define HITMARKER_FAINTED2(battler) (0x10000000 << battler)
// Per-side statuses that affect an entire party
#define SIDE_STATUS_REFLECT (1 << 0)
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index 49ecfeafa..de1b2a65e 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -39,6 +39,8 @@
#define BS_EFFECT_BATTLER 2
#define BS_FAINTED 3
#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_updatestatusicon
+#define BS_UNKNOWN_5 5 // for openpartyscreen
+#define BS_UNKNOWN_6 6 // for openpartyscreen
#define BS_BATTLER_0 7
#define BS_ATTACKER_SIDE 8 // for atk1E_jumpifability
#define BS_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability
@@ -48,6 +50,9 @@
#define BS_PLAYER2 13 // for atk98_updatestatusicon
#define BS_OPPONENT2 14
+// used for openpartyscreen
+#define OPEN_PARTY_ALLOW_CANCEL 0x80
+
// atk 01, accuracy calc
#define NO_ACC_CALC 0xFFFE
#define NO_ACC_CALC_CHECK_LOCK_ON 0xFFFF
@@ -70,7 +75,7 @@
#define VARIOUS_CASE_4 4
#define VARIOUS_RESET_INTIMIDATE_TRACE_BITS 5
#define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP 6
-#define VARIOUS_CASE_7 7
+#define VARIOUS_RESET_PLAYER_FAINTED_FLAG 7
#define VARIOUS_CASE_8 8
#define VARIOUS_RETURN_OPPONENT_MON1 9
#define VARIOUS_RETURN_OPPONENT_MON2 10
diff --git a/src/battle_main.c b/src/battle_main.c
index 9104bc381..abeea3acf 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -2910,7 +2910,7 @@ void BattleTurnPassed(void)
TurnValuesCleanUp(FALSE);
gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING);
gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE);
- gHitMarker &= ~(HITMARKER_x400000);
+ gHitMarker &= ~(HITMARKER_PLAYER_FAINTED);
gHitMarker &= ~(HITMARKER_x100000);
gBattleScripting.animTurn = 0;
gBattleScripting.animTargetsHit = 0;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index d8ea3cdc7..7be47d762 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -2833,7 +2833,7 @@ static void atk19_tryfaintmon(void)
gBattlescriptCurrInstr = BS_ptr;
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
{
- gHitMarker |= HITMARKER_x400000;
+ gHitMarker |= HITMARKER_PLAYER_FAINTED;
if (gBattleResults.playerFaintCounter < 0xFF)
++gBattleResults.playerFaintCounter;
AdjustFriendshipOnBattleFaint(gActiveBattler);
@@ -4738,11 +4738,11 @@ static void atk50_openpartyscreen(void)
}
else
{
- if (gBattlescriptCurrInstr[1] & 0x80)
+ if (gBattlescriptCurrInstr[1] & OPEN_PARTY_ALLOW_CANCEL)
hitmarkerFaintBits = PARTY_CHOOSE_MON; // Used here as the caseId for the EmitChoose function.
else
hitmarkerFaintBits = PARTY_MUST_CHOOSE_MON;
- battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(0x80));
+ battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(OPEN_PARTY_ALLOW_CANCEL));
if (gSpecialStatuses[battlerId].flag40)
{
gBattlescriptCurrInstr += 6;
@@ -6146,12 +6146,12 @@ static void atk76_various(void)
*choicedMove = MOVE_NONE;
}
break;
- case VARIOUS_CASE_7:
+ case VARIOUS_RESET_PLAYER_FAINTED_FLAG:
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLE))
&& gBattleTypeFlags & BATTLE_TYPE_TRAINER
&& gBattleMons[0].hp != 0
&& gBattleMons[1].hp != 0)
- gHitMarker &= ~(HITMARKER_x400000);
+ gHitMarker &= ~(HITMARKER_PLAYER_FAINTED);
break;
case VARIOUS_CASE_8:
i = 0; // redundant
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 09:55:46 +0000