diff options
| author | Antonio Niño Díaz <antonio_nd@outlook.com> | 2017-06-09 22:54:09 +0100 |
|---|---|---|
| committer | Antonio Niño Díaz <antonio_nd@outlook.com> | 2017-06-09 22:54:09 +0100 |
| commit | 9ea25bc8cd32df5b3bcf6333c3d2582e1b11f2dd (patch) | |
| tree | 838b94841af8efe22697c15775f99035d42fd734 /engine/battle/core.asm | |
| parent | Update Travis configuration to use rgbds 0.3.1 (diff) | |
| download | pokeyellow-9ea25bc8cd32df5b3bcf6333c3d2582e1b11f2dd.tar.gz pokeyellow-9ea25bc8cd32df5b3bcf6333c3d2582e1b11f2dd.tar.xz pokeyellow-9ea25bc8cd32df5b3bcf6333c3d2582e1b11f2dd.zip | |
Replace deprecated mnemonics by the correct ones
The old mnemonics generate warnings with new versions of rgbds. This
patch replaces them by the correct ones.
Signed-off-by: Antonio Niño Díaz <antonio_nd@outlook.com>
Diffstat (limited to 'engine/battle/core.asm')
| -rwxr-xr-x | engine/battle/core.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 153a9048..4835e8cf 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3150,7 +3150,7 @@ ExecutePlayerMove: jp z, ExecutePlayerMoveDone call CheckPlayerStatusConditions jr nz, .playerHasNoSpecialCondition - jp [hl] + jp hl .playerHasNoSpecialCondition call GetCurrentMove ld hl, wPlayerBattleStatus1 @@ -5690,7 +5690,7 @@ ExecuteEnemyMove: ld [wDamageMultipliers], a call CheckEnemyStatusConditions jr nz, .enemyHasNoSpecialConditions - jp [hl] + jp hl .enemyHasNoSpecialConditions ld hl, wEnemyBattleStatus1 bit ChargingUp, [hl] ; is the enemy charging up for attack? @@ -7139,7 +7139,7 @@ _JumpMoveEffect: ld a, [hli] ld h, [hl] ld l, a - jp [hl] ; jump to special effect handler + jp hl ; jump to special effect handler MoveEffectPointerTable: dw SleepEffect ; unused effect |