mirror of
https://github.com/pret/pokered.git
synced 2024-10-22 22:55:31 +00:00
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:
parent
dfc094db72
commit
9ea25bc8cd
17 changed files with 30 additions and 30 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -304,7 +304,7 @@ CallCurrentTradeCenterFunction:
|
|||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
jp [hl]
|
||||
jp hl
|
||||
|
||||
TradeCenter_SelectMon:
|
||||
call ClearScreen
|
||||
|
|
|
@ -13,7 +13,7 @@ UseItem_:
|
|||
ld a,[hli]
|
||||
ld h,[hl]
|
||||
ld l,a
|
||||
jp [hl]
|
||||
jp hl
|
||||
|
||||
ItemUsePtrTable:
|
||||
dw ItemUseBall ; MASTER_BALL
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -103,7 +103,7 @@ IsPlayerFacingEdgeOfMap:
|
|||
ld c, a
|
||||
ld de, .asm_c41e
|
||||
push de
|
||||
jp [hl]
|
||||
jp hl
|
||||
.asm_c41e
|
||||
pop bc
|
||||
pop de
|
||||
|
|
|
@ -16,7 +16,7 @@ AnimateBoulderDust:
|
|||
ld bc, .returnAddress
|
||||
push bc
|
||||
ld c, 4
|
||||
jp [hl]
|
||||
jp hl
|
||||
.returnAddress
|
||||
ld a, [rOBP1]
|
||||
xor %01100100
|
||||
|
|
|
@ -17,7 +17,7 @@ _RunPaletteCommand:
|
|||
ld l, a
|
||||
ld de, SendSGBPackets
|
||||
push de
|
||||
jp [hl]
|
||||
jp hl
|
||||
|
||||
SetPal_BattleBlack:
|
||||
ld hl, PalPacket_Black
|
||||
|
|
|
@ -451,7 +451,7 @@ SlotMachine_CheckForMatches:
|
|||
pop hl
|
||||
ld de, .flashScreenLoop
|
||||
push de
|
||||
jp [hl]
|
||||
jp hl
|
||||
|
||||
.flashScreenLoop
|
||||
ld a, [rBGP]
|
||||
|
|
|
@ -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
|
||||
|
|
6
home.asm
6
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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ Predef::
|
|||
|
||||
ld de, .done
|
||||
push de
|
||||
jp [hl]
|
||||
jp hl
|
||||
.done
|
||||
|
||||
pop af
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue