summaryrefslogtreecommitdiff
path: root/mobile
diff options
context:
space:
mode:
Diffstat (limited to 'mobile')
-rw-r--r--mobile/fixed_words.asm16
-rw-r--r--mobile/mobile_12.asm10
-rw-r--r--mobile/mobile_22.asm54
-rw-r--r--mobile/mobile_22_2.asm10
-rw-r--r--mobile/mobile_40.asm44
-rw-r--r--mobile/mobile_42.asm20
-rw-r--r--mobile/mobile_45_stadium.asm4
-rw-r--r--mobile/mobile_46.asm18
-rw-r--r--mobile/mobile_5b.asm24
-rw-r--r--mobile/mobile_5c.asm8
-rw-r--r--mobile/mobile_5e.asm10
-rw-r--r--mobile/mobile_5f.asm16
-rw-r--r--mobile/mobile_menu.asm14
13 files changed, 124 insertions, 124 deletions
diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm
index 5456a08a7..6c35b1530 100644
--- a/mobile/fixed_words.asm
+++ b/mobile/fixed_words.asm
@@ -696,11 +696,11 @@ Function11c4a5:
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 @@ EZChat_PlaceCategoryNames:
Function11c618:
ld a, $2
- hlcoord 0, 6, wAttrMap
+ hlcoord 0, 6, wAttrmap
ld bc, $c8
call ByteFill
farcall ReloadMapPart
@@ -1495,7 +1495,7 @@ Function11c992:
Function11c9ab:
ld a, $7
- hlcoord 0, 6, wAttrMap
+ hlcoord 0, 6, wAttrmap
ld bc, $c8
call ByteFill
farcall ReloadMapPart
@@ -1552,7 +1552,7 @@ Function11c9c3:
ret
Function11ca01:
- hlcoord 14, 7, wAttrMap
+ hlcoord 14, 7, wAttrmap
ld de, $14
ld a, $5
ld c, a
@@ -1571,7 +1571,7 @@ Function11ca01:
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 @@ Function11cd54:
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
diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm
index f3453328b..17f38f524 100644
--- a/mobile/mobile_12.asm
+++ b/mobile/mobile_12.asm
@@ -144,7 +144,7 @@ asm_4815f:
call ClearBGPalettes
call Function48d30
pop bc
- call ClearTileMap
+ call ClearTilemap
ld a, $ff
ret
@@ -254,7 +254,7 @@ Function4820d:
call ClearBGPalettes
call Function48d30
pop bc
- call ClearTileMap
+ call ClearTilemap
ld b, SCGB_DIPLOMA
call GetSGBLayout
ld hl, wd479
@@ -354,7 +354,7 @@ Function48304:
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 @@ Function48304:
ld [wd003], a
.asm_48377
call Function48187
- farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+ farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
jp Function4840c
Function48383:
@@ -1662,7 +1662,7 @@ Function48cdc:
call Function48cfd
pop hl
pop bc
- ld de, wAttrMap - wTileMap
+ ld de, wAttrmap - wTilemap
add hl, de
inc b
inc b
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm
index d3d88d9b1..a83803257 100644
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -123,7 +123,7 @@ Function891d3:
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 @@ Function8920f:
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 @@ Palette_895de:
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 @@ Function895e6:
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 @@ Function895f2:
ret
Function89605:
- hlcoord 19, 2, wAttrMap
+ hlcoord 19, 2, wAttrmap
ld a, 1
ld de, SCREEN_WIDTH
ld c, 14
@@ -828,7 +828,7 @@ Function89605:
jr nz, .loop
.done
- hlcoord 0, 16, wAttrMap
+ hlcoord 0, 16, wAttrmap
ld c, 10
ld a, 2
.loop2
@@ -838,7 +838,7 @@ Function89605:
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 @@ Function89605:
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 @@ Function8963d:
ret
Function89655:
- hlcoord 1, 12, wAttrMap
+ hlcoord 1, 12, wAttrmap
ld de, SCREEN_WIDTH
ld a, 5
ld b, 4
@@ -1164,7 +1164,7 @@ Function897d5:
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 @@ Function89d75:
push hl
call Mobile22_SetBGMapMode0
call _hl_
- farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+ farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
pop hl
jr asm_89d90
@@ -2256,10 +2256,10 @@ Function89e6f:
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 @@ Function89eb9:
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 @@ Function89fa5:
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 @@ Function8a055:
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 @@ Function8a0a1:
Function8a0c1:
push hl
- ld bc, wAttrMap - wTileMap
+ ld bc, wAttrmap - wTilemap
add hl, bc
ld a, [hl]
pop hl
@@ -2612,7 +2612,7 @@ Function8a0c9:
Function8a0de:
call Function8a0c9
- ld de, wAttrMap - wTileMap
+ ld de, wAttrmap - wTilemap
add hl, de
ret
@@ -2814,10 +2814,10 @@ Function8a262:
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 @@ Function8a4d3:
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
diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm
index b0fbe5918..719a1fe6b 100644
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -615,11 +615,11 @@ Palette_8b6d5:
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 @@ Function8b73e:
ret
Function8b744:
- ld de, wAttrMap - wTileMap
+ ld de, wAttrmap - wTilemap
add hl, de
inc b
inc b
@@ -743,10 +743,10 @@ Function8b788:
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
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm
index 759220151..cb1aec1cf 100644
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -195,7 +195,7 @@ Function100144:
ret z
res 2, [hl]
res 6, [hl]
- farcall HDMATransferTileMapToWRAMBank3
+ farcall HDMATransferTilemapToWRAMBank3
ret
Function100163:
@@ -430,7 +430,7 @@ Function100320:
ret
Function100327:
- farcall HDMATransferTileMapToWRAMBank3
+ farcall HDMATransferTilemapToWRAMBank3
ret
Function10032e:
@@ -1436,7 +1436,7 @@ Function100970:
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 @@ Function100989:
call Function1009ae
farcall ReloadMapPart
ld hl, w3_dd68
- decoord 0, 0, wAttrMap
+ decoord 0, 0, wAttrmap
call Function1009a5
ret
@@ -1467,7 +1467,7 @@ Function1009ae:
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 @@ Function100b45:
call Mobile_SetOverworldDelay
farcall MobileMenuJoypad
push bc
- farcall HDMATransferTileMapToWRAMBank3
+ farcall HDMATransferTilemapToWRAMBank3
call Function100e2d
pop bc
jr c, .asm_100b6b
@@ -1773,7 +1773,7 @@ MobileMoveSelectionScreen:
call Mobile_SetOverworldDelay
farcall MobileMenuJoypad
push bc
- farcall HDMATransferTileMapToWRAMBank3
+ farcall HDMATransferTilemapToWRAMBank3
call Function100e2d
pop bc
jr c, .b_button
@@ -1857,7 +1857,7 @@ MobileMoveSelectionScreen:
.print_text
call StdBattleTextbox
- call SafeLoadTempTileMapToTileMap
+ call SafeLoadTempTilemapToTilemap
jp .GetMoveSelection
Function100c74:
@@ -1904,7 +1904,7 @@ Mobile_PartyMenuSelect:
farcall MobileMenuJoypad
push bc
farcall PlaySpriteAnimations
- farcall HDMATransferTileMapToWRAMBank3
+ farcall HDMATransferTilemapToWRAMBank3
call MobileComms_CheckInactivityTimer
pop bc
jr c, .done
@@ -1957,7 +1957,7 @@ MobileBattleMonMenu:
farcall MobileMenuJoypad
push bc
farcall PlaySpriteAnimations
- farcall HDMATransferTileMapToWRAMBank3
+ farcall HDMATransferTilemapToWRAMBank3
call MobileComms_CheckInactivityTimer
pop bc
jr c, .asm_100d54
@@ -2918,7 +2918,7 @@ Function1013c0:
ret
Function1013d6:
- farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+ farcall HDMATransferAttrmapAndTilemapToWRAMBank3
ret
Function1013dd:
@@ -3785,7 +3785,7 @@ _StartMobileBattle:
farcall Function100846
ld c, 120
call DelayFrames
- farcall ClearTileMap
+ farcall ClearTilemap
call .CopyOTDetails
call StartMobileBattle
ld a, [wcd2b]
@@ -4907,14 +4907,14 @@ Function102274:
Function102283:
ld a, $01
- ld [wAttrMapEnd], a
+ ld [wAttrmapEnd], a
ld hl, wcd4b
set 0, [hl]
ret
Function10228e:
xor a
- ld [wAttrMapEnd], a
+ ld [wAttrmapEnd], a
ld hl, wcd4b
res 0, [hl]
ret
@@ -4945,7 +4945,7 @@ Function102298:
.asm_1022c1
call Function10304f
ld a, $01
- ld [wAttrMapEnd], a
+ ld [wAttrmapEnd], a
ret
Function1022ca:
@@ -6415,10 +6415,10 @@ Function102d9a:
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 @@ String_10302e:
Function10304f:
xor a
- ld [wAttrMapEnd], a
+ ld [wAttrmapEnd], a
ld [wcf42], a
ld [wcf44], a
ld [wcf45], a
@@ -6699,7 +6699,7 @@ Function10304f:
Function10305d:
nop
- ld a, [wAttrMapEnd]
+ ld a, [wAttrmapEnd]
and a
ret z
call Function10307f
@@ -6958,7 +6958,7 @@ Function103309:
ld [wd1ee], a
call Function1034be
call UpdateSprites
- farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+ farcall HDMATransferAttrmapAndTilemapToWRAMBank3
ld a, $01
ld [wd1f0], a
call Function10339a
@@ -6971,7 +6971,7 @@ Function103362:
call Function1033af
call Function10339a
call Function10342c
- farcall HDMATransferTileMapToWRAMBank3
+ farcall HDMATransferTilemapToWRAMBank3
ld a, [wBuffer2]
bit 7, a
jr z, .asm_103362
@@ -7179,7 +7179,7 @@ Function1034e0:
push hl
call ClearBox
pop hl
- ld bc, wAttrMap - wTileMap
+ ld bc, wAttrmap - wTilemap
add hl, bc
pop bc
ld a, $06
diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm
index ab00ef67d..6bae84ccf 100644
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -140,7 +140,7 @@ Function1080b7:
ld [wJumptableIndex], a
call ClearBGPalettes
call ClearSprites
- call ClearTileMap
+ call ClearTilemap
call DisableLCD
call MobileTradeAnim_ClearTiles
call MobileTradeAnim_ClearBGMap
@@ -215,7 +215,7 @@ Function108157:
ld [wJumptableIndex], a
call ClearBGPalettes
call ClearSprites
- call ClearTileMap
+ call ClearTilemap
call DisableLCD
call MobileTradeAnim_ClearTiles
call MobileTradeAnim_ClearBGMap
@@ -421,7 +421,7 @@ Function1082db:
.loop
farcall PlaySpriteAnimations
farcall SetUpPokeAnim
- farcall HDMATransferTileMapToWRAMBank3
+ farcall HDMATransferTilemapToWRAMBank3
jr nc, .loop
ret
@@ -515,7 +515,7 @@ MobileTradeAnim_ShowPlayerMonToBeSent:
MobileTradeAnim_ShowOTMonFromTrade:
call ClearBGPalettes
call ClearSprites
- call ClearTileMap
+ call ClearTilemap
call DisableLCD
call MobileTradeAnim_ClearBGMap
ld a, [wOTTrademonSpecies]
@@ -648,7 +648,7 @@ MobileTradeAnim_ShowPlayerMonForGTS:
MobileTradeAnim_ShowOTMonFromGTS:
call ClearBGPalettes
call ClearSprites
- call ClearTileMap
+ call ClearTilemap
call DisableLCD
call MobileTradeAnim_ClearBGMap
ld a, [wOTTrademonSpecies]
@@ -716,7 +716,7 @@ MobileTradeAnim_ShowOTMonFromGTS:
MobileTradeAnim_GetOddEgg:
call ClearBGPalettes
call ClearSprites
- call ClearTileMap
+ call ClearTilemap
call DisableLCD
call MobileTradeAnim_ClearBGMap
ld a, [wOTTrademonSpecies]
@@ -784,7 +784,7 @@ MobileTradeAnim_02:
farcall DeinitializeAllSprites
call ClearBGPalettes
call ClearSprites
- call ClearTileMap
+ call ClearTilemap
xor a
ldh [hBGMapMode], a
call DisableLCD
@@ -819,7 +819,7 @@ MobileTradeAnim_10:
farcall DeinitializeAllSprites
call ClearBGPalettes
call ClearSprites
- call ClearTileMap
+ call ClearTilemap
xor a
ldh [hBGMapMode], a
call DisableLCD
@@ -863,7 +863,7 @@ MobileTradeAnim_10:
MobileTradeAnim_11:
call ClearBGPalettes
call ClearSprites
- call ClearTileMap
+ call ClearTilemap
xor a
ldh [hBGMapMode], a
call DisableLCD
@@ -1149,7 +1149,7 @@ MobileTradeAnim_0f:
farcall DeinitializeAllSprites
call ClearBGPalettes
call ClearSprites
- call ClearTileMap
+ call ClearTilemap
call DisableLCD
call MobileTradeAnim_ClearTiles
call MobileTradeAnim_ClearBGMap
diff --git a/mobile/mobile_45_stadium.asm b/mobile/mobile_45_stadium.asm
index 16ddd6a8a..ffae225b1 100644
--- a/mobile/mobile_45_stadium.asm
+++ b/mobile/mobile_45_stadium.asm
@@ -519,7 +519,7 @@ Function117a94:
call ClearBGPalettes
call ClearSprites
farcall Function172e78
- farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+ farcall HDMATransferAttrmapAndTilemapToWRAMBank3
ret
Function117ab4:
@@ -536,7 +536,7 @@ Function117acd:
bit 7, a
jr nz, .asm_117ae2
call Function117ae9
- farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+ farcall HDMATransferAttrmapAndTilemapToWRAMBank3
jr Function117acd
.asm_117ae2
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm
index d4ba2fa55..6e925d025 100644
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -1144,7 +1144,7 @@ BattleTowerRoomMenu_PlacePickLevelMenu:
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 @@ Function11a5b9:
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 @@ Function11a5f5:
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 @@ Function11acb7:
Function11ad1b:
call ClearBGPalettes
call ClearSprites
- call ClearTileMap
+ call ClearTilemap
farcall Function17c000
ld a, [wMenuCursorY]
ld [wcd82], a
@@ -5680,7 +5680,7 @@ Function11ad95:
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 @@ Function11ae4e:
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 @@ Function11af04:
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
diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm
index 885d9835d..fed24a6d4 100644
--- a/mobile/mobile_5b.asm
+++ b/mobile/mobile_5b.asm
@@ -161,8 +161,8 @@ MobileSystemSplashScreen_InitGFX:
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 @@ MobileSystemSplashScreen_InitGFX:
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 @@ MobileSystemSplashScreen_InitGFX:
.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 @@ Function16cc5a:
ret
Function16cc62:
- hlcoord 0, 15, wAttrMap
+ hlcoord 0, 15, wAttrmap
ld bc, $0028
ld a, $1
call ByteFill
@@ -731,7 +731,7 @@ Function16cc73:
pop hl
ld a, $1
ldh [rVBK], a
- decoord 0, 0, wAttrMap
+ decoord 0, 0, wAttrmap
call Function16cc90
pop af
ldh [rVBK], a
diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm
index b5a92532e..e3a93f107 100644
--- a/mobile/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
@@ -672,7 +672,7 @@ Function171c87:
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 @@ Function171d2b:
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 @@ Function172e78:
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 @@ Function172e78:
ld bc, $168
call CopyBytes
ld hl, Attrmap_173517
- decoord 0, 0, wAttrMap
+ decoord 0, 0, wAttrmap
ld bc, $168
call CopyBytes
ret
diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm
index 589d9d444..a27f74d1a 100644
--- a/mobile/mobile_5e.asm
+++ b/mobile/mobile_5e.asm
@@ -41,7 +41,7 @@ Function17a6a8:
call Function17aba0
farcall Function106464
call Function17ac0c
- farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+ farcall HDMATransferAttrmapAndTilemapToWRAMBank3
call Function17abcf
farcall LoadOW_BGPal7
farcall Function49420
@@ -163,7 +163,7 @@ Function17a78f:
bit 7, [hl]
res 7, [hl]
jr nz, .asm_17a79f
- farcall HDMATransferTileMapToWRAMBank3
+ farcall HDMATransferTilemapToWRAMBank3
ret
.asm_17a79f
@@ -656,7 +656,7 @@ Function17aaa9:
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 @@ Function17ac1d:
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]
diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm
index 3fe6ce3b8..5df8c7a6f 100644
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -11,7 +11,7 @@ Function17c000:
ld hl, HaveWantMap
decoord 0, 0
- bccoord 0, 0, wAttrMap
+ bccoord 0, 0, wAttrmap
ld a, SCREEN_HEIGHT
.y
@@ -718,7 +718,7 @@ Function17d48d:
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 @@ Function17e691:
.asm_17e6c7
pop hl
- bccoord 0, 0, wAttrMap
+ bccoord 0, 0, wAttrmap
add hl, bc
ld [hl], a
pop hl
@@ -3509,7 +3509,7 @@ Function17e6de:
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 @@ Function17f41d:
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 @@ DisplayMobileError:
ld a, [wc303]
bit 7, a
jr nz, .quit
- farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+ farcall HDMATransferAttrmapAndTilemapToWRAMBank3
jr .loop
.quit
@@ -4545,7 +4545,7 @@ Function17f5c3:
Function17f5d2:
call Function17f5e4
- farcall HDMATransferAttrMapAndTileMapToWRAMBank3
+ farcall HDMATransferAttrmapAndTilemapToWRAMBank3
call SetPalettes
ld a, $1
ld [wc303], a
@@ -4564,7 +4564,7 @@ Function17f5e4:
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
diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm
index 86c18341a..bf8560309 100644
--- a/mobile/mobile_menu.asm
+++ b/mobile/mobile_menu.asm
@@ -65,7 +65,7 @@ Function49f16:
.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 @@ Function4a100:
call ClearBGPalettes
call Function4a13b
call ClearBGPalettes
- call ClearTileMap
+ call ClearTilemap
asm_4a111:
pop bc
@@ -271,7 +271,7 @@ Function4a149:
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 @@ Function4a28a:
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 @@ Function4a28a:
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 @@ Function4a28a:
call ExitMenu
.quit
call Call_ExitMenu
- farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+ farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
xor a
ret
@@ -715,7 +715,7 @@ asm_4a54d:
.asm_4a574
pop bc
call ClearBGPalettes
- call ClearTileMap
+ call ClearTilemap
jp Function49f0a
.asm_4a57e
ld hl, wMenuCursorY
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 10:10:17 +0000