summaryrefslogtreecommitdiff
path: root/engine/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'engine/gfx')
-rw-r--r--engine/gfx/cgb_layouts.asm210
-rw-r--r--engine/gfx/color.asm28
-rw-r--r--engine/gfx/crystal_layouts.asm64
-rw-r--r--engine/gfx/dma_transfer.asm114
-rw-r--r--engine/gfx/pic_animation.asm16
5 files changed, 216 insertions, 216 deletions
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index 06e060443..a41456fd6 100644
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -113,31 +113,31 @@ _CGB_BattleColors:
call ApplyPals
_CGB_FinishBattleScreenLayout:
call InitPartyMenuBGPal7
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, PAL_BATTLE_BG_ENEMY_HP
call ByteFill
- hlcoord 0, 4, wAttrMap
+ hlcoord 0, 4, wAttrmap
lb bc, 8, 10
ld a, PAL_BATTLE_BG_PLAYER
call FillBoxCGB
- hlcoord 10, 0, wAttrMap
+ hlcoord 10, 0, wAttrmap
lb bc, 7, 10
ld a, PAL_BATTLE_BG_ENEMY
call FillBoxCGB
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
lb bc, 4, 10
ld a, PAL_BATTLE_BG_ENEMY_HP
call FillBoxCGB
- hlcoord 10, 7, wAttrMap
+ hlcoord 10, 7, wAttrmap
lb bc, 5, 10
ld a, PAL_BATTLE_BG_PLAYER_HP
call FillBoxCGB
- hlcoord 10, 11, wAttrMap
+ hlcoord 10, 11, wAttrmap
lb bc, 1, 9
ld a, PAL_BATTLE_BG_EXP
call FillBoxCGB
- hlcoord 0, 12, wAttrMap
+ hlcoord 0, 12, wAttrmap
ld bc, 6 * SCREEN_WIDTH
ld a, PAL_BATTLE_BG_TEXT
call ByteFill
@@ -146,7 +146,7 @@ _CGB_FinishBattleScreenLayout:
ld bc, 6 palettes
ld a, BANK(wOBPals1)
call FarCopyWRAM
- call ApplyAttrMap
+ call ApplyAttrmap
ret
InitPartyMenuBGPal7:
@@ -214,34 +214,34 @@ _CGB_StatsScreenHPPals:
ld bc, 3 palettes ; pink, green, and blue page palettes
ld a, BANK(wBGPals1)
call FarCopyWRAM
- call WipeAttrMap
+ call WipeAttrmap
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
lb bc, 8, SCREEN_WIDTH
ld a, $1 ; mon palette
call FillBoxCGB
- hlcoord 10, 16, wAttrMap
+ hlcoord 10, 16, wAttrmap
ld bc, 10
ld a, $2 ; exp palette
call ByteFill
- hlcoord 13, 5, wAttrMap
+ hlcoord 13, 5, wAttrmap
lb bc, 2, 2
ld a, $3 ; pink page palette
call FillBoxCGB
- hlcoord 15, 5, wAttrMap
+ hlcoord 15, 5, wAttrmap
lb bc, 2, 2
ld a, $4 ; green page palette
call FillBoxCGB
- hlcoord 17, 5, wAttrMap
+ hlcoord 17, 5, wAttrmap
lb bc, 2, 2
ld a, $5 ; blue page palette
call FillBoxCGB
- call ApplyAttrMap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -269,8 +269,8 @@ _CGB_Pokedex:
call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black ; mon palette
.got_palette
- call WipeAttrMap
- hlcoord 1, 1, wAttrMap
+ call WipeAttrmap
+ hlcoord 1, 1, wAttrmap
lb bc, 7, 7
ld a, $1 ; green question mark palette
call FillBoxCGB
@@ -280,7 +280,7 @@ _CGB_Pokedex:
ld bc, 1 palettes
ld a, BANK(wOBPals1)
call FarCopyWRAM
- call ApplyAttrMap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -309,13 +309,13 @@ _CGB_BillsPC:
call GetPlayerOrMonPalettePointer
call LoadPalette_White_Col1_Col2_Black
.Resume:
- call WipeAttrMap
- hlcoord 1, 4, wAttrMap
+ call WipeAttrmap
+ hlcoord 1, 4, wAttrmap
lb bc, 7, 7
ld a, $1
call FillBoxCGB
call InitPartyMenuOBPals
- call ApplyAttrMap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -331,13 +331,13 @@ _CGB_BillsPC:
call GetPlayerOrMonPalettePointer
call LoadPalette_White_Col1_Col2_Black
.asm_901a
- call WipeAttrMap
- hlcoord 1, 1, wAttrMap
+ call WipeAttrmap
+ hlcoord 1, 1, wAttrmap
lb bc, 7, 7
ld a, $1
call FillBoxCGB
call InitPartyMenuOBPals
- call ApplyAttrMap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -354,13 +354,13 @@ _CGB_PokedexUnownMode:
ld a, [wCurPartySpecies]
call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black
- call WipeAttrMap
- hlcoord 7, 5, wAttrMap
+ call WipeAttrmap
+ hlcoord 7, 5, wAttrmap
lb bc, 7, 7
ld a, $1
call FillBoxCGB
call InitPartyMenuOBPals
- call ApplyAttrMap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -372,48 +372,48 @@ _CGB_SlotMachine:
ld bc, 16 palettes
ld a, BANK(wBGPals1)
call FarCopyWRAM
- call WipeAttrMap
- hlcoord 0, 2, wAttrMap
+ call WipeAttrmap
+ hlcoord 0, 2, wAttrmap
lb bc, 10, 3
ld a, $2
call FillBoxCGB
- hlcoord 17, 2, wAttrMap
+ hlcoord 17, 2, wAttrmap
lb bc, 10, 3
ld a, $2
call FillBoxCGB
- hlcoord 0, 4, wAttrMap
+ hlcoord 0, 4, wAttrmap
lb bc, 6, 3
ld a, $3
call FillBoxCGB
- hlcoord 17, 4, wAttrMap
+ hlcoord 17, 4, wAttrmap
lb bc, 6, 3
ld a, $3
call FillBoxCGB
- hlcoord 0, 6, wAttrMap
+ hlcoord 0, 6, wAttrmap
lb bc, 2, 3
ld a, $4
call FillBoxCGB
- hlcoord 17, 6, wAttrMap
+ hlcoord 17, 6, wAttrmap
lb bc, 2, 3
ld a, $4
call FillBoxCGB
- hlcoord 4, 2, wAttrMap
+ hlcoord 4, 2, wAttrmap
lb bc, 2, 12
ld a, $1
call FillBoxCGB
- hlcoord 3, 2, wAttrMap
+ hlcoord 3, 2, wAttrmap
lb bc, 10, 1
ld a, $1
call FillBoxCGB
- hlcoord 16, 2, wAttrMap
+ hlcoord 16, 2, wAttrmap
lb bc, 10, 1
ld a, $1
call FillBoxCGB
- hlcoord 0, 12, wAttrMap
+ hlcoord 0, 12, wAttrmap
ld bc, $78
ld a, $7
call ByteFill
- call ApplyAttrMap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -422,16 +422,16 @@ _CGB_SlotMachine:
_CGB_BetaTitleScreen:
ld hl, PalPacket_BetaTitleScreen + 1
call CopyFourPalettes
- call WipeAttrMap
+ call WipeAttrmap
ld de, wOBPals1
ld a, PREDEFPAL_PACK
call GetPredefPal
call LoadHLPaletteIntoDE
- hlcoord 0, 6, wAttrMap
+ hlcoord 0, 6, wAttrmap
lb bc, 12, SCREEN_WIDTH
ld a, $1
call FillBoxCGB
- call ApplyAttrMap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -461,7 +461,7 @@ _CGB_GSIntro:
ld bc, 2 palettes
ld a, BANK(wOBPals1)
call FarCopyWRAM
- call WipeAttrMap
+ call WipeAttrmap
ret
.ShellderLaprasBGPalette:
@@ -491,7 +491,7 @@ _CGB_GSIntro:
ld a, PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
call GetPredefPal
call LoadHLPaletteIntoDE
- call WipeAttrMap
+ call WipeAttrmap
ret
.StartersCharizardScene:
@@ -501,7 +501,7 @@ _CGB_GSIntro:
ld a, PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
call GetPredefPal
call LoadHLPaletteIntoDE
- call WipeAttrMap
+ call WipeAttrmap
ret
_CGB_BetaPoker:
@@ -511,8 +511,8 @@ _CGB_BetaPoker:
ld a, BANK(wBGPals1)
call FarCopyWRAM
call ApplyPals
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
ret
_CGB_Diploma:
@@ -524,8 +524,8 @@ _CGB_Diploma:
ld hl, PalPacket_Diploma + 1
call CopyFourPalettes
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
ret
_CGB_MapPals:
@@ -540,7 +540,7 @@ _CGB_PartyMenu:
call InitPartyMenuBGPal0
call InitPartyMenuBGPal7
call InitPartyMenuOBPals
- call ApplyAttrMap
+ call ApplyAttrmap
ret
_CGB_Evolution:
@@ -570,8 +570,8 @@ _CGB_Evolution:
call FarCopyWRAM
.got_palette
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -598,8 +598,8 @@ _CGB_GSTitleScreen:
_CGB0d:
ld hl, PalPacket_Diploma + 1
call CopyFourPalettes
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
ret
_CGB_UnownPuzzle:
@@ -620,8 +620,8 @@ _CGB_UnownPuzzle:
ld [hl], a
pop af
ldh [rSVBK], a
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
ret
_CGB_TrainerCard:
@@ -655,7 +655,7 @@ _CGB_TrainerCard:
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
@@ -665,7 +665,7 @@ _CGB_TrainerCard:
.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
@@ -675,33 +675,33 @@ _CGB_TrainerCard:
.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
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
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
@@ -710,7 +710,7 @@ _CGB_TrainerCard:
and a
push af
jr z, .got_gender3
- hlcoord 14, 14, wAttrMap
+ hlcoord 14, 14, wAttrmap
lb bc, 2, 4
ld a, $1
call FillBoxCGB
@@ -721,9 +721,9 @@ _CGB_TrainerCard:
inc c
.got_gender4
ld a, c
- hlcoord 18, 1, wAttrMap
+ hlcoord 18, 1, wAttrmap
ld [hl], a
- call ApplyAttrMap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -742,12 +742,12 @@ _CGB_MoveList:
ld bc, HPBarPals
add hl, bc
call LoadPalette_White_Col1_Col2_Black
- call WipeAttrMap
- hlcoord 11, 1, wAttrMap
+ call WipeAttrmap
+ hlcoord 11, 1, wAttrmap
lb bc, 2, 9
ld a, $1
call FillBoxCGB
- call ApplyAttrMap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -756,8 +756,8 @@ _CGB_MoveList:
_CGB_BetaPikachuMinigame:
ld hl, PalPacket_BetaPikachuMinigame + 1
call CopyFourPalettes
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -768,8 +768,8 @@ _CGB_PokedexSearchOption:
ld a, PREDEFPAL_POKEDEX
call GetPredefPal
call LoadHLPaletteIntoDE
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -796,28 +796,28 @@ _CGB_PackPals:
ld bc, 8 palettes ; 6 palettes?
ld a, BANK(wBGPals1)
call FarCopyWRAM
- call WipeAttrMap
- hlcoord 0, 0, wAttrMap
+ call WipeAttrmap
+ hlcoord 0, 0, wAttrmap
lb bc, 1, 10
ld a, $1
call FillBoxCGB
- hlcoord 10, 0, wAttrMap
+ hlcoord 10, 0, wAttrmap
lb bc, 1, 10
ld a, $2
call FillBoxCGB
- hlcoord 7, 2, wAttrMap
+ hlcoord 7, 2, wAttrmap
lb bc, 9, 1
ld a, $3
call FillBoxCGB
- hlcoord 0, 7, wAttrMap
+ hlcoord 0, 7, wAttrmap
lb bc, 3, 5
ld a, $4
call FillBoxCGB
- hlcoord 0, 3, wAttrMap
+ hlcoord 0, 3, wAttrmap
lb bc, 3, 5
ld a, $5
call FillBoxCGB
- call ApplyAttrMap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -832,7 +832,7 @@ INCLUDE "gfx/pack/pack_f.pal"
_CGB_Pokepic:
call _CGB_MapPals
ld de, SCREEN_WIDTH
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
ld a, [wMenuBorderTopCoord]
.loop
and a
@@ -860,22 +860,22 @@ _CGB_Pokepic:
ld c, a
ld a, $0
call FillBoxCGB
- call ApplyAttrMap
+ call ApplyAttrmap
ret
_CGB_MagnetTrain:
ld hl, PalPacket_MagnetTrain + 1
call CopyFourPalettes
- call WipeAttrMap
- hlcoord 0, 4, wAttrMap
+ call WipeAttrmap
+ hlcoord 0, 4, wAttrmap
lb bc, 10, SCREEN_WIDTH
ld a, $2
call FillBoxCGB
- hlcoord 0, 6, wAttrMap
+ hlcoord 0, 6, wAttrmap
lb bc, 6, SCREEN_WIDTH
ld a, $1
call FillBoxCGB
- call ApplyAttrMap
+ call ApplyAttrmap
call ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -892,8 +892,8 @@ _CGB_GamefreakLogo:
ld hl, .Palette
ld de, wOBPals1 palette 1
call LoadHLPaletteIntoDE
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
call ApplyPals
ret
@@ -906,8 +906,8 @@ _CGB_PlayerOrMonFrontpicPals:
ld bc, wTempMonDVs
call GetPlayerOrMonPalettePointer
call LoadPalette_White_Col1_Col2_Black
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
call ApplyPals
ret
@@ -916,8 +916,8 @@ _CGB1e:
ld a, [wCurPartySpecies]
call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
ret
_CGB_TradeTube:
@@ -932,7 +932,7 @@ _CGB_TradeTube:
ld a, PREDEFPAL_TRADE_TUBE
call GetPredefPal
call LoadHLPaletteIntoDE
- call WipeAttrMap
+ call WipeAttrmap
ret
_CGB_TrainerOrMonFrontpicPals:
@@ -941,8 +941,8 @@ _CGB_TrainerOrMonFrontpicPals:
ld bc, wTempMonDVs
call GetFrontpicPalettePointer
call LoadPalette_White_Col1_Col2_Black
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
call ApplyPals
ret
@@ -953,28 +953,28 @@ _CGB_MysteryGift:
ld a, BANK(wBGPals1)
call FarCopyWRAM
call ApplyPals
- call WipeAttrMap
- hlcoord 3, 7, wAttrMap
+ call WipeAttrmap
+ hlcoord 3, 7, wAttrmap
lb bc, 8, 14
ld a, $1
call FillBoxCGB
- hlcoord 1, 5, wAttrMap
+ hlcoord 1, 5, wAttrmap
lb bc, 1, 18
ld a, $1
call FillBoxCGB
- hlcoord 1, 16, wAttrMap
+ hlcoord 1, 16, wAttrmap
lb bc, 1, 18
ld a, $1
call FillBoxCGB
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
lb bc, 17, 2
ld a, $1
call FillBoxCGB
- hlcoord 18, 5, wAttrMap
+ hlcoord 18, 5, wAttrmap
lb bc, 12, 1
ld a, $1
call FillBoxCGB
- call ApplyAttrMap
+ call ApplyAttrmap
ret
.Palettes:
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
index 2426eba78..7f2fc8fa1 100644
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -103,7 +103,7 @@ InitPartyMenuPalettes:
ld hl, PalPacket_PartyMenu + 1
call CopyFourPalettes
call InitPartyMenuOBPals
- call WipeAttrMap
+ call WipeAttrmap
ret
; SGB layout for SCGB_PARTY_MENU_HP_PALS
@@ -284,7 +284,7 @@ Unreferenced_Function8bec:
ld a, [wEnemyLightScreenCount] ; col
ld c, a
ld a, [wEnemyReflectCount] ; row
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
ld de, SCREEN_WIDTH
.loop
and a
@@ -320,8 +320,8 @@ ApplyMonOrTrainerPals:
.load_palettes
ld de, wBGPals1
call LoadPalette_White_Col1_Col2_Black
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
call ApplyPals
ret
@@ -359,7 +359,7 @@ ApplyHPBarPals:
.PartyMenu:
ld e, c
inc e
- hlcoord 11, 1, wAttrMap
+ hlcoord 11, 1, wAttrmap
ld bc, 2 * SCREEN_WIDTH
ld a, [wCurPartyMon]
.loop
@@ -437,8 +437,8 @@ LoadMailPalettes:
ld a, BANK(wBGPals1)
call FarCopyWRAM
call ApplyPals
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
ret
.MailPals:
@@ -453,8 +453,8 @@ Unreferenced_Function95f0:
ld a, BANK(wBGPals1)
call FarCopyWRAM
call ApplyPals
- call WipeAttrMap
- call ApplyAttrMap
+ call WipeAttrmap
+ call ApplyAttrmap
ret
.Palette:
@@ -590,8 +590,8 @@ ResetBGPals:
pop af
ret
-WipeAttrMap:
- hlcoord 0, 0, wAttrMap
+WipeAttrmap:
+ hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
xor a
call ByteFill
@@ -605,7 +605,7 @@ ApplyPals:
call FarCopyWRAM
ret
-ApplyAttrMap:
+ApplyAttrmap:
ldh a, [rLCDC]
bit rLCDC_ENABLE, a
jr z, .UpdateVBank1
@@ -622,7 +622,7 @@ ApplyAttrMap:
ret
.UpdateVBank1:
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
debgcoord 0, 0
ld b, SCREEN_HEIGHT
ld a, $1
@@ -659,7 +659,7 @@ CGB_ApplyPartyMenuHPPals:
ld a, [de]
inc a
ld e, a
- hlcoord 11, 2, wAttrMap
+ hlcoord 11, 2, wAttrmap
ld bc, 2 * SCREEN_WIDTH
ld a, [wSGBPals]
.loop
diff --git a/engine/gfx/crystal_layouts.asm b/engine/gfx/crystal_layouts.asm
index 532e02152..d1ff97159 100644
--- a/engine/gfx/crystal_layouts.asm
+++ b/engine/gfx/crystal_layouts.asm
@@ -42,8 +42,8 @@ MG_Mobile_Layout_FillBox:
jr nz, .row
ret
-MG_Mobile_Layout_WipeAttrMap:
- hlcoord 0, 0, wAttrMap
+MG_Mobile_Layout_WipeAttrmap:
+ hlcoord 0, 0, wAttrmap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
xor a
call ByteFill
@@ -64,14 +64,14 @@ MG_Mobile_Layout_LoadPals:
MG_Mobile_Layout00:
call MG_Mobile_Layout_LoadPals
- call MG_Mobile_Layout_WipeAttrMap
+ call MG_Mobile_Layout_WipeAttrmap
call MG_Mobile_Layout_CreatePalBoxes
- farcall ApplyAttrMap
+ farcall ApplyAttrmap
farcall ApplyPals
ret
MG_Mobile_Layout_CreatePalBoxes:
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
lb bc, 4, 1
ld a, $1
call MG_Mobile_Layout_FillBox
@@ -81,7 +81,7 @@ MG_Mobile_Layout_CreatePalBoxes:
lb bc, 6, 1
ld a, $3
call MG_Mobile_Layout_FillBox
- hlcoord 1, 0, wAttrMap
+ hlcoord 1, 0, wAttrmap
ld a, $1
lb bc, 3, 18
call MG_Mobile_Layout_FillBox
@@ -91,7 +91,7 @@ MG_Mobile_Layout_CreatePalBoxes:
lb bc, 12, 18
ld a, $3
call MG_Mobile_Layout_FillBox
- hlcoord 19, 0, wAttrMap
+ hlcoord 19, 0, wAttrmap
lb bc, 4, 1
ld a, $1
call MG_Mobile_Layout_FillBox
@@ -101,7 +101,7 @@ MG_Mobile_Layout_CreatePalBoxes:
lb bc, 6, 1
ld a, $3
call MG_Mobile_Layout_FillBox
- hlcoord 0, 12, wAttrMap
+ hlcoord 0, 12, wAttrmap
ld bc, 6 * SCREEN_WIDTH
ld a, $7
call ByteFill
@@ -136,12 +136,12 @@ MG_Mobile_Layout01:
ld bc, 1 palettes
ld a, BANK(wBGPals1)
call FarCopyWRAM
- call MG_Mobile_Layout_WipeAttrMap
- hlcoord 0, 0, wAttrMap
+ call MG_Mobile_Layout_WipeAttrmap
+ hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
xor a
call ByteFill
- hlcoord 0, 14, wAttrMap
+ hlcoord 0, 14, wAttrmap
ld bc, 4 * SCREEN_WIDTH
ld a, $7
call ByteFill
@@ -155,7 +155,7 @@ MG_Mobile_Layout01:
call Function49496
.asm_49467
- farcall ApplyAttrMap
+ farcall ApplyAttrmap
farcall ApplyPals
ld a, $1
ldh [hCGBPalUpdate], a
@@ -168,26 +168,26 @@ MG_Mobile_Layout01:
RGB 00, 00, 00
Function49480:
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
lb bc, 4, SCREEN_WIDTH
ld a, $7
call MG_Mobile_Layout_FillBox
- hlcoord 0, 2, wAttrMap
+ hlcoord 0, 2, wAttrmap
ld a, $4
ld [hl], a
- hlcoord 19, 2, wAttrMap
+ hlcoord 19, 2, wAttrmap
ld [hl], a
ret
Function49496:
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
lb bc, 2, SCREEN_WIDTH
ld a, $7
call MG_Mobile_Layout_FillBox
- hlcoord 0, 1, wAttrMap
+ hlcoord 0, 1, wAttrmap
ld a, $4
ld [hl], a
- hlcoord 19, 1, wAttrMap
+ hlcoord 19, 1, wAttrmap
ld [hl], a
ret
@@ -200,8 +200,8 @@ MG_Mobile_Layout02:
ld a, BANK(wBGPals1)
call FarCopyWRAM
farcall ApplyPals
- call MG_Mobile_Layout_WipeAttrMap
- farcall ApplyAttrMap
+ call MG_Mobile_Layout_WipeAttrmap
+ farcall ApplyAttrmap
ld hl, .Palette_4973a
ld de, wOBPals1
ld bc, 1 palettes
@@ -234,43 +234,43 @@ Function49742:
INCLUDE "gfx/unknown/49757.pal"
_InitMG_Mobile_LinkTradePalMap:
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
lb bc, 16, 2
ld a, $4
call MG_Mobile_Layout_FillBox
ld a, $3
- ldcoord_a 0, 1, wAttrMap
- ldcoord_a 0, 14, wAttrMap
- hlcoord 2, 0, wAttrMap
+ ldcoord_a 0, 1, wAttrmap
+ ldcoord_a 0, 14, wAttrmap
+ hlcoord 2, 0, wAttrmap
lb bc, 8, 18
ld a, $5
call MG_Mobile_Layout_FillBox
- hlcoord 2, 8, wAttrMap
+ hlcoord 2, 8, wAttrmap
lb bc, 8, 18
ld a, $6
call MG_Mobile_Layout_FillBox
- hlcoord 0, 16, wAttrMap
+ hlcoord 0, 16, wAttrmap
lb bc, 2, SCREEN_WIDTH
ld a, $4
call MG_Mobile_Layout_FillBox
ld a, $3
lb bc, 6, 1
- hlcoord 6, 1, wAttrMap
+ hlcoord 6, 1, wAttrmap
call MG_Mobile_Layout_FillBox
ld a, $3
lb bc, 6, 1
- hlcoord 17, 1, wAttrMap
+ hlcoord 17, 1, wAttrmap
call MG_Mobile_Layout_FillBox
ld a, $3
lb bc, 6, 1
- hlcoord 6, 9, wAttrMap
+ hlcoord 6, 9, wAttrmap
call MG_Mobile_Layout_FillBox
ld a, $3
lb bc, 6, 1
- hlcoord 17, 9, wAttrMap
+ hlcoord 17, 9, wAttrmap
call MG_Mobile_Layout_FillBox
ld a, $2
- hlcoord 2, 16, wAttrMap
+ hlcoord 2, 16, wAttrmap
ld [hli], a
ld a, $7
ld [hli], a
@@ -278,7 +278,7 @@ _InitMG_Mobile_LinkTradePalMap:
ld [hli], a
ld a, $2
ld [hl], a
- hlcoord 2, 17, wAttrMap
+ hlcoord 2, 17, wAttrmap
ld a, $3
ld bc, 6
call ByteFill
diff --git a/engine/gfx/dma_transfer.asm b/engine/gfx/dma_transfer.asm
index 5c84a23ca..a3cdb6dd3 100644
--- a/engine/gfx/dma_transfer.asm
+++ b/engine/gfx/dma_transfer.asm
@@ -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
diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm
index 88dc1f6d9..8eff13ad1 100644
--- a/engine/gfx/pic_animation.asm
+++ b/engine/gfx/pic_animation.asm
@@ -87,7 +87,7 @@ AnimateFrontpic:
.loop
call SetUpPokeAnim
push af
- farcall HDMATransferTileMapToWRAMBank3
+ farcall HDMATransferTilemapToWRAMBank3
pop af
jr nc, .loop
ret
@@ -261,9 +261,9 @@ PokeAnim_DeinitFrames:
ld a, BANK(wPokeAnimCoord)
ldh [rSVBK], a
call PokeAnim_PlaceGraphic
- farcall HDMATransferTileMapToWRAMBank3
+ farcall HDMATransferTilemapToWRAMBank3
call PokeAnim_SetVBank0
- farcall HDMATransferAttrMapToWRAMBank3
+ farcall HDMATransferAttrmapToWRAMBank3
pop af
ldh [rSVBK], a
ret
@@ -830,13 +830,13 @@ PokeAnim_SetVBank1:
xor a
ldh [hBGMapMode], a
call .SetFlag
- farcall HDMATransferAttrMapToWRAMBank3
+ farcall HDMATransferAttrmapToWRAMBank3
pop af
ldh [rSVBK], a
ret
.SetFlag:
- call PokeAnim_GetAttrMapCoord
+ call PokeAnim_GetAttrmapCoord
ld b, 7
ld c, 7
ld de, SCREEN_WIDTH
@@ -858,7 +858,7 @@ PokeAnim_SetVBank1:
ret
PokeAnim_SetVBank0:
- call PokeAnim_GetAttrMapCoord
+ call PokeAnim_GetAttrmapCoord
ld b, 7
ld c, 7
ld de, SCREEN_WIDTH
@@ -879,12 +879,12 @@ PokeAnim_SetVBank0:
jr nz, .row
ret
-PokeAnim_GetAttrMapCoord:
+PokeAnim_GetAttrmapCoord:
ld hl, wPokeAnimCoord
ld a, [hli]
ld h, [hl]
ld l, a
- ld de, wAttrMap - wTileMap
+ ld de, wAttrmap - wTilemap
add hl, de
ret
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 18:38:04 +0000