summaryrefslogtreecommitdiff
path: root/engine/card_flip.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/card_flip.asm')
-rwxr-xr-xengine/card_flip.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/card_flip.asm b/engine/card_flip.asm
index d7d24cba1..0e85ef21b 100755
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -11,7 +11,7 @@ ret_e00ed: ; e00ed (38:40ed)
ret
_CardFlip: ; e00ee (38:40ee)
- ld hl, Options
+ ld hl, wOptions
set 4, [hl]
call ClearBGPalettes
call ClearTileMap
@@ -70,7 +70,7 @@ _CardFlip: ; e00ee (38:40ee)
call PlaySFX
call WaitSFX
call ClearBGPalettes
- ld hl, Options
+ ld hl, wOptions
res 4, [hl]
ret
@@ -485,7 +485,7 @@ CardFlip_DisplayCardFaceUp: ; e03ec
ret z
; Set the attributes
- ld de, AttrMap - TileMap
+ ld de, wAttrMap - wTileMap
add hl, de
ld a, [wCardFlipFaceUpCard]
and 3
@@ -601,7 +601,7 @@ CardFlip_CopyToBox: ; e04f7 (38:44f7)
; e0509 (38:4509)
CardFlip_CopyOAM: ; e0509
- ld de, Sprite01
+ ld de, wSprite01
ld a, [hli]
.loop
push af
@@ -1625,32 +1625,32 @@ CardFlip_InitAttrPals: ; e0c37 (38:4c37)
and a
ret z
- hlcoord 0, 0, AttrMap
+ hlcoord 0, 0, wAttrMap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
xor a
call ByteFill
- hlcoord 12, 1, AttrMap
+ hlcoord 12, 1, wAttrMap
lb bc, 2, 2
ld a, $1
call CardFlip_FillBox
- hlcoord 14, 1, AttrMap
+ hlcoord 14, 1, wAttrMap
lb bc, 2, 2
ld a, $2
call CardFlip_FillBox
- hlcoord 16, 1, AttrMap
+ hlcoord 16, 1, wAttrMap
lb bc, 2, 2
ld a, $3
call CardFlip_FillBox
- hlcoord 18, 1, AttrMap
+ hlcoord 18, 1, wAttrMap
lb bc, 2, 2
ld a, $4
call CardFlip_FillBox
- hlcoord 9, 0, AttrMap
+ hlcoord 9, 0, wAttrMap
lb bc, 12, 1
ld a, $1
call CardFlip_FillBox