Replace ‘jp [hl]’ with ‘jp hl’

The former is arguably misleading (as you don’t access the memory location in hl to retrieve the jump location), and is consequently deprecated in newer versions of rgbds.

This fix silences these deprecation warnings.

7 files changed, 12 insertions, 12 deletions

diff --git a/battle/ai/items.asm b/battle/ai/items.asm
index 4405ae756..f8c97578a 100644
--- a/battle/ai/items.asm
+++ b/battle/ai/items.asm
@@ -211,7 +211,7 @@ AI_TryItem: ; 38105
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 .callback
 	pop de
 	pop hl
diff --git a/battle/ai/redundant.asm b/battle/ai/redundant.asm
index da71d0ece..e3dda8c4b 100755
--- a/battle/ai/redundant.asm
+++ b/battle/ai/redundant.asm
@@ -11,7 +11,7 @@ AI_Redundant: ; 2c41a
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Moves: ; 2c42c
 	dbw EFFECT_DREAM_EATER,  .DreamEater
diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm
index 957b2a066..958dcfe40 100644
--- a/battle/anim_commands.asm
+++ b/battle/anim_commands.asm
@@ -347,7 +347,7 @@ RunBattleAnimCommand: ; cc25f
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; cc2a4
 
 
diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm
index b7f415770..22807f77d 100644
--- a/battle/bg_effects.asm
+++ b/battle/bg_effects.asm
@@ -75,7 +75,7 @@ DoBattleBGEffectFunction: ; c804a (32:404a)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 BattleBGEffects: ; c805a (32:405a)
 	dw BattleBGEffect_End
@@ -161,7 +161,7 @@ BattleBGEffects_AnonJumptable: ; c80d7 (32:40d7)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 BattleBGEffects_IncrementJumptable: ; c80e5 (32:40e5)
 	ld hl, BG_EFFECT_STRUCT_JT_INDEX
@@ -2059,7 +2059,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
 .cgb
 	ld de, .Jumptable
 	call BatttleBGEffects_GetNamedJumptablePointer
-	jp [hl]
+	jp hl
 
 .Jumptable:
 	dw .cgb_zero
@@ -2421,7 +2421,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
 	ld de, .Jumptable_DMG
 	call BatttleBGEffects_GetNamedJumptablePointer
 	pop de
-	jp [hl]
+	jp hl
 
 .Jumptable_DMG:
 	dw .zero_dmg
@@ -2484,7 +2484,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
 	ld de, .Jumptable_CGB
 	call BatttleBGEffects_GetNamedJumptablePointer
 	pop de
-	jp [hl]
+	jp hl
 
 .Jumptable_CGB: ; c8ddd (32:4ddd)
 	dw .zero_cgb
diff --git a/battle/core.asm b/battle/core.asm
index dec315ab8..be6e24eca 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -4331,7 +4331,7 @@ SpikesDamage: ; 3dc23
 	jp WaitBGMap
 
 .hl
-	jp [hl]
+	jp hl
 ; 3dc5b
 
 PursuitSwitch: ; 3dc5b
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
index a74dea632..54af56a10 100644
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -113,7 +113,7 @@ DoMove: ; 3402c
 	jr .ReadMoveEffectCommand
 
 .DoMoveEffectCommand:
-	jp [hl]
+	jp hl
 
 ; 34084
 
diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm
index 4ed9b67b7..debfcf04d 100755
--- a/battle/objects/functions.asm
+++ b/battle/objects/functions.asm
@@ -9,7 +9,7 @@ DoBattleAnimFrame: ; ccfbe
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; ccfce
 
 .Jumptable:
@@ -4085,7 +4085,7 @@ BattleAnim_AnonJumptable: ; ce71e (33:671e)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 BattleAnim_IncAnonJumptableIndex: ; ce72c (33:672c)
 	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX