diff options
| author | yenatch <yenatch@gmail.com> | 2017-09-29 22:41:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 22:41:34 -0400 |
| commit | 5c2419383118280465a89657fed34ed6562f2981 (patch) | |
| tree | 4844873fcd027d8f238be629d283663d5fcafc9b /engine/battle/core.asm | |
| parent | Add Gen 3 disassemblies. (diff) | |
| parent | Update Travis configuration to use rgbds 0.3.3 (diff) | |
| download | pokeyellow-5c2419383118280465a89657fed34ed6562f2981.tar.gz pokeyellow-5c2419383118280465a89657fed34ed6562f2981.tar.xz pokeyellow-5c2419383118280465a89657fed34ed6562f2981.zip | |
Merge pull request #167 from Pokechu22/rgbds-0.3.3
Update for RGBDS 0.3.3
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 4e21f6de..4e7c8032 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 |