diff options
Diffstat (limited to 'src/engine/duel')
| -rw-r--r-- | src/engine/duel/animations/core.asm | 6 | ||||
| -rw-r--r-- | src/engine/duel/animations/screen_effects.asm | 24 | ||||
| -rw-r--r-- | src/engine/duel/core.asm | 14 |
3 files changed, 22 insertions, 22 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 diff --git a/src/engine/duel/core.asm b/src/engine/duel/core.asm index 10ccdee..5e462bb 100644 --- a/src/engine/duel/core.asm +++ b/src/engine/duel/core.asm @@ -223,7 +223,7 @@ SetupDuel: call ZeroObjectPositionsAndToggleOAMCopy call EmptyScreen call LoadSymbolsFont - call SetDefaultPalettes + call SetDefaultConsolePalettes lb de, $38, $9f call SetupText call EnableLCD @@ -1604,7 +1604,7 @@ DrawDuelistPortraitsAndNames: ; opponent's portrait ld a, [wOpponentPortrait] lb bc, 13, 1 - call Func_3e2a + call DrawOpponentPortrait ; middle line call DrawDuelHorizontalSeparator ret @@ -3965,7 +3965,7 @@ SetSGB3ToCardPalette: jr SetBGP7OrSGB2ToCardPalette.copy_pal_loop SetOBP1OrSGB3ToCardPalette: - ld a, $e4 + ld a, %11100100 ld [wOBP0], a ld a, [wConsole] or a ; CONSOLE_DMG @@ -4125,13 +4125,13 @@ ApplyCardCGBAttributes: ; BGP and OBP0 on DMG ; SGB0 and SGB1 on SGB ; BGP0 to BGP5 and OBP1 on CGB -SetDefaultPalettes: +SetDefaultConsolePalettes: ld a, [wConsole] cp CONSOLE_SGB jr z, .sgb cp CONSOLE_CGB jr z, .cgb - ld a, $e4 + ld a, %11100100 ld [wOBP0], a ld [wBGP], a ld a, $01 ; equivalent to FLUSH_ONE_PAL @@ -4200,7 +4200,7 @@ CGBDefaultPalettes: rgb 28, 0, 0 rgb 0, 0, 0 -; first and last byte of the packet not contained here (see SetDefaultPalettes.sgb) +; first and last byte of the packet not contained here (see SetDefaultConsolePalettes.sgb) Pal01Packet_Default: ; SGB0 rgb 28, 28, 24 @@ -4718,7 +4718,7 @@ DrawLargePictureOfCard: call ZeroObjectPositionsAndToggleOAMCopy call EmptyScreen call LoadSymbolsFont - call SetDefaultPalettes + call SetDefaultConsolePalettes ld a, LARGE_CARD_PICTURE ld [wDuelDisplayedScreen], a call LoadCardOrDuelMenuBorderTiles |