dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

give names to some battlescripts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-02 00:03:46 +01:00
parent 0250aefb73
commit 273474d57a
5 changed files with 121 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/battle_script.inc
+6 -2
View File
@@ -422,10 +422,10 @@
.byte \bank .byte \bank
.endm .endm
.macro switchinanim bank, param1 .macro switchinanim bank, dontclearsubstitutebit
.byte 0x4e .byte 0x4e
.byte \bank .byte \bank
.byte \param1 .byte \dontclearsubstitutebit
.endm .endm
.macro jumpifcantswitch bank, param1 .macro jumpifcantswitch bank, param1
@@ -1387,3 +1387,7 @@
.macro jumpifnostatus3 bank, status, jumpptr .macro jumpifnostatus3 bank, status, jumpptr
jumpifstatus3condition \bank, \status, 0x1, \jumpptr jumpifstatus3condition \bank, \status, 0x1, \jumpptr
.endm .endm
.macro jumpifmovehadnoeffect jumpptr
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr
.endm
data/battle_scripts_1.s
+108 -110
View File
@@ -356,19 +356,19 @@ BattleScript_EffectAbsorb::
waitmessage 0x40 waitmessage 0x40
negativedamage negativedamage
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
jumpifability TARGET, ABILITY_LIQUID_OOZE, BattleScript_82D8B26 jumpifability TARGET, ABILITY_LIQUID_OOZE, BattleScript_AbsorbLiquidOoze
setbyte cMULTISTRING_CHOOSER, 0x0 setbyte cMULTISTRING_CHOOSER, 0x0
goto BattleScript_82D8B2E goto BattleScript_AbsorbUpdateHp
BattleScript_82D8B26:: BattleScript_AbsorbLiquidOoze::
manipulatedamage ATK80_DMG_CHANGE_SIGN manipulatedamage ATK80_DMG_CHANGE_SIGN
setbyte cMULTISTRING_CHOOSER, 0x1 setbyte cMULTISTRING_CHOOSER, 0x1
BattleScript_82D8B2E:: BattleScript_AbsorbUpdateHp::
healthbarupdate ATTACKER healthbarupdate ATTACKER
datahpupdate ATTACKER datahpupdate ATTACKER
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, BattleScript_82D8B45 jumpifmovehadnoeffect BattleScript_AbsorbTryFainting
printfromtable gLeechSeedDrainStringIds printfromtable gLeechSeedDrainStringIds
waitmessage 0x40 waitmessage 0x40
BattleScript_82D8B45:: BattleScript_AbsorbTryFainting::
tryfaintmon ATTACKER, FALSE, NULL tryfaintmon ATTACKER, FALSE, NULL
tryfaintmon TARGET, FALSE, NULL tryfaintmon TARGET, FALSE, NULL
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
@@ -470,10 +470,10 @@ BattleScript_82D8C18::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate ATTACKER healthbarupdate ATTACKER
datahpupdate ATTACKER datahpupdate ATTACKER
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, BattleScript_82D8C56 jumpifmovehadnoeffect BattleScript_DreamEaterTryFaintEnd
printstring STRINGID_PKMNDREAMEATEN printstring STRINGID_PKMNDREAMEATEN
waitmessage 0x40 waitmessage 0x40
BattleScript_82D8C56:: BattleScript_DreamEaterTryFaintEnd::
tryfaintmon TARGET, FALSE, NULL tryfaintmon TARGET, FALSE, NULL
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
@@ -636,7 +636,7 @@ BattleScript_82D8E1F::
critcalc critcalc
damagecalc damagecalc
typecalc typecalc
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, BattleScript_82D8E71 jumpifmovehadnoeffect BattleScript_82D8E71
adjustnormaldamage adjustnormaldamage
attackanimation attackanimation
waitanimation waitanimation
@@ -660,7 +660,7 @@ BattleScript_82D8E71::
BattleScript_82D8E74:: BattleScript_82D8E74::
resultmessage resultmessage
waitmessage 0x40 waitmessage 0x40
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, BattleScript_82D8E93 jumpifmovehadnoeffect BattleScript_82D8E93
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 0x6 copyarray gBattleTextBuff1, sMULTIHIT_STRING, 0x6
printstring STRINGID_HITXTIMES printstring STRINGID_HITXTIMES
waitmessage 0x40 waitmessage 0x40
@@ -784,7 +784,7 @@ BattleScript_EffectOHKO::
ppreduce ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
typecalc typecalc
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, BattleScript_HitFromAtkAnimation jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation
tryKO BattleScript_KOFail tryKO BattleScript_KOFail
trysetdestinybondtohappen trysetdestinybondtohappen
goto BattleScript_HitFromAtkAnimation goto BattleScript_HitFromAtkAnimation
@@ -867,10 +867,9 @@ BattleScript_EffectDoubleHit::
BattleScript_EffectRecoilIfMiss:: BattleScript_EffectRecoilIfMiss::
attackcanceler attackcanceler
accuracycheck BattleScript_82D9135, ACC_CURR_MOVE accuracycheck BattleScript_MoveMissedDoDamage, ACC_CURR_MOVE
goto BattleScript_HitFromAtkString goto BattleScript_HitFromAtkString
BattleScript_MoveMissedDoDamage::
BattleScript_82D9135::
attackstring attackstring
ppreduce ppreduce
pause 0x40 pause 0x40
@@ -1031,7 +1030,7 @@ BattleScript_EffectParalyze::
jumpifability TARGET, ABILITY_LIMBER, BattleScript_LimberProtected jumpifability TARGET, ABILITY_LIMBER, BattleScript_LimberProtected
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
typecalc typecalc
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, BattleScript_ButItFailed jumpifmovehadnoeffect BattleScript_ButItFailed
jumpifstatus TARGET, STATUS_PARALYSIS, BattleScript_AlreadyParalyzed jumpifstatus TARGET, STATUS_PARALYSIS, BattleScript_AlreadyParalyzed
jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
@@ -1349,7 +1348,7 @@ BattleScript_SleepTalkUsingMove::
waitanimation waitanimation
setbyte sANIM_TURN, 0x0 setbyte sANIM_TURN, 0x0
setbyte sANIM_TARGETS_HIT, 0x0 setbyte sANIM_TARGETS_HIT, 0x0
jumptorandomattack 0x1 jumptorandomattack TRUE
BattleScript_EffectDestinyBond:: BattleScript_EffectDestinyBond::
attackcanceler attackcanceler
@@ -1423,7 +1422,7 @@ BattleScript_DoTripleKickAttack::
damagecalc damagecalc
typecalc typecalc
adjustnormaldamage adjustnormaldamage
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, BattleScript_TripleKickNoMoreHits jumpifmovehadnoeffect BattleScript_TripleKickNoMoreHits
attackanimation attackanimation
waitanimation waitanimation
effectivenesssound effectivenesssound
@@ -1660,7 +1659,7 @@ BattleScript_FuryCutterHit::
critcalc critcalc
damagecalc damagecalc
typecalc typecalc
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, BattleScript_FuryCutterHit jumpifmovehadnoeffect BattleScript_FuryCutterHit
adjustnormaldamage adjustnormaldamage
goto BattleScript_HitFromAtkAnimation goto BattleScript_HitFromAtkAnimation
@@ -1730,7 +1729,7 @@ BattleScript_EffectBatonPass::
switchindataupdate ATTACKER switchindataupdate ATTACKER
hpthresholds ATTACKER hpthresholds ATTACKER
printstring STRINGID_SWITCHINMON printstring STRINGID_SWITCHINMON
switchinanim ATTACKER, 0x1 switchinanim ATTACKER, TRUE
waitstate waitstate
switchineffects ATTACKER switchineffects ATTACKER
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
@@ -2395,7 +2394,7 @@ BattleScript_EffectAssist::
waitanimation waitanimation
setbyte sANIM_TURN, 0x0 setbyte sANIM_TURN, 0x0
setbyte sANIM_TARGETS_HIT, 0x0 setbyte sANIM_TARGETS_HIT, 0x0
jumptorandomattack 0x1 jumptorandomattack TRUE
BattleScript_EffectIngrain:: BattleScript_EffectIngrain::
attackcanceler attackcanceler
@@ -2448,15 +2447,15 @@ BattleScript_EffectBrickBreak::
damagecalc damagecalc
typecalc typecalc
adjustnormaldamage adjustnormaldamage
jumpifbyte EQUAL, sANIM_TURN, 0x0, BattleScript_82DA306 jumpifbyte EQUAL, sANIM_TURN, 0x0, BattleScript_BrickBreakAnim
bicbyte gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED bicbyte gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED
BattleScript_82DA306:: BattleScript_BrickBreakAnim::
attackanimation attackanimation
waitanimation waitanimation
jumpifbyte LESS_THAN, sANIM_TURN, 0x2, BattleScript_82DA319 jumpifbyte LESS_THAN, sANIM_TURN, 0x2, BattleScript_BrickBreakDoHit
printstring STRINGID_THEWALLSHATTERED printstring STRINGID_THEWALLSHATTERED
waitmessage 0x40 waitmessage 0x40
BattleScript_82DA319:: BattleScript_BrickBreakDoHit::
typecalc2 typecalc2
effectivenesssound effectivenesssound
hitanimation TARGET hitanimation TARGET
@@ -2507,7 +2506,7 @@ BattleScript_EffectEndeavor::
copyword gHpDealt, gBattleMoveDamage copyword gHpDealt, gBattleMoveDamage
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
typecalc typecalc
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, BattleScript_HitFromAtkAnimation jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation
bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
copyword gBattleMoveDamage, gHpDealt copyword gBattleMoveDamage, gHpDealt
adjustsetdamage adjustsetdamage
@@ -2596,58 +2595,58 @@ BattleScript_EffectTeeterDance::
attackstring attackstring
ppreduce ppreduce
setbyte gBankTarget, 0x0 setbyte gBankTarget, 0x0
BattleScript_82DA47B:: BattleScript_TeeterDanceLoop::
movevaluescleanup movevaluescleanup
setmoveeffect EFFECT_CONFUSION setmoveeffect EFFECT_CONFUSION
jumpifbyteequal gBankAttacker, gBankTarget, BattleScript_82DA4D0 jumpifbyteequal gBankAttacker, gBankTarget, BattleScript_TeeterDanceLoopIncrement
jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_82DA4E5 jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_TeeterDanceOwnTempoPrevents
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_82DA501 jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_TeeterDanceSubstitutePrevents
jumpifstatus2 TARGET, STATUS2_CONFUSION, BattleScript_82DA50F jumpifstatus2 TARGET, STATUS2_CONFUSION, BattleScript_TeeterDanceAlreadyConfused
jumpifhasnohp TARGET, BattleScript_82DA4D0 jumpifhasnohp TARGET, BattleScript_TeeterDanceLoopIncrement
accuracycheck BattleScript_82DA520, ACC_CURR_MOVE accuracycheck BattleScript_TeeterDanceMissed, ACC_CURR_MOVE
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_82DA4F3 jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_TeeterDanceSafeguardProtected
attackanimation attackanimation
waitanimation waitanimation
seteffectprimary seteffectprimary
resultmessage resultmessage
waitmessage 0x40 waitmessage 0x40
BattleScript_82DA4C7:: BattleScript_TeeterDanceDoMoveEndIncrement::
setbyte sMOVEEND_STATE, 0x0 setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10 moveend 0x2, 0x10
BattleScript_82DA4D0:: BattleScript_TeeterDanceLoopIncrement::
addbyte gBankTarget, 0x1 addbyte gBankTarget, 0x1
jumpifbytenotequal gBankTarget, gNoOfAllBanks, BattleScript_82DA47B jumpifbytenotequal gBankTarget, gNoOfAllBanks, BattleScript_TeeterDanceLoop
end end
BattleScript_82DA4E5:: BattleScript_TeeterDanceOwnTempoPrevents::
pause 0x20 pause 0x20
printstring STRINGID_PKMNPREVENTSCONFUSIONWITH printstring STRINGID_PKMNPREVENTSCONFUSIONWITH
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DA4C7 goto BattleScript_TeeterDanceDoMoveEndIncrement
BattleScript_82DA4F3:: BattleScript_TeeterDanceSafeguardProtected::
pause 0x20 pause 0x20
printstring STRINGID_PKMNUSEDSAFEGUARD printstring STRINGID_PKMNUSEDSAFEGUARD
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DA4C7 goto BattleScript_TeeterDanceDoMoveEndIncrement
BattleScript_82DA501:: BattleScript_TeeterDanceSubstitutePrevents::
pause 0x20 pause 0x20
printstring STRINGID_BUTITFAILED printstring STRINGID_BUTITFAILED
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DA4C7 goto BattleScript_TeeterDanceDoMoveEndIncrement
BattleScript_82DA50F:: BattleScript_TeeterDanceAlreadyConfused::
various23 ATTACKER various23 ATTACKER
pause 0x20 pause 0x20
printstring STRINGID_PKMNALREADYCONFUSED printstring STRINGID_PKMNALREADYCONFUSED
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DA4C7 goto BattleScript_TeeterDanceDoMoveEndIncrement
BattleScript_82DA520:: BattleScript_TeeterDanceMissed::
resultmessage resultmessage
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DA4C7 goto BattleScript_TeeterDanceDoMoveEndIncrement
BattleScript_EffectMudSport:: BattleScript_EffectMudSport::
BattleScript_EffectWaterSport:: BattleScript_EffectWaterSport::
@@ -2906,7 +2905,7 @@ BattleScript_82DA8D0::
hpthresholds GBANK_1 hpthresholds GBANK_1
printstring STRINGID_SWITCHINMON printstring STRINGID_SWITCHINMON
atk62 GBANK_1 atk62 GBANK_1
switchinanim GBANK_1, 0x0 switchinanim GBANK_1, FALSE
waitstate waitstate
various7 ATTACKER various7 ATTACKER
switchineffects GBANK_1 switchineffects GBANK_1
@@ -2929,7 +2928,7 @@ BattleScript_82DA908::
hpthresholds GBANK_1 hpthresholds GBANK_1
printstring STRINGID_SWITCHINMON printstring STRINGID_SWITCHINMON
atk62 GBANK_1 atk62 GBANK_1
switchinanim GBANK_1, 0x0 switchinanim GBANK_1, FALSE
waitstate waitstate
switchineffects 5 switchineffects 5
jumpifbytenotequal gBank1, gNoOfAllBanks, BattleScript_82DA908 jumpifbytenotequal gBank1, gNoOfAllBanks, BattleScript_82DA908
@@ -3108,20 +3107,19 @@ BattleScript_ActionSwitch::
hpthresholds2 ATTACKER hpthresholds2 ATTACKER
printstring STRINGID_RETURNMON printstring STRINGID_RETURNMON
setbyte sDMG_MULTIPLIER, 0x2 setbyte sDMG_MULTIPLIER, 0x2
jumpifword COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_DOUBLE, BattleScript_82DAB35 jumpifword COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_DOUBLE, BattleScript_PursuitSwitchDmgSetMultihit
setmultihit 0x1 setmultihit 0x1
goto BattleScript_82DAB37 goto BattleScript_PursuitSwitchDmgLoop
BattleScript_PursuitSwitchDmgSetMultihit::
BattleScript_82DAB35::
setmultihit 0x2 setmultihit 0x2
BattleScript_82DAB37:: BattleScript_PursuitSwitchDmgLoop::
jumpifnopursuitswitchdmg BattleScript_82DAB44 jumpifnopursuitswitchdmg BattleScript_DoSwitchOut
atk5F atk5F
trysetdestinybondtohappen trysetdestinybondtohappen
call BattleScript_82DAB77 call BattleScript_PursuitDmgOnSwitchOut
atk5F atk5F
BattleScript_82DAB44:: BattleScript_DoSwitchOut::
decrementmultihit BattleScript_82DAB37 decrementmultihit BattleScript_PursuitSwitchDmgLoop
switchoutabilities ATTACKER switchoutabilities ATTACKER
waitstate waitstate
returnatktoball returnatktoball
@@ -3133,7 +3131,7 @@ BattleScript_82DAB44::
hpthresholds ATTACKER hpthresholds ATTACKER
printstring STRINGID_SWITCHINMON printstring STRINGID_SWITCHINMON
atk62 ATTACKER atk62 ATTACKER
switchinanim ATTACKER, 0x0 switchinanim ATTACKER, FALSE
waitstate waitstate
switchineffects ATTACKER switchineffects ATTACKER
setbyte sMOVEEND_STATE, 0x4 setbyte sMOVEEND_STATE, 0x4
@@ -3142,7 +3140,7 @@ BattleScript_82DAB44::
moveend 0x1, 0x0 moveend 0x1, 0x0
end2 end2
BattleScript_82DAB77:: BattleScript_PursuitDmgOnSwitchOut::
pause 0x20 pause 0x20
attackstring attackstring
ppreduce ppreduce
@@ -3165,10 +3163,10 @@ BattleScript_82DAB77::
setbyte sMOVEEND_STATE, 0x3 setbyte sMOVEEND_STATE, 0x3
moveend 0x2, 0x6 moveend 0x2, 0x6
various4 TARGET various4 TARGET
jumpifbyte EQUAL, gBattleCommunication, 0x0, BattleScript_82DABB8 jumpifbyte EQUAL, gBattleCommunication, 0x0, BattleScript_PursuitDmgOnSwitchOutRet
setbyte sGIVEEXP_STATE, 0x0 setbyte sGIVEEXP_STATE, 0x0
getexp TARGET getexp TARGET
BattleScript_82DABB8:: BattleScript_PursuitDmgOnSwitchOutRet::
return return
BattleScript_Pausex20:: BattleScript_Pausex20::
@@ -3345,20 +3343,20 @@ BattleScript_BideNoEnergyToAttack::
waitmessage 0x40 waitmessage 0x40
goto BattleScript_ButItFailed goto BattleScript_ButItFailed
BattleScript_82DADD8:: BattleScript_SuccessForceOut::
attackanimation attackanimation
waitanimation waitanimation
switchoutabilities TARGET switchoutabilities TARGET
returntoball TARGET returntoball TARGET
waitstate waitstate
jumpifword COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_TRAINER, BattleScript_82DADF1 jumpifword COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_TRAINER, BattleScript_TrainerBattleForceOut
setoutcomeonteleport ATTACKER setoutcomeonteleport ATTACKER
finishaction finishaction
BattleScript_82DADF1:: BattleScript_TrainerBattleForceOut::
getswitchedmondata TARGET getswitchedmondata TARGET
switchindataupdate TARGET switchindataupdate TARGET
switchinanim TARGET, 0x0 switchinanim TARGET, FALSE
waitstate waitstate
printstring STRINGID_PKMNWASDRAGGEDOUT printstring STRINGID_PKMNWASDRAGGEDOUT
switchineffects TARGET switchineffects TARGET
@@ -3414,12 +3412,12 @@ BattleScript_SpikesOnAttacker::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate ATTACKER healthbarupdate ATTACKER
datahpupdate ATTACKER datahpupdate ATTACKER
call BattleScript_82DAEFE call BattleScript_PrintHurtBySpikes
tryfaintmon ATTACKER, FALSE, NULL tryfaintmon ATTACKER, FALSE, NULL
tryfaintmon ATTACKER, TRUE, BattleScript_82DAE7A tryfaintmon ATTACKER, TRUE, BattleScript_SpikesOnAttackerFainted
return return
BattleScript_82DAE7A:: BattleScript_SpikesOnAttackerFainted::
setbyte sGIVEEXP_STATE, 0x0 setbyte sGIVEEXP_STATE, 0x0
getexp ATTACKER getexp ATTACKER
setbyte sMOVEEND_STATE, 0x0 setbyte sMOVEEND_STATE, 0x0
@@ -3430,12 +3428,12 @@ BattleScript_SpikesOnTarget::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate TARGET healthbarupdate TARGET
datahpupdate TARGET datahpupdate TARGET
call BattleScript_82DAEFE call BattleScript_PrintHurtBySpikes
tryfaintmon TARGET, FALSE, NULL tryfaintmon TARGET, FALSE, NULL
tryfaintmon TARGET, TRUE, BattleScript_82DAEB1 tryfaintmon TARGET, TRUE, BattleScript_SpikesOnTargetFainted
return return
BattleScript_82DAEB1:: BattleScript_SpikesOnTargetFainted::
setbyte sGIVEEXP_STATE, 0x0 setbyte sGIVEEXP_STATE, 0x0
getexp TARGET getexp TARGET
setbyte sMOVEEND_STATE, 0x0 setbyte sMOVEEND_STATE, 0x0
@@ -3446,19 +3444,19 @@ BattleScript_SpikesOngBank1::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate GBANK_1 healthbarupdate GBANK_1
datahpupdate GBANK_1 datahpupdate GBANK_1
call BattleScript_82DAEFE call BattleScript_PrintHurtBySpikes
tryfaintmon GBANK_1, FALSE, NULL tryfaintmon GBANK_1, FALSE, NULL
tryfaintmon GBANK_1, TRUE, BattleScript_82DAEE8 tryfaintmon GBANK_1, TRUE, BattleScript_SpikesOngBank1Fainted
return return
BattleScript_82DAEE8:: BattleScript_SpikesOngBank1Fainted::
setbyte sGIVEEXP_STATE, 0x0 setbyte sGIVEEXP_STATE, 0x0
getexp GBANK_1 getexp GBANK_1
setbyte sMOVEEND_STATE, 0x0 setbyte sMOVEEND_STATE, 0x0
moveend 0x0, 0x0 moveend 0x0, 0x0
goto BattleScript_82DA7CD goto BattleScript_82DA7CD
BattleScript_82DAEFE:: BattleScript_PrintHurtBySpikes::
printstring STRINGID_PKMNHURTBYSPIKES printstring STRINGID_PKMNHURTBYSPIKES
waitmessage 0x40 waitmessage 0x40
return return
@@ -3478,39 +3476,39 @@ BattleScript_PerishSongCountGoesDown::
end2 end2
BattleScript_AllStatsUp:: BattleScript_AllStatsUp::
jumpifstat ATTACKER, LESS_THAN, ATK, 0xC, BattleScript_82DAF54 jumpifstat ATTACKER, LESS_THAN, ATK, 0xC, BattleScript_AllStatsUpAtk
jumpifstat ATTACKER, LESS_THAN, DEF, 0xC, BattleScript_82DAF54 jumpifstat ATTACKER, LESS_THAN, DEF, 0xC, BattleScript_AllStatsUpAtk
jumpifstat ATTACKER, LESS_THAN, SPEED, 0xC, BattleScript_82DAF54 jumpifstat ATTACKER, LESS_THAN, SPEED, 0xC, BattleScript_AllStatsUpAtk
jumpifstat ATTACKER, LESS_THAN, SPATK, 0xC, BattleScript_82DAF54 jumpifstat ATTACKER, LESS_THAN, SPATK, 0xC, BattleScript_AllStatsUpAtk
jumpifstat ATTACKER, EQUAL, SPDEF, 0xC, BattleScript_82DAFC2 jumpifstat ATTACKER, EQUAL, SPDEF, 0xC, BattleScript_AllStatsUpRet
BattleScript_82DAF54:: BattleScript_AllStatsUpAtk::
setbyte sFIELD_1B, 0x0 setbyte sFIELD_1B, 0x0
playstatchangeanimation ATTACKER, 0x3E, 0x0 playstatchangeanimation ATTACKER, 0x3E, 0x0
setstatchanger ATK, 1, FALSE setstatchanger ATK, 1, FALSE
statbuffchange AFFECTS_USER | 0x1, BattleScript_82DAF72 statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpDef
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage 0x40 waitmessage 0x40
BattleScript_82DAF72:: BattleScript_AllStatsUpDef::
setstatchanger DEF, 1, FALSE setstatchanger DEF, 1, FALSE
statbuffchange AFFECTS_USER | 0x1, BattleScript_82DAF86 statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpeed
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage 0x40 waitmessage 0x40
BattleScript_82DAF86:: BattleScript_AllStatsUpSpeed::
setstatchanger SPEED, 1, FALSE setstatchanger SPEED, 1, FALSE
statbuffchange AFFECTS_USER | 0x1, BattleScript_82DAF9A statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpAtk
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage 0x40 waitmessage 0x40
BattleScript_82DAF9A:: BattleScript_AllStatsUpSpAtk::
setstatchanger SPATK, 1, FALSE setstatchanger SPATK, 1, FALSE
statbuffchange AFFECTS_USER | 0x1, BattleScript_82DAFAE statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpDef
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage 0x40 waitmessage 0x40
BattleScript_82DAFAE:: BattleScript_AllStatsUpSpDef::
setstatchanger SPDEF, 1, FALSE setstatchanger SPDEF, 1, FALSE
statbuffchange AFFECTS_USER | 0x1, BattleScript_82DAFC2 statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpRet
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage 0x40 waitmessage 0x40
BattleScript_82DAFC2:: BattleScript_AllStatsUpRet::
return return
BattleScript_RapidSpinAway:: BattleScript_RapidSpinAway::
@@ -3765,21 +3763,21 @@ BattleScript_MonWokeUpInUproar::
BattleScript_PoisonTurnDmg:: BattleScript_PoisonTurnDmg::
printstring STRINGID_PKMNHURTBYPOISON printstring STRINGID_PKMNHURTBYPOISON
waitmessage 0x40 waitmessage 0x40
BattleScript_82DB243:: BattleScript_DoStatusTurnDmg::
statusanimation ATTACKER statusanimation ATTACKER
BattleScript_82DB245:: BattleScript_DoTurnDmg::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate ATTACKER healthbarupdate ATTACKER
datahpupdate ATTACKER datahpupdate ATTACKER
tryfaintmon ATTACKER, FALSE, NULL tryfaintmon ATTACKER, FALSE, NULL
atk24 BattleScript_82DB25E atk24 BattleScript_DoTurnDmgEnd
BattleScript_82DB25E:: BattleScript_DoTurnDmgEnd::
end2 end2
BattleScript_BurnTurnDmg:: BattleScript_BurnTurnDmg::
printstring STRINGID_PKMNHURTBYBURN printstring STRINGID_PKMNHURTBYBURN
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DB243 goto BattleScript_DoStatusTurnDmg
BattleScript_MoveUsedIsFrozen:: BattleScript_MoveUsedIsFrozen::
printstring STRINGID_PKMNISFROZEN printstring STRINGID_PKMNISFROZEN
@@ -3826,8 +3824,8 @@ BattleScript_MoveUsedIsConfused::
printstring STRINGID_PKMNISCONFUSED printstring STRINGID_PKMNISCONFUSED
waitmessage 0x40 waitmessage 0x40
status2animation ATTACKER, STATUS2_CONFUSION status2animation ATTACKER, STATUS2_CONFUSION
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x0, BattleScript_82DB2FF jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x0, BattleScript_MoveUsedIsConfusedRet
BattleScript_82DB2D4:: BattleScript_DoSelfConfusionDmg::
cancelmultiturnmoves ATTACKER cancelmultiturnmoves ATTACKER
adjustnormaldamage2 adjustnormaldamage2
printstring STRINGID_ITHURTCONFUSION printstring STRINGID_ITHURTCONFUSION
@@ -3842,7 +3840,7 @@ BattleScript_82DB2D4::
waitmessage 0x40 waitmessage 0x40
tryfaintmon ATTACKER, FALSE, NULL tryfaintmon ATTACKER, FALSE, NULL
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_82DB2FF:: BattleScript_MoveUsedIsConfusedRet::
return return
BattleScript_MoveUsedIsConfusedNoMore:: BattleScript_MoveUsedIsConfusedNoMore::
@@ -3859,7 +3857,7 @@ BattleScript_WrapTurnDmg::
playanimation ATTACKER, ANIM_TURN_TRAP, sANIM_ARG1 playanimation ATTACKER, ANIM_TURN_TRAP, sANIM_ARG1
printstring STRINGID_PKMNHURTBY printstring STRINGID_PKMNHURTBY
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DB245 goto BattleScript_DoTurnDmg
BattleScript_WrapEnds:: BattleScript_WrapEnds::
printstring STRINGID_PKMNFREEDFROM printstring STRINGID_PKMNFREEDFROM
@@ -3881,13 +3879,13 @@ BattleScript_NightmareTurnDmg::
printstring STRINGID_PKMNLOCKEDINNIGHTMARE printstring STRINGID_PKMNLOCKEDINNIGHTMARE
waitmessage 0x40 waitmessage 0x40
status2animation ATTACKER, STATUS2_NIGHTMARE status2animation ATTACKER, STATUS2_NIGHTMARE
goto BattleScript_82DB245 goto BattleScript_DoTurnDmg
BattleScript_CurseTurnDmg:: BattleScript_CurseTurnDmg::
printstring STRINGID_PKMNAFFLICTEDBYCURSE printstring STRINGID_PKMNAFFLICTEDBYCURSE
waitmessage 0x40 waitmessage 0x40
status2animation ATTACKER, STATUS2_CURSED status2animation ATTACKER, STATUS2_CURSED
goto BattleScript_82DB245 goto BattleScript_DoTurnDmg
BattleScript_TargetPRLZHeal:: BattleScript_TargetPRLZHeal::
printstring STRINGID_PKMNHEALEDPARALYSIS printstring STRINGID_PKMNHEALEDPARALYSIS
@@ -3899,7 +3897,7 @@ BattleScript_MoveEffectSleep::
statusanimation EFFECT_BANK statusanimation EFFECT_BANK
printfromtable gFellAsleepStringIds printfromtable gFellAsleepStringIds
waitmessage 0x40 waitmessage 0x40
BattleScript_82DB374:: BattleScript_UpdateEffectStatusIconRet::
updatestatusicon EFFECT_BANK updatestatusicon EFFECT_BANK
waitstate waitstate
return return
@@ -3917,25 +3915,25 @@ BattleScript_MoveEffectPoison::
statusanimation EFFECT_BANK statusanimation EFFECT_BANK
printfromtable gGotPoisonedStringIds printfromtable gGotPoisonedStringIds
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DB374 goto BattleScript_UpdateEffectStatusIconRet
BattleScript_MoveEffectBurn:: BattleScript_MoveEffectBurn::
statusanimation EFFECT_BANK statusanimation EFFECT_BANK
printfromtable gGotBurnedStringIds printfromtable gGotBurnedStringIds
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DB374 goto BattleScript_UpdateEffectStatusIconRet
BattleScript_MoveEffectFreeze:: BattleScript_MoveEffectFreeze::
statusanimation EFFECT_BANK statusanimation EFFECT_BANK
printfromtable gGotFrozenStringIds printfromtable gGotFrozenStringIds
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DB374 goto BattleScript_UpdateEffectStatusIconRet
BattleScript_MoveEffectParalysis:: BattleScript_MoveEffectParalysis::
statusanimation EFFECT_BANK statusanimation EFFECT_BANK
printfromtable gGotParalyzedStringIds printfromtable gGotParalyzedStringIds
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DB374 goto BattleScript_UpdateEffectStatusIconRet
BattleScript_MoveEffectUproar:: BattleScript_MoveEffectUproar::
printstring STRINGID_PKMNCAUSEDUPROAR printstring STRINGID_PKMNCAUSEDUPROAR
@@ -3946,7 +3944,7 @@ BattleScript_MoveEffectToxic::
statusanimation EFFECT_BANK statusanimation EFFECT_BANK
printstring STRINGID_PKMNBADLYPOISONED printstring STRINGID_PKMNBADLYPOISONED
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DB374 goto BattleScript_UpdateEffectStatusIconRet
BattleScript_MoveEffectPayDay:: BattleScript_MoveEffectPayDay::
printstring STRINGID_COINSSCATTERED printstring STRINGID_COINSSCATTERED
@@ -4258,7 +4256,7 @@ BattleScript_82DB695::
BattleScript_IgnoresAndUsesRandomMove:: BattleScript_IgnoresAndUsesRandomMove::
printstring STRINGID_PKMNIGNOREDORDERS printstring STRINGID_PKMNIGNOREDORDERS
waitmessage 0x40 waitmessage 0x40
jumptorandomattack 0x0 jumptorandomattack FALSE
BattleScript_MoveUsedLoafingAround:: BattleScript_MoveUsedLoafingAround::
jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0x4, BattleScript_82DB6C7 jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0x4, BattleScript_82DB6C7
@@ -4284,7 +4282,7 @@ BattleScript_IgnoresAndFallsAsleep::
BattleScript_82DB6F0:: BattleScript_82DB6F0::
printstring STRINGID_PKMNWONTOBEY printstring STRINGID_PKMNWONTOBEY
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DB2D4 goto BattleScript_DoSelfConfusionDmg
BattleScript_SubstituteFade:: BattleScript_SubstituteFade::
playanimation TARGET, ANIM_SUBSTITUTE_FADE, NULL playanimation TARGET, ANIM_SUBSTITUTE_FADE, NULL
include/battle_scripts.h
+1 -1
View File
@@ -414,7 +414,7 @@ extern const u8 BattleScript_82DAD4D[];
extern const u8 BattleScript_BideStoringEnergy[]; extern const u8 BattleScript_BideStoringEnergy[];
extern const u8 BattleScript_BideAttack[]; extern const u8 BattleScript_BideAttack[];
extern const u8 BattleScript_BideNoEnergyToAttack[]; extern const u8 BattleScript_BideNoEnergyToAttack[];
extern const u8 BattleScript_82DADD8[]; extern const u8 BattleScript_SuccessForceOut[];
extern const u8 BattleScript_82DADF1[]; extern const u8 BattleScript_82DADF1[];
extern const u8 BattleScript_MistProtected[]; extern const u8 BattleScript_MistProtected[];
extern const u8 BattleScript_RageIsBuilding[]; extern const u8 BattleScript_RageIsBuilding[];
src/battle_ai_script_commands.c
-1
View File
@@ -12,7 +12,6 @@
#define AIScriptRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24) #define AIScriptRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24)
#define AIScriptRead16(ptr) ((ptr)[0] | (ptr)[1] << 8) #define AIScriptRead16(ptr) ((ptr)[0] | (ptr)[1] << 8)
#define AIScriptRead8(ptr) ((ptr)[0])
#define AIScriptReadPtr(ptr) (const u8*) AIScriptRead32(ptr) #define AIScriptReadPtr(ptr) (const u8*) AIScriptRead32(ptr)
#define AI_ACTION_DONE 0x0001 #define AI_ACTION_DONE 0x0001
src/battle_script_commands.c
+6 -6
View File
@@ -6383,7 +6383,7 @@ static void atk62(void)
static void atk63_jumptorandomattack(void) static void atk63_jumptorandomattack(void)
{ {
if (gBattlescriptCurrInstr[1] != 0) if (gBattlescriptCurrInstr[1])
gCurrentMove = gRandomMove; gCurrentMove = gRandomMove;
else else
gChosenMove = gCurrentMove = gRandomMove; gChosenMove = gCurrentMove = gRandomMove;
@@ -7790,7 +7790,7 @@ static void atk8E_initmultihitstring(void)
gBattlescriptCurrInstr++; gBattlescriptCurrInstr++;
} }
static bool8 sub_8051064(void) static bool8 TryDoForceSwitchOut(void)
{ {
if (gBattleMons[gBankAttacker].level >= gBattleMons[gBankTarget].level) if (gBattleMons[gBankAttacker].level >= gBattleMons[gBankTarget].level)
{ {
@@ -7807,7 +7807,7 @@ static bool8 sub_8051064(void)
*(gBattleStruct->field_58 + gBankTarget) = gBattlePartyID[gBankTarget]; *(gBattleStruct->field_58 + gBankTarget) = gBattlePartyID[gBankTarget];
} }
gBattlescriptCurrInstr = BattleScript_82DADD8; gBattlescriptCurrInstr = BattleScript_SuccessForceOut;
return TRUE; return TRUE;
} }
@@ -7935,7 +7935,7 @@ static void atk8F_forcerandomswitch(void)
} }
else else
{ {
if (sub_8051064()) if (TryDoForceSwitchOut())
{ {
do do
{ {
@@ -7968,7 +7968,7 @@ static void atk8F_forcerandomswitch(void)
} }
else else
{ {
sub_8051064(); TryDoForceSwitchOut();
} }
} }
@@ -9306,7 +9306,7 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON2); gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON2);
} }
if (gActionForBanks[gBankTarget] == 0 if (gActionForBanks[gBankTarget] == ACTION_USE_MOVE
&& gBankAttacker == *(gBattleStruct->moveTarget + gBankTarget) && gBankAttacker == *(gBattleStruct->moveTarget + gBankTarget)
&& !(gBattleMons[gBankTarget].status1 & (STATUS_SLEEP | STATUS_FREEZE)) && !(gBattleMons[gBankTarget].status1 & (STATUS_SLEEP | STATUS_FREEZE))
&& gBattleMons[gBankAttacker].hp && gBattleMons[gBankAttacker].hp