diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-07-29 19:56:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-29 19:56:54 -0400 |
| commit | 98e670f3637b5f845a91423ee2d624d2f1e331a6 (patch) | |
| tree | 20bacd2c3cd766eedddd636de59a99af1d662866 /engine/battle/move_effects/baton_pass.asm | |
| parent | 2ec900d96c3b6020be0816151b9ad606c04114b5 (diff) | |
| parent | e346cc7b4152578106f7708363b41d076a3e8d52 (diff) | |
Merge pull request #548 from Rangi42/master
Add meaningful aliases for wd265
Diffstat (limited to 'engine/battle/move_effects/baton_pass.asm')
| -rw-r--r-- | engine/battle/move_effects/baton_pass.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/move_effects/baton_pass.asm b/engine/battle/move_effects/baton_pass.asm index 5d9f19838..7f922b214 100644 --- a/engine/battle/move_effects/baton_pass.asm +++ b/engine/battle/move_effects/baton_pass.asm @@ -68,8 +68,8 @@ BattleCommand_BatonPass: call CallBattleCore ld hl, ResetBattleParticipants call CallBattleCore - ld a, 1 - ld [wTypeMatchup], a + ld a, TRUE + ld [wApplyStatLevelMultipliersToEnemy], a ld hl, ApplyStatLevelMultiplierOnAllStats call CallBattleCore @@ -83,7 +83,7 @@ BatonPass_LinkPlayerSwitch: and a ret z - ld a, 1 + ld a, BATTLEPLAYERACTION_USEITEM ld [wBattlePlayerAction], a call LoadStandardMenuHeader @@ -91,7 +91,7 @@ BatonPass_LinkPlayerSwitch: call CallBattleCore call CloseWindow - xor a + xor a ; BATTLEPLAYERACTION_USEMOVE ld [wBattlePlayerAction], a ret |