diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-08-25 22:23:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 22:23:45 -0400 |
| commit | 3eacab563d0e1ab5557c2443556a7a5e58d14cad (patch) | |
| tree | 3d747166409fdc94f0fd1aa760693a7ee5bd2156 /engine/battle/move_effects/disable.asm | |
| parent | 89681d231611938a791f4256e602c88c2f9aa3e1 (diff) | |
| parent | b2adcd6d6ff91efc764a6ecc65147be7b9cda9e8 (diff) | |
Merge pull request #555 from Rangi42/ldh
Use real labels for HRAM instead of constants, and the ldh instruction
Diffstat (limited to 'engine/battle/move_effects/disable.asm')
| -rw-r--r-- | engine/battle/move_effects/disable.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/move_effects/disable.asm b/engine/battle/move_effects/disable.asm index 44017e30d..7f5cfaea0 100644 --- a/engine/battle/move_effects/disable.asm +++ b/engine/battle/move_effects/disable.asm @@ -7,7 +7,7 @@ BattleCommand_Disable: ld de, wEnemyDisableCount ld hl, wEnemyMonMoves - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_moves ld de, wPlayerDisableCount @@ -33,7 +33,7 @@ BattleCommand_Disable: cp b jr nz, .loop - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a ld hl, wEnemyMonPP jr z, .got_pp @@ -55,7 +55,7 @@ BattleCommand_Disable: ld [de], a call AnimateCurrentMove ld hl, wDisabledMove - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr nz, .got_disabled_move_pointer inc hl |