Merge pull request #167 from Pokechu22/rgbds-0.3.3

Update for RGBDS 0.3.3
This commit is contained in:
yenatch 2017-09-29 22:41:34 -04:00 committed by GitHub
commit 5c24193831
21 changed files with 219 additions and 38 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

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

View file

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

View file

@ -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

View file

@ -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

View file

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

View file

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

View file

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

View file

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

View file

@ -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