diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-17 17:51:32 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-17 17:51:32 -0500 |
| commit | fe4ef4e5951e855174cbff3da308b342b0b5bd09 (patch) | |
| tree | c5d635a2b4fa10699a8b37817e041d46938e53df /battle/effect_commands.asm | |
| parent | 42dd25b3e50569d94ca78adf47c527a9859089b5 (diff) | |
Elevator
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index d5d9a78b9..3e66c446a 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -1,7 +1,7 @@ DoPlayerTurn: ; 34000 call SetPlayerTurn - ld a, [wd0ec] + ld a, [wPlayerAction] and a ret nz @@ -9025,7 +9025,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67 ret z ld a, 1 - ld [wd0ec], a + ld [wPlayerAction], a call LoadStandardMenuDataHeader ld hl, LinkBattleSendReceiveAction @@ -9033,7 +9033,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67 call WriteBackup xor a - ld [wd0ec], a + ld [wPlayerAction], a ret ; 37a82 |