TileMap/AttrMap -> Tilemap/Attrmap

7 files changed, 21 insertions, 21 deletions

diff --git a/Allow-map-tiles-to-appear-above-sprites-(so-NPCs-can-walk-behind-tiles)-with-PRIORITY-colors.md b/Allow-map-tiles-to-appear-above-sprites-(so-NPCs-can-walk-behind-tiles)-with-PRIORITY-colors.md
index d46c932..dc4d56b 100644
--- a/Allow-map-tiles-to-appear-above-sprites-(so-NPCs-can-walk-behind-tiles)-with-PRIORITY-colors.md
+++ b/Allow-map-tiles-to-appear-above-sprites-(so-NPCs-can-walk-behind-tiles)-with-PRIORITY-colors.md
@@ -139,7 +139,7 @@ Edit [engine/tilesets/map_palettes.asm](../blob/master/engine/tilesets/map_palet
 ```diff
  SwapTextboxPalettes::
  	hlcoord 0, 0
- 	decoord 0, 0, wAttrMap
+ 	decoord 0, 0, wAttrmap
  	ld b, SCREEN_HEIGHT
  .loop
  	push bc
diff --git a/Edit-the-male-and-female-player-colors.md b/Edit-the-male-and-female-player-colors.md
index 8321a2f..590c56e 100644
--- a/Edit-the-male-and-female-player-colors.md
+++ b/Edit-the-male-and-female-player-colors.md
@@ -714,7 +714,7 @@ Edit [engine/gfx/cgb_layouts.asm](../blob/master/engine/gfx/cgb_layouts.asm):
  	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
@@ -724,7 +724,7 @@ Edit [engine/gfx/cgb_layouts.asm](../blob/master/engine/gfx/cgb_layouts.asm):
  .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
@@ -734,35 +734,35 @@ Edit [engine/gfx/cgb_layouts.asm](../blob/master/engine/gfx/cgb_layouts.asm):
  .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
 +	ld a, $5 ; 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
 +	ld a, $7 ; 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
@@ -771,7 +771,7 @@ Edit [engine/gfx/cgb_layouts.asm](../blob/master/engine/gfx/cgb_layouts.asm):
 -	and a
 -	push af
 -	jr z, .got_gender3
- 	hlcoord 14, 14, wAttrMap
+ 	hlcoord 14, 14, wAttrmap
  	lb bc, 2, 4
 -	ld a, $1
 +	ld a, $5 ; clair
@@ -784,7 +784,7 @@ Edit [engine/gfx/cgb_layouts.asm](../blob/master/engine/gfx/cgb_layouts.asm):
 -.got_gender4
 -	ld a, c
 +	; top-right corner still uses the border's palette
- 	hlcoord 18, 1, wAttrMap
+ 	hlcoord 18, 1, wAttrmap
 +	ld a, [wPlayerGender]
 +	and a
 +	ld a, $1 ; kris
@@ -792,7 +792,7 @@ Edit [engine/gfx/cgb_layouts.asm](../blob/master/engine/gfx/cgb_layouts.asm):
 +	ld a, $0 ; chris
 +.got_gender3
  	ld [hl], a
- 	call ApplyAttrMap
+ 	call ApplyAttrmap
  	call ApplyPals
  	ld a, $1
  	ldh [hCGBPalUpdate], a
diff --git a/Expand-the-Town-Map-tileset-Alternate.md b/Expand-the-Town-Map-tileset-Alternate.md
index cd5f00f..0090df6 100644
--- a/Expand-the-Town-Map-tileset-Alternate.md
+++ b/Expand-the-Town-Map-tileset-Alternate.md
@@ -172,7 +172,7 @@ Edit [engine/pokegear/pokegear.asm](../blob/master/engine/pokegear/pokegear.asm)
  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
diff --git a/Expand-the-Town-Map-tileset.md b/Expand-the-Town-Map-tileset.md
index 00e8c8d..64ff84f 100644
--- a/Expand-the-Town-Map-tileset.md
+++ b/Expand-the-Town-Map-tileset.md
@@ -157,7 +157,7 @@ And edit [engine/pokegear/pokegear.asm](../blob/master/engine/pokegear/pokegear.
  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
diff --git a/Increase-Pokémon-sprite-animation-size.md b/Increase-Pokémon-sprite-animation-size.md
index a6aaeb0..358c161 100644
--- a/Increase-Pokémon-sprite-animation-size.md
+++ b/Increase-Pokémon-sprite-animation-size.md
@@ -58,8 +58,8 @@ Edit [wram.asm](../blob/master/wram.asm):
  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
diff --git a/Print-text-when-you-lose-a-trainer-battle.md b/Print-text-when-you-lose-a-trainer-battle.md
index 5968fff..b1b7af3 100644
--- a/Print-text-when-you-lose-a-trainer-battle.md
+++ b/Print-text-when-you-lose-a-trainer-battle.md
@@ -74,7 +74,7 @@ Anyway, it's quite simple to enable this feature. Edit [engine/battle/core.asm](
  	ld c, BATTLETOWERTEXT_WIN_TEXT
  	farcall BattleTowerText
  	call WaitPressAorB_BlinkCursor
- 	call ClearTileMap
+ 	call ClearTilemap
  	call ClearBGPalettes
  	ret
  
diff --git a/Remove-Pokémon-sprite-animations.md b/Remove-Pokémon-sprite-animations.md
index da38fdd..b710261 100644
--- a/Remove-Pokémon-sprite-animations.md
+++ b/Remove-Pokémon-sprite-animations.md
@@ -399,7 +399,7 @@ Edit [mobile/mobile_42.asm](../blob/master/mobile/mobile_42.asm):
  .loop
  	farcall PlaySpriteAnimations
 -	farcall SetUpPokeAnim
--	farcall HDMATransferTileMapToWRAMBank3
+-	farcall HDMATransferTilemapToWRAMBank3
  	jr nc, .loop
  	ret
 ```
@@ -446,7 +446,7 @@ Edit [engine/pokemon/stats_screen.asm](../blob/master/engine/pokemon/stats_scree
  .finish
  	ld hl, wcf64
  	res 5, [hl]
- 	farcall HDMATransferTileMapToWRAMBank3
+ 	farcall HDMATransferTilemapToWRAMBank3
  	ret
  
  ...