diff options
| author | Ben10do <Ben10do@users.noreply.github.com> | 2017-06-09 22:01:10 +0100 |
|---|---|---|
| committer | Ben10do <Ben10do@users.noreply.github.com> | 2017-06-09 22:01:10 +0100 |
| commit | e6ea1889fbce20b0dc170310ac63891a1cca2bb5 (patch) | |
| tree | 436ae844ff5b28f9680d2ac13657c0e9be3af690 | |
| parent | fb154f5a6e43a86801fd16f392633c854d099ac4 (diff) | |
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.
56 files changed, 112 insertions, 112 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index 2cc921bd0..57418246b 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -229,7 +229,7 @@ UpdateChannels: ; e8125 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .ChannelFnPtrs: dw .Channel1 @@ -1389,7 +1389,7 @@ ParseMusicCommand: ; e870f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e8720 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 diff --git a/engine/billspc.asm b/engine/billspc.asm index b9b51f850..4d8bf1c48 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -39,7 +39,7 @@ _DepositPKMN: ; e2391 (38:6391) ld a, [wJumptableIndex] ld hl, .Jumptable call BillsPC_Jumptable - jp [hl] + jp hl .Jumptable: ; e23df (38:63df) @@ -147,7 +147,7 @@ _DepositPKMN: ; e2391 (38:6391) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl BillsPCDepositJumptable: ; e24a1 (38:64a1) @@ -306,7 +306,7 @@ _WithdrawPKMN: ; e2583 (38:6583) ld a, [wJumptableIndex] ld hl, .Jumptable call BillsPC_Jumptable - jp [hl] + jp hl .Jumptable: ; e25d2 (38:65d2) @@ -415,7 +415,7 @@ BillsPC_Withdraw: ; e2675 (38:6675) 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 @@ _MovePKMNWithoutMail: ; e2759 ld a, [wJumptableIndex] ld hl, .Jumptable call BillsPC_Jumptable - jp [hl] + jp hl ; e27ac .Jumptable: ; e27ac @@ -678,7 +678,7 @@ _MovePKMNWithoutMail: ; e2759 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e2881 .Jumptable2: ; e2881 @@ -2014,7 +2014,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld l, a ld de, .dw_return push de - jp [hl] + jp hl ; e322a .dw_return ; e322a diff --git a/engine/card_flip.asm b/engine/card_flip.asm index 0479e8248..cdf2be010 100755 --- a/engine/card_flip.asm +++ b/engine/card_flip.asm @@ -76,7 +76,7 @@ _CardFlip: ; e00ee (38:40ee) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e01a0 (38:41a0) .Jumptable: ; e01a0 @@ -652,7 +652,7 @@ CardFlip_BlankDiscardedCardSlot: ; e0534 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e0553 .Jumptable: ; e0553 @@ -829,7 +829,7 @@ CardFlip_CheckWinCondition: ; e0637 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e0643 .Jumptable: ; e0643 diff --git a/engine/credits.asm b/engine/credits.asm index fad8a615e..b2a1c1e93 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -263,7 +263,7 @@ Credits_Jumptable: ; 109926 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 109937 diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index 29bb0934f..e324ed476 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -125,7 +125,7 @@ PlaceGameFreakPresents: ; e4670 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e467f .dw ; e467f @@ -222,7 +222,7 @@ GameFreakLogoJumper: ; e46ed (39:46ed) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl GameFreakLogoScenes: ; e46fd (39:46fd) dw GameFreakLogoScene1 @@ -438,7 +438,7 @@ IntroSceneJumper: ; e490f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e491e IntroScenes: ; e491e (39:491e) diff --git a/engine/debug.asm b/engine/debug.asm index 78fc52489..9c2bb35c2 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -305,7 +305,7 @@ Function81a74: ; 81a74 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .asm_81a9a call Function81eca @@ -611,7 +611,7 @@ Function81cc2: ; 81cc2 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .asm_81cdf ld a, $4 @@ -1353,7 +1353,7 @@ Function822f0: ; 822f0 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 82301 .dw ; 82301 diff --git a/engine/events.asm b/engine/events.asm index e7598b595..2eb92d1a1 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -609,7 +609,7 @@ TryObjectEvent: ; 969b5 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .nope_bugged ; pop bc diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 3e4257ab7..8e3c90204 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1064,7 +1064,7 @@ StartTitleScreen: ; 6219 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 626a .dw @@ -1117,7 +1117,7 @@ TitleScreenScene: ; 62a3 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 62af .scenes diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 3f63030ec..d5fa84642 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -1955,7 +1955,7 @@ JumpMovementPointer: ; 505e ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 5065 ContinueReadingMovement: ; 5065 diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 7e8136235..d66ea6fac 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -33,7 +33,7 @@ LoadMenuMonIcon: ; 8e83f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8e854 diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index d80b4717b..4a7ca301a 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -70,7 +70,7 @@ NamingScreen: ; 116c1 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1172e @@ -405,7 +405,7 @@ NamingScreenJoypadLoop: ; 11915 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 11977 @@ -1166,7 +1166,7 @@ INCBIN "gfx/icon/mail2.2bpp" ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 12017 (4:6017) dw .init_blinking_cursor diff --git a/engine/options_menu.asm b/engine/options_menu.asm index 68c1883ee..ec41288ff 100755 --- a/engine/options_menu.asm +++ b/engine/options_menu.asm @@ -90,7 +90,7 @@ GetOptionPointer: ; e42d6 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: diff --git a/engine/pack.asm b/engine/pack.asm index 19b7fccbf..8a63d22e5 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -23,7 +23,7 @@ Pack: ; 10000 ld a, [wJumptableIndex] ld hl, .Jumptable call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10030 @@ -144,7 +144,7 @@ Pack: ; 10000 ld a, [wMenuCursorY] dec a call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10124 (4:4124) .MenuDataHeader1: ; 0x10124 @@ -306,7 +306,7 @@ Pack: ; 10000 ld a, [wMenuCursorY] dec a call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10249 (4:4249) MenuDataHeader_UsableKeyItem: ; 0x10249 @@ -689,7 +689,7 @@ BattlePack: ; 10493 ld a, [wJumptableIndex] ld hl, .Jumptable call Pack_GetJumptablePointer - jp [hl] + jp hl ; 104c3 @@ -846,7 +846,7 @@ TMHMSubmenu: ; 105dc (4:45dc) ld a, [wMenuCursorY] dec a call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10601 (4:4601) .UsableMenuDataHeader: ; 0x10601 @@ -997,7 +997,7 @@ DepositSellPack: ; 106be ld a, [wJumptableIndex] ld hl, .Jumptable call Pack_GetJumptablePointer - jp [hl] + jp hl ; 106d1 @@ -1144,7 +1144,7 @@ TutorialPack: ; 107bb ld a, [wJumptableIndex] ld hl, .dw call Pack_GetJumptablePointer - jp [hl] + jp hl ; 107e1 diff --git a/engine/pokedex.asm b/engine/pokedex.asm index e61a24964..569bdbb0b 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -182,7 +182,7 @@ Pokedex_RunJumptable: ; 4010b ld a, [wJumptableIndex] ld hl, .Jumptable call Pokedex_LoadPointer - jp [hl] + jp hl .Jumptable: ; 40115 (10:4115) @@ -366,7 +366,7 @@ Pokedex_UpdateDexEntryScreen: ; 40258 (10:4258) 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 @@ Pokedex_UpdateOptionScreen: ; 403be (10:43be) ld a, [wDexArrowCursorPosIndex] ld hl, .MenuActionJumptable call Pokedex_LoadPointer - jp [hl] + jp hl .return_to_main_screen call Pokedex_BlackOutBG @@ -647,7 +647,7 @@ Pokedex_UpdateSearchScreen: ; 40471 (10:4471) ld a, [wDexArrowCursorPosIndex] ld hl, .MenuActionJumptable call Pokedex_LoadPointer - jp [hl] + jp hl .cancel call Pokedex_BlackOutBG @@ -1621,7 +1621,7 @@ Pokedex_OrderMonsByMode: ; 40bdc ld a, [wCurrentDexMode] ld hl, .Jumptable call Pokedex_LoadPointer - jp [hl] + jp hl .Jumptable: ; 40bf0 (10:4bf0) diff --git a/engine/pokegear.asm b/engine/pokegear.asm index d180ee875..c6ea8ed4f 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -235,7 +235,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8) ld l, a ld de, .return_from_jumptable push de - jp [hl] + jp hl .return_from_jumptable call Pokegear_FinishTilemap @@ -431,7 +431,7 @@ PokegearJumptable: ; 90f04 (24:4f04) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 90f13 (24:4f13) dw PokegearClock_Init @@ -1217,7 +1217,7 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Cancel: ; 913f1 ld hl, PokegearText_WhomToCall @@ -1484,7 +1484,7 @@ UpdateRadioStation: ; 9166f (24:566f) ld l, a ld de, .returnafterstation push de - jp [hl] + jp hl .returnafterstation ld a, [wPokegearRadioChannelBank] @@ -2043,7 +2043,7 @@ PlayRadio: ; 91a53 ld l, a ld de, .jump_return push de - jp [hl] + jp hl .jump_return push de diff --git a/engine/printer/serial.asm b/engine/printer/serial.asm index da1c334ed..37ed2990b 100755 --- a/engine/printer/serial.asm +++ b/engine/printer/serial.asm @@ -26,7 +26,7 @@ PrinterJumptableIteration: ; 84022 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 84031 @@ -468,7 +468,7 @@ _PrinterReceive:: ; 842db ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 842ea diff --git a/engine/radio.asm b/engine/radio.asm index ce3bc7942..99408af48 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -25,7 +25,7 @@ PlayRadioShow: ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl RadioJumptable: dw OaksPkmnTalk1 ; $00 diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index ea842ea9c..93be28d9a 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -796,7 +796,7 @@ Function92bd4: ; 92bd4 (24:6bd4) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 92be4 (24:6be4) @@ -1311,7 +1311,7 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94 ld l, a ld de, .return push de - jp [hl] + jp hl .return ld a, [wFirstTwoReelsMatching] @@ -1422,7 +1422,7 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d ld l, a ld de, .return push de - jp [hl] + jp hl .return ld a, [wSlotMatched] @@ -1855,7 +1855,7 @@ SlotPayoutText: ; 93158 (24:7158) ld l, a ld de, .return push de - jp [hl] + jp hl .return ld hl, .Text_PrintPayout @@ -1958,7 +1958,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 9322d (24:722d) @@ -2059,7 +2059,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 932bc (24:72bc) diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 0e25cafdf..a8755b832 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -9,7 +9,7 @@ DoAnimFrame: ; 8d24b ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8d25b .Jumptable: ; 8d25b (23:525b) @@ -134,7 +134,7 @@ DoAnimFrame: ; 8d24b .four ; 8d302 (23:5302) call .AnonymousJumptable - jp [hl] + jp hl ; 8d306 (23:5306) ; Anonymous dw (see .AnonymousJumptable) @@ -418,7 +418,7 @@ DoAnimFrame: ; 8d24b .sixteen ; 8d483 (23:5483) call .AnonymousJumptable - jp [hl] + jp hl ; 8d487 (23:5487) ; Anonymous dw (see .AnonymousJumptable) diff --git a/engine/startmenu.asm b/engine/startmenu.asm index fa61d99cb..a935b8a07 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -55,7 +55,7 @@ StartMenu:: ; 125cd ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .MenuReturns: dw .Reopen @@ -227,7 +227,7 @@ StartMenu:: ; 125cd ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 127ef .MenuString: ; 127ef @@ -701,7 +701,7 @@ PokemonActionSubmenu: ; 12a88 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .nothing ld a, 0 diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index e9b19c6f7..263a83fc1 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -250,7 +250,7 @@ GetTimePalette: ; 8c117 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8c126 .TimePalettes: diff --git a/engine/trade/animation.asm b/engine/trade/animation.asm index d90f45a82..fa351ba3d 100755 --- a/engine/trade/animation.asm +++ b/engine/trade/animation.asm @@ -232,7 +232,7 @@ DoTradeAnimation: ; 29082 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 290af .JumpTable: ; 290af @@ -549,7 +549,7 @@ TradeAnim_TubeAnimJumptable: ; 29281 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 2928f .Jumptable: ; 2928f @@ -1173,7 +1173,7 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 29686 .Jumptable: ; 29686 (a:5686) diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index 8d46a02a6..a1fed2520 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -183,7 +183,7 @@ UnownPuzzleJumptable: ; e12ca ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e12d9 .Jumptable: ; e12d9 diff --git a/event/field_moves.asm b/event/field_moves.asm index c1b3bc236..82660da2f 100755 --- a/event/field_moves.asm +++ b/event/field_moves.asm @@ -169,7 +169,7 @@ OWCutJumptable: ; 8ca0c ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8ca1b diff --git a/event/magnet_train.asm b/event/magnet_train.asm index ccc41a59d..75bd12cd7 100755 --- a/event/magnet_train.asm +++ b/event/magnet_train.asm @@ -299,7 +299,7 @@ MagnetTrain_Jumptable: ; 8cdf7 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8ce06 .Jumptable: ; 8ce06 diff --git a/event/mom.asm b/event/mom.asm index 4002f69d2..80513e5fb 100644 --- a/event/mom.asm +++ b/event/mom.asm @@ -28,7 +28,7 @@ Special_BankOfMom: ; 16218 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 16242 .dw ; 16242 diff --git a/gfx/mail.asm b/gfx/mail.asm index fa0736ca6..575fe9ef5 100755 --- a/gfx/mail.asm +++ b/gfx/mail.asm @@ -107,7 +107,7 @@ ReadAnyMail: ; b9237 ld de, .done pop bc push de - jp [hl] + jp hl .done ret ; b92f8 @@ -152,7 +152,7 @@ INCLUDE "home/sram.asm" ; Register aliases _hl_:: ; 2fec - jp [hl] + jp hl ; 2fed _de_:: ; 2fed diff --git a/home/farcall.asm b/home/farcall.asm index 944087465..27649f30e 100644 --- a/home/farcall.asm +++ b/home/farcall.asm @@ -50,5 +50,5 @@ ReturnFarCall:: ; 2d6e ; 2d82 FarJump_hl:: ; 2d82 - jp [hl] + jp hl ; 2d83 diff --git a/home/menu.asm b/home/menu.asm index 563ee9f99..53e4457e3 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -337,7 +337,7 @@ RunMenuItemPrintingFunction:: ; 1eda ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1eff InitMenuCursorAndButtonPermissions:: ; 1eff @@ -470,7 +470,7 @@ MenuJumptable:: ; 1fa7 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1fb1 GetMenuDataPointerTableEntry:: ; 1fb1 diff --git a/home/text.asm b/home/text.asm index a5ddf43c9..f7730319a 100644 --- a/home/text.asm +++ b/home/text.asm @@ -943,7 +943,7 @@ Text_START_ASM:: ; 14c9 bit 7, h jr nz, .not_rom - jp [hl] + jp hl .not_rom ld a, "@" diff --git a/items/item_effects.asm b/items/item_effects.asm index 7061909f6..c13568a5d 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -263,7 +263,7 @@ ParkBall: ; e8a2 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] diff --git a/macros.asm b/macros.asm index c4fd73b3e..13aff261d 100644 --- a/macros.asm +++ b/macros.asm @@ -281,7 +281,7 @@ jumptable: MACRO ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl endm maskbits: macro @@ -3214,7 +3214,7 @@ CatchTutorial:: ; 4e554 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .dw ; 4e564 (13:6564) dw .DudeTutorial diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm index 09c827146..4d996167f 100755 --- a/misc/battle_tower_5c.asm +++ b/misc/battle_tower_5c.asm @@ -222,7 +222,7 @@ _BattleTowerBattle: ; 17022c ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 170249 .dw ; 170249 @@ -692,7 +692,7 @@ Function1704e1: ; 1704e1 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 17051f .dw ; 17051f @@ -947,7 +947,7 @@ BattleTowerAction: ; 170687 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 170696 @@ -1443,7 +1443,7 @@ Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .invalid ld a, $5 diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index 14ef91e9d..b471ff013 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -2516,7 +2516,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: dw .zero diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm index e3a1a0375..952742ec1 100755 --- a/misc/gfx_41.asm +++ b/misc/gfx_41.asm @@ -240,7 +240,7 @@ CallInSafeGFXMode: ; 104177 ; 10419c ._hl_ ; 10419c - jp [hl] + jp hl ; 10419d diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index 60f9e6d66..d08bc8882 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -377,7 +377,7 @@ MobileTradeAnim_JumptableLoop: ; 10824b ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 10828a .Jumptable: ; 10828a diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 10242b77e..41f106211 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -146,7 +146,7 @@ Function114243:: ; 114243 ld h, [hl] ld l, a pop de - jp [hl] + jp hl ; 11425c @@ -5397,7 +5397,7 @@ Function11659d: ; 11659d ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1165af @@ -6931,7 +6931,7 @@ Function117719: ; 117719 (45:7719) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl Jumptable_117728: ; 117728 (45:7728) dw Function117738 @@ -7419,7 +7419,7 @@ Function117ae9: ; 0x117ae9 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 0x117af8 dw Function117b06 diff --git a/misc/mobile_45_sprite_engine.asm b/misc/mobile_45_sprite_engine.asm index d0183b2ca..57c45e43c 100755 --- a/misc/mobile_45_sprite_engine.asm +++ b/misc/mobile_45_sprite_engine.asm @@ -380,7 +380,7 @@ Function1161b8: ; 1161b8 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1161c7 diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 644989872..7d0003b13 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -5874,7 +5874,7 @@ Function11ad6e: ; 11ad6e ld a, [wJumptableIndex] ld hl, Jumptable_11ad78 call Function11b239 - jp [hl] + jp hl ; 11ad78 Jumptable_11ad78: ; 11ad78 diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index 5f72f32c7..ef9db89a8 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -373,7 +373,7 @@ Function171a36: ; 171a36 (5c:5a36) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl Jumptable_171a45: ; 171a45 (5c:5a45) dw Function171a95 diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 2ce71049f..47b85dcd8 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -1146,7 +1146,7 @@ Function17d711: ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl asm_17d721 call Function17e5af @@ -3746,7 +3746,7 @@ Function17f047: ; 17f047 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .finished scf diff --git a/predef/cgb.asm b/predef/cgb.asm index b0c3fdb46..5ac243963 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -25,7 +25,7 @@ Predef_LoadSGBLayoutCGB: ; 8d59 ld l, a ld de, .ReturnFromJumpTable push de - jp [hl] + jp hl ; 8d79 .ReturnFromJumpTable: ; 8d79 @@ -491,7 +491,7 @@ _CGB07: ; 9122 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 912d Jumptable_912d: ; 912d diff --git a/predef/crystal.asm b/predef/crystal.asm index 8f542e5dd..9aa0fbdf2 100755 --- a/predef/crystal.asm +++ b/predef/crystal.asm @@ -17,7 +17,7 @@ GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile) ld l, a ld de, .done push de - jp [hl] + jp hl .done ret ; 49330 (12:5330) diff --git a/predef/sgb.asm b/predef/sgb.asm index 65a09756d..1d8184cc2 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -20,7 +20,7 @@ Predef_LoadSGBLayout: ; 864c ld l, a ld de, .Finish push de - jp [hl] + jp hl ; 866f .Jumptable: ; 866f @@ -28,7 +28,7 @@ SECTION "rst28",ROM0[JumpTable] ld h, [hl] ld l, a pop de - jp [hl] + jp hl ; SECTION "rst30",ROM0[$30] ; rst30 is midst rst28 diff --git a/tilesets/animations.asm b/tilesets/animations.asm index a3b0c4f06..51f95129c 100644 --- a/tilesets/animations.asm +++ b/tilesets/animations.asm @@ -32,7 +32,7 @@ _AnimateTileset:: ; fc000 ld h, [hl] ld l, a - jp [hl] + jp hl ; fc01b Tileset00Anim: ; 0xfc01b diff --git a/trainers/read_party.asm b/trainers/read_party.asm index c74d4c6dc..9b7727a84 100755 --- a/trainers/read_party.asm +++ b/trainers/read_party.asm @@ -68,7 +68,7 @@ ReadTrainerParty: ; 39771 ld l, a ld bc, .done push bc - jp [hl] + jp hl .done jp ComputeTrainerReward |