diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2019-07-30 21:31:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 21:31:27 -0500 |
| commit | bc159dbb03735db55e6a09bb7947dccc70d0532b (patch) | |
| tree | 5b27866fe839d0f2f7ae76e0f13580ecea2dd863 /data | |
| parent | b8393b3a799f92e7064c266600607d98f6baf4d9 (diff) | |
| parent | cf0da4c3bb5658908275068591fe51fb6f2ce49d (diff) | |
Merge pull request #752 from camthesaxman/emerald_diff
resolve some Emerald differences
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 7708f2f4f..1c2f89ca3 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -765,7 +765,7 @@ BattleScript_AlreadyPoisoned: @ 81D7455 goto BattleScript_MoveEnd BattleScript_ImmunityProtected: @ 81D7463 - copybyte gEffectBank, gBankTarget + copybyte gEffectBattler, gBattlerTarget setbyte cMULTISTRING_CHOOSER, 0 call BattleScript_PSNPrevention goto BattleScript_MoveEnd @@ -1086,7 +1086,7 @@ BattleScript_AlreadyParalyzed: @ 81D784B goto BattleScript_MoveEnd BattleScript_LimberProtected: @ 81D7859 - copybyte gEffectBank, gBankTarget + copybyte gEffectBattler, gBattlerTarget setbyte cMULTISTRING_CHOOSER, 0 call BattleScript_PRLZPrevention goto BattleScript_MoveEnd @@ -1557,7 +1557,7 @@ BattleScript_EffectCurse: @ 81D7D3B jumpifstat USER, EQUAL, DEFENSE, 12, BattleScript_ButItFailed BattleScript_CurseTrySpeed: @ 81D7D60 - copybyte gBankTarget, gBankAttacker + copybyte gBattlerTarget, gBattlerAttacker setbyte sANIM_TURN, 1 attackanimation waitanimation @@ -1582,7 +1582,7 @@ BattleScript_CurseEnd: @ 81D7DAE goto BattleScript_MoveEnd BattleScript_GhostCurse: @ 81D7DB3 - jumpifbytenotequal gBankAttacker, gBankTarget, BattleScript_DoGhostCurse + jumpifbytenotequal gBattlerAttacker, gBattlerTarget, BattleScript_DoGhostCurse getmovetarget USER BattleScript_DoGhostCurse: @ 81D7DC4 @@ -2291,7 +2291,7 @@ BattleScript_EffectWillOWisp: @ 81D850F goto BattleScript_MoveEnd BattleScript_WaterVeilPrevents: @ 81D855B - copybyte gEffectBank, gBankTarget + copybyte gEffectBattler, gBattlerTarget setbyte cMULTISTRING_CHOOSER, 0 call BattleScript_BRNPrevention goto BattleScript_MoveEnd @@ -2680,12 +2680,12 @@ BattleScript_EffectTeeterDance: @ 81D8929 attackcanceler attackstring ppreduce - setbyte gBankTarget, 0 + setbyte gBattlerTarget, 0 BattleScript_TeeterDanceLoop: @ 81D8932 movevaluescleanup setmoveeffect EFFECT_CONFUSION - jumpifbyteequal gBankAttacker, gBankTarget, BattleScript_TeeterDanceDoMoveEndIncrement + jumpifbyteequal gBattlerAttacker, gBattlerTarget, BattleScript_TeeterDanceDoMoveEndIncrement jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_TeeterDanceLoopIncrement jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_TeeterDanceSubstitutePrevents jumpifstatus2 TARGET, STATUS2_CONFUSION, BattleScript_TeeterDanceAlreadyConfused @@ -2700,8 +2700,8 @@ BattleScript_TeeterDanceLoop: @ 81D8932 BattleScript_TeeterDanceDoMoveEndIncrement: @ 81D8978 setbyte sMOVEEND_STATE, 0 moveend 2, 16 - addbyte gBankTarget, 1 - jumpifbytenotequal gBankTarget, gBattlersCount, BattleScript_TeeterDanceLoop + addbyte gBattlerTarget, 1 + jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_TeeterDanceLoop end BattleScript_TeeterDanceLoopIncrement: @ 81D8996 @@ -3248,7 +3248,7 @@ BattleScript_DamagingWeatherContinues:: @ 81D8F7D setbyte gBattleCommunication, 0 BattleScript_DamagingWeatherLoop: @ 81D8F95 - copyarraywithindex gBankAttacker, gBanksByTurnOrder, gBattleCommunication, 1 + copyarraywithindex gBattlerAttacker, gBanksByTurnOrder, gBattleCommunication, 1 weatherdamage jumpifword EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement printfromtable gSandStormHailDmgStringIds @@ -4064,7 +4064,7 @@ BattleScript_1D9792: @ 81D9792 pause 32 gUnknown_081D9795:: @ 81D9795 - setbyte gBankTarget, 0 + setbyte gBattlerTarget, 0 setstatchanger ATTACK, 1, TRUE BattleScript_1D97A1: @ 81D97A1 @@ -4081,7 +4081,7 @@ BattleScript_1D97A1: @ 81D97A1 waitmessage 64 BattleScript_1D97E4: @ 81D97E4 - addbyte gBankTarget, 1 + addbyte gBattlerTarget, 1 goto BattleScript_1D97A1 BattleScript_1D97EF: @ 81D97EF |