diff options
| author | einstein95 <einstein95@users.noreply.github.com> | 2017-09-30 21:55:14 +1300 |
|---|---|---|
| committer | einstein95 <einstein95@users.noreply.github.com> | 2017-09-30 21:55:14 +1300 |
| commit | 9d864ede0e89cd95c9d2ff090a218bd64611fdee (patch) | |
| tree | d4b18f8eb867228fc6e81356bceadf3be188cc2f /engine/battle | |
| parent | 66e9f2288377f697bd8a63b9fe7dbe4a314ff200 (diff) | |
| parent | 5c2419383118280465a89657fed34ed6562f2981 (diff) | |
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/animations.asm | 8 | ||||
| -rw-r--r-- | engine/battle/battle_transitions.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 6 | ||||
| -rw-r--r-- | engine/battle/trainer_ai.asm | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 4964b2cf..1e400aa5 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -213,7 +213,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 @@ -457,7 +457,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 @@ -642,7 +642,7 @@ DoSpecialEffectByAnimationId: ld l,a ld de,.done push de - jp [hl] + jp hl .done pop bc pop de @@ -1080,7 +1080,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 9e02c56f..985a1eb2 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 a60fe4a1..6ec9930c 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3151,7 +3151,7 @@ ExecutePlayerMove: jp z, ExecutePlayerMoveDone call CheckPlayerStatusConditions jr nz, .playerHasNoSpecialCondition - jp [hl] + jp hl .playerHasNoSpecialCondition call GetCurrentMove ld hl, wPlayerBattleStatus1 @@ -5691,7 +5691,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? @@ -7144,7 +7144,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 cabd4334..fff064fa 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 @@ -366,7 +366,7 @@ TrainerAI: ld h,[hl] ld l,a call Random - jp [hl] + jp hl TrainerAIPointers: ; one entry per trainer class |