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.
This commit is contained in:
mid-kid
2020-02-13 18:30:13 +01:00
parent 34ceaac71d
commit 26b8bf003e
84 changed files with 630 additions and 630 deletions

View File

@@ -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 @@ ReloadMapPart::
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 @@ ReloadMapPart::
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 @@ Mobile_ReloadMapPart:
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 @@ Mobile_ReloadMapPart:
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 @@ Mobile_ReloadMapPart:
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,40 +166,40 @@ OpenAndCloseMenu_HDMATransferTileMapAndAttrMap::
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
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 @@ CallInSafeGFXMode:
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 @@ PadTilemapForHDMATransfer:
ld c, " "
jr PadMapForHDMATransfer
PadAttrMapForHDMATransfer:
PadAttrmapForHDMATransfer:
ld c, $0
PadMapForHDMATransfer:
@@ -455,13 +455,13 @@ _Get2bpp::
; 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 @@ _Get2bpp::
ld c, l
ld h, d ; address
ld l, e
ld de, wScratchTileMap
ld de, wScratchTilemap
call FarCopyBytes
pop hl
@@ -486,7 +486,7 @@ _Get2bpp::
ld d, h
ld e, l
ld hl, wScratchTileMap
ld hl, wScratchTilemap
call HDMATransfer_Wait127Scanlines
; restore the previous bank
@@ -523,7 +523,7 @@ _Get1bpp::
.bankswitch
ldh a, [rSVBK]
push af
ld a, BANK(wScratchTileMap)
ld a, BANK(wScratchTilemap)
ldh [rSVBK], a
push bc
@@ -539,7 +539,7 @@ _Get1bpp::
ld b, h
ld h, d
ld l, e
ld de, wScratchTileMap
ld de, wScratchTilemap
call FarCopyBytesDouble_DoubleBankSwitch
pop hl
@@ -551,7 +551,7 @@ _Get1bpp::
ld d, h
ld e, l
ld hl, wScratchTileMap
ld hl, wScratchTilemap
call HDMATransfer_Wait127Scanlines
pop af
@@ -563,22 +563,22 @@ HDMATransfer_OnlyTopFourRows:
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