summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Niño Díaz <antonio_nd@outlook.com>2017-06-09 22:54:09 +0100
committerAntonio Niño Díaz <antonio_nd@outlook.com>2017-06-09 22:54:09 +0100
commit9ea25bc8cd32df5b3bcf6333c3d2582e1b11f2dd (patch)
tree838b94841af8efe22697c15775f99035d42fd734
parentdfc094db727d094e50e2a7bfb7fc1ae22cb1084b (diff)
Replace deprecated mnemonics by the correct ones
The old mnemonics generate warnings with new versions of rgbds. This patch replaces them by the correct ones. Signed-off-by: Antonio Niño Díaz <antonio_nd@outlook.com>
-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_box.asm2
-rw-r--r--engine/overworld/player_state.asm2
-rwxr-xr-xengine/overworld/ssanne.asm2
-rwxr-xr-xengine/palettes.asm2
-rwxr-xr-xengine/slot_machine.asm2
-rwxr-xr-xengine/trade.asm2
-rw-r--r--home.asm6
-rw-r--r--home/overworld.asm2
-rw-r--r--home/predef.asm2
-rw-r--r--home/vcopy.asm12
17 files changed, 30 insertions, 30 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 373136a8..4992b84a 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -213,7 +213,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
@@ -457,7 +457,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
@@ -642,7 +642,7 @@ DoSpecialEffectByAnimationId:
ld l,a
ld de,.done
push de
- jp [hl]
+ jp hl
.done
pop bc
pop de
@@ -1080,7 +1080,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 9e02c56f..985a1eb2 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 153a9048..4835e8cf 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -3150,7 +3150,7 @@ ExecutePlayerMove:
jp z, ExecutePlayerMoveDone
call CheckPlayerStatusConditions
jr nz, .playerHasNoSpecialCondition
- jp [hl]
+ jp hl
.playerHasNoSpecialCondition
call GetCurrentMove
ld hl, wPlayerBattleStatus1
@@ -5690,7 +5690,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?
@@ -7139,7 +7139,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 b175fcaf..d78079e8 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
@@ -366,7 +366,7 @@ TrainerAI:
ld h,[hl]
ld l,a
call Random
- jp [hl]
+ jp hl
TrainerAIPointers:
; one entry per trainer class
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index 474dbd11..3e72daa9 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -304,7 +304,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 057595df..f334e384 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 251d7ae4..8c10266b 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_box.asm b/engine/menu/text_box.asm
index 12067dd4..90c35d25 100644
--- a/engine/menu/text_box.asm
+++ b/engine/menu/text_box.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/player_state.asm b/engine/overworld/player_state.asm
index 79f755b9..b8d734f2 100644
--- a/engine/overworld/player_state.asm
+++ b/engine/overworld/player_state.asm
@@ -103,7 +103,7 @@ IsPlayerFacingEdgeOfMap:
ld c, a
ld de, .asm_c41e
push de
- jp [hl]
+ jp hl
.asm_c41e
pop bc
pop de
diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm
index 712c53ed..ea4747ce 100755
--- a/engine/overworld/ssanne.asm
+++ b/engine/overworld/ssanne.asm
@@ -16,7 +16,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 4785ade2..6a798860 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_BattleBlack:
ld hl, PalPacket_Black
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index 2dfcffde..3a46687f 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -451,7 +451,7 @@ SlotMachine_CheckForMatches:
pop hl
ld de, .flashScreenLoop
push de
- jp [hl]
+ jp hl
.flashScreenLoop
ld a, [rBGP]
diff --git a/engine/trade.asm b/engine/trade.asm
index c3913a7e..8bc8e3bc 100755
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -46,7 +46,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/home.asm b/home.asm
index 0a2d829d..27c977ca 100644
--- a/home.asm
+++ b/home.asm
@@ -2966,7 +2966,7 @@ Bankswitch::
ld [MBC1RomBank],a
ld bc,.Return
push bc
- jp [hl]
+ jp hl
.Return
pop bc
ld a,b
@@ -4422,7 +4422,7 @@ CallFunctionInTable::
ld l, a
ld de, .returnAddress
push de
- jp [hl]
+ jp hl
.returnAddress
pop bc
pop de
@@ -4605,7 +4605,7 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor::
ld [H_LOADEDROMBANK], a
ld de, .returnAddress
push de
- jp [hl]
+ jp hl
.returnAddress
xor a
jr .done
diff --git a/home/overworld.asm b/home/overworld.asm
index ec8f1925..509b699b 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -1995,7 +1995,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 2fac9aca..9bb9be74 100644
--- a/home/predef.asm
+++ b/home/predef.asm
@@ -24,7 +24,7 @@ Predef::
ld de, .done
push de
- jp [hl]
+ jp hl
.done
pop af
diff --git a/home/vcopy.asm b/home/vcopy.asm
index 3fe19745..ad92e8fb 100644
--- a/home/vcopy.asm
+++ b/home/vcopy.asm
@@ -123,7 +123,7 @@ AutoBgMapTransfer::
ld a,[H_AUTOBGTRANSFERENABLED]
and a
ret z
- ld hl,[sp + 0]
+ ld hl,sp + 0
ld a,h
ld [H_SPTEMP],a
ld a,l
@@ -205,7 +205,7 @@ VBlankCopyBgMap::
ld a,[H_VBCOPYBGSRC] ; doubles as enabling byte
and a
ret z
- ld hl,[sp + 0]
+ ld hl,sp + 0
ld a,h
ld [H_SPTEMP],a
ld a,l
@@ -238,7 +238,7 @@ VBlankCopyDouble::
and a
ret z
- ld hl, [sp + 0]
+ ld hl, sp + 0
ld a, h
ld [H_SPTEMP], a
ld a, l
@@ -290,7 +290,7 @@ VBlankCopyDouble::
ld a, h
ld [H_VBCOPYDOUBLEDEST + 1], a
- ld hl, [sp + 0]
+ ld hl, sp + 0
ld a, l
ld [H_VBCOPYDOUBLESRC], a
ld a, h
@@ -316,7 +316,7 @@ VBlankCopy::
and a
ret z
- ld hl, [sp + 0]
+ ld hl, sp + 0
ld a, h
ld [H_SPTEMP], a
ld a, l
@@ -360,7 +360,7 @@ VBlankCopy::
ld a, h
ld [H_VBCOPYDEST + 1], a
- ld hl, [sp + 0]
+ ld hl, sp + 0
ld a, l
ld [H_VBCOPYSRC], a
ld a, h