shithub: pokecrystal

Download patch

ref: e6ea1889fbce20b0dc170310ac63891a1cca2bb5
parent: fb154f5a6e43a86801fd16f392633c854d099ac4
author: Ben10do <[email protected]>
date: Fri Jun 9 18:01:10 EDT 2017

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.

--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -229,7 +229,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .ChannelFnPtrs:
 	dw .Channel1
@@ -1389,7 +1389,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 ; e8720
 
--- a/battle/ai/items.asm
+++ b/battle/ai/items.asm
@@ -211,7 +211,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 .callback
 	pop de
 	pop hl
--- a/battle/ai/redundant.asm
+++ b/battle/ai/redundant.asm
@@ -11,7 +11,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Moves: ; 2c42c
 	dbw EFFECT_DREAM_EATER,  .DreamEater
--- a/battle/anim_commands.asm
+++ b/battle/anim_commands.asm
@@ -347,7 +347,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; cc2a4
 
 
--- a/battle/bg_effects.asm
+++ b/battle/bg_effects.asm
@@ -75,7 +75,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 BattleBGEffects: ; c805a (32:405a)
 	dw BattleBGEffect_End
@@ -161,7 +161,7 @@
 	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 @@
 .cgb
 	ld de, .Jumptable
 	call BatttleBGEffects_GetNamedJumptablePointer
-	jp [hl]
+	jp hl
 
 .Jumptable:
 	dw .cgb_zero
@@ -2421,7 +2421,7 @@
 	ld de, .Jumptable_DMG
 	call BatttleBGEffects_GetNamedJumptablePointer
 	pop de
-	jp [hl]
+	jp hl
 
 .Jumptable_DMG:
 	dw .zero_dmg
@@ -2484,7 +2484,7 @@
 	ld de, .Jumptable_CGB
 	call BatttleBGEffects_GetNamedJumptablePointer
 	pop de
-	jp [hl]
+	jp hl
 
 .Jumptable_CGB: ; c8ddd (32:4ddd)
 	dw .zero_cgb
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -4331,7 +4331,7 @@
 	jp WaitBGMap
 
 .hl
-	jp [hl]
+	jp hl
 ; 3dc5b
 
 PursuitSwitch: ; 3dc5b
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -113,7 +113,7 @@
 	jr .ReadMoveEffectCommand
 
 .DoMoveEffectCommand:
-	jp [hl]
+	jp hl
 
 ; 34084
 
--- a/battle/objects/functions.asm
+++ b/battle/objects/functions.asm
@@ -9,7 +9,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; ccfce
 
 .Jumptable:
@@ -4085,7 +4085,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 BattleAnim_IncAnonJumptableIndex: ; ce72c (33:672c)
 	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -39,7 +39,7 @@
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call BillsPC_Jumptable
-	jp [hl]
+	jp hl
 
 .Jumptable: ; e23df (38:63df)
 
@@ -147,7 +147,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 BillsPCDepositJumptable: ; e24a1 (38:64a1)
 
@@ -306,7 +306,7 @@
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call BillsPC_Jumptable
-	jp [hl]
+	jp hl
 
 .Jumptable: ; e25d2 (38:65d2)
 
@@ -415,7 +415,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .dw ; e2699 (38:6699) #mark
 	dw .withdraw ; Withdraw
@@ -556,7 +556,7 @@
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call BillsPC_Jumptable
-	jp [hl]
+	jp hl
 ; e27ac
 
 .Jumptable: ; e27ac
@@ -678,7 +678,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e2881
 
 .Jumptable2: ; e2881
@@ -2014,7 +2014,7 @@
 	ld l, a
 	ld de, .dw_return
 	push de
-	jp [hl]
+	jp hl
 ; e322a
 
 .dw_return ; e322a
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -76,7 +76,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e01a0 (38:41a0)
 
 .Jumptable: ; e01a0
@@ -652,7 +652,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e0553
 
 .Jumptable: ; e0553
@@ -829,7 +829,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e0643
 
 .Jumptable: ; e0643
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -263,7 +263,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 109937
 
 
--- a/engine/crystal_intro.asm
+++ b/engine/crystal_intro.asm
@@ -125,7 +125,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e467f
 
 .dw ; e467f
@@ -222,7 +222,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 GameFreakLogoScenes: ; e46fd (39:46fd)
 	dw GameFreakLogoScene1
@@ -438,7 +438,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e491e
 
 IntroScenes: ; e491e (39:491e)
--- a/engine/debug.asm
+++ b/engine/debug.asm
@@ -305,7 +305,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .asm_81a9a
 	call Function81eca
@@ -611,7 +611,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .asm_81cdf
 	ld a, $4
@@ -1353,7 +1353,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 82301
 
 .dw ; 82301
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -609,7 +609,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .nope_bugged
 	; pop bc
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -1064,7 +1064,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 626a
 
 .dw
@@ -1117,7 +1117,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 62af
 
 .scenes
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -1955,7 +1955,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 5065
 
 ContinueReadingMovement: ; 5065
--- a/engine/mon_icons.asm
+++ b/engine/mon_icons.asm
@@ -33,7 +33,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 8e854
 
 
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -70,7 +70,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 ; 1172e
 
@@ -405,7 +405,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 ; 11977
 
@@ -1166,7 +1166,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Jumptable: ; 12017 (4:6017)
 	dw .init_blinking_cursor
--- a/engine/options_menu.asm
+++ b/engine/options_menu.asm
@@ -90,7 +90,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl] ; jump to the code of the current highlighted item
+	jp hl ; jump to the code of the current highlighted item
 ; e42e5
 
 .Pointers:
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -23,7 +23,7 @@
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 10030
 
@@ -144,7 +144,7 @@
 	ld a, [wMenuCursorY]
 	dec a
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 10124 (4:4124)
 .MenuDataHeader1: ; 0x10124
@@ -306,7 +306,7 @@
 	ld a, [wMenuCursorY]
 	dec a
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 10249 (4:4249)
 MenuDataHeader_UsableKeyItem: ; 0x10249
@@ -689,7 +689,7 @@
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 104c3
 
@@ -846,7 +846,7 @@
 	ld a, [wMenuCursorY]
 	dec a
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 10601 (4:4601)
 .UsableMenuDataHeader: ; 0x10601
@@ -997,7 +997,7 @@
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 106d1
 
@@ -1144,7 +1144,7 @@
 	ld a, [wJumptableIndex]
 	ld hl, .dw
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 107e1
 
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -182,7 +182,7 @@
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call Pokedex_LoadPointer
-	jp [hl]
+	jp hl
 
 
 .Jumptable: ; 40115 (10:4115)
@@ -366,7 +366,7 @@
 	ld a, [wDexArrowCursorPosIndex]
 	ld hl, DexEntryScreen_MenuActionJumptable
 	call Pokedex_LoadPointer
-	jp [hl]
+	jp hl
 
 .return_to_prev_screen
 	ld a, [LastVolume]
@@ -545,7 +545,7 @@
 	ld a, [wDexArrowCursorPosIndex]
 	ld hl, .MenuActionJumptable
 	call Pokedex_LoadPointer
-	jp [hl]
+	jp hl
 
 .return_to_main_screen
 	call Pokedex_BlackOutBG
@@ -647,7 +647,7 @@
 	ld a, [wDexArrowCursorPosIndex]
 	ld hl, .MenuActionJumptable
 	call Pokedex_LoadPointer
-	jp [hl]
+	jp hl
 
 .cancel
 	call Pokedex_BlackOutBG
@@ -1621,7 +1621,7 @@
 	ld a, [wCurrentDexMode]
 	ld hl, .Jumptable
 	call Pokedex_LoadPointer
-	jp [hl]
+	jp hl
 
 
 .Jumptable: ; 40bf0 (10:4bf0)
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -235,7 +235,7 @@
 	ld l, a
 	ld de, .return_from_jumptable
 	push de
-	jp [hl]
+	jp hl
 
 .return_from_jumptable
 	call Pokegear_FinishTilemap
@@ -431,7 +431,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Jumptable: ; 90f13 (24:4f13)
 	dw PokegearClock_Init
@@ -1217,7 +1217,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Cancel: ; 913f1
 	ld hl, PokegearText_WhomToCall
@@ -1484,7 +1484,7 @@
 	ld l, a
 	ld de, .returnafterstation
 	push de
-	jp [hl]
+	jp hl
 
 .returnafterstation
 	ld a, [wPokegearRadioChannelBank]
@@ -2043,7 +2043,7 @@
 	ld l, a
 	ld de, .jump_return
 	push de
-	jp [hl]
+	jp hl
 
 .jump_return
 	push de
--- a/engine/printer/serial.asm
+++ b/engine/printer/serial.asm
@@ -26,7 +26,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 84031
 
 
@@ -468,7 +468,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 842ea
 
 
--- a/engine/radio.asm
+++ b/engine/radio.asm
@@ -25,7 +25,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 RadioJumptable:
 	dw OaksPkmnTalk1  ; $00
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -796,7 +796,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 ; 92be4 (24:6be4)
 
@@ -1311,7 +1311,7 @@
 	ld l, a
 	ld de, .return
 	push de
-	jp [hl]
+	jp hl
 
 .return
 	ld a, [wFirstTwoReelsMatching]
@@ -1422,7 +1422,7 @@
 	ld l, a
 	ld de, .return
 	push de
-	jp [hl]
+	jp hl
 
 .return
 	ld a, [wSlotMatched]
@@ -1855,7 +1855,7 @@
 	ld l, a
 	ld de, .return
 	push de
-	jp [hl]
+	jp hl
 
 .return
 	ld hl, .Text_PrintPayout
@@ -1958,7 +1958,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Jumptable: ; 9322d (24:722d)
 
@@ -2059,7 +2059,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Jumptable: ; 932bc (24:72bc)
 
--- a/engine/sprite_anims.asm
+++ b/engine/sprite_anims.asm
@@ -9,7 +9,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 8d25b
 
 .Jumptable: ; 8d25b (23:525b)
@@ -134,7 +134,7 @@
 
 .four ; 8d302 (23:5302)
 	call .AnonymousJumptable
-	jp [hl]
+	jp hl
 ; 8d306 (23:5306)
 
 ; Anonymous dw (see .AnonymousJumptable)
@@ -418,7 +418,7 @@
 
 .sixteen ; 8d483 (23:5483)
 	call .AnonymousJumptable
-	jp [hl]
+	jp hl
 ; 8d487 (23:5487)
 
 ; Anonymous dw (see .AnonymousJumptable)
--- a/engine/startmenu.asm
+++ b/engine/startmenu.asm
@@ -55,7 +55,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .MenuReturns:
 	dw .Reopen
@@ -227,7 +227,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 127ef
 
 .MenuString: ; 127ef
@@ -701,7 +701,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .nothing
 	ld a, 0
--- a/engine/timeofdaypals.asm
+++ b/engine/timeofdaypals.asm
@@ -250,7 +250,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 8c126
 
 .TimePalettes:
--- a/engine/trade/animation.asm
+++ b/engine/trade/animation.asm
@@ -232,7 +232,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 290af
 
 .JumpTable: ; 290af
@@ -549,7 +549,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 2928f
 
 .Jumptable: ; 2928f
@@ -1173,7 +1173,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 29686
 
 .Jumptable: ; 29686 (a:5686)
--- a/engine/unown_puzzle.asm
+++ b/engine/unown_puzzle.asm
@@ -183,7 +183,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e12d9
 
 .Jumptable: ; e12d9
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -169,7 +169,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 8ca1b
 
 
--- a/event/magnet_train.asm
+++ b/event/magnet_train.asm
@@ -299,7 +299,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 8ce06
 
 .Jumptable: ; 8ce06
--- a/event/mom.asm
+++ b/event/mom.asm
@@ -28,7 +28,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 16242
 
 .dw ; 16242
--- a/gfx/mail.asm
+++ b/gfx/mail.asm
@@ -107,7 +107,7 @@
 	ld de, .done
 	pop bc
 	push de
-	jp [hl]
+	jp hl
 .done
 	ret
 ; b92f8
--- a/home.asm
+++ b/home.asm
@@ -152,7 +152,7 @@
 ; Register aliases
 
 _hl_:: ; 2fec
-	jp [hl]
+	jp hl
 ; 2fed
 
 _de_:: ; 2fed
--- a/home/farcall.asm
+++ b/home/farcall.asm
@@ -50,5 +50,5 @@
 ; 2d82
 
 FarJump_hl:: ; 2d82
-	jp [hl]
+	jp hl
 ; 2d83
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -337,7 +337,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 1eff
 
 InitMenuCursorAndButtonPermissions:: ; 1eff
@@ -470,7 +470,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 1fb1
 
 GetMenuDataPointerTableEntry:: ; 1fb1
--- a/home/text.asm
+++ b/home/text.asm
@@ -943,7 +943,7 @@
 
 	bit 7, h
 	jr nz, .not_rom
-	jp [hl]
+	jp hl
 
 .not_rom
 	ld a, "@"
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -263,7 +263,7 @@
 	ld l, a
 	ld de, .skip_or_return_from_ball_fn
 	push de
-	jp [hl]
+	jp hl
 
 .skip_or_return_from_ball_fn
 	ld a, [CurItem]
--- a/macros.asm
+++ b/macros.asm
@@ -281,7 +281,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 endm
 
 maskbits: macro
--- a/main.asm
+++ b/main.asm
@@ -3214,7 +3214,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .dw ; 4e564 (13:6564)
 	dw .DudeTutorial
--- a/misc/battle_tower_5c.asm
+++ b/misc/battle_tower_5c.asm
@@ -222,7 +222,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 170249
 
 .dw ; 170249
@@ -692,7 +692,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 17051f
 
 .dw ; 17051f
@@ -947,7 +947,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 170696
 
 
@@ -1443,7 +1443,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .invalid
 	ld a, $5
--- a/misc/fixed_words.asm
+++ b/misc/fixed_words.asm
@@ -2516,7 +2516,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Jumptable:
 	dw .zero
--- a/misc/gfx_41.asm
+++ b/misc/gfx_41.asm
@@ -240,7 +240,7 @@
 ; 10419c
 
 ._hl_ ; 10419c
-	jp [hl]
+	jp hl
 ; 10419d
 
 
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -377,7 +377,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 10828a
 
 .Jumptable: ; 10828a
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -146,7 +146,7 @@
 	ld h, [hl]
 	ld l, a
 	pop de
-	jp [hl]
+	jp hl
 
 ; 11425c
 
@@ -5397,7 +5397,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 ; 1165af
 
@@ -6931,7 +6931,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 Jumptable_117728: ; 117728 (45:7728)
 	dw Function117738
@@ -7419,7 +7419,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Jumptable: ; 0x117af8
 	dw Function117b06
--- a/misc/mobile_45_sprite_engine.asm
+++ b/misc/mobile_45_sprite_engine.asm
@@ -380,7 +380,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 ; 1161c7
 
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -5874,7 +5874,7 @@
 	ld a, [wJumptableIndex]
 	ld hl, Jumptable_11ad78
 	call Function11b239
-	jp [hl]
+	jp hl
 ; 11ad78
 
 Jumptable_11ad78: ; 11ad78
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -373,7 +373,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 Jumptable_171a45: ; 171a45 (5c:5a45)
 	dw Function171a95
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -1146,7 +1146,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 asm_17d721
 	call Function17e5af
@@ -3746,7 +3746,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .finished
 	scf
--- a/predef/cgb.asm
+++ b/predef/cgb.asm
@@ -25,7 +25,7 @@
 	ld l, a
 	ld de, .ReturnFromJumpTable
 	push de
-	jp [hl]
+	jp hl
 ; 8d79
 
 .ReturnFromJumpTable: ; 8d79
@@ -491,7 +491,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 912d
 
 Jumptable_912d: ; 912d
--- a/predef/crystal.asm
+++ b/predef/crystal.asm
@@ -17,7 +17,7 @@
 	ld l, a
 	ld de, .done
 	push de
-	jp [hl]
+	jp hl
 .done
 	ret
 ; 49330 (12:5330)
--- a/predef/sgb.asm
+++ b/predef/sgb.asm
@@ -20,7 +20,7 @@
 	ld l, a
 	ld de, .Finish
 	push de
-	jp [hl]
+	jp hl
 ; 866f
 
 .Jumptable: ; 866f
--- a/rst.asm
+++ b/rst.asm
@@ -28,7 +28,7 @@
 	ld h, [hl]
 	ld l, a
 	pop de
-	jp [hl]
+	jp hl
 
 ; SECTION "rst30",ROM0[$30]
 ; rst30 is midst rst28
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -32,7 +32,7 @@
 	ld h, [hl]
 	ld l, a
 
-	jp [hl]
+	jp hl
 ; fc01b
 
 Tileset00Anim: ; 0xfc01b
--- a/trainers/read_party.asm
+++ b/trainers/read_party.asm
@@ -68,7 +68,7 @@
 	ld l, a
 	ld bc, .done
 	push bc
-	jp [hl]
+	jp hl
 
 .done
 	jp ComputeTrainerReward