ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
9d8672e3df
pokeemerald/data/battle_scripts_1.s

8549 lines
279 KiB
ArmAsm
Raw Normal View History

Misc battle script cleanup
2021-04-03 18:38:07 +02:00
#include "constants/global.h"
create more battle constants
2018-02-08 00:35:13 +01:00
#include "constants/battle.h"
pokemon and battle constants
2018-02-08 11:17:41 +01:00
#include "constants/pokemon.h"
#include "constants/battle_script_commands.h"
create more battle constants
2018-02-08 00:35:13 +01:00
#include "constants/battle_anim.h"
#include "constants/battle_string_ids.h"
convert more constants
2017-12-11 19:27:51 +01:00
#include "constants/abilities.h"
Power Herb
2020-04-22 10:44:19 +02:00
#include "constants/hold_effects.h"
convert more constants
2017-12-11 19:27:51 +01:00
#include "constants/moves.h"
#include "constants/songs.h"
Label most of the anim tags
2018-10-06 09:37:52 +02:00
#include "constants/game_stat.h"
Add missing trainer constant use
2021-04-02 08:17:36 +02:00
#include "constants/trainers.h"
Added a way to quickly switch Rapid Spin's move effect from Gen. 3 to 8
2020-10-15 09:21:40 +02:00
#include "constants/battle_config.h"
.s -> .inc
2016-11-01 16:29:13 +01:00
.include "asm/macros.inc"
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.include "asm/macros/battle_script.inc"
.s -> .inc
2016-11-01 16:29:13 +01:00
.include "constants/constants.inc"
split data1.s
2016-09-03 19:20:06 +02:00
.section script_data, "aw", %progbits
pokemon and battle constants
2018-02-08 11:17:41 +01:00
dump battle animation scripts
2017-12-31 16:28:57 +01:00
.align 2
merge with be
2021-09-16 19:12:59 +02:00
<<<<<<< HEAD
atk49 is matching baby WOHOHOHOHO
2017-09-23 20:13:45 +02:00
gBattleScriptsForMoveEffects:: @ 82D86A8
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectHit
.4byte BattleScript_EffectSleep
.4byte BattleScript_EffectPoisonHit
.4byte BattleScript_EffectAbsorb
.4byte BattleScript_EffectBurnHit
.4byte BattleScript_EffectFreezeHit
.4byte BattleScript_EffectParalyzeHit
.4byte BattleScript_EffectExplosion
.4byte BattleScript_EffectDreamEater
.4byte BattleScript_EffectMirrorMove
.4byte BattleScript_EffectAttackUp
.4byte BattleScript_EffectDefenseUp
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectSpeedUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectSpecialAttackUp
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectSpecialDefenseUp
.4byte BattleScript_EffectAccuracyUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectEvasionUp
Misc. move updates Bind: 75% Acc -> 85% Acc Disable: 55% Acc. -> 100% Acc. Freeze-Dry: 10% chance to freeze Hammer Arm and Ice Hammer: lower user's speed High Jump Kick: 130BP, 10 PP Jump Kick: 100BP, 10 PP Tail Glow: raises Sp. Atk by 3 stages Waterfall: 20% chance to flinch
2019-03-31 17:23:41 +02:00
.4byte BattleScript_EffectSpecialAttackUp3
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectAttackDown
.4byte BattleScript_EffectDefenseDown
.4byte BattleScript_EffectSpeedDown
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectSpecialAttackDown
.4byte BattleScript_EffectSpecialDefenseDown
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectAccuracyDown
.4byte BattleScript_EffectEvasionDown
.4byte BattleScript_EffectHaze
.4byte BattleScript_EffectBide
.4byte BattleScript_EffectRampage
.4byte BattleScript_EffectRoar
.4byte BattleScript_EffectMultiHit
.4byte BattleScript_EffectConversion
.4byte BattleScript_EffectFlinchHit
.4byte BattleScript_EffectRestoreHp
.4byte BattleScript_EffectToxic
.4byte BattleScript_EffectPayDay
.4byte BattleScript_EffectLightScreen
.4byte BattleScript_EffectTriAttack
.4byte BattleScript_EffectRest
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectOHKO
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
.4byte BattleScript_EffectFusionCombo
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectSuperFang
.4byte BattleScript_EffectDragonRage
.4byte BattleScript_EffectTrap
Moves with accuracy 0 bypass accuracy checks; Heal Block move effect done
2018-07-30 20:41:16 +02:00
.4byte BattleScript_EffectHealBlock
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectDoubleHit
.4byte BattleScript_EffectRecoilIfMiss
.4byte BattleScript_EffectMist
.4byte BattleScript_EffectFocusEnergy
AI dont rely on power if bad effects
2020-04-20 11:27:09 +02:00
.4byte BattleScript_EffectRecoil25
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectConfuse
.4byte BattleScript_EffectAttackUp2
.4byte BattleScript_EffectDefenseUp2
.4byte BattleScript_EffectSpeedUp2
.4byte BattleScript_EffectSpecialAttackUp2
.4byte BattleScript_EffectSpecialDefenseUp2
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectAccuracyUp2
.4byte BattleScript_EffectEvasionUp2
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectTransform
.4byte BattleScript_EffectAttackDown2
.4byte BattleScript_EffectDefenseDown2
.4byte BattleScript_EffectSpeedDown2
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectSpecialAttackDown2
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectSpecialDefenseDown2
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectAccuracyDown2
.4byte BattleScript_EffectEvasionDown2
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectReflect
.4byte BattleScript_EffectPoison
.4byte BattleScript_EffectParalyze
.4byte BattleScript_EffectAttackDownHit
.4byte BattleScript_EffectDefenseDownHit
.4byte BattleScript_EffectSpeedDownHit
.4byte BattleScript_EffectSpecialAttackDownHit
.4byte BattleScript_EffectSpecialDefenseDownHit
.4byte BattleScript_EffectAccuracyDownHit
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectEvasionDownHit
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
.4byte BattleScript_EffectTwoTurnsAttack
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectConfuseHit
.4byte BattleScript_EffectTwineedle
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectVitalThrow
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectSubstitute
.4byte BattleScript_EffectRecharge
.4byte BattleScript_EffectRage
.4byte BattleScript_EffectMimic
.4byte BattleScript_EffectMetronome
.4byte BattleScript_EffectLeechSeed
Three pointless moves Celebrate, Hold Hands and Happy Hour. Yay(!) Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money. Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-03 21:33:37 +02:00
.4byte BattleScript_EffectDoNothing
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectDisable
.4byte BattleScript_EffectLevelDamage
.4byte BattleScript_EffectPsywave
.4byte BattleScript_EffectCounter
.4byte BattleScript_EffectEncore
.4byte BattleScript_EffectPainSplit
.4byte BattleScript_EffectSnore
.4byte BattleScript_EffectConversion2
.4byte BattleScript_EffectLockOn
.4byte BattleScript_EffectSketch
Misc. move updates Bind: 75% Acc -> 85% Acc Disable: 55% Acc. -> 100% Acc. Freeze-Dry: 10% chance to freeze Hammer Arm and Ice Hammer: lower user's speed High Jump Kick: 130BP, 10 PP Jump Kick: 100BP, 10 PP Tail Glow: raises Sp. Atk by 3 stages Waterfall: 20% chance to flinch
2019-03-31 17:23:41 +02:00
.4byte BattleScript_EffectHammerArm
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectSleepTalk
.4byte BattleScript_EffectDestinyBond
.4byte BattleScript_EffectFlail
.4byte BattleScript_EffectSpite
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectFalseSwipe
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectHealBell
New crit calculator.
2018-07-23 21:36:05 +02:00
.4byte BattleScript_EffectAlwaysCrit
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectTripleKick
.4byte BattleScript_EffectThief
.4byte BattleScript_EffectMeanLook
.4byte BattleScript_EffectNightmare
.4byte BattleScript_EffectMinimize
.4byte BattleScript_EffectCurse
Healing Wish and Lunar Dance
2018-07-26 20:36:16 +02:00
.4byte BattleScript_EffectHealingWish
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectProtect
.4byte BattleScript_EffectSpikes
.4byte BattleScript_EffectForesight
.4byte BattleScript_EffectPerishSong
.4byte BattleScript_EffectSandstorm
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectEndure
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectRollout
.4byte BattleScript_EffectSwagger
.4byte BattleScript_EffectFuryCutter
.4byte BattleScript_EffectAttract
.4byte BattleScript_EffectReturn
.4byte BattleScript_EffectPresent
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectFrustration
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectSafeguard
.4byte BattleScript_EffectMagnitude
.4byte BattleScript_EffectBatonPass
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectPursuit
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectRapidSpin
.4byte BattleScript_EffectSonicboom
Captivate and new accuracy calc
2018-07-22 15:08:32 +02:00
.4byte BattleScript_EffectCaptivate
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectMorningSun
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectSynthesis
.4byte BattleScript_EffectMoonlight
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectHiddenPower
.4byte BattleScript_EffectRainDance
.4byte BattleScript_EffectSunnyDay
.4byte BattleScript_EffectDefenseUpHit
.4byte BattleScript_EffectAttackUpHit
.4byte BattleScript_EffectAllStatsUpHit
Add Fell Stinger
2018-07-26 23:40:55 +02:00
.4byte BattleScript_EffectFellStinger
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectBellyDrum
.4byte BattleScript_EffectPsychUp
.4byte BattleScript_EffectMirrorCoat
.4byte BattleScript_EffectSkullBash
.4byte BattleScript_EffectTwister
.4byte BattleScript_EffectEarthquake
.4byte BattleScript_EffectFutureSight
.4byte BattleScript_EffectGust
.4byte BattleScript_EffectStomp
.4byte BattleScript_EffectSolarbeam
.4byte BattleScript_EffectThunder
.4byte BattleScript_EffectTeleport
.4byte BattleScript_EffectBeatUp
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectSemiInvulnerable
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectDefenseCurl
.4byte BattleScript_EffectSoftboiled
.4byte BattleScript_EffectFakeOut
.4byte BattleScript_EffectUproar
.4byte BattleScript_EffectStockpile
.4byte BattleScript_EffectSpitUp
.4byte BattleScript_EffectSwallow
Fix crits and do Worry Seed
2018-07-23 22:18:56 +02:00
.4byte BattleScript_EffectWorrySeed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectHail
.4byte BattleScript_EffectTorment
.4byte BattleScript_EffectFlatter
.4byte BattleScript_EffectWillOWisp
.4byte BattleScript_EffectMemento
.4byte BattleScript_EffectFacade
.4byte BattleScript_EffectFocusPunch
.4byte BattleScript_EffectSmellingsalt
.4byte BattleScript_EffectFollowMe
.4byte BattleScript_EffectNaturePower
.4byte BattleScript_EffectCharge
.4byte BattleScript_EffectTaunt
.4byte BattleScript_EffectHelpingHand
.4byte BattleScript_EffectTrick
.4byte BattleScript_EffectRolePlay
.4byte BattleScript_EffectWish
.4byte BattleScript_EffectAssist
.4byte BattleScript_EffectIngrain
.4byte BattleScript_EffectSuperpower
.4byte BattleScript_EffectMagicCoat
.4byte BattleScript_EffectRecycle
.4byte BattleScript_EffectRevenge
.4byte BattleScript_EffectBrickBreak
.4byte BattleScript_EffectYawn
.4byte BattleScript_EffectKnockOff
.4byte BattleScript_EffectEndeavor
.4byte BattleScript_EffectEruption
.4byte BattleScript_EffectSkillSwap
.4byte BattleScript_EffectImprison
.4byte BattleScript_EffectRefresh
.4byte BattleScript_EffectGrudge
.4byte BattleScript_EffectSnatch
.4byte BattleScript_EffectLowKick
.4byte BattleScript_EffectSecretPower
AI dont rely on power if bad effects
2020-04-20 11:27:09 +02:00
.4byte BattleScript_EffectRecoil33
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectTeeterDance
Add U-turn effect
2018-07-23 22:43:05 +02:00
.4byte BattleScript_EffectHitEscape
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectMudSport
.4byte BattleScript_EffectPoisonFang
.4byte BattleScript_EffectWeatherBall
.4byte BattleScript_EffectOverheat
.4byte BattleScript_EffectTickle
.4byte BattleScript_EffectCosmicPower
.4byte BattleScript_EffectSkyUppercut
.4byte BattleScript_EffectBulkUp
Add placeholder string for not done moves.
2018-08-02 20:32:13 +02:00
.4byte BattleScript_EffectPlaceholder
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
.4byte BattleScript_EffectWaterSport
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
.4byte BattleScript_EffectCalmMind
.4byte BattleScript_EffectDragonDance
.4byte BattleScript_EffectCamouflage
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
.4byte BattleScript_EffectPledge
.4byte BattleScript_EffectFling
.4byte BattleScript_EffectNaturalGift
.4byte BattleScript_EffectWakeUpSlap
.4byte BattleScript_EffectWringOut
.4byte BattleScript_EffectHex
.4byte BattleScript_EffectAssurance
.4byte BattleScript_EffectTrump_card
.4byte BattleScript_EffectAcrobatics
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
.4byte BattleScript_EffectHeatCrash
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
.4byte BattleScript_EffectPunishment
.4byte BattleScript_EffectStoredPower
.4byte BattleScript_EffectElectroBall
.4byte BattleScript_EffectGyroBall
.4byte BattleScript_EffectEchoedVoice
.4byte BattleScript_EffectPayback
.4byte BattleScript_EffectRound
.4byte BattleScript_EffectBrine
.4byte BattleScript_EffectVenoshock
.4byte BattleScript_EffectRetalitate
.4byte BattleScript_EffectBulldoze
.4byte BattleScript_EffectFoulPlay
.4byte BattleScript_EffectPsyshock
.4byte BattleScript_EffectRoost
.4byte BattleScript_EffectGravity
.4byte BattleScript_EffectMircleEye
.4byte BattleScript_EffectTailwind
.4byte BattleScript_EffectEmbargo
.4byte BattleScript_EffectAquaRing
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
.4byte BattleScript_EffectTrickRoom
.4byte BattleScript_EffectWonderRoom
.4byte BattleScript_EffectMagicRoom
.4byte BattleScript_EffectMagnetRise
.4byte BattleScript_EffectToxicSpikes
.4byte BattleScript_EffectGastroAcid
.4byte BattleScript_EffectStealthRock
.4byte BattleScript_EffectTelekinesis
Gen 5 move names, telekinesis, power/guard split/swap
2018-07-21 23:12:10 +02:00
.4byte BattleScript_EffectPowerSwap
.4byte BattleScript_EffectGuardSwap
.4byte BattleScript_EffectHeartSwap
.4byte BattleScript_EffectPowerSplit
.4byte BattleScript_EffectGuardSplit
Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst
2018-08-04 20:36:24 +02:00
.4byte BattleScript_EffectStickyWeb
.4byte BattleScript_EffectMetalBurst
.4byte BattleScript_EffectLuckyChant
.4byte BattleScript_EffectSuckerPunch
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
.4byte BattleScript_EffectSpecialDefenseDownHit2
.4byte BattleScript_EffectSimpleBeam
.4byte BattleScript_EffectEntrainment
.4byte BattleScript_EffectHealPulse
.4byte BattleScript_EffectQuash
Topsy Turvy and Ion Deluge.
2018-08-04 23:34:29 +02:00
.4byte BattleScript_EffectIonDeluge
.4byte BattleScript_EffectFreezeDry
.4byte BattleScript_EffectTopsyTurvy
Moves changing terrains
2018-08-05 12:43:57 +02:00
.4byte BattleScript_EffectMistyTerrain
.4byte BattleScript_EffectGrassyTerrain
.4byte BattleScript_EffectElectricTerrain
.4byte BattleScript_EffectPsychicTerrain
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
.4byte BattleScript_EffectAttackAccUp
.4byte BattleScript_EffectAttackSpAttackUp
.4byte BattleScript_EffectHurricane
Support for two typed moves.
2018-08-05 13:57:37 +02:00
.4byte BattleScript_EffectTwoTypedMove
Me First.
2018-08-05 16:43:07 +02:00
.4byte BattleScript_EffectMeFirst
Couple bug fixes
2018-08-11 12:16:00 +02:00
.4byte BattleScript_EffectSpeedUpHit
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
.4byte BattleScript_EffectQuiverDance
.4byte BattleScript_EffectCoil
Reflect Type and SOAK
2018-08-11 13:30:34 +02:00
.4byte BattleScript_EffectElectrify
.4byte BattleScript_EffectScald
.4byte BattleScript_EffectReflectType
.4byte BattleScript_EffectSoak
Growth gen6 effect
2018-09-22 01:01:13 +02:00
.4byte BattleScript_EffectGrowth
Close combat effect
2018-09-22 01:12:27 +02:00
.4byte BattleScript_EffectCloseCombat
Last Resort, Fangs and Flare Blitz/Volt Tackle
2018-09-22 10:45:43 +02:00
.4byte BattleScript_EffectLastResort
.4byte BattleScript_EffectRecoil33WithStatus
.4byte BattleScript_EffectFlinchWithStatus
Shell Smash move effect
2018-09-22 11:13:17 +02:00
.4byte BattleScript_EffectRecoil50
.4byte BattleScript_EffectShellSmash
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
.4byte BattleScript_EffectShiftGear
.4byte BattleScript_EffectDefenseUp3
.4byte BattleScript_EffectNobleRoar
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
.4byte BattleScript_EffectVenomDrench
.4byte BattleScript_EffectToxicThread
.4byte BattleScript_EffectClearSmog
.4byte BattleScript_EffectHitSwitchTarget
.4byte BattleScript_EffectFinalGambit
Remove Techno Blast and Judgment from battle scripts
2020-11-20 04:14:12 +01:00
.4byte BattleScript_EffectChangeTypeOnItem
Some cleanup (#454) * Toxic Thread doesn't have power. * Added missing commas. * Autotomize typo. It wasn't until today that I learned that autotomize was a word.
2020-06-27 11:21:13 +02:00
.4byte BattleScript_EffectAutotomize
Add Copycat
2018-09-22 18:37:03 +02:00
.4byte BattleScript_EffectCopycat
Defog
2018-09-23 19:03:53 +02:00
.4byte BattleScript_EffectDefog
Add Pollen Puff effect
2018-09-29 14:10:53 +02:00
.4byte BattleScript_EffectHitEnemyHealAlly
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
.4byte BattleScript_EffectSmackDown
.4byte BattleScript_EffectSynchronoise
Psycho Shift, Power Trick, Flame Burst
2018-09-29 18:40:14 +02:00
.4byte BattleScript_EffectPsychoShift
.4byte BattleScript_EffectPowerTrick
.4byte BattleScript_EffectFlameBurst
After you
2018-09-29 19:37:39 +02:00
.4byte BattleScript_EffectAfterYou
Bestow
2018-09-30 12:27:51 +02:00
.4byte BattleScript_EffectBestow
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
.4byte BattleScript_EffectRototiller
Flower Shield and protect moves
2018-10-06 15:50:35 +02:00
.4byte BattleScript_EffectFlowerShield
.4byte BattleScript_EffectHitPreventEscape
.4byte BattleScript_EffectSpeedSwap
Aurora Veil, Revelation Dance, Diamond Storm
2018-11-03 14:35:45 +01:00
.4byte BattleScript_EffectDefenseUp2Hit
.4byte BattleScript_EffectRevelationDance
.4byte BattleScript_EffectAuroraVeil
Add third type
2018-11-17 12:10:24 +01:00
.4byte BattleScript_EffectThirdType
Add Move Effect - Feint
2018-11-24 19:37:10 +01:00
.4byte BattleScript_EffectFeint
Add Acupressure
2018-11-24 21:06:53 +01:00
.4byte BattleScript_EffectSparklingAria
.4byte BattleScript_EffectAcupressure
Add Aromatic Mist
2018-11-25 12:59:22 +01:00
.4byte BattleScript_EffectAromaticMist
Add Powder
2018-12-03 12:50:32 +01:00
.4byte BattleScript_EffectPowder
Fix Charge Beam effect
2019-01-27 11:57:13 +01:00
.4byte BattleScript_EffectSpAtkUpHit
Code Belch effect
2019-02-01 14:17:24 +01:00
.4byte BattleScript_EffectBelch
Parting Shot Effect plus animation (looks like Snarl)
2019-02-05 22:47:50 +01:00
.4byte BattleScript_EffectPartingShot
Spectral Thief effect
2019-02-14 12:15:53 +01:00
.4byte BattleScript_EffectSpectralThief
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
.4byte BattleScript_EffectVCreate
Mat Block Nothing more needs to be said
2019-03-31 18:17:13 +02:00
.4byte BattleScript_EffectMatBlock
Stomping Tantrum Uses timer in gBattleStruct to count time since last failed move. This is augmented by a MOVE_FAILED result in atk_49 and decreased with an ENDTURN case. EFFECT_STOMPING_TANTRUM doubles base power if the timer is set.
2019-04-01 16:28:17 +02:00
.4byte BattleScript_EffectStompingTantrum
Core Enforcer New code - uses Gastro Acid script instead through own move effect
2019-04-15 16:55:37 +02:00
.4byte BattleScript_EffectCoreEnforcer
Instruct Re-PR'd due to excess "merges"
2019-04-20 21:11:49 +02:00
.4byte BattleScript_EffectInstruct
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
.4byte BattleScript_EffectThroatChop
Laser Focus Re-PR'd due to excess "merges"
2019-04-20 21:02:52 +02:00
.4byte BattleScript_EffectLaserFocus
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
.4byte BattleScript_EffectMagneticFlux
.4byte BattleScript_EffectGearUp
Incinerate
2019-05-10 15:12:33 +02:00
.4byte BattleScript_EffectIncinerate
Bug Bite
2019-05-23 12:32:14 +02:00
.4byte BattleScript_EffectBugBite
Big Root and STRENGTH Sap
2020-04-13 15:00:17 +02:00
.4byte BattleScript_EffectStrengthSap
Mind blown (#302) * Mind Blown Part 1 (Definition and self-damage) * Mind Blown Part 2 (Damp interaction)
2020-04-14 09:27:29 +02:00
.4byte BattleScript_EffectMindBlown
Burn Up And Purify
2020-04-17 21:14:26 +02:00
.4byte BattleScript_EffectPurify
.4byte BattleScript_EffectBurnUp
Shore Up
2020-04-18 18:34:18 +02:00
.4byte BattleScript_EffectShoreUp
Geomancy
2020-04-20 19:02:03 +02:00
.4byte BattleScript_EffectGeomancy
Fairy Lock
2020-04-20 19:41:07 +02:00
.4byte BattleScript_EffectFairyLock
Ally Switch, tbd
2020-04-20 20:05:04 +02:00
.4byte BattleScript_EffectAllySwitch
Implemented Relic Song's effect
2020-06-16 12:06:38 +02:00
.4byte BattleScript_EffectSleepHit
Implemented Clanging Scales' effect
2021-05-09 23:15:24 +02:00
.4byte BattleScript_EffectAttackerDefenseDownHit
Implement Body Press' effect Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
2021-03-16 10:56:44 +01:00
.4byte BattleScript_EffectBodyPress
add eerie spell, surging strikes, jungle healing
2021-01-28 18:51:00 +01:00
.4byte BattleScript_EffectEerieSpell
.4byte BattleScript_EffectJungleHealing
coaching, lash out, burning jealousy
2021-01-28 20:21:11 +01:00
.4byte BattleScript_EffectCoaching
.4byte BattleScript_EffectLashOut
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 21:27:00 +01:00
.4byte BattleScript_EffectGrassyGlide
.4byte BattleScript_EffectRemoveTerrain
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 17:38:54 +02:00
.4byte BattleScript_EffectDynamaxDoubleDmg
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 21:27:00 +01:00
.4byte BattleScript_EffectDecorate
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 17:38:54 +02:00
.4byte BattleScript_EffectSnipeShot
.4byte BattleScript_EffectTripleHit
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 21:27:00 +01:00
BattleScript_EffectDecorate:
attackcanceler
attackstring
ppreduce
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_ATK, 12, BattleScript_DecorateBoost
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_SPATK, 12, BattleScript_DecorateBoost
goto BattleScript_ButItFailed
BattleScript_DecorateBoost:
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, 0x0
setstatchanger STAT_ATK, 2, FALSE
statbuffchange STAT_BUFF_ALLOW_PTR | STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_DecorateBoostSpAtk
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DecorateBoostSpAtk
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_DecorateBoostSpAtk:
setstatchanger STAT_SPATK, 2, FALSE
statbuffchange STAT_BUFF_ALLOW_PTR | STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_MoveEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_MoveEnd
printfromtable gStatUpStringIds
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_EffectRemoveTerrain:
attackcanceler
attackstring
ppreduce
jumpifword CMP_NO_COMMON_BITS, gFieldStatuses, STATUS_FIELD_TERRAIN_ANY, BattleScript_ButItFailed
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
waitmessage 0x40
resultmessage
waitmessage 0x40
removeterrain
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 4, BattleScript_MoveEnd
printfromtable gTerrainEndingStringIds
waitmessage 0x40
playanimation BS_ATTACKER, B_ANIM_RESTORE_BG, NULL
tryfaintmon BS_TARGET, FALSE, NULL
goto BattleScript_MoveEnd
coaching, lash out, burning jealousy
2021-01-28 20:21:11 +01:00
BattleScript_EffectCoaching:
attackcanceler
attackstring
ppreduce
jumpifnoally BS_ATTACKER, BattleScript_ButItFailed
copybyte gBattlerTarget, gBattlerAttacker
setallytonexttarget EffectCoaching_CheckAllyStats
goto BattleScript_ButItFailed
EffectCoaching_CheckAllyStats:
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_ATK, 12, BattleScript_CoachingWorks
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_DEF, 12, BattleScript_CoachingWorks
goto BattleScript_ButItFailed @ ally at max atk, def
BattleScript_CoachingWorks:
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 21:27:00 +01:00
attackanimation
waitanimation
coaching, lash out, burning jealousy
2021-01-28 20:21:11 +01:00
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, 0x0
setstatchanger STAT_ATK, 1, FALSE
statbuffchange STAT_BUFF_ALLOW_PTR | STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_CoachingBoostDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CoachingBoostDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CoachingBoostDef:
setstatchanger STAT_DEF, 1, FALSE
statbuffchange STAT_BUFF_ALLOW_PTR | STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_MoveEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_MoveEnd
printfromtable gStatUpStringIds
waitmessage 0x40
goto BattleScript_MoveEnd
add eerie spell, surging strikes, jungle healing
2021-01-28 18:51:00 +01:00
BattleScript_EffectJungleHealing:
attackcanceler
attackstring
ppreduce
jumpifteamhealthy BS_ATTACKER, BattleScript_ButItFailed
attackanimation
waitanimation
copybyte gBattlerTarget, gBattlerAttacker
setbyte gBattleCommunication, 0
JungleHealing_RestoreTargetHealth:
copybyte gBattlerAttacker, gBattlerTarget
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 17:38:54 +02:00
tryhealquarterhealth BS_TARGET, BattleScript_JungleHealing_TryCureStatus
add eerie spell, surging strikes, jungle healing
2021-01-28 18:51:00 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage 0x40
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 17:38:54 +02:00
BattleScript_JungleHealing_TryCureStatus:
jumpifmove MOVE_LIFE_DEW, BattleScript_JungleHealingTryRestoreAlly @ life dew only heals
add eerie spell, surging strikes, jungle healing
2021-01-28 18:51:00 +01:00
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_JungleHealingCureStatus
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 17:38:54 +02:00
goto BattleScript_JungleHealingTryRestoreAlly
add eerie spell, surging strikes, jungle healing
2021-01-28 18:51:00 +01:00
BattleScript_JungleHealingCureStatus:
curestatus BS_TARGET
updatestatusicon BS_TARGET
printstring STRINGID_PKMNSTATUSNORMAL
waitmessage 0x40
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 17:38:54 +02:00
BattleScript_JungleHealingTryRestoreAlly:
add eerie spell, surging strikes, jungle healing
2021-01-28 18:51:00 +01:00
jumpifbyte CMP_NOT_EQUAL, gBattleCommunication, 0x0, BattleScript_MoveEnd
addbyte gBattleCommunication, 1
jumpifnoally BS_TARGET, BattleScript_MoveEnd
setallytonexttarget JungleHealing_RestoreTargetHealth
goto BattleScript_MoveEnd
merge with be
2021-09-16 19:12:59 +02:00
=======
Remove address comments
2021-07-20 21:18:31 +02:00
gBattleScriptsForMoveEffects::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-12 01:33:10 +02:00
.4byte BattleScript_EffectHit @ EFFECT_HIT
.4byte BattleScript_EffectSleep @ EFFECT_SLEEP
.4byte BattleScript_EffectPoisonHit @ EFFECT_POISON_HIT
.4byte BattleScript_EffectAbsorb @ EFFECT_ABSORB
.4byte BattleScript_EffectBurnHit @ EFFECT_BURN_HIT
.4byte BattleScript_EffectFreezeHit @ EFFECT_FREEZE_HIT
.4byte BattleScript_EffectParalyzeHit @ EFFECT_PARALYZE_HIT
.4byte BattleScript_EffectExplosion @ EFFECT_EXPLOSION
.4byte BattleScript_EffectDreamEater @ EFFECT_DREAM_EATER
.4byte BattleScript_EffectMirrorMove @ EFFECT_MIRROR_MOVE
.4byte BattleScript_EffectAttackUp @ EFFECT_ATTACK_UP
.4byte BattleScript_EffectDefenseUp @ EFFECT_DEFENSE_UP
.4byte BattleScript_EffectSpeedUp @ EFFECT_SPEED_UP
.4byte BattleScript_EffectSpecialAttackUp @ EFFECT_SPECIAL_ATTACK_UP
.4byte BattleScript_EffectSpecialDefenseUp @ EFFECT_SPECIAL_DEFENSE_UP
.4byte BattleScript_EffectAccuracyUp @ EFFECT_ACCURACY_UP
.4byte BattleScript_EffectEvasionUp @ EFFECT_EVASION_UP
.4byte BattleScript_EffectSpecialAttackUp3 @ EFFECT_SPECIAL_ATTACK_UP_3
.4byte BattleScript_EffectAttackDown @ EFFECT_ATTACK_DOWN
.4byte BattleScript_EffectDefenseDown @ EFFECT_DEFENSE_DOWN
.4byte BattleScript_EffectSpeedDown @ EFFECT_SPEED_DOWN
.4byte BattleScript_EffectSpecialAttackDown @ EFFECT_SPECIAL_ATTACK_DOWN
.4byte BattleScript_EffectSpecialDefenseDown @ EFFECT_SPECIAL_DEFENSE_DOWN
.4byte BattleScript_EffectAccuracyDown @ EFFECT_ACCURACY_DOWN
.4byte BattleScript_EffectEvasionDown @ EFFECT_EVASION_DOWN
.4byte BattleScript_EffectHaze @ EFFECT_HAZE
.4byte BattleScript_EffectBide @ EFFECT_BIDE
.4byte BattleScript_EffectRampage @ EFFECT_RAMPAGE
.4byte BattleScript_EffectRoar @ EFFECT_ROAR
.4byte BattleScript_EffectMultiHit @ EFFECT_MULTI_HIT
.4byte BattleScript_EffectConversion @ EFFECT_CONVERSION
.4byte BattleScript_EffectFlinchHit @ EFFECT_FLINCH_HIT
.4byte BattleScript_EffectRestoreHp @ EFFECT_RESTORE_HP
.4byte BattleScript_EffectToxic @ EFFECT_TOXIC
.4byte BattleScript_EffectPayDay @ EFFECT_PAY_DAY
.4byte BattleScript_EffectLightScreen @ EFFECT_LIGHT_SCREEN
.4byte BattleScript_EffectTriAttack @ EFFECT_TRI_ATTACK
.4byte BattleScript_EffectRest @ EFFECT_REST
.4byte BattleScript_EffectOHKO @ EFFECT_OHKO
.4byte BattleScript_EffectHit @ EFFECT_FUSION_COMBO
.4byte BattleScript_EffectSuperFang @ EFFECT_SUPER_FANG
.4byte BattleScript_EffectDragonRage @ EFFECT_DRAGON_RAGE
.4byte BattleScript_EffectTrap @ EFFECT_TRAP
.4byte BattleScript_EffectHealBlock @ EFFECT_HEAL_BLOCK
.4byte BattleScript_EffectDoubleHit @ EFFECT_DOUBLE_HIT
.4byte BattleScript_EffectRecoilIfMiss @ EFFECT_RECOIL_IF_MISS
.4byte BattleScript_EffectMist @ EFFECT_MIST
.4byte BattleScript_EffectFocusEnergy @ EFFECT_FOCUS_ENERGY
.4byte BattleScript_EffectRecoil25 @ EFFECT_RECOIL_25
.4byte BattleScript_EffectConfuse @ EFFECT_CONFUSE
.4byte BattleScript_EffectAttackUp2 @ EFFECT_ATTACK_UP_2
.4byte BattleScript_EffectDefenseUp2 @ EFFECT_DEFENSE_UP_2
.4byte BattleScript_EffectSpeedUp2 @ EFFECT_SPEED_UP_2
.4byte BattleScript_EffectSpecialAttackUp2 @ EFFECT_SPECIAL_ATTACK_UP_2
.4byte BattleScript_EffectSpecialDefenseUp2 @ EFFECT_SPECIAL_DEFENSE_UP_2
.4byte BattleScript_EffectAccuracyUp2 @ EFFECT_ACCURACY_UP_2
.4byte BattleScript_EffectEvasionUp2 @ EFFECT_EVASION_UP_2
.4byte BattleScript_EffectTransform @ EFFECT_TRANSFORM
.4byte BattleScript_EffectAttackDown2 @ EFFECT_ATTACK_DOWN_2
.4byte BattleScript_EffectDefenseDown2 @ EFFECT_DEFENSE_DOWN_2
.4byte BattleScript_EffectSpeedDown2 @ EFFECT_SPEED_DOWN_2
.4byte BattleScript_EffectSpecialAttackDown2 @ EFFECT_SPECIAL_ATTACK_DOWN_2
.4byte BattleScript_EffectSpecialDefenseDown2 @ EFFECT_SPECIAL_DEFENSE_DOWN_2
.4byte BattleScript_EffectAccuracyDown2 @ EFFECT_ACCURACY_DOWN_2
.4byte BattleScript_EffectEvasionDown2 @ EFFECT_EVASION_DOWN_2
.4byte BattleScript_EffectReflect @ EFFECT_REFLECT
.4byte BattleScript_EffectPoison @ EFFECT_POISON
.4byte BattleScript_EffectParalyze @ EFFECT_PARALYZE
.4byte BattleScript_EffectAttackDownHit @ EFFECT_ATTACK_DOWN_HIT
.4byte BattleScript_EffectDefenseDownHit @ EFFECT_DEFENSE_DOWN_HIT
.4byte BattleScript_EffectSpeedDownHit @ EFFECT_SPEED_DOWN_HIT
.4byte BattleScript_EffectSpecialAttackDownHit @ EFFECT_SPECIAL_ATTACK_DOWN_HIT
.4byte BattleScript_EffectSpecialDefenseDownHit @ EFFECT_SPECIAL_DEFENSE_DOWN_HIT
.4byte BattleScript_EffectAccuracyDownHit @ EFFECT_ACCURACY_DOWN_HIT
.4byte BattleScript_EffectHit @ EFFECT_EVASION_DOWN_HIT
.4byte BattleScript_EffectTwoTurnsAttack @ EFFECT_TWO_TURNS_ATTACK
.4byte BattleScript_EffectConfuseHit @ EFFECT_CONFUSE_HIT
.4byte BattleScript_EffectTwineedle @ EFFECT_TWINEEDLE
.4byte BattleScript_EffectHit @ EFFECT_VITAL_THROW
.4byte BattleScript_EffectSubstitute @ EFFECT_SUBSTITUTE
.4byte BattleScript_EffectRecharge @ EFFECT_RECHARGE
.4byte BattleScript_EffectRage @ EFFECT_RAGE
.4byte BattleScript_EffectMimic @ EFFECT_MIMIC
.4byte BattleScript_EffectMetronome @ EFFECT_METRONOME
.4byte BattleScript_EffectLeechSeed @ EFFECT_LEECH_SEED
.4byte BattleScript_EffectDoNothing @ EFFECT_DO_NOTHING
.4byte BattleScript_EffectDisable @ EFFECT_DISABLE
.4byte BattleScript_EffectLevelDamage @ EFFECT_LEVEL_DAMAGE
.4byte BattleScript_EffectPsywave @ EFFECT_PSYWAVE
.4byte BattleScript_EffectCounter @ EFFECT_COUNTER
.4byte BattleScript_EffectEncore @ EFFECT_ENCORE
.4byte BattleScript_EffectPainSplit @ EFFECT_PAIN_SPLIT
.4byte BattleScript_EffectSnore @ EFFECT_SNORE
.4byte BattleScript_EffectConversion2 @ EFFECT_CONVERSION_2
.4byte BattleScript_EffectLockOn @ EFFECT_LOCK_ON
.4byte BattleScript_EffectSketch @ EFFECT_SKETCH
.4byte BattleScript_EffectHammerArm @ EFFECT_HAMMER_ARM
.4byte BattleScript_EffectSleepTalk @ EFFECT_SLEEP_TALK
.4byte BattleScript_EffectDestinyBond @ EFFECT_DESTINY_BOND
.4byte BattleScript_EffectHit @ EFFECT_FLAIL
.4byte BattleScript_EffectSpite @ EFFECT_SPITE
.4byte BattleScript_EffectHit @ EFFECT_FALSE_SWIPE
.4byte BattleScript_EffectHealBell @ EFFECT_HEAL_BELL
.4byte BattleScript_EffectHit @ EFFECT_ALWAYS_CRIT
.4byte BattleScript_EffectTripleKick @ EFFECT_TRIPLE_KICK
.4byte BattleScript_EffectThief @ EFFECT_THIEF
.4byte BattleScript_EffectMeanLook @ EFFECT_MEAN_LOOK
.4byte BattleScript_EffectNightmare @ EFFECT_NIGHTMARE
.4byte BattleScript_EffectMinimize @ EFFECT_MINIMIZE
.4byte BattleScript_EffectCurse @ EFFECT_CURSE
.4byte BattleScript_EffectHealingWish @ EFFECT_HEALING_WISH
.4byte BattleScript_EffectProtect @ EFFECT_PROTECT
.4byte BattleScript_EffectSpikes @ EFFECT_SPIKES
.4byte BattleScript_EffectForesight @ EFFECT_FORESIGHT
.4byte BattleScript_EffectPerishSong @ EFFECT_PERISH_SONG
.4byte BattleScript_EffectSandstorm @ EFFECT_SANDSTORM
.4byte BattleScript_EffectEndure @ EFFECT_ENDURE
.4byte BattleScript_EffectRollout @ EFFECT_ROLLOUT
.4byte BattleScript_EffectSwagger @ EFFECT_SWAGGER
.4byte BattleScript_EffectFuryCutter @ EFFECT_FURY_CUTTER
.4byte BattleScript_EffectAttract @ EFFECT_ATTRACT
.4byte BattleScript_EffectHit @ EFFECT_RETURN
.4byte BattleScript_EffectPresent @ EFFECT_PRESENT
.4byte BattleScript_EffectHit @ EFFECT_FRUSTRATION
.4byte BattleScript_EffectSafeguard @ EFFECT_SAFEGUARD
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_125
.4byte BattleScript_EffectMagnitude @ EFFECT_MAGNITUDE
.4byte BattleScript_EffectBatonPass @ EFFECT_BATON_PASS
.4byte BattleScript_EffectHit @ EFFECT_PURSUIT
.4byte BattleScript_EffectRapidSpin @ EFFECT_RAPID_SPIN
.4byte BattleScript_EffectSonicboom @ EFFECT_SONICBOOM
.4byte BattleScript_EffectCaptivate @ EFFECT_CAPTIVATE
.4byte BattleScript_EffectMorningSun @ EFFECT_MORNING_SUN
.4byte BattleScript_EffectSynthesis @ EFFECT_SYNTHESIS
.4byte BattleScript_EffectMoonlight @ EFFECT_MOONLIGHT
.4byte BattleScript_EffectHit @ EFFECT_HIDDEN_POWER
.4byte BattleScript_EffectRainDance @ EFFECT_RAIN_DANCE
.4byte BattleScript_EffectSunnyDay @ EFFECT_SUNNY_DAY
.4byte BattleScript_EffectDefenseUpHit @ EFFECT_DEFENSE_UP_HIT
.4byte BattleScript_EffectAttackUpHit @ EFFECT_ATTACK_UP_HIT
.4byte BattleScript_EffectAllStatsUpHit @ EFFECT_ALL_STATS_UP_HIT
.4byte BattleScript_EffectHit @ EFFECT_FELL_STINGER
.4byte BattleScript_EffectBellyDrum @ EFFECT_BELLY_DRUM
.4byte BattleScript_EffectPsychUp @ EFFECT_PSYCH_UP
.4byte BattleScript_EffectMirrorCoat @ EFFECT_MIRROR_COAT
.4byte BattleScript_EffectSkullBash @ EFFECT_SKULL_BASH
.4byte BattleScript_EffectTwister @ EFFECT_TWISTER
.4byte BattleScript_EffectEarthquake @ EFFECT_EARTHQUAKE
.4byte BattleScript_EffectFutureSight @ EFFECT_FUTURE_SIGHT
.4byte BattleScript_EffectGust @ EFFECT_GUST
.4byte BattleScript_EffectStomp @ EFFECT_FLINCH_MINIMIZE_HIT
.4byte BattleScript_EffectSolarbeam @ EFFECT_SOLARBEAM
.4byte BattleScript_EffectThunder @ EFFECT_THUNDER
.4byte BattleScript_EffectTeleport @ EFFECT_TELEPORT
.4byte BattleScript_EffectBeatUp @ EFFECT_BEAT_UP
.4byte BattleScript_EffectSemiInvulnerable @ EFFECT_SEMI_INVULNERABLE
.4byte BattleScript_EffectDefenseCurl @ EFFECT_DEFENSE_CURL
.4byte BattleScript_EffectSoftboiled @ EFFECT_SOFTBOILED
.4byte BattleScript_EffectFakeOut @ EFFECT_FAKE_OUT
.4byte BattleScript_EffectUproar @ EFFECT_UPROAR
.4byte BattleScript_EffectStockpile @ EFFECT_STOCKPILE
.4byte BattleScript_EffectSpitUp @ EFFECT_SPIT_UP
.4byte BattleScript_EffectSwallow @ EFFECT_SWALLOW
.4byte BattleScript_EffectWorrySeed @ EFFECT_WORRY_SEED
.4byte BattleScript_EffectHail @ EFFECT_HAIL
.4byte BattleScript_EffectTorment @ EFFECT_TORMENT
.4byte BattleScript_EffectFlatter @ EFFECT_FLATTER
.4byte BattleScript_EffectWillOWisp @ EFFECT_WILL_O_WISP
.4byte BattleScript_EffectMemento @ EFFECT_MEMENTO
.4byte BattleScript_EffectHit @ EFFECT_FACADE
.4byte BattleScript_EffectFocusPunch @ EFFECT_FOCUS_PUNCH
.4byte BattleScript_EffectSmellingsalt @ EFFECT_SMELLINGSALT
.4byte BattleScript_EffectFollowMe @ EFFECT_FOLLOW_ME
.4byte BattleScript_EffectNaturePower @ EFFECT_NATURE_POWER
.4byte BattleScript_EffectCharge @ EFFECT_CHARGE
.4byte BattleScript_EffectTaunt @ EFFECT_TAUNT
.4byte BattleScript_EffectHelpingHand @ EFFECT_HELPING_HAND
.4byte BattleScript_EffectTrick @ EFFECT_TRICK
.4byte BattleScript_EffectRolePlay @ EFFECT_ROLE_PLAY
.4byte BattleScript_EffectWish @ EFFECT_WISH
.4byte BattleScript_EffectAssist @ EFFECT_ASSIST
.4byte BattleScript_EffectIngrain @ EFFECT_INGRAIN
.4byte BattleScript_EffectSuperpower @ EFFECT_SUPERPOWER
.4byte BattleScript_EffectMagicCoat @ EFFECT_MAGIC_COAT
.4byte BattleScript_EffectRecycle @ EFFECT_RECYCLE
.4byte BattleScript_EffectHit @ EFFECT_REVENGE
.4byte BattleScript_EffectBrickBreak @ EFFECT_BRICK_BREAK
.4byte BattleScript_EffectYawn @ EFFECT_YAWN
.4byte BattleScript_EffectKnockOff @ EFFECT_KNOCK_OFF
.4byte BattleScript_EffectEndeavor @ EFFECT_ENDEAVOR
.4byte BattleScript_EffectHit @ EFFECT_ERUPTION
.4byte BattleScript_EffectSkillSwap @ EFFECT_SKILL_SWAP
.4byte BattleScript_EffectImprison @ EFFECT_IMPRISON
.4byte BattleScript_EffectRefresh @ EFFECT_REFRESH
.4byte BattleScript_EffectGrudge @ EFFECT_GRUDGE
.4byte BattleScript_EffectSnatch @ EFFECT_SNATCH
.4byte BattleScript_EffectHit @ EFFECT_LOW_KICK
.4byte BattleScript_EffectSecretPower @ EFFECT_SECRET_POWER
.4byte BattleScript_EffectRecoil33 @ EFFECT_RECOIL_33
.4byte BattleScript_EffectTeeterDance @ EFFECT_TEETER_DANCE
.4byte BattleScript_EffectHitEscape @ EFFECT_HIT_ESCAPE
.4byte BattleScript_EffectMudSport @ EFFECT_MUD_SPORT
.4byte BattleScript_EffectPoisonFang @ EFFECT_POISON_FANG
.4byte BattleScript_EffectHit @ EFFECT_WEATHER_BALL
.4byte BattleScript_EffectOverheat @ EFFECT_OVERHEAT
.4byte BattleScript_EffectTickle @ EFFECT_TICKLE
.4byte BattleScript_EffectCosmicPower @ EFFECT_COSMIC_POWER
.4byte BattleScript_EffectSkyUppercut @ EFFECT_SKY_UPPERCUT
.4byte BattleScript_EffectBulkUp @ EFFECT_BULK_UP
.4byte BattleScript_EffectPlaceholder @ EFFECT_PLACEHOLDER
.4byte BattleScript_EffectWaterSport @ EFFECT_WATER_SPORT
.4byte BattleScript_EffectCalmMind @ EFFECT_CALM_MIND
.4byte BattleScript_EffectDragonDance @ EFFECT_DRAGON_DANCE
.4byte BattleScript_EffectCamouflage @ EFFECT_CAMOUFLAGE
.4byte BattleScript_EffectHit @ EFFECT_PLEDGE
.4byte BattleScript_EffectHit @ EFFECT_FLING
.4byte BattleScript_EffectNaturalGift @ EFFECT_NATURAL_GIFT
.4byte BattleScript_EffectWakeUpSlap @ EFFECT_WAKE_UP_SLAP
.4byte BattleScript_EffectHit @ EFFECT_WRING_OUT
.4byte BattleScript_EffectHit @ EFFECT_HEX
.4byte BattleScript_EffectHit @ EFFECT_ASSURANCE
.4byte BattleScript_EffectHit @ EFFECT_TRUMP_CARD
.4byte BattleScript_EffectHit @ EFFECT_ACROBATICS
.4byte BattleScript_EffectHit @ EFFECT_HEAT_CRASH
.4byte BattleScript_EffectHit @ EFFECT_PUNISHMENT
.4byte BattleScript_EffectHit @ EFFECT_STORED_POWER
.4byte BattleScript_EffectHit @ EFFECT_ELECTRO_BALL
.4byte BattleScript_EffectHit @ EFFECT_GYRO_BALL
.4byte BattleScript_EffectHit @ EFFECT_ECHOED_VOICE
.4byte BattleScript_EffectHit @ EFFECT_PAYBACK
.4byte BattleScript_EffectHit @ EFFECT_ROUND
.4byte BattleScript_EffectHit @ EFFECT_BRINE
.4byte BattleScript_EffectHit @ EFFECT_VENOSHOCK
.4byte BattleScript_EffectHit @ EFFECT_RETALITATE
.4byte BattleScript_EffectBulldoze @ EFFECT_BULLDOZE
.4byte BattleScript_EffectHit @ EFFECT_FOUL_PLAY
.4byte BattleScript_EffectHit @ EFFECT_PSYSHOCK
.4byte BattleScript_EffectRoost @ EFFECT_ROOST
.4byte BattleScript_EffectGravity @ EFFECT_GRAVITY
.4byte BattleScript_EffectMircleEye @ EFFECT_MIRACLE_EYE
.4byte BattleScript_EffectTailwind @ EFFECT_TAILWIND
.4byte BattleScript_EffectEmbargo @ EFFECT_EMBARGO
.4byte BattleScript_EffectAquaRing @ EFFECT_AQUA_RING
.4byte BattleScript_EffectTrickRoom @ EFFECT_TRICK_ROOM
.4byte BattleScript_EffectWonderRoom @ EFFECT_WONDER_ROOM
.4byte BattleScript_EffectMagicRoom @ EFFECT_MAGIC_ROOM
.4byte BattleScript_EffectMagnetRise @ EFFECT_MAGNET_RISE
.4byte BattleScript_EffectToxicSpikes @ EFFECT_TOXIC_SPIKES
.4byte BattleScript_EffectGastroAcid @ EFFECT_GASTRO_ACID
.4byte BattleScript_EffectStealthRock @ EFFECT_STEALTH_ROCK
.4byte BattleScript_EffectTelekinesis @ EFFECT_TELEKINESIS
.4byte BattleScript_EffectPowerSwap @ EFFECT_POWER_SWAP
.4byte BattleScript_EffectGuardSwap @ EFFECT_GUARD_SWAP
.4byte BattleScript_EffectHeartSwap @ EFFECT_HEART_SWAP
.4byte BattleScript_EffectPowerSplit @ EFFECT_POWER_SPLIT
.4byte BattleScript_EffectGuardSplit @ EFFECT_GUARD_SPLIT
.4byte BattleScript_EffectStickyWeb @ EFFECT_STICKY_WEB
.4byte BattleScript_EffectMetalBurst @ EFFECT_METAL_BURST
.4byte BattleScript_EffectLuckyChant @ EFFECT_LUCKY_CHANT
.4byte BattleScript_EffectSuckerPunch @ EFFECT_SUCKER_PUNCH
.4byte BattleScript_EffectSpecialDefenseDownHit2 @ EFFECT_SPECIAL_DEFENSE_DOWN_HIT_2
.4byte BattleScript_EffectSimpleBeam @ EFFECT_SIMPLE_BEAM
.4byte BattleScript_EffectEntrainment @ EFFECT_ENTRAINMENT
.4byte BattleScript_EffectHealPulse @ EFFECT_HEAL_PULSE
.4byte BattleScript_EffectQuash @ EFFECT_QUASH
.4byte BattleScript_EffectIonDeluge @ EFFECT_ION_DELUGE
.4byte BattleScript_EffectFreezeHit @ EFFECT_FREEZE_DRY
.4byte BattleScript_EffectTopsyTurvy @ EFFECT_TOPSY_TURVY
.4byte BattleScript_EffectMistyTerrain @ EFFECT_MISTY_TERRAIN
.4byte BattleScript_EffectGrassyTerrain @ EFFECT_GRASSY_TERRAIN
.4byte BattleScript_EffectElectricTerrain @ EFFECT_ELECTRIC_TERRAIN
.4byte BattleScript_EffectPsychicTerrain @ EFFECT_PSYCHIC_TERRAIN
.4byte BattleScript_EffectAttackAccUp @ EFFECT_ATTACK_ACCURACY_UP
.4byte BattleScript_EffectAttackSpAttackUp @ EFFECT_ATTACK_SPATK_UP
.4byte BattleScript_EffectHurricane @ EFFECT_HURRICANE
.4byte BattleScript_EffectHit @ EFFECT_TWO_TYPED_MOVE
.4byte BattleScript_EffectMeFirst @ EFFECT_ME_FIRST
.4byte BattleScript_EffectSpeedUpHit @ EFFECT_SPEED_UP_HIT
.4byte BattleScript_EffectQuiverDance @ EFFECT_QUIVER_DANCE
.4byte BattleScript_EffectCoil @ EFFECT_COIL
.4byte BattleScript_EffectElectrify @ EFFECT_ELECTRIFY
.4byte BattleScript_EffectBurnHit @ EFFECT_SCALD
.4byte BattleScript_EffectReflectType @ EFFECT_REFLECT_TYPE
.4byte BattleScript_EffectSoak @ EFFECT_SOAK
.4byte BattleScript_EffectGrowth @ EFFECT_GROWTH
.4byte BattleScript_EffectCloseCombat @ EFFECT_CLOSE_COMBAT
.4byte BattleScript_EffectLastResort @ EFFECT_LAST_RESORT
.4byte BattleScript_EffectRecoil33WithStatus @ EFFECT_RECOIL_33_STATUS
.4byte BattleScript_EffectFlinchWithStatus @ EFFECT_FLINCH_STATUS
.4byte BattleScript_EffectRecoil50 @ EFFECT_RECOIL_50
.4byte BattleScript_EffectShellSmash @ EFFECT_SHELL_SMASH
.4byte BattleScript_EffectShiftGear @ EFFECT_SHIFT_GEAR
.4byte BattleScript_EffectDefenseUp3 @ EFFECT_DEFENSE_UP_3
.4byte BattleScript_EffectNobleRoar @ EFFECT_NOBLE_ROAR
.4byte BattleScript_EffectVenomDrench @ EFFECT_VENOM_DRENCH
.4byte BattleScript_EffectToxicThread @ EFFECT_TOXIC_THREAD
.4byte BattleScript_EffectClearSmog @ EFFECT_CLEAR_SMOG
.4byte BattleScript_EffectHitSwitchTarget @ EFFECT_HIT_SWITCH_TARGET
.4byte BattleScript_EffectFinalGambit @ EFFECT_FINAL_GAMBIT
.4byte BattleScript_EffectHit @ EFFECT_CHANGE_TYPE_ON_ITEM
.4byte BattleScript_EffectAutotomize @ EFFECT_AUTOTOMIZE
.4byte BattleScript_EffectCopycat @ EFFECT_COPYCAT
.4byte BattleScript_EffectDefog @ EFFECT_DEFOG
.4byte BattleScript_EffectHitEnemyHealAlly @ EFFECT_HIT_ENEMY_HEAL_ALLY
.4byte BattleScript_EffectSmackDown @ EFFECT_SMACK_DOWN
.4byte BattleScript_EffectSynchronoise @ EFFECT_SYNCHRONOISE
.4byte BattleScript_EffectPsychoShift @ EFFECT_PSYCHO_SHIFT
.4byte BattleScript_EffectPowerTrick @ EFFECT_POWER_TRICK
.4byte BattleScript_EffectFlameBurst @ EFFECT_FLAME_BURST
.4byte BattleScript_EffectAfterYou @ EFFECT_AFTER_YOU
.4byte BattleScript_EffectBestow @ EFFECT_BESTOW
.4byte BattleScript_EffectRototiller @ EFFECT_ROTOTILLER
.4byte BattleScript_EffectFlowerShield @ EFFECT_FLOWER_SHIELD
.4byte BattleScript_EffectHitPreventEscape @ EFFECT_HIT_PREVENT_ESCAPE
.4byte BattleScript_EffectSpeedSwap @ EFFECT_SPEED_SWAP
.4byte BattleScript_EffectDefenseUp2Hit @ EFFECT_DEFENSE_UP2_HIT
.4byte BattleScript_EffectHit @ EFFECT_REVELATION_DANCE
.4byte BattleScript_EffectAuroraVeil @ EFFECT_AURORA_VEIL
.4byte BattleScript_EffectThirdType @ EFFECT_THIRD_TYPE
.4byte BattleScript_EffectFeint @ EFFECT_FEINT
.4byte BattleScript_EffectSparklingAria @ EFFECT_SPARKLING_ARIA
.4byte BattleScript_EffectAcupressure @ EFFECT_ACUPRESSURE
.4byte BattleScript_EffectAromaticMist @ EFFECT_AROMATIC_MIST
.4byte BattleScript_EffectPowder @ EFFECT_POWDER
.4byte BattleScript_EffectSpAtkUpHit @ EFFECT_SP_ATTACK_UP_HIT
.4byte BattleScript_EffectHit @ EFFECT_BELCH
.4byte BattleScript_EffectPartingShot @ EFFECT_PARTING_SHOT
.4byte BattleScript_EffectSpectralThief @ EFFECT_SPECTRAL_THIEF
.4byte BattleScript_EffectVCreate @ EFFECT_V_CREATE
.4byte BattleScript_EffectMatBlock @ EFFECT_MAT_BLOCK
.4byte BattleScript_EffectHit @ EFFECT_STOMPING_TANTRUM
.4byte BattleScript_EffectCoreEnforcer @ EFFECT_CORE_ENFORCER
.4byte BattleScript_EffectInstruct @ EFFECT_INSTRUCT
.4byte BattleScript_EffectThroatChop @ EFFECT_THROAT_CHOP
.4byte BattleScript_EffectLaserFocus @ EFFECT_LASER_FOCUS
.4byte BattleScript_EffectMagneticFlux @ EFFECT_MAGNETIC_FLUX
.4byte BattleScript_EffectGearUp @ EFFECT_GEAR_UP
.4byte BattleScript_EffectIncinerate @ EFFECT_INCINERATE
.4byte BattleScript_EffectBugBite @ EFFECT_BUG_BITE
.4byte BattleScript_EffectStrengthSap @ EFFECT_STRENGTH_SAP
.4byte BattleScript_EffectMindBlown @ EFFECT_MIND_BLOWN
.4byte BattleScript_EffectPurify @ EFFECT_PURIFY
.4byte BattleScript_EffectBurnUp @ EFFECT_BURN_UP
.4byte BattleScript_EffectShoreUp @ EFFECT_SHORE_UP
.4byte BattleScript_EffectGeomancy @ EFFECT_GEOMANCY
.4byte BattleScript_EffectFairyLock @ EFFECT_FAIRY_LOCK
.4byte BattleScript_EffectAllySwitch @ EFFECT_ALLY_SWITCH
.4byte BattleScript_EffectSleepHit @ EFFECT_SLEEP_HIT
.4byte BattleScript_EffectAttackerDefenseDownHit @ EFFECT_ATTACKER_DEFENSE_DOWN_HIT
.4byte BattleScript_EffectHit @ EFFECT_BODY_PRESS
merge with be
2021-09-16 19:12:59 +02:00
>>>>>>> 0cd7f3ffcde00002691719ae33b4fa0516662acf
Implemented Relic Song's effect
2020-06-16 12:06:38 +02:00
Implemented Clanging Scales' effect
2021-05-09 23:15:24 +02:00
BattleScript_EffectAttackerDefenseDownHit:
Added the MOVE_EFFECT_CERTAIN arg to BattleScript_EffectAttackerDefenseDownHit Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-06-02 21:42:02 +02:00
setmoveeffect MOVE_EFFECT_DEF_MINUS_1 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
Implemented Clanging Scales' effect
2021-05-09 23:15:24 +02:00
goto BattleScript_EffectHit
Implemented Relic Song's effect
2020-06-16 12:06:38 +02:00
BattleScript_EffectSleepHit:
setmoveeffect MOVE_EFFECT_SLEEP
goto BattleScript_EffectHit
Ally Switch, tbd
2020-04-20 20:05:04 +02:00
BattleScript_EffectAllySwitch:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
jumpifnoally BS_ATTACKER, BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_ALLYSWITCHPOSITION
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Ally Switch, tbd
2020-04-20 20:05:04 +02:00
goto BattleScript_MoveEnd
Fairy Lock
2020-04-20 19:41:07 +02:00
BattleScript_EffectFairyLock:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
trysetfairylock BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_NOONEWILLBEABLETORUNAWAY
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Fairy Lock
2020-04-20 19:41:07 +02:00
goto BattleScript_MoveEnd
Burn Up And Purify
2020-04-17 21:14:26 +02:00
BattleScript_EffectBurnUp:
attackcanceler
attackstring
ppreduce
jumpiftype BS_ATTACKER, TYPE_FIRE, BattleScript_BurnUpWorks
goto BattleScript_ButItFailed
BattleScript_BurnUpWorks:
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Burn Up And Purify
2020-04-17 21:14:26 +02:00
resultmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Burn Up And Purify
2020-04-17 21:14:26 +02:00
losetype BS_ATTACKER, TYPE_FIRE
printstring STRINGID_ATTACKERLOSTFIRETYPE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Burn Up And Purify
2020-04-17 21:14:26 +02:00
tryfaintmon BS_TARGET, FALSE, NULL
goto BattleScript_MoveEnd
BattleScript_EffectPurify:
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_PurifyWorks
goto BattleScript_ButItFailed
BattleScript_PurifyWorks:
attackanimation
waitanimation
curestatus BS_TARGET
updatestatusicon BS_TARGET
printstring STRINGID_ATTACKERCUREDTARGETSTATUS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Burn Up And Purify
2020-04-17 21:14:26 +02:00
tryhealhalfhealth BattleScript_AlreadyAtFullHp, BS_ATTACKER
goto BattleScript_RestoreHp
Big Root and STRENGTH Sap
2020-04-13 15:00:17 +02:00
BattleScript_EffectStrengthSap:
setstatchanger STAT_ATK, 1, TRUE
attackcanceler
jumpifsubstituteblocks BattleScript_ButItFailedAtkStringPpReduce
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_ATK, MIN_STAT_STAGE, BattleScript_StrengthSapTryLower
pause B_WAIT_TIME_SHORT
Big Root and STRENGTH Sap
2020-04-13 15:00:17 +02:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_MoveEnd
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Big Root and STRENGTH Sap
2020-04-13 15:00:17 +02:00
goto BattleScript_MoveEnd
BattleScript_StrengthSapTryLower:
getstatvalue BS_TARGET, STAT_ATK
jumpiffullhp BS_ATTACKER, BattleScript_StrengthSapMustLower
attackanimation
waitanimation
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_StrengthSapHp
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_StrengthSapHp
Big Root and STRENGTH Sap
2020-04-13 15:00:17 +02:00
BattleScript_StrengthSapLower:
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Big Root and STRENGTH Sap
2020-04-13 15:00:17 +02:00
goto BattleScript_StrengthSapHp
@ Drain HP without lowering a stat
BattleScript_StrengthSapTryHp:
jumpiffullhp BS_ATTACKER, BattleScript_ButItFailed
attackanimation
waitanimation
BattleScript_StrengthSapHp:
jumpiffullhp BS_ATTACKER, BattleScript_MoveEnd
manipulatedamage DMG_BIG_ROOT
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_PKMNENERGYDRAINED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Big Root and STRENGTH Sap
2020-04-13 15:00:17 +02:00
goto BattleScript_MoveEnd
BattleScript_StrengthSapMustLower:
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_MoveEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_MoveEnd
Big Root and STRENGTH Sap
2020-04-13 15:00:17 +02:00
attackanimation
waitanimation
goto BattleScript_StrengthSapLower
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Bug Bite
2019-05-23 12:32:14 +02:00
BattleScript_EffectBugBite:
setmoveeffect MOVE_EFFECT_BUG_BITE | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Incinerate
2019-05-10 15:12:33 +02:00
BattleScript_EffectIncinerate:
setmoveeffect MOVE_EFFECT_INCINERATE | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Incinerate
2019-05-10 15:12:33 +02:00
BattleScript_MoveEffectIncinerate::
printstring STRINGID_INCINERATEBURN
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Incinerate
2019-05-10 15:12:33 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Bug Bite
2019-05-23 12:32:14 +02:00
BattleScript_MoveEffectBugBite::
printstring STRINGID_BUGBITE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Bug Bite
2019-05-23 12:32:14 +02:00
return
Three pointless moves Celebrate, Hold Hands and Happy Hour. Yay(!) Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money. Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-03 21:33:37 +02:00
Core Enforcer New code - uses Gastro Acid script instead through own move effect
2019-04-15 16:55:37 +02:00
BattleScript_EffectCoreEnforcer:
setmoveeffect MOVE_EFFECT_CORE_ENFORCER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_MoveEffectCoreEnforcer::
setgastroacid BattleScript_CoreEnforcerRet
printstring STRINGID_PKMNSABILITYSUPPRESSED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Core Enforcer New code - uses Gastro Acid script instead through own move effect
2019-04-15 16:55:37 +02:00
BattleScript_CoreEnforcerRet:
return
Three pointless moves Celebrate, Hold Hands and Happy Hour. Yay(!) Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money. Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-03 21:33:37 +02:00
Laser Focus Re-PR'd due to excess "merges"
2019-04-20 21:02:52 +02:00
BattleScript_EffectLaserFocus:
attackcanceler
attackstring
ppreduce
Merge with master
2020-07-27 14:51:39 +02:00
setuserstatus3 STATUS3_LASER_FOCUS, BattleScript_ButItFailed
Laser Focus Re-PR'd due to excess "merges"
2019-04-20 21:02:52 +02:00
attackanimation
waitanimation
printstring STRINGID_LASERFOCUS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Laser Focus Re-PR'd due to excess "merges"
2019-04-20 21:02:52 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
BattleScript_EffectVCreate:
setmoveeffect MOVE_EFFECT_V_CREATE | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
BattleScript_VCreateStatLoss::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_DEF, MIN_STAT_STAGE, BattleScript_VCreateStatAnim
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPDEF, MIN_STAT_STAGE, BattleScript_VCreateStatAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MIN_STAT_STAGE, BattleScript_VCreateStatLossRet
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
BattleScript_VCreateStatAnim:
setbyte sSTAT_ANIM_PLAYED, FALSE
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF | BIT_SPEED, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
setstatchanger STAT_DEF, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateTrySpDef
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_VCreateTrySpDef
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
BattleScript_VCreateTrySpDef:
setstatchanger STAT_SPDEF, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateTrySpeed
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_VCreateTrySpeed
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
BattleScript_VCreateTrySpeed:
setstatchanger STAT_SPEED, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateStatLossRet
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_VCreateStatLossRet
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
BattleScript_VCreateStatLossRet:
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Spectral Thief effect
2019-02-14 12:15:53 +01:00
BattleScript_SpectralThiefSteal::
printstring STRINGID_SPECTRALTHIEFSTEAL
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Spectral Thief effect
2019-02-14 12:15:53 +01:00
setbyte sB_ANIM_ARG2, 0
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
spectralthiefprintstats
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Spectral Thief effect
2019-02-14 12:15:53 +01:00
BattleScript_EffectSpectralThief:
setmoveeffect MOVE_EFFECT_SPECTRAL_THIEF
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Parting Shot Effect plus animation (looks like Snarl)
2019-02-05 22:47:50 +01:00
BattleScript_EffectPartingShot::
attackcanceler
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, MIN_STAT_STAGE, BattleScript_EffectPartingShotTryAtk
jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPATK, MIN_STAT_STAGE, BattleScript_CantLowerMultipleStats
Parting Shot Effect plus animation (looks like Snarl)
2019-02-05 22:47:50 +01:00
BattleScript_EffectPartingShotTryAtk:
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
Parting Shot Effect plus animation (looks like Snarl)
2019-02-05 22:47:50 +01:00
setstatchanger STAT_ATK, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectPartingShotTrySpAtk
Parting Shot Effect plus animation (looks like Snarl)
2019-02-05 22:47:50 +01:00
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Parting Shot Effect plus animation (looks like Snarl)
2019-02-05 22:47:50 +01:00
BattleScript_EffectPartingShotTrySpAtk:
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE
Parting Shot Effect plus animation (looks like Snarl)
2019-02-05 22:47:50 +01:00
setstatchanger STAT_SPATK, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectPartingShotSwitch
Parting Shot Effect plus animation (looks like Snarl)
2019-02-05 22:47:50 +01:00
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Parting Shot v3
2019-02-09 18:40:04 +01:00
BattleScript_EffectPartingShotSwitch:
Merge with master, add defines to atk49 and statbuffchange commands
2019-03-31 15:19:25 +02:00
moveendall
UTurn Battle Arena no switchin
2020-07-08 17:38:28 +02:00
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_PartingShotEnd
merge
2019-11-10 12:09:14 +01:00
jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_PartingShotEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
openpartyscreen BS_ATTACKER, BattleScript_PartingShotEnd
Parting Shot Effect plus animation (looks like Snarl)
2019-02-05 22:47:50 +01:00
switchoutabilities BS_ATTACKER
waitstate
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
switchhandleorder BS_ATTACKER, 2
Parting Shot v2 With DizzyEgg's amendment
2019-02-09 17:05:59 +01:00
returntoball BS_ATTACKER
Parting Shot Effect plus animation (looks like Snarl)
2019-02-05 22:47:50 +01:00
getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE
waitstate
switchineffects BS_ATTACKER
Parting Shot v2 With DizzyEgg's amendment
2019-02-09 17:05:59 +01:00
BattleScript_PartingShotEnd:
end
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Fix Charge Beam effect
2019-01-27 11:57:13 +01:00
BattleScript_EffectSpAtkUpHit:
setmoveeffect MOVE_EFFECT_SP_ATK_PLUS_1 | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Powder
2018-12-03 12:50:32 +01:00
BattleScript_EffectPowder:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, NO_ACC_CALC_CHECK_LOCK_ON
attackstring
ppreduce
jumpifstatus2 BS_TARGET, STATUS2_POWDER, BattleScript_ButItFailed
setpowder BS_TARGET
attackanimation
waitanimation
printstring STRINGID_COVEREDINPOWDER
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add Powder
2018-12-03 12:50:32 +01:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Aromatic Mist
2018-11-25 12:59:22 +01:00
BattleScript_EffectAromaticMist:
attackcanceler
attackstring
ppreduce
jumpifbyteequal gBattlerTarget, gBattlerAttacker, BattleScript_ButItFailed
jumpiftargetally BattleScript_EffectAromaticMistWorks
goto BattleScript_ButItFailed
BattleScript_EffectAromaticMistWorks:
setstatchanger STAT_SPDEF, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectAromaticMistEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AromaticMistAnim
pause 16
Add Aromatic Mist
2018-11-25 12:59:22 +01:00
printstring STRINGID_TARGETSTATWONTGOHIGHER
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add Aromatic Mist
2018-11-25 12:59:22 +01:00
goto BattleScript_EffectAromaticMistEnd
BattleScript_AromaticMistAnim:
attackanimation
waitanimation
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add Aromatic Mist
2018-11-25 12:59:22 +01:00
BattleScript_EffectAromaticMistEnd:
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
BattleScript_EffectMagneticFlux::
attackcanceler
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte gBattleCommunication, 0
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
BattleScript_EffectMagneticFluxStart:
jumpifability BS_TARGET, ABILITY_MINUS, BattleScript_EffectMagneticFluxCheckStats
jumpifability BS_TARGET, ABILITY_PLUS, BattleScript_EffectMagneticFluxCheckStats
goto BattleScript_EffectMagneticFluxLoop
BattleScript_EffectMagneticFluxCheckStats:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_EffectMagneticFluxTryDef
jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_EffectMagneticFluxLoop
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
BattleScript_EffectMagneticFluxTryDef:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_NOT_EQUAL, gBattleCommunication, 0, BattleScript_EffectMagneticFluxSkipAnim
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
attackanimation
waitanimation
BattleScript_EffectMagneticFluxSkipAnim:
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_TARGET, BIT_DEF | BIT_SPDEF, 0
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
setstatchanger STAT_DEF, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMagneticFluxTrySpDef
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectMagneticFluxTrySpDef
addbyte gBattleCommunication, 1
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
BattleScript_EffectMagneticFluxTrySpDef:
setstatchanger STAT_SPDEF, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMagneticFluxLoop
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectMagneticFluxLoop
addbyte gBattleCommunication, 1
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
BattleScript_EffectMagneticFluxLoop:
jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_EffectMagneticFluxEnd
setallytonexttarget BattleScript_EffectMagneticFluxStart
BattleScript_EffectMagneticFluxEnd:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_NOT_EQUAL, gBattleCommunication, 0, BattleScript_MoveEnd
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
goto BattleScript_ButItFailed
BattleScript_EffectGearUp::
attackcanceler
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte gBattleCommunication, 0
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
BattleScript_EffectGearUpStart:
jumpifability BS_TARGET, ABILITY_MINUS, BattleScript_EffectGearUpCheckStats
jumpifability BS_TARGET, ABILITY_PLUS, BattleScript_EffectGearUpCheckStats
goto BattleScript_EffectGearUpLoop
BattleScript_EffectGearUpCheckStats:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_EffectGearUpTryAtk
jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPATK, MAX_STAT_STAGE, BattleScript_EffectGearUpLoop
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
BattleScript_EffectGearUpTryAtk:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_NOT_EQUAL, gBattleCommunication, 0, BattleScript_EffectGearUpSkipAnim
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
attackanimation
waitanimation
BattleScript_EffectGearUpSkipAnim:
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, 0
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
setstatchanger STAT_ATK, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectGearUpTrySpAtk
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectGearUpTrySpAtk
addbyte gBattleCommunication, 1
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
BattleScript_EffectGearUpTrySpAtk:
setstatchanger STAT_SPATK, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectGearUpLoop
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectGearUpLoop
addbyte gBattleCommunication, 1
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
BattleScript_EffectGearUpLoop:
jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_EffectGearUpEnd
setallytonexttarget BattleScript_EffectGearUpStart
BattleScript_EffectGearUpEnd:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_NOT_EQUAL, gBattleCommunication, 0, BattleScript_MoveEnd
Magnetic Flux + Gear Up Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.
2019-04-20 21:17:56 +02:00
goto BattleScript_ButItFailed
Add Acupressure
2018-11-24 21:06:53 +01:00
BattleScript_EffectAcupressure:
attackcanceler
jumpifbyteequal gBattlerTarget, gBattlerAttacker, BattleScript_EffectAcupressureTry
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_PrintMoveMissed
BattleScript_EffectAcupressureTry:
attackstring
ppreduce
tryaccupressure BS_TARGET, BattleScript_ButItFailed
added acupressure and wring out
2019-07-03 03:02:22 +02:00
attackanimation
waitanimation
Add Acupressure
2018-11-24 21:06:53 +01:00
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
statbuffchange MOVE_EFFECT_CERTAIN, BattleScript_MoveEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
printstring STRINGID_DEFENDERSSTATROSE
waitmessage B_WAIT_TIME_LONG
Add Acupressure
2018-11-24 21:06:53 +01:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Move Effect - Feint
2018-11-24 19:37:10 +01:00
BattleScript_MoveEffectFeint::
printstring STRINGID_FELLFORFEINT
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add Move Effect - Feint
2018-11-24 19:37:10 +01:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Move Effect - Feint
2018-11-24 19:37:10 +01:00
BattleScript_EffectFeint:
setmoveeffect MOVE_EFFECT_FEINT
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add third type
2018-11-17 12:10:24 +01:00
BattleScript_EffectThirdType:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
trysetthirdtype BS_TARGET, BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_THIRDTYPEADDED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add third type
2018-11-17 12:10:24 +01:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Aurora Veil, Revelation Dance, Diamond Storm
2018-11-03 14:35:45 +01:00
BattleScript_EffectDefenseUp2Hit:
setmoveeffect MOVE_EFFECT_DEF_PLUS_2 | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Flower Shield and protect moves
2018-10-06 15:50:35 +02:00
BattleScript_EffectFlowerShield:
attackcanceler
attackstring
ppreduce
selectfirstvalidtarget
BattleScript_FlowerShieldIsAnyGrass:
jumpiftype BS_TARGET, TYPE_GRASS, BattleScript_FlowerShieldLoopStart
jumpifnexttargetvalid BattleScript_FlowerShieldIsAnyGrass
goto BattleScript_ButItFailed
BattleScript_FlowerShieldLoopStart:
selectfirstvalidtarget
BattleScript_FlowerShieldLoop:
movevaluescleanup
jumpiftype BS_TARGET, TYPE_GRASS, BattleScript_FlowerShieldLoop2
goto BattleScript_FlowerShieldMoveTargetEnd
BattleScript_FlowerShieldLoop2:
setstatchanger STAT_DEF, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_FlowerShieldMoveTargetEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_FlowerShieldDoAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_EMPTY, BattleScript_FlowerShieldMoveTargetEnd
pause 21
Flower Shield and protect moves
2018-10-06 15:50:35 +02:00
goto BattleScript_FlowerShieldString
BattleScript_FlowerShieldDoAnim:
attackanimation
waitanimation
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
BattleScript_FlowerShieldString:
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Flower Shield and protect moves
2018-10-06 15:50:35 +02:00
BattleScript_FlowerShieldMoveTargetEnd:
merge
2019-11-10 12:09:14 +01:00
moveendto MOVEEND_NEXT_TARGET
Flower Shield and protect moves
2018-10-06 15:50:35 +02:00
jumpifnexttargetvalid BattleScript_FlowerShieldLoop
end
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
BattleScript_EffectRototiller:
attackcanceler
attackstring
ppreduce
selectfirstvalidtarget
BattleScript_RototillerLoop:
movevaluescleanup
jumpifnotgrounded BS_TARGET, BattleScript_RototillerNoEffect
jumpiftype BS_TARGET, TYPE_GRASS, BattleScript_RototillerLoop2
BattleScript_RototillerNoEffect:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
printstring STRINGID_NOEFFECTONTARGET
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
goto BattleScript_RototillerMoveTargetEnd
BattleScript_RototillerLoop2:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_RototillerDoMoveAnim
jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPATK, MAX_STAT_STAGE, BattleScript_RototillerCantRaiseMultipleStats
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
BattleScript_RototillerDoMoveAnim::
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, 0
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
setstatchanger STAT_ATK, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_RototillerTrySpAtk
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_RototillerTrySpAtk
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
BattleScript_RototillerTrySpAtk::
setstatchanger STAT_SPATK, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_RototillerMoveTargetEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_RototillerMoveTargetEnd
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
BattleScript_RototillerMoveTargetEnd:
merge
2019-11-10 12:09:14 +01:00
moveendto MOVEEND_NEXT_TARGET
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
jumpifnexttargetvalid BattleScript_RototillerLoop
end
BattleScript_RototillerCantRaiseMultipleStats:
printstring STRINGID_STATSWONTINCREASE2
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
goto BattleScript_RototillerMoveTargetEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Bestow
2018-09-30 12:27:51 +02:00
BattleScript_EffectBestow:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, NO_ACC_CALC_CHECK_LOCK_ON
attackstring
ppreduce
jumpifsubstituteblocks BattleScript_ButItFailed
trybestow BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_BESTOWITEMGIVING
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Bestow
2018-09-30 12:27:51 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
After you
2018-09-29 19:37:39 +02:00
BattleScript_EffectAfterYou:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
tryafteryou BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_KINDOFFER
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
After you
2018-09-29 19:37:39 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Psycho Shift, Power Trick, Flame Burst
2018-09-29 18:40:14 +02:00
BattleScript_EffectFlameBurst:
setmoveeffect MOVE_EFFECT_FLAME_BURST | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Psycho Shift, Power Trick, Flame Burst
2018-09-29 18:40:14 +02:00
BattleScript_MoveEffectFlameBurst::
Fix Flame Burst crashing the game
2019-05-23 10:02:04 +02:00
tryfaintmon BS_TARGET, FALSE, NULL
Fix FlameBurst
2021-06-03 09:50:43 +02:00
copybyte sBATTLER, sSAVED_BATTLER
Psycho Shift, Power Trick, Flame Burst
2018-09-29 18:40:14 +02:00
printstring STRINGID_BURSTINGFLAMESHIT
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Fix Flame Burst crashing the game
2019-05-23 10:02:04 +02:00
savetarget
Fix FlameBurst
2021-06-03 09:50:43 +02:00
copybyte gBattlerTarget, sSAVED_BATTLER
Fix Flame Burst crashing the game
2019-05-23 10:02:04 +02:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
tryfaintmon BS_TARGET, FALSE, NULL
restoretarget
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Psycho Shift, Power Trick, Flame Burst
2018-09-29 18:40:14 +02:00
BattleScript_EffectPowerTrick:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
powertrick BS_ATTACKER
attackanimation
waitanimation
printstring STRINGID_PKMNSWITCHEDATKANDDEF
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Psycho Shift, Power Trick, Flame Burst
2018-09-29 18:40:14 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Psycho Shift, Power Trick, Flame Burst
2018-09-29 18:40:14 +02:00
BattleScript_EffectPsychoShift:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
jumpifstatus BS_ATTACKER, STATUS1_ANY, BattleScript_EffectPsychoShiftCanWork
goto BattleScript_ButItFailed
BattleScript_EffectPsychoShiftCanWork:
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
Infiltrator affects mist safeguard
2020-04-23 11:29:19 +02:00
jumpifsafeguard BattleScript_SafeguardProtected
Psycho Shift, Power Trick, Flame Burst
2018-09-29 18:40:14 +02:00
trypsychoshift BattleScript_MoveEnd
attackanimation
waitanimation
Fix Psycho Shift string
2019-10-26 22:39:07 +02:00
copybyte gEffectBattler, gBattlerTarget
Psycho Shift, Power Trick, Flame Burst
2018-09-29 18:40:14 +02:00
printfromtable gStatusConditionsStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Psycho Shift, Power Trick, Flame Burst
2018-09-29 18:40:14 +02:00
statusanimation BS_TARGET
updatestatusicon BS_TARGET
curestatus BS_ATTACKER
printstring STRINGID_PKMNSTATUSNORMAL
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Psycho Shift, Power Trick, Flame Burst
2018-09-29 18:40:14 +02:00
updatestatusicon BS_ATTACKER
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
BattleScript_EffectSynchronoise:
attackcanceler
attackstring
ppreduce
selectfirstvalidtarget
BattleScript_SynchronoiseLoop:
movevaluescleanup
jumpifcantusesynchronoise BattleScript_SynchronoiseNoEffect
accuracycheck BattleScript_SynchronoiseMissed, ACC_CURR_MOVE
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
resultmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
printstring STRINGID_EMPTYSTRING3
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage 1
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
tryfaintmon BS_TARGET, FALSE, NULL
BattleScript_SynchronoiseMoveTargetEnd:
merge
2019-11-10 12:09:14 +01:00
moveendto MOVEEND_NEXT_TARGET
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
jumpifnexttargetvalid BattleScript_SynchronoiseLoop
end
BattleScript_SynchronoiseMissed:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
resultmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
goto BattleScript_SynchronoiseMoveTargetEnd
BattleScript_SynchronoiseNoEffect:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
printstring STRINGID_NOEFFECTONTARGET
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
goto BattleScript_SynchronoiseMoveTargetEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
BattleScript_EffectSmackDown:
setmoveeffect MOVE_EFFECT_SMACK_DOWN
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
BattleScript_MoveEffectSmackDown::
printstring STRINGID_FELLSTRAIGHTDOWN
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Pollen Puff effect
2018-09-29 14:10:53 +02:00
BattleScript_EffectHitEnemyHealAlly:
jumpiftargetally BattleScript_EffectHealPulse
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Defog
2018-09-23 19:03:53 +02:00
BattleScript_EffectDefog:
setstatchanger STAT_EVASION, 1, TRUE
attackcanceler
jumpifsubstituteblocks BattleScript_DefogIfCanClearHazards
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_EVASION, MIN_STAT_STAGE, BattleScript_DefogWorks
Defog
2018-09-23 19:03:53 +02:00
BattleScript_DefogIfCanClearHazards:
defogclear BS_ATTACKER, FALSE, BattleScript_ButItFailedAtkStringPpReduce
BattleScript_DefogWorks:
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_DefogTryHazardsWithAnim
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_DefogDoAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_DefogTryHazardsWithAnim
pause B_WAIT_TIME_SHORT
Defog
2018-09-23 19:03:53 +02:00
goto BattleScript_DefogPrintString
BattleScript_DefogDoAnim::
attackanimation
waitanimation
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
BattleScript_DefogPrintString::
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Defog
2018-09-23 19:03:53 +02:00
BattleScript_DefogTryHazards::
copybyte gEffectBattler, gBattlerAttacker
defogclear BS_ATTACKER, TRUE, NULL
copybyte gBattlerAttacker, gEffectBattler
goto BattleScript_MoveEnd
BattleScript_DefogTryHazardsWithAnim:
attackanimation
waitanimation
goto BattleScript_DefogTryHazards
Add Copycat
2018-09-22 18:37:03 +02:00
BattleScript_EffectCopycat:
attackcanceler
attackstring
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause 5
Add Copycat
2018-09-22 18:37:03 +02:00
trycopycat BattleScript_CopycatFail
attackanimation
waitanimation
random move to called move
2018-09-22 19:27:56 +02:00
jumptocalledmove TRUE
Add Copycat
2018-09-22 18:37:03 +02:00
BattleScript_CopycatFail:
ppreduce
goto BattleScript_ButItFailed
Instruct Re-PR'd due to excess "merges"
2019-04-20 21:11:49 +02:00
BattleScript_EffectInstruct:
attackcanceler
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause 5
Instruct Re-PR'd due to excess "merges"
2019-04-20 21:11:49 +02:00
tryinstruct BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_USEDINSTRUCTEDMOVE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
setbyte sB_ANIM_TURN, 0
setbyte sB_ANIM_TARGETS_HIT, 0
Instruct Re-PR'd due to excess "merges"
2019-04-20 21:11:49 +02:00
jumptocalledmove TRUE
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Some cleanup (#454) * Toxic Thread doesn't have power. * Added missing commas. * Autotomize typo. It wasn't until today that I learned that autotomize was a word.
2020-06-27 11:21:13 +02:00
BattleScript_EffectAutotomize:
Techno Blast and Autotomize
2018-09-22 17:27:51 +02:00
setstatchanger STAT_SPEED, 2, FALSE
attackcanceler
attackstring
ppreduce
Some cleanup (#454) * Toxic Thread doesn't have power. * Added missing commas. * Autotomize typo. It wasn't until today that I learned that autotomize was a word.
2020-06-27 11:21:13 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AutotomizeWeightLoss
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AutotomizeAttackAnim
pause B_WAIT_TIME_SHORT
Some cleanup (#454) * Toxic Thread doesn't have power. * Added missing commas. * Autotomize typo. It wasn't until today that I learned that autotomize was a word.
2020-06-27 11:21:13 +02:00
goto BattleScript_AutotomizePrintString
BattleScript_AutotomizeAttackAnim::
Techno Blast and Autotomize
2018-09-22 17:27:51 +02:00
attackanimation
waitanimation
Some cleanup (#454) * Toxic Thread doesn't have power. * Added missing commas. * Autotomize typo. It wasn't until today that I learned that autotomize was a word.
2020-06-27 11:21:13 +02:00
BattleScript_AutotomizeDoAnim::
Techno Blast and Autotomize
2018-09-22 17:27:51 +02:00
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
Some cleanup (#454) * Toxic Thread doesn't have power. * Added missing commas. * Autotomize typo. It wasn't until today that I learned that autotomize was a word.
2020-06-27 11:21:13 +02:00
BattleScript_AutotomizePrintString::
Techno Blast and Autotomize
2018-09-22 17:27:51 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Some cleanup (#454) * Toxic Thread doesn't have power. * Added missing commas. * Autotomize typo. It wasn't until today that I learned that autotomize was a word.
2020-06-27 11:21:13 +02:00
BattleScript_AutotomizeWeightLoss::
Techno Blast and Autotomize
2018-09-22 17:27:51 +02:00
jumpifmovehadnoeffect BattleScript_MoveEnd
Some cleanup (#454) * Toxic Thread doesn't have power. * Added missing commas. * Autotomize typo. It wasn't until today that I learned that autotomize was a word.
2020-06-27 11:21:13 +02:00
tryautotomize BS_ATTACKER, BattleScript_MoveEnd
Techno Blast and Autotomize
2018-09-22 17:27:51 +02:00
printstring STRINGID_BECAMENIMBLE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Techno Blast and Autotomize
2018-09-22 17:27:51 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
BattleScript_EffectFinalGambit:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
typecalc
bichalfword gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
dmgtocurrattackerhp
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
resultmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Corrections to Final Gambit's effect's battle script -Restored the call to resultmessage -Corrected its behavior against Endured, Focus Banded/Sashed and Sturdy foes
2020-12-21 01:31:36 +01:00
dmgtocurrattackerhp
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
Tweaked Final Gambit's effect -Made the user faint before the foe like in the official games -Removed calls to resultmessage and critmessage as those were never needed by this move's effect
2020-12-20 01:57:47 +01:00
seteffectwithchance
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
tryfaintmon BS_ATTACKER, FALSE, NULL
Tweaked Final Gambit's effect -Made the user faint before the foe like in the official games -Removed calls to resultmessage and critmessage as those were never needed by this move's effect
2020-12-20 01:57:47 +01:00
tryfaintmon BS_TARGET, FALSE, NULL
jumpifmovehadnoeffect BattleScript_MoveEnd
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
BattleScript_EffectHitSwitchTarget:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
resultmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
tryfaintmon BS_TARGET, FALSE, NULL
jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
tryhitswitchtarget BattleScript_EffectHitSwitchTargetMoveEnd
BattleScript_EffectHitSwitchTargetMoveEnd:
Merge with master, add defines to atk49 and statbuffchange commands
2019-03-31 15:19:25 +02:00
moveendall
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
end
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
BattleScript_EffectClearSmog:
setmoveeffect MOVE_EFFECT_CLEAR_SMOG
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
BattleScript_EffectToxicThread:
setstatchanger STAT_SPEED, 2, TRUE
attackcanceler
jumpifsubstituteblocks BattleScript_ButItFailedAtkStringPpReduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_SPEED, MIN_STAT_STAGE, BattleScript_ToxicThreadWorks
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
jumpifstatus BS_TARGET, STATUS1_PSN_ANY, BattleScript_ButItFailedAtkStringPpReduce
BattleScript_ToxicThreadWorks:
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_ToxicThreadTryPsn
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_ToxicThreadDoAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_ToxicThreadTryPsn
pause B_WAIT_TIME_SHORT
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
goto BattleScript_ToxicThreadPrintString
BattleScript_ToxicThreadDoAnim::
attackanimation
waitanimation
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
BattleScript_ToxicThreadPrintString::
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
BattleScript_ToxicThreadTryPsn::
setmoveeffect MOVE_EFFECT_POISON
seteffectprimary
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
BattleScript_EffectVenomDrench:
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
attackcanceler
attackstring
ppreduce
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
jumpifstatus BS_TARGET, STATUS1_PSN_ANY, BattleScript_EffectVenomDrenchCanBeUsed
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
goto BattleScript_ButItFailed
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
BattleScript_EffectVenomDrenchCanBeUsed:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, MIN_STAT_STAGE, BattleScript_VenomDrenchDoMoveAnim
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_SPATK, MIN_STAT_STAGE, BattleScript_VenomDrenchDoMoveAnim
jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPEED, MIN_STAT_STAGE, BattleScript_CantLowerMultipleStats
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
BattleScript_VenomDrenchDoMoveAnim::
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK | BIT_SPEED, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
setstatchanger STAT_ATK, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_VenomDrenchTryLowerSpAtk
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VenomDrenchTryLowerSpAtk
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
BattleScript_VenomDrenchTryLowerSpAtk::
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
setstatchanger STAT_SPATK, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_VenomDrenchTryLowerSpeed
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VenomDrenchTryLowerSpeed
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
BattleScript_VenomDrenchTryLowerSpeed::
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_TARGET, BIT_SPEED, STAT_CHANGE_NEGATIVE
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
setstatchanger STAT_SPEED, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_VenomDrenchEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VenomDrenchEnd
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
BattleScript_VenomDrenchEnd::
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
BattleScript_EffectNobleRoar:
attackcanceler
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, MIN_STAT_STAGE, BattleScript_NobleRoarDoMoveAnim
jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPATK, MIN_STAT_STAGE, BattleScript_CantLowerMultipleStats
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
BattleScript_NobleRoarDoMoveAnim::
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
setstatchanger STAT_ATK, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_NobleRoarTryLowerSpAtk
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_NobleRoarTryLowerSpAtk
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
BattleScript_NobleRoarTryLowerSpAtk::
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
setstatchanger STAT_SPATK, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_NobleRoarEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_NobleRoarEnd
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
BattleScript_NobleRoarEnd::
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Shell Smash move effect
2018-09-22 11:13:17 +02:00
BattleScript_EffectShellSmash:
attackcanceler
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_ShellSmashTryDef
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_ShellSmashTryDef
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, MAX_STAT_STAGE, BattleScript_ShellSmashTryDef
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_DEF, MIN_STAT_STAGE, BattleScript_ShellSmashTryDef
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MIN_STAT_STAGE, BattleScript_ButItFailed
Shell Smash move effect
2018-09-22 11:13:17 +02:00
BattleScript_ShellSmashTryDef::
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT
Shell Smash move effect
2018-09-22 11:13:17 +02:00
setstatchanger STAT_DEF, 1, TRUE
Fix White Smoke affecting Shell Smash's def drop
2021-07-06 10:37:17 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_ShellSmashTrySpDef
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashTrySpDef
Shell Smash move effect
2018-09-22 11:13:17 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Shell Smash move effect
2018-09-22 11:13:17 +02:00
BattleScript_ShellSmashTrySpDef:
setstatchanger STAT_SPDEF, 1, TRUE
Fix White Smoke affecting Shell Smash's def drop
2021-07-06 10:37:17 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_ShellSmashTryAttack
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashTryAttack
Shell Smash move effect
2018-09-22 11:13:17 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Shell Smash move effect
2018-09-22 11:13:17 +02:00
BattleScript_ShellSmashTryAttack:
setbyte sSTAT_ANIM_PLAYED, FALSE
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_ATK | BIT_SPEED, STAT_CHANGE_BY_TWO
Shell Smash move effect
2018-09-22 11:13:17 +02:00
setstatchanger STAT_ATK, 2, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShellSmashTrySpAtk
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashTrySpAtk
Shell Smash move effect
2018-09-22 11:13:17 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Shell Smash move effect
2018-09-22 11:13:17 +02:00
BattleScript_ShellSmashTrySpAtk:
setstatchanger STAT_SPATK, 2, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShellSmashTrySpeed
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashTrySpeed
Shell Smash move effect
2018-09-22 11:13:17 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Shell Smash move effect
2018-09-22 11:13:17 +02:00
BattleScript_ShellSmashTrySpeed:
setstatchanger STAT_SPEED, 2, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShellSmashEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashEnd
Shell Smash move effect
2018-09-22 11:13:17 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Shell Smash move effect
2018-09-22 11:13:17 +02:00
BattleScript_ShellSmashEnd:
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Last Resort, Fangs and Flare Blitz/Volt Tackle
2018-09-22 10:45:43 +02:00
BattleScript_EffectLastResort:
attackcanceler
attackstring
ppreduce
jumpifcantuselastresort BS_ATTACKER, BattleScript_ButItFailed
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
goto BattleScript_HitFromCritCalc
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Growth gen6 effect
2018-09-22 01:01:13 +02:00
BattleScript_EffectGrowth:
attackcanceler
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_GrowthDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPATK, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
Growth gen6 effect
2018-09-22 01:01:13 +02:00
BattleScript_GrowthDoMoveAnim::
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPATK, 0
Growth gen6 effect
2018-09-22 01:01:13 +02:00
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, WEATHER_SUN_ANY, BattleScript_GrowthAtk2
setstatchanger STAT_ATK, 1, FALSE
goto BattleScript_GrowthAtk
BattleScript_GrowthAtk2:
setstatchanger STAT_ATK, 2, FALSE
BattleScript_GrowthAtk:
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_GrowthTrySpAtk
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GrowthTrySpAtk
Growth gen6 effect
2018-09-22 01:01:13 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Growth gen6 effect
2018-09-22 01:01:13 +02:00
BattleScript_GrowthTrySpAtk::
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, WEATHER_SUN_ANY, BattleScript_GrowthSpAtk2
setstatchanger STAT_SPATK, 1, FALSE
goto BattleScript_GrowthSpAtk
BattleScript_GrowthSpAtk2:
setstatchanger STAT_SPATK, 2, FALSE
BattleScript_GrowthSpAtk:
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_GrowthEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GrowthEnd
Growth gen6 effect
2018-09-22 01:01:13 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Growth gen6 effect
2018-09-22 01:01:13 +02:00
BattleScript_GrowthEnd:
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Reflect Type and SOAK
2018-08-11 13:30:34 +02:00
BattleScript_EffectSoak:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
jumpifability BS_TARGET, ABILITY_MULTITYPE, BattleScript_ButItFailed
jumpifability BS_TARGET, ABILITY_RKS_SYSTEM, BattleScript_ButItFailed
jumpifsubstituteblocks BattleScript_ButItFailed
attackanimation
waitanimation
trysoak BattleScript_ButItFailed
printstring STRINGID_TRANSFORMEDINTOWATERTYPE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Reflect Type and SOAK
2018-08-11 13:30:34 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Reflect Type and SOAK
2018-08-11 13:30:34 +02:00
BattleScript_EffectReflectType:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
tryreflecttype BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_REFLECTTARGETSTYPE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Reflect Type and SOAK
2018-08-11 13:30:34 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Reflect Type and SOAK
2018-08-11 13:30:34 +02:00
BattleScript_EffectElectrify:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
tryelectrify BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_TARGETELECTRIFIED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Reflect Type and SOAK
2018-08-11 13:30:34 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
BattleScript_EffectShiftGear:
attackcanceler
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, MAX_STAT_STAGE, BattleScript_ShiftGearDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_ATK, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
BattleScript_ShiftGearDoMoveAnim:
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, 10, BattleScript_ShiftGearSpeedBy1
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_ATTACKER, BIT_SPEED | BIT_ATK, STAT_CHANGE_BY_TWO
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
setstatchanger STAT_SPEED, 2, FALSE
goto BattleScript_ShiftGearDoSpeed
BattleScript_ShiftGearSpeedBy1:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_ATTACKER, BIT_SPEED | BIT_ATK, 0
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
setstatchanger STAT_SPEED, 1, FALSE
BattleScript_ShiftGearDoSpeed:
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShiftGearTryAtk
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShiftGearTryAtk
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
BattleScript_ShiftGearTryAtk:
setstatchanger STAT_ATK, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShiftGearEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShiftGearEnd
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
BattleScript_ShiftGearEnd:
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
BattleScript_EffectCoil:
attackcanceler
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_CoilDoMoveAnim
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_CoilDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_ACC, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
BattleScript_CoilDoMoveAnim:
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_ACC, 0
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
setstatchanger STAT_ATK, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CoilTryDef
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CoilTryDef
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
BattleScript_CoilTryDef:
setstatchanger STAT_DEF, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CoilTryAcc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CoilTryAcc
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
BattleScript_CoilTryAcc:
setstatchanger STAT_ACC, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CoilEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CoilEnd
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
BattleScript_CoilEnd:
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
BattleScript_EffectQuiverDance:
attackcanceler
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_QuiverDanceDoMoveAnim
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_QuiverDanceDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
BattleScript_QuiverDanceDoMoveAnim::
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF | BIT_SPEED, 0
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
setstatchanger STAT_SPATK, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_QuiverDanceTrySpDef
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_QuiverDanceTrySpDef
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
BattleScript_QuiverDanceTrySpDef::
setstatchanger STAT_SPDEF, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_QuiverDanceTrySpeed
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_QuiverDanceTrySpeed
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
BattleScript_QuiverDanceTrySpeed::
setstatchanger STAT_SPEED, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_QuiverDanceEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_QuiverDanceEnd
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
BattleScript_QuiverDanceEnd::
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Couple bug fixes
2018-08-11 12:16:00 +02:00
BattleScript_EffectSpeedUpHit:
setmoveeffect MOVE_EFFECT_SPD_PLUS_1 | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Me First.
2018-08-05 16:43:07 +02:00
BattleScript_EffectMeFirst:
attackcanceler
attackstring
trymefirst BattleScript_ButItFailedPpReduce
attackanimation
waitanimation
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte sB_ANIM_TURN, 0
setbyte sB_ANIM_TARGETS_HIT, 0
random move to called move
2018-09-22 19:27:56 +02:00
jumptocalledmove TRUE
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
BattleScript_EffectAttackSpAttackUp:
attackcanceler
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_AttackSpAttackUpDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPATK, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
BattleScript_AttackSpAttackUpDoMoveAnim::
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPATK, 0
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
setstatchanger STAT_ATK, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AttackSpAttackUpTrySpAtk
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AttackSpAttackUpTrySpAtk
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Growth gen6 effect
2018-09-22 01:01:13 +02:00
BattleScript_AttackSpAttackUpTrySpAtk::
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
setstatchanger STAT_SPATK, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AttackSpAttackUpEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AttackSpAttackUpEnd
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
BattleScript_AttackSpAttackUpEnd:
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
BattleScript_EffectAttackAccUp:
attackcanceler
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_AttackAccUpDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_ACC, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
BattleScript_AttackAccUpDoMoveAnim::
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
setstatchanger STAT_ATK, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AttackAccUpTrySpDef
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AttackAccUpTrySpDef
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
BattleScript_AttackAccUpTrySpDef::
setstatchanger STAT_ACC, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AttackAccUpEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AttackAccUpEnd
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
BattleScript_AttackAccUpEnd:
goto BattleScript_MoveEnd
Moves changing terrains
2018-08-05 12:43:57 +02:00
BattleScript_EffectMistyTerrain:
BattleScript_EffectGrassyTerrain:
BattleScript_EffectElectricTerrain:
BattleScript_EffectPsychicTerrain:
attackcanceler
attackstring
ppreduce
setterrain BattleScript_ButItFailed
attackanimation
waitanimation
printfromtable gTerrainStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
fix bad bg fade if no permanent terrain
2021-01-14 00:01:47 +01:00
playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG, NULL
Moves changing terrains
2018-08-05 12:43:57 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Topsy Turvy and Ion Deluge.
2018-08-04 23:34:29 +02:00
BattleScript_EffectTopsyTurvy:
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_ATK, 6, BattleScript_EffectTopsyTurvyWorks
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_DEF, 6, BattleScript_EffectTopsyTurvyWorks
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_SPATK, 6, BattleScript_EffectTopsyTurvyWorks
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_SPDEF, 6, BattleScript_EffectTopsyTurvyWorks
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_SPEED, 6, BattleScript_EffectTopsyTurvyWorks
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_ACC, 6, BattleScript_EffectTopsyTurvyWorks
jumpifstat BS_TARGET, CMP_EQUAL, STAT_EVASION, 6, BattleScript_ButItFailed
BattleScript_EffectTopsyTurvyWorks:
attackanimation
waitanimation
invertstatstages BS_TARGET
printstring STRINGID_TOPSYTURVYSWITCHEDSTATS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Topsy Turvy and Ion Deluge.
2018-08-04 23:34:29 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Topsy Turvy and Ion Deluge.
2018-08-04 23:34:29 +02:00
BattleScript_EffectIonDeluge:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
orword gFieldStatuses, STATUS_FIELD_ION_DELUGE
attackanimation
waitanimation
printstring STRINGID_IONDELUGEON
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Topsy Turvy and Ion Deluge.
2018-08-04 23:34:29 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
BattleScript_EffectQuash:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
tryquash BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_QUASHSUCCESS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
BattleScript_EffectHealPulse:
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
jumpifsubstituteblocks BattleScript_ButItFailed
tryhealpulse BS_TARGET, BattleScript_AlreadyAtFullHp
attackanimation
waitanimation
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
printstring STRINGID_PKMNREGAINEDHEALTH
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
BattleScript_EffectEntrainment:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
tryentrainment BattleScript_ButItFailed
attackanimation
waitanimation
setlastusedability BS_TARGET
printstring STRINGID_PKMNACQUIREDABILITY
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
BattleScript_EffectSimpleBeam:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
setabilitysimple BS_TARGET, BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNACQUIREDSIMPLE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst
2018-08-04 20:36:24 +02:00
BattleScript_EffectSuckerPunch:
attackcanceler
suckerpunchcheck BattleScript_ButItFailedAtkStringPpReduce
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
goto BattleScript_HitFromAtkString
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst
2018-08-04 20:36:24 +02:00
BattleScript_EffectLuckyChant:
attackcanceler
attackstring
ppreduce
setluckychant BS_ATTACKER, BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_SHIELDEDFROMCRITICALHITS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst
2018-08-04 20:36:24 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst
2018-08-04 20:36:24 +02:00
BattleScript_EffectMetalBurst:
attackcanceler
metalburstdamagecalculator BattleScript_ButItFailedAtkStringPpReduce
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc
bichalfword gMoveResultFlags, MOVE_RESULT_NOT_VERY_EFFECTIVE | MOVE_RESULT_SUPER_EFFECTIVE
adjustdamage
goto BattleScript_HitFromAtkAnimation
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Healing Wish and Lunar Dance
2018-07-26 20:36:16 +02:00
BattleScript_EffectHealingWish:
attackcanceler
Fix Healing Wish
2020-03-14 12:31:42 +01:00
jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_ButItFailedAtkStringPpReduce
Healing Wish and Lunar Dance
2018-07-26 20:36:16 +02:00
attackstring
ppreduce
attackanimation
waitanimation
instanthpdrop BS_ATTACKER
setatkhptozero
tryfaintmon BS_ATTACKER, FALSE, NULL
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
openpartyscreen BS_ATTACKER, BattleScript_EffectHealingWishEnd
Healing Wish and Lunar Dance
2018-07-26 20:36:16 +02:00
switchoutabilities BS_ATTACKER
waitstate
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
switchhandleorder BS_ATTACKER, 2
Healing Wish and Lunar Dance
2018-07-26 20:36:16 +02:00
returnatktoball
getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE
waitstate
setbyte cMULTISTRING_CHOOSER 0
jumpifnotchosenmove MOVE_LUNAR_DANCE BattleScript_EffectHealingWishNewMon
setbyte cMULTISTRING_CHOOSER 1
restorepp BS_ATTACKER
BattleScript_EffectHealingWishNewMon:
printfromtable gHealingWishStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Healing Wish and Lunar Dance
2018-07-26 20:36:16 +02:00
playanimation BS_ATTACKER, B_ANIM_WISH_HEAL, NULL
waitanimation
dmgtomaxattackerhp
merge
2019-11-10 12:09:14 +01:00
manipulatedamage DMG_CHANGE_SIGN
Healing Wish and Lunar Dance
2018-07-26 20:36:16 +02:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
clearstatus BS_ATTACKER
waitstate
updatestatusicon BS_ATTACKER
waitstate
printstring STRINGID_HEALINGWISHHEALED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Healing Wish and Lunar Dance
2018-07-26 20:36:16 +02:00
switchineffects BS_ATTACKER
BattleScript_EffectHealingWishEnd:
Merge with master, add defines to atk49 and statbuffchange commands
2019-03-31 15:19:25 +02:00
moveendall
Healing Wish and Lunar Dance
2018-07-26 20:36:16 +02:00
end
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Fix crits and do Worry Seed
2018-07-23 22:18:56 +02:00
BattleScript_EffectWorrySeed:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
tryworryseed BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNACQUIREDABILITY
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Fix crits and do Worry Seed
2018-07-23 22:18:56 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Gen 5 move names, telekinesis, power/guard split/swap
2018-07-21 23:12:10 +02:00
BattleScript_EffectPowerSplit:
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
averagestats STAT_ATK
averagestats STAT_SPATK
attackanimation
waitanimation
printstring STRINGID_SHAREDITSPOWER
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Gen 5 move names, telekinesis, power/guard split/swap
2018-07-21 23:12:10 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Gen 5 move names, telekinesis, power/guard split/swap
2018-07-21 23:12:10 +02:00
BattleScript_EffectGuardSplit:
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
averagestats STAT_DEF
averagestats STAT_SPDEF
attackanimation
waitanimation
printstring STRINGID_SHAREDITSGUARD
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Gen 5 move names, telekinesis, power/guard split/swap
2018-07-21 23:12:10 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Gen 5 move names, telekinesis, power/guard split/swap
2018-07-21 23:12:10 +02:00
BattleScript_EffectHeartSwap:
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
swapstatstages STAT_ATK
swapstatstages STAT_DEF
swapstatstages STAT_SPEED
swapstatstages STAT_SPATK
swapstatstages STAT_SPDEF
swapstatstages STAT_EVASION
swapstatstages STAT_ACC
attackanimation
waitanimation
printstring STRINGID_PKMNSWITCHEDSTATCHANGES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Gen 5 move names, telekinesis, power/guard split/swap
2018-07-21 23:12:10 +02:00
goto BattleScript_MoveEnd
BattleScript_EffectPowerSwap:
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
swapstatstages STAT_ATK
swapstatstages STAT_SPATK
attackanimation
waitanimation
printstring STRINGID_PKMNSWITCHEDSTATCHANGES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Gen 5 move names, telekinesis, power/guard split/swap
2018-07-21 23:12:10 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Gen 5 move names, telekinesis, power/guard split/swap
2018-07-21 23:12:10 +02:00
BattleScript_EffectGuardSwap:
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
swapstatstages STAT_DEF
swapstatstages STAT_SPDEF
attackanimation
waitanimation
printstring STRINGID_PKMNSWITCHEDSTATCHANGES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Gen 5 move names, telekinesis, power/guard split/swap
2018-07-21 23:12:10 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Flower Shield and protect moves
2018-10-06 15:50:35 +02:00
BattleScript_EffectSpeedSwap:
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
swapstatstages STAT_SPEED
attackanimation
waitanimation
printstring STRINGID_PKMNSWITCHEDSTATCHANGES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Flower Shield and protect moves
2018-10-06 15:50:35 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectTelekinesis:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, NO_ACC_CALC_CHECK_LOCK_ON
attackstring
ppreduce
settelekinesis BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNIDENTIFIED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectStealthRock:
attackcanceler
attackstring
ppreduce
Fix crits and do Worry Seed
2018-07-23 22:18:56 +02:00
setstealthrock BattleScript_ButItFailed
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
attackanimation
waitanimation
Fix crits and do Worry Seed
2018-07-23 22:18:56 +02:00
printstring STRINGID_POINTEDSTONESFLOAT
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst
2018-08-04 20:36:24 +02:00
BattleScript_EffectStickyWeb:
attackcanceler
attackstring
ppreduce
setstickyweb BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_STICKYWEBUSED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst
2018-08-04 20:36:24 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectGastroAcid:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
setgastroacid BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNSABILITYSUPPRESSED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectToxicSpikes:
attackcanceler
attackstring
ppreduce
settoxicspikes BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_POISONSPIKESSCATTERED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectMagnetRise:
attackcanceler
attackstring
ppreduce
Merge with master
2020-07-27 14:51:39 +02:00
setuserstatus3 STATUS3_MAGNET_RISE, BattleScript_ButItFailed
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
attackanimation
waitanimation
printstring STRINGID_PKMNLEVITATEDONELECTROMAGNETISM
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectTrickRoom:
BattleScript_EffectWonderRoom:
BattleScript_EffectMagicRoom:
attackcanceler
attackstring
ppreduce
setroom
attackanimation
waitanimation
printfromtable gRoomsStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
BattleScript_EffectAquaRing:
attackcanceler
attackstring
ppreduce
Merge with master
2020-07-27 14:51:39 +02:00
setuserstatus3 STATUS3_AQUA_RING, BattleScript_ButItFailed
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
attackanimation
waitanimation
printstring STRINGID_PKMNSURROUNDEDWITHVEILOFWATER
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
BattleScript_EffectEmbargo:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
setembargo BattleScript_ButItFailed
attackanimation
waitanimation
Fix Embargo string
2019-02-01 13:41:08 +01:00
printstring STRINGID_PKMNCANTUSEITEMSANYMORE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
BattleScript_EffectTailwind:
attackcanceler
attackstring
ppreduce
settailwind BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_TAILWINDBLEW
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
BattleScript_EffectMircleEye:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
setmiracleeye BattleScript_ButItFailed
goto BattleScript_IdentifiedFoe
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
BattleScript_EffectGravity:
attackcanceler
attackstring
ppreduce
setgravity BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_GRAVITYINTENSIFIED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Gravity fix Brings down Pokémon in the middle of a two-turn flying move (only Bounce and Fly at the moment); says the appropriate message for all mons brought to the ground via Gravity
2019-02-22 23:48:28 +01:00
selectfirstvalidtarget
BattleScript_GravityLoop:
movevaluescleanup
jumpifstatus3 BS_TARGET, STATUS3_ON_AIR | STATUS3_MAGNET_RISE | STATUS3_TELEKINESIS, BattleScript_GravityLoopDrop
goto BattleScript_GravityLoopEnd
BattleScript_GravityLoopDrop:
bringdownairbornebattler BS_TARGET
printstring STRINGID_GRAVITYGROUNDING
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Gravity fix Brings down Pokémon in the middle of a two-turn flying move (only Bounce and Fly at the moment); says the appropriate message for all mons brought to the ground via Gravity
2019-02-22 23:48:28 +01:00
BattleScript_GravityLoopEnd:
merge
2019-11-10 12:09:14 +01:00
moveendto MOVEEND_NEXT_TARGET
Gravity fix Brings down Pokémon in the middle of a two-turn flying move (only Bounce and Fly at the moment); says the appropriate message for all mons brought to the ground via Gravity
2019-02-22 23:48:28 +01:00
jumpifnexttargetvalid BattleScript_GravityLoop
end
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
BattleScript_EffectRoost:
attackcanceler
attackstring
ppreduce
tryhealhalfhealth BattleScript_AlreadyAtFullHp, BS_TARGET
setroost
goto BattleScript_PresentHealTarget
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Captivate and new accuracy calc
2018-07-22 15:08:32 +02:00
BattleScript_EffectCaptivate:
setstatchanger STAT_SPATK, 2, TRUE
attackcanceler
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailedAtkStringPpReduce
Captivate and new accuracy calc
2018-07-22 15:08:32 +02:00
jumpifoppositegenders BattleScript_CaptivateCheckAcc
goto BattleScript_ButItFailedAtkStringPpReduce
BattleScript_CaptivateCheckAcc:
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
goto BattleScript_StatDownFromAttackString
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Moves with accuracy 0 bypass accuracy checks; Heal Block move effect done
2018-07-30 20:41:16 +02:00
BattleScript_EffectHealBlock:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
Aroma Veil
2019-04-01 11:42:37 +02:00
jumpifability BS_TARGET_SIDE, ABILITY_AROMA_VEIL, BattleScript_AromaVeilProtects
Moves with accuracy 0 bypass accuracy checks; Heal Block move effect done
2018-07-30 20:41:16 +02:00
sethealblock BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNPREVENTEDFROMHEALING
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Moves with accuracy 0 bypass accuracy checks; Heal Block move effect done
2018-07-30 20:41:16 +02:00
goto BattleScript_MoveEnd
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
BattleScript_EffectThroatChop:
jumpifsubstituteblocks BattleScript_EffectHit
setmoveeffect MOVE_EFFECT_THROAT_CHOP | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
Add U-turn effect
2018-07-23 22:43:05 +02:00
BattleScript_EffectHitEscape:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add U-turn effect
2018-07-23 22:43:05 +02:00
resultmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add U-turn effect
2018-07-23 22:43:05 +02:00
jumpifmovehadnoeffect BattleScript_MoveEnd
seteffectwithchance
tryfaintmon BS_TARGET, FALSE, NULL
Some more move animations. Thanks Doesnt
2020-04-17 17:44:28 +02:00
moveendto MOVEEND_ATTACKER_VISIBLE
moveendfrom MOVEEND_TARGET_VISIBLE
Couple bug fixes
2018-08-11 12:16:00 +02:00
jumpifbattleend BattleScript_HitEscapeEnd
Add Surge Abilities
2019-02-09 14:30:16 +01:00
jumpifbyte CMP_NOT_EQUAL gBattleOutcome 0, BattleScript_HitEscapeEnd
UTurn Battle Arena no switchin
2020-07-08 17:38:28 +02:00
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_HitEscapeEnd
merge
2019-11-10 12:09:14 +01:00
jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_HitEscapeEnd
Some more move animations. Thanks Doesnt
2020-04-17 17:44:28 +02:00
openpartyscreen BS_ATTACKER, BattleScript_HitEscapeEnd
Add U-turn effect
2018-07-23 22:43:05 +02:00
switchoutabilities BS_ATTACKER
waitstate
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
switchhandleorder BS_ATTACKER, 2
Add U-turn effect
2018-07-23 22:43:05 +02:00
returntoball BS_ATTACKER
getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE
waitstate
switchineffects BS_ATTACKER
BattleScript_HitEscapeEnd:
end
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add placeholder string for not done moves.
2018-08-02 20:32:13 +02:00
BattleScript_EffectPlaceholder:
attackcanceler
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause 5
Add placeholder string for not done moves.
2018-08-02 20:32:13 +02:00
printstring STRINGID_NOTDONEYET
goto BattleScript_MoveEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectHit::
merge with be
2021-09-16 19:12:59 +02:00
<<<<<<< HEAD
Prepare damage calc huge changes
2018-07-14 18:44:38 +02:00
BattleScript_EffectLowKick:
BattleScript_EffectFlail:
BattleScript_EffectFacade:
Get rid of scripting dmg multiplier
2018-07-14 18:58:45 +02:00
BattleScript_EffectRevenge:
Fix dynamic move power moves, get rid of gDynamicBasePower' '
2018-07-16 21:42:03 +02:00
BattleScript_EffectReturn:
BattleScript_EffectFrustration:
BattleScript_EffectEruption:
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
BattleScript_EffectPledge:
BattleScript_EffectFling:
BattleScript_EffectWringOut:
BattleScript_EffectHex:
BattleScript_EffectAssurance:
BattleScript_EffectTrump_card:
BattleScript_EffectAcrobatics:
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectHeatCrash:
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
BattleScript_EffectPunishment:
BattleScript_EffectStoredPower:
BattleScript_EffectElectroBall:
BattleScript_EffectGyroBall:
BattleScript_EffectEchoedVoice:
BattleScript_EffectPayback:
BattleScript_EffectRound:
BattleScript_EffectBrine:
BattleScript_EffectVenoshock:
BattleScript_EffectRetalitate:
BattleScript_EffectFoulPlay:
BattleScript_EffectPsyshock:
Move Weather Ball, Hidden power, AI support for dynamic type moves and AI debug support
2018-07-29 11:32:40 +02:00
BattleScript_EffectWeatherBall:
BattleScript_EffectHiddenPower:
Support for two typed moves.
2018-08-05 13:57:37 +02:00
BattleScript_EffectTwoTypedMove:
Remove Techno Blast and Judgment from battle scripts
2020-11-20 04:14:12 +01:00
BattleScript_EffectChangeTypeOnItem:
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
BattleScript_EffectFusionCombo:
Aurora Veil, Revelation Dance, Diamond Storm
2018-11-03 14:35:45 +01:00
BattleScript_EffectRevelationDance:
Code Belch effect
2019-02-01 14:17:24 +01:00
BattleScript_EffectBelch:
Implement Body Press' effect Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
2021-03-16 10:56:44 +01:00
BattleScript_EffectBodyPress:
coaching, lash out, burning jealousy
2021-01-28 20:21:11 +01:00
BattleScript_EffectLashOut:
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 21:27:00 +01:00
BattleScript_EffectGrassyGlide:
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 17:38:54 +02:00
BattleScript_EffectDynamaxDoubleDmg:
BattleScript_EffectSnipeShot:
Change inner structure of semi invulerable moves
2020-04-11 11:47:13 +02:00
merge with be
2021-09-16 19:12:59 +02:00
=======
>>>>>>> 0cd7f3ffcde00002691719ae33b4fa0516662acf
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_HitFromAtkCanceler::
attackcanceler
BattleScript_HitFromAccCheck::
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
BattleScript_HitFromAtkString::
attackstring
ppreduce
BattleScript_HitFromCritCalc::
critcalc
damagecalc
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_HitFromAtkAnimation::
attackanimation
waitanimation
effectivenesssound
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hitanimation BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
critmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectwithchance
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_TARGET, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveEnd::
Helpful macros for atk49
2019-03-30 12:37:18 +01:00
moveendall
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Natural Gift
2019-05-20 12:03:00 +02:00
BattleScript_EffectNaturalGift:
attackcanceler
attackstring
ppreduce
jumpifnotberry BS_ATTACKER, BattleScript_ButItFailed
jumpifword CMP_COMMON_BITS, gFieldStatuses, STATUS_FIELD_MAGIC_ROOM, BattleScript_ButItFailed
jumpifability BS_ATTACKER, ABILITY_KLUTZ, BattleScript_ButItFailed
jumpifstatus3 BS_ATTACKER, STATUS3_EMBARGO, BattleScript_ButItFailed
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Natural Gift
2019-05-20 12:03:00 +02:00
resultmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Natural Gift
2019-05-20 12:03:00 +02:00
seteffectwithchance
jumpifmovehadnoeffect BattleScript_EffectNaturalGiftEnd
removeitem BS_ATTACKER
BattleScript_EffectNaturalGiftEnd:
tryfaintmon BS_TARGET, FALSE, NULL
goto BattleScript_MoveEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MakeMoveMissed::
Move high crit to a flag and update move table
2018-07-14 10:11:38 +02:00
orhalfword gMoveResultFlags, MOVE_RESULT_MISSED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_PrintMoveMissed::
attackstring
ppreduce
BattleScript_MoveMissedPause::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveMissed::
effectivenesssound
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 17:38:54 +02:00
jumpifobstruct BattleScript_ObstructActivates
goto BattleScript_MoveEnd
BattleScript_ObstructActivates:
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MIN_STAT_STAGE, BattleScript_ObstructActivationEnd
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_ObstructActivationEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ObstructActivationEnd:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectSleep::
attackcanceler
attackstring
ppreduce
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailed
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_AlreadyAsleep
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
jumpifcantmakeasleep BattleScript_CantMakeAsleep
Comatose
2019-12-31 16:36:53 +01:00
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
jumpifflowerveil BattleScript_FlowerVeilProtects
Add Sweet Veil
2019-03-31 22:02:39 +02:00
jumpifability BS_TARGET_SIDE, ABILITY_SWEET_VEIL, BattleScript_SweetVeilProtects
Spaces to tabs
2019-12-18 22:03:01 +01:00
jumpifleafguard BattleScript_LeafGuardProtects
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
Infiltrator affects mist safeguard
2020-04-23 11:29:19 +02:00
jumpifsafeguard BattleScript_SafeguardProtected
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_SLEEP
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
BattleScript_FlowerVeilProtectsRet::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
call BattleScript_AbilityPopUp
printstring STRINGID_FLOWERVEILPROTECTED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
BattleScript_FlowerVeilProtects:
call BattleScript_FlowerVeilProtectsRet
orhalfword gMoveResultFlags, MOVE_RESULT_FAILED
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Sweet Veil
2019-03-31 22:02:39 +02:00
BattleScript_SweetVeilProtectsRet::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Add Sweet Veil
2019-03-31 22:02:39 +02:00
call BattleScript_AbilityPopUp
printstring STRINGID_FLOWERVEILPROTECTED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add Sweet Veil
2019-03-31 22:02:39 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Sweet Veil
2019-03-31 22:02:39 +02:00
BattleScript_SweetVeilProtects:
call BattleScript_SweetVeilProtectsRet
orhalfword gMoveResultFlags, MOVE_RESULT_FAILED
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Aroma Veil
2019-04-01 11:42:37 +02:00
BattleScript_AromaVeilProtectsRet::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Aroma Veil
2019-04-01 11:42:37 +02:00
call BattleScript_AbilityPopUp
printstring STRINGID_AROMAVEILPROTECTED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Aroma Veil
2019-04-01 11:42:37 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Aroma Veil
2019-04-01 11:42:37 +02:00
BattleScript_AromaVeilProtects:
call BattleScript_AromaVeilProtectsRet
orhalfword gMoveResultFlags, MOVE_RESULT_FAILED
goto BattleScript_MoveEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
Implement Leaf Guard.
2019-12-16 09:29:20 +01:00
BattleScript_LeafGuardProtectsRet::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Implement Leaf Guard.
2019-12-16 09:29:20 +01:00
call BattleScript_AbilityPopUp
printstring STRINGID_ITDOESNTAFFECT
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Implement Leaf Guard.
2019-12-16 09:29:20 +01:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Implement Leaf Guard.
2019-12-16 09:29:20 +01:00
BattleScript_LeafGuardProtects:
call BattleScript_LeafGuardProtectsRet
orhalfword gMoveResultFlags, MOVE_RESULT_FAILED
goto BattleScript_MoveEnd
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
BattleScript_AlreadyAsleep::
Document battle arena
2018-11-11 18:33:16 +01:00
setalreadystatusedmoveattempt BS_ATTACKER
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNALREADYASLEEP
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
BattleScript_WasntAffected::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNWASNTAFFECTED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
BattleScript_CantMakeAsleep::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gUproarAwakeStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Move high crit to a flag and update move table
2018-07-14 10:11:38 +02:00
BattleScript_EffectPoisonHit:
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_POISON
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectAbsorb::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
damagecalc
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
effectivenesssound
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hitanimation BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
critmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Introduce argument and do Draining kiss
2018-08-03 19:01:03 +02:00
setdrainedhp
Make Big Root affect absorb moves Big Root should increase the HP recovered by Absorb, Giga Drain etc.
2021-05-04 13:20:22 +02:00
manipulatedamage DMG_BIG_ROOT
Fix many Disguise bugs Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
2021-09-06 08:27:42 +02:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifability BS_TARGET, ABILITY_LIQUID_OOZE, BattleScript_AbsorbLiquidOoze
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte cMULTISTRING_CHOOSER, B_MSG_ABSORB
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_AbsorbUpdateHp
BattleScript_AbsorbLiquidOoze::
Draining abilities have the pop-up appear now
2020-02-22 19:25:35 +01:00
copybyte gBattlerAbility, gBattlerTarget
call BattleScript_AbilityPopUp
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
manipulatedamage DMG_CHANGE_SIGN
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte cMULTISTRING_CHOOSER, B_MSG_ABSORB_OOZE
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_AbsorbUpdateHp::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
give names to some battlescripts
2017-12-02 00:03:46 +01:00
jumpifmovehadnoeffect BattleScript_AbsorbTryFainting
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
printfromtable gAbsorbDrainStringIds
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_AbsorbTryFainting::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
tryfaintmon BS_TARGET, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectBurnHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_BURN
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectFreezeHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_FREEZE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectParalyzeHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_PARALYSIS
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectExplosion::
attackcanceler
attackstring
ppreduce
faintifabilitynotdamp
setatkhptozero
waitstate
Label various battle scripts
2018-09-01 20:00:13 +02:00
jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop
call BattleScript_PreserveMissedBitDoMoveAnim
goto BattleScript_ExplosionLoop
BattleScript_ExplosionDoAnimStartLoop:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_ExplosionLoop:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
movevaluescleanup
critcalc
damagecalc
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
Label various battle scripts
2018-09-01 20:00:13 +02:00
accuracycheck BattleScript_ExplosionMissed, ACC_CURR_MOVE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
effectivenesssound
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hitanimation BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
critmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_TARGET, FALSE, NULL
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendto MOVEEND_NEXT_TARGET
Label various battle scripts
2018-09-01 20:00:13 +02:00
jumpifnexttargetvalid BattleScript_ExplosionLoop
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
Fix Damp loop
2020-04-11 12:02:51 +02:00
moveendcase MOVEEND_CLEAR_BITS
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_ExplosionMissed:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
effectivenesssound
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendto MOVEEND_NEXT_TARGET
Label various battle scripts
2018-09-01 20:00:13 +02:00
jumpifnexttargetvalid BattleScript_ExplosionLoop
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end
Mind blown (#302) * Mind Blown Part 1 (Definition and self-damage) * Mind Blown Part 2 (Damp interaction)
2020-04-14 09:27:29 +02:00
BattleScript_EffectMindBlown::
attackcanceler
attackstring
ppreduce
faintifabilitynotdamp
dmg_1_2_attackerhp
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
waitstate
jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop
call BattleScript_PreserveMissedBitDoMoveAnim
goto BattleScript_ExplosionLoop
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_PreserveMissedBitDoMoveAnim:
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
bichalfword gMoveResultFlags, MOVE_RESULT_MISSED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
orhalfword gMoveResultFlags, MOVE_RESULT_MISSED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_EffectDreamEater::
attackcanceler
merge with master
2018-09-02 00:07:19 +02:00
jumpifsubstituteblocks BattleScript_DreamEaterNoEffect
Label various battle scripts
2018-09-01 20:00:13 +02:00
jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_DreamEaterWorked
Comatose
2019-12-31 16:36:53 +01:00
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_DreamEaterWorked
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_DreamEaterNoEffect:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
goto BattleScript_WasntAffected
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_DreamEaterWorked:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
damagecalc
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
effectivenesssound
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hitanimation BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
critmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Introduce argument and do Draining kiss
2018-08-03 19:01:03 +02:00
setdrainedhp
Make Big Root affect absorb moves Big Root should increase the HP recovered by Absorb, Giga Drain etc.
2021-05-04 13:20:22 +02:00
manipulatedamage DMG_BIG_ROOT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
give names to some battlescripts
2017-12-02 00:03:46 +01:00
jumpifmovehadnoeffect BattleScript_DreamEaterTryFaintEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNDREAMEATEN
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_DreamEaterTryFaintEnd:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_TARGET, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectMirrorMove::
attackcanceler
attackstring
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
trymirrormove
ppreduce
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
orhalfword gMoveResultFlags, MOVE_RESULT_FAILED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_MIRRORMOVEFAILED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectAttackUp::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_ATK, 1, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatUp
BattleScript_EffectDefenseUp::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_DEF, 1, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatUp
BattleScript_EffectSpecialAttackUp::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPATK, 1, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatUp
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectSpeedUp:
setstatchanger STAT_SPEED, 1, FALSE
goto BattleScript_EffectStatUp
BattleScript_EffectSpecialDefenseUp:
setstatchanger STAT_SPDEF, 1, FALSE
goto BattleScript_EffectStatUp
BattleScript_EffectAccuracyUp:
setstatchanger STAT_ACC, 1, FALSE
goto BattleScript_EffectStatUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectEvasionUp::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_EVASION, 1, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectStatUp::
attackcanceler
BattleScript_EffectStatUpAfterAtkCanceler::
attackstring
ppreduce
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_StatUpEnd
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpAttackAnim
pause B_WAIT_TIME_SHORT
fixes and labels
2017-11-26 01:19:57 +01:00
goto BattleScript_StatUpPrintString
BattleScript_StatUpAttackAnim::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_StatUpDoAnim::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
setgraphicalstatchangevalues
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_StatUpPrintString::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_StatUpEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_StatUp::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_EFFECT_BATTLER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
Spectral Thief effect
2019-02-14 12:15:53 +01:00
BattleScript_StatUpMsg::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectAttackDown:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_ATK, 1, TRUE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatDown
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectDefenseDown:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_DEF, 1, TRUE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatDown
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectSpeedDown:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPEED, 1, TRUE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatDown
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectAccuracyDown:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_ACC, 1, TRUE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatDown
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectSpecialAttackDown:
setstatchanger STAT_SPATK, 1, TRUE
goto BattleScript_EffectStatDown
BattleScript_EffectSpecialDefenseDown:
setstatchanger STAT_SPDEF, 1, TRUE
goto BattleScript_EffectStatDown
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectEvasionDown:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_EVASION, 1, TRUE
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectStatDown:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailedAtkStringPpReduce
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
Captivate and new accuracy calc
2018-07-22 15:08:32 +02:00
BattleScript_StatDownFromAttackString:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_StatDownEnd
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_StatDownDoAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_StatDownEnd
pause B_WAIT_TIME_SHORT
fixes and labels
2017-11-26 01:19:57 +01:00
goto BattleScript_StatDownPrintString
BattleScript_StatDownDoAnim::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
setgraphicalstatchangevalues
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_StatDownPrintString::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatDownStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_StatDownEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_StatDown::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_EFFECT_BATTLER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatDownStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_EffectHaze::
attackcanceler
attackstring
ppreduce
attackanimation
waitanimation
normalisebuffs
printstring STRINGID_STATCHANGESGONE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectBide::
attackcanceler
attackstring
ppreduce
attackanimation
waitanimation
Move some vars to C
2019-01-13 13:15:23 +01:00
orword gHitMarker, HITMARKER_CHARGING
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
setbide
goto BattleScript_MoveEnd
BattleScript_EffectRampage::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
Label various battle scripts
2018-09-01 20:00:13 +02:00
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_EffectRampage2
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
ppreduce
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_EffectRampage2:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
confuseifrepeatingattackends
goto BattleScript_HitFromCritCalc
BattleScript_EffectRoar::
attackcanceler
attackstring
ppreduce
Proper Roar handling in double battles
2019-03-06 12:09:34 +01:00
jumpifroarfails BattleScript_ButItFailed
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
BattleScript_ForceRandomSwitch::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
forcerandomswitch BattleScript_ButItFailed
BattleScript_EffectMultiHit::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setmultihitcounter 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
initmultihitstring
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
sethword sMULTIHIT_EFFECT, 0
give some more labels to battle struct fields
2017-12-02 23:31:58 +01:00
BattleScript_MultiHitLoop::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
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
give some more labels to battle struct fields
2017-12-02 23:31:58 +01:00
BattleScript_DoMultiHit::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
movevaluescleanup
Change move effect to u16
2019-02-14 13:17:27 +01:00
copyhword sMOVE_EFFECT, sMULTIHIT_EFFECT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
critcalc
damagecalc
give some more labels to battle struct fields
2017-12-02 23:31:58 +01:00
jumpifmovehadnoeffect BattleScript_MultiHitNoMoreHits
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
effectivenesssound
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hitanimation BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
critmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
multihitresultmessage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_EMPTYSTRING3
Add WAIT_TIME battle script constants
2021-04-02 08:16:01 +02:00
waitmessage 1
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
addbyte sMULTIHIT_STRING + 4, 1
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendto MOVEEND_NEXT_TARGET
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
give some more labels to battle struct fields
2017-12-02 23:31:58 +01:00
decrementmultihit BattleScript_MultiHitLoop
goto BattleScript_MultiHitPrintStrings
BattleScript_MultiHitNoMoreHits::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
give some more labels to battle struct fields
2017-12-02 23:31:58 +01:00
BattleScript_MultiHitPrintStrings::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give some more labels to battle struct fields
2017-12-02 23:31:58 +01:00
jumpifmovehadnoeffect BattleScript_MultiHitEnd
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_HITXTIMES
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give some more labels to battle struct fields
2017-12-02 23:31:58 +01:00
BattleScript_MultiHitEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectwithchance
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_TARGET, FALSE, NULL
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendcase MOVEEND_SYNCHRONIZE_TARGET
merge
2019-11-10 12:09:14 +01:00
moveendfrom MOVEEND_STATUS_IMMUNITY_ABILITIES
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end
BattleScript_EffectConversion::
attackcanceler
attackstring
ppreduce
tryconversiontypechange BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNCHANGEDTYPE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectFlinchHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_FLINCH
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Last Resort, Fangs and Flare Blitz/Volt Tackle
2018-09-22 10:45:43 +02:00
BattleScript_EffectFlinchWithStatus:
setmoveeffect MOVE_EFFECT_FLINCH
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Last Resort, Fangs and Flare Blitz/Volt Tackle
2018-09-22 10:45:43 +02:00
resultmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Last Resort, Fangs and Flare Blitz/Volt Tackle
2018-09-22 10:45:43 +02:00
seteffectwithchance
argumentstatuseffect
tryfaintmon BS_TARGET, FALSE, NULL
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectRestoreHp::
attackcanceler
attackstring
ppreduce
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryhealhalfhealth BattleScript_AlreadyAtFullHp, BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Burn Up And Purify
2020-04-17 21:14:26 +02:00
BattleScript_RestoreHp:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNREGAINEDHEALTH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectToxic::
attackcanceler
attackstring
ppreduce
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
Comatose
2019-12-31 16:36:53 +01:00
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
jumpifflowerveil BattleScript_FlowerVeilProtects
Spaces to tabs
2019-12-18 22:03:01 +01:00
jumpifleafguard BattleScript_LeafGuardProtects
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailed
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
jumpifstatus BS_TARGET, STATUS1_POISON | STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
Corrosion (#306) * Status move poisoning for Steel and Poison types. * Can poison itself with Toxic Orb. * Secondary effect poisoning now working. * Created a function that checks if abilities can bypass type immunities. * Created macro to handle typeimmunity * Applied review changes. * Applied review requests. * Left more readable version of HOLD_EFFECT_TOXIC_ORB.
2020-04-21 15:59:19 +02:00
trypoisontype BS_ATTACKER, BS_TARGET, BattleScript_NotAffected
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
Infiltrator affects mist safeguard
2020-04-23 11:29:19 +02:00
jumpifsafeguard BattleScript_SafeguardProtected
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_TOXIC
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_AlreadyPoisoned::
Document battle arena
2018-11-11 18:33:16 +01:00
setalreadystatusedmoveattempt BS_ATTACKER
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNALREADYPOISONED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_ImmunityProtected::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
copybyte gEffectBattler, gBattlerTarget
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte cMULTISTRING_CHOOSER, B_MSG_ABILITY_PREVENTS_MOVE_STATUS
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
call BattleScript_PSNPrevention
goto BattleScript_MoveEnd
BattleScript_EffectPayDay::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_PAYDAY
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Aurora Veil, Revelation Dance, Diamond Storm
2018-11-03 14:35:45 +01:00
BattleScript_EffectAuroraVeil:
attackcanceler
attackstring
ppreduce
setauroraveil BS_ATTACKER
goto BattleScript_PrintReflectLightScreenSafeguardString
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectLightScreen::
attackcanceler
attackstring
ppreduce
setlightscreen
more battle labels
2017-11-26 17:15:28 +01:00
goto BattleScript_PrintReflectLightScreenSafeguardString
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectTriAttack::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_TRI_ATTACK
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectRest::
attackcanceler
attackstring
ppreduce
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_RestIsAlreadyAsleep
Comatose
2019-12-31 16:36:53 +01:00
jumpifability BS_ATTACKER, ABILITY_COMATOSE, BattleScript_RestIsAlreadyAsleep
more battle labels
2017-11-26 17:15:28 +01:00
jumpifcantmakeasleep BattleScript_RestCantSleep
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
trysetrest BattleScript_AlreadyAtFullHp
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gRestUsedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
goto BattleScript_PresentHealTarget
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_RestCantSleep::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gUproarAwakeStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_RestIsAlreadyAsleep::
Document battle arena
2018-11-11 18:33:16 +01:00
setalreadystatusedmoveattempt BS_ATTACKER
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNALREADYASLEEP2
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
BattleScript_EffectOHKO::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
typecalc
give names to some battlescripts
2017-12-02 00:03:46 +01:00
jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
tryKO BattleScript_KOFail
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
trysetdestinybondtohappen
goto BattleScript_HitFromAtkAnimation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
BattleScript_KOFail::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gKOFailedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_TwoTurnMovesSecondTurn::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_CHARGING
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sB_ANIM_TURN, 1
pokemon and battle constants
2018-02-08 11:17:41 +01:00
clearstatusfromeffect BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_NO_PPDEDUCT
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
argumenttomoveeffect
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromAccCheck
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
BattleScriptFirstChargingTurn::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
printstring STRINGID_EMPTYSTRING3
ppreduce
Corrected the order of actions in BattleScript_FirstChargingTurn
2021-02-08 21:40:37 +01:00
attackstring
pause 0x40 -> pause B_WAIT_TIME_LONG Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-22 21:34:39 +02:00
pause B_WAIT_TIME_LONG
Corrected the order of actions in BattleScript_FirstChargingTurn
2021-02-08 21:40:37 +01:00
copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID
printfromtable gFirstTurnOfTwoStringIds
waitmessage 0x40 -> waitmessage B_WAIT_TIME_LONG
2021-05-22 01:22:04 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Move some vars to C
2019-01-13 13:15:23 +01:00
orword gHitMarker, HITMARKER_CHARGING
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
return
BattleScript_EffectSuperFang::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
bichalfword gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
damagetohalftargethp
goto BattleScript_HitFromAtkAnimation
BattleScript_EffectDragonRage::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
bichalfword gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
create setword macro
2017-11-25 21:11:20 +01:00
setword gBattleMoveDamage, 40
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromAtkAnimation
BattleScript_EffectTrap::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_WRAP
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 17:38:54 +02:00
BattleScript_EffectTripleHit::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
setmultihitcounter 3
initmultihitstring
sethword sMULTIHIT_EFFECT, 0
goto BattleScript_MultiHitLoop
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectDoubleHit::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setmultihitcounter 2
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
initmultihitstring
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
sethword sMULTIHIT_EFFECT, 0
give some more labels to battle struct fields
2017-12-02 23:31:58 +01:00
goto BattleScript_MultiHitLoop
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectRecoilIfMiss::
attackcanceler
give names to some battlescripts
2017-12-02 00:03:46 +01:00
accuracycheck BattleScript_MoveMissedDoDamage, ACC_CURR_MOVE
Add config options for Jump Kick Added options for: - Gen 4 style recoil when target is immune (user takes 50% of target's max HP) - Gen 3 style recoil when target is immune (i.e no recoil) - Gen 5+ recoil was already implemented but was bugged
2020-12-07 07:30:31 +01:00
.if B_CRASH_IF_TARGET_IMMUNE >= GEN_4
Fix Jump Kick * Now inflicts recoil damage on the user if the target was immune to the attack * Gen V+ recoil damage is now half of the user's HP instead of half of the target's HP.
2020-12-06 04:14:02 +01:00
typecalc
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveMissedDoDamage
Add config options for Jump Kick Added options for: - Gen 4 style recoil when target is immune (user takes 50% of target's max HP) - Gen 3 style recoil when target is immune (i.e no recoil) - Gen 5+ recoil was already implemented but was bugged
2020-12-07 07:30:31 +01:00
.endif
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromAtkString
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_MoveMissedDoDamage::
Magic Guard protects from stuff
2020-04-13 15:49:40 +02:00
jumpifability BS_ATTACKER, ABILITY_MAGIC_GUARD, BattleScript_PrintMoveMissed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Add config options for Jump Kick Added options for: - Gen 4 style recoil when target is immune (user takes 50% of target's max HP) - Gen 3 style recoil when target is immune (i.e no recoil) - Gen 5+ recoil was already implemented but was bugged
2020-12-07 07:30:31 +01:00
.if B_CRASH_IF_TARGET_IMMUNE < GEN_4
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd
Add config options for Jump Kick Added options for: - Gen 4 style recoil when target is immune (user takes 50% of target's max HP) - Gen 3 style recoil when target is immune (i.e no recoil) - Gen 5+ recoil was already implemented but was bugged
2020-12-07 07:30:31 +01:00
.endif
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNCRASHED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
damagecalc
typecalc
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
Add config options for Jump Kick Added options for: - Gen 4 style recoil when target is immune (user takes 50% of target's max HP) - Gen 3 style recoil when target is immune (i.e no recoil) - Gen 5+ recoil was already implemented but was bugged
2020-12-07 07:30:31 +01:00
.if B_CRASH_IF_TARGET_IMMUNE == GEN_4
manipulatedamage DMG_RECOIL_FROM_IMMUNE
.else
Update BS constants for Cmd rename
2019-09-15 23:58:12 +02:00
manipulatedamage DMG_RECOIL_FROM_MISS
Add config options for Jump Kick Added options for: - Gen 4 style recoil when target is immune (user takes 50% of target's max HP) - Gen 3 style recoil when target is immune (i.e no recoil) - Gen 5+ recoil was already implemented but was bugged
2020-12-07 07:30:31 +01:00
.endif
.if B_CRASH_IF_TARGET_IMMUNE >= GEN_4
Fix Jump Kick * Now inflicts recoil damage on the user if the target was immune to the attack * Gen V+ recoil damage is now half of the user's HP instead of half of the target's HP.
2020-12-06 04:14:02 +01:00
bichalfword gMoveResultFlags, MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE
Add config options for Jump Kick Added options for: - Gen 4 style recoil when target is immune (user takes 50% of target's max HP) - Gen 3 style recoil when target is immune (i.e no recoil) - Gen 5+ recoil was already implemented but was bugged
2020-12-07 07:30:31 +01:00
.else
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
bichalfword gMoveResultFlags, MOVE_RESULT_MISSED
Add config options for Jump Kick Added options for: - Gen 4 style recoil when target is immune (user takes 50% of target's max HP) - Gen 3 style recoil when target is immune (i.e no recoil) - Gen 5+ recoil was already implemented but was bugged
2020-12-07 07:30:31 +01:00
.endif
Fix many Disguise bugs Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
2021-09-06 08:27:42 +02:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
tryfaintmon BS_ATTACKER, FALSE, NULL
Add config options for Jump Kick Added options for: - Gen 4 style recoil when target is immune (user takes 50% of target's max HP) - Gen 3 style recoil when target is immune (i.e no recoil) - Gen 5+ recoil was already implemented but was bugged
2020-12-07 07:30:31 +01:00
.if B_CRASH_IF_TARGET_IMMUNE >= GEN_4
Fix Jump Kick * Now inflicts recoil damage on the user if the target was immune to the attack * Gen V+ recoil damage is now half of the user's HP instead of half of the target's HP.
2020-12-06 04:14:02 +01:00
orhalfword gMoveResultFlags, MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE
Add config options for Jump Kick Added options for: - Gen 4 style recoil when target is immune (user takes 50% of target's max HP) - Gen 3 style recoil when target is immune (i.e no recoil) - Gen 5+ recoil was already implemented but was bugged
2020-12-07 07:30:31 +01:00
.else
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
orhalfword gMoveResultFlags, MOVE_RESULT_MISSED
Add config options for Jump Kick Added options for: - Gen 4 style recoil when target is immune (user takes 50% of target's max HP) - Gen 3 style recoil when target is immune (i.e no recoil) - Gen 5+ recoil was already implemented but was bugged
2020-12-07 07:30:31 +01:00
.endif
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectMist::
attackcanceler
attackstring
ppreduce
setmist
attackanimation
waitanimation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gMistUsedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
BattleScript_EffectFocusEnergy:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus2 BS_ATTACKER, STATUS2_FOCUS_ENERGY, BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
setfocusenergy
attackanimation
waitanimation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gFocusEnergyUsedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
BattleScript_EffectConfuse:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailed
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus2 BS_TARGET, STATUS2_CONFUSION, BattleScript_AlreadyConfused
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
Infiltrator affects mist safeguard
2020-04-23 11:29:19 +02:00
jumpifsafeguard BattleScript_SafeguardProtected
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_CONFUSION
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
BattleScript_AlreadyConfused::
Document battle arena
2018-11-11 18:33:16 +01:00
setalreadystatusedmoveattempt BS_ATTACKER
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNALREADYCONFUSED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectAttackUp2::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_ATK, 2, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatUp
BattleScript_EffectDefenseUp2::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_DEF, 2, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatUp
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
BattleScript_EffectDefenseUp3:
setstatchanger STAT_DEF, 3, FALSE
goto BattleScript_EffectStatUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectSpeedUp2::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPEED, 2, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatUp
BattleScript_EffectSpecialAttackUp2::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPATK, 2, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatUp
Misc. move updates Bind: 75% Acc -> 85% Acc Disable: 55% Acc. -> 100% Acc. Freeze-Dry: 10% chance to freeze Hammer Arm and Ice Hammer: lower user's speed High Jump Kick: 130BP, 10 PP Jump Kick: 100BP, 10 PP Tail Glow: raises Sp. Atk by 3 stages Waterfall: 20% chance to flinch
2019-03-31 17:23:41 +02:00
BattleScript_EffectSpecialAttackUp3::
setstatchanger STAT_SPATK, 3, FALSE
goto BattleScript_EffectStatUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectSpecialDefenseUp2::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPDEF, 2, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatUp
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectAccuracyUp2:
setstatchanger STAT_ACC, 2, FALSE
goto BattleScript_EffectStatUp
BattleScript_EffectEvasionUp2:
setstatchanger STAT_EVASION, 2, FALSE
goto BattleScript_EffectStatUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectTransform::
attackcanceler
attackstring
ppreduce
transformdataexecution
attackanimation
waitanimation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gTransformUsedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectAttackDown2:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_ATK, 2, TRUE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatDown
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectDefenseDown2:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_DEF, 2, TRUE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatDown
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectSpeedDown2:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPEED, 2, TRUE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatDown
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectSpecialDefenseDown2:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPDEF, 2, TRUE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatDown
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectSpecialAttackDown2:
setstatchanger STAT_SPATK, 2, TRUE
goto BattleScript_EffectStatDown
BattleScript_EffectAccuracyDown2:
setstatchanger STAT_ACC, 2, TRUE
goto BattleScript_EffectStatDown
BattleScript_EffectEvasionDown2:
setstatchanger STAT_EVASION, 2, TRUE
goto BattleScript_EffectStatDown
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectReflect::
attackcanceler
attackstring
ppreduce
setreflect
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_PrintReflectLightScreenSafeguardString::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gReflectLightScreenSafeguardStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectPoison::
attackcanceler
attackstring
ppreduce
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
Comatose
2019-12-31 16:36:53 +01:00
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
jumpifflowerveil BattleScript_FlowerVeilProtects
Spaces to tabs
2019-12-18 22:03:01 +01:00
jumpifleafguard BattleScript_LeafGuardProtects
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailed
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus BS_TARGET, STATUS1_POISON, BattleScript_AlreadyPoisoned
jumpifstatus BS_TARGET, STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
Corrosion (#306) * Status move poisoning for Steel and Poison types. * Can poison itself with Toxic Orb. * Secondary effect poisoning now working. * Created a function that checks if abilities can bypass type immunities. * Created macro to handle typeimmunity * Applied review changes. * Applied review requests. * Left more readable version of HOLD_EFFECT_TOXIC_ORB.
2020-04-21 15:59:19 +02:00
trypoisontype BS_ATTACKER, BS_TARGET, BattleScript_NotAffected
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
Infiltrator affects mist safeguard
2020-04-23 11:29:19 +02:00
jumpifsafeguard BattleScript_SafeguardProtected
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_POISON
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Couple bug fixes
2018-08-11 12:16:00 +02:00
BattleScript_EffectParalyze:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifability BS_TARGET, ABILITY_LIMBER, BattleScript_LimberProtected
Comatose
2019-12-31 16:36:53 +01:00
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
jumpifflowerveil BattleScript_FlowerVeilProtects
Spaces to tabs
2019-12-18 22:03:01 +01:00
jumpifleafguard BattleScript_LeafGuardProtects
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
typecalc
give names to some battlescripts
2017-12-02 00:03:46 +01:00
jumpifmovehadnoeffect BattleScript_ButItFailed
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus BS_TARGET, STATUS1_PARALYSIS, BattleScript_AlreadyParalyzed
Battle Configs: The Revenge (#363) * Turns for Uproar * Chances for the amount of hits with multi-hit moves. * Electric type mon's immunity to paralysis * (Hi) Jump Kick to always do 1/2 of maxHP when crashing * Turns for Disable. * Minimized mons can always be hit by moves like Stomp * Grass types immune to powder and spore moves. * Psywave's damage formula * Fixed random usage.
2020-05-28 10:38:27 +02:00
tryparalyzetype BS_ATTACKER, BS_TARGET, BattleScript_NotAffected
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
Infiltrator affects mist safeguard
2020-04-23 11:29:19 +02:00
jumpifsafeguard BattleScript_SafeguardProtected
Couple bug fixes
2018-08-11 12:16:00 +02:00
bichalfword gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_PARALYSIS
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Couple bug fixes
2018-08-11 12:16:00 +02:00
BattleScript_AlreadyParalyzed:
Document battle arena
2018-11-11 18:33:16 +01:00
setalreadystatusedmoveattempt BS_ATTACKER
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNISALREADYPARALYZED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_LimberProtected::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
copybyte gEffectBattler, gBattlerTarget
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte cMULTISTRING_CHOOSER, B_MSG_ABILITY_PREVENTS_MOVE_STATUS
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
call BattleScript_PRLZPrevention
goto BattleScript_MoveEnd
BattleScript_EffectAttackDownHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_ATK_MINUS_1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectDefenseDownHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_DEF_MINUS_1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectSpeedDownHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_SPD_MINUS_1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectSpecialAttackDownHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_SP_ATK_MINUS_1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectSpecialDefenseDownHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_SP_DEF_MINUS_1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
BattleScript_EffectSpecialDefenseDownHit2::
setmoveeffect MOVE_EFFECT_SP_DEF_MINUS_2
goto BattleScript_EffectHit
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectAccuracyDownHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_ACC_MINUS_1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
Power Herb
2020-04-22 10:44:19 +02:00
BattleScript_PowerHerbActivation:
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_POWERHERB
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Power Herb
2020-04-22 10:44:19 +02:00
removeitem BS_ATTACKER
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
BattleScript_EffectTwoTurnsAttack::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
jumpifmove MOVE_SKY_ATTACK, BattleScript_EffectTwoTurnsAttackSkyAttack
jumpifmove MOVE_RAZOR_WIND, BattleScript_EffectTwoTurnsAttackRazorWind
jumpifmove MOVE_ICE_BURN, BattleScript_EffectTwoTurnsAttackIceBurn
jumpifmove MOVE_FREEZE_SHOCK, BattleScript_EffectTwoTurnsAttackFreezeShock
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_RAZOR_WIND
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
BattleScript_EffectTwoTurnsAttackContinue:
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
call BattleScriptFirstChargingTurn
Power Herb
2020-04-22 10:44:19 +02:00
jumpifnoholdeffect BS_ATTACKER, HOLD_EFFECT_POWER_HERB, BattleScript_MoveEnd
call BattleScript_PowerHerbActivation
goto BattleScript_TwoTurnMovesSecondTurn
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
BattleScript_EffectTwoTurnsAttackSkyAttack:
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_SKY_ATTACK
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
goto BattleScript_EffectTwoTurnsAttackContinue
BattleScript_EffectTwoTurnsAttackRazorWind:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_RAZOR_WIND
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
goto BattleScript_EffectTwoTurnsAttackContinue
BattleScript_EffectTwoTurnsAttackIceBurn:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_RAZOR_WIND
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
goto BattleScript_EffectTwoTurnsAttackContinue
BattleScript_EffectTwoTurnsAttackFreezeShock:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_FREEZE_SHOCK
Geomancy
2020-04-20 19:02:03 +02:00
goto BattleScript_EffectTwoTurnsAttackContinue
BattleScript_EffectGeomancy:
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_GeomancySecondTurn
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_GeomancySecondTurn
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_GEOMANCY
Geomancy
2020-04-20 19:02:03 +02:00
call BattleScriptFirstChargingTurn
Power Herb
2020-04-22 10:44:19 +02:00
jumpifnoholdeffect BS_ATTACKER, HOLD_EFFECT_POWER_HERB, BattleScript_MoveEnd
call BattleScript_PowerHerbActivation
Geomancy
2020-04-20 19:02:03 +02:00
BattleScript_GeomancySecondTurn:
attackcanceler
setmoveeffect MOVE_EFFECT_CHARGING
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte sB_ANIM_TURN, 1
Geomancy
2020-04-20 19:02:03 +02:00
clearstatusfromeffect BS_ATTACKER
orword gHitMarker, HITMARKER_NO_PPDEDUCT
attackstring
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_GeomancyDoMoveAnim
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_GeomancyDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
Geomancy
2020-04-20 19:02:03 +02:00
BattleScript_GeomancyDoMoveAnim::
attackanimation
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF | BIT_SPEED, 0
Geomancy
2020-04-20 19:02:03 +02:00
setstatchanger STAT_SPATK, 2, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_GeomancyTrySpDef
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GeomancyTrySpDef
Geomancy
2020-04-20 19:02:03 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Geomancy
2020-04-20 19:02:03 +02:00
BattleScript_GeomancyTrySpDef::
setstatchanger STAT_SPDEF, 2, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_GeomancyTrySpeed
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GeomancyTrySpeed
Geomancy
2020-04-20 19:02:03 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Geomancy
2020-04-20 19:02:03 +02:00
BattleScript_GeomancyTrySpeed::
setstatchanger STAT_SPEED, 2, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_GeomancyEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GeomancyEnd
Geomancy
2020-04-20 19:02:03 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Geomancy
2020-04-20 19:02:03 +02:00
BattleScript_GeomancyEnd::
goto BattleScript_MoveEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectConfuseHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_CONFUSION
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectTwineedle::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
Change move effect to u16
2019-02-14 13:17:27 +01:00
sethword sMULTIHIT_EFFECT, MOVE_EFFECT_POISON
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setmultihitcounter 2
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
initmultihitstring
give some more labels to battle struct fields
2017-12-02 23:31:58 +01:00
goto BattleScript_MultiHitLoop
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectSubstitute::
attackcanceler
ppreduce
attackstring
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus2 BS_ATTACKER, STATUS2_SUBSTITUTE, BattleScript_AlreadyHasSubstitute
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
setsubstitute
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_SUBSTITUTE_FAILED, BattleScript_SubstituteAnim
pause B_WAIT_TIME_SHORT
more battle labels
2017-11-26 17:15:28 +01:00
goto BattleScript_SubstituteString
BattleScript_SubstituteAnim::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SubstituteString::
Fix Substitute typo
2021-05-07 02:49:04 +02:00
printfromtable gSubstituteUsedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_AlreadyHasSubstitute::
Document battle arena
2018-11-11 18:33:16 +01:00
setalreadystatusedmoveattempt BS_ATTACKER
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNHASSUBSTITUTE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectRecharge::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_RECHARGE | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromAtkString
BattleScript_MoveUsedMustRecharge::
printstring STRINGID_PKMNMUSTRECHARGE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectRage::
attackcanceler
fixes and labels
2017-11-26 01:19:57 +01:00
accuracycheck BattleScript_RageMiss, ACC_CURR_MOVE
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_RAGE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
setmoveeffect 0
goto BattleScript_HitFromAtkString
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_RageMiss::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_RAGE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
clearstatusfromeffect BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_PrintMoveMissed
BattleScript_EffectMimic::
attackcanceler
attackstring
ppreduce
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
mimicattackcopy BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNLEARNEDMOVE2
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectMetronome::
attackcanceler
attackstring
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sB_ANIM_TURN, 0
setbyte sB_ANIM_TARGETS_HIT, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
metronome
fixes and labels
2017-11-26 01:19:57 +01:00
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectLeechSeed::
attackcanceler
attackstring
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
ppreduce
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailed
more battle labels
2017-11-26 17:15:28 +01:00
accuracycheck BattleScript_DoLeechSeed, ACC_CURR_MOVE
BattleScript_DoLeechSeed::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
setseeded
attackanimation
waitanimation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gLeechSeedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Three pointless moves Celebrate, Hold Hands and Happy Hour. Yay(!) Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money. Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-03 21:33:37 +02:00
BattleScript_EffectDoNothing::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
Three pointless moves Celebrate, Hold Hands and Happy Hour. Yay(!) Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money. Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-03 21:33:37 +02:00
jumpifmove MOVE_HOLD_HANDS, BattleScript_EffectHoldHands
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Three pointless moves Celebrate, Hold Hands and Happy Hour. Yay(!) Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money. Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-03 21:33:37 +02:00
jumpifmove MOVE_CELEBRATE, BattleScript_EffectCelebrate
jumpifmove MOVE_HAPPY_HOUR, BattleScript_EffectHappyHour
Label most of the anim tags
2018-10-06 09:37:52 +02:00
incrementgamestat GAME_STAT_USED_SPLASH
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_BUTNOTHINGHAPPENED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Three pointless moves Celebrate, Hold Hands and Happy Hour. Yay(!) Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money. Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-03 21:33:37 +02:00
BattleScript_EffectHoldHands:
jumpifsideaffecting BS_TARGET, SIDE_STATUS_CRAFTY_SHIELD, BattleScript_ButItFailed
Hold Hands fix Better check for valid ally. If there isn't one, the target defaults to the attacker, causing the move to fail.
2019-04-06 23:23:34 +02:00
jumpifbyteequal gBattlerTarget, gBattlerAttacker, BattleScript_ButItFailed
Three pointless moves Celebrate, Hold Hands and Happy Hour. Yay(!) Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money. Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-03 21:33:37 +02:00
attackanimation
waitanimation
goto BattleScript_MoveEnd
BattleScript_EffectCelebrate:
printstring STRINGID_CELEBRATEMESSAGE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Three pointless moves Celebrate, Hold Hands and Happy Hour. Yay(!) Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money. Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-03 21:33:37 +02:00
goto BattleScript_MoveEnd
BattleScript_EffectHappyHour:
setmoveeffect MOVE_EFFECT_HAPPY_HOUR
seteffectprimary
goto BattleScript_MoveEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectDisable::
attackcanceler
attackstring
ppreduce
Aroma Veil
2019-04-01 11:42:37 +02:00
jumpifability BS_TARGET_SIDE, ABILITY_AROMA_VEIL, BattleScript_AromaVeilProtects
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
disablelastusedattack BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNMOVEWASDISABLED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectLevelDamage::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
bichalfword gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
dmgtolevel
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromAtkAnimation
BattleScript_EffectPsywave::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
bichalfword gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
psywavedamageeffect
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromAtkAnimation
BattleScript_EffectCounter::
attackcanceler
counterdamagecalculator BattleScript_ButItFailedAtkStringPpReduce
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
Fix Counter and Mirror Coat
2018-07-28 10:58:47 +02:00
typecalc
bichalfword gMoveResultFlags, MOVE_RESULT_NOT_VERY_EFFECTIVE | MOVE_RESULT_SUPER_EFFECTIVE
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromAtkAnimation
BattleScript_EffectEncore::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
Aroma Veil
2019-04-01 11:42:37 +02:00
jumpifability BS_TARGET_SIDE, ABILITY_AROMA_VEIL, BattleScript_AromaVeilProtects
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
trysetencore BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNGOTENCORE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectPainSplit::
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
painsplitdmgcalc BattleScript_ButItFailed
attackanimation
waitanimation
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
add more battlescript macros
2017-11-25 21:32:17 +01:00
copyword gBattleMoveDamage, sPAINSPLIT_HP
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_SHAREDPAIN
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectSnore::
attackcanceler
Comatose
2019-12-31 16:36:53 +01:00
jumpifability BS_ATTACKER, ABILITY_COMATOSE, BattleScript_SnoreIsAsleep
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_SnoreIsAsleep
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
goto BattleScript_ButItFailed
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SnoreIsAsleep::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoSnore
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNFASTASLEEP
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
statusanimation BS_ATTACKER
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_DoSnore::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_FLINCH
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromCritCalc
BattleScript_EffectConversion2::
attackcanceler
attackstring
ppreduce
settypetorandomresistance BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNCHANGEDTYPE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectLockOn::
attackcanceler
attackstring
ppreduce
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
setalwayshitflag
attackanimation
waitanimation
printstring STRINGID_PKMNTOOKAIM
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectSketch::
attackcanceler
attackstring
ppreduce
copymovepermanently BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNSKETCHEDMOVE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectSleepTalk::
attackcanceler
Comatose
2019-12-31 16:36:53 +01:00
jumpifability BS_ATTACKER, ABILITY_COMATOSE, BattleScript_SleepTalkIsAsleep
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_SleepTalkIsAsleep
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
goto BattleScript_ButItFailed
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_SleepTalkIsAsleep::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNFASTASLEEP
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
statusanimation BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
orword gHitMarker, HITMARKER_NO_PPDEDUCT
fixes and labels
2017-11-26 01:19:57 +01:00
trychoosesleeptalkmove BattleScript_SleepTalkUsingMove
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_ButItFailed
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_SleepTalkUsingMove::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sB_ANIM_TURN, 0
setbyte sB_ANIM_TARGETS_HIT, 0
calledattack to calledmove
2018-09-22 19:08:41 +02:00
jumptocalledmove TRUE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectDestinyBond::
attackcanceler
attackstring
ppreduce
setdestinybond
attackanimation
waitanimation
printstring STRINGID_PKMNTRYINGTOTAKEFOE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
add eerie spell, surging strikes, jungle healing
2021-01-28 18:51:00 +01:00
BattleScript_EffectEerieSpell::
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
waitmessage 0x40
resultmessage
waitmessage 0x40
tryfaintmon BS_TARGET, FALSE, NULL
eeriespellppreduce BattleScript_MoveEnd
printstring STRINGID_PKMNREDUCEDPP
goto BattleScript_MoveEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectSpite::
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
tryspiteppreduce BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNREDUCEDPP
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectHealBell::
attackcanceler
attackstring
ppreduce
healpartystatus
waitstate
attackanimation
waitanimation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gPartyStatusHealStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
jumpifnotmove MOVE_HEAL_BELL, BattleScript_PartyHealEnd
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_NO_COMMON_BITS, cMULTISTRING_CHOOSER, B_MSG_BELL_SOUNDPROOF_ATTACKER, BattleScript_CheckHealBellMon2Unaffected
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXBLOCKSY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_CheckHealBellMon2Unaffected::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_NO_COMMON_BITS, cMULTISTRING_CHOOSER, B_MSG_BELL_SOUNDPROOF_PARTNER, BattleScript_PartyHealEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXBLOCKSY2
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_PartyHealEnd::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_ATTACKER_WITH_PARTNER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
goto BattleScript_MoveEnd
BattleScript_EffectTripleKick::
attackcanceler
attackstring
ppreduce
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
sethword sTRIPLE_KICK_POWER, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
initmultihitstring
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setmultihit 3
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
BattleScript_TripleKickLoop::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifhasnohp BS_ATTACKER, BattleScript_TripleKickEnd
jumpifhasnohp BS_TARGET, BattleScript_TripleKickNoMoreHits
jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoTripleKickAttack
jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_TripleKickNoMoreHits
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_DoTripleKickAttack::
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
accuracycheck BattleScript_TripleKickNoMoreHits, ACC_CURR_MOVE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
movevaluescleanup
add eerie spell, surging strikes, jungle healing
2021-01-28 18:51:00 +01:00
jumpifmove MOVE_SURGING_STRIKES, EffectTripleKick_DoDmgCalcs @ no power boost each hit
jumpifmove MOVE_TRIPLE_AXEL, EffectTripleKick_TripleAxelBoost @ triple axel gets +20 power
addbyte sTRIPLE_KICK_POWER, 10 @ triple kick gets +10 power
goto EffectTripleKick_DoDmgCalcs
EffectTripleKick_TripleAxelBoost:
addbyte sTRIPLE_KICK_POWER, 20
EffectTripleKick_DoDmgCalcs:
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
addbyte sTRIPLE_KICK_POWER, 10
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
addbyte sMULTIHIT_STRING + 4, 1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
critcalc
damagecalc
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
give names to some battlescripts
2017-12-02 00:03:46 +01:00
jumpifmovehadnoeffect BattleScript_TripleKickNoMoreHits
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
effectivenesssound
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hitanimation BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
critmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_EMPTYSTRING3
Add WAIT_TIME battle script constants
2021-04-02 08:16:01 +02:00
waitmessage 1
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendto MOVEEND_NEXT_TARGET
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_TripleKickPrintStrings
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
decrementmultihit BattleScript_TripleKickLoop
goto BattleScript_TripleKickPrintStrings
BattleScript_TripleKickNoMoreHits::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
jumpifbyte CMP_EQUAL, sMULTIHIT_STRING + 4, 0, BattleScript_TripleKickPrintStrings
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
bichalfword gMoveResultFlags, MOVE_RESULT_MISSED
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
BattleScript_TripleKickPrintStrings::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
jumpifbyte CMP_EQUAL, sMULTIHIT_STRING + 4, 0, BattleScript_TripleKickEnd
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_TripleKickEnd
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_HITXTIMES
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
BattleScript_TripleKickEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectwithchance
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_TARGET, FALSE, NULL
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendfrom MOVEEND_UPDATE_LAST_MOVES
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end
BattleScript_EffectThief::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_STEAL_ITEM
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Flower Shield and protect moves
2018-10-06 15:50:35 +02:00
BattleScript_EffectHitPreventEscape:
setmoveeffect MOVE_EFFECT_PREVENT_ESCAPE
goto BattleScript_EffectHit
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectMeanLook::
attackcanceler
attackstring
ppreduce
Moves with accuracy 0 bypass accuracy checks; Heal Block move effect done
2018-07-30 20:41:16 +02:00
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus2 BS_TARGET, STATUS2_ESCAPE_PREVENTION, BattleScript_ButItFailed
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_PREVENT_ESCAPE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
printstring STRINGID_TARGETCANTESCAPENOW
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectNightmare::
attackcanceler
attackstring
ppreduce
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailed
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus2 BS_TARGET, STATUS2_NIGHTMARE, BattleScript_ButItFailed
jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_NightmareWorked
Comatose
2019-12-31 16:36:53 +01:00
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_NightmareWorked
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_ButItFailed
BattleScript_NightmareWorked::
attackanimation
waitanimation
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_NIGHTMARE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
printstring STRINGID_PKMNFELLINTONIGHTMARE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectMinimize::
attackcanceler
setminimize
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_EVASION, 1, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectStatUpAfterAtkCanceler
BattleScript_EffectCurse::
Get rid of duplicate bs command jumpiftype
2018-07-14 12:02:29 +02:00
jumpiftype BS_ATTACKER, TYPE_GHOST, BattleScript_GhostCurse
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
Add stat stage constants
2020-08-05 02:33:05 +02:00
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, MIN_STAT_STAGE, BattleScript_CurseTrySpeed
jumpifstat BS_ATTACKER, CMP_NOT_EQUAL, STAT_ATK, MAX_STAT_STAGE, BattleScript_CurseTrySpeed
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MAX_STAT_STAGE, BattleScript_ButItFailed
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_CurseTrySpeed::
more renaming
2018-02-06 23:09:39 +01:00
copybyte gBattlerTarget, gBattlerAttacker
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sB_ANIM_TURN, 1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPEED, 1, TRUE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseTryAttack
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatDownStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_CurseTryAttack::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_ATK, 1, FALSE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseTryDefense
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
BattleScript_CurseTryDefense::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_DEF, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseEnd
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_CurseEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_GhostCurse::
more renaming
2018-02-06 23:09:39 +01:00
jumpifbytenotequal gBattlerAttacker, gBattlerTarget, BattleScript_DoGhostCurse
pokemon and battle constants
2018-02-08 11:17:41 +01:00
getmovetarget BS_ATTACKER
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_DoGhostCurse::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
cursetarget BattleScript_ButItFailed
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sB_ANIM_TURN, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNLAIDCURSE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Mat Block Nothing more needs to be said
2019-03-31 18:17:13 +02:00
BattleScript_EffectMatBlock::
attackcanceler
jumpifnotfirstturn BattleScript_ButItFailedAtkStringPpReduce
goto BattleScript_ProtectLikeAtkString
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectProtect::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
BattleScript_EffectEndure::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
Mat Block Nothing more needs to be said
2019-03-31 18:17:13 +02:00
BattleScript_ProtectLikeAtkString:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
setprotectlike
attackanimation
waitanimation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gProtectLikeUsedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectSpikes::
attackcanceler
trysetspikes BattleScript_ButItFailedAtkStringPpReduce
attackstring
ppreduce
attackanimation
waitanimation
printstring STRINGID_SPIKESSCATTERED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Couple bug fixes
2018-08-11 12:16:00 +02:00
BattleScript_EffectForesight:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
Couple bug fixes
2018-08-11 12:16:00 +02:00
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
jumpifstatus2 BS_TARGET, STATUS2_FORESIGHT, BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
setforesight
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
BattleScript_IdentifiedFoe:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
printstring STRINGID_PKMNIDENTIFIED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectPerishSong::
attackcanceler
attackstring
ppreduce
trysetperishsong BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_FAINTINTHREE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sBATTLER, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_PerishSongLoop::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifability BS_SCRIPTING, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_PerishSongLoopIncrement::
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
addbyte sBATTLER, 1
Make battle tower compile
2018-10-27 00:04:18 +02:00
jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_PerishSongLoop
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_PerishSongNotAffected::
printstring STRINGID_PKMNSXBLOCKSY2
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_PerishSongLoopIncrement
BattleScript_EffectSandstorm::
attackcanceler
attackstring
ppreduce
setsandstorm
more battle labels
2017-11-26 17:15:28 +01:00
goto BattleScript_MoveWeatherChange
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectRollout::
attackcanceler
attackstring
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_RolloutCheckAccuracy
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
ppreduce
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_RolloutCheckAccuracy::
accuracycheck BattleScript_RolloutHit, ACC_CURR_MOVE
BattleScript_RolloutHit::
Fix Counter and Mirror Coat
2018-07-28 10:58:47 +02:00
typecalc
Fix dynamic move power moves, get rid of gDynamicBasePower' '
2018-07-16 21:42:03 +02:00
handlerollout
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromCritCalc
BattleScript_EffectSwagger::
attackcanceler
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_MakeMoveMissed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifconfusedandstatmaxed STAT_ATK, BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_ATK, 2, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_SwaggerTryConfuse
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SwaggerTryConfuse
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
setgraphicalstatchangevalues
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Small change
2018-07-16 21:56:11 +02:00
BattleScript_SwaggerTryConfuse:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
Infiltrator affects mist safeguard
2020-04-23 11:29:19 +02:00
jumpifsafeguard BattleScript_SafeguardProtected
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_CONFUSION
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
goto BattleScript_MoveEnd
Small change
2018-07-16 21:56:11 +02:00
BattleScript_EffectFuryCutter:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
more battle labels
2017-11-26 17:15:28 +01:00
accuracycheck BattleScript_FuryCutterHit, ACC_CURR_MOVE
Small change
2018-07-16 21:56:11 +02:00
BattleScript_FuryCutterHit:
Fix dynamic move power moves, get rid of gDynamicBasePower' '
2018-07-16 21:42:03 +02:00
handlefurycutter
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
critcalc
damagecalc
give names to some battlescripts
2017-12-02 00:03:46 +01:00
jumpifmovehadnoeffect BattleScript_FuryCutterHit
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromAtkAnimation
Destiny Knot
2020-04-22 14:40:44 +02:00
BattleScript_TryDestinyKnotTarget:
jumpifnoholdeffect BS_ATTACKER, HOLD_EFFECT_DESTINY_KNOT, BattleScript_TryDestinyKnotTargetRet
infatuatewithbattler BS_TARGET, BS_ATTACKER
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
waitanimation
status2animation BS_TARGET, STATUS2_INFATUATION
waitanimation
printstring STRINGID_DESTINYKNOTACTIVATES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Destiny Knot
2020-04-22 14:40:44 +02:00
BattleScript_TryDestinyKnotTargetRet:
return
BattleScript_TryDestinyKnotAttacker:
jumpifnoholdeffect BS_TARGET, HOLD_EFFECT_DESTINY_KNOT, BattleScript_TryDestinyKnotAttackerRet
infatuatewithbattler BS_ATTACKER, BS_TARGET
playanimation BS_TARGET, B_ANIM_HELD_ITEM_EFFECT, NULL
waitanimation
status2animation BS_ATTACKER, STATUS2_INFATUATION
waitanimation
printstring STRINGID_DESTINYKNOTACTIVATES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Destiny Knot
2020-04-22 14:40:44 +02:00
BattleScript_TryDestinyKnotAttackerRet:
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectAttract::
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
Aroma Veil
2019-04-01 11:42:37 +02:00
jumpifability BS_TARGET_SIDE, ABILITY_AROMA_VEIL, BattleScript_AromaVeilProtects
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
tryinfatuating BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNFELLINLOVE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Destiny Knot
2020-04-22 14:40:44 +02:00
call BattleScript_TryDestinyKnotAttacker
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectPresent::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc
presentdamagecalculation
add more battlescript macros
2017-11-25 21:32:17 +01:00
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectSafeguard::
attackcanceler
attackstring
ppreduce
setsafeguard
more battle labels
2017-11-26 17:15:28 +01:00
goto BattleScript_PrintReflectLightScreenSafeguardString
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectMagnitude::
Change inner structure of semi invulerable moves
2020-04-11 11:47:13 +02:00
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_NO_PPDEDUCT, BattleScript_EffectMagnitudeTarget
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
magnitudedamagecalculation
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_MAGNITUDESTRENGTH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Change inner structure of semi invulerable moves
2020-04-11 11:47:13 +02:00
BattleScript_EffectMagnitudeTarget:
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
goto BattleScript_HitFromCritCalc
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectBatonPass::
attackcanceler
attackstring
ppreduce
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed
Update BS constants for Cmd rename
2019-09-15 23:58:12 +02:00
jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Healing Wish and Lunar Dance
2018-07-26 20:36:16 +02:00
openpartyscreen BS_ATTACKER, BattleScript_ButItFailed
pokemon and battle constants
2018-02-08 11:17:41 +01:00
switchoutabilities BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
switchhandleorder BS_ATTACKER, 2
pokemon and battle constants
2018-02-08 11:17:41 +01:00
returntoball BS_ATTACKER
getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_SWITCHINMON
pokemon and battle constants
2018-02-08 11:17:41 +01:00
switchinanim BS_ATTACKER, TRUE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
switchineffects BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectRapidSpin::
Added a way to quickly switch Rapid Spin's move effect from Gen. 3 to 8
2020-10-15 09:21:40 +02:00
.if B_SPEED_BUFFING_RAPID_SPIN == GEN_8
Updated many moves' data to Gen. 8 standards
2020-08-20 20:40:11 +02:00
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Updated many moves' data to Gen. 8 standards
2020-08-20 20:40:11 +02:00
resultmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_RAPIDSPIN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
Updated many moves' data to Gen. 8 standards
2020-08-20 20:40:11 +02:00
seteffectwithchance
setstatchanger STAT_SPEED, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_EffectRapidSpinEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectRapidSpinEnd
Updated many moves' data to Gen. 8 standards
2020-08-20 20:40:11 +02:00
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Updated many moves' data to Gen. 8 standards
2020-08-20 20:40:11 +02:00
BattleScript_EffectRapidSpinEnd::
tryfaintmon BS_TARGET, FALSE, NULL
moveendall
end
Added a way to quickly switch Rapid Spin's move effect from Gen. 3 to 8
2020-10-15 09:21:40 +02:00
.else
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_RAPIDSPIN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
Added a way to quickly switch Rapid Spin's move effect from Gen. 3 to 8
2020-10-15 09:21:40 +02:00
.endif
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectSonicboom::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
typecalc
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
bichalfword gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
create setword macro
2017-11-25 21:11:20 +01:00
setword gBattleMoveDamage, 20
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromAtkAnimation
BattleScript_EffectMorningSun::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
BattleScript_EffectSynthesis::
BattleScript_EffectMoonlight::
Shore Up
2020-04-18 18:34:18 +02:00
BattleScript_EffectShoreUp::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
recoverbasedonsunlight BattleScript_AlreadyAtFullHp
goto BattleScript_PresentHealTarget
BattleScript_EffectRainDance::
attackcanceler
attackstring
ppreduce
setrain
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_MoveWeatherChange::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gMoveWeatherChangeStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
fixes and labels
2017-11-26 01:19:57 +01:00
call BattleScript_WeatherFormChanges
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectSunnyDay::
attackcanceler
attackstring
ppreduce
setsunny
more battle labels
2017-11-26 17:15:28 +01:00
goto BattleScript_MoveWeatherChange
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectDefenseUpHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_DEF_PLUS_1 | MOVE_EFFECT_AFFECTS_USER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectAttackUpHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_ATK_PLUS_1 | MOVE_EFFECT_AFFECTS_USER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectAllStatsUpHit::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_ALL_STATS_UP | MOVE_EFFECT_AFFECTS_USER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectBellyDrum::
attackcanceler
attackstring
ppreduce
maxattackhalvehp BattleScript_ButItFailed
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
attackanimation
waitanimation
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNCUTHPMAXEDATTACK
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectPsychUp::
attackcanceler
attackstring
ppreduce
copyfoestats BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNCOPIEDSTATCHANGES
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectMirrorCoat::
attackcanceler
mirrorcoatdamagecalculator BattleScript_ButItFailedAtkStringPpReduce
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
Fix Counter and Mirror Coat
2018-07-28 10:58:47 +02:00
typecalc
bichalfword gMoveResultFlags, MOVE_RESULT_NOT_VERY_EFFECTIVE | MOVE_RESULT_SUPER_EFFECTIVE
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromAtkAnimation
BattleScript_EffectSkullBash::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_SKULL_BASH
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
call BattleScriptFirstChargingTurn
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_DEF, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_SkullBashEnd
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SkullBashEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
setgraphicalstatchangevalues
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SkullBashEnd::
Power Herb
2020-04-22 10:44:19 +02:00
jumpifnoholdeffect BS_ATTACKER, HOLD_EFFECT_POWER_HERB, BattleScript_MoveEnd
call BattleScript_PowerHerbActivation
goto BattleScript_TwoTurnMovesSecondTurn
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
Get rid of scripting dmg multiplier
2018-07-14 18:58:45 +02:00
BattleScript_EffectTwister:
BattleScript_FlinchEffect:
BattleScript_EffectStomp:
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_FLINCH
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
Full support for moves hitting all battlers
2018-09-29 16:41:25 +02:00
BattleScript_EffectBulldoze:
setmoveeffect MOVE_EFFECT_SPD_MINUS_1
BattleScript_EffectEarthquake:
Change inner structure of semi invulerable moves
2020-04-11 11:47:13 +02:00
goto BattleScript_EffectHit
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectFutureSight::
attackcanceler
attackstring
ppreduce
trysetfutureattack BattleScript_ButItFailed
attackanimation
waitanimation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gFutureMoveUsedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectGust::
goto BattleScript_EffectHit
BattleScript_EffectSolarbeam::
more battle labels
2017-11-26 17:15:28 +01:00
jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarbeamDecideTurn
jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarbeamDecideTurn
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT, BattleScript_SolarbeamOnFirstTurn
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SolarbeamDecideTurn::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_SOLAR_BEAM
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
call BattleScriptFirstChargingTurn
Power Herb
2020-04-22 10:44:19 +02:00
jumpifnoholdeffect BS_ATTACKER, HOLD_EFFECT_POWER_HERB, BattleScript_MoveEnd
call BattleScript_PowerHerbActivation
goto BattleScript_TwoTurnMovesSecondTurn
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_SolarbeamOnFirstTurn::
Move some vars to C
2019-01-13 13:15:23 +01:00
orword gHitMarker, HITMARKER_CHARGING
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
ppreduce
more battle labels
2017-11-26 17:15:28 +01:00
goto BattleScript_TwoTurnMovesSecondTurn
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
BattleScript_EffectThunder:
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_PARALYSIS
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
BattleScript_EffectHurricane:
setmoveeffect MOVE_EFFECT_CONFUSION
goto BattleScript_EffectHit
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
BattleScript_EffectTeleport:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_ButItFailed
pokemon and battle constants
2018-02-08 11:17:41 +01:00
getifcantrunfrombattle BS_ATTACKER
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
jumpifbyte CMP_EQUAL, gBattleCommunication, 1, BattleScript_ButItFailed
jumpifbyte CMP_EQUAL, gBattleCommunication, 2, BattleScript_PrintAbilityMadeIneffective
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
printstring STRINGID_PKMNFLEDFROMBATTLE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setoutcomeonteleport BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectBeatUp::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
ppreduce
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte gBattleCommunication, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_BeatUpLoop::
movevaluescleanup
trydobeatup BattleScript_BeatUpEnd, BattleScript_ButItFailed
printstring STRINGID_PKMNATTACK
critcalc
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
jumpifbyte CMP_NOT_EQUAL, gIsCriticalHit, TRUE, BattleScript_BeatUpAttack
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
manipulatedamage DMG_DOUBLED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_BeatUpAttack::
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
effectivenesssound
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hitanimation BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
critmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_TARGET, FALSE, NULL
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendto MOVEEND_NEXT_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_BeatUpLoop
BattleScript_BeatUpEnd::
end
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
BattleScript_EffectSemiInvulnerable::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_SecondTurnSemiInvulnerable
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_SecondTurnSemiInvulnerable
clear battle code and battlescripts
2017-11-26 11:55:17 +01:00
jumpifmove MOVE_FLY, BattleScript_FirstTurnFly
jumpifmove MOVE_DIVE, BattleScript_FirstTurnDive
jumpifmove MOVE_BOUNCE, BattleScript_FirstTurnBounce
Fix Phantom Force
2018-12-08 16:19:50 +01:00
jumpifmove MOVE_PHANTOM_FORCE, BattleScript_FirstTurnPhantomForce
jumpifmove MOVE_SHADOW_FORCE, BattleScript_FirstTurnPhantomForce
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_DIG
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
goto BattleScript_FirstTurnSemiInvulnerable
BattleScript_FirstTurnBounce::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_BOUNCE
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
goto BattleScript_FirstTurnSemiInvulnerable
BattleScript_FirstTurnDive::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_DIVE
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
goto BattleScript_FirstTurnSemiInvulnerable
Fix Phantom Force
2018-12-08 16:19:50 +01:00
BattleScript_FirstTurnPhantomForce:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_PHANTOM_FORCE
Fix Phantom Force
2018-12-08 16:19:50 +01:00
goto BattleScript_FirstTurnSemiInvulnerable
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
BattleScript_FirstTurnFly::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_FLY
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
BattleScript_FirstTurnSemiInvulnerable::
call BattleScriptFirstChargingTurn
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
setsemiinvulnerablebit
Power Herb
2020-04-22 10:44:19 +02:00
jumpifnoholdeffect BS_ATTACKER, HOLD_EFFECT_POWER_HERB, BattleScript_MoveEnd
call BattleScript_PowerHerbActivation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
BattleScript_SecondTurnSemiInvulnerable::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_CHARGING
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sB_ANIM_TURN, 1
pokemon and battle constants
2018-02-08 11:17:41 +01:00
clearstatusfromeffect BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_NO_PPDEDUCT
Fix Phantom Force
2018-12-08 16:19:50 +01:00
argumenttomoveeffect
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SemiInvulnerableTryHit::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
accuracycheck BattleScript_SemiInvulnerableMiss, ACC_CURR_MOVE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
clearsemiinvulnerablebit
goto BattleScript_HitFromAtkString
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
BattleScript_SemiInvulnerableMiss::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
clearsemiinvulnerablebit
goto BattleScript_PrintMoveMissed
BattleScript_EffectDefenseCurl::
attackcanceler
attackstring
ppreduce
setdefensecurlbit
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_DEF, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DefenseCurlDoStatUpAnim
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpPrintString
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_DefenseCurlDoStatUpAnim::
fixes and labels
2017-11-26 01:19:57 +01:00
goto BattleScript_StatUpDoAnim
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectSoftboiled::
attackcanceler
attackstring
ppreduce
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryhealhalfhealth BattleScript_AlreadyAtFullHp, BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_PresentHealTarget::
attackanimation
waitanimation
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNREGAINEDHEALTH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_AlreadyAtFullHp::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNHPFULL
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectFakeOut::
attackcanceler
jumpifnotfirstturn BattleScript_ButItFailedAtkStringPpReduce
Add Acupressure
2018-11-24 21:06:53 +01:00
setmoveeffect MOVE_EFFECT_FLINCH
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_ButItFailedAtkStringPpReduce::
attackstring
BattleScript_ButItFailedPpReduce::
ppreduce
BattleScript_ButItFailed::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
orhalfword gMoveResultFlags, MOVE_RESULT_FAILED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_NotAffected::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
orhalfword gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Added a variation of BattleScript_NotAffected This one triggers the Ability PopUp.
2021-04-01 04:11:27 +02:00
BattleScript_NotAffectedAbilityPopUp::
copybyte gBattlerAbility, gBattlerTarget
Replaced magic numbers with constants in BattleScript_NotAffectedAbilityPopUp
2021-06-01 23:20:33 +02:00
pause B_WAIT_TIME_SHORT
Added a variation of BattleScript_NotAffected This one triggers the Ability PopUp.
2021-04-01 04:11:27 +02:00
call BattleScript_AbilityPopUp
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
orhalfword gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Replaced magic numbers with constants in BattleScript_NotAffectedAbilityPopUp
2021-06-01 23:20:33 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectUproar::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_UPROAR | MOVE_EFFECT_AFFECTS_USER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_UproarHit
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
ppreduce
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_UproarHit::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromCritCalc
BattleScript_EffectStockpile::
attackcanceler
attackstring
ppreduce
Stockpile gen4 effect and fixed spit up
2019-07-09 19:06:12 +02:00
stockpile 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStockpileUsedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Stockpile gen4 effect and fixed spit up
2019-07-09 19:06:12 +02:00
jumpifmovehadnoeffect BattleScript_EffectStockpileEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_EffectStockpileDef
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_EffectStockpileEnd
Stockpile gen4 effect and fixed spit up
2019-07-09 19:06:12 +02:00
BattleScript_EffectStockpileDef:
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0
Stockpile gen4 effect and fixed spit up
2019-07-09 19:06:12 +02:00
setstatchanger STAT_DEF, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_EffectStockpileSpDef
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectStockpileSpDef
Stockpile gen4 effect and fixed spit up
2019-07-09 19:06:12 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Stockpile gen4 effect and fixed spit up
2019-07-09 19:06:12 +02:00
BattleScript_EffectStockpileSpDef::
setstatchanger STAT_SPDEF, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_EffectStockpileEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectStockpileEnd
Stockpile gen4 effect and fixed spit up
2019-07-09 19:06:12 +02:00
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Stockpile gen4 effect and fixed spit up
2019-07-09 19:06:12 +02:00
BattleScript_EffectStockpileEnd:
stockpile 1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectSpitUp::
attackcanceler
Label miss string indexes
2021-04-02 08:12:46 +02:00
jumpifbyte CMP_EQUAL, cMISS_TYPE, B_MSG_PROTECTED, BattleScript_SpitUpFailProtect
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
Stockpile gen4 effect and fixed spit up
2019-07-09 19:06:12 +02:00
setbyte gIsCriticalHit, FALSE
damagecalc
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
Stockpile gen4 effect and fixed spit up
2019-07-09 19:06:12 +02:00
stockpiletobasedamage BattleScript_SpitUpFail
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromAtkAnimation
BattleScript_SpitUpFail::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_FAILEDTOSPITUP
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Label miss string indexes
2021-04-02 08:12:46 +02:00
BattleScript_SpitUpFailProtect::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
stockpiletobasedamage BattleScript_SpitUpFail
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectSwallow::
attackcanceler
attackstring
ppreduce
stockpiletohpheal BattleScript_SwallowFail
goto BattleScript_PresentHealTarget
BattleScript_SwallowFail::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gSwallowFailStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectHail::
attackcanceler
attackstring
ppreduce
sethail
more battle labels
2017-11-26 17:15:28 +01:00
goto BattleScript_MoveWeatherChange
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectTorment::
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
Aroma Veil
2019-04-01 11:42:37 +02:00
jumpifability BS_TARGET_SIDE, ABILITY_AROMA_VEIL, BattleScript_AromaVeilProtects
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
settorment BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNSUBJECTEDTOTORMENT
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectFlatter::
attackcanceler
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_MakeMoveMissed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifconfusedandstatmaxed STAT_SPATK, BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPATK, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_FlatterTryConfuse
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_FlatterTryConfuse
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
setgraphicalstatchangevalues
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_FlatterTryConfuse::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
Infiltrator affects mist safeguard
2020-04-23 11:29:19 +02:00
jumpifsafeguard BattleScript_SafeguardProtected
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_CONFUSION
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
goto BattleScript_MoveEnd
BattleScript_EffectWillOWisp::
attackcanceler
attackstring
ppreduce
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailed
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus BS_TARGET, STATUS1_BURN, BattleScript_AlreadyBurned
jumpiftype BS_TARGET, TYPE_FIRE, BattleScript_NotAffected
jumpifability BS_TARGET, ABILITY_WATER_VEIL, BattleScript_WaterVeilPrevents
water bubble prevents burn
2021-07-25 15:53:44 +02:00
jumpifability BS_TARGET, ABILITY_WATER_BUBBLE, BattleScript_WaterVeilPrevents
Comatose
2019-12-31 16:36:53 +01:00
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
jumpifflowerveil BattleScript_FlowerVeilProtects
Spaces to tabs
2019-12-18 22:03:01 +01:00
jumpifleafguard BattleScript_LeafGuardProtects
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
Infiltrator affects mist safeguard
2020-04-23 11:29:19 +02:00
jumpifsafeguard BattleScript_SafeguardProtected
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_BURN
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
goto BattleScript_MoveEnd
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_WaterVeilPrevents::
add ability popup
2021-09-06 15:24:15 +02:00
call BattleScript_AbilityPopUp
pokemon and battle constants
2018-02-08 11:17:41 +01:00
copybyte gEffectBattler, gBattlerTarget
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte cMULTISTRING_CHOOSER, B_MSG_ABILITY_PREVENTS_MOVE_STATUS
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
call BattleScript_BRNPrevention
goto BattleScript_MoveEnd
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_AlreadyBurned::
Document battle arena
2018-11-11 18:33:16 +01:00
setalreadystatusedmoveattempt BS_ATTACKER
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNALREADYHASBURN
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectMemento::
attackcanceler
Label miss string indexes
2021-04-02 08:12:46 +02:00
jumpifbyte CMP_EQUAL, cMISS_TYPE, B_MSG_PROTECTED, BattleScript_MementoFailProtect
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
jumpifattackandspecialattackcannotfall BattleScript_ButItFailed
setatkhptozero
attackanimation
waitanimation
Make it compile
2018-08-03 00:21:40 +02:00
jumpifsubstituteblocks BattleScript_EffectMementoPrintNoEffect
Document atk48
2018-07-29 15:33:16 +02:00
setbyte sSTAT_ANIM_PLAYED, FALSE
Rename some STAT_CHANGE macros
2019-10-26 17:53:00 +02:00
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO | STAT_CHANGE_MULTIPLE_STATS
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_ATK, 2, TRUE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMementoTrySpAtk
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
@ Greater than STAT_FELL is checking if the stat cannot decrease
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTrySpAtk
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatDownStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Document atk48
2018-07-29 15:33:16 +02:00
BattleScript_EffectMementoTrySpAtk:
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPATK, 2, TRUE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMementoTryFaint
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
@ Greater than STAT_FELL is checking if the stat cannot decrease
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTryFaint
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatDownStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Document atk48
2018-07-29 15:33:16 +02:00
BattleScript_EffectMementoTryFaint:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Document atk48
2018-07-29 15:33:16 +02:00
BattleScript_EffectMementoPrintNoEffect:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_BUTNOEFFECT
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Document atk48
2018-07-29 15:33:16 +02:00
goto BattleScript_EffectMementoTryFaint
Label miss string indexes
2021-04-02 08:12:46 +02:00
BattleScript_MementoFailProtect:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
Label miss string indexes
2021-04-02 08:12:46 +02:00
jumpifattackandspecialattackcannotfall BattleScript_MementoFailEnd
BattleScript_MementoFailEnd:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
setatkhptozero
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
effectivenesssound
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectFocusPunch::
attackcanceler
jumpifnodamage BattleScript_HitFromAccCheck
ppreduce
printstring STRINGID_PKMNLOSTFOCUS
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Add Acupressure
2018-11-24 21:06:53 +01:00
BattleScript_EffectSmellingsalt:
BattleScript_EffectWakeUpSlap:
BattleScript_EffectSparklingAria:
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_EffectHit
Add Acupressure
2018-11-24 21:06:53 +01:00
setmoveeffect MOVE_EFFECT_REMOVE_STATUS | MOVE_EFFECT_CERTAIN
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectFollowMe::
attackcanceler
attackstring
ppreduce
setforcedtarget
attackanimation
waitanimation
printstring STRINGID_PKMNCENTERATTENTION
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectNaturePower::
attackcanceler
attackstring
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
callterrainattack
printstring STRINGID_NATUREPOWERTURNEDINTO
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_EffectCharge::
attackcanceler
attackstring
ppreduce
setcharge
attackanimation
waitanimation
Make Charge raise sp.def
2020-02-08 11:55:16 +01:00
setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_EffectChargeString
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectChargeString
Make Charge raise sp.def
2020-02-08 11:55:16 +01:00
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Make Charge raise sp.def
2020-02-08 11:55:16 +01:00
BattleScript_EffectChargeString:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNCHARGINGPOWER
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectTaunt::
attackcanceler
attackstring
ppreduce
Aroma Veil
2019-04-01 11:42:37 +02:00
jumpifability BS_TARGET_SIDE, ABILITY_AROMA_VEIL, BattleScript_AromaVeilProtects
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
settaunt BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNFELLFORTAUNT
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectHelpingHand::
attackcanceler
attackstring
ppreduce
trysethelpinghand BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNREADYTOHELP
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectTrick::
attackcanceler
attackstring
ppreduce
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
tryswapitems BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNSWITCHEDITEMS
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gItemSwapStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectRolePlay::
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
trycopyability BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNCOPIEDFOE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectWish::
attackcanceler
attackstring
ppreduce
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
trywish 0, BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
goto BattleScript_MoveEnd
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectAssist:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
Document landmark setting and item balls
2019-04-03 20:13:11 +02:00
assistattackselect BattleScript_ButItFailedPpReduce
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sB_ANIM_TURN, 0
setbyte sB_ANIM_TARGETS_HIT, 0
calledattack to calledmove
2018-09-22 19:08:41 +02:00
jumptocalledmove TRUE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectIngrain:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
Merge with master
2020-07-27 14:51:39 +02:00
setuserstatus3 STATUS3_ROOTED, BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
printstring STRINGID_PKMNPLANTEDROOTS
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectSuperpower:
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_ATK_DEF_DOWN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Close combat effect
2018-09-22 01:12:27 +02:00
BattleScript_EffectCloseCombat:
setmoveeffect MOVE_EFFECT_DEF_SPDEF_DOWN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectMagicCoat:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
trysetmagiccoat BattleScript_ButItFailedAtkStringPpReduce
attackstring
ppreduce
attackanimation
waitanimation
printstring STRINGID_PKMNSHROUDEDITSELF
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectRecycle::
attackcanceler
attackstring
ppreduce
tryrecycleitem BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_XFOUNDONEY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectBrickBreak::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
removelightscreenreflect
critcalc
damagecalc
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
jumpifbyte CMP_EQUAL, sB_ANIM_TURN, 0, BattleScript_BrickBreakAnim
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
bichalfword gMoveResultFlags, MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_BrickBreakAnim::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
jumpifbyte CMP_LESS_THAN, sB_ANIM_TURN, 2, BattleScript_BrickBreakDoHit
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_THEWALLSHATTERED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_BrickBreakDoHit::
Fix Counter and Mirror Coat
2018-07-28 10:58:47 +02:00
typecalc
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
effectivenesssound
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hitanimation BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
critmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectwithchance
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_TARGET, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectYawn::
attackcanceler
attackstring
ppreduce
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifability BS_TARGET, ABILITY_VITAL_SPIRIT, BattleScript_PrintBankAbilityMadeIneffective
jumpifability BS_TARGET, ABILITY_INSOMNIA, BattleScript_PrintBankAbilityMadeIneffective
Comatose
2019-12-31 16:36:53 +01:00
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_PrintBankAbilityMadeIneffective
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
jumpifflowerveil BattleScript_FlowerVeilProtects
Spaces to tabs
2019-12-18 22:03:01 +01:00
jumpifleafguard BattleScript_LeafGuardProtects
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_ButItFailed
Infiltrator affects mist safeguard
2020-04-23 11:29:19 +02:00
jumpifsafeguard BattleScript_SafeguardProtected
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
jumpifcantmakeasleep BattleScript_ButItFailed
setyawn BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNWASMADEDROWSY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
give some more labels to battle struct fields
2017-12-02 23:31:58 +01:00
BattleScript_PrintBankAbilityMadeIneffective::
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
copybyte sBATTLER, gBattlerAbility
give some more labels to battle struct fields
2017-12-02 23:31:58 +01:00
BattleScript_PrintAbilityMadeIneffective::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXMADEITINEFFECTIVE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectKnockOff::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_KNOCK_OFF
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectEndeavor::
attackcanceler
attackstring
ppreduce
setdamagetohealthdifference BattleScript_ButItFailed
add more battlescript macros
2017-11-25 21:32:17 +01:00
copyword gHpDealt, gBattleMoveDamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
typecalc
give names to some battlescripts
2017-12-02 00:03:46 +01:00
jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
bichalfword gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
add more battlescript macros
2017-11-25 21:32:17 +01:00
copyword gBattleMoveDamage, gHpDealt
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_HitFromAtkAnimation
Gen 5 move names, telekinesis, power/guard split/swap
2018-07-21 23:12:10 +02:00
BattleScript_EffectSkillSwap:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
tryswapabilities BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNSWAPPEDABILITIES
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectImprison::
attackcanceler
attackstring
ppreduce
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
tryimprison BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
printstring STRINGID_PKMNSEALEDOPPONENTMOVE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectRefresh:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
cureifburnedparalysedorpoisoned BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNSTATUSNORMAL
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectGrudge:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
Merge with master
2020-07-27 14:51:39 +02:00
setuserstatus3 STATUS3_GRUDGE, BattleScript_ButItFailed
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
printstring STRINGID_PKMNWANTSGRUDGE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
More gen4 move effects battlescrips.
2018-07-21 21:58:07 +02:00
BattleScript_EffectSnatch:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
trysetsnatch BattleScript_ButItFailedAtkStringPpReduce
attackstring
ppreduce
attackanimation
waitanimation
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNWAITSFORTARGET
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectSecretPower::
getsecretpowereffect
goto BattleScript_EffectHit
AI dont rely on power if bad effects
2020-04-20 11:27:09 +02:00
BattleScript_EffectRecoil25:
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_EffectRecoil33::
Label various battle scripts
2018-09-01 20:00:13 +02:00
setmoveeffect MOVE_EFFECT_RECOIL_33 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Last Resort, Fangs and Flare Blitz/Volt Tackle
2018-09-22 10:45:43 +02:00
BattleScript_EffectRecoil33WithStatus:
setmoveeffect MOVE_EFFECT_RECOIL_33_STATUS | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Shell Smash move effect
2018-09-22 11:13:17 +02:00
BattleScript_EffectRecoil50:
setmoveeffect MOVE_EFFECT_RECOIL_50 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectTeeterDance::
attackcanceler
attackstring
ppreduce
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte gBattlerTarget, 0
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_TeeterDanceLoop::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
movevaluescleanup
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_CONFUSION
more renaming
2018-02-06 23:09:39 +01:00
jumpifbyteequal gBattlerAttacker, gBattlerTarget, BattleScript_TeeterDanceLoopIncrement
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_TeeterDanceOwnTempoPrevents
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
jumpifsubstituteblocks BattleScript_TeeterDanceSubstitutePrevents
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifstatus2 BS_TARGET, STATUS2_CONFUSION, BattleScript_TeeterDanceAlreadyConfused
jumpifhasnohp BS_TARGET, BattleScript_TeeterDanceLoopIncrement
give names to some battlescripts
2017-12-02 00:03:46 +01:00
accuracycheck BattleScript_TeeterDanceMissed, ACC_CURR_MOVE
Infiltrator affects mist safeguard
2020-04-23 11:29:19 +02:00
jumpifsafeguard BattleScript_TeeterDanceSafeguardProtected
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
seteffectprimary
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_TeeterDanceDoMoveEndIncrement::
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendto MOVEEND_NEXT_TARGET
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_TeeterDanceLoopIncrement::
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
addbyte gBattlerTarget, 1
more renaming
2018-02-06 23:09:39 +01:00
jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_TeeterDanceLoop
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_TeeterDanceOwnTempoPrevents::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNPREVENTSCONFUSIONWITH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_TeeterDanceDoMoveEndIncrement
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_TeeterDanceSafeguardProtected::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNUSEDSAFEGUARD
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_TeeterDanceDoMoveEndIncrement
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_TeeterDanceSubstitutePrevents::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_BUTITFAILED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_TeeterDanceDoMoveEndIncrement
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_TeeterDanceAlreadyConfused::
Document battle arena
2018-11-11 18:33:16 +01:00
setalreadystatusedmoveattempt BS_ATTACKER
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNALREADYCONFUSED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_TeeterDanceDoMoveEndIncrement
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_TeeterDanceMissed::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_TeeterDanceDoMoveEndIncrement
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectMudSport::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
BattleScript_EffectWaterSport::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackcanceler
attackstring
ppreduce
settypebasedhalvers BattleScript_ButItFailed
attackanimation
waitanimation
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gSportsUsedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectPoisonFang::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_TOXIC
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
BattleScript_EffectOverheat::
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_SP_ATK_TWO_DOWN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_EffectHit
Misc. move updates Bind: 75% Acc -> 85% Acc Disable: 55% Acc. -> 100% Acc. Freeze-Dry: 10% chance to freeze Hammer Arm and Ice Hammer: lower user's speed High Jump Kick: 130BP, 10 PP Jump Kick: 100BP, 10 PP Tail Glow: raises Sp. Atk by 3 stages Waterfall: 20% chance to flinch
2019-03-31 17:23:41 +02:00
BattleScript_EffectHammerArm::
setmoveeffect MOVE_EFFECT_SPD_MINUS_1 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_EffectTickle::
attackcanceler
attackstring
ppreduce
Add stat stage constants
2020-08-05 02:33:05 +02:00
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, MIN_STAT_STAGE, BattleScript_TickleDoMoveAnim
jumpifstat BS_TARGET, CMP_EQUAL, STAT_DEF, MIN_STAT_STAGE, BattleScript_CantLowerMultipleStats
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_TickleDoMoveAnim::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
attackanimation
waitanimation
Document atk48
2018-07-29 15:33:16 +02:00
setbyte sSTAT_ANIM_PLAYED, FALSE
Rename some STAT_CHANGE macros
2019-10-26 17:53:00 +02:00
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_ATK, 1, TRUE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TickleTryLowerDef
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleTryLowerDef
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatDownStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_TickleTryLowerDef::
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
playstatchangeanimation BS_TARGET, BIT_DEF, STAT_CHANGE_NEGATIVE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_DEF, 1, TRUE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TickleEnd
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleEnd
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatDownStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_TickleEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_CantLowerMultipleStats::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
orhalfword gMoveResultFlags, MOVE_RESULT_FAILED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_STATSWONTDECREASE2
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectCosmicPower::
attackcanceler
attackstring
ppreduce
Add stat stage constants
2020-08-05 02:33:05 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_CosmicPowerDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_CosmicPowerDoMoveAnim::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Document atk48
2018-07-29 15:33:16 +02:00
setbyte sSTAT_ANIM_PLAYED, FALSE
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_DEF, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CosmicPowerTrySpDef
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerTrySpDef
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_CosmicPowerTrySpDef::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPDEF, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CosmicPowerEnd
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerEnd
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_CosmicPowerEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectSkyUppercut::
goto BattleScript_EffectHit
BattleScript_EffectBulkUp::
attackcanceler
attackstring
ppreduce
Add stat stage constants
2020-08-05 02:33:05 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_BulkUpDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_BulkUpDoMoveAnim::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Document atk48
2018-07-29 15:33:16 +02:00
setbyte sSTAT_ANIM_PLAYED, FALSE
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_ATK, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BulkUpTryDef
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpTryDef
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_BulkUpTryDef::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_DEF, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BulkUpEnd
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpEnd
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_BulkUpEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectCalmMind::
attackcanceler
attackstring
ppreduce
Add stat stage constants
2020-08-05 02:33:05 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_CalmMindDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_CalmMindDoMoveAnim::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Document atk48
2018-07-29 15:33:16 +02:00
setbyte sSTAT_ANIM_PLAYED, FALSE
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPATK, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CalmMindTrySpDef
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindTrySpDef
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_CalmMindTrySpDef::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPDEF, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CalmMindEnd
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindEnd
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_CalmMindEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_CantRaiseMultipleStats::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
orhalfword gMoveResultFlags, MOVE_RESULT_FAILED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_STATSWONTINCREASE2
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectDragonDance::
attackcanceler
attackstring
ppreduce
Add stat stage constants
2020-08-05 02:33:05 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_DragonDanceDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_DragonDanceDoMoveAnim::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
Document atk48
2018-07-29 15:33:16 +02:00
setbyte sSTAT_ANIM_PLAYED, FALSE
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPEED, 0
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_ATK, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DragonDanceTrySpeed
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceTrySpeed
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_DragonDanceTrySpeed::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPEED, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DragonDanceEnd
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceEnd
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_DragonDanceEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_EffectCamouflage::
attackcanceler
attackstring
ppreduce
settypetoterrain BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNCHANGEDTYPE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_FaintAttacker::
Illusion
2019-08-08 13:06:55 +02:00
tryillusionoff BS_ATTACKER
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playfaintcry BS_ATTACKER
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
dofaintanimation BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_ATTACKERFAINTED
Illusion
2019-08-08 13:06:55 +02:00
cleareffectsonfaint BS_ATTACKER
Soul Heart
2020-04-18 19:59:09 +02:00
tryactivatesoulheart
Beast Boost and Receiver
2020-04-19 12:07:56 +02:00
tryactivatereceiver BS_ATTACKER
Implement trainer sliding
2018-11-03 01:17:16 +01:00
trytrainerslidefirstdownmsg BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_FaintTarget::
Illusion
2019-08-08 13:06:55 +02:00
tryillusionoff BS_TARGET
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playfaintcry BS_TARGET
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
dofaintanimation BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_TARGETFAINTED
Illusion
2019-08-08 13:06:55 +02:00
cleareffectsonfaint BS_TARGET
Beast Boost and Receiver
2020-04-19 12:07:56 +02:00
tryactivatefellstinger BS_ATTACKER
Soul Heart
2020-04-18 19:59:09 +02:00
tryactivatesoulheart
Beast Boost and Receiver
2020-04-19 12:07:56 +02:00
tryactivatereceiver BS_TARGET
add neigh and as one abilities
2021-01-06 03:37:23 +01:00
tryactivatemoxie BS_ATTACKER @ and chilling neigh, as one ice rider
Beast Boost and Receiver
2020-04-19 12:07:56 +02:00
tryactivatebeastboost BS_ATTACKER
add neigh and as one abilities
2021-01-06 03:37:23 +01:00
tryactivategrimneigh BS_ATTACKER @ and as one shadow rider
Implement trainer sliding
2018-11-03 01:17:16 +01:00
trytrainerslidefirstdownmsg BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
label battle stuff
2017-12-02 14:08:55 +01:00
BattleScript_GiveExp::
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sGIVEEXP_STATE, 0
pokemon and battle constants
2018-02-08 11:17:41 +01:00
getexp BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
label battle stuff
2017-12-02 14:08:55 +01:00
BattleScript_HandleFaintedMon::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte sSHIFT_SWITCHED, 0
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
atk24 BattleScript_HandleFaintedMonMultiple
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_FaintedMonEnd
Fix allowing the player to run from wild double battles
2019-03-06 12:13:37 +01:00
jumpifbattletype BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonTryChooseAnother
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifword CMP_NO_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonTryChooseAnother
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_USENEXTPKMN
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte gBattleCommunication, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
yesnobox
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0, BattleScript_FaintedMonTryChooseAnother
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifplayerran BattleScript_FaintedMonEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_CANTESCAPE2
Fix switch-in abilities when shift style switch
2020-04-25 11:17:59 +02:00
BattleScript_FaintedMonTryChooseAnother:
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
openpartyscreen BS_FAINTED, BattleScript_FaintedMonEnd
switchhandleorder BS_FAINTED, 2
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother
Label remaining battle types
2021-01-13 21:17:32 +01:00
jumpifbattletype BATTLE_TYPE_RECORDED_LINK, BattleScript_FaintedMonChooseAnother
more battle documentation
2018-06-30 14:12:17 +02:00
jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_FaintedMonChooseAnother
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
jumpifbyte CMP_EQUAL, sBATTLE_STYLE, OPTIONS_BATTLE_STYLE_SET, BattleScript_FaintedMonChooseAnother
Update BS constants for Cmd rename
2019-09-15 23:58:12 +02:00
jumpifcantswitch BS_PLAYER1, BattleScript_FaintedMonChooseAnother
Hopefully illusion works as intended now
2020-06-28 19:45:48 +02:00
setbyte sILLUSION_NICK_HACK, 1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_ENEMYABOUTTOSWITCHPKMN
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte gBattleCommunication, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
yesnobox
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 1, BattleScript_FaintedMonChooseAnother
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
setatktoplayer0
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
openpartyscreen BS_ATTACKER | PARTY_SCREEN_OPTIONAL, BattleScript_FaintedMonChooseAnother
switchhandleorder BS_ATTACKER, 2
jumpifbyte CMP_EQUAL, gBattleCommunication, PARTY_SIZE, BattleScript_FaintedMonChooseAnother
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
atknameinbuff1
Fix resetintimidatetracebits typo
2019-10-22 22:02:01 +02:00
resetintimidatetracebits BS_ATTACKER
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hpthresholds2 BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_RETURNMON
pokemon and battle constants
2018-02-08 11:17:41 +01:00
switchoutabilities BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
returnatktoball
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
drawpartystatussummary BS_ATTACKER
getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_SWITCHINMON
document party status summary
2018-06-28 21:06:32 +02:00
hidepartystatussummary BS_ATTACKER
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
switchinanim BS_ATTACKER, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte sSHIFT_SWITCHED, 1
Fix switch-in abilities when shift style switch
2020-04-25 11:17:59 +02:00
BattleScript_FaintedMonChooseAnother:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
drawpartystatussummary BS_FAINTED
getswitchedmondata BS_FAINTED
switchindataupdate BS_FAINTED
hpthresholds BS_FAINTED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_SWITCHINMON
document party status summary
2018-06-28 21:06:32 +02:00
hidepartystatussummary BS_FAINTED
pokemon and battle constants
2018-02-08 11:17:41 +01:00
switchinanim BS_FAINTED, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
various7 BS_ATTACKER
Implement trainer sliding
2018-11-03 01:17:16 +01:00
trytrainerslidelastonmsg BS_FAINTED
Fix switch-in abilities when shift style switch
2020-04-25 11:17:59 +02:00
jumpifbytenotequal sSHIFT_SWITCHED, sZero, BattleScript_FaintedMonShiftSwitched
BattleScript_FaintedMonChooseAnotherEnd:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
switchineffects BS_FAINTED
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
cancelallactions
label battle stuff
2017-12-02 14:08:55 +01:00
BattleScript_FaintedMonEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Fix switch-in abilities when shift style switch
2020-04-25 11:17:59 +02:00
BattleScript_FaintedMonShiftSwitched:
copybyte sSAVED_BATTLER, gBattlerTarget
switchineffects BS_ATTACKER
resetsentmonsvalue
copybyte gBattlerTarget, sSAVED_BATTLER
goto BattleScript_FaintedMonChooseAnotherEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
BattleScript_HandleFaintedMonMultiple::
openpartyscreen BS_UNK_5, BattleScript_HandleFaintedMonMultipleStart
BattleScript_HandleFaintedMonMultipleStart::
switchhandleorder BS_FAINTED, 0
openpartyscreen BS_UNK_6, BattleScript_HandleFaintedMonMultipleEnd
switchhandleorder BS_FAINTED, 0
BattleScript_HandleFaintedMonLoop::
switchhandleorder BS_FAINTED, 3
pokemon and battle constants
2018-02-08 11:17:41 +01:00
drawpartystatussummary BS_FAINTED
getswitchedmondata BS_FAINTED
switchindataupdate BS_FAINTED
hpthresholds BS_FAINTED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_SWITCHINMON
document party status summary
2018-06-28 21:06:32 +02:00
hidepartystatussummary BS_FAINTED
pokemon and battle constants
2018-02-08 11:17:41 +01:00
switchinanim BS_FAINTED, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
switchineffects 5
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
jumpifbytenotequal gBattlerFainted, gBattlersCount, BattleScript_HandleFaintedMonLoop
BattleScript_HandleFaintedMonMultipleEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_LocalTrainerBattleWon::
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalTwoTrainersDefeated
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PLAYERDEFEATEDTRAINER1
fixes and labels
2017-11-26 01:19:57 +01:00
goto BattleScript_LocalBattleWonLoseTexts
BattleScript_LocalTwoTrainersDefeated::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_TWOENEMIESDEFEATED
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_LocalBattleWonLoseTexts::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
trainerslidein BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
printstring STRINGID_TRAINER1LOSETEXT
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleWonReward
identity -> position
2018-01-16 21:01:31 +01:00
trainerslideout B_POSITION_OPPONENT_LEFT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
trainerslidein BS_FAINTED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
printstring STRINGID_TRAINER2LOSETEXT
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_LocalBattleWonReward::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
getmoneyreward
printstring STRINGID_PLAYERGOTMONEY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_PayDayMoneyAndPickUpItems::
givepaydaymoney
pickup
end2
BattleScript_LocalBattleLost::
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew
more battle documentation
2018-06-30 14:12:17 +02:00
jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_LocalBattleLostPrintTrainersWinText
Label trainer hill battle type
2018-09-20 22:00:00 +02:00
jumpifbattletype BATTLE_TYPE_TRAINER_HILL, BattleScript_LocalBattleLostPrintTrainersWinText
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd
Add missing trainer constant use
2021-04-02 08:17:36 +02:00
jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, TRAINER_SECRET_BASE, BattleScript_LocalBattleLostEnd
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_LocalBattleLostPrintWhiteOut::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PLAYERWHITEOUT
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PLAYERWHITEOUT2
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_LocalBattleLostEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_CheckDomeDrew::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifbyte CMP_EQUAL, gBattleOutcome, B_OUTCOME_DREW, BattleScript_LocalBattleLostEnd_
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_LocalBattleLostPrintTrainersWinText::
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_LocalBattleLostPrintWhiteOut
pokemon and battle constants
2018-02-08 11:17:41 +01:00
returnopponentmon1toball BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
returnopponentmon2toball BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
trainerslidein BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
printstring STRINGID_TRAINER1WINTEXT
Label remaining battle types
2021-01-13 21:17:32 +01:00
jumpifbattletype BATTLE_TYPE_TOWER_LINK_MULTI, BattleScript_LocalBattleLostDoTrainer2WinText
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleLostEnd_
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_LocalBattleLostDoTrainer2WinText::
identity -> position
2018-01-16 21:01:31 +01:00
trainerslideout B_POSITION_OPPONENT_LEFT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
trainerslidein BS_FAINTED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
printstring STRINGID_TRAINER2WINTEXT
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_LocalBattleLostEnd_::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Document remainder of battle_controllers.c
2021-01-22 08:48:22 +01:00
BattleScript_FrontierLinkBattleLost::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
returnopponentmon1toball BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
returnopponentmon2toball BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
trainerslidein BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
printstring STRINGID_TRAINER1WINTEXT
identity -> position
2018-01-16 21:01:31 +01:00
trainerslideout B_POSITION_OPPONENT_LEFT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
trainerslidein BS_FAINTED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
printstring STRINGID_TRAINER2WINTEXT
Document remainder of battle_controllers.c
2021-01-22 08:48:22 +01:00
jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_FrontierLinkBattleLostEnd
endlinkbattle
BattleScript_FrontierLinkBattleLostEnd::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_LinkBattleWonOrLost::
Document remainder of battle_controllers.c
2021-01-22 08:48:22 +01:00
jumpifbattletype BATTLE_TYPE_BATTLE_TOWER, BattleScript_TowerLinkBattleWon
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_BATTLEEND
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_LinkBattleWonOrLostWaitEnd
Document remainder of battle_controllers.c
2021-01-22 08:48:22 +01:00
endlinkbattle
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_LinkBattleWonOrLostWaitEnd::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Document remainder of battle_controllers.c
2021-01-22 08:48:22 +01:00
BattleScript_TowerLinkBattleWon::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playtrainerdefeatbgm BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_BATTLEEND
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
trainerslidein BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
printstring STRINGID_TRAINER1LOSETEXT
identity -> position
2018-01-16 21:01:31 +01:00
trainerslideout B_POSITION_OPPONENT_LEFT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
trainerslidein BS_FAINTED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
printstring STRINGID_TRAINER2LOSETEXT
Document remainder of battle_controllers.c
2021-01-22 08:48:22 +01:00
jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_TowerLinkBattleWonEnd
endlinkbattle
BattleScript_TowerLinkBattleWonEnd::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_FrontierTrainerBattleWon::
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_PayDayMoneyAndPickUpItems
Label various battle scripts
2018-09-01 20:00:13 +02:00
jumpifbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_FrontierTrainerBattleWon_TwoDefeated
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PLAYERDEFEATEDTRAINER1
Label various battle scripts
2018-09-01 20:00:13 +02:00
goto BattleScript_FrontierTrainerBattleWon_LoseTexts
BattleScript_FrontierTrainerBattleWon_TwoDefeated:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_TWOENEMIESDEFEATED
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_FrontierTrainerBattleWon_LoseTexts:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
trainerslidein BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
printstring STRINGID_TRAINER1LOSETEXT
Add stat stage constants
2020-08-05 02:33:05 +02:00
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_TryPickUpItems
identity -> position
2018-01-16 21:01:31 +01:00
trainerslideout B_POSITION_OPPONENT_LEFT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
trainerslidein BS_FAINTED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
printstring STRINGID_TRAINER2LOSETEXT
Add stat stage constants
2020-08-05 02:33:05 +02:00
BattleScript_TryPickUpItems:
Label various battle scripts
2018-09-01 20:00:13 +02:00
jumpifnotbattletype BATTLE_TYPE_PYRAMID, BattleScript_FrontierTrainerBattleWon_End
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
pickup
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_FrontierTrainerBattleWon_End:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_SmokeBallEscape::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_ATTACKER, B_ANIM_SMOKEBALL_ESCAPE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNFLEDUSINGITS
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_RanAwayUsingMonAbility::
printstring STRINGID_PKMNFLEDUSING
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_GotAwaySafely::
printstring STRINGID_GOTAWAYSAFELY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_WildMonFled::
printstring STRINGID_WILDPKMNFLED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
name more battlescripts
2017-11-26 17:26:11 +01:00
BattleScript_PrintCantRunFromTrainer::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_NORUNNINGFROMTRAINERS
end2
BattleScript_PrintFailedToRunString::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gNoEscapeStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
name more battlescripts
2017-11-26 17:26:11 +01:00
BattleScript_PrintCantEscapeFromBattle::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printselectionstringfromtable gNoEscapeStringIds
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
endselectionscript
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_PrintFullBox::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printselectionstring STRINGID_BOXISFULL
endselectionscript
BattleScript_ActionSwitch::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hpthresholds2 BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_RETURNMON
label battle stuff
2017-12-02 14:08:55 +01:00
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_PursuitSwitchDmgSetMultihit
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setmultihit 1
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_PursuitSwitchDmgLoop
BattleScript_PursuitSwitchDmgSetMultihit::
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setmultihit 2
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_PursuitSwitchDmgLoop::
jumpifnopursuitswitchdmg BattleScript_DoSwitchOut
more battle documentation
2018-06-30 14:12:17 +02:00
swapattackerwithtarget
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
trysetdestinybondtohappen
give names to some battlescripts
2017-12-02 00:03:46 +01:00
call BattleScript_PursuitDmgOnSwitchOut
more battle documentation
2018-06-30 14:12:17 +02:00
swapattackerwithtarget
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_DoSwitchOut::
decrementmultihit BattleScript_PursuitSwitchDmgLoop
pokemon and battle constants
2018-02-08 11:17:41 +01:00
switchoutabilities BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
returnatktoball
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
drawpartystatussummary BS_ATTACKER
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
switchhandleorder BS_ATTACKER, 1
pokemon and battle constants
2018-02-08 11:17:41 +01:00
getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_SWITCHINMON
document party status summary
2018-06-28 21:06:32 +02:00
hidepartystatussummary BS_ATTACKER
pokemon and battle constants
2018-02-08 11:17:41 +01:00
switchinanim BS_ATTACKER, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
switchineffects BS_ATTACKER
merge
2019-11-10 12:09:14 +01:00
moveendcase MOVEEND_STATUS_IMMUNITY_ABILITIES
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendcase MOVEEND_MIRROR_MOVE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_PursuitDmgOnSwitchOut::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
ppreduce
critcalc
damagecalc
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
effectivenesssound
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hitanimation BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
critmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_TARGET, FALSE, NULL
merge
2019-11-10 12:09:14 +01:00
moveendfromto MOVEEND_ABILITIES, MOVEEND_CHOICE_MOVE
Clean up some battle scr cmd data
2020-07-17 02:12:12 +02:00
getbattlerfainted BS_TARGET
jumpifbyte CMP_EQUAL, gBattleCommunication, FALSE, BattleScript_PursuitDmgOnSwitchOutRet
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sGIVEEXP_STATE, 0
pokemon and battle constants
2018-02-08 11:17:41 +01:00
getexp BS_TARGET
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_PursuitDmgOnSwitchOutRet:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_Pausex20::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_LevelUp::
Give songs meaningful english names
2020-08-21 00:02:00 +02:00
fanfare MUS_LEVEL_UP
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNGREWTOLV
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sLVLBOX_STATE, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
drawlvlupbox
handlelearnnewmove BattleScript_LearnedNewMove, BattleScript_LearnMoveReturn, TRUE
goto BattleScript_AskToLearnMove
BattleScript_TryLearnMoveLoop::
handlelearnnewmove BattleScript_LearnedNewMove, BattleScript_LearnMoveReturn, FALSE
BattleScript_AskToLearnMove::
buffermovetolearn
printstring STRINGID_TRYTOLEARNMOVE1
printstring STRINGID_TRYTOLEARNMOVE2
printstring STRINGID_TRYTOLEARNMOVE3
waitstate
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sLEARNMOVE_STATE, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
yesnoboxlearnmove BattleScript_ForgotAndLearnedNewMove
printstring STRINGID_STOPLEARNINGMOVE
waitstate
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sLEARNMOVE_STATE, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
yesnoboxstoplearningmove BattleScript_AskToLearnMove
printstring STRINGID_DIDNOTLEARNMOVE
goto BattleScript_TryLearnMoveLoop
BattleScript_ForgotAndLearnedNewMove::
printstring STRINGID_123POOF
printstring STRINGID_PKMNFORGOTMOVE
printstring STRINGID_ANDELLIPSIS
BattleScript_LearnedNewMove::
buffermovetolearn
Give songs meaningful english names
2020-08-21 00:02:00 +02:00
fanfare MUS_LEVEL_UP
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNLEARNEDMOVE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatechoicemoveonlvlup BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_TryLearnMoveLoop
BattleScript_LearnMoveReturn::
return
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_RainContinuesOrEnds::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gRainContinuesStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_RAIN_STOPPED, BattleScript_RainContinuesOrEndsEnd
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_ATTACKER, B_ANIM_RAIN_CONTINUES, NULL
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_RainContinuesOrEndsEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_DamagingWeatherContinues::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gSandStormHailContinuesStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte gBattleCommunication, 0
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_DamagingWeatherLoop::
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
weatherdamage
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
jumpifword CMP_EQUAL, gBattleMoveDamage, 0, BattleScript_DamagingWeatherLoopIncrement
Abilities affected by weather conditions
2018-07-22 22:41:13 +02:00
jumpifword CMP_COMMON_BITS gBattleMoveDamage, 1 << 31, BattleScript_DamagingWeatherHeal
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gSandStormHailDmgStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
effectivenesssound
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hitanimation BS_ATTACKER
Abilities affected by weather conditions
2018-07-22 22:41:13 +02:00
goto BattleScript_DamagingWeatherHpChange
BattleScript_DamagingWeatherHeal:
Fix Ice Body not working
2020-01-18 19:18:57 +01:00
call BattleScript_AbilityPopUp
Abilities affected by weather conditions
2018-07-22 22:41:13 +02:00
printstring STRINGID_ICEBODYHPGAIN
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Abilities affected by weather conditions
2018-07-22 22:41:13 +02:00
BattleScript_DamagingWeatherHpChange:
orword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
tryfaintmon BS_ATTACKER, FALSE, NULL
more battle labels
2017-11-26 17:15:28 +01:00
atk24 BattleScript_DamagingWeatherLoopIncrement
BattleScript_DamagingWeatherLoopIncrement::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_DamagingWeatherContinuesEnd
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
addbyte gBattleCommunication, 1
rename bank to battler
2018-02-06 02:46:59 +01:00
jumpifbytenotequal gBattleCommunication, gBattlersCount, BattleScript_DamagingWeatherLoop
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_DamagingWeatherContinuesEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
bicword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
end2
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SandStormHailEnds::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gSandStormHailEndStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SunlightContinues::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_SUNLIGHTSTRONG
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_ATTACKER, B_ANIM_SUN_CONTINUES, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SunlightFaded::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_SUNLIGHTFADED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_OverworldWeatherStarts::
Clean some battle_message.c data
2020-07-21 19:29:51 +02:00
printfromtable gWeatherStartsStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end3
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
BattleScript_OverworldTerrain::
printfromtable gTerrainStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG, NULL
end3
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SideStatusWoreOff::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXWOREOFF
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Defog
2018-09-23 19:03:53 +02:00
BattleScript_SideStatusWoreOffReturn::
printstring STRINGID_PKMNSXWOREOFF
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Defog
2018-09-23 19:03:53 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add new Side turn effects
2018-07-21 12:56:07 +02:00
BattleScript_LuckyChantEnds::
printstring STRINGID_LUCKYCHANTENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add new Side turn effects
2018-07-21 12:56:07 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add new Side turn effects
2018-07-21 12:56:07 +02:00
BattleScript_TailwindEnds::
printstring STRINGID_TAILWINDENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add new Side turn effects
2018-07-21 12:56:07 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add new field end turn effects
2018-07-21 13:24:20 +02:00
BattleScript_TrickRoomEnds::
printstring STRINGID_TRICKROOMENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add new field end turn effects
2018-07-21 13:24:20 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add new field end turn effects
2018-07-21 13:24:20 +02:00
BattleScript_WonderRoomEnds::
printstring STRINGID_WONDERROOMENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add new field end turn effects
2018-07-21 13:24:20 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add new field end turn effects
2018-07-21 13:24:20 +02:00
BattleScript_MagicRoomEnds::
printstring STRINGID_MAGICROOMENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add new field end turn effects
2018-07-21 13:24:20 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add new field end turn effects
2018-07-21 13:24:20 +02:00
BattleScript_ElectricTerrainEnds::
printstring STRINGID_ELECTRICTERRAINENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
permanent terrain move bgs
2020-11-18 03:45:27 +01:00
playanimation BS_ATTACKER, B_ANIM_RESTORE_BG, NULL
Add new field end turn effects
2018-07-21 13:24:20 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add new field end turn effects
2018-07-21 13:24:20 +02:00
BattleScript_MistyTerrainEnds::
printstring STRINGID_MISTYTERRAINENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
permanent terrain move bgs
2020-11-18 03:45:27 +01:00
playanimation BS_ATTACKER, B_ANIM_RESTORE_BG, NULL
Add new field end turn effects
2018-07-21 13:24:20 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add new field end turn effects
2018-07-21 13:24:20 +02:00
BattleScript_GrassyTerrainEnds::
printstring STRINGID_GRASSYTERRAINENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
permanent terrain move bgs
2020-11-18 03:45:27 +01:00
playanimation BS_ATTACKER, B_ANIM_RESTORE_BG, NULL
Add new field end turn effects
2018-07-21 13:24:20 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add new field end turn effects
2018-07-21 13:24:20 +02:00
BattleScript_PsychicTerrainEnds::
printstring STRINGID_PSYCHICTERRAINENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
permanent terrain move bgs
2020-11-18 03:45:27 +01:00
playanimation BS_ATTACKER, B_ANIM_RESTORE_BG, NULL
Add new field end turn effects
2018-07-21 13:24:20 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add new field end turn effects
2018-07-21 13:24:20 +02:00
BattleScript_MudSportEnds::
printstring STRINGID_MUDSPORTENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add new field end turn effects
2018-07-21 13:24:20 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add new field end turn effects
2018-07-21 13:24:20 +02:00
BattleScript_WaterSportEnds::
printstring STRINGID_WATERSPORTENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add new field end turn effects
2018-07-21 13:24:20 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
BattleScript_GravityEnds::
printstring STRINGID_GRAVITYENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
end2
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_SafeguardProtected::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNUSEDSAFEGUARD
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SafeguardEnds::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSAFEGUARDEXPIRED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_LeechSeedTurnDrain::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_ATTACKER, B_ANIM_LEECH_SEED_DRAIN, sB_ANIM_ARG1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
add more battlescript macros
2017-11-25 21:32:17 +01:00
copyword gBattleMoveDamage, gHpDealt
pokemon and battle constants
2018-02-08 11:17:41 +01:00
jumpifability BS_ATTACKER, ABILITY_LIQUID_OOZE, BattleScript_LeechSeedTurnPrintLiquidOoze
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte cMULTISTRING_CHOOSER, B_MSG_LEECH_SEED_DRAIN
Fix Heal Block Leech Seed
2020-06-22 10:40:08 +02:00
jumpifstatus3 BS_TARGET, STATUS3_HEAL_BLOCK, BattleScript_LeechSeedHealBlock
manipulatedamage DMG_BIG_ROOT
more battlescript labels
2017-12-03 00:47:21 +01:00
goto BattleScript_LeechSeedTurnPrintAndUpdateHp
BattleScript_LeechSeedTurnPrintLiquidOoze::
Draining abilities have the pop-up appear now
2020-02-22 19:25:35 +01:00
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte cMULTISTRING_CHOOSER, B_MSG_LEECH_SEED_OOZE
more battlescript labels
2017-12-03 00:47:21 +01:00
BattleScript_LeechSeedTurnPrintAndUpdateHp::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gLeechSeedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
tryfaintmon BS_TARGET, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Fix Heal Block Leech Seed
2020-06-22 10:40:08 +02:00
BattleScript_LeechSeedHealBlock:
setword gBattleMoveDamage, 0
goto BattleScript_LeechSeedTurnPrintAndUpdateHp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_BideStoringEnergy::
printstring STRINGID_PKMNSTORINGENERGY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_BideAttack::
attackcanceler
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_CHARGING
pokemon and battle constants
2018-02-08 11:17:41 +01:00
clearstatusfromeffect BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNUNLEASHEDENERGY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE
typecalc
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
bichalfword gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
add more battlescript macros
2017-11-25 21:32:17 +01:00
copyword gBattleMoveDamage, sBIDE_DMG
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sB_ANIM_TURN, 1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackanimation
waitanimation
effectivenesssound
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hitanimation BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_TARGET, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_BideNoEnergyToAttack::
attackcanceler
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_CHARGING
pokemon and battle constants
2018-02-08 11:17:41 +01:00
clearstatusfromeffect BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNUNLEASHEDENERGY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_ButItFailed
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Proper Roar handling in double battles
2019-03-06 12:09:34 +01:00
BattleScript_RoarSuccessSwitch::
call BattleScript_RoarSuccessRet
pokemon and battle constants
2018-02-08 11:17:41 +01:00
getswitchedmondata BS_TARGET
switchindataupdate BS_TARGET
switchinanim BS_TARGET, FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
printstring STRINGID_PKMNWASDRAGGEDOUT
pokemon and battle constants
2018-02-08 11:17:41 +01:00
switchineffects BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Proper Roar handling in double battles
2019-03-06 12:09:34 +01:00
BattleScript_RoarSuccessEndBattle::
call BattleScript_RoarSuccessRet
setoutcomeonteleport BS_ATTACKER
finishaction
BattleScript_RoarSuccessRet:
attackanimation
waitanimation
switchoutabilities BS_TARGET
returntoball BS_TARGET
waitstate
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Various battle target items
2019-05-09 20:31:58 +02:00
BattleScript_WeaknessPolicy::
copybyte sBATTLER, gBattlerTarget
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_WeaknessPolicyAtk
jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPATK, MAX_STAT_STAGE, BattleScript_WeaknessPolicyEnd
Various battle target items
2019-05-09 20:31:58 +02:00
BattleScript_WeaknessPolicyAtk:
Merge battle anim documentation
2020-02-29 13:59:41 +01:00
playanimation BS_TARGET, B_ANIM_HELD_ITEM_EFFECT, NULL
Various battle target items
2019-05-09 20:31:58 +02:00
waitanimation
setbyte sSTAT_ANIM_PLAYED, FALSE
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_BY_TWO
Various battle target items
2019-05-09 20:31:58 +02:00
setstatchanger STAT_ATK, 2, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeaknessPolicySpAtk
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_WeaknessPolicySpAtk
printstring STRINGID_USINGITEMSTATOFPKMNROSE
waitmessage B_WAIT_TIME_LONG
Various battle target items
2019-05-09 20:31:58 +02:00
BattleScript_WeaknessPolicySpAtk:
setstatchanger STAT_SPATK, 2, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeaknessPolicyRemoveItem
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_WeaknessPolicyRemoveItem
printstring STRINGID_USINGITEMSTATOFPKMNROSE
waitmessage B_WAIT_TIME_LONG
Various battle target items
2019-05-09 20:31:58 +02:00
BattleScript_WeaknessPolicyRemoveItem:
removeitem BS_TARGET
BattleScript_WeaknessPolicyEnd:
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Various battle target items
2019-05-09 20:31:58 +02:00
BattleScript_TargetItemStatRaise::
copybyte sBATTLER, gBattlerTarget
statbuffchange 0, BattleScript_TargetItemStatRaiseRemoveItemRet
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_TargetItemStatRaiseRemoveItemRet
Merge battle anim documentation
2020-02-29 13:59:41 +01:00
playanimation BS_TARGET, B_ANIM_HELD_ITEM_EFFECT, NULL
Various battle target items
2019-05-09 20:31:58 +02:00
waitanimation
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
waitanimation
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
printstring STRINGID_USINGITEMSTATOFPKMNROSE
waitmessage B_WAIT_TIME_LONG
Various battle target items
2019-05-09 20:31:58 +02:00
removeitem BS_TARGET
BattleScript_TargetItemStatRaiseRemoveItemRet:
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MistProtected::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNPROTECTEDBYMIST
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_RageIsBuilding::
printstring STRINGID_PKMNRAGEBUILDING
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_MoveUsedIsDisabled::
printstring STRINGID_PKMNMOVEISDISABLED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SelectingDisabledMove::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printselectionstring STRINGID_PKMNMOVEISDISABLED
endselectionscript
BattleScript_DisabledNoMore::
printstring STRINGID_PKMNMOVEDISABLEDNOMORE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
more battlescript labels
2017-12-03 00:47:21 +01:00
BattleScript_SelectingDisabledMoveInPalace::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNMOVEISDISABLED
more battlescript labels
2017-12-03 00:47:21 +01:00
BattleScript_SelectingUnusableMoveInPalace::
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendto MOVEEND_NEXT_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end
BattleScript_EncoredNoMore::
printstring STRINGID_PKMNENCOREENDED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_DestinyBondTakesLife::
printstring STRINGID_PKMNTOOKFOE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
tryfaintmon BS_ATTACKER, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
BattleScript_DmgHazardsOnAttacker::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
call BattleScript_PrintHurtByDmgHazards
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
tryfaintmon BS_ATTACKER, TRUE, BattleScript_DmgHazardsOnAttackerFainted
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
BattleScript_DmgHazardsOnAttackerFainted::
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sGIVEEXP_STATE, 0
pokemon and battle constants
2018-02-08 11:17:41 +01:00
getexp BS_ATTACKER
Helpful macros for atk49
2019-03-30 12:37:18 +01:00
moveendall
label battle stuff
2017-12-02 14:08:55 +01:00
goto BattleScript_HandleFaintedMon
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
BattleScript_DmgHazardsOnTarget::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
call BattleScript_PrintHurtByDmgHazards
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_TARGET, FALSE, NULL
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
tryfaintmon BS_TARGET, TRUE, BattleScript_DmgHazardsOnTargetFainted
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
BattleScript_DmgHazardsOnTargetFainted::
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sGIVEEXP_STATE, 0
pokemon and battle constants
2018-02-08 11:17:41 +01:00
getexp BS_TARGET
Helpful macros for atk49
2019-03-30 12:37:18 +01:00
moveendall
label battle stuff
2017-12-02 14:08:55 +01:00
goto BattleScript_HandleFaintedMon
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
BattleScript_DmgHazardsOnFaintedBattler::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_FAINTED
datahpupdate BS_FAINTED
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
call BattleScript_PrintHurtByDmgHazards
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_FAINTED, FALSE, NULL
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
tryfaintmon BS_FAINTED, TRUE, BattleScript_DmgHazardsOnFaintedBattlerFainted
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
BattleScript_DmgHazardsOnFaintedBattlerFainted::
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sGIVEEXP_STATE, 0
pokemon and battle constants
2018-02-08 11:17:41 +01:00
getexp BS_FAINTED
Helpful macros for atk49
2019-03-30 12:37:18 +01:00
moveendall
label battle stuff
2017-12-02 14:08:55 +01:00
goto BattleScript_HandleFaintedMon
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
BattleScript_PrintHurtByDmgHazards::
printfromtable gDmgHazardsStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
BattleScript_ToxicSpikesAbsorbed::
printstring STRINGID_TOXICSPIKESABSORBED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
BattleScript_ToxicSpikesPoisoned::
printstring STRINGID_TOXICSPIKESPOISONED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
statusanimation BS_SCRIPTING
updatestatusicon BS_SCRIPTING
waitstate
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Sticky Web done
2018-07-24 22:09:55 +02:00
BattleScript_StickyWebOnSwitchIn::
savetarget
Various battle target items
2019-05-09 20:31:58 +02:00
copybyte gBattlerTarget, sBATTLER
Sticky Web done
2018-07-24 22:09:55 +02:00
printstring STRINGID_STICKYWEBSWITCHIN
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_StickyWebOnSwitchInEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_StickyWebOnSwitchInStatAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_StickyWebOnSwitchInEnd
pause B_WAIT_TIME_SHORT
Sticky Web done
2018-07-24 22:09:55 +02:00
goto BattleScript_StickyWebOnSwitchInPrintStatMsg
BattleScript_StickyWebOnSwitchInStatAnim:
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
BattleScript_StickyWebOnSwitchInPrintStatMsg:
printfromtable gStatDownStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Sticky Web done
2018-07-24 22:09:55 +02:00
BattleScript_StickyWebOnSwitchInEnd:
restoretarget
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
name more battlescripts
2017-11-26 17:26:11 +01:00
BattleScript_PerishSongTakesLife::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNPERISHCOUNTFELL
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
tryfaintmon BS_ATTACKER, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Implemented Perish Body Inspired by Raguzero's implementation.
2020-12-11 23:00:30 +01:00
BattleScript_PerishBodyActivates::
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSWILLPERISHIN3TURNS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Implemented Perish Body Inspired by Raguzero's implementation.
2020-12-11 23:00:30 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
return
name more battlescripts
2017-11-26 17:26:11 +01:00
BattleScript_PerishSongCountGoesDown::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNPERISHCOUNTFELL
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_AllStatsUp::
Add stat stage constants
2020-08-05 02:33:05 +02:00
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_AllStatsUpRet
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_AllStatsUpAtk::
Document atk48
2018-07-29 15:33:16 +02:00
setbyte sSTAT_ANIM_PLAYED, FALSE
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_ATK, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpDef
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_AllStatsUpDef::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_DEF, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpeed
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_AllStatsUpSpeed::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPEED, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpAtk
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_AllStatsUpSpAtk::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPATK, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpDef
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_AllStatsUpSpDef::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPDEF, 1, FALSE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpRet
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_AllStatsUpRet::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_RapidSpinAway::
rapidspinfree
return
BattleScript_WrapFree::
printstring STRINGID_PKMNGOTFREE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Make battle tower compile
2018-10-27 00:04:18 +02:00
copybyte gBattlerTarget, sBATTLER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_LeechSeedFree::
printstring STRINGID_PKMNSHEDLEECHSEED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_SpikesFree::
printstring STRINGID_PKMNBLEWAWAYSPIKES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
BattleScript_ToxicSpikesFree::
printstring STRINGID_PKMNBLEWAWAYTOXICSPIKES
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
BattleScript_StickyWebFree::
printstring STRINGID_PKMNBLEWAWAYSTICKYWEB
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
BattleScript_StealthRockFree::
printstring STRINGID_PKMNBLEWAWAYSTEALTHROCK
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
name more battlescripts
2017-11-26 17:26:11 +01:00
BattleScript_MonTookFutureAttack::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNTOOKATTACK
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_FUTURE_SIGHT, BattleScript_CheckDoomDesireMiss
more battlescript labels
2017-12-03 00:47:21 +01:00
accuracycheck BattleScript_FutureAttackMiss, MOVE_FUTURE_SIGHT
goto BattleScript_FutureAttackAnimate
BattleScript_CheckDoomDesireMiss::
accuracycheck BattleScript_FutureAttackMiss, MOVE_DOOM_DESIRE
BattleScript_FutureAttackAnimate::
Fix Future Sight
2018-12-02 18:47:39 +01:00
critcalc
damagecalc
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
Fix Future Sight
2018-12-02 18:47:39 +01:00
jumpifmovehadnoeffect BattleScript_DoFutureAttackResult
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_FUTURE_SIGHT, BattleScript_FutureHitAnimDoomDesire
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_ATTACKER, B_ANIM_FUTURE_SIGHT_HIT, NULL
more battlescript labels
2017-12-03 00:47:21 +01:00
goto BattleScript_DoFutureAttackHit
BattleScript_FutureHitAnimDoomDesire::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_ATTACKER, B_ANIM_DOOM_DESIRE_HIT, NULL
more battlescript labels
2017-12-03 00:47:21 +01:00
BattleScript_DoFutureAttackHit::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
effectivenesssound
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hitanimation BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
Fix Future Sight
2018-12-02 18:47:39 +01:00
critmessage
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Fix Future Sight
2018-12-02 18:47:39 +01:00
BattleScript_DoFutureAttackResult:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_TARGET, FALSE, NULL
more battlescript labels
2017-12-03 00:47:21 +01:00
atk24 BattleScript_FutureAttackEnd
BattleScript_FutureAttackEnd::
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendcase MOVEEND_RAGE
moveendfromto MOVEEND_ITEM_EFFECTS_ALL, MOVEEND_UPDATE_LAST_MOVES
more renaming
2018-01-16 22:12:38 +01:00
setbyte gMoveResultFlags, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
more battlescript labels
2017-12-03 00:47:21 +01:00
BattleScript_FutureAttackMiss::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Fix Future Sight
2018-12-02 18:47:39 +01:00
sethword gMoveResultFlags, MOVE_RESULT_FAILED
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
sethword gMoveResultFlags, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_NoMovesLeft::
printselectionstring STRINGID_PKMNHASNOMOVESLEFT
endselectionscript
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SelectingMoveWithNoPP::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printselectionstring STRINGID_NOPPLEFT
endselectionscript
BattleScript_NoPPForMove::
attackstring
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_BUTNOPPLEFT
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SelectingTormentedMove::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printselectionstring STRINGID_PKMNCANTUSEMOVETORMENT
endselectionscript
more battlescript labels
2017-12-03 00:47:21 +01:00
BattleScript_MoveUsedIsTormented::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNCANTUSEMOVETORMENT
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
more battlescript labels
2017-12-03 00:47:21 +01:00
BattleScript_SelectingTormentedMoveInPalace::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNCANTUSEMOVETORMENT
more battlescript labels
2017-12-03 00:47:21 +01:00
goto BattleScript_SelectingUnusableMoveInPalace
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SelectingNotAllowedMoveTaunt::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printselectionstring STRINGID_PKMNCANTUSEMOVETAUNT
endselectionscript
BattleScript_MoveUsedIsTaunted::
printstring STRINGID_PKMNCANTUSEMOVETAUNT
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
more battlescript labels
2017-12-03 00:47:21 +01:00
BattleScript_SelectingNotAllowedMoveTauntInPalace::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNCANTUSEMOVETAUNT
more battlescript labels
2017-12-03 00:47:21 +01:00
goto BattleScript_SelectingUnusableMoveInPalace
Dancer Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-11-14 00:03:20 +01:00
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
BattleScript_SelectingNotAllowedMoveThroatChop::
printselectionstring STRINGID_PKMNCANTUSEMOVETHROATCHOP
endselectionscript
BattleScript_MoveUsedIsThroatChopPrevented::
printstring STRINGID_PKMNCANTUSEMOVETHROATCHOP
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
goto BattleScript_MoveEnd
BattleScript_SelectingNotAllowedMoveThroatChopInPalace::
printstring STRINGID_PKMNCANTUSEMOVETHROATCHOP
goto BattleScript_SelectingUnusableMoveInPalace
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
BattleScript_ThroatChopEndTurn::
printstring STRINGID_THROATCHOPENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
end2
Slow Start
2020-04-18 12:52:15 +02:00
BattleScript_SlowStartEnds::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause 5
Slow Start
2020-04-18 12:52:15 +02:00
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
printstring STRINGID_SLOWSTARTEND
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Slow Start
2020-04-18 12:52:15 +02:00
end2
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
Update Unusable Moves
2018-07-31 23:09:47 +02:00
BattleScript_SelectingNotAllowedMoveGravity::
printselectionstring STRINGID_GRAVITYPREVENTSUSAGE
endselectionscript
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Code Belch effect
2019-02-01 14:17:24 +01:00
BattleScript_SelectingNotAllowedBelch::
printselectionstring STRINGID_BELCHCANTSELECT
endselectionscript
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Code Belch effect
2019-02-01 14:17:24 +01:00
BattleScript_SelectingNotAllowedBelchInPalace::
Add Crafty Shield effect
2019-02-01 14:34:16 +01:00
printstring STRINGID_BELCHCANTSELECT
Code Belch effect
2019-02-01 14:17:24 +01:00
goto BattleScript_SelectingUnusableMoveInPalace
Update Unusable Moves
2018-07-31 23:09:47 +02:00
BattleScript_MoveUsedGravityPrevents::
printstring STRINGID_GRAVITYPREVENTSUSAGE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Update Unusable Moves
2018-07-31 23:09:47 +02:00
goto BattleScript_MoveEnd
BattleScript_SelectingNotAllowedMoveGravityInPalace::
printstring STRINGID_GRAVITYPREVENTSUSAGE
goto BattleScript_SelectingUnusableMoveInPalace
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Update Unusable Moves
2018-07-31 23:09:47 +02:00
BattleScript_SelectingNotAllowedMoveHealBlock::
Taunt fix etc. Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's. Heal Block now displays the correct string when preventing usage of a move.
2019-03-24 03:45:21 +01:00
printselectionstring STRINGID_HEALBLOCKPREVENTSUSAGE
Update Unusable Moves
2018-07-31 23:09:47 +02:00
endselectionscript
BattleScript_MoveUsedHealBlockPrevents::
Taunt fix etc. Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's. Heal Block now displays the correct string when preventing usage of a move.
2019-03-24 03:45:21 +01:00
printstring STRINGID_HEALBLOCKPREVENTSUSAGE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Update Unusable Moves
2018-07-31 23:09:47 +02:00
goto BattleScript_MoveEnd
BattleScript_SelectingNotAllowedMoveHealBlockInPalace::
Taunt fix etc. Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's. Heal Block now displays the correct string when preventing usage of a move.
2019-03-24 03:45:21 +01:00
printstring STRINGID_HEALBLOCKPREVENTSUSAGE
Update Unusable Moves
2018-07-31 23:09:47 +02:00
goto BattleScript_SelectingUnusableMoveInPalace
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_WishComesTrue::
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
trywish 1, BattleScript_WishButFullHp
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_TARGET, B_ANIM_WISH_HEAL, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNWISHCAMETRUE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNREGAINEDHEALTH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
more battlescript labels
2017-12-03 00:47:21 +01:00
BattleScript_WishButFullHp::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNWISHCAMETRUE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNHPFULL
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_IngrainTurnHeal::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_ATTACKER, B_ANIM_INGRAIN_HEAL, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNABSORBEDNUTRIENTS
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
BattleScript_TurnHeal:
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
BattleScript_AquaRingHeal::
playanimation BS_ATTACKER, B_ANIM_INGRAIN_HEAL, NULL
printstring STRINGID_AQUARINGHEAL
goto BattleScript_TurnHeal
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
more battlescript labels
2017-12-03 00:47:21 +01:00
BattleScript_PrintMonIsRooted::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNANCHOREDITSELF
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_AtkDefDown::
Document atk48
2018-07-29 15:33:16 +02:00
setbyte sSTAT_ANIM_PLAYED, FALSE
Rename some STAT_CHANGE macros
2019-10-26 17:53:00 +02:00
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_ATTACKER, BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_ATK, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDownTryDef
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_AtkDefDownTryDef
Close combat effect
2018-09-22 01:12:27 +02:00
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Last Resort, Fangs and Flare Blitz/Volt Tackle
2018-09-22 10:45:43 +02:00
BattleScript_AtkDefDownTryDef:
Rename some STAT_CHANGE macros
2019-10-26 17:53:00 +02:00
playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
Close combat effect
2018-09-22 01:12:27 +02:00
setstatchanger STAT_DEF, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDownRet
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_AtkDefDownRet
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatDownStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Last Resort, Fangs and Flare Blitz/Volt Tackle
2018-09-22 10:45:43 +02:00
BattleScript_AtkDefDownRet:
Close combat effect
2018-09-22 01:12:27 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Close combat effect
2018-09-22 01:12:27 +02:00
BattleScript_DefSpDefDown::
setbyte sSTAT_ANIM_PLAYED, FALSE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_DEF, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_DefSpDefDownTrySpDef
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_DefSpDefDownTrySpDef
Close combat effect
2018-09-22 01:12:27 +02:00
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Close combat effect
2018-09-22 01:12:27 +02:00
BattleScript_DefSpDefDownTrySpDef::
merge
2019-11-10 12:09:14 +01:00
playstatchangeanimation BS_ATTACKER, BIT_SPDEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
Close combat effect
2018-09-22 01:12:27 +02:00
setstatchanger STAT_SPDEF, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_DefSpDefDownRet
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_DefSpDefDownRet
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatDownStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Close combat effect
2018-09-22 01:12:27 +02:00
BattleScript_DefSpDefDownRet::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_KnockedOff::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_TARGET, B_ANIM_ITEM_KNOCKOFF, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNKNOCKEDOFF
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_MoveUsedIsImprisoned::
printstring STRINGID_PKMNCANTUSEMOVESEALED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
BattleScript_SelectingImprisonedMove::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printselectionstring STRINGID_PKMNCANTUSEMOVESEALED
endselectionscript
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
BattleScript_SelectingImprisonedMoveInPalace::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNCANTUSEMOVESEALED
more battlescript labels
2017-12-03 00:47:21 +01:00
goto BattleScript_SelectingUnusableMoveInPalace
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_GrudgeTakesPp::
printstring STRINGID_PKMNLOSTPPGRUDGE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_MagicCoatBounce::
attackstring
ppreduce
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add Magic Bounce
2018-07-28 10:41:20 +02:00
printfromtable gMagicCoatBounceStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setmagiccoattarget BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_SnatchedMove::
attackstring
ppreduce
more battle documentation
2018-06-30 14:12:17 +02:00
snatchsetbattlers
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_TARGET, B_ANIM_SNATCH_MOVE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSNATCHEDMOVE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000
more battle documentation
2018-06-30 14:12:17 +02:00
swapattackerwithtarget
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_EnduredMsg::
printstring STRINGID_PKMNENDUREDHIT
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
BattleScript_SturdiedMsg::
Fix Sturdy's pop-up
2019-03-01 13:53:06 +01:00
copybyte gBattlerAbility, gBattlerTarget
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause 16
Fix Sturdy's pop-up
2019-03-01 13:53:06 +01:00
call BattleScript_AbilityPopUp
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
printstring STRINGID_ENDUREDSTURDY
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_OneHitKOMsg::
printstring STRINGID_ONEHITKO
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_SAtkDown2::
Document atk48
2018-07-29 15:33:16 +02:00
setbyte sSTAT_ANIM_PLAYED, FALSE
Rename some STAT_CHANGE macros
2019-10-26 17:53:00 +02:00
playstatchangeanimation BS_ATTACKER, BIT_SPATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
pokemon and battle constants
2018-02-08 11:17:41 +01:00
setstatchanger STAT_SPATK, 2, TRUE
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_SAtkDown2End
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_SAtkDown2End
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gStatDownStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Document atk48
2018-07-29 15:33:16 +02:00
BattleScript_SAtkDown2End::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
BattleScript_MoveEffectClearSmog::
printstring STRINGID_RESETSTARGETSSTATLEVELS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_FocusPunchSetUp::
printstring STRINGID_EMPTYSTRING3
Add WAIT_TIME battle script constants
2021-04-02 08:16:01 +02:00
waitmessage 1
Document battle animation scripts.
2018-09-10 21:19:19 +02:00
playanimation BS_ATTACKER, B_ANIM_FOCUS_PUNCH_SETUP, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNTIGHTENINGFOCUS
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
almost full support for link battles mega evolution
2018-09-20 11:23:12 +02:00
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
BattleScript_MegaEvolution::
printstring STRINGID_MEGAEVOREACTING
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Tweak up mega evo
2019-05-02 23:10:01 +02:00
setbyte gIsCriticalHit, 0
handlemegaevo BS_ATTACKER, 0
handlemegaevo BS_ATTACKER, 1
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
playanimation BS_ATTACKER, B_ANIM_MEGA_EVOLUTION, NULL
waitanimation
Tweak up mega evo
2019-05-02 23:10:01 +02:00
handlemegaevo BS_ATTACKER, 2
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
printstring STRINGID_MEGAEVOEVOLVED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Switch-in abilities for megas
2020-02-16 13:34:25 +01:00
switchinabilities BS_ATTACKER
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Implemented Wish Mega Evolution
2020-11-07 13:53:34 +01:00
BattleScript_WishMegaEvolution::
printstring STRINGID_FERVENTWISHREACHED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Implemented Wish Mega Evolution
2020-11-07 13:53:34 +01:00
setbyte gIsCriticalHit, 0
handlemegaevo BS_ATTACKER, 0
handlemegaevo BS_ATTACKER, 1
playanimation BS_ATTACKER, B_ANIM_MEGA_EVOLUTION, NULL
waitanimation
handlemegaevo BS_ATTACKER, 2
printstring STRINGID_MEGAEVOEVOLVED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Implemented Wish Mega Evolution
2020-11-07 13:53:34 +01:00
switchinabilities BS_ATTACKER
end2
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
BattleScript_AttackerFormChange::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause 5
Fix Aegi ability pop up sliding
2020-01-18 20:33:46 +01:00
copybyte gBattlerAbility, gBattlerAttacker
Form changes layout and Stance Change Aegi
2019-12-31 19:11:53 +01:00
call BattleScript_AbilityPopUp
printstring STRINGID_EMPTYSTRING3
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage 1
Form changes layout and Stance Change Aegi
2019-12-31 19:11:53 +01:00
handleformchange BS_ATTACKER, 0
handleformchange BS_ATTACKER, 1
playanimation BS_ATTACKER, B_ANIM_FORM_CHANGE, NULL
waitanimation
handleformchange BS_ATTACKER, 2
return
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
BattleScript_AttackerFormChangeEnd3::
call BattleScript_AttackerFormChange
end3
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Implemented Ball Fetch
2020-12-03 03:09:35 +01:00
BattleScript_BallFetch::
Ball Fetch tweaks
2020-12-05 07:03:55 +01:00
call BattleScript_AbilityPopUp
Implemented Ball Fetch
2020-12-03 03:09:35 +01:00
printstring STRINGID_FETCHEDPOKEBALL
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Implemented Ball Fetch
2020-12-03 03:09:35 +01:00
end3
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
BattleScript_TargetFormChange::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause 5
Disguise ability (#258) * Protection from attacks. * Changes form when Busting Disguise. * Ability changing moves set to fail. - Simple Beam and Worry Seed now fail if the target has Disguise. - Role Play and Skill Swap now fail if either the attacker or the target have Disguise. * Disguise no longer triggers when transformed. * Mimikyu reverts to Disguised * No longer blocks from entry hazards and weather. * Applied review changes * Oops, new line * yeah
2020-02-08 19:29:51 +01:00
copybyte gBattlerAbility, gBattlerTarget
call BattleScript_AbilityPopUp
printstring STRINGID_EMPTYSTRING3
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage 1
Disguise ability (#258) * Protection from attacks. * Changes form when Busting Disguise. * Ability changing moves set to fail. - Simple Beam and Worry Seed now fail if the target has Disguise. - Role Play and Skill Swap now fail if either the attacker or the target have Disguise. * Disguise no longer triggers when transformed. * Mimikyu reverts to Disguised * No longer blocks from entry hazards and weather. * Applied review changes * Oops, new line * yeah
2020-02-08 19:29:51 +01:00
handleformchange BS_TARGET, 0
handleformchange BS_TARGET, 1
playanimation BS_TARGET, B_ANIM_FORM_CHANGE, NULL
waitanimation
handleformchange BS_TARGET, 2
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
Illusion
2019-08-08 13:06:55 +02:00
BattleScript_IllusionOff::
spriteignore0hp TRUE
playanimation BS_TARGET, B_ANIM_ILLUSION_OFF, NULL
waitanimation
updatenick BS_TARGET
waitstate
spriteignore0hp FALSE
printstring STRINGID_ILLUSIONWOREOFF
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Illusion
2019-08-08 13:06:55 +02:00
return
Implemented Cotton Down
2020-12-03 02:53:00 +01:00
BattleScript_CottonDownActivates::
Tweaked abilitypopup usage on Cotton Down's BattleScript
2020-12-13 01:24:39 +01:00
setbyte sFIXED_ABILITY_POPUP, TRUE
Fixed Cotton Down It was tough, but the nightmare is finally over. Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
2020-12-07 19:03:52 +01:00
call BattleScript_AbilityPopUp
copybyte gEffectBattler, gBattlerTarget
savetarget
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte gBattlerTarget, 0
Implemented Cotton Down
2020-12-03 02:53:00 +01:00
BattleScript_CottonDownLoop:
Fixed Cotton Down It will no longer affect fainted 'mons.
2021-07-13 18:54:31 +02:00
getbattlerfainted BS_TARGET
jumpifbyte CMP_EQUAL, gBattleCommunication, TRUE, BattleScript_CottonDownLoopIncrement
Implemented Cotton Down
2020-12-03 02:53:00 +01:00
setstatchanger STAT_SPEED, 1, TRUE
Fixed Cotton Down It was tough, but the nightmare is finally over. Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
2020-12-07 19:03:52 +01:00
jumpifbyteequal gBattlerTarget, gEffectBattler, BattleScript_CottonDownLoopIncrement
statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_CottonDownTargetSpeedCantGoLower
Implemented Cotton Down
2020-12-03 02:53:00 +01:00
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Fixed Cotton Down It was tough, but the nightmare is finally over. Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
2020-12-07 19:03:52 +01:00
goto BattleScript_CottonDownLoopIncrement
BattleScript_CottonDownTargetSpeedCantGoLower:
printstring STRINGID_STATSWONTDECREASE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Fixed Cotton Down It was tough, but the nightmare is finally over. Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
2020-12-07 19:03:52 +01:00
BattleScript_CottonDownLoopIncrement:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
addbyte gBattlerTarget, 1
Implemented Cotton Down
2020-12-03 02:53:00 +01:00
jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_CottonDownLoop
Fixed Cotton Down It was tough, but the nightmare is finally over. Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
2020-12-07 19:03:52 +01:00
BattleScript_CottonDownReturn:
restoretarget
Tweaked abilitypopup usage on Cotton Down's BattleScript
2020-12-13 01:24:39 +01:00
destroyabilitypopup
Fixed Cotton Down It was tough, but the nightmare is finally over. Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
2020-12-07 19:03:52 +01:00
return
Implemented Cotton Down
2020-12-03 02:53:00 +01:00
Anticipation ability (#282)
2020-04-11 12:24:25 +02:00
BattleScript_AnticipationActivates::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause 5
Anticipation ability (#282)
2020-04-11 12:24:25 +02:00
call BattleScript_AbilityPopUp
printstring STRINGID_ANTICIPATIONACTIVATES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Anticipation ability (#282)
2020-04-11 12:24:25 +02:00
return
Implemented Aftermath's effect
2019-12-21 09:01:42 +01:00
BattleScript_AftermathDmg::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Made Aftermath trigger the Ability Pop Up sign
2019-12-23 18:17:54 +01:00
call BattleScript_AbilityPopUp
Implemented Aftermath's effect
2019-12-21 09:01:42 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_AFTERMATHDMG
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Implemented Aftermath's effect
2019-12-21 09:01:42 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveUsedIsAsleep::
printstring STRINGID_PKMNFASTASLEEP
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
statusanimation BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_MoveUsedWokeUp::
bicword gHitMarker, HITMARKER_x10
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gWokeUpStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
name more battlescripts
2017-11-26 17:26:11 +01:00
BattleScript_MonWokeUpInUproar::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNWOKEUPINUPROAR
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_PoisonTurnDmg::
printstring STRINGID_PKMNHURTBYPOISON
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_DoStatusTurnDmg::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
statusanimation BS_ATTACKER
Magic Guard protects from stuff
2020-04-13 15:49:40 +02:00
BattleScript_DoTurnDmg:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
tryfaintmon BS_ATTACKER, FALSE, NULL
give names to some battlescripts
2017-12-02 00:03:46 +01:00
atk24 BattleScript_DoTurnDmgEnd
Magic Guard protects from stuff
2020-04-13 15:49:40 +02:00
BattleScript_DoTurnDmgEnd:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BattleScript_PoisonHealActivates::
printstring STRINGID_POISONHEALHPUP
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
recordability BS_ATTACKER
statusanimation BS_ATTACKER
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
end2
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_BurnTurnDmg::
printstring STRINGID_PKMNHURTBYBURN
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_DoStatusTurnDmg
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveUsedIsFrozen::
printstring STRINGID_PKMNISFROZEN
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
statusanimation BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_MoveUsedUnfroze::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gGotDefrostedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_DefrostedViaFireMove::
printstring STRINGID_PKMNWASDEFROSTED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_MoveUsedIsParalyzed::
printstring STRINGID_PKMNISPARALYZED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
statusanimation BS_ATTACKER
cancelmultiturnmoves BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Powder moves on grass types
2019-03-02 13:08:50 +01:00
BattleScript_PowderMoveNoEffect::
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Powder moves on grass types
2019-03-02 13:08:50 +01:00
jumpiftype BS_TARGET, TYPE_GRASS, BattleScript_PowderMoveNoEffectPrint
Add Safety Googles effect
2019-03-08 10:16:54 +01:00
jumpifability BS_TARGET, ABILITY_OVERCOAT, BattleScript_PowderMoveNoEffectOvercoat
printstring STRINGID_SAFETYGOOGLESPROTECTED
goto BattleScript_PowderMoveNoEffectWaitMsg
BattleScript_PowderMoveNoEffectOvercoat:
Powder moves on grass types
2019-03-02 13:08:50 +01:00
call BattleScript_AbilityPopUp
BattleScript_PowderMoveNoEffectPrint:
printstring STRINGID_ITDOESNTAFFECT
Add Safety Googles effect
2019-03-08 10:16:54 +01:00
BattleScript_PowderMoveNoEffectWaitMsg:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Powder moves on grass types
2019-03-02 13:08:50 +01:00
cancelmultiturnmoves BS_ATTACKER
sethword gMoveResultFlags, MOVE_RESULT_FAILED
goto BattleScript_MoveEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveUsedFlinched::
printstring STRINGID_PKMNFLINCHED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
jumpifability BS_ATTACKER ABILITY_STEADFAST BattleScript_TryActivateSteadFast
BattleScript_MoveUsedFlinchedEnd:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BattleScript_TryActivateSteadFast:
setstatchanger STAT_SPEED, 1, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_MoveUsedFlinchedEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_MoveUsedFlinchedEnd
Steadfast string fix
2020-01-04 18:41:59 +01:00
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
setbyte gBattleCommunication STAT_SPEED
stattextbuffer BS_ATTACKER
Steadfast string fix
2020-01-04 18:41:59 +01:00
printstring STRINGID_ATTACKERABILITYSTATRAISE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
goto BattleScript_MoveUsedFlinchedEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
name more battlescripts
2017-11-26 17:26:11 +01:00
BattleScript_PrintUproarOverTurns::
printfromtable gUproarOverTurnStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_ThrashConfuses::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
chosenstatus2animation BS_ATTACKER, STATUS2_CONFUSION
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNFATIGUECONFUSION
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_MoveUsedIsConfused::
printstring STRINGID_PKMNISCONFUSED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
status2animation BS_ATTACKER, STATUS2_CONFUSION
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, FALSE, BattleScript_MoveUsedIsConfusedRet
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_DoSelfConfusionDmg::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
cancelmultiturnmoves BS_ATTACKER
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
adjustdamage
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_ITHURTCONFUSION
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
effectivenesssound
pokemon and battle constants
2018-02-08 11:17:41 +01:00
hitanimation BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
resultmessage
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_MoveUsedIsConfusedRet::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Powder
2018-12-03 12:50:32 +01:00
BattleScript_MoveUsedPowder::
bicword gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_ATTACKSTRING_PRINTED
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Add Powder
2018-12-03 12:50:32 +01:00
cancelmultiturnmoves BS_ATTACKER
status2animation BS_ATTACKER, STATUS2_POWDER
waitanimation
effectivenesssound
hitanimation BS_ATTACKER
waitstate
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_POWDEREXPLODES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add Powder
2018-12-03 12:50:32 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
goto BattleScript_MoveEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveUsedIsConfusedNoMore::
printstring STRINGID_PKMNHEALEDCONFUSION
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_PrintPayDayMoneyString::
rename string id to reflect usage
2021-01-11 14:47:11 +01:00
printstring STRINGID_PLAYERPICKEDUPMONEY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_WrapTurnDmg::
Magic Guard protects from stuff
2020-04-13 15:49:40 +02:00
jumpifability BS_ATTACKER, ABILITY_MAGIC_GUARD, BattleScript_DoTurnDmgEnd
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_ATTACKER, B_ANIM_TURN_TRAP, sB_ANIM_ARG1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNHURTBY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_DoTurnDmg
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_WrapEnds::
printstring STRINGID_PKMNFREEDFROM
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_MoveUsedIsInLove::
printstring STRINGID_PKMNINLOVE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
status2animation BS_ATTACKER, STATUS2_INFATUATION
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Rename an erroneously named battlescript
2019-03-05 17:06:29 +01:00
BattleScript_MoveUsedIsInLoveCantAttack::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNIMMOBILIZEDBYLOVE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_NightmareTurnDmg::
printstring STRINGID_PKMNLOCKEDINNIGHTMARE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
status2animation BS_ATTACKER, STATUS2_NIGHTMARE
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_DoTurnDmg
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_CurseTurnDmg::
printstring STRINGID_PKMNAFFLICTEDBYCURSE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
status2animation BS_ATTACKER, STATUS2_CURSED
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_DoTurnDmg
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_TargetPRLZHeal::
printstring STRINGID_PKMNHEALEDPARALYSIS
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Fix MOVE_EFFECT_REMOVE_STATUS Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured. Also, fix Ice Hammer's effect chance.
2021-09-07 06:34:32 +02:00
BattleScript_TargetWokeUp::
printstring STRINGID_TARGETWOKEUP
waitmessage B_WAIT_TIME_LONG
updatestatusicon BS_TARGET
return
BattleScript_TargetBurnHeal::
printstring STRINGID_PKMNBURNHEALED
waitmessage B_WAIT_TIME_LONG
updatestatusicon BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_MoveEffectSleep::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
statusanimation BS_EFFECT_BATTLER
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gFellAsleepStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
BattleScript_UpdateEffectStatusIconRet::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_EFFECT_BATTLER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
return
BattleScript_YawnMakesAsleep::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
statusanimation BS_EFFECT_BATTLER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNFELLASLEEP
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_EFFECT_BATTLER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
makevisible BS_EFFECT_BATTLER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
BattleScript_EmbargoEndTurn::
printstring STRINGID_EMBARGOENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
BattleScript_TelekinesisEndTurn::
printstring STRINGID_TELEKINESISENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Taunt fix etc. Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's. Heal Block now displays the correct string when preventing usage of a move.
2019-03-24 03:45:21 +01:00
BattleScript_BufferEndTurn::
printstring STRINGID_BUFFERENDS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
BattleScript_ToxicOrb::
setbyte cMULTISTRING_CHOOSER, 0
copybyte gEffectBattler, gBattlerAttacker
call BattleScript_MoveEffectToxic
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
BattleScript_FlameOrb::
setbyte cMULTISTRING_CHOOSER, 0
copybyte gEffectBattler, gBattlerAttacker
call BattleScript_MoveEffectBurn
end2
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveEffectPoison::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
statusanimation BS_EFFECT_BATTLER
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gGotPoisonedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_UpdateEffectStatusIconRet
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveEffectBurn::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
statusanimation BS_EFFECT_BATTLER
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gGotBurnedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_UpdateEffectStatusIconRet
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveEffectFreeze::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
statusanimation BS_EFFECT_BATTLER
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gGotFrozenStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_UpdateEffectStatusIconRet
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveEffectParalysis::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
statusanimation BS_EFFECT_BATTLER
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gGotParalyzedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_UpdateEffectStatusIconRet
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveEffectUproar::
printstring STRINGID_PKMNCAUSEDUPROAR
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_MoveEffectToxic::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
statusanimation BS_EFFECT_BATTLER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNBADLYPOISONED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_UpdateEffectStatusIconRet
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveEffectPayDay::
printstring STRINGID_COINSSCATTERED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_MoveEffectWrap::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gWrappedStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_MoveEffectConfusion::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
chosenstatus2animation BS_EFFECT_BATTLER, STATUS2_CONFUSION
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNWASCONFUSED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Last Resort, Fangs and Flare Blitz/Volt Tackle
2018-09-22 10:45:43 +02:00
BattleScript_MoveEffectRecoilWithStatus::
argumentstatuseffect
copyword gBattleMoveDamage, sSAVED_DMG
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_MoveEffectRecoil::
jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil
jumpifability BS_ATTACKER, ABILITY_ROCK_HEAD, BattleScript_RecoilEnd
BattleScript_DoRecoil::
Fix many Disguise bugs Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
2021-09-06 08:27:42 +02:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_IGNORE_DISGUISE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNHITWITHRECOIL
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_RecoilEnd::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Last Resort, Fangs and Flare Blitz/Volt Tackle
2018-09-22 10:45:43 +02:00
BattleScript_EffectWithChance::
seteffectwithchance
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_ItemSteal::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_TARGET, B_ANIM_ITEM_STEAL, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSTOLEITEM
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_DrizzleActivates::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNMADEITRAIN
waitstate
merge with battle tent update
2018-07-01 12:16:52 +02:00
playanimation BS_BATTLER_0, B_ANIM_RAIN_CONTINUES, NULL
fixes and labels
2017-11-26 01:19:57 +01:00
call BattleScript_WeatherFormChanges
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end3
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Defiant and Competitive
2019-02-16 12:54:11 +01:00
BattleScript_DefiantActivates::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Defiant and Competitive
2019-02-16 12:54:11 +01:00
call BattleScript_AbilityPopUp
statbuffchange 0, NULL
setgraphicalstatchangevalues
playanimation BS_ABILITY_BATTLER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
printstring STRINGID_DEFENDERSSTATROSE
waitmessage B_WAIT_TIME_LONG
Defiant and Competitive
2019-02-16 12:54:11 +01:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
BattleScript_AbilityPopUp:
Fix Ability-popup lag
2021-06-08 12:56:38 +02:00
.if B_ABILITY_POP_UP == TRUE
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
showabilitypopup BS_ABILITY_BATTLER
recordability BS_ABILITY_BATTLER
longer ability popup delay to prevent overwriting
2020-11-10 18:05:11 +01:00
pause 40
Fix Ability-popup lag
2021-06-08 12:56:38 +02:00
.endif
fix screen cleaner, curious medicine, as one
2021-02-02 17:00:07 +01:00
sethword sABILITY_OVERWRITE, 0
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_SpeedBoostActivates::
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNRAISEDSPEED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end3
Moody
2020-04-19 15:44:44 +02:00
@ Can't compare directly to a value, have to compare to value at pointer
sZero:
.byte 0
BattleScript_MoodyActivates::
call BattleScript_AbilityPopUp
jumpifbyteequal sSTATCHANGER, sZero, BattleScript_MoodyLower
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_MoodyLower
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_ROSE, BattleScript_MoodyLower
Moody
2020-04-19 15:44:44 +02:00
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Moody
2020-04-19 15:44:44 +02:00
BattleScript_MoodyLower:
jumpifbyteequal sSAVED_STAT_CHANGER, sZero, BattleScript_MoodyEnd
copybyte sSTATCHANGER, sSAVED_STAT_CHANGER
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_MoodyEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_MoodyEnd
Moody
2020-04-19 15:44:44 +02:00
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Moody
2020-04-19 15:44:44 +02:00
BattleScript_MoodyEnd:
end3
Emergency Exit
2020-07-15 17:21:12 +02:00
BattleScript_EmergencyExit::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause 5
Emergency Exit
2020-07-15 17:21:12 +02:00
call BattleScript_AbilityPopUp
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_LONG
Emergency Exit
2020-07-15 17:21:12 +02:00
BattleScript_EmergencyExitNoPopUp::
playanimation BS_TARGET, B_ANIM_SLIDE_OFFSCREEN, NULL
waitanimation
openpartyscreen BS_TARGET, BattleScript_EmergencyExitRet
switchoutabilities BS_TARGET
waitstate
switchhandleorder BS_TARGET, 2
returntoball BS_TARGET
getswitchedmondata BS_TARGET
switchindataupdate BS_TARGET
hpthresholds BS_TARGET
printstring STRINGID_SWITCHINMON
switchinanim BS_TARGET, TRUE
waitstate
switchineffects BS_TARGET
BattleScript_EmergencyExitRet:
return
BattleScript_EmergencyExitWild::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause 5
Emergency Exit
2020-07-15 17:21:12 +02:00
call BattleScript_AbilityPopUp
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_LONG
Emergency Exit
2020-07-15 17:21:12 +02:00
BattleScript_EmergencyExitWildNoPopUp::
playanimation BS_TARGET, B_ANIM_SLIDE_OFFSCREEN, NULL
waitanimation
setoutcomeonteleport BS_TARGET
finishaction
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_TraceActivates::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNTRACED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
settracedability BS_SCRIPTING
switchinabilities BS_SCRIPTING
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
BattleScript_TraceActivatesEnd3::
call BattleScript_TraceActivates
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end3
Beast Boost and Receiver
2020-04-19 12:07:56 +02:00
BattleScript_ReceiverActivates::
call BattleScript_AbilityPopUp
printstring STRINGID_RECEIVERABILITYTAKEOVER
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Beast Boost and Receiver
2020-04-19 12:07:56 +02:00
settracedability BS_ABILITY_BATTLER
return
Cheek Pouch
2020-07-16 15:20:03 +02:00
BattleScript_AbilityHpHeal:
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXRESTOREDHPALITTLE2
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
Cheek Pouch
2020-07-16 15:20:03 +02:00
return
BattleScript_RainDishActivates::
call BattleScript_AbilityHpHeal
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end3
Cheek Pouch
2020-07-16 15:20:03 +02:00
BattleScript_CheekPouchActivates::
copybyte sSAVED_BATTLER, gBattlerAttacker
copybyte gBattlerAttacker, gBattlerAbility
call BattleScript_AbilityHpHeal
copybyte gBattlerAttacker, sSAVED_BATTLER
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Harvest
2018-07-28 17:13:47 +02:00
BattleScript_HarvestActivates::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause 5
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
Add Harvest
2018-07-28 17:13:47 +02:00
printstring STRINGID_HARVESTBERRY
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add Harvest
2018-07-28 17:13:47 +02:00
end3
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
BattleScript_SolarPowerActivates::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_SOLARPOWERHPDROP
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
tryfaintmon BS_ATTACKER, FALSE, NULL
end3
Healer
2020-04-18 19:09:17 +02:00
BattleScript_HealerActivates::
call BattleScript_AbilityPopUp
curestatus BS_SCRIPTING
updatestatusicon BS_SCRIPTING
printstring STRINGID_HEALERCURE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Healer
2020-04-18 19:09:17 +02:00
end3
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_SandstreamActivates::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXWHIPPEDUPSANDSTORM
waitstate
merge with battle tent update
2018-07-01 12:16:52 +02:00
playanimation BS_BATTLER_0, B_ANIM_SANDSTORM_CONTINUES, NULL
fixes and labels
2017-11-26 01:19:57 +01:00
call BattleScript_WeatherFormChanges
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end3
Implemented Sand Spit
2020-12-11 20:41:53 +01:00
BattleScript_SandSpitActivates::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Implemented Sand Spit
2020-12-11 20:41:53 +01:00
call BattleScript_AbilityPopUp
printstring STRINGID_ASANDSTORMKICKEDUP
waitstate
playanimation BS_BATTLER_0, B_ANIM_SANDSTORM_CONTINUES, NULL
call BattleScript_WeatherFormChanges
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_ShedSkinActivates::
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXCUREDYPROBLEM
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end3
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_WeatherFormChanges::
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte sBATTLER, 0
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_WeatherFormChangesLoop::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
trycastformdatachange
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
addbyte sBATTLER, 1
Make battle tower compile
2018-10-27 00:04:18 +02:00
jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_WeatherFormChangesLoop
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_CastformChange::
Add stat stage constants
2020-08-05 02:33:05 +02:00
call BattleScript_DoCastformChange
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end3
Add stat stage constants
2020-08-05 02:33:05 +02:00
BattleScript_DoCastformChange::
Fix Castfrom ability pop-up and refactor one function
2019-06-14 12:58:29 +02:00
copybyte gBattlerAbility, sBATTLER
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
docastformchangeanimation
waitstate
printstring STRINGID_PKMNTRANSFORMED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Adrenaline Orb
2020-04-22 15:12:25 +02:00
BattleScript_TryAdrenalineOrb:
jumpifnoholdeffect BS_TARGET, HOLD_EFFECT_ADRENALINE_ORB, BattleScript_TryAdrenalineOrbRet
jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPEED, 12, BattleScript_TryAdrenalineOrbRet
setstatchanger STAT_SPEED, 1, FALSE
statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_TryAdrenalineOrbRet
playanimation BS_TARGET, B_ANIM_HELD_ITEM_EFFECT, NULL
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
copybyte sBATTLER, gBattlerTarget
setlastuseditem BS_TARGET
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
printstring STRINGID_USINGITEMSTATOFPKMNROSE
waitmessage B_WAIT_TIME_LONG
Adrenaline Orb
2020-04-22 15:12:25 +02:00
removeitem BS_TARGET
BattleScript_TryAdrenalineOrbRet:
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_IntimidateActivatesEnd3::
call BattleScript_PauseIntimidateActivates
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end3
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_PauseIntimidateActivates:
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_IntimidateActivates::
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte gBattlerTarget, 0
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_IntimidateActivatesLoop:
Adrenaline Orb
2020-04-22 15:12:25 +02:00
setstatchanger STAT_ATK, 1, TRUE
Label various battle scripts
2018-09-01 20:00:13 +02:00
trygetintimidatetarget BattleScript_IntimidateActivatesReturn
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_IntimidateActivatesLoopIncrement
jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_IntimidatePrevented
Fixed incorrect preprocessor directive in ASM file
2021-01-14 02:42:56 +01:00
.if B_UPDATED_INTIMIDATE >= GEN_8
Updated Intimidate to Gen. 8 standard
2020-11-10 14:18:16 +01:00
jumpifability BS_TARGET, ABILITY_INNER_FOCUS, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_SCRAPPY, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_OBLIVIOUS, BattleScript_IntimidatePrevented
Fixed incorrect preprocessor directive in ASM file
2021-01-14 02:42:56 +01:00
.endif
Clean up new Cmd macro names
2019-09-27 08:46:33 +02:00
statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | STAT_BUFF_ALLOW_PTR, BattleScript_IntimidateActivatesLoopIncrement
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_IntimidateActivatesLoopIncrement
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
setgraphicalstatchangevalues
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNCUTSATTACKWITH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Adrenaline Orb
2020-04-22 15:12:25 +02:00
call BattleScript_TryAdrenalineOrb
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_IntimidateActivatesLoopIncrement:
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
addbyte gBattlerTarget, 1
Label various battle scripts
2018-09-01 20:00:13 +02:00
goto BattleScript_IntimidateActivatesLoop
BattleScript_IntimidateActivatesReturn:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_IntimidatePrevented:
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
A few things. -Introduced a Gen. 8 styled text string for Intimidate -Added an ability popup to BattleScript_IntimidatePrevented
2020-11-10 14:34:51 +01:00
call BattleScript_AbilityPopUp
setbyte gBattleCommunication STAT_ATK
stattextbuffer BS_ATTACKER
printstring STRINGID_STATWASNOTLOWERED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Adrenaline Orb
2020-04-22 15:12:25 +02:00
call BattleScript_TryAdrenalineOrb
Label various battle scripts
2018-09-01 20:00:13 +02:00
goto BattleScript_IntimidateActivatesLoopIncrement
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_DroughtActivates::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXINTENSIFIEDSUN
waitstate
merge with battle tent update
2018-07-01 12:16:52 +02:00
playanimation BS_BATTLER_0, B_ANIM_SUN_CONTINUES, NULL
fixes and labels
2017-11-26 01:19:57 +01:00
call BattleScript_WeatherFormChanges
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end3
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
BattleScript_SnowWarningActivates::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
printstring STRINGID_SNOWWARNINGHAIL
waitstate
playanimation BS_BATTLER_0, B_ANIM_HAIL_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Surge Abilities
2019-02-09 14:30:16 +01:00
BattleScript_ElectricSurgeActivates::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Add Surge Abilities
2019-02-09 14:30:16 +01:00
call BattleScript_AbilityPopUp
printstring STRINGID_TERRAINBECOMESELECTRIC
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG, NULL
Add Surge Abilities
2019-02-09 14:30:16 +01:00
end3
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Surge Abilities
2019-02-09 14:30:16 +01:00
BattleScript_MistySurgeActivates::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Add Surge Abilities
2019-02-09 14:30:16 +01:00
call BattleScript_AbilityPopUp
printstring STRINGID_TERRAINBECOMESMISTY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG, NULL
Add Surge Abilities
2019-02-09 14:30:16 +01:00
end3
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Surge Abilities
2019-02-09 14:30:16 +01:00
BattleScript_GrassySurgeActivates::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add Surge Abilities
2019-02-09 14:30:16 +01:00
call BattleScript_AbilityPopUp
printstring STRINGID_TERRAINBECOMESGRASSY
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG, NULL
Add Surge Abilities
2019-02-09 14:30:16 +01:00
end3
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Surge Abilities
2019-02-09 14:30:16 +01:00
BattleScript_PsychicSurgeActivates::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Add Surge Abilities
2019-02-09 14:30:16 +01:00
call BattleScript_AbilityPopUp
printstring STRINGID_TERRAINBECOMESPSYCHIC
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG, NULL
Add Surge Abilities
2019-02-09 14:30:16 +01:00
end3
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Bad Dreams
2018-07-22 21:05:12 +02:00
BattleScript_BadDreamsActivates::
setbyte gBattlerTarget, 0
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
Add Bad Dreams
2018-07-22 21:05:12 +02:00
BattleScript_BadDreamsLoop:
trygetbaddreamstarget BattleScript_BadDreamsEnd
dmg_1_8_targethp
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
printstring STRINGID_BADDREAMSDMG
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
jumpifability BS_TARGET, ABILITY_MAGIC_GUARD, BattleScript_BadDreamsIncrement
Add Bad Dreams
2018-07-22 21:05:12 +02:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
tryfaintmon BS_TARGET, FALSE, NULL
atk24 BattleScript_BadDreamsIncrement
BattleScript_BadDreamsIncrement:
addbyte gBattlerTarget, 1
goto BattleScript_BadDreamsLoop
BattleScript_BadDreamsEnd:
end3
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_TookAttack::
attackstring
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXTOOKATTACK
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED
return
BattleScript_SturdyPreventsOHKO::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNPROTECTEDBY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_DampStopsExplosion::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Fixed Damp ability popup (#295)
2020-02-29 09:45:37 +01:00
copybyte gBattlerAbility, gBattlerTarget
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNPREVENTSUSAGE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
Fix Damp loop
2020-04-11 12:02:51 +02:00
moveendto MOVEEND_NEXT_TARGET
moveendcase MOVEEND_CLEAR_BITS
end
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveHPDrain_PPLoss::
ppreduce
BattleScript_MoveHPDrain::
attackstring
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Draining abilities have the pop-up appear now
2020-02-22 19:25:35 +01:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNRESTOREDHPUSING
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
orhalfword gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BattleScript_MoveStatDrain_PPLoss::
ppreduce
BattleScript_MoveStatDrain::
attackstring
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Draining abilities have the pop-up appear now
2020-02-22 19:25:35 +01:00
call BattleScript_AbilityPopUp
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
waitanimation
printstring STRINGID_TARGETABILITYSTATRAISE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
fix galvanice explosion
2021-09-08 12:38:46 +02:00
tryfaintmon BS_ATTACKER, FALSE, NULL
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
goto BattleScript_MoveEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_MonMadeMoveUseless_PPLoss::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
ppreduce
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_MonMadeMoveUseless::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
attackstring
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXMADEYUSELESS
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
fix galvanice explosion
2021-09-08 12:38:46 +02:00
tryfaintmon BS_ATTACKER, FALSE, NULL
Add new Sturdy effect
2018-07-21 15:11:13 +02:00
orhalfword gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_FlashFireBoost_PPLoss::
ppreduce
BattleScript_FlashFireBoost::
attackstring
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gFlashFireStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
fix galvanice explosion
2021-09-08 12:38:46 +02:00
tryfaintmon BS_ATTACKER, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
more battlescript labels
2017-12-03 00:47:21 +01:00
BattleScript_AbilityPreventsPhasingOut::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNANCHORSITSELFWITH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_AbilityNoStatLoss::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNPREVENTSSTATLOSSWITH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_BRNPrevention::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gBRNPreventionStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_PRLZPrevention::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gPRLZPreventionStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_PSNPrevention::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gPSNPreventionStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_ObliviousPreventsAttraction::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNPREVENTSROMANCEWITH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
fixes and labels
2017-11-26 01:19:57 +01:00
BattleScript_OwnTempoPrevents::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNPREVENTSCONFUSIONWITH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_SoundproofProtected::
attackstring
ppreduce
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXBLOCKSY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Dazzling
2018-11-30 22:12:18 +01:00
BattleScript_DazzlingProtected::
attackstring
ppreduce
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
pause B_WAIT_TIME_SHORT
Add Dazzling
2018-11-30 22:12:18 +01:00
call BattleScript_AbilityPopUp
printstring STRINGID_POKEMONCANNOTUSEMOVE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add Dazzling
2018-11-30 22:12:18 +01:00
goto BattleScript_MoveEnd
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Psychic Terrain blocks priority moves
2018-12-01 11:35:49 +01:00
BattleScript_MoveUsedPsychicTerrainPrevents::
printstring STRINGID_POKEMONCANNOTUSEMOVE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Psychic Terrain blocks priority moves
2018-12-01 11:35:49 +01:00
goto BattleScript_MoveEnd
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
Fix Grassy Terrain bad loop
2020-06-29 18:26:53 +02:00
BattleScript_GrassyTerrainHeals::
setbyte gBattleCommunication, 0
BattleScript_GrassyTerrainLoop:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 1
Grassy Terrain + minor fixes Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack
2019-02-28 15:02:54 +01:00
checkgrassyterrainheal BS_ATTACKER, BattleScript_GrassyTerrainLoopIncrement
printstring STRINGID_GRASSYTERRAINHEALS
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Grassy Terrain + minor fixes Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack
2019-02-28 15:02:54 +01:00
BattleScript_GrassyTerrainHpChange:
Grassy Terrain v2 All corrected, simplest version Also includes proper ending strings for all terrains
2019-03-02 23:54:08 +01:00
orword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
Grassy Terrain + minor fixes Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack
2019-02-28 15:02:54 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
BattleScript_GrassyTerrainLoopIncrement::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
addbyte gBattleCommunication, 1
Grassy Terrain + minor fixes Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack
2019-02-28 15:02:54 +01:00
jumpifbytenotequal gBattleCommunication, gBattlersCount, BattleScript_GrassyTerrainLoop
BattleScript_GrassyTerrainLoopEnd::
Grassy Terrain v2 All corrected, simplest version Also includes proper ending strings for all terrains
2019-03-02 23:54:08 +01:00
bicword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
jumpifword CMP_COMMON_BITS, gFieldStatuses, STATUS_FIELD_TERRAIN_PERMANENT, BattleScript_GrassyTerrainHealEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, gFieldTimers + 5, 0, BattleScript_GrassyTerrainEnds
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
BattleScript_GrassyTerrainHealEnd:
Grassy Terrain + minor fixes Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack
2019-02-28 15:02:54 +01:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_AbilityNoSpecificStatLoss::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXPREVENTSYLOSS
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_StickyHoldActivates::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXMADEYINEFFECTIVE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
goto BattleScript_MoveEnd
BattleScript_ColorChangeActivates::
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNCHANGEDTYPEWITH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Protean
2018-11-30 21:21:43 +01:00
BattleScript_ProteanActivates::
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNCHANGEDTYPE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add Protean
2018-11-30 21:21:43 +01:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
BattleScript_CursedBodyActivates::
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
printstring STRINGID_CUSEDBODYDISABLED
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
BattleScript_MummyActivates::
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
printstring STRINGID_ATTACKERACQUIREDABILITY
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Implemented Steam Engine And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
2020-12-10 22:27:35 +01:00
BattleScript_TargetsStatWasMaxedOut::
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
Touch up Anger Point
2019-03-23 16:33:08 +01:00
setgraphicalstatchangevalues
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
Implemented Steam Engine And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
2020-12-10 22:27:35 +01:00
printstring STRINGID_TARGETSSTATWASMAXEDOUT
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Renamed BattleScript_TargetAbilityStatRaiseOnSwitchIn This battlescript is meant to be called within the case ABILITYEFFECT_ON_SWITCHIN of AbilityBattleEffects, which refers to the currently selected battler as Battler instead of Attacker or Target.
2020-12-05 17:50:47 +01:00
BattleScript_BattlerAbilityStatRaiseOnSwitchIn::
Fixed Intrepid Sword and Dauntless Shield And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn
2020-12-05 18:03:13 +01:00
copybyte gBattlerAbility, gBattlerAttacker
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
call BattleScript_AbilityPopUp
Review corrections -Intrepid Sword and Dauntless Shield are now properly affecting the user -Slightly tweaked Ball Fetch's effect, since an operation involving gBattleResults.catchAttempts was being done twice unnecessarily.
2021-01-07 08:30:34 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
setgraphicalstatchangevalues
Fixed Intrepid Sword and Dauntless Shield And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn
2020-12-05 18:03:13 +01:00
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
waitanimation
Fixed Intrepid Sword and Dauntless Shield And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn
2020-12-05 18:03:13 +01:00
printstring STRINGID_BATTLERABILITYRAISEDSTAT
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
end3
BattleScript_TargetAbilityStatRaiseOnMoveEnd::
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
Touch Up Justified and Rattled
2019-03-23 16:37:56 +01:00
setgraphicalstatchangevalues
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
waitanimation
Tweaked Steam Engine's battle string
2021-01-07 21:56:23 +01:00
printstring STRINGID_ABILITYRAISEDSTATDRASTICALLY
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
return
Soul Heart
2020-04-18 19:59:09 +02:00
BattleScript_ScriptingAbilityStatRaise::
copybyte gBattlerAbility, sBATTLER
call BattleScript_AbilityPopUp
copybyte sSAVED_DMG, gBattlerAttacker
copybyte gBattlerAttacker, sBATTLER
statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
setgraphicalstatchangevalues
playanimation BS_SCRIPTING, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
waitanimation
printstring STRINGID_ATTACKERABILITYSTATRAISE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Soul Heart
2020-04-18 19:59:09 +02:00
copybyte gBattlerAttacker, sSAVED_DMG
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
BattleScript_WeakArmorActivates::
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
Touch up Weak Armor
2019-03-23 16:56:56 +01:00
setstatchanger STAT_DEF, 1, TRUE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeakArmorActivatesSpeed
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_WeakArmorDefAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_WeakArmorActivatesSpeed
pause 16
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
printfromtable gStatDownStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
goto BattleScript_WeakArmorActivatesSpeed
BattleScript_WeakArmorDefAnim:
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printstring STRINGID_TARGETABILITYSTATLOWER
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
BattleScript_WeakArmorActivatesSpeed:
Touch up Weak Armor
2019-03-23 16:56:56 +01:00
setstatchanger STAT_SPEED, 2, FALSE
merge
2019-11-10 12:09:14 +01:00
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeakArmorActivatesEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_WeakArmorSpeedAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_EMPTY, BattleScript_WeakArmorActivatesEnd
pause 16
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
printstring STRINGID_TARGETSTATWONTGOHIGHER
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
goto BattleScript_WeakArmorActivatesEnd
BattleScript_WeakArmorSpeedAnim:
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printstring STRINGID_TARGETABILITYSTATRAISE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
BattleScript_WeakArmorActivatesEnd:
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
fix screen cleaner, curious medicine, as one
2021-02-02 17:00:07 +01:00
BattleScript_RaiseStatOnFaintingTarget::
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
waitanimation
printstring STRINGID_LASTABILITYRAISEDSTAT
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
fix screen cleaner, curious medicine, as one
2021-02-02 17:00:07 +01:00
return
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BattleScript_AttackerAbilityStatRaise::
Fix Moxie battler
2020-01-18 19:40:49 +01:00
copybyte gBattlerAbility, gBattlerAttacker
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
Moody
2020-04-19 15:44:44 +02:00
setgraphicalstatchangevalues
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
waitanimation
printstring STRINGID_ATTACKERABILITYSTATRAISE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Fell Stinger
2018-07-26 23:40:55 +02:00
BattleScript_FellStingerRaisesStat::
merge
2019-11-10 12:09:14 +01:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_FellStingerRaisesAtkEnd
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_ROSE, BattleScript_FellStingerRaisesAtkEnd
Add Fell Stinger
2018-07-26 23:40:55 +02:00
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add Fell Stinger
2018-07-26 23:40:55 +02:00
BattleScript_FellStingerRaisesAtkEnd:
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BattleScript_AttackerAbilityStatRaiseEnd3::
call BattleScript_AttackerAbilityStatRaise
end3
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Switch-in abilities with a message
2018-07-22 22:21:47 +02:00
BattleScript_SwitchInAbilityMsg::
Fix switch-in abilities text/pop-up
2019-08-05 11:24:49 +02:00
call BattleScript_AbilityPopUp
Switch-in abilities with a message
2018-07-22 22:21:47 +02:00
printfromtable gSwitchInAbilityStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Switch-in abilities with a message
2018-07-22 22:21:47 +02:00
end3
fix screen cleaner, curious medicine, as one
2021-02-02 17:00:07 +01:00
BattleScript_ActivateAsOne::
call BattleScript_AbilityPopUp
printfromtable gSwitchInAbilityStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
fix screen cleaner, curious medicine, as one
2021-02-02 17:00:07 +01:00
@ show unnerve
sethword sABILITY_OVERWRITE, ABILITY_UNNERVE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte cMULTISTRING_CHOOSER, B_MSG_SWITCHIN_UNNERVE
fix screen cleaner, curious medicine, as one
2021-02-02 17:00:07 +01:00
call BattleScript_AbilityPopUp
printfromtable gSwitchInAbilityStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Switch-in abilities with a message
2018-07-22 22:21:47 +02:00
end3
Frisk, would be easier if it didnt scan 2 opponents
2020-04-19 13:37:56 +02:00
BattleScript_FriskMsgWithPopup::
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
BattleScript_FriskMsg::
printstring STRINGID_FRISKACTIVATES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Frisk, would be easier if it didnt scan 2 opponents
2020-04-19 13:37:56 +02:00
return
BattleScript_FriskActivates::
tryfriskmsg BS_ATTACKER
end3
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Add Imposter
2018-07-29 12:21:28 +02:00
BattleScript_ImposterActivates::
transformdataexecution
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
playmoveanimation BS_ATTACKER, MOVE_TRANSFORM
Add Imposter
2018-07-29 12:21:28 +02:00
waitanimation
printstring STRINGID_IMPOSTERTRANSFORM
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Add Imposter
2018-07-29 12:21:28 +02:00
end3
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Various battle target items
2019-05-09 20:31:58 +02:00
BattleScript_HurtAttacker:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNHURTSWITH
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Various battle target items
2019-05-09 20:31:58 +02:00
BattleScript_RoughSkinActivates::
call BattleScript_AbilityPopUp
call BattleScript_HurtAttacker
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Various battle target items
2019-05-09 20:31:58 +02:00
BattleScript_RockyHelmetActivates::
Rocky Helmet before Knock Off
2020-06-25 16:15:11 +02:00
@ don't play the animation for a fainted mon
jumpifabsent BS_TARGET, BattleScript_RockyHelmetActivatesDmg
Merge battle anim documentation
2020-02-29 13:59:41 +01:00
playanimation BS_TARGET, B_ANIM_HELD_ITEM_EFFECT, NULL
Various battle target items
2019-05-09 20:31:58 +02:00
waitanimation
Rocky Helmet before Knock Off
2020-06-25 16:15:11 +02:00
BattleScript_RockyHelmetActivatesDmg:
Various battle target items
2019-05-09 20:31:58 +02:00
call BattleScript_HurtAttacker
return
Spiky Shield Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
2019-03-15 13:54:11 +01:00
BattleScript_SpikyShieldEffect::
Fix Spiky Shield/Jump Kick bug Spiky Shield no longer tries to hurt a Pokemon that has already fainted. Previously this would freeze the game if Jump Kick recoil fainted a Pokemon due to the target using Spiky Shield.
2021-02-19 01:57:29 +01:00
jumpifabsent BS_ATTACKER, BattleScript_SpikyShieldRet
Spiky Shield Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
2019-03-15 13:54:11 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
Baneful Bunker + King's Shield Both apply a move effect from atk49. King's Shield swaps attacker and defender for the sake of Defiant etc. and then swaps them back!
2019-04-15 13:02:25 +02:00
bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
Spiky Shield Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
2019-03-15 13:54:11 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_PKMNHURTSWITH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Spiky Shield Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
2019-03-15 13:54:11 +01:00
tryfaintmon BS_ATTACKER, FALSE, NULL
Fix Spiky Shield/Jump Kick bug Spiky Shield no longer tries to hurt a Pokemon that has already fainted. Previously this would freeze the game if Jump Kick recoil fainted a Pokemon due to the target using Spiky Shield.
2021-02-19 01:57:29 +01:00
BattleScript_SpikyShieldRet::
Spiky Shield Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
2019-03-15 13:54:11 +01:00
return
Baneful Bunker + King's Shield Both apply a move effect from atk49. King's Shield swaps attacker and defender for the sake of Defiant etc. and then swaps them back!
2019-04-15 13:02:25 +02:00
BattleScript_KingsShieldEffect::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
seteffectsecondary
setmoveeffect 0
copybyte sBATTLER, gBattlerTarget
copybyte gBattlerTarget, gBattlerAttacker
copybyte gBattlerAttacker, sBATTLER
return
BattleScript_BanefulBunkerEffect::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_x100000
bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
seteffectsecondary
setmoveeffect 0
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_CuteCharmActivates::
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
pokemon and battle constants
2018-02-08 11:17:41 +01:00
status2animation BS_ATTACKER, STATUS2_INFATUATION
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXINFATUATEDY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Destiny Knot
2020-04-22 14:40:44 +02:00
call BattleScript_TryDestinyKnotTarget
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Effect Spore ability pop-up
2019-03-01 13:59:08 +01:00
BattleScript_AbilityStatusEffect::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
Effect Spore ability pop-up
2019-03-01 13:59:08 +01:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectsecondary
return
Dancer Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-11-14 00:03:20 +01:00
BattleScript_DancerActivates::
call BattleScript_AbilityPopUp
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_SHORT
setbyte sB_ANIM_TURN, 0
setbyte sB_ANIM_TARGETS_HIT, 0
Dancer Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-11-14 00:03:20 +01:00
orword gHitMarker, HITMARKER_x800000
jumptocalledmove TRUE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_SynchronizeActivates::
waitstate
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
return
BattleScript_NoItemSteal::
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_SHORT
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXMADEYINEFFECTIVE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_AbilityCuredStatus::
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSXCUREDITSYPROBLEM
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_SCRIPTING
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Tweaked the Oblivious immunities Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
2021-06-03 12:55:44 +02:00
BattleScript_BattlerShookOffTaunt::
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSHOOKOFFTHETAUNT
waitmessage B_WAIT_TIME_LONG
return
BattleScript_BattlerGotOverItsInfatuation::
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNGOTOVERITSINFATUATION
waitmessage B_WAIT_TIME_LONG
return
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_IgnoresWhileAsleep::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNIGNORESASLEEP
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendto MOVEEND_NEXT_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_IgnoresAndUsesRandomMove::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNIGNOREDORDERS
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
calledattack to calledmove
2018-09-22 19:08:41 +02:00
jumptocalledmove FALSE
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_MoveUsedLoafingAround::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_LOAFING, BattleScript_MoveUsedLoafingAroundMsg
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_INCAPABLE_OF_POWER, BattleScript_MoveUsedLoafingAroundMsg
setbyte gBattleCommunication, 0
pokemon and battle constants
2018-02-08 11:17:41 +01:00
various24 BS_ATTACKER
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
setbyte cMULTISTRING_CHOOSER, B_MSG_INCAPABLE_OF_POWER
BattleScript_MoveUsedLoafingAroundMsg::
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gInobedientStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendto MOVEEND_NEXT_TARGET
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
end
Loafing Around bug fix
2020-04-18 13:04:28 +02:00
BattleScript_TruantLoafingAround::
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
call BattleScript_AbilityPopUp
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
goto BattleScript_MoveUsedLoafingAroundMsg
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_IgnoresAndFallsAsleep::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNBEGANTONAP
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_SLEEP | MOVE_EFFECT_AFFECTS_USER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
Rename atk## constants and states
2019-08-23 14:46:21 +02:00
moveendto MOVEEND_NEXT_TARGET
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_IgnoresAndHitsItself::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNWONTOBEY
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
give names to some battlescripts
2017-12-02 00:03:46 +01:00
goto BattleScript_DoSelfConfusionDmg
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_SubstituteFade::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_TARGET, B_ANIM_SUBSTITUTE_FADE, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSUBSTITUTEFADED
return
BattleScript_BerryCurePrlzEnd2::
call BattleScript_BerryCureParRet
end2
BattleScript_BerryCureParRet::
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSITEMCUREDPARALYSIS
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_BerryCurePsnEnd2::
call BattleScript_BerryCurePsnRet
end2
BattleScript_BerryCurePsnRet::
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSITEMCUREDPOISON
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_BerryCureBrnEnd2::
call BattleScript_BerryCureBrnRet
end2
BattleScript_BerryCureBrnRet::
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSITEMHEALEDBURN
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_BerryCureFrzEnd2::
call BattleScript_BerryCureFrzRet
end2
BattleScript_BerryCureFrzRet::
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSITEMDEFROSTEDIT
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_BerryCureSlpEnd2::
call BattleScript_BerryCureSlpRet
end2
BattleScript_BerryCureSlpRet::
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSITEMWOKEIT
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
BattleScript_GemActivates::
Merge battle anim documentation
2020-02-29 13:59:41 +01:00
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
waitanimation
printstring STRINGID_GEMACTIVATES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
removeitem BS_ATTACKER
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
BattleScript_BerryReduceDmg::
Merge battle anim documentation
2020-02-29 13:59:41 +01:00
playanimation BS_TARGET, B_ANIM_HELD_ITEM_EFFECT, NULL
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
waitanimation
printstring STRINGID_TARGETATEITEM
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
removeitem BS_TARGET
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
BattleScript_PrintBerryReduceString::
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
printstring STRINGID_BERRYDMGREDUCES
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_BerryCureConfusionEnd2::
call BattleScript_BerryCureConfusionRet
end2
BattleScript_BerryCureConfusionRet::
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSITEMSNAPPEDOUT
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
removeitem BS_SCRIPTING
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_BerryCureChosenStatusEnd2::
call BattleScript_BerryCureChosenStatusRet
end2
BattleScript_BerryCureChosenStatusRet::
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
clean up and use names for printfromtable
2017-11-26 00:33:40 +01:00
printfromtable gBerryEffectStringIds
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_WhiteHerbEnd2::
call BattleScript_WhiteHerbRet
end2
BattleScript_WhiteHerbRet::
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSITEMRESTOREDSTATUS
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
removeitem BS_SCRIPTING
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
berries work like in gen4
2020-06-29 18:04:13 +02:00
BattleScript_ItemHealHP_RemoveItemRet::
ripen & hp restoring berries
2021-01-06 05:15:21 +01:00
jumpifability BS_SCRIPTING, ABILITY_RIPEN, BattleScript_ItemHealHP_RemoveItemRet_AbilityPopUp
goto BattleScript_ItemHealHP_RemoveItemRet_Anim
BattleScript_ItemHealHP_RemoveItemRet_AbilityPopUp:
call BattleScript_AbilityPopUp
BattleScript_ItemHealHP_RemoveItemRet_Anim:
berries work like in gen4
2020-06-29 18:04:13 +02:00
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
berries work like in gen4
2020-06-29 18:04:13 +02:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_SCRIPTING
datahpupdate BS_SCRIPTING
removeitem BS_SCRIPTING
return
stat raising berries
2021-01-06 06:13:32 +01:00
berries work like in gen4
2020-06-29 18:04:13 +02:00
BattleScript_ItemHealHP_RemoveItemEnd2::
stat raising berries
2021-01-06 06:13:32 +01:00
jumpifability BS_ATTACKER, ABILITY_RIPEN, BattleScript_ItemHealHP_RemoveItemEnd2_AbilityPopUp
ripen & hp restoring berries
2021-01-06 05:15:21 +01:00
goto BattleScript_ItemHealHP_RemoveItemEnd2_Anim
BattleScript_ItemHealHP_RemoveItemEnd2_AbilityPopUp:
call BattleScript_AbilityPopUp
BattleScript_ItemHealHP_RemoveItemEnd2_Anim:
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
removeitem BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_BerryPPHealEnd2::
stat raising berries
2021-01-06 06:13:32 +01:00
jumpifability BS_ATTACKER, ABILITY_RIPEN, BattleScript_BerryPPHealEnd2_AbilityPopup
goto BattleScript_BerryPPHealEnd2_Anim
BattleScript_BerryPPHealEnd2_AbilityPopup:
call BattleScript_AbilityPopUp
BattleScript_BerryPPHealEnd2_Anim:
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSITEMRESTOREDPP
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
removeitem BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_ItemHealHP_End2::
call BattleScript_ItemHealHP_Ret
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Various battle target items
2019-05-09 20:31:58 +02:00
BattleScript_AirBaloonMsgIn::
printstring STRINGID_AIRBALLOONFLOAT
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Fix Air Baloon msg
2019-05-20 12:20:49 +02:00
end3
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Various battle target items
2019-05-09 20:31:58 +02:00
BattleScript_AirBaloonMsgPop::
printstring STRINGID_AIRBALLOONPOP
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Various battle target items
2019-05-09 20:31:58 +02:00
removeitem BS_TARGET
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
BattleScript_ItemHurtRet::
Fix many Disguise bugs Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
2021-09-06 08:27:42 +02:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_IGNORE_DISGUISE
Various battle target items
2019-05-09 20:31:58 +02:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_HURTBYITEM
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
Various battle target items
2019-05-09 20:31:58 +02:00
tryfaintmon BS_ATTACKER, FALSE, NULL
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
return
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
BattleScript_ItemHurtEnd2::
playanimation BS_ATTACKER, B_ANIM_MON_HIT, NULL
waitanimation
call BattleScript_ItemHurtRet
Various battle target items
2019-05-09 20:31:58 +02:00
end2
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_ItemHealHP_Ret::
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSITEMRESTOREDHPALITTLE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Fix many Disguise bugs Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
2021-09-06 08:27:42 +02:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
more battle labels
2017-11-26 17:15:28 +01:00
BattleScript_SelectingNotAllowedMoveChoiceItem::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printselectionstring STRINGID_ITEMALLOWSONLYYMOVE
endselectionscript
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Update Unusable Moves
2018-07-31 23:09:47 +02:00
BattleScript_SelectingNotAllowedMoveAssaultVest::
printselectionstring STRINGID_ASSAULTVESTDOESNTALLOW
endselectionscript
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_HangedOnMsg::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playanimation BS_TARGET, B_ANIM_HANGED_ON, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNHUNGONWITHX
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Focus Sash removed on use
2020-06-22 10:50:50 +02:00
jumpifnoholdeffect BS_TARGET, HOLD_EFFECT_FOCUS_SASH, BattleScript_HangedOnMsgRet
removeitem BS_TARGET
BattleScript_HangedOnMsgRet:
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
return
BattleScript_BerryConfuseHealEnd2::
stat raising berries
2021-01-06 06:13:32 +01:00
jumpifability BS_ATTACKER, ABILITY_RIPEN, BattleScript_BerryConfuseHealEnd2_AbilityPopup
goto BattleScript_BerryConfuseHealEnd2_Anim
BattleScript_BerryConfuseHealEnd2_AbilityPopup:
call BattleScript_AbilityPopUp
BattleScript_BerryConfuseHealEnd2_Anim:
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
pokemon and battle constants
2018-02-08 11:17:41 +01:00
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_FORXCOMMAYZ
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
create more battle constants
2018-02-08 00:35:13 +01:00
setmoveeffect MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
seteffectprimary
pokemon and battle constants
2018-02-08 11:17:41 +01:00
removeitem BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
stat raising berries
2021-01-06 06:13:32 +01:00
BattleScript_BerryConfuseHealRet::
jumpifability BS_SCRIPTING, ABILITY_RIPEN, BattleScript_BerryConfuseHealRet_AbilityPopup
goto BattleScript_BerryConfuseHealRet_Anim
BattleScript_BerryConfuseHealRet_AbilityPopup:
call BattleScript_AbilityPopUp
BattleScript_BerryConfuseHealRet_Anim:
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
stat raising berries
2021-01-06 06:13:32 +01:00
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_SCRIPTING
datahpupdate BS_SCRIPTING
printstring STRINGID_FORXCOMMAYZ
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
stat raising berries
2021-01-06 06:13:32 +01:00
setmoveeffect MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
removeitem BS_SCRIPTING
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_BerryStatRaiseEnd2::
stat raising berries
2021-01-06 06:13:32 +01:00
jumpifability BS_ATTACKER, ABILITY_RIPEN, BattleScript_BerryStatRaiseEnd2_AbilityPopup
goto BattleScript_BerryStatRaiseEnd2_Anim
BattleScript_BerryStatRaiseEnd2_AbilityPopup:
call BattleScript_AbilityPopUp
BattleScript_BerryStatRaiseEnd2_Anim:
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BerryStatRaiseDoStatUp
BattleScript_BerryStatRaiseDoStatUp::
setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_ITEM
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
call BattleScript_StatUp
pokemon and battle constants
2018-02-08 11:17:41 +01:00
removeitem BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
stat raising berries
2021-01-06 06:13:32 +01:00
BattleScript_BerryStatRaiseRet::
jumpifability BS_SCRIPTING, ABILITY_RIPEN, BattleScript_BerryStatRaiseRet_AbilityPopup
goto BattleScript_BerryStatRaiseRet_Anim
BattleScript_BerryStatRaiseRet_AbilityPopup:
call BattleScript_AbilityPopUp
BattleScript_BerryStatRaiseRet_Anim:
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_BerryStatRaiseRet_End
BattleScript_BerryStatRaiseRet_End:
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_ITEM
stat raising berries
2021-01-06 06:13:32 +01:00
call BattleScript_StatUp
removeitem BS_SCRIPTING
return
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
BattleScript_BerryFocusEnergyEnd2::
Document remaining status/general/special anims
2020-02-20 05:13:54 +01:00
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_PKMNUSEDXTOGETPUMPED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
removeitem BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
BattleScript_ActionSelectionItemsCantBeUsed::
printselectionstring STRINGID_ITEMSCANTBEUSEDNOW
endselectionscript
Label various battle scripts
2018-09-01 20:00:13 +02:00
BattleScript_FlushMessageBox::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_EMPTYSTRING3
return
Clean up some battle scr cmd data
2020-07-17 02:12:12 +02:00
BattleScript_PalacePrintFlavorText::
setbyte gBattleCommunication + 1, 0
BattleScript_PalaceTryBattlerFlavorText::
palaceflavortext BS_ATTACKER @ BS_ATTACKER here overwritten by gBattleCommunication + 1
jumpifbyte CMP_NOT_EQUAL, gBattleCommunication, TRUE, BattleScript_PalaceEndFlavorText
printfromtable gBattlePalaceFlavorTextTable
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Clean up some battle scr cmd data
2020-07-17 02:12:12 +02:00
BattleScript_PalaceEndFlavorText::
addbyte gBattleCommunication + 1, 1
jumpifbytenotequal gBattleCommunication + 1, gBattlersCount, BattleScript_PalaceTryBattlerFlavorText
setbyte gBattleCommunication, 0
setbyte gBattleCommunication + 1, 0
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Some labels
2018-08-25 21:04:12 +02:00
BattleScript_ArenaTurnBeginning::
pokemon and battle constants
2018-02-08 11:17:41 +01:00
waitcry BS_ATTACKER
Some labels
2018-08-25 21:04:12 +02:00
volumedown
Give songs meaningful english names
2020-08-21 00:02:00 +02:00
playse SE_ARENA_TIMEUP1
Add WAIT_TIME battle script constants
2021-04-02 08:16:01 +02:00
pause 8
Give songs meaningful english names
2020-08-21 00:02:00 +02:00
playse SE_ARENA_TIMEUP1
pokemon and battle constants
2018-02-08 11:17:41 +01:00
various14 BS_ATTACKER
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
arenajudgmentstring B_MSG_REF_COMMENCE_BATTLE
arenawaitmessage B_MSG_REF_COMMENCE_BATTLE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
various15 BS_ATTACKER
Some labels
2018-08-25 21:04:12 +02:00
volumeup
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)
2020-02-16 13:14:18 +01:00
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
@ Unused
BattleScript_ArenaNothingDecided::
Give songs meaningful english names
2020-08-21 00:02:00 +02:00
playse SE_DING_DONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
various14 BS_ATTACKER
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
arenajudgmentstring B_MSG_REF_NOTHING_IS_DECIDED
arenawaitmessage B_MSG_REF_NOTHING_IS_DECIDED
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
various15 BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Document battle arena
2018-11-11 18:33:16 +01:00
BattleScript_ArenaDoJudgment::
makevisible BS_PLAYER1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
pokemon and battle constants
2018-02-08 11:17:41 +01:00
makevisible BS_OPPONENT1
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
waitstate
Some labels
2018-08-25 21:04:12 +02:00
volumedown
Give songs meaningful english names
2020-08-21 00:02:00 +02:00
playse SE_ARENA_TIMEUP1
Add WAIT_TIME battle script constants
2021-04-02 08:16:01 +02:00
pause 8
Give songs meaningful english names
2020-08-21 00:02:00 +02:00
playse SE_ARENA_TIMEUP1
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
various14 BS_ATTACKER
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
arenajudgmentstring B_MSG_REF_THATS_IT
arenawaitmessage B_MSG_REF_THATS_IT
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
setbyte gBattleCommunication, 0
Document battle arena
2018-11-11 18:33:16 +01:00
arenajudgmentwindow
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
pause B_WAIT_TIME_LONG
Document battle arena
2018-11-11 18:33:16 +01:00
arenajudgmentwindow
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
arenajudgmentstring B_MSG_REF_JUDGE_MIND
arenawaitmessage B_MSG_REF_JUDGE_MIND
Document battle arena
2018-11-11 18:33:16 +01:00
arenajudgmentwindow
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
arenajudgmentstring B_MSG_REF_JUDGE_SKILL
arenawaitmessage B_MSG_REF_JUDGE_SKILL
Document battle arena
2018-11-11 18:33:16 +01:00
arenajudgmentwindow
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
arenajudgmentstring B_MSG_REF_JUDGE_BODY
arenawaitmessage B_MSG_REF_JUDGE_BODY
Document battle arena
2018-11-11 18:33:16 +01:00
arenajudgmentwindow
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 3, BattleScript_ArenaJudgmentPlayerLoses
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 4, BattleScript_ArenaJudgmentDraw
arenajudgmentstring B_MSG_REF_PLAYER_WON
arenawaitmessage B_MSG_REF_PLAYER_WON
Document battle arena
2018-11-11 18:33:16 +01:00
arenajudgmentwindow
pokemon and battle constants
2018-02-08 11:17:41 +01:00
various15 BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_DEFEATEDOPPONENTBYREFEREE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playfaintcry BS_OPPONENT1
waitcry BS_ATTACKER
dofaintanimation BS_OPPONENT1
cleareffectsonfaint BS_OPPONENT1
Document battle arena
2018-11-11 18:33:16 +01:00
arenaopponentmonlost
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Document battle arena
2018-11-11 18:33:16 +01:00
BattleScript_ArenaJudgmentPlayerLoses:
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
arenajudgmentstring B_MSG_REF_OPPONENT_WON
arenawaitmessage B_MSG_REF_OPPONENT_WON
Document battle arena
2018-11-11 18:33:16 +01:00
arenajudgmentwindow
pokemon and battle constants
2018-02-08 11:17:41 +01:00
various15 BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_LOSTTOOPPONENTBYREFEREE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Document battle arena
2018-11-11 18:33:16 +01:00
playfaintcry BS_PLAYER1
pokemon and battle constants
2018-02-08 11:17:41 +01:00
waitcry BS_ATTACKER
Document battle arena
2018-11-11 18:33:16 +01:00
dofaintanimation BS_PLAYER1
cleareffectsonfaint BS_PLAYER1
arenaplayermonlost
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
Document battle arena
2018-11-11 18:33:16 +01:00
BattleScript_ArenaJudgmentDraw:
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
arenajudgmentstring B_MSG_REF_DRAW
arenawaitmessage B_MSG_REF_DRAW
Document battle arena
2018-11-11 18:33:16 +01:00
arenajudgmentwindow
pokemon and battle constants
2018-02-08 11:17:41 +01:00
various15 BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_TIEDOPPONENTBYREFEREE
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Document battle arena
2018-11-11 18:33:16 +01:00
playfaintcry BS_PLAYER1
pokemon and battle constants
2018-02-08 11:17:41 +01:00
waitcry BS_ATTACKER
Document battle arena
2018-11-11 18:33:16 +01:00
dofaintanimation BS_PLAYER1
cleareffectsonfaint BS_PLAYER1
pokemon and battle constants
2018-02-08 11:17:41 +01:00
playfaintcry BS_OPPONENT1
waitcry BS_ATTACKER
dofaintanimation BS_OPPONENT1
cleareffectsonfaint BS_OPPONENT1
Document battle arena
2018-11-11 18:33:16 +01:00
arenabothmonlost
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
name more battlescripts
2017-11-26 17:26:11 +01:00
BattleScript_AskIfWantsToForfeitMatch::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printselectionstring STRINGID_QUESTIONFORFEITMATCH
pokemon and battle constants
2018-02-08 11:17:41 +01:00
forfeityesnobox BS_ATTACKER
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
endselectionscript
more battlescript labels
2017-12-03 00:47:21 +01:00
BattleScript_PrintPlayerForfeited::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_FORFEITEDMATCH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
more battlescript labels
2017-12-03 00:47:21 +01:00
BattleScript_PrintPlayerForfeitedLinkBattle::
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
printstring STRINGID_FORFEITEDMATCH
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
Document remainder of battle_controllers.c
2021-01-22 08:48:22 +01:00
endlinkbattle
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
waitmessage B_WAIT_TIME_LONG
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
end2
add totem boosts
2020-11-19 18:35:37 +01:00
BattleScript_TotemFlaredToLife::
playanimation BS_ATTACKER, B_ANIM_TOTEM_FLARE, NULL
printstring STRINGID_AURAFLAREDTOLIFE
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
add totem boosts
2020-11-19 18:35:37 +01:00
goto BattleScript_ApplyTotemVarBoost
BattleScript_TotemVar::
gettotemboost BattleScript_ApplyTotemVarBoost
BattleScript_TotemVarEnd:
end2
BattleScript_ApplyTotemVarBoost:
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TotemVarEnd
setgraphicalstatchangevalues
playanimation BS_SCRIPTING, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
BattleScript_TotemVarPrintStatMsg:
printfromtable gStatUpStringIds
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
add totem boosts
2020-11-19 18:35:37 +01:00
goto BattleScript_TotemVar @loop until stats bitfield is empty
fix merge conflicts
2020-12-01 23:57:57 +01:00
finish switch in ability messages
2020-11-19 19:42:00 +01:00
BattleScript_AnnounceAirLockCloudNine::
call BattleScript_AbilityPopUp
printstring STRINGID_AIRLOCKACTIVATES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
finish switch in ability messages
2020-11-19 19:42:00 +01:00
call BattleScript_WeatherFormChanges
end3
custap berry effect, custap/quick claw activation message
2021-01-06 17:37:31 +01:00
BattleScript_QuickClawActivation::
some quick claw/custap berry fixes
2021-02-01 07:31:27 +01:00
printstring STRINGID_EMPTYSTRING3
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage 1
merge with be. magic guard checks
2021-03-03 17:21:06 +01:00
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
custap berry effect, custap/quick claw activation message
2021-01-06 17:37:31 +01:00
waitanimation
printstring STRINGID_CANACTFASTERTHANKSTO
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
custap berry effect, custap/quick claw activation message
2021-01-06 17:37:31 +01:00
end2
BattleScript_CustapBerryActivation::
some quick claw/custap berry fixes
2021-02-01 07:31:27 +01:00
printstring STRINGID_EMPTYSTRING3
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage 1
custap berry effect, custap/quick claw activation message
2021-01-06 17:37:31 +01:00
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
waitanimation
printstring STRINGID_CANACTFASTERTHANKSTO
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
custap berry effect, custap/quick claw activation message
2021-01-06 17:37:31 +01:00
removeitem BS_ATTACKER
end2
micle berry
2021-01-06 18:47:07 +01:00
BattleScript_MicleBerryActivateEnd2::
jumpifability BS_ATTACKER, ABILITY_RIPEN, BattleScript_MicleBerryActivateEnd2_Ripen
goto BattleScript_MicleBerryActivateEnd2_Anim
BattleScript_MicleBerryActivateEnd2_Ripen:
call BattleScript_AbilityPopUp
BattleScript_MicleBerryActivateEnd2_Anim:
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_MICLEBERRYACTIVATES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
micle berry
2021-01-06 18:47:07 +01:00
removeitem BS_ATTACKER
end2
BattleScript_MicleBerryActivateRet::
jumpifability BS_SCRIPTING, ABILITY_RIPEN, BattleScript_MicleBerryActivateRet_Ripen
goto BattleScript_MicleBerryActivateRet_Anim
BattleScript_MicleBerryActivateRet_Ripen:
call BattleScript_AbilityPopUp
BattleScript_MicleBerryActivateRet_Anim:
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_MICLEBERRYACTIVATES
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
waitmessage B_WAIT_TIME_LONG
micle berry
2021-01-06 18:47:07 +01:00
removeitem BS_SCRIPTING
return
jaboca, rowap berry effects
2021-01-06 19:15:56 +01:00
BattleScript_JabocaRowapBerryActivates::
jumpifability BS_TARGET, ABILITY_RIPEN, BattleScript_JabocaRowapBerryActivate_Ripen
goto BattleScript_JabocaRowapBerryActivate_Anim
BattleScript_JabocaRowapBerryActivate_Ripen:
call BattleScript_AbilityPopUp
BattleScript_JabocaRowapBerryActivate_Anim:
jumpifabsent BS_TARGET, BattleScript_JabocaRowapBerryActivate_Dmg @ dont play the animation for a fainted target
playanimation BS_TARGET, B_ANIM_HELD_ITEM_EFFECT, NULL
waitanimation
BattleScript_JabocaRowapBerryActivate_Dmg:
call BattleScript_HurtAttacker
removeitem BS_TARGET
return
merge with be
2021-08-12 07:26:13 +02:00
add pickpocket
2020-11-12 02:08:46 +01:00
BattleScript_Pickpocket::
call BattleScript_AbilityPopUp
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
jumpifability BS_ATTACKER, ABILITY_STICKY_HOLD, BattleScript_PickpocketPrevented
format fix
2020-11-12 02:37:11 +01:00
swapattackerwithtarget
move pickpocket to back of moveend sequence
2020-11-13 07:30:00 +01:00
call BattleScript_ItemSteal
format fix
2020-11-12 02:37:11 +01:00
swapattackerwithtarget
move pickpocket to back of moveend sequence
2020-11-13 07:30:00 +01:00
activateitemeffects BS_TARGET
format fix
2020-11-12 02:37:11 +01:00
return
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
BattleScript_PickpocketPrevented:
merge with be
2021-08-12 07:26:13 +02:00
pause B_WAIT_TIME_SHORT
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
printstring STRINGID_ITEMCANNOTBEREMOVED
merge with be
2021-08-12 07:26:13 +02:00
waitmessage B_WAIT_TIME_LONG
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
return
BattleScript_StickyBarbTransfer::
playanimation BS_TARGET, B_ANIM_ITEM_STEAL, NULL
printstring STRINGID_STICKYBARBTRANSFER
merge with be
2021-08-12 07:26:13 +02:00
waitmessage B_WAIT_TIME_LONG
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
removeitem BS_TARGET
return
merge with be
2021-08-12 07:26:13 +02:00
merge with be
2021-09-16 19:12:59 +02:00
>>>>>>> 0cd7f3ffcde00002691719ae33b4fa0516662acf
Copy Permalink