diff options
Diffstat (limited to 'battle/effects')
-rw-r--r-- | battle/effects/curse.asm | 2 | ||||
-rw-r--r-- | battle/effects/metronome.asm | 4 | ||||
-rw-r--r-- | battle/effects/mirror_move.asm | 6 | ||||
-rw-r--r-- | battle/effects/rollout.asm | 2 | ||||
-rw-r--r-- | battle/effects/thief.asm | 8 |
5 files changed, 11 insertions, 11 deletions
diff --git a/battle/effects/curse.asm b/battle/effects/curse.asm index 27f821ffc..f117c5108 100644 --- a/battle/effects/curse.asm +++ b/battle/effects/curse.asm @@ -40,7 +40,7 @@ BattleCommand54: ; 37588 ; Raise Attack and Defense, and lower Speed. ld a, $1 - ld [$c689], a + ld [wc689], a call AnimateCurrentMove ld a, $2 call Function36532 diff --git a/battle/effects/metronome.asm b/battle/effects/metronome.asm index 97052a66c..213892945 100644 --- a/battle/effects/metronome.asm +++ b/battle/effects/metronome.asm @@ -5,11 +5,11 @@ BattleCommand34: ; 37418 call Function34548 jr nz, .asm_3742b - ld a, [$c689] + ld a, [wc689] push af call BattleCommand0a pop af - ld [$c689], a + ld [wc689], a .asm_3742b call Function37e36 diff --git a/battle/effects/mirror_move.asm b/battle/effects/mirror_move.asm index a9dfa7931..2a32e7e81 100644 --- a/battle/effects/mirror_move.asm +++ b/battle/effects/mirror_move.asm @@ -24,7 +24,7 @@ BattleCommand1b: ; 373c9 .use ld a, b ld [hl], a - ld [$d265], a + ld [wd265], a push af ld a, BATTLE_VARS_MOVE_ANIM @@ -40,11 +40,11 @@ BattleCommand1b: ; 373c9 call Function34548 jr nz, .done - ld a, [$c689] + ld a, [wc689] push af call BattleCommand0a pop af - ld [$c689], a + ld [wc689], a .done call BattleCommandaa diff --git a/battle/effects/rollout.asm b/battle/effects/rollout.asm index d3a765de5..f709c7988 100644 --- a/battle/effects/rollout.asm +++ b/battle/effects/rollout.asm @@ -44,7 +44,7 @@ BattleCommand5c: ; 37734 and a jr nz, .asm_37750 ld a, 1 - ld [$c73e], a + ld [wc73e], a .asm_37750 ld a, [AttackMissed] diff --git a/battle/effects/thief.asm b/battle/effects/thief.asm index 617e73e37..83b954eaf 100644 --- a/battle/effects/thief.asm +++ b/battle/effects/thief.asm @@ -21,7 +21,7 @@ BattleCommand50: ; 37492 ; Can't steal mail. - ld [$d265], a + ld [wd265], a ld d, a callba ItemIsMail ret c @@ -45,7 +45,7 @@ BattleCommand50: ; 37492 ld [de], a call .playeritem - ld a, [$d265] + ld a, [wd265] ld [hl], a ld [de], a jr .stole @@ -69,7 +69,7 @@ BattleCommand50: ; 37492 ; Can't steal mail! - ld [$d265], a + ld [wd265], a ld d, a callba ItemIsMail ret c @@ -87,7 +87,7 @@ BattleCommand50: ; 37492 ld [de], a call .enemyitem - ld a, [$d265] + ld a, [wd265] ld [hl], a ld [de], a |