Merge pull request #366 from Ben10do/fix-deprecation-warnings

Replace ‘jp [hl]’ with ‘jp hl’
This commit is contained in:
yenatch 2017-06-17 23:10:53 -04:00 committed by GitHub
commit 217b7b8d9b
56 changed files with 112 additions and 112 deletions

View File

@ -229,7 +229,7 @@ UpdateChannels: ; e8125
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.ChannelFnPtrs: .ChannelFnPtrs:
dw .Channel1 dw .Channel1
@ -1389,7 +1389,7 @@ ParseMusicCommand: ; e870f
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; e8720 ; e8720

View File

@ -211,7 +211,7 @@ AI_TryItem: ; 38105
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.callback .callback
pop de pop de
pop hl pop hl

View File

@ -11,7 +11,7 @@ AI_Redundant: ; 2c41a
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.Moves: ; 2c42c .Moves: ; 2c42c
dbw EFFECT_DREAM_EATER, .DreamEater dbw EFFECT_DREAM_EATER, .DreamEater

View File

@ -347,7 +347,7 @@ RunBattleAnimCommand: ; cc25f
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; cc2a4 ; cc2a4

View File

@ -75,7 +75,7 @@ DoBattleBGEffectFunction: ; c804a (32:404a)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
BattleBGEffects: ; c805a (32:405a) BattleBGEffects: ; c805a (32:405a)
dw BattleBGEffect_End dw BattleBGEffect_End
@ -161,7 +161,7 @@ BattleBGEffects_AnonJumptable: ; c80d7 (32:40d7)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
BattleBGEffects_IncrementJumptable: ; c80e5 (32:40e5) BattleBGEffects_IncrementJumptable: ; c80e5 (32:40e5)
ld hl, BG_EFFECT_STRUCT_JT_INDEX ld hl, BG_EFFECT_STRUCT_JT_INDEX
@ -2059,7 +2059,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
.cgb .cgb
ld de, .Jumptable ld de, .Jumptable
call BatttleBGEffects_GetNamedJumptablePointer call BatttleBGEffects_GetNamedJumptablePointer
jp [hl] jp hl
.Jumptable: .Jumptable:
dw .cgb_zero dw .cgb_zero
@ -2421,7 +2421,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
ld de, .Jumptable_DMG ld de, .Jumptable_DMG
call BatttleBGEffects_GetNamedJumptablePointer call BatttleBGEffects_GetNamedJumptablePointer
pop de pop de
jp [hl] jp hl
.Jumptable_DMG: .Jumptable_DMG:
dw .zero_dmg dw .zero_dmg
@ -2484,7 +2484,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
ld de, .Jumptable_CGB ld de, .Jumptable_CGB
call BatttleBGEffects_GetNamedJumptablePointer call BatttleBGEffects_GetNamedJumptablePointer
pop de pop de
jp [hl] jp hl
.Jumptable_CGB: ; c8ddd (32:4ddd) .Jumptable_CGB: ; c8ddd (32:4ddd)
dw .zero_cgb dw .zero_cgb

View File

@ -4331,7 +4331,7 @@ SpikesDamage: ; 3dc23
jp WaitBGMap jp WaitBGMap
.hl .hl
jp [hl] jp hl
; 3dc5b ; 3dc5b
PursuitSwitch: ; 3dc5b PursuitSwitch: ; 3dc5b

View File

@ -113,7 +113,7 @@ DoMove: ; 3402c
jr .ReadMoveEffectCommand jr .ReadMoveEffectCommand
.DoMoveEffectCommand: .DoMoveEffectCommand:
jp [hl] jp hl
; 34084 ; 34084

View File

@ -9,7 +9,7 @@ DoBattleAnimFrame: ; ccfbe
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; ccfce ; ccfce
.Jumptable: .Jumptable:
@ -4085,7 +4085,7 @@ BattleAnim_AnonJumptable: ; ce71e (33:671e)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
BattleAnim_IncAnonJumptableIndex: ; ce72c (33:672c) BattleAnim_IncAnonJumptableIndex: ; ce72c (33:672c)
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX

View File

@ -39,7 +39,7 @@ _DepositPKMN: ; e2391 (38:6391)
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
ld hl, .Jumptable ld hl, .Jumptable
call BillsPC_Jumptable call BillsPC_Jumptable
jp [hl] jp hl
.Jumptable: ; e23df (38:63df) .Jumptable: ; e23df (38:63df)
@ -147,7 +147,7 @@ _DepositPKMN: ; e2391 (38:6391)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
BillsPCDepositJumptable: ; e24a1 (38:64a1) BillsPCDepositJumptable: ; e24a1 (38:64a1)
@ -306,7 +306,7 @@ _WithdrawPKMN: ; e2583 (38:6583)
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
ld hl, .Jumptable ld hl, .Jumptable
call BillsPC_Jumptable call BillsPC_Jumptable
jp [hl] jp hl
.Jumptable: ; e25d2 (38:65d2) .Jumptable: ; e25d2 (38:65d2)
@ -415,7 +415,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.dw ; e2699 (38:6699) #mark .dw ; e2699 (38:6699) #mark
dw .withdraw ; Withdraw dw .withdraw ; Withdraw
@ -556,7 +556,7 @@ _MovePKMNWithoutMail: ; e2759
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
ld hl, .Jumptable ld hl, .Jumptable
call BillsPC_Jumptable call BillsPC_Jumptable
jp [hl] jp hl
; e27ac ; e27ac
.Jumptable: ; e27ac .Jumptable: ; e27ac
@ -678,7 +678,7 @@ _MovePKMNWithoutMail: ; e2759
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; e2881 ; e2881
.Jumptable2: ; e2881 .Jumptable2: ; e2881
@ -2014,7 +2014,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
ld l, a ld l, a
ld de, .dw_return ld de, .dw_return
push de push de
jp [hl] jp hl
; e322a ; e322a
.dw_return ; e322a .dw_return ; e322a

View File

@ -76,7 +76,7 @@ _CardFlip: ; e00ee (38:40ee)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; e01a0 (38:41a0) ; e01a0 (38:41a0)
.Jumptable: ; e01a0 .Jumptable: ; e01a0
@ -652,7 +652,7 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; e0553 ; e0553
.Jumptable: ; e0553 .Jumptable: ; e0553
@ -829,7 +829,7 @@ CardFlip_CheckWinCondition: ; e0637
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; e0643 ; e0643
.Jumptable: ; e0643 .Jumptable: ; e0643

View File

@ -263,7 +263,7 @@ Credits_Jumptable: ; 109926
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 109937 ; 109937

View File

@ -125,7 +125,7 @@ PlaceGameFreakPresents: ; e4670
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; e467f ; e467f
.dw ; e467f .dw ; e467f
@ -222,7 +222,7 @@ GameFreakLogoJumper: ; e46ed (39:46ed)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
GameFreakLogoScenes: ; e46fd (39:46fd) GameFreakLogoScenes: ; e46fd (39:46fd)
dw GameFreakLogoScene1 dw GameFreakLogoScene1
@ -438,7 +438,7 @@ IntroSceneJumper: ; e490f
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; e491e ; e491e
IntroScenes: ; e491e (39:491e) IntroScenes: ; e491e (39:491e)

View File

@ -305,7 +305,7 @@ Function81a74: ; 81a74
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.asm_81a9a .asm_81a9a
call Function81eca call Function81eca
@ -611,7 +611,7 @@ Function81cc2: ; 81cc2
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.asm_81cdf .asm_81cdf
ld a, $4 ld a, $4
@ -1353,7 +1353,7 @@ Function822f0: ; 822f0
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 82301 ; 82301
.dw ; 82301 .dw ; 82301

View File

@ -609,7 +609,7 @@ TryObjectEvent: ; 969b5
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.nope_bugged .nope_bugged
; pop bc ; pop bc

View File

@ -1064,7 +1064,7 @@ StartTitleScreen: ; 6219
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 626a ; 626a
.dw .dw
@ -1117,7 +1117,7 @@ TitleScreenScene: ; 62a3
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 62af ; 62af
.scenes .scenes

View File

@ -1955,7 +1955,7 @@ JumpMovementPointer: ; 505e
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 5065 ; 5065
ContinueReadingMovement: ; 5065 ContinueReadingMovement: ; 5065

View File

@ -33,7 +33,7 @@ LoadMenuMonIcon: ; 8e83f
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 8e854 ; 8e854

View File

@ -70,7 +70,7 @@ NamingScreen: ; 116c1
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 1172e ; 1172e
@ -405,7 +405,7 @@ NamingScreenJoypadLoop: ; 11915
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 11977 ; 11977
@ -1166,7 +1166,7 @@ INCBIN "gfx/icon/mail2.2bpp"
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.Jumptable: ; 12017 (4:6017) .Jumptable: ; 12017 (4:6017)
dw .init_blinking_cursor dw .init_blinking_cursor

View File

@ -90,7 +90,7 @@ GetOptionPointer: ; e42d6
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a 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 ; e42e5
.Pointers: .Pointers:

View File

@ -23,7 +23,7 @@ Pack: ; 10000
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
ld hl, .Jumptable ld hl, .Jumptable
call Pack_GetJumptablePointer call Pack_GetJumptablePointer
jp [hl] jp hl
; 10030 ; 10030
@ -144,7 +144,7 @@ Pack: ; 10000
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
dec a dec a
call Pack_GetJumptablePointer call Pack_GetJumptablePointer
jp [hl] jp hl
; 10124 (4:4124) ; 10124 (4:4124)
.MenuDataHeader1: ; 0x10124 .MenuDataHeader1: ; 0x10124
@ -306,7 +306,7 @@ Pack: ; 10000
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
dec a dec a
call Pack_GetJumptablePointer call Pack_GetJumptablePointer
jp [hl] jp hl
; 10249 (4:4249) ; 10249 (4:4249)
MenuDataHeader_UsableKeyItem: ; 0x10249 MenuDataHeader_UsableKeyItem: ; 0x10249
@ -689,7 +689,7 @@ BattlePack: ; 10493
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
ld hl, .Jumptable ld hl, .Jumptable
call Pack_GetJumptablePointer call Pack_GetJumptablePointer
jp [hl] jp hl
; 104c3 ; 104c3
@ -846,7 +846,7 @@ TMHMSubmenu: ; 105dc (4:45dc)
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
dec a dec a
call Pack_GetJumptablePointer call Pack_GetJumptablePointer
jp [hl] jp hl
; 10601 (4:4601) ; 10601 (4:4601)
.UsableMenuDataHeader: ; 0x10601 .UsableMenuDataHeader: ; 0x10601
@ -997,7 +997,7 @@ DepositSellPack: ; 106be
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
ld hl, .Jumptable ld hl, .Jumptable
call Pack_GetJumptablePointer call Pack_GetJumptablePointer
jp [hl] jp hl
; 106d1 ; 106d1
@ -1144,7 +1144,7 @@ TutorialPack: ; 107bb
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
ld hl, .dw ld hl, .dw
call Pack_GetJumptablePointer call Pack_GetJumptablePointer
jp [hl] jp hl
; 107e1 ; 107e1

View File

@ -182,7 +182,7 @@ Pokedex_RunJumptable: ; 4010b
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
ld hl, .Jumptable ld hl, .Jumptable
call Pokedex_LoadPointer call Pokedex_LoadPointer
jp [hl] jp hl
.Jumptable: ; 40115 (10:4115) .Jumptable: ; 40115 (10:4115)
@ -366,7 +366,7 @@ Pokedex_UpdateDexEntryScreen: ; 40258 (10:4258)
ld a, [wDexArrowCursorPosIndex] ld a, [wDexArrowCursorPosIndex]
ld hl, DexEntryScreen_MenuActionJumptable ld hl, DexEntryScreen_MenuActionJumptable
call Pokedex_LoadPointer call Pokedex_LoadPointer
jp [hl] jp hl
.return_to_prev_screen .return_to_prev_screen
ld a, [LastVolume] ld a, [LastVolume]
@ -545,7 +545,7 @@ Pokedex_UpdateOptionScreen: ; 403be (10:43be)
ld a, [wDexArrowCursorPosIndex] ld a, [wDexArrowCursorPosIndex]
ld hl, .MenuActionJumptable ld hl, .MenuActionJumptable
call Pokedex_LoadPointer call Pokedex_LoadPointer
jp [hl] jp hl
.return_to_main_screen .return_to_main_screen
call Pokedex_BlackOutBG call Pokedex_BlackOutBG
@ -647,7 +647,7 @@ Pokedex_UpdateSearchScreen: ; 40471 (10:4471)
ld a, [wDexArrowCursorPosIndex] ld a, [wDexArrowCursorPosIndex]
ld hl, .MenuActionJumptable ld hl, .MenuActionJumptable
call Pokedex_LoadPointer call Pokedex_LoadPointer
jp [hl] jp hl
.cancel .cancel
call Pokedex_BlackOutBG call Pokedex_BlackOutBG
@ -1621,7 +1621,7 @@ Pokedex_OrderMonsByMode: ; 40bdc
ld a, [wCurrentDexMode] ld a, [wCurrentDexMode]
ld hl, .Jumptable ld hl, .Jumptable
call Pokedex_LoadPointer call Pokedex_LoadPointer
jp [hl] jp hl
.Jumptable: ; 40bf0 (10:4bf0) .Jumptable: ; 40bf0 (10:4bf0)

View File

@ -235,7 +235,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
ld l, a ld l, a
ld de, .return_from_jumptable ld de, .return_from_jumptable
push de push de
jp [hl] jp hl
.return_from_jumptable .return_from_jumptable
call Pokegear_FinishTilemap call Pokegear_FinishTilemap
@ -431,7 +431,7 @@ PokegearJumptable: ; 90f04 (24:4f04)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.Jumptable: ; 90f13 (24:4f13) .Jumptable: ; 90f13 (24:4f13)
dw PokegearClock_Init dw PokegearClock_Init
@ -1217,7 +1217,7 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.Cancel: ; 913f1 .Cancel: ; 913f1
ld hl, PokegearText_WhomToCall ld hl, PokegearText_WhomToCall
@ -1484,7 +1484,7 @@ UpdateRadioStation: ; 9166f (24:566f)
ld l, a ld l, a
ld de, .returnafterstation ld de, .returnafterstation
push de push de
jp [hl] jp hl
.returnafterstation .returnafterstation
ld a, [wPokegearRadioChannelBank] ld a, [wPokegearRadioChannelBank]
@ -2043,7 +2043,7 @@ PlayRadio: ; 91a53
ld l, a ld l, a
ld de, .jump_return ld de, .jump_return
push de push de
jp [hl] jp hl
.jump_return .jump_return
push de push de

View File

@ -26,7 +26,7 @@ PrinterJumptableIteration: ; 84022
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 84031 ; 84031
@ -468,7 +468,7 @@ _PrinterReceive:: ; 842db
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 842ea ; 842ea

View File

@ -25,7 +25,7 @@ PlayRadioShow:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
RadioJumptable: RadioJumptable:
dw OaksPkmnTalk1 ; $00 dw OaksPkmnTalk1 ; $00

View File

@ -796,7 +796,7 @@ Function92bd4: ; 92bd4 (24:6bd4)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 92be4 (24:6be4) ; 92be4 (24:6be4)
@ -1311,7 +1311,7 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94
ld l, a ld l, a
ld de, .return ld de, .return
push de push de
jp [hl] jp hl
.return .return
ld a, [wFirstTwoReelsMatching] ld a, [wFirstTwoReelsMatching]
@ -1422,7 +1422,7 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d
ld l, a ld l, a
ld de, .return ld de, .return
push de push de
jp [hl] jp hl
.return .return
ld a, [wSlotMatched] ld a, [wSlotMatched]
@ -1855,7 +1855,7 @@ SlotPayoutText: ; 93158 (24:7158)
ld l, a ld l, a
ld de, .return ld de, .return
push de push de
jp [hl] jp hl
.return .return
ld hl, .Text_PrintPayout ld hl, .Text_PrintPayout
@ -1958,7 +1958,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.Jumptable: ; 9322d (24:722d) .Jumptable: ; 9322d (24:722d)
@ -2059,7 +2059,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.Jumptable: ; 932bc (24:72bc) .Jumptable: ; 932bc (24:72bc)

View File

@ -9,7 +9,7 @@ DoAnimFrame: ; 8d24b
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 8d25b ; 8d25b
.Jumptable: ; 8d25b (23:525b) .Jumptable: ; 8d25b (23:525b)
@ -134,7 +134,7 @@ DoAnimFrame: ; 8d24b
.four ; 8d302 (23:5302) .four ; 8d302 (23:5302)
call .AnonymousJumptable call .AnonymousJumptable
jp [hl] jp hl
; 8d306 (23:5306) ; 8d306 (23:5306)
; Anonymous dw (see .AnonymousJumptable) ; Anonymous dw (see .AnonymousJumptable)
@ -418,7 +418,7 @@ DoAnimFrame: ; 8d24b
.sixteen ; 8d483 (23:5483) .sixteen ; 8d483 (23:5483)
call .AnonymousJumptable call .AnonymousJumptable
jp [hl] jp hl
; 8d487 (23:5487) ; 8d487 (23:5487)
; Anonymous dw (see .AnonymousJumptable) ; Anonymous dw (see .AnonymousJumptable)

View File

@ -55,7 +55,7 @@ StartMenu:: ; 125cd
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.MenuReturns: .MenuReturns:
dw .Reopen dw .Reopen
@ -227,7 +227,7 @@ StartMenu:: ; 125cd
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 127ef ; 127ef
.MenuString: ; 127ef .MenuString: ; 127ef
@ -701,7 +701,7 @@ PokemonActionSubmenu: ; 12a88
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.nothing .nothing
ld a, 0 ld a, 0

View File

@ -250,7 +250,7 @@ GetTimePalette: ; 8c117
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 8c126 ; 8c126
.TimePalettes: .TimePalettes:

View File

@ -232,7 +232,7 @@ DoTradeAnimation: ; 29082
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 290af ; 290af
.JumpTable: ; 290af .JumpTable: ; 290af
@ -549,7 +549,7 @@ TradeAnim_TubeAnimJumptable: ; 29281
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 2928f ; 2928f
.Jumptable: ; 2928f .Jumptable: ; 2928f
@ -1173,7 +1173,7 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 29686 ; 29686
.Jumptable: ; 29686 (a:5686) .Jumptable: ; 29686 (a:5686)

View File

@ -183,7 +183,7 @@ UnownPuzzleJumptable: ; e12ca
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; e12d9 ; e12d9
.Jumptable: ; e12d9 .Jumptable: ; e12d9

View File

@ -169,7 +169,7 @@ OWCutJumptable: ; 8ca0c
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 8ca1b ; 8ca1b

View File

@ -299,7 +299,7 @@ MagnetTrain_Jumptable: ; 8cdf7
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 8ce06 ; 8ce06
.Jumptable: ; 8ce06 .Jumptable: ; 8ce06

View File

@ -28,7 +28,7 @@ Special_BankOfMom: ; 16218
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 16242 ; 16242
.dw ; 16242 .dw ; 16242

View File

@ -107,7 +107,7 @@ ReadAnyMail: ; b9237
ld de, .done ld de, .done
pop bc pop bc
push de push de
jp [hl] jp hl
.done .done
ret ret
; b92f8 ; b92f8

View File

@ -152,7 +152,7 @@ INCLUDE "home/sram.asm"
; Register aliases ; Register aliases
_hl_:: ; 2fec _hl_:: ; 2fec
jp [hl] jp hl
; 2fed ; 2fed
_de_:: ; 2fed _de_:: ; 2fed

View File

@ -50,5 +50,5 @@ ReturnFarCall:: ; 2d6e
; 2d82 ; 2d82
FarJump_hl:: ; 2d82 FarJump_hl:: ; 2d82
jp [hl] jp hl
; 2d83 ; 2d83

View File

@ -337,7 +337,7 @@ RunMenuItemPrintingFunction:: ; 1eda
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 1eff ; 1eff
InitMenuCursorAndButtonPermissions:: ; 1eff InitMenuCursorAndButtonPermissions:: ; 1eff
@ -470,7 +470,7 @@ MenuJumptable:: ; 1fa7
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 1fb1 ; 1fb1
GetMenuDataPointerTableEntry:: ; 1fb1 GetMenuDataPointerTableEntry:: ; 1fb1

View File

@ -943,7 +943,7 @@ Text_START_ASM:: ; 14c9
bit 7, h bit 7, h
jr nz, .not_rom jr nz, .not_rom
jp [hl] jp hl
.not_rom .not_rom
ld a, "@" ld a, "@"

View File

@ -263,7 +263,7 @@ ParkBall: ; e8a2
ld l, a ld l, a
ld de, .skip_or_return_from_ball_fn ld de, .skip_or_return_from_ball_fn
push de push de
jp [hl] jp hl
.skip_or_return_from_ball_fn .skip_or_return_from_ball_fn
ld a, [CurItem] ld a, [CurItem]

View File

@ -281,7 +281,7 @@ jumptable: MACRO
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
endm endm
maskbits: macro maskbits: macro

View File

@ -3214,7 +3214,7 @@ CatchTutorial:: ; 4e554
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.dw ; 4e564 (13:6564) .dw ; 4e564 (13:6564)
dw .DudeTutorial dw .DudeTutorial

View File

@ -222,7 +222,7 @@ _BattleTowerBattle: ; 17022c
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 170249 ; 170249
.dw ; 170249 .dw ; 170249
@ -692,7 +692,7 @@ Function1704e1: ; 1704e1
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 17051f ; 17051f
.dw ; 17051f .dw ; 17051f
@ -947,7 +947,7 @@ BattleTowerAction: ; 170687
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 170696 ; 170696
@ -1443,7 +1443,7 @@ Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.invalid .invalid
ld a, $5 ld a, $5

View File

@ -2516,7 +2516,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.Jumptable: .Jumptable:
dw .zero dw .zero

View File

@ -240,7 +240,7 @@ CallInSafeGFXMode: ; 104177
; 10419c ; 10419c
._hl_ ; 10419c ._hl_ ; 10419c
jp [hl] jp hl
; 10419d ; 10419d

View File

@ -377,7 +377,7 @@ MobileTradeAnim_JumptableLoop: ; 10824b
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 10828a ; 10828a
.Jumptable: ; 10828a .Jumptable: ; 10828a

View File

@ -146,7 +146,7 @@ Function114243:: ; 114243
ld h, [hl] ld h, [hl]
ld l, a ld l, a
pop de pop de
jp [hl] jp hl
; 11425c ; 11425c
@ -5397,7 +5397,7 @@ Function11659d: ; 11659d
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 1165af ; 1165af
@ -6931,7 +6931,7 @@ Function117719: ; 117719 (45:7719)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
Jumptable_117728: ; 117728 (45:7728) Jumptable_117728: ; 117728 (45:7728)
dw Function117738 dw Function117738
@ -7419,7 +7419,7 @@ Function117ae9: ; 0x117ae9
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.Jumptable: ; 0x117af8 .Jumptable: ; 0x117af8
dw Function117b06 dw Function117b06

View File

@ -380,7 +380,7 @@ Function1161b8: ; 1161b8
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 1161c7 ; 1161c7

View File

@ -5874,7 +5874,7 @@ Function11ad6e: ; 11ad6e
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
ld hl, Jumptable_11ad78 ld hl, Jumptable_11ad78
call Function11b239 call Function11b239
jp [hl] jp hl
; 11ad78 ; 11ad78
Jumptable_11ad78: ; 11ad78 Jumptable_11ad78: ; 11ad78

View File

@ -373,7 +373,7 @@ Function171a36: ; 171a36 (5c:5a36)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
Jumptable_171a45: ; 171a45 (5c:5a45) Jumptable_171a45: ; 171a45 (5c:5a45)
dw Function171a95 dw Function171a95

View File

@ -1146,7 +1146,7 @@ Function17d711:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
asm_17d721 asm_17d721
call Function17e5af call Function17e5af
@ -3746,7 +3746,7 @@ Function17f047: ; 17f047
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
.finished .finished
scf scf

View File

@ -25,7 +25,7 @@ Predef_LoadSGBLayoutCGB: ; 8d59
ld l, a ld l, a
ld de, .ReturnFromJumpTable ld de, .ReturnFromJumpTable
push de push de
jp [hl] jp hl
; 8d79 ; 8d79
.ReturnFromJumpTable: ; 8d79 .ReturnFromJumpTable: ; 8d79
@ -491,7 +491,7 @@ _CGB07: ; 9122
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; 912d ; 912d
Jumptable_912d: ; 912d Jumptable_912d: ; 912d

View File

@ -17,7 +17,7 @@ GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile)
ld l, a ld l, a
ld de, .done ld de, .done
push de push de
jp [hl] jp hl
.done .done
ret ret
; 49330 (12:5330) ; 49330 (12:5330)

View File

@ -20,7 +20,7 @@ Predef_LoadSGBLayout: ; 864c
ld l, a ld l, a
ld de, .Finish ld de, .Finish
push de push de
jp [hl] jp hl
; 866f ; 866f
.Jumptable: ; 866f .Jumptable: ; 866f

View File

@ -28,7 +28,7 @@ SECTION "rst28",ROM0[JumpTable]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
pop de pop de
jp [hl] jp hl
; SECTION "rst30",ROM0[$30] ; SECTION "rst30",ROM0[$30]
; rst30 is midst rst28 ; rst30 is midst rst28

View File

@ -32,7 +32,7 @@ _AnimateTileset:: ; fc000
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; fc01b ; fc01b
Tileset00Anim: ; 0xfc01b Tileset00Anim: ; 0xfc01b

View File

@ -68,7 +68,7 @@ ReadTrainerParty: ; 39771
ld l, a ld l, a
ld bc, .done ld bc, .done
push bc push bc
jp [hl] jp hl
.done .done
jp ComputeTrainerReward jp ComputeTrainerReward