summaryrefslogtreecommitdiff
path: root/engine/battle/move_effects
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-07 11:30:10 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-07 11:30:10 -0400
commit13129459f11e73df8c556f0c02cd4fca7266a346 (patch)
treef0157c5ba3e66a48eba01fef6ce7283f1dece57a /engine/battle/move_effects
parent45ed05decf330faab4503fe8fecadc54698c9724 (diff)
Sync coordinate macros with pokecrystal
Diffstat (limited to 'engine/battle/move_effects')
-rw-r--r--engine/battle/move_effects/drain_hp.asm4
-rw-r--r--engine/battle/move_effects/heal.asm4
-rw-r--r--engine/battle/move_effects/recoil.asm4
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/move_effects/drain_hp.asm b/engine/battle/move_effects/drain_hp.asm
index e7b241f6..04a585cc 100644
--- a/engine/battle/move_effects/drain_hp.asm
+++ b/engine/battle/move_effects/drain_hp.asm
@@ -71,10 +71,10 @@ DrainHPEffect_:
.next
ldh a, [hWhoseTurn]
and a
- coord hl, 10, 9
+ hlcoord 10, 9
ld a, $1
jr z, .next2
- coord hl, 2, 2
+ hlcoord 2, 2
xor a
.next2
ld [wHPBarType], a
diff --git a/engine/battle/move_effects/heal.asm b/engine/battle/move_effects/heal.asm
index d12b1ea4..e9fb62a7 100644
--- a/engine/battle/move_effects/heal.asm
+++ b/engine/battle/move_effects/heal.asm
@@ -89,10 +89,10 @@ HealEffect_:
call BankswitchEtoF
ldh a, [hWhoseTurn]
and a
- coord hl, 10, 9
+ hlcoord 10, 9
ld a, $1
jr z, .updateHPBar
- coord hl, 2, 2
+ hlcoord 2, 2
xor a
.updateHPBar
ld [wHPBarType], a
diff --git a/engine/battle/move_effects/recoil.asm b/engine/battle/move_effects/recoil.asm
index aa2a3fed..85110d50 100644
--- a/engine/battle/move_effects/recoil.asm
+++ b/engine/battle/move_effects/recoil.asm
@@ -53,12 +53,12 @@ RecoilEffect_:
ld [hli], a
ld [hl], a
.getHPBarCoords
- coord hl, 10, 9
+ hlcoord 10, 9
ldh a, [hWhoseTurn]
and a
ld a, $1
jr z, .updateHPBar
- coord hl, 2, 2
+ hlcoord 2, 2
xor a
.updateHPBar
ld [wHPBarType], a