diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-02-13 18:30:13 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2020-02-13 18:31:10 +0100 |
| commit | 26b8bf003e3523fee94c4c18447ea55f9eb1d429 (patch) | |
| tree | 96515ae3efceb833cd71c93786150daa3348c71c /engine/overworld | |
| parent | 34ceaac71d32baace82f1e6de8fd4b252fb92a84 (diff) | |
Standardize on lowercase Tilemap and Attrmap
We used to have a mixture of TileMap and and Tilemap, as well as the
similar AttrMap. Standardize on one.
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/init_map.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/player_object.asm | 6 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/warp_connection.asm | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm index fece592d0..6889eed83 100644 --- a/engine/overworld/init_map.asm +++ b/engine/overworld/init_map.asm @@ -29,7 +29,7 @@ ReanchorBGMap_NoOAMUpdate:: 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 @@ HDMATransfer_FillBGMap0WithBlack: ld a, "■" ld hl, wDecompressScratch - ld bc, wScratchAttrMap - wDecompressScratch + ld bc, wScratchAttrmap - wDecompressScratch call ByteFill ld a, HIGH(wDecompressScratch) ldh [rHDMA1], a diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 478c8f6c6..0507d98f6 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -5,11 +5,11 @@ BlankScreen: 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 diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 245d8e763..bd74cfc40 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -2643,7 +2643,7 @@ Script_writeunusedbytebuffer: Script_closetext: ; script command 0x49 - call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap call CloseText ret diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index ed3b26ef5..c08ca11d7 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -233,7 +233,7 @@ LoadMapTimeOfDay: farcall UpdateTimeOfDayPal call OverworldTextModeSwitch call .ClearBGMap - call .PushAttrMap + call .PushAttrmap ret .ClearBGMap: @@ -264,14 +264,14 @@ LoadMapTimeOfDay: call ByteFill ret -.PushAttrMap: +.PushAttrmap: decoord 0, 0 call .copy ldh a, [hCGB] and a ret z - decoord 0, 0, wAttrMap + decoord 0, 0, wAttrmap ld a, $1 ldh [rVBK], a .copy |