pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Ben10do 2017-06-09 22:01:10 +01:00
parent fb154f5a6e
commit e6ea1889fb
No known key found for this signature in database
GPG Key ID: DFBC5B504E8D20B9
56 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/engine.asm
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

2
battle/ai/items.asm
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

2
battle/ai/redundant.asm
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

2
battle/anim_commands.asm
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

10
battle/bg_effects.asm
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

2
battle/core.asm
View File

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

2
battle/effect_commands.asm
View File

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

4
battle/objects/functions.asm
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

14
engine/billspc.asm
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

6
engine/card_flip.asm
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

2
engine/credits.asm
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

6
engine/crystal_intro.asm
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)

6
engine/debug.asm
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

2
engine/events.asm
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

4
engine/intro_menu.asm
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

2
engine/map_objects.asm
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

2
engine/mon_icons.asm
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

6
engine/namingscreen.asm
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

2
engine/options_menu.asm
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:

14
engine/pack.asm
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

Some files were not shown because too many files have changed in this diff Show More