shithub: pokecrystal

Download patch

ref: 26b8bf003e3523fee94c4c18447ea55f9eb1d429
parent: 34ceaac71d32baace82f1e6de8fd4b252fb92a84
author: mid-kid <esteve.varela@gmail.com>
date: Thu Feb 13 13:30:13 EST 2020 

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.


--- a/data/special_pointers.asm
+++ b/data/special_pointers.asm
@@ -65,7 +65,7 @@
 	add_special ReloadSpritesNoPalettes ; bank 0
 	add_special ClearBGPalettes ; bank 0
 	add_special UpdateTimePals ; bank 0
-	add_special ClearTileMap ; bank 0
+	add_special ClearTilemap ; bank 0
 	add_special UpdateSprites ; bank 0
 	add_special ReplaceKrisSprite ; $38 ; bank 0
 	add_special GameCornerPrizeMonCheckDex
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -585,7 +585,7 @@
 
 	xor a
 	ldh [hBGMapMode], a
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	inc b
 	inc c
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -46,12 +46,12 @@
 	call DelayFrames
 
 .player_2
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	call CheckPlayerPartyForFitMon
 	ld a, d
 	and a
 	jp z, LostBattle
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	ld a, [wBattleType]
 	cp BATTLETYPE_DEBUG
 	jp z, .tutorial_debug
@@ -82,7 +82,7 @@
 	hlcoord 1, 5
 	ld a, 9
 	call SlideBattlePicOut
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	call ResetBattleParticipants
 	call InitBattleMon
 	call ResetPlayerStatLevels
@@ -91,7 +91,7 @@
 	call BreakAttraction
 	call SendOutPlayerMon
 	call EmptyBattleTextbox
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	call SetPlayerTurn
 	call SpikesDamage
 	ld a, [wLinkMode]
@@ -116,7 +116,7 @@
 	jp BattleMenu
 
 WildFled_EnemyFled_LinkBattleCanceled:
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	ld a, [wBattleResult]
 	and BATTLERESULT_BITMASK
 	add DRAW
@@ -291,7 +291,7 @@
 	call HandleStatBoostingHeldItems
 	call HandleHealingItems
 	call UpdateBattleMonInParty
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	jp HandleEncore
 
 CheckFaint_PlayerThenEnemy:
@@ -624,7 +624,7 @@
 	ld [wFXAnimID], a
 	call MoveSelectionScreen
 	push af
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	call UpdateBattleHuds
 	ld a, [wCurPlayerMove]
 	cp STRUGGLE
@@ -862,7 +862,7 @@
 	ret
 
 Battle_EnemyFirst:
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	call TryEnemyFlee
 	jp c, WildFled_EnemyFled_LinkBattleCanceled
 	call SetEnemyTurn
@@ -930,7 +930,7 @@
 	call RefreshBattleHuds
 	pop af
 	jr c, .switched_or_used_item
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	call TryEnemyFlee
 	jp c, WildFled_EnemyFled_LinkBattleCanceled
 	call EnemyTurn_EndOpponentProtectEndureDestinyBond
@@ -2082,7 +2082,7 @@
 	ld a, $1
 	call EnemyPartyMonEntrance
 	call ClearSprites
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	pop af
 	ld [wCurPartyMon], a
 	call PlayerPartyMonEntrance
@@ -2142,7 +2142,7 @@
 	dec a
 	call z, PlayVictoryMusic
 	call EmptyBattleTextbox
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	ld a, [wBattleResult]
 	and BATTLERESULT_BITMASK
 	ld [wBattleResult], a ; WIN
@@ -2303,7 +2303,7 @@
 	cp BATTLEACTION_FORFEIT
 	ret z
 
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 
 .not_linked
 	ld hl, wBattleMonHP
@@ -2401,7 +2401,7 @@
 	inc hl
 	or [hl]
 	ret nz
-	call ClearTileMap
+	call ClearTilemap
 	call ClearBGPalettes
 	ret
 
@@ -2682,7 +2682,7 @@
 
 AskUseNextPokemon:
 	call EmptyBattleTextbox
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 ; We don't need to be here if we're in a Trainer battle,
 ; as that decision is made for us.
 	ld a, [wBattleMode]
@@ -2735,7 +2735,7 @@
 	call ClearBGPalettes
 	call _LoadHPBar
 	call ExitMenu
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	call WaitBGMap
 	call GetMemSGBLayout
 	call SetPalettes
@@ -2763,7 +2763,7 @@
 	call BreakAttraction
 	call SendOutPlayerMon
 	call EmptyBattleTextbox
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	call SetPlayerTurn
 	call SpikesDamage
 	ld a, $1
@@ -2784,7 +2784,7 @@
 	call BreakAttraction
 	call SendOutPlayerMon
 	call EmptyBattleTextbox
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	call SetPlayerTurn
 	jp SpikesDamage
 
@@ -2942,7 +2942,7 @@
 	ld c, BATTLETOWERTEXT_WIN_TEXT
 	farcall BattleTowerText
 	call WaitPressAorB_BlinkCursor
-	call ClearTileMap
+	call ClearTilemap
 	call ClearBGPalettes
 	ret
 
@@ -3141,7 +3141,7 @@
 	ld [wBattlePlayerAction], a
 	inc a
 	ld [wEnemyIsSwitching], a
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	jp PlayerSwitch
 
 EnemySwitch_SetMode:
@@ -3726,7 +3726,7 @@
 	ldh [hEnemyMonSpeed + 0], a
 	ld a, [de]
 	ldh [hEnemyMonSpeed + 1], a
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	ld de, hMultiplicand + 1
 	ld hl, hEnemyMonSpeed
 	ld c, 2
@@ -3791,7 +3791,7 @@
 	call StdBattleTextbox
 	ld a, TRUE
 	ld [wFailedToFlee], a
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	and a
 	ret
 
@@ -3800,7 +3800,7 @@
 	and a
 	ld a, DRAW
 	jr z, .fled
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	xor a ; BATTLEPLAYERACTION_USEMOVE
 	ld [wBattlePlayerAction], a
 	ld a, $f
@@ -3808,7 +3808,7 @@
 	xor a
 	ld [wCurPlayerMove], a
 	call LinkBattleSendReceiveAction
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	call CheckMobileBattleError
 	jr c, .mobile
 
@@ -3833,7 +3833,7 @@
 	ld hl, BattleText_GotAwaySafely
 	call StdBattleTextbox
 	call WaitSFX
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	scf
 	ret
 
@@ -3847,7 +3847,7 @@
 
 .skip_link_error
 	call WaitSFX
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	scf
 	ret
 
@@ -4001,7 +4001,7 @@
 	call BreakAttraction
 	call SendOutPlayerMon
 	call EmptyBattleTextbox
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	ld hl, wEnemyMonHP
 	ld a, [hli]
 	or [hl]
@@ -4860,7 +4860,7 @@
 BattleMenu:
 	xor a
 	ldh [hBGMapMode], a
-	call LoadTempTileMapToTileMap
+	call LoadTempTilemapToTilemap
 
 	ld a, [wBattleType]
 	cp BATTLETYPE_DEBUG
@@ -4870,7 +4870,7 @@
 	call EmptyBattleTextbox
 	call UpdateBattleHuds
 	call EmptyBattleTextbox
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 .ok
 
 .loop
@@ -4907,7 +4907,7 @@
 BattleMenu_Fight:
 	xor a
 	ld [wNumFleeAttempts], a
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	and a
 	ret
 
@@ -4984,7 +4984,7 @@
 	call ExitMenu
 	call WaitBGMap
 	call FinishBattleAnim
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	jp BattleMenu
 
 .ItemsCantBeUsed:
@@ -5019,7 +5019,7 @@
 	call ExitMenu
 	call UpdateBattleHUDs
 	call WaitBGMap
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	call ClearWindowData
 	call FinishBattleAnim
 	and a
@@ -5080,7 +5080,7 @@
 	call DelayFrame
 	call _LoadHPBar
 	call CloseWindow
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	call GetMemSGBLayout
 	call SetPalettes
 	jp BattleMenu
@@ -5254,7 +5254,7 @@
 	call BreakAttraction
 	call SendOutPlayerMon
 	call EmptyBattleTextbox
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	call SetPlayerTurn
 	call SpikesDamage
 	ld a, $2
@@ -5278,12 +5278,12 @@
 	call ApplyStatLevelMultiplierOnAllStats
 	call SendOutPlayerMon
 	call EmptyBattleTextbox
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	call SetPlayerTurn
 	jp SpikesDamage
 
 BattleMenu_Run:
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	ld a, $3
 	ld [wMenuCursorY], a
 	ld hl, wBattleMonSpeed
@@ -5508,7 +5508,7 @@
 
 .place_textbox_start_over
 	call StdBattleTextbox
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	jp MoveSelectionScreen
 
 .string_3e61c
@@ -5771,11 +5771,11 @@
 	and a
 	jr z, .not_linked
 	call EmptyBattleTextbox
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	ld a, [wBattlePlayerAction]
 	and a ; BATTLEPLAYERACTION_USEMOVE?
 	call z, LinkBattleSendReceiveAction
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	ld a, [wBattleAction]
 	cp BATTLEACTION_STRUGGLE
 	jp z, .struggle
@@ -7117,7 +7117,7 @@
 	pop bc
 	call AnimateExpBar
 	push bc
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	pop bc
 	ld hl, MON_EXP + 2
 	add hl, bc
@@ -7270,7 +7270,7 @@
 	callfar BadgeStatBoosts
 	callfar UpdatePlayerHUD
 	call EmptyBattleTextbox
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	ld a, $1
 	ldh [hBGMapMode], a
 
@@ -7286,7 +7286,7 @@
 	call WaitSFX
 	ld hl, BattleText_StringBuffer1GrewToLevel
 	call StdBattleTextbox
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 
 .skip_exp_bar_animation
 	xor a ; PARTYMON
@@ -7302,7 +7302,7 @@
 	ld c, 30
 	call DelayFrames
 	call WaitPressAorB_BlinkCursor
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	xor a ; PARTYMON
 	ld [wMonType], a
 	ld a, [wCurSpecies]
@@ -7799,7 +7799,7 @@
 
 .finish
 	push hl
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	pop hl
 	jp StdBattleTextbox
 
@@ -8342,7 +8342,7 @@
 	ld a, [wInBattleTowerBattle]
 	bit 0, a
 	ret z
-	call ClearTileMap
+	call ClearTilemap
 	call ClearBGPalettes
 	ret
 
@@ -8354,7 +8354,7 @@
 	call GetPartyLocation
 	ld a, [wEnemyMonStatus]
 	ld [hl], a
-	call ClearTileMap
+	call ClearTilemap
 	farcall _ShowLinkBattleParticipants
 	ret
 
@@ -8409,13 +8409,13 @@
 	call IsMobileBattle2
 	jr z, .mobile
 	call WaitPressAorB_BlinkCursor
-	call ClearTileMap
+	call ClearTilemap
 	ret
 
 .mobile
 	ld c, 200
 	call DelayFrames
-	call ClearTileMap
+	call ClearTilemap
 	ret
 
 .Win:
@@ -8431,7 +8431,7 @@
 	call PlaceString
 	ld c, 200
 	call DelayFrames
-	call ClearTileMap
+	call ClearTilemap
 	ret
 
 .Invalid:
@@ -8449,7 +8449,7 @@
 	call ReadAndPrintLinkBattleRecord
 
 	call CloseSRAM
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	xor a
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
@@ -8463,7 +8463,7 @@
 	ret
 
 ReadAndPrintLinkBattleRecord:
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	call .PrintBattleRecord
 	hlcoord 0, 8
@@ -8949,7 +8949,7 @@
 	ldh [rSVBK], a
 
 	ld hl, wDecompressScratch
-	ld bc, wScratchAttrMap - wDecompressScratch
+	ld bc, wScratchAttrmap - wDecompressScratch
 	ld a, " "
 	call ByteFill
 
--- a/engine/battle/returntobattle_useball.asm
+++ b/engine/battle/returntobattle_useball.asm
@@ -1,6 +1,6 @@
 _ReturnToBattle_UseBall:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	ld a, [wBattleType]
 	cp BATTLETYPE_TUTORIAL
 	jr z, .gettutorialbackpic
--- a/engine/battle/start_battle.asm
+++ b/engine/battle/start_battle.asm
@@ -8,7 +8,7 @@
 	farcall _ShowLinkBattleParticipants
 	ld c, 150
 	call DelayFrames
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	ret
 
@@ -38,7 +38,7 @@
 	ld a, 1
 	ldh [hBGMapMode], a
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 	ldh [hWY], a
--- 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
 
--- a/engine/events/diploma.asm
+++ b/engine/events/diploma.asm
@@ -5,7 +5,7 @@
 
 PlaceDiplomaOnScreen:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	call DisableLCD
 	ld hl, DiplomaGFX
--- a/engine/events/magnet_train.asm
+++ b/engine/events/magnet_train.asm
@@ -70,7 +70,7 @@
 	ld [wRequested2bppDest], a
 	ld [wRequested2bppDest + 1], a
 	ld [wRequested2bpp], a
-	call ClearTileMap
+	call ClearTilemap
 
 	pop af
 	ldh [hSCY], a
--- a/engine/events/map_name_sign.asm
+++ b/engine/events/map_name_sign.asm
@@ -135,7 +135,7 @@
 	hlcoord 0, 0
 	ld b, 2
 	ld c, 18
-	call InitMapSignAttrMap
+	call InitMapSignAttrmap
 	call PlaceMapNameFrame
 	ret
 
@@ -171,8 +171,8 @@
 	pop hl
 	ret
 
-InitMapSignAttrMap:
-	ld de, wAttrMap - wTileMap
+InitMapSignAttrmap:
+	ld de, wAttrmap - wTilemap
 	add hl, de
 	inc b
 	inc b
--- a/engine/events/print_unown.asm
+++ b/engine/events/print_unown.asm
@@ -15,7 +15,7 @@
 	set NO_TEXT_SCROLL, a
 	ld [wOptions], a
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 
 	ld de, UnownDexATile
 	ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A
--- a/engine/events/unown_walls.asm
+++ b/engine/events/unown_walls.asm
@@ -139,7 +139,7 @@
 	jr nz, .loop2
 .copy
 	call _DisplayUnownWords_CopyWord
-	ld bc, wAttrMap - wTileMap
+	ld bc, wAttrmap - wTilemap
 	add hl, bc
 	call _DisplayUnownWords_FillAttr
 	call WaitBGMap2
--- a/engine/games/card_flip.asm
+++ b/engine/games/card_flip.asm
@@ -14,7 +14,7 @@
 	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 @@
 	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 @@
 	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
--- a/engine/games/slot_machine.asm
+++ b/engine/games/slot_machine.asm
@@ -96,7 +96,7 @@
 
 .InitGFX:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	ld de, MUSIC_NONE
 	call PlayMusic
--- a/engine/games/unown_puzzle.asm
+++ b/engine/games/unown_puzzle.asm
@@ -9,7 +9,7 @@
 	ld a, $1
 	ldh [hInMenu], a
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	xor a
 	ldh [hBGMapMode], a
@@ -83,7 +83,7 @@
 	pop af
 	ldh [hInMenu], a
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	ld a, LCDC_DEFAULT
 	ldh [rLCDC], a
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -113,31 +113,31 @@
 	call ApplyPals
 _CGB_FinishBattleScreenLayout:
 	call InitPartyMenuBGPal7
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, PAL_BATTLE_BG_ENEMY_HP
 	call ByteFill
-	hlcoord 0, 4, wAttrMap
+	hlcoord 0, 4, wAttrmap
 	lb bc, 8, 10
 	ld a, PAL_BATTLE_BG_PLAYER
 	call FillBoxCGB
-	hlcoord 10, 0, wAttrMap
+	hlcoord 10, 0, wAttrmap
 	lb bc, 7, 10
 	ld a, PAL_BATTLE_BG_ENEMY
 	call FillBoxCGB
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	lb bc, 4, 10
 	ld a, PAL_BATTLE_BG_ENEMY_HP
 	call FillBoxCGB
-	hlcoord 10, 7, wAttrMap
+	hlcoord 10, 7, wAttrmap
 	lb bc, 5, 10
 	ld a, PAL_BATTLE_BG_PLAYER_HP
 	call FillBoxCGB
-	hlcoord 10, 11, wAttrMap
+	hlcoord 10, 11, wAttrmap
 	lb bc, 1, 9
 	ld a, PAL_BATTLE_BG_EXP
 	call FillBoxCGB
-	hlcoord 0, 12, wAttrMap
+	hlcoord 0, 12, wAttrmap
 	ld bc, 6 * SCREEN_WIDTH
 	ld a, PAL_BATTLE_BG_TEXT
 	call ByteFill
@@ -146,7 +146,7 @@
 	ld bc, 6 palettes
 	ld a, BANK(wOBPals1)
 	call FarCopyWRAM
-	call ApplyAttrMap
+	call ApplyAttrmap
 	ret
 
 InitPartyMenuBGPal7:
@@ -214,34 +214,34 @@
 	ld bc, 3 palettes ; pink, green, and blue page palettes
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
-	call WipeAttrMap
+	call WipeAttrmap
 
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	lb bc, 8, SCREEN_WIDTH
 	ld a, $1 ; mon palette
 	call FillBoxCGB
 
-	hlcoord 10, 16, wAttrMap
+	hlcoord 10, 16, wAttrmap
 	ld bc, 10
 	ld a, $2 ; exp palette
 	call ByteFill
 
-	hlcoord 13, 5, wAttrMap
+	hlcoord 13, 5, wAttrmap
 	lb bc, 2, 2
 	ld a, $3 ; pink page palette
 	call FillBoxCGB
 
-	hlcoord 15, 5, wAttrMap
+	hlcoord 15, 5, wAttrmap
 	lb bc, 2, 2
 	ld a, $4 ; green page palette
 	call FillBoxCGB
 
-	hlcoord 17, 5, wAttrMap
+	hlcoord 17, 5, wAttrmap
 	lb bc, 2, 2
 	ld a, $5 ; blue page palette
 	call FillBoxCGB
 
-	call ApplyAttrMap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -269,8 +269,8 @@
 	call GetMonPalettePointer
 	call LoadPalette_White_Col1_Col2_Black ; mon palette
 .got_palette
-	call WipeAttrMap
-	hlcoord 1, 1, wAttrMap
+	call WipeAttrmap
+	hlcoord 1, 1, wAttrmap
 	lb bc, 7, 7
 	ld a, $1 ; green question mark palette
 	call FillBoxCGB
@@ -280,7 +280,7 @@
 	ld bc, 1 palettes
 	ld a, BANK(wOBPals1)
 	call FarCopyWRAM
-	call ApplyAttrMap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -309,13 +309,13 @@
 	call GetPlayerOrMonPalettePointer
 	call LoadPalette_White_Col1_Col2_Black
 .Resume:
-	call WipeAttrMap
-	hlcoord 1, 4, wAttrMap
+	call WipeAttrmap
+	hlcoord 1, 4, wAttrmap
 	lb bc, 7, 7
 	ld a, $1
 	call FillBoxCGB
 	call InitPartyMenuOBPals
-	call ApplyAttrMap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -331,13 +331,13 @@
 	call GetPlayerOrMonPalettePointer
 	call LoadPalette_White_Col1_Col2_Black
 .asm_901a
-	call WipeAttrMap
-	hlcoord 1, 1, wAttrMap
+	call WipeAttrmap
+	hlcoord 1, 1, wAttrmap
 	lb bc, 7, 7
 	ld a, $1
 	call FillBoxCGB
 	call InitPartyMenuOBPals
-	call ApplyAttrMap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -354,13 +354,13 @@
 	ld a, [wCurPartySpecies]
 	call GetMonPalettePointer
 	call LoadPalette_White_Col1_Col2_Black
-	call WipeAttrMap
-	hlcoord 7, 5, wAttrMap
+	call WipeAttrmap
+	hlcoord 7, 5, wAttrmap
 	lb bc, 7, 7
 	ld a, $1
 	call FillBoxCGB
 	call InitPartyMenuOBPals
-	call ApplyAttrMap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -372,48 +372,48 @@
 	ld bc, 16 palettes
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
-	call WipeAttrMap
-	hlcoord 0, 2, wAttrMap
+	call WipeAttrmap
+	hlcoord 0, 2, wAttrmap
 	lb bc, 10, 3
 	ld a, $2
 	call FillBoxCGB
-	hlcoord 17, 2, wAttrMap
+	hlcoord 17, 2, wAttrmap
 	lb bc, 10, 3
 	ld a, $2
 	call FillBoxCGB
-	hlcoord 0, 4, wAttrMap
+	hlcoord 0, 4, wAttrmap
 	lb bc, 6, 3
 	ld a, $3
 	call FillBoxCGB
-	hlcoord 17, 4, wAttrMap
+	hlcoord 17, 4, wAttrmap
 	lb bc, 6, 3
 	ld a, $3
 	call FillBoxCGB
-	hlcoord 0, 6, wAttrMap
+	hlcoord 0, 6, wAttrmap
 	lb bc, 2, 3
 	ld a, $4
 	call FillBoxCGB
-	hlcoord 17, 6, wAttrMap
+	hlcoord 17, 6, wAttrmap
 	lb bc, 2, 3
 	ld a, $4
 	call FillBoxCGB
-	hlcoord 4, 2, wAttrMap
+	hlcoord 4, 2, wAttrmap
 	lb bc, 2, 12
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 3, 2, wAttrMap
+	hlcoord 3, 2, wAttrmap
 	lb bc, 10, 1
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 16, 2, wAttrMap
+	hlcoord 16, 2, wAttrmap
 	lb bc, 10, 1
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 0, 12, wAttrMap
+	hlcoord 0, 12, wAttrmap
 	ld bc, $78
 	ld a, $7
 	call ByteFill
-	call ApplyAttrMap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -422,16 +422,16 @@
 _CGB_BetaTitleScreen:
 	ld hl, PalPacket_BetaTitleScreen + 1
 	call CopyFourPalettes
-	call WipeAttrMap
+	call WipeAttrmap
 	ld de, wOBPals1
 	ld a, PREDEFPAL_PACK
 	call GetPredefPal
 	call LoadHLPaletteIntoDE
-	hlcoord 0, 6, wAttrMap
+	hlcoord 0, 6, wAttrmap
 	lb bc, 12, SCREEN_WIDTH
 	ld a, $1
 	call FillBoxCGB
-	call ApplyAttrMap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -461,7 +461,7 @@
 	ld bc, 2 palettes
 	ld a, BANK(wOBPals1)
 	call FarCopyWRAM
-	call WipeAttrMap
+	call WipeAttrmap
 	ret
 
 .ShellderLaprasBGPalette:
@@ -491,7 +491,7 @@
 	ld a, PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
 	call GetPredefPal
 	call LoadHLPaletteIntoDE
-	call WipeAttrMap
+	call WipeAttrmap
 	ret
 
 .StartersCharizardScene:
@@ -501,7 +501,7 @@
 	ld a, PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
 	call GetPredefPal
 	call LoadHLPaletteIntoDE
-	call WipeAttrMap
+	call WipeAttrmap
 	ret
 
 _CGB_BetaPoker:
@@ -511,8 +511,8 @@
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	call ApplyPals
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	ret
 
 _CGB_Diploma:
@@ -524,8 +524,8 @@
 
 	ld hl, PalPacket_Diploma + 1
 	call CopyFourPalettes
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	ret
 
 _CGB_MapPals:
@@ -540,7 +540,7 @@
 	call InitPartyMenuBGPal0
 	call InitPartyMenuBGPal7
 	call InitPartyMenuOBPals
-	call ApplyAttrMap
+	call ApplyAttrmap
 	ret
 
 _CGB_Evolution:
@@ -570,8 +570,8 @@
 	call FarCopyWRAM
 
 .got_palette
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -598,8 +598,8 @@
 _CGB0d:
 	ld hl, PalPacket_Diploma + 1
 	call CopyFourPalettes
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	ret
 
 _CGB_UnownPuzzle:
@@ -620,8 +620,8 @@
 	ld [hl], a
 	pop af
 	ldh [rSVBK], a
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	ret
 
 _CGB_TrainerCard:
@@ -655,7 +655,7 @@
 	call LoadHLPaletteIntoDE
 
 	; fill screen with opposite-gender palette for the card border
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, [wPlayerGender]
 	and a
@@ -665,7 +665,7 @@
 .got_gender
 	call ByteFill
 	; fill trainer sprite area with same-gender palette
-	hlcoord 14, 1, wAttrMap
+	hlcoord 14, 1, wAttrmap
 	lb bc, 7, 5
 	ld a, [wPlayerGender]
 	and a
@@ -675,33 +675,33 @@
 .got_gender2
 	call FillBoxCGB
 	; top-right corner still uses the border's palette
-	hlcoord 18, 1, wAttrMap
+	hlcoord 18, 1, wAttrmap
 	ld [hl], $1
-	hlcoord 2, 11, wAttrMap
+	hlcoord 2, 11, wAttrmap
 	lb bc, 2, 4
 	ld a, $1 ; falkner
 	call FillBoxCGB
-	hlcoord 6, 11, wAttrMap
+	hlcoord 6, 11, wAttrmap
 	lb bc, 2, 4
 	ld a, $2 ; bugsy
 	call FillBoxCGB
-	hlcoord 10, 11, wAttrMap
+	hlcoord 10, 11, wAttrmap
 	lb bc, 2, 4
 	ld a, $3 ; whitney
 	call FillBoxCGB
-	hlcoord 14, 11, wAttrMap
+	hlcoord 14, 11, wAttrmap
 	lb bc, 2, 4
 	ld a, $4 ; morty
 	call FillBoxCGB
-	hlcoord 2, 14, wAttrMap
+	hlcoord 2, 14, wAttrmap
 	lb bc, 2, 4
 	ld a, $5 ; chuck
 	call FillBoxCGB
-	hlcoord 6, 14, wAttrMap
+	hlcoord 6, 14, wAttrmap
 	lb bc, 2, 4
 	ld a, $6 ; jasmine
 	call FillBoxCGB
-	hlcoord 10, 14, wAttrMap
+	hlcoord 10, 14, wAttrmap
 	lb bc, 2, 4
 	ld a, $7 ; pryce
 	call FillBoxCGB
@@ -710,7 +710,7 @@
 	and a
 	push af
 	jr z, .got_gender3
-	hlcoord 14, 14, wAttrMap
+	hlcoord 14, 14, wAttrmap
 	lb bc, 2, 4
 	ld a, $1
 	call FillBoxCGB
@@ -721,9 +721,9 @@
 	inc c
 .got_gender4
 	ld a, c
-	hlcoord 18, 1, wAttrMap
+	hlcoord 18, 1, wAttrmap
 	ld [hl], a
-	call ApplyAttrMap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -742,12 +742,12 @@
 	ld bc, HPBarPals
 	add hl, bc
 	call LoadPalette_White_Col1_Col2_Black
-	call WipeAttrMap
-	hlcoord 11, 1, wAttrMap
+	call WipeAttrmap
+	hlcoord 11, 1, wAttrmap
 	lb bc, 2, 9
 	ld a, $1
 	call FillBoxCGB
-	call ApplyAttrMap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -756,8 +756,8 @@
 _CGB_BetaPikachuMinigame:
 	ld hl, PalPacket_BetaPikachuMinigame + 1
 	call CopyFourPalettes
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -768,8 +768,8 @@
 	ld a, PREDEFPAL_POKEDEX
 	call GetPredefPal
 	call LoadHLPaletteIntoDE
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -796,28 +796,28 @@
 	ld bc, 8 palettes ; 6 palettes?
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
-	call WipeAttrMap
-	hlcoord 0, 0, wAttrMap
+	call WipeAttrmap
+	hlcoord 0, 0, wAttrmap
 	lb bc, 1, 10
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 10, 0, wAttrMap
+	hlcoord 10, 0, wAttrmap
 	lb bc, 1, 10
 	ld a, $2
 	call FillBoxCGB
-	hlcoord 7, 2, wAttrMap
+	hlcoord 7, 2, wAttrmap
 	lb bc, 9, 1
 	ld a, $3
 	call FillBoxCGB
-	hlcoord 0, 7, wAttrMap
+	hlcoord 0, 7, wAttrmap
 	lb bc, 3, 5
 	ld a, $4
 	call FillBoxCGB
-	hlcoord 0, 3, wAttrMap
+	hlcoord 0, 3, wAttrmap
 	lb bc, 3, 5
 	ld a, $5
 	call FillBoxCGB
-	call ApplyAttrMap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -832,7 +832,7 @@
 _CGB_Pokepic:
 	call _CGB_MapPals
 	ld de, SCREEN_WIDTH
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld a, [wMenuBorderTopCoord]
 .loop
 	and a
@@ -860,22 +860,22 @@
 	ld c, a
 	ld a, $0
 	call FillBoxCGB
-	call ApplyAttrMap
+	call ApplyAttrmap
 	ret
 
 _CGB_MagnetTrain:
 	ld hl, PalPacket_MagnetTrain + 1
 	call CopyFourPalettes
-	call WipeAttrMap
-	hlcoord 0, 4, wAttrMap
+	call WipeAttrmap
+	hlcoord 0, 4, wAttrmap
 	lb bc, 10, SCREEN_WIDTH
 	ld a, $2
 	call FillBoxCGB
-	hlcoord 0, 6, wAttrMap
+	hlcoord 0, 6, wAttrmap
 	lb bc, 6, SCREEN_WIDTH
 	ld a, $1
 	call FillBoxCGB
-	call ApplyAttrMap
+	call ApplyAttrmap
 	call ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -892,8 +892,8 @@
 	ld hl, .Palette
 	ld de, wOBPals1 palette 1
 	call LoadHLPaletteIntoDE
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	call ApplyPals
 	ret
 
@@ -906,8 +906,8 @@
 	ld bc, wTempMonDVs
 	call GetPlayerOrMonPalettePointer
 	call LoadPalette_White_Col1_Col2_Black
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	call ApplyPals
 	ret
 
@@ -916,8 +916,8 @@
 	ld a, [wCurPartySpecies]
 	call GetMonPalettePointer
 	call LoadPalette_White_Col1_Col2_Black
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	ret
 
 _CGB_TradeTube:
@@ -932,7 +932,7 @@
 	ld a, PREDEFPAL_TRADE_TUBE
 	call GetPredefPal
 	call LoadHLPaletteIntoDE
-	call WipeAttrMap
+	call WipeAttrmap
 	ret
 
 _CGB_TrainerOrMonFrontpicPals:
@@ -941,8 +941,8 @@
 	ld bc, wTempMonDVs
 	call GetFrontpicPalettePointer
 	call LoadPalette_White_Col1_Col2_Black
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	call ApplyPals
 	ret
 
@@ -953,28 +953,28 @@
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	call ApplyPals
-	call WipeAttrMap
-	hlcoord 3, 7, wAttrMap
+	call WipeAttrmap
+	hlcoord 3, 7, wAttrmap
 	lb bc, 8, 14
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 1, 5, wAttrMap
+	hlcoord 1, 5, wAttrmap
 	lb bc, 1, 18
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 1, 16, wAttrMap
+	hlcoord 1, 16, wAttrmap
 	lb bc, 1, 18
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	lb bc, 17, 2
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 18, 5, wAttrMap
+	hlcoord 18, 5, wAttrmap
 	lb bc, 12, 1
 	ld a, $1
 	call FillBoxCGB
-	call ApplyAttrMap
+	call ApplyAttrmap
 	ret
 
 .Palettes:
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -103,7 +103,7 @@
 	ld hl, PalPacket_PartyMenu + 1
 	call CopyFourPalettes
 	call InitPartyMenuOBPals
-	call WipeAttrMap
+	call WipeAttrmap
 	ret
 
 ; SGB layout for SCGB_PARTY_MENU_HP_PALS
@@ -284,7 +284,7 @@
 	ld a, [wEnemyLightScreenCount] ; col
 	ld c, a
 	ld a, [wEnemyReflectCount] ; row
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld de, SCREEN_WIDTH
 .loop
 	and a
@@ -320,8 +320,8 @@
 .load_palettes
 	ld de, wBGPals1
 	call LoadPalette_White_Col1_Col2_Black
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	call ApplyPals
 	ret
 
@@ -359,7 +359,7 @@
 .PartyMenu:
 	ld e, c
 	inc e
-	hlcoord 11, 1, wAttrMap
+	hlcoord 11, 1, wAttrmap
 	ld bc, 2 * SCREEN_WIDTH
 	ld a, [wCurPartyMon]
 .loop
@@ -437,8 +437,8 @@
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	call ApplyPals
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	ret
 
 .MailPals:
@@ -453,8 +453,8 @@
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	call ApplyPals
-	call WipeAttrMap
-	call ApplyAttrMap
+	call WipeAttrmap
+	call ApplyAttrmap
 	ret
 
 .Palette:
@@ -590,8 +590,8 @@
 	pop af
 	ret
 
-WipeAttrMap:
-	hlcoord 0, 0, wAttrMap
+WipeAttrmap:
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	xor a
 	call ByteFill
@@ -605,7 +605,7 @@
 	call FarCopyWRAM
 	ret
 
-ApplyAttrMap:
+ApplyAttrmap:
 	ldh a, [rLCDC]
 	bit rLCDC_ENABLE, a
 	jr z, .UpdateVBank1
@@ -622,7 +622,7 @@
 	ret
 
 .UpdateVBank1:
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	debgcoord 0, 0
 	ld b, SCREEN_HEIGHT
 	ld a, $1
@@ -659,7 +659,7 @@
 	ld a, [de]
 	inc a
 	ld e, a
-	hlcoord 11, 2, wAttrMap
+	hlcoord 11, 2, wAttrmap
 	ld bc, 2 * SCREEN_WIDTH
 	ld a, [wSGBPals]
 .loop
--- a/engine/gfx/crystal_layouts.asm
+++ b/engine/gfx/crystal_layouts.asm
@@ -42,8 +42,8 @@
 	jr nz, .row
 	ret
 
-MG_Mobile_Layout_WipeAttrMap:
-	hlcoord 0, 0, wAttrMap
+MG_Mobile_Layout_WipeAttrmap:
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	xor a
 	call ByteFill
@@ -64,14 +64,14 @@
 
 MG_Mobile_Layout00:
 	call MG_Mobile_Layout_LoadPals
-	call MG_Mobile_Layout_WipeAttrMap
+	call MG_Mobile_Layout_WipeAttrmap
 	call MG_Mobile_Layout_CreatePalBoxes
-	farcall ApplyAttrMap
+	farcall ApplyAttrmap
 	farcall ApplyPals
 	ret
 
 MG_Mobile_Layout_CreatePalBoxes:
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	lb bc, 4, 1
 	ld a, $1
 	call MG_Mobile_Layout_FillBox
@@ -81,7 +81,7 @@
 	lb bc, 6, 1
 	ld a, $3
 	call MG_Mobile_Layout_FillBox
-	hlcoord 1, 0, wAttrMap
+	hlcoord 1, 0, wAttrmap
 	ld a, $1
 	lb bc, 3, 18
 	call MG_Mobile_Layout_FillBox
@@ -91,7 +91,7 @@
 	lb bc, 12, 18
 	ld a, $3
 	call MG_Mobile_Layout_FillBox
-	hlcoord 19, 0, wAttrMap
+	hlcoord 19, 0, wAttrmap
 	lb bc, 4, 1
 	ld a, $1
 	call MG_Mobile_Layout_FillBox
@@ -101,7 +101,7 @@
 	lb bc, 6, 1
 	ld a, $3
 	call MG_Mobile_Layout_FillBox
-	hlcoord 0, 12, wAttrMap
+	hlcoord 0, 12, wAttrmap
 	ld bc, 6 * SCREEN_WIDTH
 	ld a, $7
 	call ByteFill
@@ -136,12 +136,12 @@
 	ld bc, 1 palettes
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
-	call MG_Mobile_Layout_WipeAttrMap
-	hlcoord 0, 0, wAttrMap
+	call MG_Mobile_Layout_WipeAttrmap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	xor a
 	call ByteFill
-	hlcoord 0, 14, wAttrMap
+	hlcoord 0, 14, wAttrmap
 	ld bc, 4 * SCREEN_WIDTH
 	ld a, $7
 	call ByteFill
@@ -155,7 +155,7 @@
 	call Function49496
 
 .asm_49467
-	farcall ApplyAttrMap
+	farcall ApplyAttrmap
 	farcall ApplyPals
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -168,26 +168,26 @@
 	RGB 00, 00, 00
 
 Function49480:
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	lb bc, 4, SCREEN_WIDTH
 	ld a, $7
 	call MG_Mobile_Layout_FillBox
-	hlcoord 0, 2, wAttrMap
+	hlcoord 0, 2, wAttrmap
 	ld a, $4
 	ld [hl], a
-	hlcoord 19, 2, wAttrMap
+	hlcoord 19, 2, wAttrmap
 	ld [hl], a
 	ret
 
 Function49496:
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	lb bc, 2, SCREEN_WIDTH
 	ld a, $7
 	call MG_Mobile_Layout_FillBox
-	hlcoord 0, 1, wAttrMap
+	hlcoord 0, 1, wAttrmap
 	ld a, $4
 	ld [hl], a
-	hlcoord 19, 1, wAttrMap
+	hlcoord 19, 1, wAttrmap
 	ld [hl], a
 	ret
 
@@ -200,8 +200,8 @@
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	farcall ApplyPals
-	call MG_Mobile_Layout_WipeAttrMap
-	farcall ApplyAttrMap
+	call MG_Mobile_Layout_WipeAttrmap
+	farcall ApplyAttrmap
 	ld hl, .Palette_4973a
 	ld de, wOBPals1
 	ld bc, 1 palettes
@@ -234,43 +234,43 @@
 INCLUDE "gfx/unknown/49757.pal"
 
 _InitMG_Mobile_LinkTradePalMap:
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	lb bc, 16, 2
 	ld a, $4
 	call MG_Mobile_Layout_FillBox
 	ld a, $3
-	ldcoord_a 0, 1, wAttrMap
-	ldcoord_a 0, 14, wAttrMap
-	hlcoord 2, 0, wAttrMap
+	ldcoord_a 0, 1, wAttrmap
+	ldcoord_a 0, 14, wAttrmap
+	hlcoord 2, 0, wAttrmap
 	lb bc, 8, 18
 	ld a, $5
 	call MG_Mobile_Layout_FillBox
-	hlcoord 2, 8, wAttrMap
+	hlcoord 2, 8, wAttrmap
 	lb bc, 8, 18
 	ld a, $6
 	call MG_Mobile_Layout_FillBox
-	hlcoord 0, 16, wAttrMap
+	hlcoord 0, 16, wAttrmap
 	lb bc, 2, SCREEN_WIDTH
 	ld a, $4
 	call MG_Mobile_Layout_FillBox
 	ld a, $3
 	lb bc, 6, 1
-	hlcoord 6, 1, wAttrMap
+	hlcoord 6, 1, wAttrmap
 	call MG_Mobile_Layout_FillBox
 	ld a, $3
 	lb bc, 6, 1
-	hlcoord 17, 1, wAttrMap
+	hlcoord 17, 1, wAttrmap
 	call MG_Mobile_Layout_FillBox
 	ld a, $3
 	lb bc, 6, 1
-	hlcoord 6, 9, wAttrMap
+	hlcoord 6, 9, wAttrmap
 	call MG_Mobile_Layout_FillBox
 	ld a, $3
 	lb bc, 6, 1
-	hlcoord 17, 9, wAttrMap
+	hlcoord 17, 9, wAttrmap
 	call MG_Mobile_Layout_FillBox
 	ld a, $2
-	hlcoord 2, 16, wAttrMap
+	hlcoord 2, 16, wAttrmap
 	ld [hli], a
 	ld a, $7
 	ld [hli], a
@@ -278,7 +278,7 @@
 	ld [hli], a
 	ld a, $2
 	ld [hl], a
-	hlcoord 2, 17, wAttrMap
+	hlcoord 2, 17, wAttrmap
 	ld a, $3
 	ld bc, 6
 	call ByteFill
--- a/engine/gfx/dma_transfer.asm
+++ b/engine/gfx/dma_transfer.asm
@@ -1,49 +1,49 @@
-HDMATransferAttrMapAndTileMapToWRAMBank3::
+HDMATransferAttrmapAndTilemapToWRAMBank3::
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
 .Function:
-	decoord 0, 0, wAttrMap
-	ld hl, wScratchAttrMap
-	call PadAttrMapForHDMATransfer
+	decoord 0, 0, wAttrmap
+	ld hl, wScratchAttrmap
+	call PadAttrmapForHDMATransfer
 	decoord 0, 0
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call PadTilemapForHDMATransfer
 	ld a, $0
 	ldh [rVBK], a
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call HDMATransferToWRAMBank3
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, wScratchAttrMap
+	ld hl, wScratchAttrmap
 	call HDMATransferToWRAMBank3
 	ret
 
-HDMATransferTileMapToWRAMBank3::
+HDMATransferTilemapToWRAMBank3::
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
 .Function:
 	decoord 0, 0
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call PadTilemapForHDMATransfer
 	ld a, $0
 	ldh [rVBK], a
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call HDMATransferToWRAMBank3
 	ret
 
-HDMATransferAttrMapToWRAMBank3:
+HDMATransferAttrmapToWRAMBank3:
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
 .Function:
-	decoord 0, 0, wAttrMap
-	ld hl, wScratchAttrMap
-	call PadAttrMapForHDMATransfer
+	decoord 0, 0, wAttrmap
+	ld hl, wScratchAttrmap
+	call PadAttrmapForHDMATransfer
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, wScratchAttrMap
+	ld hl, wScratchAttrmap
 	call HDMATransferToWRAMBank3
 	ret
 
@@ -52,11 +52,11 @@
 	jp CallInSafeGFXMode
 
 .Function:
-	decoord 0, 0, wAttrMap
-	ld hl, wScratchAttrMap
-	call PadAttrMapForHDMATransfer
+	decoord 0, 0, wAttrmap
+	ld hl, wScratchAttrmap
+	call PadAttrmapForHDMATransfer
 	decoord 0, 0
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call PadTilemapForHDMATransfer
 	call DelayFrame
 
@@ -65,11 +65,11 @@
 	push af
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, wScratchAttrMap
+	ld hl, wScratchAttrmap
 	call HDMATransfer_Wait127Scanlines_toBGMap
 	ld a, $0
 	ldh [rVBK], a
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call HDMATransfer_Wait127Scanlines_toBGMap
 	pop af
 	ldh [rVBK], a
@@ -83,11 +83,11 @@
 	jp CallInSafeGFXMode
 
 .Function:
-	decoord 0, 0, wAttrMap
-	ld hl, wScratchAttrMap
-	call PadAttrMapForHDMATransfer
+	decoord 0, 0, wAttrmap
+	ld hl, wScratchAttrmap
+	call PadAttrmapForHDMATransfer
 	decoord 0, 0
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call PadTilemapForHDMATransfer
 	call DelayFrame
 
@@ -96,11 +96,11 @@
 	push af
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, wScratchAttrMap
+	ld hl, wScratchAttrmap
 	call HDMATransfer_NoDI
 	ld a, $0
 	ldh [rVBK], a
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call HDMATransfer_NoDI
 	pop af
 	ldh [rVBK], a
@@ -144,20 +144,20 @@
 	call HDMATransferToWRAMBank3
 	ret
 
-OpenAndCloseMenu_HDMATransferTileMapAndAttrMap::
+OpenAndCloseMenu_HDMATransferTilemapAndAttrmap::
 ; OpenText
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
 .Function:
-	; Transfer wAttrMap and Tilemap to BGMap
+	; Transfer wAttrmap and Tilemap to BGMap
 	; Fill vBGAttrs with $00
 	; Fill vBGTiles with " "
-	decoord 0, 0, wAttrMap
-	ld hl, wScratchAttrMap
-	call PadAttrMapForHDMATransfer
+	decoord 0, 0, wAttrmap
+	ld hl, wScratchAttrmap
+	call PadAttrmapForHDMATransfer
 	decoord 0, 0
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call PadTilemapForHDMATransfer
 	call DelayFrame
 
@@ -166,11 +166,11 @@
 	push af
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, wScratchAttrMap
+	ld hl, wScratchAttrmap
 	call HDMATransfer_Wait123Scanlines_toBGMap
 	ld a, $0
 	ldh [rVBK], a
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call HDMATransfer_Wait123Scanlines_toBGMap
 	pop af
 	ldh [rVBK], a
@@ -177,29 +177,29 @@
 	ei
 	ret
 
-Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:
+Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap:
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
 .Function:
-	; Transfer wAttrMap and Tilemap to BGMap
+	; Transfer wAttrmap and Tilemap to BGMap
 	; Fill vBGAttrs with $00
 	; Fill vBGTiles with $ff
-	decoord 0, 0, wAttrMap
-	ld hl, wScratchAttrMap
-	call PadAttrMapForHDMATransfer
+	decoord 0, 0, wAttrmap
+	ld hl, wScratchAttrmap
+	call PadAttrmapForHDMATransfer
 	ld c, $ff
 	decoord 0, 0
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call PadMapForHDMATransfer
 
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, wScratchAttrMap
+	ld hl, wScratchAttrmap
 	call HDMATransfer_Wait127Scanlines_toBGMap
 	ld a, $0
 	ldh [rVBK], a
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call HDMATransfer_Wait127Scanlines_toBGMap
 	ret
 
@@ -213,7 +213,7 @@
 	ldh [hMapAnims], a
 	ldh a, [rSVBK]
 	push af
-	ld a, BANK(wScratchTileMap)
+	ld a, BANK(wScratchTilemap)
 	ldh [rSVBK], a
 	ldh a, [rVBK]
 	push af
@@ -410,7 +410,7 @@
 	ld c, " "
 	jr PadMapForHDMATransfer
 
-PadAttrMapForHDMATransfer:
+PadAttrmapForHDMATransfer:
 	ld c, $0
 
 PadMapForHDMATransfer:
@@ -455,13 +455,13 @@
 	; switch to WRAM bank 6
 	ldh a, [rSVBK]
 	push af
-	ld a, BANK(wScratchTileMap)
+	ld a, BANK(wScratchTilemap)
 	ldh [rSVBK], a
 
 	push bc
 	push hl
 
-	; Copy c tiles of the 2bpp from b:de to wScratchTileMap
+	; Copy c tiles of the 2bpp from b:de to wScratchTilemap
 	ld a, b ; bank
 	ld l, c ; number of tiles
 	ld h, $0
@@ -474,7 +474,7 @@
 	ld c, l
 	ld h, d ; address
 	ld l, e
-	ld de, wScratchTileMap
+	ld de, wScratchTilemap
 	call FarCopyBytes
 
 	pop hl
@@ -486,7 +486,7 @@
 
 	ld d, h
 	ld e, l
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call HDMATransfer_Wait127Scanlines
 
 	; restore the previous bank
@@ -523,7 +523,7 @@
 .bankswitch
 	ldh a, [rSVBK]
 	push af
-	ld a, BANK(wScratchTileMap)
+	ld a, BANK(wScratchTilemap)
 	ldh [rSVBK], a
 
 	push bc
@@ -539,7 +539,7 @@
 	ld b, h
 	ld h, d
 	ld l, e
-	ld de, wScratchTileMap
+	ld de, wScratchTilemap
 	call FarCopyBytesDouble_DoubleBankSwitch
 
 	pop hl
@@ -551,7 +551,7 @@
 
 	ld d, h
 	ld e, l
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	call HDMATransfer_Wait127Scanlines
 
 	pop af
@@ -563,22 +563,22 @@
 	jp CallInSafeGFXMode
 
 .Function:
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	decoord 0, 0
 	call .Copy
-	ld hl, wScratchTileMap + $80
-	decoord 0, 0, wAttrMap
+	ld hl, wScratchTilemap + $80
+	decoord 0, 0, wAttrmap
 	call .Copy
 	ld a, $1
 	ldh [rVBK], a
 	ld c, $8
-	ld hl, wScratchTileMap + $80
+	ld hl, wScratchTilemap + $80
 	debgcoord 0, 0, vBGMap1
 	call HDMATransfer_Wait127Scanlines
 	ld a, $0
 	ldh [rVBK], a
 	ld c, $8
-	ld hl, wScratchTileMap
+	ld hl, wScratchTilemap
 	debgcoord 0, 0, vBGMap1
 	call HDMATransfer_Wait127Scanlines
 	ret
--- a/engine/gfx/pic_animation.asm
+++ b/engine/gfx/pic_animation.asm
@@ -87,7 +87,7 @@
 .loop
 	call SetUpPokeAnim
 	push af
-	farcall HDMATransferTileMapToWRAMBank3
+	farcall HDMATransferTilemapToWRAMBank3
 	pop af
 	jr nc, .loop
 	ret
@@ -261,9 +261,9 @@
 	ld a, BANK(wPokeAnimCoord)
 	ldh [rSVBK], a
 	call PokeAnim_PlaceGraphic
-	farcall HDMATransferTileMapToWRAMBank3
+	farcall HDMATransferTilemapToWRAMBank3
 	call PokeAnim_SetVBank0
-	farcall HDMATransferAttrMapToWRAMBank3
+	farcall HDMATransferAttrmapToWRAMBank3
 	pop af
 	ldh [rSVBK], a
 	ret
@@ -830,13 +830,13 @@
 	xor a
 	ldh [hBGMapMode], a
 	call .SetFlag
-	farcall HDMATransferAttrMapToWRAMBank3
+	farcall HDMATransferAttrmapToWRAMBank3
 	pop af
 	ldh [rSVBK], a
 	ret
 
 .SetFlag:
-	call PokeAnim_GetAttrMapCoord
+	call PokeAnim_GetAttrmapCoord
 	ld b, 7
 	ld c, 7
 	ld de, SCREEN_WIDTH
@@ -858,7 +858,7 @@
 	ret
 
 PokeAnim_SetVBank0:
-	call PokeAnim_GetAttrMapCoord
+	call PokeAnim_GetAttrmapCoord
 	ld b, 7
 	ld c, 7
 	ld de, SCREEN_WIDTH
@@ -879,12 +879,12 @@
 	jr nz, .row
 	ret
 
-PokeAnim_GetAttrMapCoord:
+PokeAnim_GetAttrmapCoord:
 	ld hl, wPokeAnimCoord
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld de, wAttrMap - wTileMap
+	ld de, wAttrmap - wTilemap
 	add hl, de
 	ret
 
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -697,7 +697,7 @@
 	jr z, .toss
 
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 
 .toss
 	ld hl, wNumItems
@@ -1761,7 +1761,7 @@
 	xor a
 	ldh [hBGMapMode], a
 	hlcoord 0, 0
-	ld bc, wTileMapEnd - wTileMap
+	ld bc, wTilemapEnd - wTilemap
 	ld a, " "
 	call ByteFill
 	ld a, [wPartyMenuActionText]
--- a/engine/items/pack.asm
+++ b/engine/items/pack.asm
@@ -1326,7 +1326,7 @@
 
 Pack_InitGFX:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	call DisableLCD
 	ld hl, PackMenuGFX
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@@ -1328,7 +1328,7 @@
 	jp LinkTradeOTPartymonMenuLoop  ; OTPARTYMON
 
 Function28926:
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	ld a, [wMenuCursorY]
 	push af
 	hlcoord 0, 15
@@ -1369,7 +1369,7 @@
 .b_button
 	pop af
 	ld [wMenuCursorY], a
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	jp LinkTrade_PlayerPartyMenu
 
 .d_right
@@ -1407,7 +1407,7 @@
 	ld [wInitListType], a
 	callfar InitList
 	farcall LinkMonStatsScreen
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	hlcoord 6, 1
 	lb bc, 6, 1
 	ld a, " "
@@ -1844,7 +1844,7 @@
 	ld [wd003], a
 	ld c, 100
 	call DelayFrames
-	call ClearTileMap
+	call ClearTilemap
 	call LoadFontsBattleExtra
 	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
--- a/engine/link/link_2.asm
+++ b/engine/link/link_2.asm
@@ -31,7 +31,7 @@
 	pop hl
 	pop bc
 
-	ld de, wAttrMap - wTileMap
+	ld de, wAttrmap - wTilemap
 	add hl, de
 	inc b
 	inc b
--- a/engine/link/link_trade.asm
+++ b/engine/link/link_trade.asm
@@ -18,7 +18,7 @@
 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 @@
 	pop hl
 	pop bc
 
-	ld de, wAttrMap - wTileMap
+	ld de, wAttrmap - wTilemap
 	add hl, de
 	inc b
 	inc b
--- 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 @@
 	pop af
 	ldh [rIE], a
 	push de
-	call ClearTileMap
+	call ClearTilemap
 	call EnableLCD
 	call WaitBGMap
 	ld b, SCGB_DIPLOMA
@@ -1396,7 +1396,7 @@
 .End
 
 Function105688:
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	call WaitBGMap
 	call Function1057d7
@@ -1511,7 +1511,7 @@
 
 Function105777:
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	call EnableLCD
 	call WaitBGMap
 	ld b, SCGB_DIPLOMA
--- a/engine/menus/debug.asm
+++ b/engine/menus/debug.asm
@@ -135,7 +135,7 @@
 	ld bc, sScratch - vTiles0
 	xor a
 	call ByteFill
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	xor a
 	call ByteFill
@@ -378,15 +378,15 @@
 String_81bb9: db DEBUGTEST_A, "きりかえ▶@" ; (A) switches
 
 Function81bc0:
-	decoord 0, 11, wAttrMap
+	decoord 0, 11, wAttrmap
 	hlcoord 2, 11
 	ld a, $1
 	call Function81bde
-	decoord 0, 13, wAttrMap
+	decoord 0, 13, wAttrmap
 	hlcoord 2, 13
 	ld a, $2
 	call Function81bde
-	decoord 0, 15, wAttrMap
+	decoord 0, 15, wAttrmap
 	hlcoord 2, 15
 	ld a, $3
 
@@ -1061,7 +1061,7 @@
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, DEBUGTEST_BLACK
 	call ByteFill
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, $7
 	call ByteFill
@@ -1091,7 +1091,7 @@
 
 Function821d8:
 	ld a, [wcf64]
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 
 Function821de:
 	add hl, de
--- a/engine/menus/init_gender.asm
+++ b/engine/menus/init_gender.asm
@@ -73,7 +73,7 @@
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	ld a, $0
 	call ByteFill
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	xor a
 	call ByteFill
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -39,10 +39,10 @@
 .Day:
 	db "DAY@"
 
-NewGame_ClearTileMapEtc:
+NewGame_ClearTilemapEtc:
 	xor a
 	ldh [hMapAnims], a
-	call ClearTileMap
+	call ClearTilemap
 	call LoadFontsExtra
 	call LoadStandardFont
 	call ClearWindowData
@@ -62,7 +62,7 @@
 	xor a
 	ld [wDebugFlags], a
 	call ResetWRAM
-	call NewGame_ClearTileMapEtc
+	call NewGame_ClearTilemapEtc
 	call AreYouABoyOrAreYouAGirl
 	call OakSpeech
 	call InitializeWorld
@@ -359,7 +359,7 @@
 	call ClearBGPalettes
 	call Continue_MobileAdapterMenu
 	call CloseWindow
-	call ClearTileMap
+	call ClearTilemap
 	ld c, 20
 	call DelayFrames
 	farcall JumpRoamMons
@@ -627,7 +627,7 @@
 OakSpeech:
 	farcall InitClock
 	call RotateFourPalettesLeft
-	call ClearTileMap
+	call ClearTilemap
 
 	ld de, MUSIC_ROUTE_30
 	call PlayMusic
@@ -647,7 +647,7 @@
 	ld hl, OakText1
 	call PrintText
 	call RotateThreePalettesRight
-	call ClearTileMap
+	call ClearTilemap
 
 	ld a, WOOPER
 	ld [wCurSpecies], a
@@ -670,7 +670,7 @@
 	ld hl, OakText4
 	call PrintText
 	call RotateThreePalettesRight
-	call ClearTileMap
+	call ClearTilemap
 
 	xor a
 	ld [wCurPartySpecies], a
@@ -685,7 +685,7 @@
 	ld hl, OakText5
 	call PrintText
 	call RotateThreePalettesRight
-	call ClearTileMap
+	call ClearTilemap
 
 	xor a
 	ld [wCurPartySpecies], a
@@ -752,7 +752,7 @@
 	farcall NamingScreen
 
 	call RotateThreePalettesRight
-	call ClearTileMap
+	call ClearTilemap
 
 	call LoadFontsExtra
 	call WaitBGMap
@@ -848,7 +848,7 @@
 	call DelayFrames
 
 	call RotateThreePalettesRight
-	call ClearTileMap
+	call ClearTilemap
 	ret
 
 Intro_RotatePalettesLeftFrontpic:
@@ -1293,7 +1293,7 @@
 	db  0 * 8,      0 * 8, 11 * 8 + 4, 11 * 8
 
 Copyright:
-	call ClearTileMap
+	call ClearTilemap
 	call LoadFontsExtra
 	ld de, CopyrightGFX
 	ld hl, vTiles2 tile $60
@@ -1322,7 +1322,7 @@
 	farcall TryLoadSaveData
 	call ClearWindowData
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	ld a, HIGH(vBGMap0)
 	ldh [hBGMapAddress + 1], a
 	xor a ; LOW(vBGMap0)
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -18,7 +18,7 @@
 	call MainMenuJoypadLoop
 	call CloseWindow
 	jr c, .quit
-	call ClearTileMap
+	call ClearTilemap
 	ld a, [wMenuSelection]
 	ld hl, .Jumptable
 	rst JumpTable
@@ -313,7 +313,7 @@
 Function49ed0:
 	xor a
 	ldh [hMapAnims], a
-	call ClearTileMap
+	call ClearTilemap
 	call LoadFontsExtra
 	call LoadStandardFont
 	call ClearWindowData
--- a/engine/menus/menu.asm
+++ b/engine/menus/menu.asm
@@ -276,7 +276,7 @@
 	call Place2DMenuCursor
 .loop
 	call Move2DMenuCursor
-	call HDMATransferTileMapToWRAMBank3 ; BUG: This function is in another bank.
+	call HDMATransferTilemapToWRAMBank3 ; BUG: This function is in another bank.
 	                    ; Pointer in current bank (9) is bogus.
 	call .loop2
 	jr nc, .done
--- a/engine/menus/savemenu_copytilemapatonce.asm
+++ b/engine/menus/savemenu_copytilemapatonce.asm
@@ -20,7 +20,7 @@
 	di
 	ld a, BANK(vBGMap2)
 	ldh [rVBK], a
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	call .CopyTilemapAtOnce
 	ld a, BANK(vBGMap0)
 	ldh [rVBK], a
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -33,7 +33,7 @@
 	call DrawVariableLengthMenuBox
 	call .DrawBugContestStatusBox
 	call SafeUpdateSprites
-	call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+	call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 	farcall LoadFonts_NoOAMUpdate
 	call .DrawBugContestStatus
 	call UpdateTimePals
--- a/engine/menus/trainer_card.asm
+++ b/engine/menus/trainer_card.asm
@@ -41,7 +41,7 @@
 .InitRAM:
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	call DisableLCD
 
 	farcall GetCardPic
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -17,7 +17,7 @@
 	ldh [rSVBK], a
 
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 
 	ld hl, wCreditsBlankFrame2bpp
@@ -419,22 +419,22 @@
 	ld a, $20
 	call DrawCreditsBorder
 
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, 4 * SCREEN_WIDTH
 	xor a
 	call ByteFill
 
-	hlcoord 0, 4, wAttrMap
+	hlcoord 0, 4, wAttrmap
 	ld bc, SCREEN_WIDTH
 	ld a, $1
 	call ByteFill
 
-	hlcoord 0, 5, wAttrMap
+	hlcoord 0, 5, wAttrmap
 	ld bc, 12 * SCREEN_WIDTH
 	ld a, $2
 	call ByteFill
 
-	hlcoord 0, 17, wAttrMap
+	hlcoord 0, 17, wAttrmap
 	ld bc, SCREEN_WIDTH
 	ld a, $1
 	call ByteFill
--- a/engine/movie/crystal_intro.asm
+++ b/engine/movie/crystal_intro.asm
@@ -2,7 +2,7 @@
 	ld de, MUSIC_NONE
 	call PlayMusic
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	ld a, HIGH(vBGMap0)
 	ldh [hBGMapAddress + 1], a
 	xor a ; LOW(vBGMap0)
@@ -22,7 +22,7 @@
 	call WaitBGMap
 	ld c, 100
 	call DelayFrames
-	call ClearTileMap
+	call ClearTilemap
 	farcall GBCOnlyScreen
 	call .GetGFLogoGFX
 .joy_loop
@@ -106,7 +106,7 @@
 
 .StopGamefreakAnim:
 	farcall ClearSpriteAnims
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	ld c, 16
 	call DelayFrames
@@ -363,7 +363,7 @@
 .done
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hSCX], a
 	ldh [hSCY], a
@@ -440,7 +440,7 @@
 ; Setup the next scene.
 	call Intro_ClearBGPals
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 	ld a, $1
@@ -516,7 +516,7 @@
 ; More setup. Transition to the outdoor scene.
 	call Intro_ClearBGPals
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 	ld a, $1
@@ -578,7 +578,7 @@
 ; Go back to the Unown.
 	call Intro_ClearBGPals
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 	ldh [hLCDCPointer], a
@@ -676,7 +676,7 @@
 ; Back to the outdoor scene.
 	call Intro_ClearBGPals
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 
@@ -777,7 +777,7 @@
 	xor a
 	ldh [hLCDCPointer], a
 	call ClearSprites
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	; first 12 rows have palette 1
 	ld bc, 12 * SCREEN_WIDTH
 	ld a, $1
@@ -846,7 +846,7 @@
 ; Back to Unown again.
 	call Intro_ClearBGPals
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 	ldh [hLCDCPointer], a
@@ -970,7 +970,7 @@
 ; Switch scenes again.
 	call Intro_ClearBGPals
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 	ld a, $1
@@ -1074,7 +1074,7 @@
 ; Transition to a new scene.
 	call Intro_ClearBGPals
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 	ld a, $1
@@ -1156,7 +1156,7 @@
 ; ...
 	call Intro_ClearBGPals
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 	ld a, $1
@@ -1222,7 +1222,7 @@
 ; More setup.
 	call Intro_ClearBGPals
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 	ld a, $1
@@ -1399,7 +1399,7 @@
 ; Load the final scene.
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 	ld a, $1
--- a/engine/movie/gbc_only.asm
+++ b/engine/movie/gbc_only.asm
@@ -6,7 +6,7 @@
 	ld de, MUSIC_NONE
 	call PlayMusic
 
-	call ClearTileMap
+	call ClearTilemap
 
 	ld hl, GBCOnlyGFX
 	ld de, wGBCOnlyDecompressBuffer
--- a/engine/movie/init_hof_credits.asm
+++ b/engine/movie/init_hof_credits.asm
@@ -1,6 +1,6 @@
 InitDisplayForHallOfFame:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	call DisableLCD
 	call LoadStandardFont
@@ -9,7 +9,7 @@
 	ld bc, vBGMap1 - vBGMap0
 	ld a, " "
 	call ByteFill
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	xor a
 	call ByteFill
@@ -29,7 +29,7 @@
 
 InitDisplayForRedCredits:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	call DisableLCD
 	call LoadStandardFont
@@ -38,7 +38,7 @@
 	ld bc, vBGMap1 - vBGMap0
 	ld a, " "
 	call ByteFill
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	xor a
 	call ByteFill
@@ -65,7 +65,7 @@
 	ld a, BANK(wDecompressScratch)
 	ldh [rSVBK], a
 	ld hl, wDecompressScratch
-	ld bc, wScratchAttrMap - wDecompressScratch
+	ld bc, wScratchAttrmap - wDecompressScratch
 	ld a, " "
 	call ByteFill
 	hlbgcoord 0, 0
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -1,7 +1,7 @@
 _TitleScreen:
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 
 ; Turn BG Map update off
 	xor a
--- a/engine/movie/trade_animation.asm
+++ b/engine/movie/trade_animation.asm
@@ -149,7 +149,7 @@
 	ld [wJumptableIndex], a
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	call DisableLCD
 	call LoadFontsBattleExtra
 	callfar ClearSpriteAnims
@@ -466,7 +466,7 @@
 TradeAnim_TubeToOT8:
 TradeAnim_TubeToPlayer8:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	call DisableLCD
 	callfar ClearSpriteAnims
@@ -534,7 +534,7 @@
 
 .Zero:
 .Three:
-	call TradeAnim_BlankTileMap
+	call TradeAnim_BlankTilemap
 	hlcoord 9, 3
 	ld [hl], $5b
 	inc hl
@@ -546,7 +546,7 @@
 	ret
 
 .One:
-	call TradeAnim_BlankTileMap
+	call TradeAnim_BlankTilemap
 	hlcoord 0, 3
 	ld bc, SCREEN_WIDTH
 	ld a, $60
@@ -554,7 +554,7 @@
 	ret
 
 .Two:
-	call TradeAnim_BlankTileMap
+	call TradeAnim_BlankTilemap
 	hlcoord 0, 3
 	ld bc, $11
 	ld a, $60
@@ -593,7 +593,7 @@
 	call WaitTop
 	ld a, HIGH(vBGMap1)
 	ldh [hBGMapAddress + 1], a
-	call ClearTileMap
+	call ClearTilemap
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH
 	ld a, "─"
@@ -623,11 +623,11 @@
 	call WaitTop
 	ld a, HIGH(vBGMap0)
 	ldh [hBGMapAddress + 1], a
-	call ClearTileMap
+	call ClearTilemap
 	ret
 
 TradeAnim_EnterLinkTube1:
-	call ClearTileMap
+	call ClearTilemap
 	call WaitTop
 	ld a, $a0
 	ldh [hSCX], a
@@ -671,7 +671,7 @@
 	ret
 
 .done
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hSCX], a
 	call TradeAnim_AdvanceScriptPointer
@@ -735,7 +735,7 @@
 	call WaitTop
 	ld a, HIGH(vBGMap0)
 	ldh [hBGMapAddress + 1], a
-	call ClearTileMap
+	call ClearTilemap
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
@@ -840,7 +840,7 @@
 	lb bc, 10, $31
 	call Request2bpp
 	call WaitTop
-	call TradeAnim_BlankTileMap
+	call TradeAnim_BlankTilemap
 	hlcoord 7, 2
 	xor a
 	ldh [hGraphicStartTile], a
@@ -925,7 +925,7 @@
 
 TrademonStats_MonTemplate:
 	call WaitTop
-	call TradeAnim_BlankTileMap
+	call TradeAnim_BlankTilemap
 	ld a, HIGH(vBGMap1)
 	ldh [hBGMapAddress + 1], a
 	hlcoord 3, 0
@@ -945,7 +945,7 @@
 
 TrademonStats_Egg:
 	call WaitTop
-	call TradeAnim_BlankTileMap
+	call TradeAnim_BlankTilemap
 	ld a, HIGH(vBGMap1)
 	ldh [hBGMapAddress + 1], a
 	hlcoord 3, 0
@@ -1277,7 +1277,7 @@
 	call DelayFrames
 	ret
 
-TradeAnim_BlankTileMap:
+TradeAnim_BlankTilemap:
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, " "
--- a/engine/movie/unused_title.asm
+++ b/engine/movie/unused_title.asm
@@ -1,6 +1,6 @@
 UnusedTitleScreen:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call DisableLCD
 
 ; Turn BG Map update off
--- a/engine/overworld/init_map.asm
+++ b/engine/overworld/init_map.asm
@@ -29,7 +29,7 @@
 	call OverworldTextModeSwitch
 	ld a, HIGH(vBGMap1)
 	call .LoadBGMapAddrIntoHRAM
-	call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+	call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 	farcall LoadOW_BGPal7
 	farcall ApplyPals
 	ld a, $1
@@ -84,7 +84,7 @@
 
 	ld a, "■"
 	ld hl, wDecompressScratch
-	ld bc, wScratchAttrMap - wDecompressScratch
+	ld bc, wScratchAttrmap - wDecompressScratch
 	call ByteFill
 	ld a, HIGH(wDecompressScratch)
 	ldh [rHDMA1], a
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -5,11 +5,11 @@
 	call ClearBGPalettes
 	call ClearSprites
 	hlcoord 0, 0
-	ld bc, wTileMapEnd - wTileMap
+	ld bc, wTilemapEnd - wTilemap
 	ld a, " "
 	call ByteFill
-	hlcoord 0, 0, wAttrMap
-	ld bc, wAttrMapEnd - wAttrMap
+	hlcoord 0, 0, wAttrmap
+	ld bc, wAttrmapEnd - wAttrmap
 	ld a, $7
 	call ByteFill
 	call WaitBGMap2
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -2643,7 +2643,7 @@
 Script_closetext:
 ; script command 0x49
 
-	call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+	call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 	call CloseText
 	ret
 
--- a/engine/overworld/warp_connection.asm
+++ b/engine/overworld/warp_connection.asm
@@ -233,7 +233,7 @@
 	farcall UpdateTimeOfDayPal
 	call OverworldTextModeSwitch
 	call .ClearBGMap
-	call .PushAttrMap
+	call .PushAttrmap
 	ret
 
 .ClearBGMap:
@@ -264,7 +264,7 @@
 	call ByteFill
 	ret
 
-.PushAttrMap:
+.PushAttrmap:
 	decoord 0, 0
 	call .copy
 	ldh a, [hCGB]
@@ -271,7 +271,7 @@
 	and a
 	ret z
 
-	decoord 0, 0, wAttrMap
+	decoord 0, 0, wAttrmap
 	ld a, $1
 	ldh [rVBK], a
 .copy
--- a/engine/phone/phonering_copytilemapatonce.asm
+++ b/engine/phone/phonering_copytilemapatonce.asm
@@ -23,7 +23,7 @@
 	di
 	ld a, BANK(vBGMap2)
 	ldh [rVBK], a
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	call .CopyTilemapAtOnce
 	ld a, BANK(vBGMap0)
 	ldh [rVBK], a
--- a/engine/pokedex/new_pokedex_entry.asm
+++ b/engine/pokedex/new_pokedex_entry.asm
@@ -5,7 +5,7 @@
 	ldh [hMapAnims], a
 	call LowVolume
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call UpdateSprites
 	call ClearSprites
 	ld a, [wPokedexStatus]
@@ -34,7 +34,7 @@
 	ret
 
 .ReturnFromDexRegistration:
-	call ClearTileMap
+	call ClearTilemap
 	call LoadFontsExtra
 	call LoadStandardFont
 	farcall Pokedex_PlaceFrontpicTopLeftCorner
--- a/engine/pokedex/pokedex.asm
+++ b/engine/pokedex/pokedex.asm
@@ -79,7 +79,7 @@
 InitPokedex:
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	call Pokedex_LoadGFX
 
 	ld hl, wPokedexDataStart
@@ -219,7 +219,7 @@
 	ldh [hBGMapMode], a
 	call ClearSprites
 	xor a
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	call ByteFill
 	farcall DrawPokedexListWindow
@@ -718,7 +718,7 @@
 	xor a
 	ldh [hBGMapMode], a
 	xor a
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	call Pokedex_SetBGMapMode4
--- a/engine/pokedex/pokedex_3.asm
+++ b/engine/pokedex/pokedex_3.asm
@@ -140,7 +140,7 @@
 	ld [hl], $3c
 	xor a
 	ld b, SCREEN_HEIGHT
-	hlcoord 19, 0, wAttrMap
+	hlcoord 19, 0, wAttrmap
 	call Bank77_FillColumn
 	call WaitBGMap2
 	pop hl
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -72,7 +72,7 @@
 
 .InitTilemap:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	call DisableLCD
 	xor a
@@ -1783,7 +1783,7 @@
 	ld [wVramState], a
 
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	call DisableLCD
 	call Pokegear_LoadGFX
@@ -2035,7 +2035,7 @@
 
 _FlyMap:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	ld hl, hInMenu
 	ld a, [hl]
@@ -2497,7 +2497,7 @@
 .GetAndPlaceNest:
 	ld [wTownMapCursorLandmark], a
 	ld e, a
-	farcall FindNest ; load nest landmarks into wTileMap[0,0]
+	farcall FindNest ; load nest landmarks into wTilemap[0,0]
 	decoord 0, 0
 	ld hl, wVirtualOAMSprite00
 .nestloop
@@ -2675,7 +2675,7 @@
 TownMapPals:
 ; Assign palettes based on tile ids
 	hlcoord 0, 0
-	decoord 0, 0, wAttrMap
+	decoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 .loop
 ; Current tile
@@ -2817,7 +2817,7 @@
 	xor a
 	ld [wTownMapPlayerIconLandmark], a
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	ld hl, hInMenu
 	ld a, [hl]
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -774,7 +774,7 @@
 BillsPC_InitRAM:
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	call BillsPC_InitGFX
 	ld hl, wBillsPCData
 	ld bc, wBillsPCDataEnd - wBillsPCData
@@ -2457,7 +2457,7 @@
 	ld b, NAME_BOX
 	ld de, wd002
 	farcall NamingScreen
-	call ClearTileMap
+	call ClearTilemap
 	call LoadStandardFont
 	call LoadFontsBattleExtra
 	ld a, [wMenuSelection]
--- a/engine/pokemon/evolve.asm
+++ b/engine/pokemon/evolve.asm
@@ -253,7 +253,7 @@
 	ld c, 40
 	call DelayFrames
 
-	call ClearTileMap
+	call ClearTilemap
 	call UpdateSpeciesNameIfNotNicknamed
 	call GetBaseData
 
@@ -379,7 +379,7 @@
 CancelEvolution:
 	ld hl, StoppedEvolvingText
 	call PrintText
-	call ClearTileMap
+	call ClearTilemap
 	pop hl
 	jp EvolveAfterBattle_MasterLoop
 
--- a/engine/pokemon/learn.asm
+++ b/engine/pokemon/learn.asm
@@ -1,5 +1,5 @@
 LearnMove:
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
 	call GetNick
@@ -166,7 +166,7 @@
 	ld [w2DMenuCursorOffsets], a
 	call StaticMenuJoypad
 	push af
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	pop af
 	pop hl
 	bit 1, a
--- a/engine/pokemon/mail_2.asm
+++ b/engine/pokemon/mail_2.asm
@@ -9,7 +9,7 @@
 	push de
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	call DisableLCD
 	call LoadFontsExtra
 	pop de
--- a/engine/pokemon/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
@@ -844,7 +844,7 @@
 	ld hl, w2DMenuFlags1
 	res 6, [hl]
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	pop af
 	ret
 
@@ -1075,7 +1075,7 @@
 	ld hl, w2DMenuFlags1
 	res 6, [hl]
 	call ClearSprites
-	jp ClearTileMap
+	jp ClearTilemap
 
 MoveScreenAttributes:
 	db 3, 1
@@ -1089,7 +1089,7 @@
 
 SetUpMoveScreenBG:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	xor a
 	ldh [hBGMapMode], a
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -37,13 +37,13 @@
 	push bc
 	push hl
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call UpdateSprites
 	farcall StatsScreen_LoadFont
 	pop hl
 	call _hl_
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	pop bc
 
 	; restore old values
@@ -129,7 +129,7 @@
 .finish
 	ld hl, wcf64
 	res 5, [hl]
-	farcall HDMATransferTileMapToWRAMBank3
+	farcall HDMATransferTilemapToWRAMBank3
 	ret
 
 StatsScreen_SetJumptableIndex:
@@ -148,8 +148,8 @@
 	ld hl, wcf64
 	res 6, [hl]
 	call ClearBGPalettes
-	call ClearTileMap
-	farcall HDMATransferTileMapToWRAMBank3
+	call ClearTilemap
+	farcall HDMATransferTilemapToWRAMBank3
 	call StatsScreen_CopyToTempMon
 	ld a, [wCurPartySpecies]
 	cp EGG
@@ -989,7 +989,7 @@
 	call DelayFrame
 	hlcoord 0, 0
 	call PrepMonFrontpic
-	farcall HDMATransferTileMapToWRAMBank3
+	farcall HDMATransferTilemapToWRAMBank3
 	call StatsScreen_AnimateEgg
 
 	ld a, [wTempMonHappiness]
--- a/engine/printer/print_party.asm
+++ b/engine/printer/print_party.asm
@@ -2,28 +2,28 @@
 
 PrintPage1:
 	hlcoord 0, 0
-	decoord 0, 0, wPrinterTileMapBuffer
+	decoord 0, 0, wPrinterTilemapBuffer
 	ld bc, 17 * SCREEN_WIDTH
 	call CopyBytes
-	hlcoord 17, 1, wPrinterTileMapBuffer
+	hlcoord 17, 1, wPrinterTilemapBuffer
 	ld a, $62
 	ld [hli], a
 	inc a
 	ld [hl], a
-	hlcoord 17, 2, wPrinterTileMapBuffer
+	hlcoord 17, 2, wPrinterTilemapBuffer
 	ld a, $64
 	ld [hli], a
 	inc a
 	ld [hl], a
-	hlcoord 1, 9, wPrinterTileMapBuffer
+	hlcoord 1, 9, wPrinterTilemapBuffer
 	ld a, " "
 	ld [hli], a
 	ld [hl], a
-	hlcoord 1, 10, wPrinterTileMapBuffer
+	hlcoord 1, 10, wPrinterTilemapBuffer
 	ld a, $61
 	ld [hli], a
 	ld [hl], a
-	hlcoord 2, 11, wPrinterTileMapBuffer
+	hlcoord 2, 11, wPrinterTilemapBuffer
 	lb bc, 5, 18
 	call ClearBox
 	ld a, [wTempSpecies]
@@ -36,9 +36,9 @@
 	farcall GetDexEntryPagePointer
 	pop af
 	ld a, b
-	hlcoord 1, 11, wPrinterTileMapBuffer
+	hlcoord 1, 11, wPrinterTilemapBuffer
 	call nz, FarString
-	hlcoord 19, 0, wPrinterTileMapBuffer
+	hlcoord 19, 0, wPrinterTilemapBuffer
 	ld [hl], $35
 	ld de, SCREEN_WIDTH
 	add hl, de
@@ -52,19 +52,19 @@
 	ret
 
 PrintPage2:
-	hlcoord 0, 0, wPrinterTileMapBuffer
+	hlcoord 0, 0, wPrinterTilemapBuffer
 	ld bc, 8 * SCREEN_WIDTH
 	ld a, " "
 	call ByteFill
-	hlcoord 0, 0, wPrinterTileMapBuffer
+	hlcoord 0, 0, wPrinterTilemapBuffer
 	ld a, $36
 	ld b, 6
 	call .FillColumn
-	hlcoord 19, 0, wPrinterTileMapBuffer
+	hlcoord 19, 0, wPrinterTilemapBuffer
 	ld a, $37
 	ld b, 6
 	call .FillColumn
-	hlcoord 0, 6, wPrinterTileMapBuffer
+	hlcoord 0, 6, wPrinterTilemapBuffer
 	ld [hl], $38
 	inc hl
 	ld a, $39
@@ -71,7 +71,7 @@
 	ld bc, SCREEN_HEIGHT
 	call ByteFill
 	ld [hl], $3a
-	hlcoord 0, 7, wPrinterTileMapBuffer
+	hlcoord 0, 7, wPrinterTilemapBuffer
 	ld bc, SCREEN_WIDTH
 	ld a, $32
 	call ByteFill
@@ -84,7 +84,7 @@
 	ld c, 2 ; get page 2
 	farcall GetDexEntryPagePointer
 	pop af
-	hlcoord 1, 1, wPrinterTileMapBuffer
+	hlcoord 1, 1, wPrinterTilemapBuffer
 	ld a, b
 	call nz, FarString
 	ret
@@ -132,7 +132,7 @@
 
 PrintPartyMonPage1:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	xor a
 	ldh [hBGMapMode], a
@@ -231,7 +231,7 @@
 
 PrintPartyMonPage2:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	xor a
 	ldh [hBGMapMode], a
--- a/engine/printer/printer.asm
+++ b/engine/printer/printer.asm
@@ -26,12 +26,12 @@
 	ld [wPrinterOpcode], a
 	ret
 
-Printer_PrepareTileMapForPrint:
+Printer_PrepareTilemapForPrint:
 	push af
 	call Printer_StartTransmission
 	pop af
 	ld [wPrinterMargins], a
-	call Printer_CopyTileMapToBuffer
+	call Printer_CopyTilemapToBuffer
 	ret
 
 Printer_ExitPrinter:
@@ -63,7 +63,7 @@
 	ln a, 1, 0
 	ld [wPrinterMargins], a
 	farcall PrintPage1
-	call ClearTileMap
+	call ClearTilemap
 	ld a, %11100100
 	call DmgToCgbBGPals
 	call DelayFrame
@@ -152,7 +152,7 @@
 	ldh [hBGMapMode], a
 	call PrintPCBox_Page1
 	ln a, 1, 0 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 	call Printer_ResetRegistersAndStartDataSend
 	jr c, .cancel
 
@@ -163,7 +163,7 @@
 	ldh [hBGMapMode], a
 	call PrintPCBox_Page2
 	ln a, 0, 0 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 	call Printer_ResetRegistersAndStartDataSend
 	jr c, .cancel
 
@@ -175,7 +175,7 @@
 	ldh [hBGMapMode], a
 	call PrintPCBox_Page3
 	ln a, 0, 0 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 	call Printer_ResetRegistersAndStartDataSend
 	jr c, .cancel
 
@@ -187,7 +187,7 @@
 	ldh [hBGMapMode], a
 	call PrintPCBox_Page4
 	ln a, 0, 3 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 	call Printer_ResetRegistersAndStartDataSend
 .cancel
 	pop af
@@ -227,11 +227,11 @@
 	ld [hl], $4
 	xor a
 	ldh [hBGMapMode], a
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	farcall PlaceUnownPrinterFrontpic
 	ln a, 0, 0 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
-	call SafeLoadTempTileMapToTileMap
+	call Printer_PrepareTilemapForPrint
+	call SafeLoadTempTilemapToTilemap
 	call Printer_ResetJoypadRegisters
 	ld a, 18 / 2
 	ld [wPrinterQueueLength], a
@@ -259,7 +259,7 @@
 	pop af
 	ldh [hVBlank], a
 	call Printer_CleanUpAfterSend
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	xor a
 	ldh [rIF], a
 	pop af
@@ -291,7 +291,7 @@
 	ldh [hBGMapMode], a
 
 	ln a, 1, 3 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 	ld hl, hVBlank
 	ld a, [hl]
 	push af
@@ -304,7 +304,7 @@
 	pop af
 	ldh [hVBlank], a
 	call Printer_CleanUpAfterSend
-	call Printer_CopyBufferToTileMap
+	call Printer_CopyBufferToTilemap
 
 	xor a
 	ldh [rIF], a
@@ -333,7 +333,7 @@
 	ldh [hBGMapMode], a
 	farcall PrintPartyMonPage1
 	ln a, 1, 0 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 
 	ld hl, hVBlank
 	ld a, [hl]
@@ -354,7 +354,7 @@
 	ldh [hBGMapMode], a
 	farcall PrintPartyMonPage2
 	ln a, 0, 3 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 
 	ld a, 18 / 2
 	ld [wPrinterQueueLength], a
@@ -365,7 +365,7 @@
 	ldh [hVBlank], a
 	call Printer_CleanUpAfterSend
 
-	call Printer_CopyBufferToTileMap
+	call Printer_CopyBufferToTilemap
 	xor a
 	ldh [rIF], a
 	pop af
@@ -399,7 +399,7 @@
 	ld [hl], %0100
 
 	ln a, 1, 0 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 	call Printer_ResetJoypadRegisters
 
 	ld a, 18 / 2
@@ -410,7 +410,7 @@
 	ld c, 12
 	call DelayFrames
 
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	xor a
 	ldh [hBGMapMode], a
 
@@ -417,8 +417,8 @@
 	farcall PrintDiplomaPage2
 
 	ln a, 0, 3 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
-	call SafeLoadTempTileMapToTileMap
+	call Printer_PrepareTilemapForPrint
+	call SafeLoadTempTilemapToTilemap
 	call Printer_ResetJoypadRegisters
 
 	ld a, 18 / 2
@@ -473,15 +473,15 @@
 	scf
 	ret
 
-Printer_CopyTileMapToBuffer:
+Printer_CopyTilemapToBuffer:
 	hlcoord 0, 0
-	ld de, wPrinterTileMapBuffer
+	ld de, wPrinterTilemapBuffer
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call CopyBytes
 	ret
 
-Printer_CopyBufferToTileMap:
-	ld hl, wPrinterTileMapBuffer
+Printer_CopyBufferToTilemap:
+	ld hl, wPrinterTilemapBuffer
 	decoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call CopyBytes
--- a/engine/printer/printer_serial.asm
+++ b/engine/printer/printer_serial.asm
@@ -362,7 +362,7 @@
 	ret
 
 Printer_Convert2RowsTo2bpp:
-	; de = wPrinterTileMapBuffer + 2 * SCREEN_WIDTH * ([wPrinterQueueLength] - [wPrinterRowIndex])
+	; de = wPrinterTilemapBuffer + 2 * SCREEN_WIDTH * ([wPrinterQueueLength] - [wPrinterRowIndex])
 	ld a, [wPrinterRowIndex]
 	xor $ff
 	ld d, a
@@ -369,7 +369,7 @@
 	ld a, [wPrinterQueueLength]
 	inc a
 	add d
-	ld hl, wPrinterTileMapBuffer
+	ld hl, wPrinterTilemapBuffer
 	ld de, 2 * SCREEN_WIDTH
 .loop1
 	and a
--- a/engine/rtc/restart_clock.asm
+++ b/engine/rtc/restart_clock.asm
@@ -36,7 +36,7 @@
 	push af
 	set NO_TEXT_SCROLL, [hl]
 	call LoadStandardMenuHeader
-	call ClearTileMap
+	call ClearTilemap
 	ld hl, .ClockSetWithControlPadText
 	call PrintText
 	call .SetClock
--- a/engine/rtc/timeset.asm
+++ b/engine/rtc/timeset.asm
@@ -19,7 +19,7 @@
 	ld c, 8
 	call DelayFrames
 	call RotateFourPalettesLeft
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
--- a/engine/tilesets/map_palettes.asm
+++ b/engine/tilesets/map_palettes.asm
@@ -1,6 +1,6 @@
 _SwapTextboxPalettes::
 	hlcoord 0, 0
-	decoord 0, 0, wAttrMap
+	decoord 0, 0, wAttrmap
 	ld b, SCREEN_HEIGHT
 .loop
 	push bc
--- a/home/copy_tilemap.asm
+++ b/home/copy_tilemap.asm
@@ -1,34 +1,34 @@
-LoadTileMapToTempTileMap::
-; Load wTileMap into wTempTileMap
+LoadTilemapToTempTilemap::
+; Load wTilemap into wTempTilemap
 	ldh a, [rSVBK]
 	push af
-	ld a, BANK(wTempTileMap)
+	ld a, BANK(wTempTilemap)
 	ldh [rSVBK], a
 	hlcoord 0, 0
-	decoord 0, 0, wTempTileMap
-	ld bc, wTileMapEnd - wTileMap
+	decoord 0, 0, wTempTilemap
+	ld bc, wTilemapEnd - wTilemap
 	call CopyBytes
 	pop af
 	ldh [rSVBK], a
 	ret
 
-SafeLoadTempTileMapToTileMap::
+SafeLoadTempTilemapToTilemap::
 	xor a
 	ldh [hBGMapMode], a
-	call LoadTempTileMapToTileMap
+	call LoadTempTilemapToTilemap
 	ld a, 1
 	ldh [hBGMapMode], a
 	ret
 
-LoadTempTileMapToTileMap::
-; Load wTempTileMap into wTileMap
+LoadTempTilemapToTilemap::
+; Load wTempTilemap into wTilemap
 	ldh a, [rSVBK]
 	push af
-	ld a, BANK(wTempTileMap)
+	ld a, BANK(wTempTilemap)
 	ldh [rSVBK], a
-	hlcoord 0, 0, wTempTileMap
+	hlcoord 0, 0, wTempTilemap
 	decoord 0, 0
-	ld bc, wTileMapEnd - wTileMap
+	ld bc, wTilemapEnd - wTilemap
 	call CopyBytes
 	pop af
 	ldh [rSVBK], a
--- a/home/menu_window.asm
+++ b/home/menu_window.asm
@@ -194,7 +194,7 @@
 	ld b, a
 
 Coord2Tile::
-; Return the address of wTileMap(c, b) in hl.
+; Return the address of wTilemap(c, b) in hl.
 	xor a
 	ld h, a
 	ld l, b
@@ -221,7 +221,7 @@
 	ld b, a
 
 Coord2Attr::
-; Return the address of wAttrMap(c, b) in hl.
+; Return the address of wAttrmap(c, b) in hl.
 	xor a
 	ld h, a
 	ld l, b
@@ -237,6 +237,6 @@
 	xor a
 	ld b, a
 	add hl, bc
-	bccoord 0, 0, wAttrMap
+	bccoord 0, 0, wAttrmap
 	add hl, bc
 	ret
--- a/home/mobile.asm
+++ b/home/mobile.asm
@@ -140,7 +140,7 @@
 Function3eea::
 	push hl
 	push bc
-	ld de, wAttrMap - wTileMap
+	ld de, wAttrmap - wTilemap
 	add hl, de
 	inc b
 	inc b
@@ -165,7 +165,7 @@
 .fill_attr
 	push hl
 	push bc
-	ld de, wAttrMap - wTileMap
+	ld de, wAttrmap - wTilemap
 	add hl, de
 	inc b
 	inc b
@@ -178,7 +178,7 @@
 	ret
 
 Function3f20::
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld b,  6
 	ld c, 20
 	call Function3f35
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -273,13 +273,13 @@
 	ret
 
 Serial_PrintWaitingTextAndSyncAndExchangeNybble::
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	callfar PlaceWaitingText
 	call WaitLinkTransfer
-	jp SafeLoadTempTileMapToTileMap
+	jp SafeLoadTempTilemapToTilemap
 
 Serial_SyncAndExchangeNybble::
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	callfar PlaceWaitingText
 	jp WaitLinkTransfer
 
--- a/home/text.asm
+++ b/home/text.asm
@@ -19,12 +19,12 @@
 	jr nz, .row
 	ret
 
-ClearTileMap::
-; Fill wTileMap with blank tiles.
+ClearTilemap::
+; Fill wTilemap with blank tiles.
 
 	hlcoord 0, 0
 	ld a, " "
-	ld bc, wTileMapEnd - wTileMap
+	ld bc, wTilemapEnd - wTilemap
 	call ByteFill
 
 	; Update the BG Map.
@@ -35,10 +35,10 @@
 
 ClearScreen::
 	ld a, PAL_BG_TEXT
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
-	jr ClearTileMap
+	jr ClearTilemap
 
 Textbox::
 ; Draw a text box at hl with room for b lines of c characters each.
@@ -99,7 +99,7 @@
 
 TextboxPalette::
 ; Fill text box width c height b at hl with pal 7
-	ld de, wAttrMap - wTileMap
+	ld de, wAttrmap - wTilemap
 	add hl, de
 	inc b
 	inc b
@@ -422,7 +422,7 @@
 CarriageReturnChar::
 	pop hl
 	push de
-	ld bc, -wTileMap + $10000
+	ld bc, -wTilemap + $10000
 	add hl, bc
 	ld de, -SCREEN_WIDTH
 	ld c, 1
--- a/home/tilemap.asm
+++ b/home/tilemap.asm
@@ -61,7 +61,7 @@
 	jr .CopyTilemapAtOnce
 
 ; unused
-	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+	farcall HDMATransferAttrmapAndTilemapToWRAMBank3
 	ret
 
 .CopyTilemapAtOnce:
@@ -83,7 +83,7 @@
 	di
 	ld a, BANK(vTiles3)
 	ldh [rVBK], a
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	call .StackPointerMagic
 	ld a, BANK(vTiles0)
 	ldh [rVBK], a
--- a/home/video.asm
+++ b/home/video.asm
@@ -114,7 +114,7 @@
 	ret
 
 UpdateBGMap::
-; Update the BG Map, in thirds, from wTileMap and wAttrMap.
+; Update the BG Map, in thirds, from wTilemap and wAttrmap.
 
 	ldh a, [hBGMapMode]
 	and a
@@ -159,7 +159,7 @@
 	ld a, 1
 	ldh [rVBK], a
 
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	call .update
 
 	ld a, 0
@@ -234,7 +234,7 @@
 ; Rows of tiles in a third
 	ld a, SCREEN_HEIGHT / 3
 
-; Discrepancy between wTileMap and BGMap
+; Discrepancy between wTilemap and BGMap
 	ld bc, BG_MAP_WIDTH - (SCREEN_WIDTH - 1)
 
 .row
--- a/home/window.asm
+++ b/home/window.asm
@@ -6,7 +6,7 @@
 	rst Bankswitch
 
 	call ReanchorBGMap_NoOAMUpdate
-	call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+	call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 	call LoadFonts_NoOAMUpdate
 
 	pop af
@@ -32,7 +32,7 @@
 	xor a
 	ldh [hBGMapMode], a
 	call OverworldTextModeSwitch
-	call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+	call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 	xor a
 	ldh [hBGMapMode], a
 	call SafeUpdateSprites
@@ -52,7 +52,7 @@
 
 	call ReanchorBGMap_NoOAMUpdate ; clear bgmap
 	call SpeechTextbox
-	call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ; anchor bgmap
+	call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap ; anchor bgmap
 	call LoadFonts_NoOAMUpdate ; load font
 	pop af
 	rst Bankswitch
@@ -59,13 +59,13 @@
 
 	ret
 
-_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap::
+_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap::
 	ldh a, [hOAMUpdate]
 	push af
 	ld a, $1
 	ldh [hOAMUpdate], a
 
-	farcall OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+	farcall OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 
 	pop af
 	ldh [hOAMUpdate], a
--- a/macros/coords.asm
+++ b/macros/coords.asm
@@ -5,7 +5,7 @@
 coord: MACRO
 ; register, x, y[, origin]
 	if _NARG < 4
-	ld \1, (\3) * SCREEN_WIDTH + (\2) + wTileMap
+	ld \1, (\3) * SCREEN_WIDTH + (\2) + wTilemap
 	else
 	ld \1, (\3) * SCREEN_WIDTH + (\2) + \4
 	endc
@@ -27,7 +27,7 @@
 dwcoord: MACRO
 ; x, y
 rept _NARG / 2
-	dw (\2) * SCREEN_WIDTH + (\1) + wTileMap
+	dw (\2) * SCREEN_WIDTH + (\1) + wTilemap
 	shift
 	shift
 endr
@@ -36,7 +36,7 @@
 ldcoord_a: MACRO
 ; x, y[, origin]
 	if _NARG < 3
-	ld [(\2) * SCREEN_WIDTH + (\1) + wTileMap], a
+	ld [(\2) * SCREEN_WIDTH + (\1) + wTilemap], a
 	else
 	ld [(\2) * SCREEN_WIDTH + (\1) + \3], a
 	endc
@@ -45,7 +45,7 @@
 lda_coord: MACRO
 ; x, y[, origin]
 	if _NARG < 3
-	ld a, [(\2) * SCREEN_WIDTH + (\1) + wTileMap]
+	ld a, [(\2) * SCREEN_WIDTH + (\1) + wTilemap]
 	else
 	ld a, [(\2) * SCREEN_WIDTH + (\1) + \3]
 	endc
--- a/mobile/fixed_words.asm
+++ b/mobile/fixed_words.asm
@@ -696,11 +696,11 @@
 
 Function11c4be:
 	ld a, $1
-	hlcoord 0, 6, wAttrMap
+	hlcoord 0, 6, wAttrmap
 	ld bc, $a0
 	call ByteFill
 	ld a, $7
-	hlcoord 0, 14, wAttrMap
+	hlcoord 0, 14, wAttrmap
 	ld bc, $28
 	call ByteFill
 	farcall ReloadMapPart
@@ -895,7 +895,7 @@
 
 Function11c618:
 	ld a, $2
-	hlcoord 0, 6, wAttrMap
+	hlcoord 0, 6, wAttrmap
 	ld bc, $c8
 	call ByteFill
 	farcall ReloadMapPart
@@ -1495,7 +1495,7 @@
 
 Function11c9ab:
 	ld a, $7
-	hlcoord 0, 6, wAttrMap
+	hlcoord 0, 6, wAttrmap
 	ld bc, $c8
 	call ByteFill
 	farcall ReloadMapPart
@@ -1552,7 +1552,7 @@
 	ret
 
 Function11ca01:
-	hlcoord 14, 7, wAttrMap
+	hlcoord 14, 7, wAttrmap
 	ld de, $14
 	ld a, $5
 	ld c, a
@@ -1571,7 +1571,7 @@
 	jr nz, .asm_11ca0a
 
 Function11ca19:
-	hlcoord 0, 12, wAttrMap
+	hlcoord 0, 12, wAttrmap
 	ld de, $14
 	ld a, $6
 	ld c, a
@@ -1993,11 +1993,11 @@
 
 Function11cdaa:
 	ld a, $2
-	hlcoord 0, 6, wAttrMap
+	hlcoord 0, 6, wAttrmap
 	ld bc, 6 * SCREEN_WIDTH
 	call ByteFill
 	ld a, $7
-	hlcoord 0, 12, wAttrMap
+	hlcoord 0, 12, wAttrmap
 	ld bc, 4 * SCREEN_WIDTH
 	call ByteFill
 	farcall ReloadMapPart
--- a/mobile/mobile_12.asm
+++ b/mobile/mobile_12.asm
@@ -144,7 +144,7 @@
 	call ClearBGPalettes
 	call Function48d30
 	pop bc
-	call ClearTileMap
+	call ClearTilemap
 	ld a, $ff
 	ret
 
@@ -254,7 +254,7 @@
 	call ClearBGPalettes
 	call Function48d30
 	pop bc
-	call ClearTileMap
+	call ClearTilemap
 	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	ld hl, wd479
@@ -354,7 +354,7 @@
 	ld a, $29
 .asm_4833f
 	ld [wMenuScrollPosition], a
-	farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+	farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 .asm_48348
 	call ScrollingMenu
 	ld de, $629
@@ -380,7 +380,7 @@
 	ld [wd003], a
 .asm_48377
 	call Function48187
-	farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+	farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 	jp Function4840c
 
 Function48383:
@@ -1662,7 +1662,7 @@
 	call Function48cfd
 	pop hl
 	pop bc
-	ld de, wAttrMap - wTileMap
+	ld de, wAttrmap - wTilemap
 	add hl, de
 	inc b
 	inc b
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -123,7 +123,7 @@
 Function891de:
 	call Mobile22_SetBGMapMode0
 	call ClearPalettes
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld a, $7
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
@@ -155,7 +155,7 @@
 Function89215:
 	push hl
 	push bc
-	ld bc, wAttrMap - wTileMap
+	ld bc, wAttrmap - wTilemap
 	add hl, bc
 	ld [hl], a
 	pop bc
@@ -794,7 +794,7 @@
 
 Function895e6:
 	ld a, 7
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	ret
@@ -802,7 +802,7 @@
 Function895f2:
 	push bc
 	xor a
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	call Function89605
@@ -811,7 +811,7 @@
 	ret
 
 Function89605:
-	hlcoord 19, 2, wAttrMap
+	hlcoord 19, 2, wAttrmap
 	ld a, 1
 	ld de, SCREEN_WIDTH
 	ld c, 14
@@ -828,7 +828,7 @@
 	jr nz, .loop
 
 .done
-	hlcoord 0, 16, wAttrMap
+	hlcoord 0, 16, wAttrmap
 	ld c, 10
 	ld a, 2
 .loop2
@@ -838,7 +838,7 @@
 	inc a
 	dec c
 	jr nz, .loop2
-	hlcoord 1, 11, wAttrMap
+	hlcoord 1, 11, wAttrmap
 	ld a, 4
 	ld bc, 4
 	call ByteFill
@@ -848,7 +848,7 @@
 	ret
 
 Function8963d:
-	hlcoord 12, 3, wAttrMap
+	hlcoord 12, 3, wAttrmap
 	ld a, 6
 	ld de, SCREEN_WIDTH
 	lb bc, 7, 7
@@ -866,7 +866,7 @@
 	ret
 
 Function89655:
-	hlcoord 1, 12, wAttrMap
+	hlcoord 1, 12, wAttrmap
 	ld de, SCREEN_WIDTH
 	ld a, 5
 	ld b, 4
@@ -1164,7 +1164,7 @@
 	push bc
 	call Function8934a
 	jr nc, .asm_897f3
-	hlcoord 12, 3, wAttrMap
+	hlcoord 12, 3, wAttrmap
 	xor a
 	ld de, SCREEN_WIDTH
 	lb bc, 7, 7
@@ -2098,7 +2098,7 @@
 	push hl
 	call Mobile22_SetBGMapMode0
 	call _hl_
-	farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+	farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 	pop hl
 	jr asm_89d90
 
@@ -2256,10 +2256,10 @@
 	hlcoord 7, 4
 	call Function8a58d
 	ld a, $5
-	hlcoord 7, 4, wAttrMap
+	hlcoord 7, 4, wAttrmap
 	call Function8a5a3
 	ld a, $6
-	hlcoord 10, 4, wAttrMap
+	hlcoord 10, 4, wAttrmap
 	call Function8a5a3
 	call Function891ab
 	call SetPalettes
@@ -2291,10 +2291,10 @@
 	hlcoord 7, 4
 	call Function8a58d
 	ld a, $5
-	hlcoord 7, 4, wAttrMap
+	hlcoord 7, 4, wAttrmap
 	call Function8a5a3
 	ld a, $6
-	hlcoord 10, 4, wAttrMap
+	hlcoord 10, 4, wAttrmap
 	call Function8a5a3
 	call Function891ab
 	call SetPalettes
@@ -2471,10 +2471,10 @@
 Function89fce:
 	call Function8a5b6
 	ld a, $5
-	hlcoord 7, 4, wAttrMap
+	hlcoord 7, 4, wAttrmap
 	call Function8a5a3
 	ld a, $6
-	hlcoord 10, 4, wAttrMap
+	hlcoord 10, 4, wAttrmap
 	call Function8a5a3
 	call Function89448
 	call SetPalettes
@@ -2554,11 +2554,11 @@
 	hlcoord 12, 4
 	call Function8a58d
 	ld a, $5
-	hlcoord 12, 4, wAttrMap
+	hlcoord 12, 4, wAttrmap
 	call Function8a5a3
 	pop hl
 	ld a, $6
-	hlcoord 15, 4, wAttrMap
+	hlcoord 15, 4, wAttrmap
 	call Function8a5a3
 	call CGBOnly_CopyTilemapAtOnce
 	jp Function89e36
@@ -2586,7 +2586,7 @@
 
 Function8a0c1:
 	push hl
-	ld bc, wAttrMap - wTileMap
+	ld bc, wAttrmap - wTilemap
 	add hl, bc
 	ld a, [hl]
 	pop hl
@@ -2612,7 +2612,7 @@
 
 Function8a0de:
 	call Function8a0c9
-	ld de, wAttrMap - wTileMap
+	ld de, wAttrmap - wTilemap
 	add hl, de
 	ret
 
@@ -2814,10 +2814,10 @@
 	hlcoord 12, 4
 	call Function8a58d
 	ld a, $5
-	hlcoord 12, 4, wAttrMap
+	hlcoord 12, 4, wAttrmap
 	call Function8a5a3
 	ld a, $6
-	hlcoord 15, 4, wAttrMap
+	hlcoord 15, 4, wAttrmap
 	call Function8a5a3
 	xor a
 	ld [wd02e], a
@@ -3080,18 +3080,18 @@
 	cp $1
 	jr nz, .asm_8a4eb
 	ld a, $5
-	hlcoord 12, 4, wAttrMap
+	hlcoord 12, 4, wAttrmap
 	call Function8a5a3
 	ld a, $7
-	hlcoord 15, 4, wAttrMap
+	hlcoord 15, 4, wAttrmap
 	call Function8a5a3
 	ret
 .asm_8a4eb
 	ld a, $7
-	hlcoord 12, 4, wAttrMap
+	hlcoord 12, 4, wAttrmap
 	call Function8a5a3
 	ld a, $6
-	hlcoord 15, 4, wAttrMap
+	hlcoord 15, 4, wAttrmap
 	call Function8a5a3
 	ret
 
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -615,11 +615,11 @@
 	RGB 00, 00, 00
 
 Function8b6ed:
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, $012c
 	xor a
 	call ByteFill
-	hlcoord 0, 14, wAttrMap
+	hlcoord 0, 14, wAttrmap
 	ld bc, $0050
 	ld a, $7
 	call ByteFill
@@ -675,7 +675,7 @@
 	ret
 
 Function8b744:
-	ld de, wAttrMap - wTileMap
+	ld de, wAttrmap - wTilemap
 	add hl, de
 	inc b
 	inc b
@@ -743,10 +743,10 @@
 	ret
 
 Function8b79e:
-	hlcoord 0, 1, wAttrMap
+	hlcoord 0, 1, wAttrmap
 	ld a, $1
 	ld [hli], a
-	hlcoord 9, 1, wAttrMap
+	hlcoord 9, 1, wAttrmap
 	ld e, $b
 .asm_8b7a9
 	ld a, $2
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -195,7 +195,7 @@
 	ret z
 	res 2, [hl]
 	res 6, [hl]
-	farcall HDMATransferTileMapToWRAMBank3
+	farcall HDMATransferTilemapToWRAMBank3
 	ret
 
 Function100163:
@@ -430,7 +430,7 @@
 	ret
 
 Function100327:
-	farcall HDMATransferTileMapToWRAMBank3
+	farcall HDMATransferTilemapToWRAMBank3
 	ret
 
 Function10032e:
@@ -1436,7 +1436,7 @@
 	hlcoord 0, 0
 	ld de, w3_dc00
 	call Function1009a5
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld de, w3_dd68
 	call Function1009a5
 	call Function1009d2
@@ -1450,7 +1450,7 @@
 	call Function1009ae
 	farcall ReloadMapPart
 	ld hl, w3_dd68
-	decoord 0, 0, wAttrMap
+	decoord 0, 0, wAttrmap
 	call Function1009a5
 	ret
 
@@ -1467,7 +1467,7 @@
 	ldh [rSVBK], a
 
 	ld hl, w3_d800
-	decoord 0, 0, wAttrMap
+	decoord 0, 0, wAttrmap
 	ld c, SCREEN_WIDTH
 	ld b, SCREEN_HEIGHT
 .loop_row
@@ -1715,7 +1715,7 @@
 	call Mobile_SetOverworldDelay
 	farcall MobileMenuJoypad
 	push bc
-	farcall HDMATransferTileMapToWRAMBank3
+	farcall HDMATransferTilemapToWRAMBank3
 	call Function100e2d
 	pop bc
 	jr c, .asm_100b6b
@@ -1773,7 +1773,7 @@
 	call Mobile_SetOverworldDelay
 	farcall MobileMenuJoypad
 	push bc
-	farcall HDMATransferTileMapToWRAMBank3
+	farcall HDMATransferTilemapToWRAMBank3
 	call Function100e2d
 	pop bc
 	jr c, .b_button
@@ -1857,7 +1857,7 @@
 
 .print_text
 	call StdBattleTextbox
-	call SafeLoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	jp .GetMoveSelection
 
 Function100c74:
@@ -1904,7 +1904,7 @@
 	farcall MobileMenuJoypad
 	push bc
 	farcall PlaySpriteAnimations
-	farcall HDMATransferTileMapToWRAMBank3
+	farcall HDMATransferTilemapToWRAMBank3
 	call MobileComms_CheckInactivityTimer
 	pop bc
 	jr c, .done
@@ -1957,7 +1957,7 @@
 	farcall MobileMenuJoypad
 	push bc
 	farcall PlaySpriteAnimations
-	farcall HDMATransferTileMapToWRAMBank3
+	farcall HDMATransferTilemapToWRAMBank3
 	call MobileComms_CheckInactivityTimer
 	pop bc
 	jr c, .asm_100d54
@@ -2918,7 +2918,7 @@
 	ret
 
 Function1013d6:
-	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+	farcall HDMATransferAttrmapAndTilemapToWRAMBank3
 	ret
 
 Function1013dd:
@@ -3785,7 +3785,7 @@
 	farcall Function100846
 	ld c, 120
 	call DelayFrames
-	farcall ClearTileMap
+	farcall ClearTilemap
 	call .CopyOTDetails
 	call StartMobileBattle
 	ld a, [wcd2b]
@@ -4907,7 +4907,7 @@
 
 Function102283:
 	ld a, $01
-	ld [wAttrMapEnd], a
+	ld [wAttrmapEnd], a
 	ld hl, wcd4b
 	set 0, [hl]
 	ret
@@ -4914,7 +4914,7 @@
 
 Function10228e:
 	xor a
-	ld [wAttrMapEnd], a
+	ld [wAttrmapEnd], a
 	ld hl, wcd4b
 	res 0, [hl]
 	ret
@@ -4945,7 +4945,7 @@
 .asm_1022c1
 	call Function10304f
 	ld a, $01
-	ld [wAttrMapEnd], a
+	ld [wAttrmapEnd], a
 	ret
 
 Function1022ca:
@@ -6415,10 +6415,10 @@
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	ld a, $07
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
-	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+	farcall HDMATransferAttrmapAndTilemapToWRAMBank3
 	ret
 
 Function102db7:
@@ -6691,7 +6691,7 @@
 
 Function10304f:
 	xor a
-	ld [wAttrMapEnd], a
+	ld [wAttrmapEnd], a
 	ld [wcf42], a
 	ld [wcf44], a
 	ld [wcf45], a
@@ -6699,7 +6699,7 @@
 
 Function10305d:
 	nop
-	ld a, [wAttrMapEnd]
+	ld a, [wAttrmapEnd]
 	and a
 	ret z
 	call Function10307f
@@ -6958,7 +6958,7 @@
 	ld [wd1ee], a
 	call Function1034be
 	call UpdateSprites
-	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+	farcall HDMATransferAttrmapAndTilemapToWRAMBank3
 	ld a, $01
 	ld [wd1f0], a
 	call Function10339a
@@ -6971,7 +6971,7 @@
 	call Function1033af
 	call Function10339a
 	call Function10342c
-	farcall HDMATransferTileMapToWRAMBank3
+	farcall HDMATransferTilemapToWRAMBank3
 	ld a, [wBuffer2]
 	bit 7, a
 	jr z, .asm_103362
@@ -7179,7 +7179,7 @@
 	push hl
 	call ClearBox
 	pop hl
-	ld bc, wAttrMap - wTileMap
+	ld bc, wAttrmap - wTilemap
 	add hl, bc
 	pop bc
 	ld a, $06
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -140,7 +140,7 @@
 	ld [wJumptableIndex], a
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	call DisableLCD
 	call MobileTradeAnim_ClearTiles
 	call MobileTradeAnim_ClearBGMap
@@ -215,7 +215,7 @@
 	ld [wJumptableIndex], a
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	call DisableLCD
 	call MobileTradeAnim_ClearTiles
 	call MobileTradeAnim_ClearBGMap
@@ -421,7 +421,7 @@
 .loop
 	farcall PlaySpriteAnimations
 	farcall SetUpPokeAnim
-	farcall HDMATransferTileMapToWRAMBank3
+	farcall HDMATransferTilemapToWRAMBank3
 	jr nc, .loop
 	ret
 
@@ -515,7 +515,7 @@
 MobileTradeAnim_ShowOTMonFromTrade:
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	call DisableLCD
 	call MobileTradeAnim_ClearBGMap
 	ld a, [wOTTrademonSpecies]
@@ -648,7 +648,7 @@
 MobileTradeAnim_ShowOTMonFromGTS:
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	call DisableLCD
 	call MobileTradeAnim_ClearBGMap
 	ld a, [wOTTrademonSpecies]
@@ -716,7 +716,7 @@
 MobileTradeAnim_GetOddEgg:
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	call DisableLCD
 	call MobileTradeAnim_ClearBGMap
 	ld a, [wOTTrademonSpecies]
@@ -784,7 +784,7 @@
 	farcall DeinitializeAllSprites
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 	call DisableLCD
@@ -819,7 +819,7 @@
 	farcall DeinitializeAllSprites
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 	call DisableLCD
@@ -863,7 +863,7 @@
 MobileTradeAnim_11:
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	xor a
 	ldh [hBGMapMode], a
 	call DisableLCD
@@ -1149,7 +1149,7 @@
 	farcall DeinitializeAllSprites
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	call DisableLCD
 	call MobileTradeAnim_ClearTiles
 	call MobileTradeAnim_ClearBGMap
--- a/mobile/mobile_45_stadium.asm
+++ b/mobile/mobile_45_stadium.asm
@@ -519,7 +519,7 @@
 	call ClearBGPalettes
 	call ClearSprites
 	farcall Function172e78
-	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+	farcall HDMATransferAttrmapAndTilemapToWRAMBank3
 	ret
 
 Function117ab4:
@@ -536,7 +536,7 @@
 	bit 7, a
 	jr nz, .asm_117ae2
 	call Function117ae9
-	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+	farcall HDMATransferAttrmapAndTilemapToWRAMBank3
 	jr Function117acd
 
 .asm_117ae2
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -1144,7 +1144,7 @@
 	call MenuBox
 	call MenuBoxCoord2Tile
 	call ApplyTilemap
-	hlcoord 16, 8, wAttrMap
+	hlcoord 16, 8, wAttrmap
 	ld a, $40
 	or [hl]
 	ld [hl], a
@@ -4998,7 +4998,7 @@
 	ld a, $5
 	ld [wMenuBorderBottomCoord], a
 	call PushWindow
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld b, $6
 	ld c, $14
 	hlcoord 0, 0
@@ -5023,7 +5023,7 @@
 	ld a, $a
 	ld [wMenuBorderBottomCoord], a
 	call PushWindow
-	hlcoord 14, 6, wAttrMap
+	hlcoord 14, 6, wAttrmap
 	ld b, $5
 	ld c, $6
 	hlcoord 14, 6
@@ -5615,7 +5615,7 @@
 Function11ad1b:
 	call ClearBGPalettes
 	call ClearSprites
-	call ClearTileMap
+	call ClearTilemap
 	farcall Function17c000
 	ld a, [wMenuCursorY]
 	ld [wcd82], a
@@ -5680,7 +5680,7 @@
 	hlcoord 12, 12
 	ld de, String_11ae40
 	call PlaceString
-	hlcoord 10, 10, wAttrMap
+	hlcoord 10, 10, wAttrmap
 	lb bc, 8, 8
 	call Function11afd6
 	farcall ReloadMapPart
@@ -5790,10 +5790,10 @@
 	hlcoord 16, 8
 	ld de, String_11b01b
 	call PlaceString
-	hlcoord 14, 7, wAttrMap
+	hlcoord 14, 7, wAttrmap
 	lb bc, 5, 6
 	call Function11afd6
-	hlcoord 9, 12, wAttrMap
+	hlcoord 9, 12, wAttrmap
 	lb bc, 6, 11
 	call Function11afd6
 	farcall ReloadMapPart
@@ -5880,10 +5880,10 @@
 	hlcoord 16, 8
 	ld de, String_11b01b
 	call PlaceString
-	hlcoord 14, 7, wAttrMap
+	hlcoord 14, 7, wAttrmap
 	lb bc, 5, 6
 	call Function11afd6
-	hlcoord 9, 12, wAttrMap
+	hlcoord 9, 12, wAttrmap
 	lb bc, 6, 11
 	call Function11afd6
 	farcall ReloadMapPart
--- a/mobile/mobile_5b.asm
+++ b/mobile/mobile_5b.asm
@@ -161,8 +161,8 @@
 	lb bc, BANK(.Tiles), 104
 	call Get2bpp
 	call .LoadPals
-	call .LoadTileMap
-	call .LoadAttrMap
+	call .LoadTilemap
+	call .LoadAttrmap
 	hlbgcoord 0, 0
 	call Function16cc73
 	call Function16cc02
@@ -180,24 +180,24 @@
 	farcall ApplyPals
 	ret
 
-.LoadTileMap:
+.LoadTilemap:
 	hlcoord 0, 0
 	ld bc, 20
 	xor a
 	call ByteFill
-	ld hl, .TileMap
+	ld hl, .Tilemap
 	decoord 0, 1
 	ld bc, $0154
 	call CopyBytes
 	ret
 
-.LoadAttrMap:
-	hlcoord 0, 0, wAttrMap
+.LoadAttrmap:
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH
 	xor a
 	call ByteFill
-	ld hl, .AttrMap
-	decoord 0, 1, wAttrMap
+	ld hl, .Attrmap
+	decoord 0, 1, wAttrmap
 	ld bc, 17 * SCREEN_WIDTH
 	call CopyBytes
 	ret
@@ -205,10 +205,10 @@
 .Tiles:
 INCBIN "gfx/mobile/mobile_splash.2bpp"
 
-.TileMap:
+.Tilemap:
 INCBIN "gfx/mobile/mobile_splash.tilemap"
 
-.AttrMap:
+.Attrmap:
 INCBIN "gfx/mobile/mobile_splash.attrmap"
 
 UnknownMobilePalettes_16c903:
@@ -710,7 +710,7 @@
 	ret
 
 Function16cc62:
-	hlcoord 0, 15, wAttrMap
+	hlcoord 0, 15, wAttrmap
 	ld bc, $0028
 	ld a, $1
 	call ByteFill
@@ -731,7 +731,7 @@
 	pop hl
 	ld a, $1
 	ldh [rVBK], a
-	decoord 0, 0, wAttrMap
+	decoord 0, 0, wAttrmap
 	call Function16cc90
 	pop af
 	ldh [rVBK], a
--- a/mobile/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
@@ -672,7 +672,7 @@
 	ld bc, $168
 	call CopyBytes
 	ld hl, Attrmap_1727ed
-	decoord 0, 0, wAttrMap
+	decoord 0, 0, wAttrmap
 	ld bc, $168
 	call CopyBytes
 	hlcoord 3, 2
@@ -744,7 +744,7 @@
 	ld bc, $168
 	call CopyBytes
 	ld hl, Attrmap_172955
-	decoord 0, 0, wAttrMap
+	decoord 0, 0, wAttrmap
 	ld bc, $168
 	call CopyBytes
 	hlcoord 2, 2
@@ -826,7 +826,7 @@
 	ld bc, $168
 	call ByteFill
 	ld a, $7
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, $168
 	call ByteFill
 	call DisableLCD
@@ -840,7 +840,7 @@
 	ld bc, $168
 	call CopyBytes
 	ld hl, Attrmap_173517
-	decoord 0, 0, wAttrMap
+	decoord 0, 0, wAttrmap
 	ld bc, $168
 	call CopyBytes
 	ret
--- a/mobile/mobile_5e.asm
+++ b/mobile/mobile_5e.asm
@@ -41,7 +41,7 @@
 	call Function17aba0
 	farcall Function106464
 	call Function17ac0c
-	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+	farcall HDMATransferAttrmapAndTilemapToWRAMBank3
 	call Function17abcf
 	farcall LoadOW_BGPal7
 	farcall Function49420
@@ -163,7 +163,7 @@
 	bit 7, [hl]
 	res 7, [hl]
 	jr nz, .asm_17a79f
-	farcall HDMATransferTileMapToWRAMBank3
+	farcall HDMATransferTilemapToWRAMBank3
 	ret
 
 .asm_17a79f
@@ -656,7 +656,7 @@
 	call Function17aae3
 	ld c, a
 	ld b, $0
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	add hl, bc
 	push hl
 	ld a, $4
@@ -797,10 +797,10 @@
 
 Function17ac2a:
 	ld hl, Tilemap_17ae3d
-	decoord 0, 4, wAttrMap
+	decoord 0, 4, wAttrmap
 	ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH
 	call CopyBytes
-	hlcoord 0, 4, wAttrMap
+	hlcoord 0, 4, wAttrmap
 	ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH
 .loop
 	ld a, [hl]
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -11,7 +11,7 @@
 
 	ld hl, HaveWantMap
 	decoord 0, 0
-	bccoord 0, 0, wAttrMap
+	bccoord 0, 0, wAttrmap
 
 	ld a, SCREEN_HEIGHT
 .y
@@ -718,7 +718,7 @@
 	call CopyBytes
 	ld hl, PokemonNewsTileAttrmap
 	decoord 0, 0
-	bccoord 0, 0, wAttrMap
+	bccoord 0, 0, wAttrmap
 	ld a, $12
 .asm_17d4a4
 	push af
@@ -3486,7 +3486,7 @@
 
 .asm_17e6c7
 	pop hl
-	bccoord 0, 0, wAttrMap
+	bccoord 0, 0, wAttrmap
 	add hl, bc
 	ld [hl], a
 	pop hl
@@ -3509,7 +3509,7 @@
 	ld l, a
 	ld a, [wc709]
 	ld h, a
-	decoord 0, 0, wAttrMap
+	decoord 0, 0, wAttrmap
 	add hl, de
 	pop af
 	ld b, $7
@@ -4250,7 +4250,7 @@
 	push af
 	ld l, c
 	ld h, b
-	ld bc, -wTileMap + $10000
+	ld bc, -wTilemap + $10000
 	add hl, bc
 	ld de, -SCREEN_WIDTH
 	ld c, $1
@@ -4480,7 +4480,7 @@
 	ld a, [wc303]
 	bit 7, a
 	jr nz, .quit
-	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+	farcall HDMATransferAttrmapAndTilemapToWRAMBank3
 	jr .loop
 
 .quit
@@ -4545,7 +4545,7 @@
 
 Function17f5d2:
 	call Function17f5e4
-	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+	farcall HDMATransferAttrmapAndTilemapToWRAMBank3
 	call SetPalettes
 	ld a, $1
 	ld [wc303], a
@@ -4564,7 +4564,7 @@
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	ld a, $6
-	hlcoord 0, 0, wAttrMap
+	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	hlcoord 2, 1
--- a/mobile/mobile_menu.asm
+++ b/mobile/mobile_menu.asm
@@ -65,7 +65,7 @@
 .b_button
 	pop bc
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	ld a, MUSIC_MAIN_MENU
 	ld [wMapMusic], a
 	ld de, MUSIC_MAIN_MENU
@@ -208,7 +208,7 @@
 	call ClearBGPalettes
 	call Function4a13b
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 
 asm_4a111:
 	pop bc
@@ -271,7 +271,7 @@
 	call ClearBox
 	hlcoord 1, 14
 	call PlaceString
-	farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+	farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 	call SetPalettes
 	call StaticMenuJoypad
 	ld hl, wMenuCursorY
@@ -390,7 +390,7 @@
 	hlcoord 14, 1
 	ld de, String_4a34b
 	call PlaceString
-	farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+	farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 	call Function4a118
 	call ScrollingMenuJoypad
 	push af
@@ -419,7 +419,7 @@
 	ld b, 3
 	ld c, 4
 	call Textbox
-	farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+	farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 	ld hl, DeletePassword_YesNo_MenuHeader
 	call LoadMenuHeader
 	call VerticalMenu
@@ -442,7 +442,7 @@
 	call ExitMenu
 .quit
 	call Call_ExitMenu
-	farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+	farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 	xor a
 	ret
 
@@ -715,7 +715,7 @@
 .asm_4a574
 	pop bc
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	jp Function49f0a
 .asm_4a57e
 	ld hl, wMenuCursorY
--- a/wram.asm
+++ b/wram.asm
@@ -360,10 +360,10 @@
 
 SECTION "Tilemap", WRAM0
 
-wTileMap:: ; c4a0
+wTilemap:: ; c4a0
 ; 20x18 grid of 8x8 tiles
 	ds SCREEN_WIDTH * SCREEN_HEIGHT
-wTileMapEnd::
+wTilemapEnd::
 
 
 SECTION "Miscellaneous", WRAM0
@@ -967,8 +967,8 @@
 wPrinterSendByteCounter:: dw
 
 ; tilemap backup?
-wPrinterTileMapBuffer:: ds SCREEN_HEIGHT * SCREEN_WIDTH ; ca90
-wPrinterTileMapBufferEnd::
+wPrinterTilemapBuffer:: ds SCREEN_HEIGHT * SCREEN_WIDTH ; ca90
+wPrinterTilemapBufferEnd::
 wPrinterStatus:: db ; cbf8
 	ds 1
 ; High nibble is for margin before the image, low nibble is for after.
@@ -1326,7 +1326,7 @@
 
 wSGBPals:: ds 48 ; cda9
 
-wAttrMap:: ; cdd9
+wAttrmap:: ; cdd9
 ; 20x18 grid of bg tile attributes for 8x8 tiles
 ; read horizontally from the top row
 ;		bit 7: priority
@@ -1336,7 +1336,7 @@
 ;		bit 3: vram bank (cgb only)
 ;		bit 2-0: pal # (cgb only)
 	ds SCREEN_WIDTH * SCREEN_HEIGHT
-wAttrMapEnd::
+wAttrmapEnd::
 
 UNION ; cf41
 ; addresses dealing with serial comms
@@ -2970,7 +2970,7 @@
 
 SECTION "Pic Animations", WRAMX
 
-wTempTileMap::
+wTempTilemap::
 ; 20x18 grid of 8x8 tiles
 	ds SCREEN_WIDTH * SCREEN_HEIGHT ; $168 = 360
 
@@ -3193,8 +3193,8 @@
 SECTION "Scratch RAM", WRAMX
 
 UNION ; d000
-wScratchTileMap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT
-wScratchAttrMap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT
+wScratchTilemap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT
+wScratchAttrmap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT
 
 NEXTU ; d000
 wDecompressScratch:: ds $80 tiles