summaryrefslogtreecommitdiff
path: root/engine/menus
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2020-02-13 18:30:13 +0100
committermid-kid <esteve.varela@gmail.com>2020-02-13 18:31:10 +0100
commit26b8bf003e3523fee94c4c18447ea55f9eb1d429 (patch)
tree96515ae3efceb833cd71c93786150daa3348c71c /engine/menus
parent34ceaac71d32baace82f1e6de8fd4b252fb92a84 (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/menus')
-rw-r--r--engine/menus/debug.asm12
-rw-r--r--engine/menus/init_gender.asm2
-rw-r--r--engine/menus/intro_menu.asm24
-rw-r--r--engine/menus/main_menu.asm4
-rw-r--r--engine/menus/menu.asm2
-rw-r--r--engine/menus/savemenu_copytilemapatonce.asm2
-rw-r--r--engine/menus/start_menu.asm2
-rw-r--r--engine/menus/trainer_card.asm2
8 files changed, 25 insertions, 25 deletions
diff --git a/engine/menus/debug.asm b/engine/menus/debug.asm
index 4c8c5edc8..484556b28 100644
--- a/engine/menus/debug.asm
+++ b/engine/menus/debug.asm
@@ -135,7 +135,7 @@ Function81948:
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_81bb4: db "ノーマル@" ; normal
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 @@ TilesetColorTest:
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 @@ Function821d2:
Function821d8:
ld a, [wcf64]
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
Function821de:
add hl, de
diff --git a/engine/menus/init_gender.asm b/engine/menus/init_gender.asm
index c5cc95bf3..9ab0dd710 100644
--- a/engine/menus/init_gender.asm
+++ b/engine/menus/init_gender.asm
@@ -73,7 +73,7 @@ InitGenderScreen:
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
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index d34b342f0..c33ccfa4a 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -39,10 +39,10 @@ PrintDayOfWeek:
.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 @@ NewGame:
xor a
ld [wDebugFlags], a
call ResetWRAM
- call NewGame_ClearTileMapEtc
+ call NewGame_ClearTilemapEtc
call AreYouABoyOrAreYouAGirl
call OakSpeech
call InitializeWorld
@@ -359,7 +359,7 @@ Continue:
call ClearBGPalettes
call Continue_MobileAdapterMenu
call CloseWindow
- call ClearTileMap
+ call ClearTilemap
ld c, 20
call DelayFrames
farcall JumpRoamMons
@@ -627,7 +627,7 @@ Continue_DisplayGameTime:
OakSpeech:
farcall InitClock
call RotateFourPalettesLeft
- call ClearTileMap
+ call ClearTilemap
ld de, MUSIC_ROUTE_30
call PlayMusic
@@ -647,7 +647,7 @@ OakSpeech:
ld hl, OakText1
call PrintText
call RotateThreePalettesRight
- call ClearTileMap
+ call ClearTilemap
ld a, WOOPER
ld [wCurSpecies], a
@@ -670,7 +670,7 @@ OakSpeech:
ld hl, OakText4
call PrintText
call RotateThreePalettesRight
- call ClearTileMap
+ call ClearTilemap
xor a
ld [wCurPartySpecies], a
@@ -685,7 +685,7 @@ OakSpeech:
ld hl, OakText5
call PrintText
call RotateThreePalettesRight
- call ClearTileMap
+ call ClearTilemap
xor a
ld [wCurPartySpecies], a
@@ -752,7 +752,7 @@ NamePlayer:
farcall NamingScreen
call RotateThreePalettesRight
- call ClearTileMap
+ call ClearTilemap
call LoadFontsExtra
call WaitBGMap
@@ -848,7 +848,7 @@ ShrinkPlayer:
call DelayFrames
call RotateThreePalettesRight
- call ClearTileMap
+ call ClearTilemap
ret
Intro_RotatePalettesLeftFrontpic:
@@ -1293,7 +1293,7 @@ Unreferenced_Function639b:
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 @@ GameInit::
farcall TryLoadSaveData
call ClearWindowData
call ClearBGPalettes
- call ClearTileMap
+ call ClearTilemap
ld a, HIGH(vBGMap0)
ldh [hBGMapAddress + 1], a
xor a ; LOW(vBGMap0)
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index 9274694da..f02da0ce7 100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -18,7 +18,7 @@ MainMenu:
call MainMenuJoypadLoop
call CloseWindow
jr c, .quit
- call ClearTileMap
+ call ClearTilemap
ld a, [wMenuSelection]
ld hl, .Jumptable
rst JumpTable
@@ -313,7 +313,7 @@ MainMenu_PrintCurrentTimeAndDay:
Function49ed0:
xor a
ldh [hMapAnims], a
- call ClearTileMap
+ call ClearTilemap
call LoadFontsExtra
call LoadStandardFont
call ClearWindowData
diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm
index 544f4ade8..37775963b 100644
--- a/engine/menus/menu.asm
+++ b/engine/menus/menu.asm
@@ -276,7 +276,7 @@ Unreferenced_Function241d5:
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
diff --git a/engine/menus/savemenu_copytilemapatonce.asm b/engine/menus/savemenu_copytilemapatonce.asm
index 58c269afd..51b7ea8fe 100644
--- a/engine/menus/savemenu_copytilemapatonce.asm
+++ b/engine/menus/savemenu_copytilemapatonce.asm
@@ -20,7 +20,7 @@ SaveMenu_CopyTilemapAtOnce:
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
diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm
index 69b1f73bf..1ca2f9991 100644
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -33,7 +33,7 @@ StartMenu::
call DrawVariableLengthMenuBox
call .DrawBugContestStatusBox
call SafeUpdateSprites
- call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
+ call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
farcall LoadFonts_NoOAMUpdate
call .DrawBugContestStatus
call UpdateTimePals
diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm
index 1509722ed..67adedd1d 100644
--- a/engine/menus/trainer_card.asm
+++ b/engine/menus/trainer_card.asm
@@ -41,7 +41,7 @@ TrainerCard:
.InitRAM:
call ClearBGPalettes
call ClearSprites
- call ClearTileMap
+ call ClearTilemap
call DisableLCD
farcall GetCardPic