diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2017-09-26 12:02:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 12:02:00 -0500 |
| commit | dcbeb6b641f97a7840ad18c76e3aec1089d184d5 (patch) | |
| tree | 9ade0c53b1a5e11e059e7be6d44e35eb13e6c4f5 /engine/battle/core.asm | |
| parent | Add Gen 3 disassemblies. (diff) | |
| parent | Fix warnings about deprecated mnemonics on newer builds of rgbds (diff) | |
| download | pokeyellow-dcbeb6b641f97a7840ad18c76e3aec1089d184d5.tar.gz pokeyellow-dcbeb6b641f97a7840ad18c76e3aec1089d184d5.tar.xz pokeyellow-dcbeb6b641f97a7840ad18c76e3aec1089d184d5.zip | |
Merge pull request #26 from Pokechu22/mnemonic-warnings
Fix warnings about deprecated mnemonics on newer builds of rgbds
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 fbbe144b..f23dd649 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3307,7 +3307,7 @@ ExecutePlayerMove: jp z, ExecutePlayerMoveDone call CheckPlayerStatusConditions jr nz, .playerHasNoSpecialCondition - jp [hl] + jp hl .playerHasNoSpecialCondition call GetCurrentMove ld hl, wPlayerBattleStatus1 @@ -5855,7 +5855,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? @@ -7024,7 +7024,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 |