diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-04 16:19:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-04 16:19:15 -0400 |
| commit | 2718c36065e7eb201a149938bcdd51987c4e56b6 (patch) | |
| tree | 4a1c0294193a497e15ec8e6be59390eb1f84b5d3 /engine/battle/move_effects/recoil.asm | |
| parent | Merge pull request #256 from Rangi42/master (diff) | |
| parent | UPDATE_PARTY_MENU_BLK_PACKET -> SET_PAL_PARTY_MENU_HP_BARS, and introduce SET... (diff) | |
| download | pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.gz pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.xz pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.zip | |
Merge pull request #257 from Rangi42/master
More reorganization
Diffstat (limited to 'engine/battle/move_effects/recoil.asm')
| -rw-r--r-- | engine/battle/move_effects/recoil.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/move_effects/recoil.asm b/engine/battle/move_effects/recoil.asm index 0f2f087b..e94f8043 100644 --- a/engine/battle/move_effects/recoil.asm +++ b/engine/battle/move_effects/recoil.asm @@ -1,5 +1,5 @@ RecoilEffect_: - ld a, [H_WHOSETURN] + ld a, [hWhoseTurn] and a ld a, [wPlayerMoveNum] ld hl, wBattleMonMaxHP @@ -54,7 +54,7 @@ RecoilEffect_: ld [hl], a .getHPBarCoords coord hl, 10, 9 - ld a, [H_WHOSETURN] + ld a, [hWhoseTurn] and a ld a, $1 jr z, .updateHPBar |