summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-10-27 00:04:18 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-10-27 00:04:18 +0200
commit0e6fbbfe091a260f627427ce4f204c192c9dbcc3 (patch)
tree30bf17f48b00223cb42b720061285052cb770976 /data
parent52be8eeaf15da7b281d48c51b1f4d06740a86c76 (diff)
Make battle tower compile
Diffstat (limited to 'data')
-rw-r--r--data/battle_scripts_1.s16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index d8f681686..edf49eda5 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -1601,12 +1601,12 @@ BattleScript_EffectPerishSong::
waitanimation
printstring STRINGID_FAINTINTHREE
waitmessage 0x40
- setbyte sBANK, 0x0
+ setbyte sBATTLER, 0x0
BattleScript_PerishSongLoop::
jumpifability BS_SCRIPTING, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected
BattleScript_PerishSongLoopIncrement::
- addbyte sBANK, 0x1
- jumpifbytenotequal sBANK, gBattlersCount, BattleScript_PerishSongLoop
+ addbyte sBATTLER, 0x1
+ jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_PerishSongLoop
goto BattleScript_MoveEnd
BattleScript_PerishSongNotAffected::
@@ -2493,7 +2493,7 @@ BattleScript_EffectYawn::
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_PrintBankAbilityMadeIneffective::
- copybyte sBANK, sBANK_WITH_ABILITY
+ copybyte sBATTLER, sBATTLER_WITH_ABILITY
BattleScript_PrintAbilityMadeIneffective::
pause 0x20
printstring STRINGID_PKMNSXMADEITINEFFECTIVE
@@ -3523,7 +3523,7 @@ BattleScript_RapidSpinAway::
BattleScript_WrapFree::
printstring STRINGID_PKMNGOTFREE
waitmessage 0x40
- copybyte gBattlerTarget, sBANK
+ copybyte gBattlerTarget, sBATTLER
return
BattleScript_LeechSeedFree::
@@ -4030,11 +4030,11 @@ BattleScript_ShedSkinActivates::
end3
BattleScript_WeatherFormChanges::
- setbyte sBANK, 0x0
+ setbyte sBATTLER, 0x0
BattleScript_WeatherFormChangesLoop::
trycastformdatachange
- addbyte sBANK, 0x1
- jumpifbytenotequal sBANK, gBattlersCount, BattleScript_WeatherFormChangesLoop
+ addbyte sBATTLER, 0x1
+ jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_WeatherFormChangesLoop
return
BattleScript_CastformChange::