shithub: pokered

Download patch

ref: 9ea25bc8cd32df5b3bcf6333c3d2582e1b11f2dd
parent: dfc094db727d094e50e2a7bfb7fc1ae22cb1084b
author: Antonio Niño Díaz <antonio_nd@outlook.com>
date: Fri Jun 9 18:54:09 EDT 2017

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>

--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -213,7 +213,7 @@
 	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 @@
 	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 @@
 	ld l,a
 	ld de,.done
 	push de
-	jp [hl]
+	jp hl
 .done
 	pop bc
 	pop de
@@ -1080,7 +1080,7 @@
 	ld [H_WHOSETURN],a
 	ld de,.returnAddress
 	push de
-	jp [hl]
+	jp hl
 .returnAddress
 	pop af
 	ld [H_WHOSETURN],a
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -62,7 +62,7 @@
 	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
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -3150,7 +3150,7 @@
 	jp z, ExecutePlayerMoveDone
 	call CheckPlayerStatusConditions
 	jr nz, .playerHasNoSpecialCondition
-	jp [hl]
+	jp hl
 .playerHasNoSpecialCondition
 	call GetCurrentMove
 	ld hl, wPlayerBattleStatus1
@@ -5690,7 +5690,7 @@
 	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 @@
 	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
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -51,7 +51,7 @@
 	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 @@
 	ld h,[hl]
 	ld l,a
 	call Random
-	jp [hl]
+	jp hl
 
 TrainerAIPointers:
 ; one entry per trainer class
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -304,7 +304,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 TradeCenter_SelectMon:
 	call ClearScreen
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -13,7 +13,7 @@
 	ld a,[hli]
 	ld h,[hl]
 	ld l,a
-	jp [hl]
+	jp hl
 
 ItemUsePtrTable:
 	dw ItemUseBall       ; MASTER_BALL
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -118,7 +118,7 @@
 	ld h,[hl]
 	ld l,a
 	ld a,[wObtainedBadges] ; badges obtained
-	jp [hl]
+	jp hl
 .outOfBattleMovePointers
 	dw .cut
 	dw .fly
--- a/engine/menu/text_box.asm
+++ b/engine/menu/text_box.asm
@@ -24,7 +24,7 @@
 	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
--- a/engine/overworld/player_state.asm
+++ b/engine/overworld/player_state.asm
@@ -103,7 +103,7 @@
 	ld c, a
 	ld de, .asm_c41e
 	push de
-	jp [hl]
+	jp hl
 .asm_c41e
 	pop bc
 	pop de
--- a/engine/overworld/ssanne.asm
+++ b/engine/overworld/ssanne.asm
@@ -16,7 +16,7 @@
 	ld bc, .returnAddress
 	push bc
 	ld c, 4
-	jp [hl]
+	jp hl
 .returnAddress
 	ld a, [rOBP1]
 	xor %01100100
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -17,7 +17,7 @@
 	ld l, a
 	ld de, SendSGBPackets
 	push de
-	jp [hl]
+	jp hl
 
 SetPal_BattleBlack:
 	ld hl, PalPacket_Black
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -451,7 +451,7 @@
 	pop hl
 	ld de, .flashScreenLoop
 	push de
-	jp [hl]
+	jp hl
 
 .flashScreenLoop
 	ld a, [rBGP]
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -46,7 +46,7 @@
 	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
--- a/home.asm
+++ b/home.asm
@@ -2966,7 +2966,7 @@
 	ld [MBC1RomBank],a
 	ld bc,.Return
 	push bc
-	jp [hl]
+	jp hl
 .Return
 	pop bc
 	ld a,b
@@ -4422,7 +4422,7 @@
 	ld l, a
 	ld de, .returnAddress
 	push de
-	jp [hl]
+	jp hl
 .returnAddress
 	pop bc
 	pop de
@@ -4605,7 +4605,7 @@
 	ld [H_LOADEDROMBANK], a
 	ld de, .returnAddress
 	push de
-	jp [hl]
+	jp hl
 .returnAddress
 	xor a
 	jr .done
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -1995,7 +1995,7 @@
 	ld l,a
 	ld de,.return
 	push de
-	jp [hl] ; jump to script
+	jp hl ; jump to script
 .return
 	ret
 
--- a/home/predef.asm
+++ b/home/predef.asm
@@ -24,7 +24,7 @@
 
 	ld de, .done
 	push de
-	jp [hl]
+	jp hl
 .done
 
 	pop af
--- a/home/vcopy.asm
+++ b/home/vcopy.asm
@@ -123,7 +123,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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