summaryrefslogtreecommitdiff
path: root/engine/events
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/events
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/events')
-rw-r--r--engine/events/bug_contest/display_stats.asm2
-rw-r--r--engine/events/diploma.asm2
-rw-r--r--engine/events/magnet_train.asm2
-rw-r--r--engine/events/map_name_sign.asm6
-rw-r--r--engine/events/print_unown.asm2
-rw-r--r--engine/events/unown_walls.asm2
6 files changed, 8 insertions, 8 deletions
diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm
index dc5518594..e35852479 100644
--- a/engine/events/bug_contest/display_stats.asm
+++ b/engine/events/bug_contest/display_stats.asm
@@ -1,6 +1,6 @@
DisplayCaughtContestMonStats:
call ClearBGPalettes
- call ClearTileMap
+ call ClearTilemap
call ClearSprites
call LoadFontsBattleExtra
diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm
index 099598f81..7cb982de5 100644
--- a/engine/events/diploma.asm
+++ b/engine/events/diploma.asm
@@ -5,7 +5,7 @@ _Diploma:
PlaceDiplomaOnScreen:
call ClearBGPalettes
- call ClearTileMap
+ call ClearTilemap
call ClearSprites
call DisableLCD
ld hl, DiplomaGFX
diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm
index 5ad968a17..068e2670f 100644
--- a/engine/events/magnet_train.asm
+++ b/engine/events/magnet_train.asm
@@ -70,7 +70,7 @@ MagnetTrain:
ld [wRequested2bppDest], a
ld [wRequested2bppDest + 1], a
ld [wRequested2bpp], a
- call ClearTileMap
+ call ClearTilemap
pop af
ldh [hSCY], a
diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm
index b2edcb990..f345c49ed 100644
--- a/engine/events/map_name_sign.asm
+++ b/engine/events/map_name_sign.asm
@@ -135,7 +135,7 @@ InitMapNameFrame:
hlcoord 0, 0
ld b, 2
ld c, 18
- call InitMapSignAttrMap
+ call InitMapSignAttrmap
call PlaceMapNameFrame
ret
@@ -171,8 +171,8 @@ PlaceMapNameCenterAlign:
pop hl
ret
-InitMapSignAttrMap:
- ld de, wAttrMap - wTileMap
+InitMapSignAttrmap:
+ ld de, wAttrmap - wTilemap
add hl, de
inc b
inc b
diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm
index 176a8725c..f90d225fb 100644
--- a/engine/events/print_unown.asm
+++ b/engine/events/print_unown.asm
@@ -15,7 +15,7 @@ _UnownPrinter:
set NO_TEXT_SCROLL, a
ld [wOptions], a
call ClearBGPalettes
- call ClearTileMap
+ call ClearTilemap
ld de, UnownDexATile
ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A
diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm
index 28020c960..3934943f4 100644
--- a/engine/events/unown_walls.asm
+++ b/engine/events/unown_walls.asm
@@ -139,7 +139,7 @@ DisplayUnownWords:
jr nz, .loop2
.copy
call _DisplayUnownWords_CopyWord
- ld bc, wAttrMap - wTileMap
+ ld bc, wAttrmap - wTilemap
add hl, bc
call _DisplayUnownWords_FillAttr
call WaitBGMap2