diff options
Diffstat (limited to 'src/engine/duel/animations')
| -rw-r--r-- | src/engine/duel/animations/core.asm | 6 | ||||
| -rw-r--r-- | src/engine/duel/animations/screen_effects.asm | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/engine/duel/animations/core.asm b/src/engine/duel/animations/core.asm index 89d072c..142183f 100644 --- a/src/engine/duel/animations/core.asm +++ b/src/engine/duel/animations/core.asm @@ -527,7 +527,7 @@ Func_1cba6: xor a ld [wd4b7], a - ld hl, wd4b4 + ld hl, wDecimalChars ld de, wAnimationQueue + 1 .asm_1cbb3 push hl @@ -588,7 +588,7 @@ Func_1cc03: ld a, [wDuelAnimDamage + 1] ld h, a - ld de, wd4b4 + ld de, wDecimalChars ld bc, -100 call .Func_1cc2f ld bc, -10 @@ -597,7 +597,7 @@ Func_1cc03: ld a, l add $4f ld [de], a - ld hl, wd4b4 + ld hl, wDecimalChars ld c, 2 .asm_1cc23 ld a, [hl] 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 |