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/spite.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/spite.asm')
| -rw-r--r-- | engine/battle/move_effects/spite.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/move_effects/spite.asm b/engine/battle/move_effects/spite.asm index 71252fe22..031cdb71f 100644 --- a/engine/battle/move_effects/spite.asm +++ b/engine/battle/move_effects/spite.asm @@ -6,7 +6,7 @@ BattleCommand_Spite: jp nz, .failed ld bc, PARTYMON_STRUCT_LENGTH ; ???? ld hl, wEnemyMonMoves - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_moves ld hl, wBattleMonMoves @@ -63,7 +63,7 @@ BattleCommand_Spite: call GetBattleVar bit SUBSTATUS_TRANSFORMED, a jr nz, .transformed - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr nz, .not_wildmon ld a, [wBattleMode] |