summaryrefslogtreecommitdiff
path: root/src/engine/duel/animations/screen_effects.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2021-11-15 13:31:15 -0600
committerGitHub <noreply@github.com>2021-11-15 13:31:15 -0600
commitf516a91f5fa02a741631c77b9097598f466d1328 (patch)
treebac2ee5e3fad02983b061580f5c085baecb5439a /src/engine/duel/animations/screen_effects.asm
parent15e986d374fdd11ed0f412fbdc9b858d4c4b9f50 (diff)
parent1fd16cd27fcd4f432bfc09fc5b7a262798b72430 (diff)
Merge pull request #114 from ElectroDeoxys/masterHEADmaster
Some more bank splitting
Diffstat (limited to 'src/engine/duel/animations/screen_effects.asm')
-rw-r--r--src/engine/duel/animations/screen_effects.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/engine/duel/animations/screen_effects.asm b/src/engine/duel/animations/screen_effects.asm
index 9058071..6d8139c 100644
--- a/src/engine/duel/animations/screen_effects.asm
+++ b/src/engine/duel/animations/screen_effects.asm
@@ -97,12 +97,12 @@ ShakeScreenX:
ld [wd4bc + 1], a
ld hl, wScreenAnimUpdatePtr
- ld [hl], LOW(.update)
+ ld [hl], LOW(.Update)
inc hl
- ld [hl], HIGH(.update)
+ ld [hl], HIGH(.Update)
ret
-.update
+.Update
call DecrementScreenAnimDuration
call UpdateShakeOffset
jp nc, LoadDefaultScreenAnimationUpdateWhenFinished
@@ -125,12 +125,12 @@ ShakeScreenY:
ld a, h
ld [wd4bc + 1], a
ld hl, wScreenAnimUpdatePtr
- ld [hl], LOW(.update)
+ ld [hl], LOW(.Update)
inc hl
- ld [hl], HIGH(.update)
+ ld [hl], HIGH(.Update)
ret
-.update
+.Update
call DecrementScreenAnimDuration
call UpdateShakeOffset
jp nc, LoadDefaultScreenAnimationUpdateWhenFinished
@@ -186,9 +186,9 @@ DecrementScreenAnimDuration:
WhiteFlashScreen:
ld hl, wScreenAnimUpdatePtr
- ld [hl], LOW(.update)
+ ld [hl], LOW(.Update)
inc hl
- ld [hl], HIGH(.update)
+ ld [hl], HIGH(.Update)
ld a, [wBGP]
ld [wd4bc], a
; backup the current background pals
@@ -204,7 +204,7 @@ WhiteFlashScreen:
call SetBGP
call FlushAllPalettes
-.update
+.Update
call DecrementScreenAnimDuration
ld a, [wScreenAnimDuration]
or a
@@ -221,9 +221,9 @@ WhiteFlashScreen:
DistortScreen:
ld hl, wScreenAnimUpdatePtr
- ld [hl], LOW(.update)
+ ld [hl], LOW(.Update)
inc hl
- ld [hl], HIGH(.update)
+ ld [hl], HIGH(.Update)
xor a
ld [wApplyBGScroll], a
ld hl, wLCDCFunctionTrampoline + 1
@@ -234,7 +234,7 @@ DistortScreen:
ld [wBGScrollMod], a
call EnableInt_LYCoincidence
-.update
+.Update
ld a, [wScreenAnimDuration]
srl a
srl a