diff options
| author | camthesaxman <camthesaxman@users.noreply.github.com> | 2019-07-31 00:13:42 -0500 |
|---|---|---|
| committer | camthesaxman <camthesaxman@users.noreply.github.com> | 2019-07-31 00:13:42 -0500 |
| commit | b74a0c3122113b5ebef469739745e2b8fd420c50 (patch) | |
| tree | e6bd06cc852ca638f9dc9a0d7c8a12b7ee394a5a /data | |
| parent | d7a754386ce491791fe8216fdcb0f4fb72240774 (diff) | |
resolve more battle system differences
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 8562af526..ed286c3b2 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3248,7 +3248,7 @@ BattleScript_DamagingWeatherContinues:: @ 81D8F7D setbyte gBattleCommunication, 0 BattleScript_DamagingWeatherLoop: @ 81D8F95 - copyarraywithindex gBattlerAttacker, gBanksByTurnOrder, gBattleCommunication, 1 + copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 1 weatherdamage jumpifword EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement printfromtable gSandStormHailDmgStringIds @@ -3693,7 +3693,7 @@ BattleScript_MoveSelectionImprisoned:: @ 81D9464 printselectionstring BATTLE_TEXT_SealedNoUse endselectionscript -BattleScript_SelectingImprisionedMoveInPalace:: @ 81D9468 +BattleScript_GrudgeTakesPp:: @ 81D9468 printstring BATTLE_TEXT_GrudgeLosePP waitmessage 64 return |