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

Convert various to callnatives (#7355)

Browse Source
This commit is contained in:
Alex 2025-07-18 19:12:37 +02:00 committed by GitHub
parent 05b1db8cc6
commit 71d40cc3f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 2256 additions and 2349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1059
asm/macros/battle_script.inc
View File

File diff suppressed because it is too large Load Diff

194
data/battle_scripts_1.s
View File

@ -621,7 +621,7 @@ BattleScript_AffectionBasedStatus_HealFrostbiteString:
printstring STRINGID_ATTACKERHEALEDITSFROSTBITE
BattleScript_AffectionBasedStatusHeal_Continue:
waitmessage B_WAIT_TIME_LONG
clearstatus BS_ATTACKER
clearstatus
waitstate
updatestatusicon BS_ATTACKER
waitstate
@ -677,7 +677,7 @@ BattleScript_EffectSkyDrop::
attackstring
jumpifsubstituteblocks BattleScript_ButItFailed
jumpiftargetally BattleScript_ButItFailed
jumpifunder200 BS_TARGET, BattleScript_SkyDropWork
jumpifunder200 BattleScript_SkyDropWork
pause B_WAIT_TIME_SHORT
printstring STRINGID_TARGETTOOHEAVY
waitmessage B_WAIT_TIME_LONG
@ -753,14 +753,14 @@ BattleScript_EffectFling::
jumpiflastuseditemholdeffect HOLD_EFFECT_WHITE_HERB, 0, BattleScript_FlingWhiteHerb
goto BattleScript_FlingEnd
BattleScript_EffectFlingConsumeBerry:
savebattleritem BS_TARGET
battleritemtolastuseditem BS_TARGET
savebattleritem
battleritemtolastuseditem
setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries
orword gHitMarker, HITMARKER_DISABLE_ANIMATION
consumeberry BS_TARGET, TRUE
bicword gHitMarker, HITMARKER_DISABLE_ANIMATION
setbyte sBERRY_OVERRIDE, 0
restorebattleritem BS_TARGET
restorebattleritem
BattleScript_FlingEnd:
tryfaintmon BS_TARGET
trysymbiosis BS_ATTACKER
@ -785,7 +785,7 @@ BattleScript_FlingLightBall:
seteffectsecondary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_PARALYSIS
goto BattleScript_FlingEnd
BattleScript_FlingMentalHerb:
curecertainstatuses BS_TARGET
curecertainstatuses
savetarget
copybyte gBattlerAttacker, gBattlerTarget
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
@ -801,7 +801,7 @@ BattleScript_FlingToxicOrb:
seteffectsecondary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_TOXIC
goto BattleScript_FlingEnd
BattleScript_FlingWhiteHerb:
tryresetnegativestatstages BS_TARGET
tryresetnegativestatstages
swapattackerwithtarget
printstring STRINGID_PKMNSTATUSNORMAL
waitmessage B_WAIT_TIME_MED
@ -815,15 +815,15 @@ BattleScript_FlingMissed:
goto BattleScript_MoveMissedPause
BattleScript_EffectAuraWheel:: @ Aura Wheel can only be used by Morpeko
jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_FULL_BELLY, BattleScript_EffectHit
jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_HANGRY, BattleScript_EffectHit
jumpifspecies SPECIES_MORPEKO_FULL_BELLY, BattleScript_EffectHit
jumpifspecies SPECIES_MORPEKO_HANGRY, BattleScript_EffectHit
goto BattleScript_PokemonCantUseTheMove
BattleScript_EffectClangorousSoul::
attackcanceler
attackstring
ppreduce
cutonethirdhpraisestats BattleScript_ButItFailed
cutonethirdhpandraisestats BattleScript_ButItFailed
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_BIDE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_IGNORE_DISGUISE
attackanimation
waitanimation
@ -863,7 +863,7 @@ BattleScript_EffectPoltergeist::
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
checkpoltergeist BS_TARGET, BattleScript_ButItFailed
checkpoltergeist BattleScript_ButItFailed
printstring STRINGID_ABOUTTOUSEPOLTERGEIST
waitmessage B_WAIT_TIME_LONG
goto BattleScript_HitFromCritCalc
@ -892,7 +892,7 @@ BattleScript_EffectNoRetreat::
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
trynoretreat BS_TARGET, BattleScript_ButItFailed
trynoretreat BattleScript_ButItFailed
attackanimation
waitanimation
call BattleScript_AllStatsUp
@ -908,8 +908,8 @@ BattleScript_BothCanNoLongerEscape::
return
BattleScript_EffectHyperspaceFury::
jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHit
jumpifspecies BS_ATTACKER, SPECIES_HOOPA_CONFINED, BattleScript_ButHoopaCantUseIt
jumpifspecies SPECIES_HOOPA_UNBOUND, BattleScript_EffectHit
jumpifspecies SPECIES_HOOPA_CONFINED, BattleScript_ButHoopaCantUseIt
goto BattleScript_PokemonCantUseTheMove
BattleScript_ButHoopaCantUseIt:
@ -1024,7 +1024,7 @@ BattleScript_EffectJungleHealing::
attackcanceler
attackstring
ppreduce
jumpifteamhealthy BS_ATTACKER, BattleScript_ButItFailed
jumpifteamhealthy BattleScript_ButItFailed
attackanimation
waitanimation
copybyte gBattlerTarget, gBattlerAttacker
@ -1170,7 +1170,7 @@ BattleScript_EffectStrengthSap::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_StrengthSapTryLower:
getstatvalue BS_TARGET, STAT_ATK
getstatvalue STAT_ATK
jumpiffullhp BS_ATTACKER, BattleScript_StrengthSapMustLower
BattleScript_StrengthSapAnimation:
attackanimation
@ -1274,7 +1274,7 @@ BattleScript_VCreateStatLossRet:
BattleScript_SpectralThiefSteal::
setbyte sB_ANIM_TURN, 1
playmoveanimation BS_ATTACKER, MOVE_SPECTRAL_THIEF
playmoveanimation MOVE_SPECTRAL_THIEF
waitanimation
setbyte sB_ANIM_TURN, 0
printstring STRINGID_SPECTRALTHIEFSTEAL
@ -1440,7 +1440,7 @@ BattleScript_EffectAcupressure::
BattleScript_EffectAcupressureTry:
attackstring
ppreduce
tryaccupressure BS_TARGET, BattleScript_ButItFailed
tryacupressure BattleScript_ButItFailed
attackanimation
waitanimation
statbuffchange BS_TARGET, STAT_CHANGE_CERTAIN, BattleScript_MoveEnd
@ -1458,7 +1458,7 @@ BattleScript_EffectThirdType::
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
trysetthirdtype BS_TARGET, BattleScript_ButItFailed
trythirdtype BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_THIRDTYPEADDED
@ -1516,7 +1516,7 @@ BattleScript_RototillerLoop:
jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_RototillerCheckAffected
jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPATK, MAX_STAT_STAGE, BattleScript_RototillerCantRaiseMultipleStats
BattleScript_RototillerCheckAffected:
jumpifnotrototilleraffected BS_TARGET, BattleScript_RototillerNoEffect
jumpifnotrototilleraffected BattleScript_RototillerNoEffect
setstatchanger STAT_ATK, 1, FALSE
statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_RototillerTrySpAtk, BIT_SPATK
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_RototillerTrySpAtk
@ -1588,7 +1588,7 @@ BattleScript_EffectPowerTrick::
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
powertrick BS_ATTACKER
powertrick
attackanimation
waitanimation
printstring STRINGID_PKMNSWITCHEDATKANDDEF
@ -1723,7 +1723,7 @@ BattleScript_AutotomizePrintString::
waitmessage B_WAIT_TIME_LONG
BattleScript_AutotomizeWeightLoss::
jumpifmovehadnoeffect BattleScript_MoveEnd
tryautotomize BS_ATTACKER, BattleScript_MoveEnd
tryautotomize BattleScript_MoveEnd
printstring STRINGID_BECAMENIMBLE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
@ -1877,7 +1877,7 @@ BattleScript_EffectLastResort::
attackcanceler
attackstring
ppreduce
jumpifcantuselastresort BS_ATTACKER, BattleScript_ButItFailed
trylastresort BattleScript_ButItFailed
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
goto BattleScript_HitFromCritCalc
@ -1890,7 +1890,7 @@ BattleScript_EffectGrowth::
BattleScript_GrowthDoMoveAnim::
attackanimation
waitanimation
jumpifweatheraffected BS_ATTACKER, B_WEATHER_SUN, BattleScript_GrowthAtk2
jumpifweatheraffected B_WEATHER_SUN, BattleScript_GrowthAtk2
setstatchanger STAT_ATK, 1, FALSE
goto BattleScript_GrowthAtk
BattleScript_GrowthAtk2:
@ -1901,7 +1901,7 @@ BattleScript_GrowthAtk:
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_GrowthTrySpAtk::
jumpifweatheraffected BS_ATTACKER, B_WEATHER_SUN, BattleScript_GrowthSpAtk2
jumpifweatheraffected B_WEATHER_SUN, BattleScript_GrowthSpAtk2
setstatchanger STAT_SPATK, 1, FALSE
goto BattleScript_GrowthSpAtk
BattleScript_GrowthSpAtk2:
@ -2156,7 +2156,7 @@ BattleScript_EffectTopsyTurvy::
BattleScript_EffectTopsyTurvyWorks:
attackanimation
waitanimation
invertstatstages BS_TARGET
invertstatstages
printstring STRINGID_TOPSYTURVYSWITCHEDSTATS
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
@ -2210,7 +2210,7 @@ BattleScript_EffectEntrainment::
tryentrainment BattleScript_ButItFailed
attackanimation
waitanimation
setlastusedability BS_TARGET
setlastusedability
printstring STRINGID_PKMNACQUIREDABILITY
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
@ -2220,7 +2220,7 @@ BattleScript_EffectSimpleBeam::
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
setabilitysimple BS_TARGET, BattleScript_ButItFailed
setsimplebeam BattleScript_ButItFailed
attackanimation
waitanimation
.if B_ABILITY_POP_UP == TRUE
@ -2233,7 +2233,7 @@ BattleScript_EffectSimpleBeam::
trytoclearprimalweather
tryrevertweatherform
flushtextbox
tryendneutralizinggas BS_TARGET
tryendneutralizinggas
goto BattleScript_MoveEnd
BattleScript_EffectSuckerPunch::
@ -2246,7 +2246,7 @@ BattleScript_EffectLuckyChant::
attackcanceler
attackstring
ppreduce
setluckychant BS_ATTACKER, BattleScript_ButItFailed
setluckychant BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_SHIELDEDFROMCRITICALHITS
@ -2271,7 +2271,7 @@ BattleScript_EffectHealingWish::
ppreduce
attackanimation
waitanimation
instanthpdrop BS_ATTACKER
instanthpdrop
setatkhptozero
tryfaintmon BS_ATTACKER
storehealingwish BS_ATTACKER
@ -2299,7 +2299,7 @@ BattleScript_HealingWishActivates::
goto BattleScript_EffectHealingWishRestore
BattleScript_LunarDanceActivates::
setbyte cMULTISTRING_CHOOSER, 1
restorepp BS_ATTACKER
restoremovepp
BattleScript_EffectHealingWishRestore:
printfromtable gHealingWishStringIds
waitmessage B_WAIT_TIME_LONG
@ -2309,7 +2309,7 @@ BattleScript_EffectHealingWishRestore:
manipulatedamage DMG_CHANGE_SIGN
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
clearstatus BS_ATTACKER
clearstatus
waitstate
updatestatusicon BS_ATTACKER
waitstate
@ -2335,7 +2335,7 @@ BattleScript_EffectWorrySeed::
trytoclearprimalweather
tryrevertweatherform
flushtextbox
tryendneutralizinggas BS_TARGET
tryendneutralizinggas
goto BattleScript_MoveEnd
BattleScript_EffectPowerSplit::
@ -2467,7 +2467,7 @@ BattleScript_EffectGastroAcid::
trytoclearprimalweather
tryrevertweatherform
flushtextbox
tryendneutralizinggas BS_TARGET
tryendneutralizinggas
goto BattleScript_MoveEnd
BattleScript_EffectToxicSpikes::
@ -2614,7 +2614,7 @@ BattleScript_GravityLoop:
jumpifstatus3 BS_TARGET, STATUS3_ON_AIR | STATUS3_MAGNET_RISE | STATUS3_TELEKINESIS, BattleScript_GravityLoopDrop
goto BattleScript_GravityLoopEnd
BattleScript_GravityLoopDrop:
bringdownairbornebattler BS_TARGET
gravityonairbornemons
printstring STRINGID_GRAVITYGROUNDING
waitmessage B_WAIT_TIME_LONG
BattleScript_GravityLoopEnd:
@ -2742,7 +2742,7 @@ BattleScript_MoveMissed::
BattleScript_EffectDarkVoid::
.if B_DARK_VOID_FAIL >= GEN_7
jumpifspecies BS_ATTACKER, SPECIES_DARKRAI, BattleScript_EffectNonVolatileStatus
jumpifspecies SPECIES_DARKRAI, BattleScript_EffectNonVolatileStatus
goto BattleScript_PokemonCantUseTheMove
.endif
@ -2831,7 +2831,7 @@ BattleScript_InsomniaProtects:
goto BattleScript_MoveEnd
BattleScript_AlreadyAsleep::
setalreadystatusedmoveattempt BS_ATTACKER
setalreadystatusedmoveattempt
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNALREADYASLEEP
waitmessage B_WAIT_TIME_LONG
@ -3158,7 +3158,7 @@ BattleScript_RestoreHp:
goto BattleScript_MoveEnd
BattleScript_AlreadyPoisoned::
setalreadystatusedmoveattempt BS_ATTACKER
setalreadystatusedmoveattempt
pause B_WAIT_TIME_LONG
printstring STRINGID_PKMNALREADYPOISONED
waitmessage B_WAIT_TIME_LONG
@ -3175,7 +3175,7 @@ BattleScript_EffectAuroraVeil::
attackcanceler
attackstring
ppreduce
setauroraveil BS_ATTACKER
setauroraveil
goto BattleScript_PrintReflectLightScreenSafeguardString
BattleScript_EffectLightScreen::
@ -3213,7 +3213,7 @@ BattleScript_RestCantSleep::
goto BattleScript_MoveEnd
BattleScript_RestIsAlreadyAsleep::
setalreadystatusedmoveattempt BS_ATTACKER
setalreadystatusedmoveattempt
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNALREADYASLEEP2
waitmessage B_WAIT_TIME_LONG
@ -3293,7 +3293,7 @@ BattleScript_EffectConfuse::
goto BattleScript_MoveEnd
BattleScript_AlreadyConfused::
setalreadystatusedmoveattempt BS_ATTACKER
setalreadystatusedmoveattempt
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNALREADYCONFUSED
waitmessage B_WAIT_TIME_LONG
@ -3395,7 +3395,7 @@ BattleScript_VoltAbsorbHeal:
goto BattleScript_MoveHPDrain
BattleScript_AlreadyParalyzed::
setalreadystatusedmoveattempt BS_ATTACKER
setalreadystatusedmoveattempt
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNISALREADYPARALYZED
waitmessage B_WAIT_TIME_LONG
@ -3414,7 +3414,7 @@ BattleScript_EffectTwoTurnsAttack::
tryfiretwoturnmovewithoutcharging BS_ATTACKER, BattleScript_EffectHit @ e.g. Solar Beam
call BattleScript_FirstChargingTurn
tryfiretwoturnmoveaftercharging BS_ATTACKER, BattleScript_TwoTurnMovesSecondTurn @ e.g. Electro Shot
jumpifholdeffect BS_ATTACKER, HOLD_EFFECT_POWER_HERB, BattleScript_TwoTurnMovesSecondPowerHerbActivates
jumpifholdeffect BS_ATTACKER, HOLD_EFFECT_POWER_HERB, BattleScript_TwoTurnMovesSecondPowerHerbActivates, TRUE
goto BattleScript_MoveEnd
BattleScript_EffectGeomancy::
@ -3515,7 +3515,7 @@ BattleScript_SubstituteString::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_AlreadyHasSubstitute::
setalreadystatusedmoveattempt BS_ATTACKER
setalreadystatusedmoveattempt
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNHASSUBSTITUTE
waitmessage B_WAIT_TIME_LONG
@ -3870,7 +3870,7 @@ BattleScript_CurseEnd::
goto BattleScript_MoveEnd
BattleScript_GhostCurse::
jumpifbytenotequal gBattlerAttacker, gBattlerTarget, BattleScript_DoGhostCurse
getmovetarget BS_ATTACKER
getmovetarget
BattleScript_DoGhostCurse::
attackcanceler
attackstring
@ -3944,7 +3944,7 @@ BattleScript_EffectPerishSong::
setbyte gBattlerTarget, 0
BattleScript_PerishSongLoop::
jumpifblockedbysoundproof BS_TARGET, BattleScript_PerishSongBlocked
jumpifpranksterblocked BS_TARGET, BattleScript_PerishSongNotAffected
jumpifpranksterblocked BattleScript_PerishSongNotAffected
BattleScript_PerishSongLoopIncrement::
addbyte gBattlerTarget, 1
jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_PerishSongLoop
@ -4269,14 +4269,14 @@ BattleScript_EffectTeleport::
attackcanceler
attackstring
ppreduce
getifcantrunfrombattle BS_ATTACKER
isrunningimpossible
jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FORBIDDEN, BattleScript_ButItFailed
jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FAILURE, BattleScript_PrintAbilityMadeIneffective
attackanimation
waitanimation
printstring STRINGID_PKMNFLEDFROMBATTLE
waitmessage B_WAIT_TIME_LONG
setoutcomeonteleport BS_ATTACKER
setteleportoutcome BS_ATTACKER
goto BattleScript_MoveEnd
BattleScript_EffectBeatUp::
@ -4557,7 +4557,7 @@ BattleScript_EffectNonVolatileStatus::
goto BattleScript_MoveEnd
BattleScript_AlreadyBurned::
setalreadystatusedmoveattempt BS_ATTACKER
setalreadystatusedmoveattempt
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNALREADYHASBURN
waitmessage B_WAIT_TIME_LONG
@ -5074,7 +5074,7 @@ BattleScript_FaintAttacker::
cleareffectsonfaint BS_ATTACKER
tryactivatesoulheart
tryactivatereceiver BS_ATTACKER
trytrainerslidefirstdownmsg BS_ATTACKER
trytrainerslidemsgfirstoff BS_ATTACKER
return
BattleScript_FaintTarget::
@ -5088,7 +5088,7 @@ BattleScript_FaintTarget::
cleareffectsonfaint BS_TARGET
tryactivatesoulheart
tryactivatereceiver BS_TARGET
trytrainerslidefirstdownmsg BS_TARGET
trytrainerslidemsgfirstoff BS_TARGET
return
BattleScript_GiveExp::
@ -5134,7 +5134,7 @@ BattleScript_FaintedMonTryChoose:
jumpifbyte CMP_EQUAL, gBattleCommunication, PARTY_SIZE, BattleScript_FaintedMonSendOutNew
@ Switch Pokémon before opponent
atknameinbuff1
resetswitchinabilitybits BS_ATTACKER
resetswitchinabilitybits
hpthresholds2 BS_ATTACKER
printstring STRINGID_RETURNMON
switchoutabilities BS_ATTACKER
@ -5164,7 +5164,7 @@ BattleScript_FaintedMonSendOutNew:
switchinanim BS_FAINTED, FALSE, FALSE
waitstate
resetplayerfainted
trytrainerslidelastonmsg BS_FAINTED
trytrainerslidemsglaston BS_FAINTED
jumpifbytenotequal sSHIFT_SWITCHED, sZero, BattleScript_FaintedMonShiftSwitched
BattleScript_FaintedMonSendOutNewEnd:
switchineffects BS_FAINTED
@ -5264,9 +5264,9 @@ BattleScript_CheckDomeDrew::
jumpifbyte CMP_EQUAL, gBattleOutcome, B_OUTCOME_DREW, BattleScript_LocalBattleLostEnd_
BattleScript_LocalBattleLostPrintTrainersWinText::
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_LocalBattleLostPrintWhiteOut
returnopponentmon1toball BS_ATTACKER
returnopponentmon1toball
waitstate
returnopponentmon2toball BS_ATTACKER
returnopponentmon2toball
waitstate
trainerslidein BS_OPPONENT1
waitstate
@ -5283,9 +5283,9 @@ BattleScript_LocalBattleLostEnd_::
end2
BattleScript_FrontierLinkBattleLost::
returnopponentmon1toball BS_ATTACKER
returnopponentmon1toball
waitstate
returnopponentmon2toball BS_ATTACKER
returnopponentmon2toball
waitstate
trainerslidein BS_OPPONENT1
waitstate
@ -5312,7 +5312,7 @@ BattleScript_LinkBattleWonOrLostWaitEnd::
end2
BattleScript_TowerLinkBattleWon::
playtrainerdefeatbgm BS_ATTACKER
playtrainerdefeatedmusic
printstring STRINGID_BATTLEEND
waitmessage B_WAIT_TIME_LONG
trainerslidein BS_OPPONENT1
@ -5456,7 +5456,7 @@ BattleScript_LearnedNewMove::
fanfare MUS_LEVEL_UP
printstring STRINGID_PKMNLEARNEDMOVE
waitmessage B_WAIT_TIME_LONG
updatechoicemoveonlvlup BS_ATTACKER
updatechoicemoveonlvlup
goto BattleScript_TryLearnMoveLoop
BattleScript_LearnMoveReturn::
return
@ -5691,7 +5691,7 @@ BattleScript_RoarSuccessSwitch_Ret:
BattleScript_RoarSuccessEndBattle::
call BattleScript_RoarSuccessRet
setbyte sSWITCH_CASE, B_SWITCH_NORMAL
setoutcomeonteleport BS_ATTACKER
setteleportoutcome BS_ATTACKER
finishaction
BattleScript_RoarSuccessRet:
@ -6661,12 +6661,12 @@ BattleScript_IllusionOffEnd3::
end3
BattleScript_IllusionOff::
spriteignore0hp TRUE
setspriteignore0hp TRUE
playanimation BS_SCRIPTING, B_ANIM_ILLUSION_OFF
waitanimation
updatenick BS_SCRIPTING
updatenick
waitstate
spriteignore0hp FALSE
setspriteignore0hp FALSE
printstring STRINGID_ILLUSIONWOREOFF
waitmessage B_WAIT_TIME_LONG
return
@ -6814,7 +6814,7 @@ BattleScript_MoveUsedIsParalyzed::
printstring STRINGID_PKMNISPARALYZED
waitmessage B_WAIT_TIME_LONG
statusanimation BS_ATTACKER
cancelmultiturnmoves BS_ATTACKER
cancelmultiturnmoves
goto BattleScript_MoveEnd
BattleScript_PowderMoveNoEffect::
@ -6831,7 +6831,7 @@ BattleScript_PowderMoveNoEffectPrint:
printstring STRINGID_ITDOESNTAFFECT
BattleScript_PowderMoveNoEffectWaitMsg:
waitmessage B_WAIT_TIME_LONG
cancelmultiturnmoves BS_ATTACKER
cancelmultiturnmoves
setmoveresultflags MOVE_RESULT_FAILED
goto BattleScript_MoveEnd
@ -6849,7 +6849,7 @@ BattleScript_TryActivateSteadFast:
call BattleScript_AbilityPopUp
statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_MoveUsedFlinchedEnd
setbyte gBattleCommunication STAT_SPEED
stattextbuffer BS_ATTACKER
stattextbuffer
printstring STRINGID_ATTACKERABILITYSTATRAISE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveUsedFlinchedEnd
@ -6871,7 +6871,7 @@ BattleScript_MoveUsedIsConfused::
volatileanimation BS_ATTACKER, VOLATILE_CONFUSION
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, FALSE, BattleScript_MoveUsedIsConfusedRet
BattleScript_DoSelfConfusionDmg::
cancelmultiturnmoves BS_ATTACKER
cancelmultiturnmoves
adjustdamage
printstring STRINGID_ITHURTCONFUSION
waitmessage B_WAIT_TIME_LONG
@ -6893,7 +6893,7 @@ BattleScript_MoveUsedPowder::
attackstring
ppreduce
pause B_WAIT_TIME_SHORT
cancelmultiturnmoves BS_ATTACKER
cancelmultiturnmoves
volatileanimation BS_ATTACKER, VOLATILE_POWDER
waitanimation
effectivenesssound
@ -7146,7 +7146,7 @@ BattleScript_AbilityPopUpTarget::
BattleScript_AbilityPopUp::
tryactivateabilityshield BS_ABILITY_BATTLER
.if B_ABILITY_POP_UP == TRUE
showabilitypopup BS_ABILITY_BATTLER
showabilitypopup
pause B_WAIT_TIME_SHORT
.endif
recordability BS_ABILITY_BATTLER
@ -7159,10 +7159,10 @@ BattleScript_AbilityPopUpScripting:
BattleScript_AbilityPopUpOverwriteThenNormal:
setbyte sFIXED_ABILITY_POPUP, TRUE
showabilitypopup BS_ABILITY_BATTLER
showabilitypopup
pause B_WAIT_TIME_SHORT
sethword sABILITY_OVERWRITE, 0
updateabilitypopup BS_ABILITY_BATTLER
updateabilitypopup
pause B_WAIT_TIME_SHORT
recordability BS_ABILITY_BATTLER
destroyabilitypopup
@ -7229,7 +7229,7 @@ BattleScript_EmergencyExitWild::
.endif
playanimation BS_SCRIPTING, B_ANIM_SLIDE_OFFSCREEN
waitanimation
setoutcomeonteleport BS_SCRIPTING
setteleportoutcome BS_SCRIPTING
finishaction
return
@ -7260,7 +7260,7 @@ BattleScript_EmergencyExitWildEnd2::
pause B_WAIT_TIME_LONG
playanimation BS_ATTACKER, B_ANIM_SLIDE_OFFSCREEN
waitanimation
setoutcomeonteleport BS_ATTACKER
setteleportoutcome BS_ATTACKER
finishaction
end2
@ -7667,7 +7667,7 @@ BattleScript_ActivateTerrainEffects:
setbyte gBattlerAttacker, 0
BattleScript_ActivateTerrainSeed:
copyarraywithindex gBattlerTarget, gBattlerByTurnOrder, gBattlerAttacker, 1
doterrainseed BS_TARGET, BattleScript_ActivateTerrainAbility
tryterrainseed BS_TARGET, BattleScript_ActivateTerrainAbility
removeitem BS_TARGET
BattleScript_ActivateTerrainAbility:
activateterrainchangeabilities BS_TARGET
@ -8118,7 +8118,7 @@ BattleScript_FriskActivates::
saveattacker
savetarget
copybyte gBattlerAttacker, sBATTLER
tryfriskmsg BS_SCRIPTING
tryfriskmessage
restoreattacker
restoretarget
end3
@ -8126,7 +8126,7 @@ BattleScript_FriskActivates::
BattleScript_ImposterActivates::
call BattleScript_AbilityPopUp
transformdataexecution
playmoveanimation BS_ATTACKER, MOVE_TRANSFORM
playmoveanimation MOVE_TRANSFORM
waitanimation
printstring STRINGID_IMPOSTERTRANSFORM
waitmessage B_WAIT_TIME_LONG
@ -8298,7 +8298,7 @@ BattleScript_MoveUsedLoafingAround::
@ Skip ahead if not the Battle Palace message
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_INCAPABLE_OF_POWER, BattleScript_MoveUsedLoafingAroundMsg
setbyte gBattleCommunication, 0
palacetryescapestatus BS_ATTACKER
palacetryescapestatus
setbyte cMULTISTRING_CHOOSER, B_MSG_INCAPABLE_OF_POWER
BattleScript_MoveUsedLoafingAroundMsg::
printfromtable gInobedientStringIds
@ -8669,7 +8669,7 @@ BattleScript_FlushMessageBox::
BattleScript_PalacePrintFlavorText::
setbyte gBattleCommunication + 1, 0
BattleScript_PalaceTryBattlerFlavorText::
palaceflavortext BS_ATTACKER @ BS_ATTACKER here overwritten by gBattleCommunication + 1
palaceflavortext
jumpifbyte CMP_NOT_EQUAL, gBattleCommunication, TRUE, BattleScript_PalaceEndFlavorText
printfromtable gBattlePalaceFlavorTextTable
waitmessage B_WAIT_TIME_LONG
@ -8681,16 +8681,16 @@ BattleScript_PalaceEndFlavorText::
end2
BattleScript_ArenaTurnBeginning::
waitcry BS_ATTACKER
waitcry
volumedown
playse SE_ARENA_TIMEUP1
pause 8
playse SE_ARENA_TIMEUP1
arenadrawreftextbox
drawarenareftextbox
arenajudgmentstring B_MSG_REF_COMMENCE_BATTLE
arenawaitmessage B_MSG_REF_COMMENCE_BATTLE
pause B_WAIT_TIME_LONG
arenaerasereftextbox
erasearenareftextbox
volumeup
end2
@ -8704,7 +8704,7 @@ BattleScript_ArenaDoJudgment::
pause 8
playse SE_ARENA_TIMEUP1
pause B_WAIT_TIME_LONG
arenadrawreftextbox
drawarenareftextbox
arenajudgmentstring B_MSG_REF_THATS_IT
arenawaitmessage B_MSG_REF_THATS_IT
pause B_WAIT_TIME_LONG
@ -8727,11 +8727,11 @@ BattleScript_ArenaDoJudgment::
arenajudgmentstring B_MSG_REF_PLAYER_WON
arenawaitmessage B_MSG_REF_PLAYER_WON
arenajudgmentwindow
arenaerasereftextbox
erasearenareftextbox
printstring STRINGID_DEFEATEDOPPONENTBYREFEREE
waitmessage B_WAIT_TIME_LONG
playfaintcry BS_OPPONENT1
waitcry BS_ATTACKER
waitcry
dofaintanimation BS_OPPONENT1
cleareffectsonfaint BS_OPPONENT1
arenaopponentmonlost
@ -8741,11 +8741,11 @@ BattleScript_ArenaJudgmentPlayerLoses:
arenajudgmentstring B_MSG_REF_OPPONENT_WON
arenawaitmessage B_MSG_REF_OPPONENT_WON
arenajudgmentwindow
arenaerasereftextbox
erasearenareftextbox
printstring STRINGID_LOSTTOOPPONENTBYREFEREE
waitmessage B_WAIT_TIME_LONG
playfaintcry BS_PLAYER1
waitcry BS_ATTACKER
waitcry
dofaintanimation BS_PLAYER1
cleareffectsonfaint BS_PLAYER1
arenaplayermonlost
@ -8755,23 +8755,23 @@ BattleScript_ArenaJudgmentDraw:
arenajudgmentstring B_MSG_REF_DRAW
arenawaitmessage B_MSG_REF_DRAW
arenajudgmentwindow
arenaerasereftextbox
erasearenareftextbox
printstring STRINGID_TIEDOPPONENTBYREFEREE
waitmessage B_WAIT_TIME_LONG
playfaintcry BS_PLAYER1
waitcry BS_ATTACKER
waitcry
dofaintanimation BS_PLAYER1
cleareffectsonfaint BS_PLAYER1
playfaintcry BS_OPPONENT1
waitcry BS_ATTACKER
waitcry
dofaintanimation BS_OPPONENT1
cleareffectsonfaint BS_OPPONENT1
arenabothmonlost
arenabothmonslost
end2
BattleScript_AskIfWantsToForfeitMatch::
printselectionstring STRINGID_QUESTIONFORFEITMATCH
forfeityesnobox BS_ATTACKER
forfeityesnobox
endselectionscript
BattleScript_PrintPlayerForfeited::
@ -9074,7 +9074,7 @@ BattleScript_Pickpocket::
swapattackerwithtarget
call BattleScript_ItemSteal
swapattackerwithtarget
activateitemeffects BS_TARGET
activateitemeffects
return
BattleScript_PickpocketPrevented:
@ -9536,7 +9536,7 @@ BattleScript_RaiseCritAlliesEnd:
goto BattleScript_MoveEnd
BattleScript_EffectHealOneSixthAllies::
jumpifteamhealthy BS_ATTACKER, BattleScript_MoveEnd
jumpifteamhealthy BattleScript_MoveEnd
savetarget
copybyte gBattlerTarget, gBattlerAttacker
BattleScript_HealOneSixthAlliesLoop:
@ -9617,11 +9617,11 @@ BattleScript_DynamaxEnds::
BattleScript_DynamaxEnds_Ret::
flushtextbox
spriteignore0hp TRUE
setspriteignore0hp TRUE
updatedynamax
playanimation BS_SCRIPTING, B_ANIM_FORM_CHANGE
waitanimation
spriteignore0hp FALSE
setspriteignore0hp FALSE
pause B_WAIT_TIME_SHORT
return
@ -9720,7 +9720,7 @@ BattleScript_SleepClausePreventsEnd::
BattleScript_QuestionForfeitBattle::
printselectionstring STRINGID_QUESTIONFORFEITBATTLE
forfeityesnobox BS_ATTACKER
forfeityesnobox
endselectionscript
BattleScript_ForfeitBattleGaveMoney::

4
data/battle_scripts_2.s
View File

@ -131,7 +131,7 @@ BattleScript_PokeFluteEnd::
BattleScript_ItemSetMist::
call BattleScript_UseItemMessage
setmist
playmoveanimation BS_ATTACKER, MOVE_MIST
playmoveanimation MOVE_MIST
waitanimation
printfromtable gMistUsedStringIds
waitmessage B_WAIT_TIME_LONG
@ -142,7 +142,7 @@ BattleScript_ItemSetFocusEnergy::
jumpifvolatile BS_ATTACKER, VOLATILE_DRAGON_CHEER, BattleScript_ButItFailed
jumpifvolatile BS_ATTACKER, VOLATILE_FOCUS_ENERGY, BattleScript_ButItFailed
setfocusenergy BS_ATTACKER
playmoveanimation BS_ATTACKER, MOVE_FOCUS_ENERGY
playmoveanimation MOVE_FOCUS_ENERGY
waitanimation
copybyte sBATTLER, gBattlerAttacker
printstring STRINGID_PKMNUSEDXTOGETPUMPED

117
include/constants/battle_script_commands.h
View File

@ -88,123 +88,10 @@
#define CMP_COMMON_BITS 4
#define CMP_NO_COMMON_BITS 5
// Veriouses have been deprecated but the enum and function will be supported for one more release cycle
enum CmdVarious
{
VARIOUS_CANCEL_MULTI_TURN_MOVES,
VARIOUS_IS_RUNNING_IMPOSSIBLE,
VARIOUS_GET_MOVE_TARGET,
VARIOUS_GET_BATTLER_FAINTED,
VARIOUS_RESET_SWITCH_IN_ABILITY_BITS,
VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP,
VARIOUS_RESET_PLAYER_FAINTED,
VARIOUS_PALACE_FLAVOR_TEXT,
VARIOUS_ARENA_JUDGMENT_WINDOW,
VARIOUS_ARENA_OPPONENT_MON_LOST,
VARIOUS_ARENA_PLAYER_MON_LOST,
VARIOUS_ARENA_BOTH_MONS_LOST,
VARIOUS_EMIT_YESNOBOX,
VARIOUS_DRAW_ARENA_REF_TEXT_BOX,
VARIOUS_ERASE_ARENA_REF_TEXT_BOX,
VARIOUS_ARENA_JUDGMENT_STRING,
VARIOUS_ARENA_WAIT_STRING,
VARIOUS_WAIT_CRY,
VARIOUS_RETURN_OPPONENT_MON1,
VARIOUS_RETURN_OPPONENT_MON2,
VARIOUS_VOLUME_DOWN,
VARIOUS_VOLUME_UP,
VARIOUS_SET_ALREADY_STATUS_MOVE_ATTEMPT,
VARIOUS_PALACE_TRY_ESCAPE_STATUS,
VARIOUS_SET_TELEPORT_OUTCOME,
VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC,
VARIOUS_STAT_TEXT_BUFFER,
VARIOUS_SWITCHIN_ABILITIES,
VARIOUS_INSTANT_HP_DROP,
VARIOUS_CLEAR_STATUS,
VARIOUS_RESTORE_PP,
VARIOUS_PLAY_MOVE_ANIMATION,
VARIOUS_SET_LUCKY_CHANT,
VARIOUS_SUCKER_PUNCH_CHECK,
VARIOUS_SET_SIMPLE_BEAM,
VARIOUS_TRY_ENTRAINMENT,
VARIOUS_SET_LAST_USED_ABILITY,
VARIOUS_INVERT_STAT_STAGES,
VARIOUS_TRY_ME_FIRST,
VARIOUS_JUMP_IF_BATTLE_END,
VARIOUS_TRY_ELECTRIFY,
VARIOUS_TRY_SOAK,
VARIOUS_TRY_LAST_RESORT,
VARIOUS_TRY_AUTOTOMIZE,
VARIOUS_ABILITY_POPUP,
VARIOUS_JUMP_IF_TARGET_ALLY,
VARIOUS_TRY_SYNCHRONOISE,
VARIOUS_PSYCHO_SHIFT,
VARIOUS_CURE_STATUS,
VARIOUS_POWER_TRICK,
VARIOUS_AFTER_YOU,
VARIOUS_BESTOW,
VARIOUS_JUMP_IF_NOT_GROUNDED,
VARIOUS_HANDLE_TRAINER_SLIDE_MSG,
VARIOUS_TRY_TRAINER_SLIDE_MSG_FIRST_OFF,
VARIOUS_TRY_TRAINER_SLIDE_MSG_LAST_ON,
VARIOUS_SET_AURORA_VEIL,
VARIOUS_TRY_THIRD_TYPE,
VARIOUS_ACUPRESSURE,
VARIOUS_GRAVITY_ON_AIRBORNE_MONS,
VARIOUS_CHECK_IF_GRASSY_TERRAIN_HEALS,
VARIOUS_JUMP_IF_ROAR_FAILS,
VARIOUS_TRY_INSTRUCT,
VARIOUS_JUMP_IF_NOT_BERRY,
VARIOUS_TRACE_ABILITY,
VARIOUS_UPDATE_NICK,
VARIOUS_TRY_ILLUSION_OFF,
VARIOUS_SET_SPRITEIGNORE0HP,
VARIOUS_HANDLE_FORM_CHANGE,
VARIOUS_GET_STAT_VALUE,
VARIOUS_JUMP_IF_FULL_HP,
VARIOUS_LOSE_TYPE,
VARIOUS_TRY_ACTIVATE_SOULHEART,
VARIOUS_TRY_ACTIVATE_RECEIVER,
VARIOUS_TRY_FRISK,
VARIOUS_JUMP_IF_SHIELDS_DOWN_PROTECTED,
VARIOUS_TRY_FAIRY_LOCK,
VARIOUS_JUMP_IF_NO_ALLY,
VARIOUS_JUMP_IF_HOLD_EFFECT,
VARIOUS_INFATUATE_WITH_BATTLER,
VARIOUS_SET_LAST_USED_ITEM,
VARIOUS_JUMP_IF_ABSENT,
VARIOUS_DESTROY_ABILITY_POPUP,
VARIOUS_TOTEM_BOOST,
VARIOUS_MOVEEND_ITEM_EFFECTS,
VARIOUS_TERRAIN_SEED,
VARIOUS_MAKE_INVISIBLE,
VARIOUS_ROOM_SERVICE,
VARIOUS_JUMP_IF_TEAM_HEALTHY,
VARIOUS_TRY_HEAL_QUARTER_HP,
VARIOUS_JUMP_IF_PRANKSTER_BLOCKED,
VARIOUS_TRY_TO_CLEAR_PRIMAL_WEATHER,
VARIOUS_GET_ROTOTILLER_TARGETS,
VARIOUS_JUMP_IF_NOT_ROTOTILLER_AFFECTED,
VARIOUS_CONSUME_BERRY,
VARIOUS_JUMP_IF_CANT_REVERT_TO_PRIMAL,
VARIOUS_JUMP_IF_SPECIES,
VARIOUS_UPDATE_ABILITY_POPUP,
VARIOUS_JUMP_IF_WEATHER_AFFECTED,
VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED,
VARIOUS_SET_ATTACKER_STICKY_WEB_USER,
VARIOUS_TRY_NO_RETREAT,
VARIOUS_CHECK_POLTERGEIST,
VARIOUS_CUT_1_3_HP_RAISE_STATS,
VARIOUS_TRY_END_NEUTRALIZING_GAS,
VARIOUS_JUMP_IF_UNDER_200,
VARIOUS_SET_SKY_DROP,
VARIOUS_CLEAR_SKY_DROP,
VARIOUS_SKY_DROP_YAWN,
VARIOUS_CURE_CERTAIN_STATUSES,
VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES,
VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY,
VARIOUS_SAVE_BATTLER_ITEM,
VARIOUS_RESTORE_BATTLER_ITEM,
VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM,
VARIOUS_NONE,
};
// Cmd_manipulatedamage

3231
src/battle_script_commands.c
View File

File diff suppressed because it is too large Load Diff