summaryrefslogtreecommitdiff
path: root/engine/games
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2020-02-13 18:30:13 +0100
committermid-kid <esteve.varela@gmail.com>2020-02-13 18:31:10 +0100
commit26b8bf003e3523fee94c4c18447ea55f9eb1d429 (patch)
tree96515ae3efceb833cd71c93786150daa3348c71c /engine/games
parent34ceaac71d32baace82f1e6de8fd4b252fb92a84 (diff)
Standardize on lowercase Tilemap and Attrmap
We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
Diffstat (limited to 'engine/games')
-rw-r--r--engine/games/card_flip.asm16
-rw-r--r--engine/games/slot_machine.asm2
-rw-r--r--engine/games/unown_puzzle.asm4
3 files changed, 11 insertions, 11 deletions
diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm
index 54d729dfa..c130b470a 100644
--- a/engine/games/card_flip.asm
+++ b/engine/games/card_flip.asm
@@ -14,7 +14,7 @@ _CardFlip:
ld hl, wOptions
set NO_TEXT_SCROLL, [hl]
call ClearBGPalettes
- call ClearTileMap
+ call ClearTilemap
call ClearSprites
ld de, MUSIC_NONE
call PlayMusic
@@ -457,7 +457,7 @@ CardFlip_DisplayCardFaceUp:
ret z
; Set the attributes
- ld de, wAttrMap - wTileMap
+ ld de, wAttrmap - wTilemap
add hl, de
ld a, [wCardFlipFaceUpCard]
and 3
@@ -1558,32 +1558,32 @@ CardFlip_InitAttrPals:
and a
ret z
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
xor a
call ByteFill
- hlcoord 12, 1, wAttrMap
+ hlcoord 12, 1, wAttrmap
lb bc, 2, 2
ld a, $1
call CardFlip_FillBox
- hlcoord 14, 1, wAttrMap
+ hlcoord 14, 1, wAttrmap
lb bc, 2, 2
ld a, $2
call CardFlip_FillBox
- hlcoord 16, 1, wAttrMap
+ hlcoord 16, 1, wAttrmap
lb bc, 2, 2
ld a, $3
call CardFlip_FillBox
- hlcoord 18, 1, wAttrMap
+ hlcoord 18, 1, wAttrmap
lb bc, 2, 2
ld a, $4
call CardFlip_FillBox
- hlcoord 9, 0, wAttrMap
+ hlcoord 9, 0, wAttrmap
lb bc, 12, 1
ld a, $1
call CardFlip_FillBox
diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm
index 291f0151d..2765dd870 100644
--- a/engine/games/slot_machine.asm
+++ b/engine/games/slot_machine.asm
@@ -96,7 +96,7 @@ _SlotMachine:
.InitGFX:
call ClearBGPalettes
- call ClearTileMap
+ call ClearTilemap
call ClearSprites
ld de, MUSIC_NONE
call PlayMusic
diff --git a/engine/games/unown_puzzle.asm b/engine/games/unown_puzzle.asm
index 4dfebb9b0..98100629e 100644
--- a/engine/games/unown_puzzle.asm
+++ b/engine/games/unown_puzzle.asm
@@ -9,7 +9,7 @@ _UnownPuzzle:
ld a, $1
ldh [hInMenu], a
call ClearBGPalettes
- call ClearTileMap
+ call ClearTilemap
call ClearSprites
xor a
ldh [hBGMapMode], a
@@ -83,7 +83,7 @@ _UnownPuzzle:
pop af
ldh [hInMenu], a
call ClearBGPalettes
- call ClearTileMap
+ call ClearTilemap
call ClearSprites
ld a, LCDC_DEFAULT
ldh [rLCDC], a