summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPokechu22 <Pokechu022@gmail.com>2017-09-25 19:18:33 -0700
committerPokechu22 <Pokechu022@gmail.com>2017-09-25 19:18:33 -0700
commit78b6f1a613913536789fe1bcc91b95d6cca54ae9 (patch)
tree9ade0c53b1a5e11e059e7be6d44e35eb13e6c4f5
parent1ce6731d98388ecacf94036cd26d0125eebbb943 (diff)
Fix warnings about deprecated mnemonics on newer builds of rgbds
-rwxr-xr-xengine/animated_objects_3e.asm2
-rwxr-xr-xengine/battle/animations.asm8
-rw-r--r--engine/battle/battle_transitions.asm2
-rwxr-xr-xengine/battle/core.asm6
-rw-r--r--engine/battle/trainer_ai.asm4
-rwxr-xr-xengine/cable_club.asm2
-rwxr-xr-xengine/items/items.asm2
-rwxr-xr-xengine/menu/start_sub_menus.asm2
-rw-r--r--engine/menu/text_ids2.asm2
-rw-r--r--engine/overworld/check_player_state.asm2
-rwxr-xr-xengine/overworld/ssanne.asm2
-rwxr-xr-xengine/palettes.asm2
-rwxr-xr-xengine/pikachu_movement.asm4
-rwxr-xr-xengine/printer/serial.asm4
-rwxr-xr-xengine/slot_machine.asm2
-rwxr-xr-xengine/surfing_minigame.asm6
-rwxr-xr-xengine/titlescreen.asm2
-rwxr-xr-xengine/trade.asm2
-rwxr-xr-xengine/unknown_ea3ea.asm8
-rwxr-xr-xengine/yellow_intro.asm4
-rw-r--r--home.asm4
-rw-r--r--home/overworld.asm2
-rw-r--r--home/predef.asm2
23 files changed, 38 insertions, 38 deletions
diff --git a/engine/animated_objects_3e.asm b/engine/animated_objects_3e.asm
index 63a94350..2373e19e 100755
--- a/engine/animated_objects_3e.asm
+++ b/engine/animated_objects_3e.asm
@@ -391,4 +391,4 @@ ExecuteCurrentAnimatedObjectCallback:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 8c095daf..629aa8cd 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -240,7 +240,7 @@ PlayAnimation:
ld h, a
ld de, .nextAnimationCommand
push de
- jp [hl] ; jump to special effect function
+ jp hl ; jump to special effect function
.playSubanimation
ld c, a
and a, %00111111
@@ -481,7 +481,7 @@ PlayApplyingAttackAnimation:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
AnimationTypePointerTable:
dw ShakeScreenVertically ; enemy mon has used a damaging move without a side effect
@@ -690,7 +690,7 @@ DoSpecialEffectByAnimationId:
ld l, a
ld de, .done
push de
- jp [hl]
+ jp hl
.done
pop bc
pop de
@@ -1129,7 +1129,7 @@ CallWithTurnFlipped:
ld [H_WHOSETURN], a
ld de, .returnAddress
push de
- jp [hl]
+ jp hl
.returnAddress
pop af
ld [H_WHOSETURN], a
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm
index 2f3e4e91..ec95a5d9 100644
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -62,7 +62,7 @@ BattleTransition:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; the three GetBattleTransitionID functions set the first
; three bits of c, which determines what transition animation
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index fbbe144b..f23dd649 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -3307,7 +3307,7 @@ ExecutePlayerMove:
jp z, ExecutePlayerMoveDone
call CheckPlayerStatusConditions
jr nz, .playerHasNoSpecialCondition
- jp [hl]
+ jp hl
.playerHasNoSpecialCondition
call GetCurrentMove
ld hl, wPlayerBattleStatus1
@@ -5855,7 +5855,7 @@ ExecuteEnemyMove:
ld [wDamageMultipliers], a
call CheckEnemyStatusConditions
jr nz, .enemyHasNoSpecialConditions
- jp [hl]
+ jp hl
.enemyHasNoSpecialConditions
ld hl, wEnemyBattleStatus1
bit ChargingUp, [hl] ; is the enemy charging up for attack?
@@ -7024,7 +7024,7 @@ _JumpMoveEffect:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl] ; jump to special effect handler
+ jp hl ; jump to special effect handler
MoveEffectPointerTable:
dw SleepEffect ; unused effect
diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm
index 2f2c46a6..f4e50562 100644
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -51,7 +51,7 @@ AIEnemyTrainerChooseMoves:
ld l, a
ld de, .nextMoveChoiceModification ; set return address
push de
- jp [hl] ; execute modification function
+ jp hl ; execute modification function
.loopFindMinimumEntries ; all entries will be decremented sequentially until one of them is zero
ld hl, wBuffer ; temp move selection array
ld de, wEnemyMonMoves ; enemy moves
@@ -372,7 +372,7 @@ TrainerAI:
ld h,[hl]
ld l,a
call Random
- jp [hl]
+ jp hl
.done
and a
ret
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index 88f7b2f7..79b5e858 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -309,7 +309,7 @@ CallCurrentTradeCenterFunction:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
TradeCenter_SelectMon:
call ClearScreen
diff --git a/engine/items/items.asm b/engine/items/items.asm
index 984cc381..8cce45f0 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -13,7 +13,7 @@ UseItem_:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
ItemUsePtrTable:
dw ItemUseBall ; MASTER_BALL
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index f3ba8207..a93fb2e3 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -118,7 +118,7 @@ StartMenu_Pokemon:
ld h,[hl]
ld l,a
ld a,[wObtainedBadges] ; badges obtained
- jp [hl]
+ jp hl
.outOfBattleMovePointers
dw .cut
dw .fly
diff --git a/engine/menu/text_ids2.asm b/engine/menu/text_ids2.asm
index e23ae707..b22c9507 100644
--- a/engine/menu/text_ids2.asm
+++ b/engine/menu/text_ids2.asm
@@ -24,7 +24,7 @@ DisplayTextBoxID_:
ld l,a ; hl = address of function
ld de,.done
push de
- jp [hl] ; jump to the function
+ jp hl ; jump to the function
.coordTableMatch
call GetTextBoxIDCoords
call GetAddressOfScreenCoords
diff --git a/engine/overworld/check_player_state.asm b/engine/overworld/check_player_state.asm
index b1951de0..b3eab447 100644
--- a/engine/overworld/check_player_state.asm
+++ b/engine/overworld/check_player_state.asm
@@ -105,7 +105,7 @@ IsPlayerFacingEdgeOfMap:
ld c, a
ld de, .returnaddress
push de
- jp [hl]
+ jp hl
.returnaddress
pop bc
pop de
diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm
index 347dc459..dc4ad130 100755
--- a/engine/overworld/ssanne.asm
+++ b/engine/overworld/ssanne.asm
@@ -17,7 +17,7 @@ AnimateBoulderDust:
ld bc, .returnAddress
push bc
ld c, 4
- jp [hl]
+ jp hl
.returnAddress
ld a, [rOBP1]
xor %01100100
diff --git a/engine/palettes.asm b/engine/palettes.asm
index a9d8908c..3c25d4d2 100755
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -17,7 +17,7 @@ _RunPaletteCommand:
ld l, a
ld de, SendSGBPackets
push de
- jp [hl]
+ jp hl
SetPal_Black:
ld hl, PalPacket_Black
diff --git a/engine/pikachu_movement.asm b/engine/pikachu_movement.asm
index 8eb09b3b..e2e27348 100755
--- a/engine/pikachu_movement.asm
+++ b/engine/pikachu_movement.asm
@@ -121,7 +121,7 @@ ExecutePikachuMovementCommand:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
GetCoordsForPikachuShadow:
ld hl, wPlayerSpriteImageIdx - wPlayerSpriteStateData1
@@ -487,7 +487,7 @@ UpdatePikachuPosition:
ld l, a
pop de
ld a, d
- jp [hl]
+ jp hl
.Jumptable:
dw .Down
diff --git a/engine/printer/serial.asm b/engine/printer/serial.asm
index b424876e..fa83eb9d 100755
--- a/engine/printer/serial.asm
+++ b/engine/printer/serial.asm
@@ -28,7 +28,7 @@ PrinterTransmissionJumptable:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable:
dw Printer_InitSerial ; 00
@@ -448,7 +448,7 @@ PrinterSerial_:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable:
dw .Nop
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index 769a3f37..292bb809 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -452,7 +452,7 @@ SlotMachine_CheckForMatches:
pop hl
ld de, .flashScreenLoop
push de
- jp [hl]
+ jp hl
.flashScreenLoop
ld a, [rBGP]
diff --git a/engine/surfing_minigame.asm b/engine/surfing_minigame.asm
index 4ac9f9e8..380093f1 100755
--- a/engine/surfing_minigame.asm
+++ b/engine/surfing_minigame.asm
@@ -384,7 +384,7 @@ RunSurfingMinigameRoutine:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable:
dw SurfingMinigameRoutine_SpawnPikachu ; 0
@@ -672,7 +672,7 @@ SurfingMinigameAnimatedObjectFn_Pikachu
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
Jumptable_f847f:
dw Func_f848d
@@ -1976,7 +1976,7 @@ SurfingMinigame_GetWaveDataPointers:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
Jumptable_f8d53:
dw SurfingMinigameWaveFunction_NoWave ; 00
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm
index 9e369d81..d4dd0fd3 100755
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -266,7 +266,7 @@ DoTitleScreenFunction:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable:
diff --git a/engine/trade.asm b/engine/trade.asm
index 2476ca78..e4bc0768 100755
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -47,7 +47,7 @@ TradeAnimCommon:
ld l, a
ld de, .loop
push de
- jp [hl] ; call trade func, which will return to the top of the loop
+ jp hl ; call trade func, which will return to the top of the loop
.done
pop af
ld [hSCX], a
diff --git a/engine/unknown_ea3ea.asm b/engine/unknown_ea3ea.asm
index 01391f17..1908809b 100755
--- a/engine/unknown_ea3ea.asm
+++ b/engine/unknown_ea3ea.asm
@@ -240,7 +240,7 @@ PrinterDebug_DoFunction:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable:
dw Func_ea623
@@ -705,7 +705,7 @@ PrinterDebug_PrepOAMForPrinting:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable:
dw .nop
@@ -823,7 +823,7 @@ PrinterDebug_PrepOAMForPrinting:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.PalJumptable:
dw .Pal0
@@ -865,7 +865,7 @@ PrinterDebug_PrepOAMForPrinting:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.PalFunJumptable:
dw .zero_zero
diff --git a/engine/yellow_intro.asm b/engine/yellow_intro.asm
index 3adb72b5..60135134 100755
--- a/engine/yellow_intro.asm
+++ b/engine/yellow_intro.asm
@@ -98,7 +98,7 @@ Func_f98fc:
ld a, [wYellowIntroCurrentScene]
ld hl, Jumptable_f9906
call Func_fa06e
- jp [hl]
+ jp hl
Jumptable_f9906:
dw YellowIntroScene0 ; running pika 1
@@ -985,7 +985,7 @@ Func_fa02b:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
Jumptable_fa03b:
dw Func_fa03f
diff --git a/home.asm b/home.asm
index 830ece4b..8901a0d9 100644
--- a/home.asm
+++ b/home.asm
@@ -4592,7 +4592,7 @@ JumpTable::
ld l, a
ld de, .returnAddress
push de
- jp [hl]
+ jp hl
.returnAddress
pop bc
pop de
@@ -4776,7 +4776,7 @@ Bankswitch::
ld [MBC1RomBank], a
ret
JumpToAddress::
- jp [hl]
+ jp hl
SwitchSRAMBankAndLatchClockData::
push af
diff --git a/home/overworld.asm b/home/overworld.asm
index 382f90f9..29e4f18d 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -1761,7 +1761,7 @@ RunMapScript::
ld l, a
ld de, .return
push de
- jp [hl] ; jump to script
+ jp hl ; jump to script
.return
ret
diff --git a/home/predef.asm b/home/predef.asm
index c55760d7..dfa10772 100644
--- a/home/predef.asm
+++ b/home/predef.asm
@@ -23,7 +23,7 @@ Predef::
ld de, .done
push de
- jp [hl]
+ jp hl
.done
pop af