summaryrefslogtreecommitdiff
path: root/engine/link
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/link
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/link')
-rw-r--r--engine/link/link.asm8
-rw-r--r--engine/link/link_2.asm2
-rw-r--r--engine/link/link_trade.asm4
-rw-r--r--engine/link/mystery_gift.asm8
4 files changed, 11 insertions, 11 deletions
diff --git a/engine/link/link.asm b/engine/link/link.asm
index a3585e349..31c189112 100644
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@@ -1328,7 +1328,7 @@ LinkTradePartiesMenuMasterLoop:
jp LinkTradeOTPartymonMenuLoop ; OTPARTYMON
Function28926:
- call LoadTileMapToTempTileMap
+ call LoadTilemapToTempTilemap
ld a, [wMenuCursorY]
push af
hlcoord 0, 15
@@ -1369,7 +1369,7 @@ Function28926:
.b_button
pop af
ld [wMenuCursorY], a
- call SafeLoadTempTileMapToTileMap
+ call SafeLoadTempTilemapToTilemap
jp LinkTrade_PlayerPartyMenu
.d_right
@@ -1407,7 +1407,7 @@ Function28926:
ld [wInitListType], a
callfar InitList
farcall LinkMonStatsScreen
- call SafeLoadTempTileMapToTileMap
+ call SafeLoadTempTilemapToTilemap
hlcoord 6, 1
lb bc, 6, 1
ld a, " "
@@ -1844,7 +1844,7 @@ LinkTrade:
ld [wd003], a
ld c, 100
call DelayFrames
- call ClearTileMap
+ call ClearTilemap
call LoadFontsBattleExtra
ld b, SCGB_DIPLOMA
call GetSGBLayout
diff --git a/engine/link/link_2.asm b/engine/link/link_2.asm
index 9406e43bb..b5fbbf6c0 100644
--- a/engine/link/link_2.asm
+++ b/engine/link/link_2.asm
@@ -31,7 +31,7 @@ LinkTextbox2:
pop hl
pop bc
- ld de, wAttrMap - wTileMap
+ ld de, wAttrmap - wTilemap
add hl, de
inc b
inc b
diff --git a/engine/link/link_trade.asm b/engine/link/link_trade.asm
index 95be2817a..16dc02e8c 100644
--- a/engine/link/link_trade.asm
+++ b/engine/link/link_trade.asm
@@ -18,7 +18,7 @@ Function16d42e:
Function16d43b:
call LoadStandardMenuHeader
call ClearBGPalettes
- call ClearTileMap
+ call ClearTilemap
call ClearSprites
farcall __LoadTradeScreenBorder ; useless to farcall
farcall Function16d42e ; useless to farcall
@@ -48,7 +48,7 @@ _LinkTextbox:
pop hl
pop bc
- ld de, wAttrMap - wTileMap
+ ld de, wAttrmap - wTilemap
add hl, de
inc b
inc b
diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm
index 7c6ce7d7b..8479c6f61 100644
--- a/engine/link/mystery_gift.asm
+++ b/engine/link/mystery_gift.asm
@@ -1,5 +1,5 @@
DoMysteryGift:
- call ClearTileMap
+ call ClearTilemap
call ClearSprites
call WaitBGMap
call InitMysteryGiftLayout
@@ -24,7 +24,7 @@ DoMysteryGift:
pop af
ldh [rIE], a
push de
- call ClearTileMap
+ call ClearTilemap
call EnableLCD
call WaitBGMap
ld b, SCGB_DIPLOMA
@@ -1396,7 +1396,7 @@ INCBIN "gfx/mystery_gift/mystery_gift.2bpp"
.End
Function105688:
- call ClearTileMap
+ call ClearTilemap
call ClearSprites
call WaitBGMap
call Function1057d7
@@ -1511,7 +1511,7 @@ MysteryGiftLinkCommErrorText:
Function105777:
call ClearSprites
- call ClearTileMap
+ call ClearTilemap
call EnableLCD
call WaitBGMap
ld b, SCGB_DIPLOMA