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>
This commit is contained in:
Antonio Niño Díaz 2017-06-09 22:54:09 +01:00
parent dfc094db72
commit 9ea25bc8cd
17 changed files with 30 additions and 30 deletions

View file

@ -213,7 +213,7 @@ PlayAnimation:
ld h,a ld h,a
ld de,.nextAnimationCommand ld de,.nextAnimationCommand
push de push de
jp [hl] ; jump to special effect function jp hl ; jump to special effect function
.playSubanimation .playSubanimation
ld c,a ld c,a
and a,%00111111 and a,%00111111
@ -457,7 +457,7 @@ PlayApplyingAttackAnimation:
ld a,[hli] ld a,[hli]
ld h,[hl] ld h,[hl]
ld l,a ld l,a
jp [hl] jp hl
AnimationTypePointerTable: AnimationTypePointerTable:
dw ShakeScreenVertically ; enemy mon has used a damaging move without a side effect dw ShakeScreenVertically ; enemy mon has used a damaging move without a side effect
@ -642,7 +642,7 @@ DoSpecialEffectByAnimationId:
ld l,a ld l,a
ld de,.done ld de,.done
push de push de
jp [hl] jp hl
.done .done
pop bc pop bc
pop de pop de
@ -1080,7 +1080,7 @@ CallWithTurnFlipped:
ld [H_WHOSETURN],a ld [H_WHOSETURN],a
ld de,.returnAddress ld de,.returnAddress
push de push de
jp [hl] jp hl
.returnAddress .returnAddress
pop af pop af
ld [H_WHOSETURN],a ld [H_WHOSETURN],a

View file

@ -62,7 +62,7 @@ BattleTransition:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
; the three GetBattleTransitionID functions set the first ; the three GetBattleTransitionID functions set the first
; three bits of c, which determines what transition animation ; three bits of c, which determines what transition animation

View file

@ -3150,7 +3150,7 @@ ExecutePlayerMove:
jp z, ExecutePlayerMoveDone jp z, ExecutePlayerMoveDone
call CheckPlayerStatusConditions call CheckPlayerStatusConditions
jr nz, .playerHasNoSpecialCondition jr nz, .playerHasNoSpecialCondition
jp [hl] jp hl
.playerHasNoSpecialCondition .playerHasNoSpecialCondition
call GetCurrentMove call GetCurrentMove
ld hl, wPlayerBattleStatus1 ld hl, wPlayerBattleStatus1
@ -5690,7 +5690,7 @@ ExecuteEnemyMove:
ld [wDamageMultipliers], a ld [wDamageMultipliers], a
call CheckEnemyStatusConditions call CheckEnemyStatusConditions
jr nz, .enemyHasNoSpecialConditions jr nz, .enemyHasNoSpecialConditions
jp [hl] jp hl
.enemyHasNoSpecialConditions .enemyHasNoSpecialConditions
ld hl, wEnemyBattleStatus1 ld hl, wEnemyBattleStatus1
bit ChargingUp, [hl] ; is the enemy charging up for attack? bit ChargingUp, [hl] ; is the enemy charging up for attack?
@ -7139,7 +7139,7 @@ _JumpMoveEffect:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] ; jump to special effect handler jp hl ; jump to special effect handler
MoveEffectPointerTable: MoveEffectPointerTable:
dw SleepEffect ; unused effect dw SleepEffect ; unused effect

View file

@ -51,7 +51,7 @@ AIEnemyTrainerChooseMoves:
ld l, a ld l, a
ld de, .nextMoveChoiceModification ; set return address ld de, .nextMoveChoiceModification ; set return address
push de 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 .loopFindMinimumEntries ; all entries will be decremented sequentially until one of them is zero
ld hl, wBuffer ; temp move selection array ld hl, wBuffer ; temp move selection array
ld de, wEnemyMonMoves ; enemy moves ld de, wEnemyMonMoves ; enemy moves
@ -366,7 +366,7 @@ TrainerAI:
ld h,[hl] ld h,[hl]
ld l,a ld l,a
call Random call Random
jp [hl] jp hl
TrainerAIPointers: TrainerAIPointers:
; one entry per trainer class ; one entry per trainer class

View file

@ -304,7 +304,7 @@ CallCurrentTradeCenterFunction:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp hl
TradeCenter_SelectMon: TradeCenter_SelectMon:
call ClearScreen call ClearScreen

View file

@ -13,7 +13,7 @@ UseItem_:
ld a,[hli] ld a,[hli]
ld h,[hl] ld h,[hl]
ld l,a ld l,a
jp [hl] jp hl
ItemUsePtrTable: ItemUsePtrTable:
dw ItemUseBall ; MASTER_BALL dw ItemUseBall ; MASTER_BALL

View file

@ -118,7 +118,7 @@ StartMenu_Pokemon:
ld h,[hl] ld h,[hl]
ld l,a ld l,a
ld a,[wObtainedBadges] ; badges obtained ld a,[wObtainedBadges] ; badges obtained
jp [hl] jp hl
.outOfBattleMovePointers .outOfBattleMovePointers
dw .cut dw .cut
dw .fly dw .fly

View file

@ -24,7 +24,7 @@ DisplayTextBoxID_:
ld l,a ; hl = address of function ld l,a ; hl = address of function
ld de,.done ld de,.done
push de push de
jp [hl] ; jump to the function jp hl ; jump to the function
.coordTableMatch .coordTableMatch
call GetTextBoxIDCoords call GetTextBoxIDCoords
call GetAddressOfScreenCoords call GetAddressOfScreenCoords

View file

@ -103,7 +103,7 @@ IsPlayerFacingEdgeOfMap:
ld c, a ld c, a
ld de, .asm_c41e ld de, .asm_c41e
push de push de
jp [hl] jp hl
.asm_c41e .asm_c41e
pop bc pop bc
pop de pop de

View file

@ -16,7 +16,7 @@ AnimateBoulderDust:
ld bc, .returnAddress ld bc, .returnAddress
push bc push bc
ld c, 4 ld c, 4
jp [hl] jp hl
.returnAddress .returnAddress
ld a, [rOBP1] ld a, [rOBP1]
xor %01100100 xor %01100100

View file

@ -17,7 +17,7 @@ _RunPaletteCommand:
ld l, a ld l, a
ld de, SendSGBPackets ld de, SendSGBPackets
push de push de
jp [hl] jp hl
SetPal_BattleBlack: SetPal_BattleBlack:
ld hl, PalPacket_Black ld hl, PalPacket_Black

View file

@ -451,7 +451,7 @@ SlotMachine_CheckForMatches:
pop hl pop hl
ld de, .flashScreenLoop ld de, .flashScreenLoop
push de push de
jp [hl] jp hl
.flashScreenLoop .flashScreenLoop
ld a, [rBGP] ld a, [rBGP]

View file

@ -46,7 +46,7 @@ TradeAnimCommon:
ld l, a ld l, a
ld de, .loop ld de, .loop
push de 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 .done
pop af pop af
ld [hSCX], a ld [hSCX], a

View file

@ -2966,7 +2966,7 @@ Bankswitch::
ld [MBC1RomBank],a ld [MBC1RomBank],a
ld bc,.Return ld bc,.Return
push bc push bc
jp [hl] jp hl
.Return .Return
pop bc pop bc
ld a,b ld a,b
@ -4422,7 +4422,7 @@ CallFunctionInTable::
ld l, a ld l, a
ld de, .returnAddress ld de, .returnAddress
push de push de
jp [hl] jp hl
.returnAddress .returnAddress
pop bc pop bc
pop de pop de
@ -4605,7 +4605,7 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor::
ld [H_LOADEDROMBANK], a ld [H_LOADEDROMBANK], a
ld de, .returnAddress ld de, .returnAddress
push de push de
jp [hl] jp hl
.returnAddress .returnAddress
xor a xor a
jr .done jr .done

View file

@ -1995,7 +1995,7 @@ RunMapScript::
ld l,a ld l,a
ld de,.return ld de,.return
push de push de
jp [hl] ; jump to script jp hl ; jump to script
.return .return
ret ret

View file

@ -24,7 +24,7 @@ Predef::
ld de, .done ld de, .done
push de push de
jp [hl] jp hl
.done .done
pop af pop af

View file

@ -123,7 +123,7 @@ AutoBgMapTransfer::
ld a,[H_AUTOBGTRANSFERENABLED] ld a,[H_AUTOBGTRANSFERENABLED]
and a and a
ret z ret z
ld hl,[sp + 0] ld hl,sp + 0
ld a,h ld a,h
ld [H_SPTEMP],a ld [H_SPTEMP],a
ld a,l ld a,l
@ -205,7 +205,7 @@ VBlankCopyBgMap::
ld a,[H_VBCOPYBGSRC] ; doubles as enabling byte ld a,[H_VBCOPYBGSRC] ; doubles as enabling byte
and a and a
ret z ret z
ld hl,[sp + 0] ld hl,sp + 0
ld a,h ld a,h
ld [H_SPTEMP],a ld [H_SPTEMP],a
ld a,l ld a,l
@ -238,7 +238,7 @@ VBlankCopyDouble::
and a and a
ret z ret z
ld hl, [sp + 0] ld hl, sp + 0
ld a, h ld a, h
ld [H_SPTEMP], a ld [H_SPTEMP], a
ld a, l ld a, l
@ -290,7 +290,7 @@ VBlankCopyDouble::
ld a, h ld a, h
ld [H_VBCOPYDOUBLEDEST + 1], a ld [H_VBCOPYDOUBLEDEST + 1], a
ld hl, [sp + 0] ld hl, sp + 0
ld a, l ld a, l
ld [H_VBCOPYDOUBLESRC], a ld [H_VBCOPYDOUBLESRC], a
ld a, h ld a, h
@ -316,7 +316,7 @@ VBlankCopy::
and a and a
ret z ret z
ld hl, [sp + 0] ld hl, sp + 0
ld a, h ld a, h
ld [H_SPTEMP], a ld [H_SPTEMP], a
ld a, l ld a, l
@ -360,7 +360,7 @@ VBlankCopy::
ld a, h ld a, h
ld [H_VBCOPYDEST + 1], a ld [H_VBCOPYDEST + 1], a
ld hl, [sp + 0] ld hl, sp + 0
ld a, l ld a, l
ld [H_VBCOPYSRC], a ld [H_VBCOPYSRC], a
ld a, h ld a, h