summaryrefslogtreecommitdiff
path: root/engine/battle
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle')
-rwxr-xr-xengine/battle/animations.asm8
-rw-r--r--engine/battle/battle_transitions.asm2
-rwxr-xr-xengine/battle/core.asm6
-rw-r--r--engine/battle/trainer_ai.asm4
4 files changed, 10 insertions, 10 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 8c095daf..629aa8cd 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -240,7 +240,7 @@ PlayAnimation:
ld h, a
ld de, .nextAnimationCommand
push de
- jp [hl] ; jump to special effect function
+ jp hl ; jump to special effect function
.playSubanimation
ld c, a
and a, %00111111
@@ -481,7 +481,7 @@ PlayApplyingAttackAnimation:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
AnimationTypePointerTable:
dw ShakeScreenVertically ; enemy mon has used a damaging move without a side effect
@@ -690,7 +690,7 @@ DoSpecialEffectByAnimationId:
ld l, a
ld de, .done
push de
- jp [hl]
+ jp hl
.done
pop bc
pop de
@@ -1129,7 +1129,7 @@ CallWithTurnFlipped:
ld [H_WHOSETURN], a
ld de, .returnAddress
push de
- jp [hl]
+ jp hl
.returnAddress
pop af
ld [H_WHOSETURN], a
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm
index 2f3e4e91..ec95a5d9 100644
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -62,7 +62,7 @@ BattleTransition:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; the three GetBattleTransitionID functions set the first
; three bits of c, which determines what transition animation
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
diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm
index 2f2c46a6..f4e50562 100644
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -51,7 +51,7 @@ AIEnemyTrainerChooseMoves:
ld l, a
ld de, .nextMoveChoiceModification ; set return address
push de
- jp [hl] ; execute modification function
+ jp hl ; execute modification function
.loopFindMinimumEntries ; all entries will be decremented sequentially until one of them is zero
ld hl, wBuffer ; temp move selection array
ld de, wEnemyMonMoves ; enemy moves
@@ -372,7 +372,7 @@ TrainerAI:
ld h,[hl]
ld l,a
call Random
- jp [hl]
+ jp hl
.done
and a
ret