diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:32:33 +0100 | 
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:32:33 +0100 | 
| commit | 333524f0beb876ceaaed99b97f4c7dacf6466050 (patch) | |
| tree | 6c6455eab8ab252d94370ea4fb76b8e8a8dc7623 /engine | |
| parent | 7beb497d3aba7cd1bb34f2b1394bde80c1cd9807 (diff) | |
Lowercase v for VRAM addresses
Diffstat (limited to 'engine')
59 files changed, 339 insertions, 339 deletions
| diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index f0c7a9b61..47c3b9f41 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -92,7 +92,7 @@ LoadTrainerBattlePokeballTiles:  ; Load the tiles used in the Pokeball Graphic that fills the screen  ; at the start of every Trainer battle.  	ld de, TrainerBattlePokeballTiles -	ld hl, VTiles1 tile $7e +	ld hl, vTiles1 tile $7e  	ld b, BANK(TrainerBattlePokeballTiles)  	ld c, 2  	call Request2bpp @@ -103,7 +103,7 @@ LoadTrainerBattlePokeballTiles:  	ld [rVBK], a  	ld de, TrainerBattlePokeballTiles -	ld hl, VTiles4 tile $7e +	ld hl, vTiles4 tile $7e  	ld b, BANK(TrainerBattlePokeballTiles)  	ld c, 2  	call Request2bpp diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d9f660a41..1a3ee24f6 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -5309,13 +5309,13 @@ BattleMenuPKMN_Loop:  Battle_StatsScreen: ; 3e308  	call DisableLCD -	ld hl, VTiles2 tile $31 -	ld de, VTiles0 +	ld hl, vTiles2 tile $31 +	ld de, vTiles0  	ld bc, $11 tiles  	call CopyBytes -	ld hl, VTiles2 -	ld de, VTiles0 tile $11 +	ld hl, vTiles2 +	ld de, vTiles0 tile $11  	ld bc, $31 tiles  	call CopyBytes @@ -5330,13 +5330,13 @@ Battle_StatsScreen: ; 3e308  	call DisableLCD -	ld hl, VTiles0 -	ld de, VTiles2 tile $31 +	ld hl, vTiles0 +	ld de, vTiles2 tile $31  	ld bc, $11 tiles  	call CopyBytes -	ld hl, VTiles0 tile $11 -	ld de, VTiles2 +	ld hl, vTiles0 tile $11 +	ld de, vTiles2  	ld bc, $31 tiles  	call CopyBytes @@ -6779,7 +6779,7 @@ BattleWinSlideInEnemyTrainerFrontpic: ; 3ebd8  	call FinishBattleAnim  	ld a, [OtherTrainerClass]  	ld [TrainerClass], a -	ld de, VTiles2 +	ld de, vTiles2  	callfar GetTrainerPic  	hlcoord 19, 0  	ld c, 0 @@ -7155,15 +7155,15 @@ _LoadHPBar: ; 3eda6  LoadHPExpBarGFX: ; unreferenced  	ld de, EnemyHPBarBorderGFX -	ld hl, VTiles2 tile $6c +	ld hl, vTiles2 tile $6c  	lb bc, BANK(EnemyHPBarBorderGFX), 4  	call Get1bpp  	ld de, HPExpBarBorderGFX -	ld hl, VTiles2 tile $73 +	ld hl, vTiles2 tile $73  	lb bc, BANK(HPExpBarBorderGFX), 6  	call Get1bpp  	ld de, ExpBarGFX -	ld hl, VTiles2 tile $55 +	ld hl, vTiles2 tile $55  	lb bc, BANK(ExpBarGFX), 8  	jp Get2bpp  ; 3edd1 @@ -8286,7 +8286,7 @@ DropPlayerSub: ; 3f447  	ld [CurPartySpecies], a  	ld hl, BattleMonDVs  	predef GetUnownLetter -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	predef GetMonBackpic  	pop af  	ld [CurPartySpecies], a @@ -8325,7 +8325,7 @@ DropEnemySub: ; 3f486  	call GetBaseData  	ld hl, EnemyMonDVs  	predef GetUnownLetter -	ld de, VTiles2 +	ld de, vTiles2  	predef GetAnimatedFrontpicPredef  	pop af  	ld [CurPartySpecies], a @@ -8382,7 +8382,7 @@ BattleIntro: ; 3f4dd  	call DisableSpriteUpdates  	farcall ClearBattleRAM  	call InitEnemy -	call BackUpVBGMap2 +	call BackUpBGMap2  	ld b, SCGB_BATTLE_GRAYSCALE  	call GetSGBLayout  	ld hl, rLCDC @@ -8428,13 +8428,13 @@ InitEnemy: ; 3f55e  	jp InitEnemyWildmon ; wild  ; 3f568 -BackUpVBGMap2: ; 3f568 +BackUpBGMap2: ; 3f568  	ld a, [rSVBK]  	push af  	ld a, $6 ; BANK(wDecompressScratch)  	ld [rSVBK], a  	ld hl, wDecompressScratch -	ld bc, $40 tiles ; VBGMap3 - VBGMap2 +	ld bc, $40 tiles ; vBGMap3 - vBGMap2  	ld a, $2  	call ByteFill  	ld a, [rVBK] @@ -8442,8 +8442,8 @@ BackUpVBGMap2: ; 3f568  	ld a, $1  	ld [rVBK], a  	ld de, wDecompressScratch -	hlbgcoord 0, 0 ; VBGMap2 -	lb bc, BANK(BackUpVBGMap2), $40 +	hlbgcoord 0, 0 ; vBGMap2 +	lb bc, BANK(BackUpBGMap2), $40  	call Request2bpp  	pop af  	ld [rVBK], a @@ -8467,7 +8467,7 @@ InitEnemyTrainer: ; 3f594  	ld [OTPartyMon1Item], a  .ok -	ld de, VTiles2 +	ld de, vTiles2  	callfar GetTrainerPic  	xor a  	ld [hGraphicStartTile], a @@ -8531,7 +8531,7 @@ InitEnemyWildmon: ; 3f607  	ld a, [UnownLetter]  	ld [wFirstUnownSeen], a  .skip_unown -	ld de, VTiles2 +	ld de, vTiles2  	predef GetAnimatedFrontpicPredef  	xor a  	ld [TrainerClass], a @@ -9336,7 +9336,7 @@ InitBattleDisplay: ; 3fb6c  ; 3fbff  GetTrainerBackpic: ; 3fbff -; Load the player character's backpic (6x6) into VRAM starting from VTiles2 tile $31. +; Load the player character's backpic (6x6) into VRAM starting from vTiles2 tile $31.  ; Special exception for Dude.  	ld b, BANK(DudeBackpic) @@ -9363,7 +9363,7 @@ GetTrainerBackpic: ; 3fbff  	ld hl, ChrisBackpic  .Decompress: -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	ld c, $31  	predef DecompressPredef  	ret @@ -9374,8 +9374,8 @@ CopyBackpic: ; 3fc30  	push af  	ld a, $6  	ld [rSVBK], a -	ld hl, VTiles0 -	ld de, VTiles2 tile $31 +	ld hl, vTiles0 +	ld de, vTiles2 tile $31  	ld a, [hROMBank]  	ld b, a  	ld c, $31 diff --git a/engine/battle/start_battle.asm b/engine/battle/start_battle.asm index 8d510b72e..7f0bff96b 100644 --- a/engine/battle/start_battle.asm +++ b/engine/battle/start_battle.asm @@ -191,7 +191,7 @@ ClearBattleRAM: ; 2ef18  	call ClearWindowData  	ld hl, hBGMapAddress -	xor a ; LOW(VBGMap0) +	xor a ; LOW(vBGMap0)  	ld [hli], a -	ld [hl], HIGH(VBGMap0) +	ld [hl], HIGH(vBGMap0)  	ret diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm index 9efe08414..b236fc56b 100755 --- a/engine/battle/trainer_huds.asm +++ b/engine/battle/trainer_huds.asm @@ -232,7 +232,7 @@ LoadTrainerHudOAM: ; 2c143  LoadBallIconGFX: ; 2c165  	ld de, .gfx -	ld hl, VTiles0 tile $31 +	ld hl, vTiles0 tile $31  	lb bc, BANK(LoadBallIconGFX), 4  	call Get2bpp_2  	ret diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 875849ce3..2db8bf293 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -236,16 +236,16 @@ Functioncc220: ; cc220  ; Appears to be unused.  	xor a  	ld [hBGMapMode], a -	ld a, LOW(VBGMap0 tile $28) +	ld a, LOW(vBGMap0 tile $28)  	ld [hBGMapAddress], a -	ld a, HIGH(VBGMap0 tile $28) +	ld a, HIGH(vBGMap0 tile $28)  	ld [hBGMapAddress + 1], a  	call WaitBGMap2  	ld a, $60  	ld [hWY], a -	xor a ; LOW(VBGMap0) +	xor a ; LOW(vBGMap0)  	ld [hBGMapAddress], a -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	ld [hBGMapAddress + 1], a  	call BattleAnimDelayFrame  	ret @@ -693,7 +693,7 @@ BattleAnimCmd_5GFX: ; cc485 (33:4485)  	ld [wBattleAnimTemp0], a  .loop  	ld a, [wBattleAnimTemp0] -	cp (VTiles1 - VTiles0) / $10 - $31 +	cp (vTiles1 - vTiles0) / $10 - $31  	ret nc  	call GetBattleAnimByte  	ld [hli], a @@ -706,7 +706,7 @@ BattleAnimCmd_5GFX: ; cc485 (33:4485)  rept 4  	add hl, hl  endr -	ld de, VTiles0 tile $31 +	ld de, vTiles0 tile $31  	add hl, de  	ld a, [BattleAnimByte]  	call LoadBattleAnimObj @@ -816,13 +816,13 @@ BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)  	ld a, $49  	ld [hl], a -	ld hl, VTiles0 tile $73 -	ld de, VTiles2 tile $06 +	ld hl, vTiles0 tile $73 +	ld de, vTiles2 tile $06  	ld a, $70  	ld [wBattleAnimTemp0], a  	ld a, $7  	call .LoadFootprint -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	ld a, $60  	ld [wBattleAnimTemp0], a  	ld a, $6 @@ -871,13 +871,13 @@ BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)  	ld a, $43  	ld [hl], a -	ld hl, VTiles0 tile $66 -	ld de, VTiles2 tile $05 +	ld hl, vTiles0 tile $66 +	ld de, vTiles2 tile $05  	ld a, $70  	ld [wBattleAnimTemp0], a  	ld a, $7  	call .LoadHead -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	ld a, $60  	ld [wBattleAnimTemp0], a  	ld a, $6 @@ -930,7 +930,7 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)  	ld [CurPartySpecies], a ; CurPartySpecies  	ld hl, BattleMonDVs ; BattleMonDVs  	predef GetUnownLetter -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	predef GetMonFrontpic  	jr .done @@ -939,7 +939,7 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)  	ld [CurPartySpecies], a ; CurPartySpecies  	ld hl, EnemyMonDVs ; EnemyMonDVs  	predef GetUnownLetter -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	predef GetMonBackpic  .done @@ -951,19 +951,19 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)  BattleAnimCmd_UpdateActorPic: ; cc622 (33:4622) -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	ld a, [hBattleTurn]  	and a  	jr z, .player -	ld hl, VTiles2 tile $00 +	ld hl, vTiles2 tile $00  	ld b, 0  	ld c, $31  	call Request2bpp  	ret  .player -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld b, 0  	ld c, $24  	call Request2bpp @@ -1007,7 +1007,7 @@ GetSubstitutePic: ; cc64c  	ld de, sScratch + (3 * 7 + 6) tiles  	call .CopyTile -	ld hl, VTiles2 tile $00 +	ld hl, vTiles2 tile $00  	ld de, sScratch  	lb bc, BANK(GetSubstitutePic), 7 * 7  	call Request2bpp @@ -1027,7 +1027,7 @@ GetSubstitutePic: ; cc64c  	ld de, sScratch + (3 * 6 + 5) tiles  	call .CopyTile -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld de, sScratch  	lb bc, BANK(GetSubstitutePic), 6 * 6  	call Request2bpp @@ -1075,7 +1075,7 @@ GetMinimizePic: ; cc6e7 (33:46e7)  	ld de, sScratch + $1a tiles  	call CopyMinimizePic -	ld hl, VTiles2 tile $00 +	ld hl, vTiles2 tile $00  	ld de, sScratch  	lb bc, BANK(GetMinimizePic), $31  	ret @@ -1083,7 +1083,7 @@ GetMinimizePic: ; cc6e7 (33:46e7)  .player  	ld de, sScratch + $160  	call CopyMinimizePic -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld de, sScratch  	lb bc, BANK(GetMinimizePic), $24  	ret @@ -1108,7 +1108,7 @@ BattleAnimCmd_Minimize: ; cc735 (33:4735)  	xor a  	call GetSRAMBank  	call GetMinimizePic -	ld hl, VTiles0 tile $00 +	ld hl, vTiles0 tile $00  	call Request2bpp  	call CloseSRAM  	pop af @@ -1157,14 +1157,14 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776)  	ld hl, BattleMonDVs  	predef GetUnownLetter -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	predef GetMonFrontpic  	jr .done  .player  	ld hl, EnemyMonDVs  	predef GetUnownLetter -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	predef GetMonBackpic  .done diff --git a/engine/billspc.asm b/engine/billspc.asm index 2dd9a512f..80dee0cc8 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -1107,7 +1107,7 @@ PCMonInfo: ; e2ac6 (38:6ac6)  	ld hl, TempMonDVs  	predef GetUnownLetter  	call GetBaseData -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	predef GetMonFrontpic  	xor a  	ld [wBillsPC_MonHasMail], a @@ -2261,18 +2261,18 @@ BillsPC_Jumptable: ; e33df (38:73df)  BillsPC_InitGFX: ; e33e8 (38:73e8)  	call DisableLCD -	ld hl, VTiles2 tile $00 +	ld hl, vTiles2 tile $00  	ld bc, $31 tiles  	xor a  	call ByteFill  	call LoadStandardFont  	call LoadFontsBattleExtra  	ld hl, PCMailGFX -	ld de, VTiles2 tile $5c +	ld de, vTiles2 tile $5c  	ld bc, 4 tiles  	call CopyBytes  	ld hl, PCSelectLZ -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	call Decompress  	ld a, 6  	call SkipMusic diff --git a/engine/breeding.asm b/engine/breeding.asm index 8977ae175..234e05448 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -704,22 +704,22 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)  	farcall BlankScreen  	call DisableLCD  	ld hl, EggHatchGFX -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	ld bc, $20  	ld a, BANK(EggHatchGFX)  	call FarCopyBytes  	farcall ClearSpriteAnims -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	ld a, [wJumptableIndex]  	call GetHatchlingFrontpic -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	ld a, EGG  	call GetEggFrontpic  	ld de, MUSIC_EVOLUTION  	call PlayMusic  	call EnableLCD  	hlcoord 7, 4 -	ld b, HIGH(VBGMap0) +	ld b, HIGH(vBGMap0)  	ld c, $31 ; Egg tiles start here  	ld a, EGG  	call Hatch_UpdateFrontpicBGMapCenter @@ -768,7 +768,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)  	call ClearSprites  	call Hatch_InitShellFragments  	hlcoord 6, 3 -	ld b, HIGH(VBGMap0) +	ld b, HIGH(vBGMap0)  	ld c, $00 ; Hatchling tiles start here  	ld a, [wJumptableIndex]  	call Hatch_UpdateFrontpicBGMapCenter diff --git a/engine/card_flip.asm b/engine/card_flip.asm index ef48283de..c1585c5dc 100755 --- a/engine/card_flip.asm +++ b/engine/card_flip.asm @@ -16,20 +16,20 @@ _CardFlip: ; e00ee (38:40ee)  	call LoadFontsExtra  	ld hl, CardFlipLZ01 -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	call Decompress  	ld hl, CardFlipLZ02 -	ld de, VTiles2 tile $3e +	ld de, vTiles2 tile $3e  	call Decompress  	ld hl, CardFlipLZ03 -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	call Decompress  	ld hl, CardFlipOffButtonGFX -	ld de, VTiles1 tile $6f +	ld de, vTiles1 tile $6f  	ld bc, 1 tiles  	call CopyBytes  	ld hl, CardFlipOnButtonGFX -	ld de, VTiles1 tile $75 +	ld de, vTiles1 tile $75  	ld bc, 1 tiles  	call CopyBytes @@ -619,11 +619,11 @@ CardFlip_CopyOAM: ; e0509  ; e0521  CardFlip_ShiftDigitsLeftTwoPixels: ; e0521 (38:4521) -	ld de, VTiles1 tile ("0" & $7f) -	ld hl, VTiles1 tile ("0" & $7f) + 2 +	ld de, vTiles1 tile ("0" & $7f) +	ld hl, vTiles1 tile ("0" & $7f) + 2  	ld bc, 10 tiles - 2  	call CopyBytes -	ld hl, VTiles1 tile $7f + 1 tiles - 2 +	ld hl, vTiles1 tile $7f + 1 tiles - 2  	xor a  	ld [hli], a  	ld [hl], a diff --git a/engine/color.asm b/engine/color.asm index 7e43ea0d4..1f563df53 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -902,7 +902,7 @@ InitCGBPals::  ; CGB only  	ld a, $1  	ld [rVBK], a -	ld hl, VTiles0 +	ld hl, vTiles0  	ld bc, $200 tiles  	xor a  	call ByteFill @@ -1069,7 +1069,7 @@ SGBBorder_PushBGPals:  	ld a, %11100100  	ld [rBGP], a  	ld hl, PredefPals -	ld de, VTiles1 +	ld de, vTiles1  	ld bc, $100 tiles  	call CopyData  	call DrawDefaultTiles @@ -1085,7 +1085,7 @@ SGBBorder_MorePalPushing:  	call DisableLCD  	ld a, $e4  	ld [rBGP], a -	ld de, VTiles1 +	ld de, vTiles1  	ld bc, 20 tiles  	call CopyData  	ld b, 18 @@ -1119,7 +1119,7 @@ SGBBorder_YetMorePalPushing:  	call DisableLCD  	ld a, %11100100  	ld [rBGP], a -	ld de, VTiles1 +	ld de, vTiles1  	ld b, $80  .loop  	push bc diff --git a/engine/credits.asm b/engine/credits.asm index 12199f904..e38ba8dc5 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -33,17 +33,17 @@ Credits:: ; 109847  	jr nz, .load_loop  	ld de, CreditsBorderGFX -	ld hl, VTiles2 tile $20 +	ld hl, vTiles2 tile $20  	lb bc, BANK(CreditsBorderGFX), $09  	call Request2bpp  	ld de, CopyrightGFX -	ld hl, VTiles2 tile $60 +	ld hl, vTiles2 tile $60  	lb bc, BANK(CopyrightGFX), $1d  	call Request2bpp  	ld de, TheEndGFX -	ld hl, VTiles2 tile $40 +	ld hl, vTiles2 tile $40  	lb bc, BANK(TheEndGFX), $10  	call Request2bpp @@ -55,7 +55,7 @@ Credits:: ; 109847  	call Credits_LoadBorderGFX  	ld e, l  	ld d, h -	ld hl, VTiles2 +	ld hl, vTiles2  	lb bc, BANK(CreditsMonsGFX), 16  	call Request2bpp @@ -193,9 +193,9 @@ Credits_UpdateGFXRequestPath: ; 109964 (42:5964)  	ld [Requested2bppSource], a  	ld a, h  	ld [Requested2bppSource + 1], a -	ld a, LOW(VTiles2) +	ld a, LOW(vTiles2)  	ld [Requested2bppDest], a -	ld a, HIGH(VTiles2) +	ld a, HIGH(vTiles2)  	ld [Requested2bppDest + 1], a  	jr Credits_RequestGFX diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index 4f79dc6be..1c2a39ef2 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -3,9 +3,9 @@ Copyright_GFPresents: ; e4579  	call PlayMusic  	call ClearBGPalettes  	call ClearTileMap -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	ld [hBGMapAddress + 1], a -	xor a ; LOW(VBGMap0) +	xor a ; LOW(vBGMap0)  	ld [hBGMapAddress], a  	ld [hJoyDown], a  	ld [hSCX], a @@ -51,7 +51,7 @@ Copyright_GFPresents: ; e4579  .GetGFLogoGFX: ; e45e8  	ld de, GameFreakLogo -	ld hl, VTiles2 +	ld hl, vTiles2  	lb bc, BANK(GameFreakLogo), $1c  	call Get1bpp @@ -65,12 +65,12 @@ Copyright_GFPresents: ; e4579  	ld a, BANK(IntroLogoGFX)  	call FarDecompress -	ld hl, VTiles0 +	ld hl, vTiles0  	ld de, wDecompressScratch  	lb bc, 1, 8 tiles  	call Request2bpp -	ld hl, VTiles1 +	ld hl, vTiles1  	ld de, wDecompressScratch + $80 tiles  	lb bc, 1, 8 tiles  	call Request2bpp @@ -470,10 +470,10 @@ IntroScene1: ; e495b (39:495b)  	ld a, $0  	ld [rVBK], a  	ld hl, IntroUnownsGFX -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld hl, IntroPulseGFX -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld hl, IntroTilemap002  	debgcoord 0, 0 @@ -546,7 +546,7 @@ IntroScene3: ; e49fd (39:49fd)  	ld a, $0  	ld [rVBK], a  	ld hl, IntroBackgroundGFX -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld hl, IntroTilemap004  	debgcoord 0, 0 @@ -609,10 +609,10 @@ IntroScene5: ; e4a7a (39:4a7a)  	ld a, $0  	ld [rVBK], a  	ld hl, IntroUnownsGFX -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld hl, IntroPulseGFX -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld hl, IntroTilemap006  	debgcoord 0, 0 @@ -706,17 +706,17 @@ IntroScene7: ; e4b3f (39:4b3f)  	call Intro_DecompressRequest2bpp_64Tiles  	ld hl, IntroPichuWooperGFX -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld a, $0  	ld [rVBK], a  	ld hl, IntroSuicuneRunGFX -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	call Intro_DecompressRequest2bpp_255Tiles  	ld hl, IntroBackgroundGFX -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld hl, IntroTilemap004 @@ -877,7 +877,7 @@ IntroScene11: ; e4c86 (39:4c86)  	ld a, $0  	ld [rVBK], a  	ld hl, IntroUnownsGFX -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld hl, IntroTilemap008  	debgcoord 0, 0 @@ -1001,10 +1001,10 @@ IntroScene13: ; e4d6d (39:4d6d)  	ld a, $0  	ld [rVBK], a  	ld hl, IntroSuicuneRunGFX -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	call Intro_DecompressRequest2bpp_255Tiles  	ld hl, IntroBackgroundGFX -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld hl, IntroTilemap004  	debgcoord 0, 0 @@ -1105,13 +1105,13 @@ IntroScene15: ; e4e40 (39:4e40)  	ld a, $0  	ld [rVBK], a  	ld hl, IntroSuicuneJumpGFX -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld hl, IntroUnownBackGFX -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld de, IntroGrass4GFX -	ld hl, VTiles1 tile $00 +	ld hl, vTiles1 tile $00  	lb bc, BANK(IntroGrass4GFX), 1  	call Request2bpp  	ld hl, IntroTilemap010 @@ -1187,7 +1187,7 @@ IntroScene17: ; e4ef5 (39:4ef5)  	ld a, $0  	ld [rVBK], a  	ld hl, IntroSuicuneCloseGFX -	ld de, VTiles1 tile $00 +	ld de, vTiles1 tile $00  	call Intro_DecompressRequest2bpp_255Tiles  	ld hl, IntroTilemap012  	debgcoord 0, 0 @@ -1253,13 +1253,13 @@ IntroScene19: ; e4f7e (39:4f7e)  	ld a, $0  	ld [rVBK], a  	ld hl, IntroSuicuneBackGFX -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld hl, IntroUnownsGFX -	ld de, VTiles1 tile $00 +	ld de, vTiles1 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld de, IntroGrass4GFX -	ld hl, VTiles1 tile $7f +	ld hl, vTiles1 tile $7f  	lb bc, BANK(IntroGrass4GFX), 1  	call Request2bpp  	ld hl, IntroTilemap014 @@ -1431,7 +1431,7 @@ IntroScene26: ; e50bb (39:50bb)  	ld a, $0  	ld [rVBK], a  	ld hl, IntroCrystalUnownsGFX -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	call Intro_DecompressRequest2bpp_128Tiles  	ld hl, IntroTilemap017  	debgcoord 0, 0 @@ -1922,9 +1922,9 @@ Intro_RustleGrass: ; e546d (39:546d)  	ld [Requested2bppSource], a  	ld a, [hli]  	ld [Requested2bppSource + 1], a -	ld a, LOW(VTiles2 tile $09) +	ld a, LOW(vTiles2 tile $09)  	ld [Requested2bppDest], a -	ld a, HIGH(VTiles2 tile $09) +	ld a, HIGH(vTiles2 tile $09)  	ld [Requested2bppDest + 1], a  	ld a, 4  	ld [Requested2bppSize], a diff --git a/engine/debug.asm b/engine/debug.asm index 0ca639aaa..fda0d3e60 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -104,14 +104,14 @@ Function81928: ; 81928  Function81948: ; 81948  	ld a, $1  	ld [rVBK], a -	ld hl, VTiles0 -	ld bc, sScratch - VTiles0 +	ld hl, vTiles0 +	ld bc, sScratch - vTiles0  	xor a  	call ByteFill  	ld a, $0  	ld [rVBK], a -	ld hl, VTiles0 -	ld bc, sScratch - VTiles0 +	ld hl, vTiles0 +	ld bc, sScratch - vTiles0  	xor a  	call ByteFill  	hlcoord 0, 0, AttrMap @@ -128,15 +128,15 @@ Function81948: ; 81948  Function8197c: ; 8197c  	ld hl, DebugColorTestGFX + $10 -	ld de, VTiles2 tile $6a +	ld de, vTiles2 tile $6a  	ld bc, $160  	call CopyBytes  	ld hl, DebugColorTestGFX -	ld de, VTiles0 +	ld de, vTiles0  	ld bc, $10  	call CopyBytes  	call LoadStandardFont -	ld hl, VTiles1 +	ld hl, vTiles1  	lb bc, 8, 0  .asm_8199d  	ld a, [hl] @@ -314,7 +314,7 @@ Function81adb: ; 81adb  	ld [wBoxAlignment], a  	hlcoord 12, 3  	call _PrepMonFrontpic -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	predef GetMonBackpic  	ld a, $31  	ld [hGraphicStartTile], a @@ -345,7 +345,7 @@ Function81adb: ; 81adb  	ld de, StringBuffer1  	hlcoord 4, 1  	call PlaceString -	ld de, VTiles2 +	ld de, vTiles2  	callfar GetTrainerPic  	xor a  	ld [TempEnemyMonSpecies], a @@ -1062,14 +1062,14 @@ TilesetColorTest:  	xor a  	ld [hBGMapMode], a  	ld de, DebugColorTestGFX + $10 -	ld hl, VTiles2 tile $6a +	ld hl, vTiles2 tile $6a  	lb bc, BANK(DebugColorTestGFX), $16  	call Request2bpp  	ld de, DebugColorTestGFX -	ld hl, VTiles1 +	ld hl, vTiles1  	lb bc, BANK(DebugColorTestGFX), 1  	call Request2bpp -	ld a, HIGH(VBGMap1) +	ld a, HIGH(vBGMap1)  	ld [hBGMapAddress + 1], a  	hlcoord 0, 0  	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT diff --git a/engine/diploma.asm b/engine/diploma.asm index f1c67ea37..ba45e4cd5 100644 --- a/engine/diploma.asm +++ b/engine/diploma.asm @@ -10,7 +10,7 @@ PlaceDiplomaOnScreen: ; 1dd709  	call ClearSprites  	call DisableLCD  	ld hl, DiplomaGFX -	ld de, VTiles2 +	ld de, vTiles2  	call Decompress  	ld hl, DiplomaPage1Tilemap  	decoord 0, 0 diff --git a/engine/dma_transfer.asm b/engine/dma_transfer.asm index 9d95c87b1..56e7d56da 100755 --- a/engine/dma_transfer.asm +++ b/engine/dma_transfer.asm @@ -594,13 +594,13 @@ HDMATransfer_OnlyTopFourRows: ; 104303  	ld [rVBK], a  	ld c, $8  	ld hl, wScratchTileMap + $80 -	debgcoord 0, 0, VBGMap1 +	debgcoord 0, 0, vBGMap1  	call HDMATransfer_Wait127Scanlines  	ld a, $0  	ld [rVBK], a  	ld c, $8  	ld hl, wScratchTileMap -	debgcoord 0, 0, VBGMap1 +	debgcoord 0, 0, vBGMap1  	call HDMATransfer_Wait127Scanlines  	ret diff --git a/engine/dummy_game.asm b/engine/dummy_game.asm index c315b8f38..4a1972ec3 100755 --- a/engine/dummy_game.asm +++ b/engine/dummy_game.asm @@ -12,10 +12,10 @@ _DummyGame: ; e1e5b (38:5e5b)  	call GetSGBLayout  	callfar ClearSpriteAnims  	ld hl, LZ_e2221 -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	call Decompress  	ld hl, Unknown_e00ed -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	ld bc, 4 tiles  	ld a, BANK(Unknown_e00ed)  	call FarCopyBytes diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm index b7bf95145..1139ad3d5 100755 --- a/engine/events/celebi.asm +++ b/engine/events/celebi.asm @@ -72,11 +72,11 @@ Special_CelebiShrineEvent: ; 4989a  LoadCelebiGFX: ; 49912  	farcall ClearSpriteAnims  	ld de, SpecialCelebiLeafGFX -	ld hl, VTiles1 +	ld hl, vTiles1  	lb bc, BANK(SpecialCelebiLeafGFX), 4  	call Request2bpp  	ld de, SpecialCelebiGFX -	ld hl, VTiles0 tile $84 +	ld hl, vTiles0 tile $84  	lb bc, BANK(SpecialCelebiGFX), $10  	call Request2bpp  	xor a diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index 6171eea07..a1a2e2e79 100755 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -22,11 +22,11 @@ BlindingFlash: ; 8c7e1  ShakeHeadbuttTree: ; 8c80a  	farcall ClearSpriteAnims  	ld de, CutGrassGFX -	ld hl, VTiles1 +	ld hl, vTiles1  	lb bc, BANK(CutGrassGFX), 4  	call Request2bpp  	ld de, HeadbuttTreeGFX -	ld hl, VTiles1 tile $04 +	ld hl, vTiles1 tile $04  	lb bc, BANK(HeadbuttTreeGFX), 8  	call Request2bpp  	call Cut_Headbutt_GetPixelFacing @@ -67,7 +67,7 @@ ShakeHeadbuttTree: ; 8c80a  	xor a  	call ByteFill  	ld de, Font -	ld hl, VTiles1 +	ld hl, vTiles1  	lb bc, BANK(Font), 12  	call Get1bpp  	call ReplaceKrisSprite @@ -141,11 +141,11 @@ OWCutAnimation: ; 8c940  .LoadCutGFX: ; 8c96d  	callfar ClearSpriteAnims ; pointless to farcall  	ld de, CutGrassGFX -	ld hl, VTiles1 +	ld hl, vTiles1  	lb bc, BANK(CutGrassGFX), 4  	call Request2bpp  	ld de, CutTreeGFX -	ld hl, VTiles1 tile $4 +	ld hl, vTiles1 tile $4  	lb bc, BANK(CutTreeGFX), 4  	call Request2bpp  	ret @@ -413,7 +413,7 @@ FlyToAnim: ; 8cb33  FlyFunction_InitGFX: ; 8cb9b (23:4b9b)  	callfar ClearSpriteAnims  	ld de, CutGrassGFX -	ld hl, VTiles1 tile $00 +	ld hl, vTiles1 tile $00  	lb bc, BANK(CutGrassGFX), 4  	call Request2bpp  	ld a, [CurPartyMon] diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 5108306d9..f1981c2fd 100755 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -249,7 +249,7 @@ AnimateHOFMonEntrance: ; 865b5  	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT  	ld a, " "  	call ByteFill -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	predef GetMonBackpic  	ld a, $31  	ld [hGraphicStartTile], a @@ -533,7 +533,7 @@ DisplayHOFMon: ; 86748  HOF_AnimatePlayerPic: ; 86810  	call ClearBGPalettes -	ld hl, VTiles2 tile HALLOFFAME_COLON +	ld hl, vTiles2 tile HALLOFFAME_COLON  	ld de, FontExtra + 13 tiles ; "<COLON>"  	lb bc, BANK(FontExtra), 1  	call Request2bpp diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm index c7789a28d..b51976d22 100755 --- a/engine/events/heal_machine_anim.asm +++ b/engine/events/heal_machine_anim.asm @@ -72,7 +72,7 @@ HealMachineAnim: ; 12324  .LoadGFX: ; 12383  	call .LoadPalettes  	ld de, .HealMachineGFX -	ld hl, VTiles0 tile $7c +	ld hl, vTiles0 tile $7c  	lb bc, BANK(.HealMachineGFX), $2  	call Request2bpp  	ret diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 02c4b10cd..6b5768029 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -79,7 +79,7 @@ Special_CheckMagikarpLength: ; fbb32  ; 0xfbbae  Magikarp_LoadFeetInchesChars: ; fbbae -	ld hl, VTiles2 tile "′" ; $6e +	ld hl, vTiles2 tile "′" ; $6e  	ld de, .feetinchchars  	lb bc, BANK(.feetinchchars), 2  	call Request2bpp diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm index ba15f6525..585912391 100755 --- a/engine/events/magnet_train.asm +++ b/engine/events/magnet_train.asm @@ -134,14 +134,14 @@ MagntTrain_LoadGFX_PlayMusic: ; 8ccc9  	farcall GetPlayerIcon  	pop af  	ld [rSVBK], a -	ld hl, VTiles0 +	ld hl, vTiles0  	ld c, 4  	call Request2bpp  	ld hl, 12 tiles  	add hl, de  	ld d, h  	ld e, l -	ld hl, VTiles0 tile $04 +	ld hl, vTiles0 tile $04  	ld c, 4  	call Request2bpp  	call MagnetTrain_InitLYOverrides diff --git a/engine/events/pokepic.asm b/engine/events/pokepic.asm index ea5b3c300..82016403b 100755 --- a/engine/events/pokepic.asm +++ b/engine/events/pokepic.asm @@ -11,7 +11,7 @@ Pokepic:: ; 244e3  	ld a, [CurPartySpecies]  	ld [CurSpecies], a  	call GetBaseData -	ld de, VTiles1 +	ld de, vTiles1  	predef GetMonFrontpic  	ld a, [wMenuBorderTopCoord]  	inc a diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index 7841a688b..72248a67b 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -15,12 +15,12 @@ UnownPrinter: ; 16be4  	call ClearTileMap  	ld de, UnownDexATile -	ld hl, VTiles1 tile $6f +	ld hl, vTiles1 tile $6f  	lb bc, BANK(UnownDexBTile), 1  	call Request1bpp  	ld de, UnownDexBTile -	ld hl, VTiles1 tile $75 +	ld hl, vTiles1 tile $75  	lb bc, BANK(UnownDexBTile), 1  	call Request1bpp @@ -139,7 +139,7 @@ UnownPrinter: ; 16be4  	ld [CurPartySpecies], a  	xor a  	ld [wBoxAlignment], a -	ld de, VTiles2 +	ld de, vTiles2  	predef GetMonFrontpic  	call .Load2bppToSRAM  	hlcoord 1, 6 @@ -147,7 +147,7 @@ UnownPrinter: ; 16be4  	ld [hGraphicStartTile], a  	lb bc, 7, 7  	predef PlaceGraphic -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	farcall RotateUnownFrontpic  	ret @@ -184,7 +184,7 @@ UnownPrinter: ; 16be4  	ld bc, $31 tiles  	xor a  	call ByteFill -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld de, sScratch  	ld c, $31  	ld a, [hROMBank] diff --git a/engine/events_3.asm b/engine/events_3.asm index 78628aaea..5ee113a95 100755 --- a/engine/events_3.asm +++ b/engine/events_3.asm @@ -132,7 +132,7 @@ PlaceMapNameSign:: ; b8098 (2e:4098)  LoadMapNameSignGFX: ; b80c6  	ld de, MapEntryFrameGFX -	ld hl, VTiles2 tile $60 +	ld hl, vTiles2 tile $60  	lb bc, BANK(MapEntryFrameGFX), $e  	call Get2bpp  	ret @@ -654,13 +654,13 @@ LoadFishingGFX: ; b84b3  	ld de, KrisFishingGFX  .got_gender -	ld hl, VTiles0 tile $02 +	ld hl, vTiles0 tile $02  	call .LoadGFX -	ld hl, VTiles0 tile $06 +	ld hl, vTiles0 tile $06  	call .LoadGFX -	ld hl, VTiles0 tile $0a +	ld hl, vTiles0 tile $0a  	call .LoadGFX -	ld hl, VTiles1 tile $7c +	ld hl, vTiles1 tile $7c  	call .LoadGFX  	pop af diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm index dd09f9eda..1fa55c10a 100755 --- a/engine/evolution_animation.asm +++ b/engine/evolution_animation.asm @@ -39,7 +39,7 @@ EvolutionAnimation: ; 4e5e1  	farcall ClearSpriteAnims  	ld de, .GFX -	ld hl, VTiles0 +	ld hl, vTiles0  	lb bc, BANK(.GFX), 8  	call Request2bpp @@ -58,8 +58,8 @@ EvolutionAnimation: ; 4e5e1  	ld [CurSpecies], a  	call .PlaceFrontpic -	ld de, VTiles2 -	ld hl, VTiles2 tile $31 +	ld de, vTiles2 +	ld hl, vTiles2 tile $31  	ld bc, 7 * 7  	call Request2bpp @@ -167,7 +167,7 @@ EvolutionAnimation: ; 4e5e1  	call GetBaseData  	ld a, $1  	ld [wBoxAlignment], a -	ld de, VTiles2 +	ld de, vTiles2  	predef GetAnimatedFrontpicPredef  	xor a  	ld [wBoxAlignment], a diff --git a/engine/gbc_only.asm b/engine/gbc_only.asm index a77a44d72..efceae701 100644 --- a/engine/gbc_only.asm +++ b/engine/gbc_only.asm @@ -20,12 +20,12 @@ GBCOnlyScreen: ; 4ea82  	ld [rSVBK], a  	ld de, $d000 -	ld hl, VTiles2 +	ld hl, vTiles2  	lb bc, BANK(GBCOnlyGFX), $54  	call Get2bpp  	ld de, Font -	ld hl, VTiles1 +	ld hl, vTiles1  	lb bc, BANK(Font), $80  	call Get1bpp diff --git a/engine/init_gender.asm b/engine/init_gender.asm index 1f30f774c..bb6ce3736 100755 --- a/engine/init_gender.asm +++ b/engine/init_gender.asm @@ -105,7 +105,7 @@ LoadGenderScreenPal: ; 48e47 (12:4e47)  LoadGenderScreenLightBlueTile: ; 48e64 (12:4e64)  	ld de, .LightBlueTile -	ld hl, VTiles2 tile $00 +	ld hl, vTiles2 tile $00  	lb bc, BANK(.LightBlueTile), 1  	call Get2bpp  	ret diff --git a/engine/init_hof_credits.asm b/engine/init_hof_credits.asm index 81def1af3..99d142236 100644 --- a/engine/init_hof_credits.asm +++ b/engine/init_hof_credits.asm @@ -6,7 +6,7 @@ InitDisplayForHallOfFame: ; 4e881  	call LoadStandardFont  	call LoadFontsBattleExtra  	hlbgcoord 0, 0 -	ld bc, VBGMap1 - VBGMap0 +	ld bc, vBGMap1 - vBGMap0  	ld a, " "  	call ByteFill  	hlcoord 0, 0, AttrMap @@ -36,7 +36,7 @@ InitDisplayForRedCredits: ; 4e8c2  	call LoadStandardFont  	call LoadFontsBattleExtra  	hlbgcoord 0, 0 -	ld bc, VBGMap1 - VBGMap0 +	ld bc, vBGMap1 - vBGMap0  	ld a, " "  	call ByteFill  	hlcoord 0, 0, AttrMap diff --git a/engine/init_map.asm b/engine/init_map.asm index b7c405b5f..e5bee971d 100644 --- a/engine/init_map.asm +++ b/engine/init_map.asm @@ -27,7 +27,7 @@ ReanchorBGMap_NoOAMUpdate:: ; 6454  	ld a, $90  	ld [hWY], a  	call OverworldTextModeSwitch -	ld a, HIGH(VBGMap1) +	ld a, HIGH(vBGMap1)  	call .LoadBGMapAddrIntoHRAM  	call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap  	farcall LoadOW_BGPal7 @@ -38,11 +38,11 @@ ReanchorBGMap_NoOAMUpdate:: ; 6454  	ld [hBGMapMode], a  	ld [hWY], a  	farcall HDMATransfer_FillBGMap0WithBlack ; no need to farcall -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	call .LoadBGMapAddrIntoHRAM -	xor a ; LOW(VBGMap0) +	xor a ; LOW(vBGMap0)  	ld [wBGMapAnchor], a -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	ld [wBGMapAnchor + 1], a  	xor a  	ld [hSCX], a @@ -90,9 +90,9 @@ HDMATransfer_FillBGMap0WithBlack: ; 64db  	ld [rHDMA1], a  	ld a, LOW(wDecompressScratch)  	ld [rHDMA2], a -	ld a, HIGH(VBGMap0 % $8000) +	ld a, HIGH(vBGMap0 % $8000)  	ld [rHDMA3], a -	ld a, LOW(VBGMap0 % $8000) +	ld a, LOW(vBGMap0 % $8000)  	ld [rHDMA4], a  	ld a, $3f  	ld [hDMATransfer], a diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 94deb1112..5e38589aa 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -942,7 +942,7 @@ Intro_WipeInFrontpic: ; 6182  ; 619c  Intro_PrepTrainerPic: ; 619c -	ld de, VTiles2 +	ld de, vTiles2  	farcall GetTrainerPic  	xor a  	ld [hGraphicStartTile], a @@ -953,7 +953,7 @@ Intro_PrepTrainerPic: ; 619c  ; 61b4  ShrinkFrame: ; 61b4 -	ld de, VTiles2 +	ld de, vTiles2  	ld c, $31  	predef DecompressPredef  	xor a @@ -968,7 +968,7 @@ Intro_PlacePlayerSprite: ; 61cd  	farcall GetPlayerIcon  	ld c, $c -	ld hl, VTiles0 +	ld hl, vTiles0  	call Request2bpp  	ld hl, Sprites @@ -1376,7 +1376,7 @@ Copyright: ; 63e2  	call ClearTileMap  	call LoadFontsExtra  	ld de, CopyrightGFX -	ld hl, VTiles2 tile $60 +	ld hl, vTiles2 tile $60  	lb bc, BANK(CopyrightGFX), $1d  	call Request2bpp  	hlcoord 2, 7 @@ -1405,9 +1405,9 @@ GameInit:: ; 642e  	call ClearWindowData  	call ClearBGPalettes  	call ClearTileMap -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	ld [hBGMapAddress + 1], a -	xor a ; LOW(VBGMap0) +	xor a ; LOW(vBGMap0)  	ld [hBGMapAddress], a  	ld [hJoyDown], a  	ld [hSCX], a diff --git a/engine/link_trade.asm b/engine/link_trade.asm index bb2765b50..f85403a29 100755 --- a/engine/link_trade.asm +++ b/engine/link_trade.asm @@ -4,7 +4,7 @@ INCBIN "gfx/trade/border_tiles.2bpp"  __LoadTradeScreenBorder: ; 16d421  	ld de, LinkCommsBorderGFX -	ld hl, VTiles2 +	ld hl, vTiles2  	lb bc, BANK(LinkCommsBorderGFX), 70  	call Get2bpp  	ret @@ -139,7 +139,7 @@ _LoadTradeScreenBorder: ; 16d696  LinkComms_LoadPleaseWaitTextboxBorderGFX: ; 16d69a  	ld de, LinkCommsBorderGFX + $30 tiles -	ld hl, VTiles2 tile $76 +	ld hl, vTiles2 tile $76  	lb bc, BANK(LinkCommsBorderGFX), 8  	call Get2bpp  	ret diff --git a/engine/mail_2.asm b/engine/mail_2.asm index dfbeca485..d66bbbbd7 100755 --- a/engine/mail_2.asm +++ b/engine/mail_2.asm @@ -28,7 +28,7 @@ ReadAnyMail: ; b9237  	ld de, SpanishItalianFont  .got_font -	ld hl, VTiles1 +	ld hl, vTiles1  	lb bc, BANK(StandardEnglishFont), $80  	call Get1bpp  	pop de @@ -128,7 +128,7 @@ MailGFXPointers: ; b92f8  LoadSurfMailGFX: ; b9317  	push bc -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld de, SurfMailBorderGFX  	ld c, 8 * 8  	call LoadMailGFX_Color2 @@ -142,7 +142,7 @@ LoadSurfMailGFX: ; b9317  LoadLiteBlueMailGFX: ; b9335  	push bc -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld de, LiteBlueMailBorderGFX  	ld c, 8 * 8  	call LoadMailGFX_Color2 @@ -213,7 +213,7 @@ FinishLoadingSurfLiteBlueMailGFX: ; b9351  LoadEonMailGFX: ; b93d2  	push bc -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld de, EonMailBorder1GFX  	ld c, 1 * 8  	call LoadMailGFX_Color2 @@ -232,7 +232,7 @@ LoadEonMailGFX: ; b93d2  	ld de, MailEeveeGFX  	ld c, 6 * 8  	call LoadMailGFX_Color3 -	ld hl, VTiles2 tile $3d +	ld hl, vTiles2 tile $3d  	ld de, MailLargeCircleGFX  	ld c, 4 * 8  	call LoadMailGFX_Color1 @@ -263,7 +263,7 @@ LoadEonMailGFX: ; b93d2  LoadLovelyMailGFX: ; b944b  	push bc -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld de, LovelyMailBorderGFX  	ld c, 5 * 8  	call LoadMailGFX_Color2 @@ -326,7 +326,7 @@ LovelyEonMail_PlaceIcons: ; b9491  LoadMorphMailGFX: ; b94d6  	push bc -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld bc, 5 * 8  	call MailGFX_GenerateMonochromeTilesColor2  	ld de, MorphMailBorderCornerGFX + 3 * 8 @@ -402,7 +402,7 @@ LoadMorphMailGFX: ; b94d6  LoadBlueSkyMailGFX: ; b9582  	push bc -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld de, EonMailBorder1GFX  	ld c, 1 * 8  	call LoadMailGFX_Color2 @@ -490,7 +490,7 @@ Mail_Place6TileRow: ; b9636  LoadFlowerMailGFX: ; b963e  	push bc -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld de, FlowerMailBorderGFX  	ld c, 8 * 8  	call LoadMailGFX_Color1 @@ -545,14 +545,14 @@ LoadFlowerMailGFX: ; b963e  LoadPortraitMailGFX: ; b96ca  	push bc -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld de, PortraitMailBorderGFX  	ld c, 5 * 8  	call LoadMailGFX_Color2  	ld de, PortraitMailUnderlineGFX  	ld c, 1 * 8  	call LoadMailGFX_Color2 -	ld hl, VTiles2 tile $3d +	ld hl, vTiles2 tile $3d  	ld de, PortraitMailLargePokeballGFX  	ld c, 4 * 8  	call LoadMailGFX_Color1 @@ -576,7 +576,7 @@ LoadPortraitMailGFX: ; b96ca  LoadMusicMailGFX: ; b9710  	push bc -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld de, MusicMailBorderGFX  	ld c, 4 * 8  	call LoadMailGFX_Color2 @@ -619,7 +619,7 @@ LoadMusicMailGFX: ; b9710  LoadMirageMailGFX: ; b9776  	push bc -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	ld bc, 5 * 8  	call MailGFX_GenerateMonochromeTilesColor2  	ld de, BlueSkyMailGrassGFX diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 2ebeb67fa..695e28770 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -331,7 +331,7 @@ rept 4  	add hl, hl  endr -	ld de, VTiles0 +	ld de, vTiles0  	add hl, de  	push hl diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm index 3c8f9d029..e6d4504c2 100755 --- a/engine/mystery_gift.asm +++ b/engine/mystery_gift.asm @@ -1277,7 +1277,7 @@ InitMysteryGiftLayout: ; 105153 (41:5153)  	call ClearBGPalettes  	call DisableLCD  	ld hl, MysteryGiftGFX -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	ld a, BANK(MysteryGiftGFX)  	ld bc, MysteryGiftGFXEnd - MysteryGiftGFX  	call FarCopyBytes @@ -1576,12 +1576,12 @@ Function1057d7: ; 1057d7 (41:57d7)  	call ClearBGPalettes  	call DisableLCD  	ld hl, MysteryGiftJP_GFX -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	ld a, BANK(MysteryGiftJP_GFX)  	lb bc, 4, 0  	call FarCopyBytes  	ld hl, MysteryGiftJP_GFX + $400 -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	ld a, BANK(MysteryGiftJP_GFX)  	ld bc, $80  	call FarCopyBytes diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index 3c4bfff5b..a01c02c31 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -175,7 +175,7 @@ NamingScreen: ; 116c1  .Box: ; 117f5 (4:57f5)  	ld de, PokeBallSpriteGFX -	ld hl, VTiles0 tile $00 +	ld hl, vTiles0 tile $00  	lb bc, BANK(PokeBallSpriteGFX), $4  	call Request2bpp  	xor a @@ -217,7 +217,7 @@ NamingScreen: ; 116c1  .LoadSprite: ; 11847 (4:5847)  	push de -	ld hl, VTiles0 tile $00 +	ld hl, vTiles0 tile $00  	ld c, $4  	push bc  	call Request2bpp @@ -226,7 +226,7 @@ NamingScreen: ; 116c1  	add hl, de  	ld e, l  	ld d, h -	ld hl, VTiles0 tile $04 +	ld hl, vTiles0 tile $04  	call Request2bpp  	xor a  	ld hl, wSpriteAnimDict @@ -905,22 +905,22 @@ LoadNamingScreenGFX: ; 11c51  	call LoadFontsExtra  	ld de, NamingScreenGFX_MiddleLine -	ld hl, VTiles1 tile $6b +	ld hl, vTiles1 tile $6b  	lb bc, BANK(NamingScreenGFX_MiddleLine), 1  	call Get1bpp  	ld de, NamingScreenGFX_UnderLine -	ld hl, VTiles1 tile $72 +	ld hl, vTiles1 tile $72  	lb bc, BANK(NamingScreenGFX_UnderLine), 1  	call Get1bpp -	ld de, VTiles2 tile $60 +	ld de, vTiles2 tile $60  	ld hl, NamingScreenGFX_Border  	ld bc, 1 tiles  	ld a, BANK(NamingScreenGFX_Border)  	call FarCopyBytes -	ld de, VTiles0 tile $7e +	ld de, vTiles0 tile $7e  	ld hl, NamingScreenGFX_Cursor  	ld bc, 2 tiles  	ld a, BANK(NamingScreenGFX_Cursor) @@ -998,7 +998,7 @@ _ComposeMailMessage: ; 11e75 (mail?)  	call ClearBGPalettes  	call DisableLCD  	call LoadNamingScreenGFX -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	ld hl, .MailIcon  	ld bc, 8 tiles  	ld a, BANK(.MailIcon) diff --git a/engine/overworld.asm b/engine/overworld.asm index 14e36a41d..68b8adaed 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -663,10 +663,10 @@ rept 4  	add hl, hl  endr  	ld a, l -	add LOW(VTiles0) +	add LOW(vTiles0)  	ld l, a  	ld a, h -	adc HIGH(VTiles0) +	adc HIGH(vTiles0)  	ld h, a  	ret  ; 14418 diff --git a/engine/pack.asm b/engine/pack.asm index 221ca51e0..b4f6d4ef1 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1304,7 +1304,7 @@ DrawPackGFX: ; 1089d  	ld a, [hli]  	ld e, a  	ld d, [hl] -	ld hl, VTiles2 tile $50 +	ld hl, vTiles2 tile $50  	lb bc, BANK(PackGFX), 15  	call Request2bpp  	ret @@ -1411,7 +1411,7 @@ Pack_InitGFX: ; 10955  	call ClearSprites  	call DisableLCD  	ld hl, PackMenuGFX -	ld de, VTiles2 +	ld de, vTiles2  	ld bc, $60 tiles  	ld a, BANK(PackMenuGFX)  	call FarCopyBytes diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index 31780342e..bb7615ae0 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -1120,7 +1120,7 @@ HOF_AnimateFrontpic: ; d066e Predef 49  	ld l, e  	push bc  	push hl -	ld de, VTiles2 +	ld de, vTiles2  	predef GetAnimatedFrontpicPredef  	pop hl  	pop bc diff --git a/engine/player_gfx.asm b/engine/player_gfx.asm index 50483eec9..98a54684b 100644 --- a/engine/player_gfx.asm +++ b/engine/player_gfx.asm @@ -110,12 +110,12 @@ GetCardPic: ; 8833e  	jr z, .GotClass  	ld hl, KrisCardPic  .GotClass: -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	ld bc, $23 tiles  	ld a, BANK(ChrisCardPic) ; BANK(KrisCardPic)  	call FarCopyBytes  	ld hl, CardGFX -	ld de, VTiles2 tile $23 +	ld de, vTiles2 tile $23  	ld bc, 6 tiles  	ld a, BANK(CardGFX)  	call FarCopyBytes @@ -140,7 +140,7 @@ GetPlayerBackpic: ; 88825  GetChrisBackpic: ; 88830  	ld hl, ChrisBackpic  	ld b, BANK(ChrisBackpic) -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	ld c, 7 * 7  	predef DecompressPredef  	ret @@ -165,7 +165,7 @@ HOF_LoadTrainerFrontpic: ; 88840  	ld de, KrisPic  .GotPic: -	ld hl, VTiles2 +	ld hl, vTiles2  	ld b, BANK(ChrisPic) ; BANK(KrisPic)  	ld c, 7 * 7  	call Get2bpp @@ -194,7 +194,7 @@ DrawIntroPlayerPic: ; 88874  	jr z, .GotPic  	ld de, KrisPic  .GotPic: -	ld hl, VTiles2 +	ld hl, vTiles2  	ld b, BANK(ChrisPic) ; BANK(KrisPic)  	ld c, 7 * 7 ; dimensions  	call Get2bpp @@ -216,7 +216,7 @@ INCBIN "gfx/player/kris.2bpp"  GetKrisBackpic: ; 88ec9  ; Kris's backpic is uncompressed.  	ld de, KrisBackpic -	ld hl, VTiles2 tile $31 +	ld hl, vTiles2 tile $31  	lb bc, BANK(KrisBackpic), 7 * 7 ; dimensions  	call Get2bpp  	ret diff --git a/engine/player_step.asm b/engine/player_step.asm index b55584ab1..c20bc09e9 100755 --- a/engine/player_step.asm +++ b/engine/player_step.asm @@ -156,7 +156,7 @@ UpdateOverworldMap: ; d536 (3:5536)  	ld a, [wBGMapAnchor + 1]  	inc a  	and $3 -	or HIGH(VBGMap0) +	or HIGH(vBGMap0)  	ld [wBGMapAnchor + 1], a  .not_overflowed  	ld hl, wMetatileStandingY @@ -187,7 +187,7 @@ UpdateOverworldMap: ; d536 (3:5536)  	ld a, [wBGMapAnchor + 1]  	dec a  	and $3 -	or HIGH(VBGMap0) +	or HIGH(vBGMap0)  	ld [wBGMapAnchor + 1], a  .not_underflowed  	ld hl, wMetatileStandingY diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 8beb9e5df..95f9404f9 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -828,7 +828,7 @@ Pokedex_UpdateUnownMode: ; 405df (10:45df)  .decompress  	ld hl, PokedexLZ -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	lb bc, BANK(PokedexLZ), $3a  	call DecompressRequest2bpp @@ -2402,7 +2402,7 @@ Pokedex_LoadSelectedMonTiles: ; 4143b  	ld a, [wd265]  	ld [CurPartySpecies], a  	call GetBaseData -	ld de, VTiles2 +	ld de, vTiles2  	predef GetMonFrontpic  	ret @@ -2410,7 +2410,7 @@ Pokedex_LoadSelectedMonTiles: ; 4143b  	ld a, BANK(sScratch)  	call GetSRAMBank  	farcall LoadQuestionMarkPic -	ld hl, VTiles2 +	ld hl, vTiles2  	ld de, sScratch  	ld c, 7 * 7  	ld a, [hROMBank] @@ -2445,7 +2445,7 @@ Pokedex_LoadAnyFootprint: ; 4147b  	push hl  	ld e, l  	ld d, h -	ld hl, VTiles2 tile $62 +	ld hl, vTiles2 tile $62  	lb bc, BANK(Footprints), 2  	call Request1bpp  	pop hl @@ -2457,7 +2457,7 @@ Pokedex_LoadAnyFootprint: ; 4147b  	ld e, l  	ld d, h -	ld hl, VTiles2 tile $64 +	ld hl, vTiles2 tile $64  	lb bc, BANK(Footprints), 2  	call Request1bpp @@ -2466,13 +2466,13 @@ Pokedex_LoadAnyFootprint: ; 4147b  Pokedex_LoadGFX: ; 414b7  	call DisableLCD -	ld hl, VTiles2 +	ld hl, vTiles2  	ld bc, $31 tiles  	xor a  	call ByteFill  	call Pokedex_LoadInvertedFont  	call LoadFontsExtra -	ld hl, VTiles2 tile $60 +	ld hl, vTiles2 tile $60  	ld bc, $20 tiles  	call Pokedex_InvertTiles  	call Pokedex_CheckSGB @@ -2482,12 +2482,12 @@ Pokedex_LoadGFX: ; 414b7  .LoadPokedexLZ:  	ld hl, PokedexLZ -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	call Decompress  .LoadPokedexSlowpokeLZ:  	ld hl, PokedexSlowpokeLZ -	ld de, VTiles0 +	ld de, vTiles0  	call Decompress  	ld a, 6  	call SkipMusic @@ -2496,7 +2496,7 @@ Pokedex_LoadGFX: ; 414b7  Pokedex_LoadInvertedFont: ; 414fb  	call LoadStandardFont -	ld hl, VTiles1 +	ld hl, vTiles1  	ld bc, $80 tiles  Pokedex_InvertTiles: ; 41504 @@ -2536,7 +2536,7 @@ Pokedex_LoadUnownFont: ; 41a2c  	ld bc, 27 tiles  	call Pokedex_InvertTiles  	ld de, sScratch + $188 -	ld hl, VTiles2 tile $40 +	ld hl, vTiles2 tile $40  	lb bc, BANK(Pokedex_LoadUnownFont), 27  	call Request2bpp  	call CloseSRAM @@ -2555,7 +2555,7 @@ Pokedex_LoadUnownFrontpicTiles: ; 41a58 (10:5a58)  	ld a, UNOWN  	ld [CurPartySpecies], a  	call GetBaseData -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	predef GetMonFrontpic  	pop af  	ld [UnownLetter], a @@ -2585,7 +2585,7 @@ _NewPokedexEntry: ; 41a7f  	call EnableLCD  	call WaitBGMap  	call GetBaseData -	ld de, VTiles2 +	ld de, vTiles2  	predef GetMonFrontpic  	ld a, SCGB_POKEDEX  	call Pokedex_GetSGBLayout diff --git a/engine/pokedex_3.asm b/engine/pokedex_3.asm index 6ec2ce9fd..482f55799 100644 --- a/engine/pokedex_3.asm +++ b/engine/pokedex_3.asm @@ -1,12 +1,12 @@  LoadSGBPokedexGFX: ; 1ddf1c  	ld hl, SGBPokedexGFX_LZ -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	call Decompress  	ret  LoadSGBPokedexGFX2: ; 1ddf26 (77:5f26)  	ld hl, SGBPokedexGFX_LZ -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	lb bc, BANK(SGBPokedexGFX_LZ), $3a  	call DecompressRequest2bpp  	ret diff --git a/engine/pokegear.asm b/engine/pokegear.asm index 48ab6855b..aff64ef6c 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -35,9 +35,9 @@ PokeGear: ; 90b8d (24:4b8d)  	pop af  	ld [Options], a  	call ClearBGPalettes -	xor a ; LOW(VBGMap0) +	xor a ; LOW(vBGMap0)  	ld [hBGMapAddress], a -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	ld [hBGMapAddress + 1], a  	ld a, $90  	ld [hWY], a @@ -88,15 +88,15 @@ PokeGear: ; 90b8d (24:4b8d)  Pokegear_LoadGFX: ; 90c4e  	call ClearVBank1  	ld hl, TownMapGFX -	ld de, VTiles2 +	ld de, vTiles2  	ld a, BANK(TownMapGFX)  	call FarDecompress  	ld hl, PokegearGFX -	ld de, VTiles2 + $30 tiles +	ld de, vTiles2 + $30 tiles  	ld a, BANK(PokegearGFX)  	call FarDecompress  	ld hl, PokegearSpritesGFX -	ld de, VTiles0 +	ld de, vTiles0  	ld a, BANK(PokegearSpritesGFX)  	call Decompress  	ld a, [MapGroup] @@ -113,7 +113,7 @@ Pokegear_LoadGFX: ; 90c4e  	ld a, b  	; standing sprite  	push af -	ld de, VTiles0 tile $10 +	ld de, vTiles0 tile $10  	ld bc, 4 tiles  	call FarCopyBytes  	pop af @@ -121,14 +121,14 @@ Pokegear_LoadGFX: ; 90c4e  	; walking sprite  	ld de, 12 tiles  	add hl, de -	ld de, VTiles0 tile $14 +	ld de, vTiles0 tile $14  	ld bc, 4 tiles  	call FarCopyBytes  	ret  .ssaqua  	ld hl, FastShipGFX -	ld de, VTiles0 tile $10 +	ld de, vTiles0 tile $10  	ld bc, 8 tiles  	call CopyBytes  	ret @@ -243,18 +243,18 @@ InitPokegearTilemap: ; 90da8 (24:4da8)  	ld a, [wcf65]  	and a  	jr nz, .kanto_0 -	xor a ; LOW(VBGMap0) +	xor a ; LOW(vBGMap0)  	ld [hBGMapAddress], a -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	ld [hBGMapAddress + 1], a  	call .UpdateBGMap  	ld a, $90  	jr .finish  .kanto_0 -	xor a ; LOW(VBGMap1) +	xor a ; LOW(vBGMap1)  	ld [hBGMapAddress], a -	ld a, HIGH(VBGMap1) +	ld a, HIGH(vBGMap1)  	ld [hBGMapAddress + 1], a  	call .UpdateBGMap  	xor a @@ -2119,7 +2119,7 @@ _FlyMap: ; 91af3  	farcall ClearSpriteAnims  	call LoadTownMapGFX  	ld de, FlyMapLabelBorderGFX -	ld hl, VTiles2 tile $30 +	ld hl, vTiles2 tile $30  	lb bc, BANK(FlyMapLabelBorderGFX), 6  	call Request1bpp  	call FlyMap @@ -2161,9 +2161,9 @@ _FlyMap: ; 91af3  	call ClearBGPalettes  	ld a, $90  	ld [hWY], a -	xor a ; LOW(VBGMap0) +	xor a ; LOW(vBGMap0)  	ld [hBGMapAddress], a -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	ld [hBGMapAddress + 1], a  	ld a, [wTownMapPlayerIconLandmark]  	ld e, a @@ -2455,18 +2455,18 @@ _Area: ; 91d11  	ld a, $1  	ld [hInMenu], a  	ld de, PokedexNestIconGFX -	ld hl, VTiles0 tile $7f +	ld hl, vTiles0 tile $7f  	lb bc, BANK(PokedexNestIconGFX), 1  	call Request2bpp  	call .GetPlayerOrFastShipIcon -	ld hl, VTiles0 tile $78 +	ld hl, vTiles0 tile $78  	ld c, 4  	call Request2bpp  	call LoadTownMapGFX  	call FillKantoMap  	call .PlaceString_MonsNest  	call TownMapPals -	hlbgcoord 0, 0, VBGMap1 +	hlbgcoord 0, 0, vBGMap1  	call TownMapBGUpdate  	call FillJohtoMap  	call .PlaceString_MonsNest @@ -2871,7 +2871,7 @@ TownMapPlayerIcon: ; 91fa6  	push af  	farcall GetPlayerIcon  ; Standing icon -	ld hl, VTiles0 tile $10 +	ld hl, vTiles0 tile $10  	ld c, 4 ; # tiles  	call Request2bpp  ; Walking icon @@ -2879,7 +2879,7 @@ TownMapPlayerIcon: ; 91fa6  	add hl, de  	ld d, h  	ld e, l -	ld hl, VTiles0 tile $14 +	ld hl, vTiles0 tile $14  	ld c, 4 ; # tiles  	ld a, BANK(ChrisSpriteGFX) ; does nothing  	call Request2bpp @@ -2913,7 +2913,7 @@ TownMapPlayerIcon: ; 91fa6  LoadTownMapGFX: ; 91ff2  	ld hl, TownMapGFX -	ld de, VTiles2 +	ld de, vTiles2  	lb bc, BANK(TownMapGFX), $30  	call DecompressRequest2bpp  	ret @@ -2948,13 +2948,13 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"  	farcall ClearSpriteAnims  	call LoadTownMapGFX  	ld de, FlyMapLabelBorderGFX -	ld hl, VTiles2 tile $30 +	ld hl, vTiles2 tile $30  	lb bc, BANK(FlyMapLabelBorderGFX), 6  	call Request1bpp  	call FillKantoMap  	call TownMapBubble  	call TownMapPals -	hlbgcoord 0, 0, VBGMap1 +	hlbgcoord 0, 0, vBGMap1  	call TownMapBGUpdate  	call FillJohtoMap  	call TownMapBubble @@ -3003,9 +3003,9 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"  	call ClearBGPalettes  	ld a, $90  	ld [hWY], a -	xor a ; LOW(VBGMap0) +	xor a ; LOW(vBGMap0)  	ld [hBGMapAddress], a -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	ld [hBGMapAddress + 1], a  	ld a, [wTownMapPlayerIconLandmark]  	ld e, a diff --git a/engine/print_party.asm b/engine/print_party.asm index 69bda8d52..f2420dfe8 100755 --- a/engine/print_party.asm +++ b/engine/print_party.asm @@ -141,17 +141,17 @@ PrintPartyMonPage1: ; 1dc381  	call LoadFontsBattleExtra  	ld de, GBPrinterHPIcon -	ld hl, VTiles2 tile $71 +	ld hl, vTiles2 tile $71  	lb bc, BANK(GBPrinterHPIcon), 1  	call Request1bpp  	ld de, GBPrinterLvIcon -	ld hl, VTiles2 tile $6e +	ld hl, vTiles2 tile $6e  	lb bc, BANK(GBPrinterLvIcon), 1  	call Request1bpp  	ld de, ShinyIconGFX -	ld hl, VTiles2 tile $3f +	ld hl, vTiles2 tile $3f  	lb bc, BANK(ShinyIconGFX), 1  	call Get2bpp diff --git a/engine/printer.asm b/engine/printer.asm index b72f99375..68c3c6c9f 100755 --- a/engine/printer.asm +++ b/engine/printer.asm @@ -49,7 +49,7 @@ PrintDexEntry: ; 8442c  	ld a, [wPrinterQueueLength]  	push af -	ld hl, VTiles1 +	ld hl, vTiles1  	ld de, FontInversed  	lb bc, BANK(FontInversed), $80  	call Request1bpp diff --git a/engine/routines/drawkrispackgfx.asm b/engine/routines/drawkrispackgfx.asm index f71e43db8..457dd7110 100644 --- a/engine/routines/drawkrispackgfx.asm +++ b/engine/routines/drawkrispackgfx.asm @@ -5,7 +5,7 @@ DrawKrisPackGFX: ; 48e81  	ld a, [hli]  	ld e, a  	ld d, [hl] -	ld hl, VTiles2 tile $50 +	ld hl, vTiles2 tile $50  	lb bc, BANK(PackFGFX), 15  	call Request2bpp  	ret diff --git a/engine/routines/phonering_copytilemapatonce.asm b/engine/routines/phonering_copytilemapatonce.asm index 1780136d1..b1a726675 100644 --- a/engine/routines/phonering_copytilemapatonce.asm +++ b/engine/routines/phonering_copytilemapatonce.asm @@ -21,11 +21,11 @@ PhoneRing_CopyTilemapAtOnce: ; 4d188  	jr c, .wait  	di -	ld a, BANK(VBGMap2) +	ld a, BANK(vBGMap2)  	ld [rVBK], a  	hlcoord 0, 0, AttrMap  	call .CopyTilemapAtOnce -	ld a, BANK(VBGMap0) +	ld a, BANK(vBGMap0)  	ld [rVBK], a  	hlcoord 0, 0  	call .CopyTilemapAtOnce diff --git a/engine/routines/savemenu_copytilemapatonce.asm b/engine/routines/savemenu_copytilemapatonce.asm index 0adce91c6..5d4ed8b7d 100644 --- a/engine/routines/savemenu_copytilemapatonce.asm +++ b/engine/routines/savemenu_copytilemapatonce.asm @@ -18,11 +18,11 @@ SaveMenu_CopyTilemapAtOnce: ; 4cf45 (13:4f45)  	jr c, .WaitLY  	di -	ld a, BANK(VBGMap2) +	ld a, BANK(vBGMap2)  	ld [rVBK], a  	hlcoord 0, 0, AttrMap  	call .CopyTilemapAtOnce -	ld a, BANK(VBGMap0) +	ld a, BANK(vBGMap0)  	ld [rVBK], a  	hlcoord 0, 0  	call .CopyTilemapAtOnce diff --git a/engine/routines/trademonfrontpic.asm b/engine/routines/trademonfrontpic.asm index 3a38688d7..e312042ff 100644 --- a/engine/routines/trademonfrontpic.asm +++ b/engine/routines/trademonfrontpic.asm @@ -1,7 +1,7 @@  GetTrademonFrontpic: ; 4d7fd  	ld a, [wOTTrademonSpecies]  	ld hl, wOTTrademonDVs -	ld de, VTiles2 +	ld de, vTiles2  	push de  	push af  	predef GetUnownLetter diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 4ab673652..7a498d223 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -36,7 +36,7 @@ _SlotMachine:  	call DelayFrame  	call DisableLCD  	hlbgcoord 0, 0 -	ld bc, VBGMap1 - VBGMap0 +	ld bc, vBGMap1 - vBGMap0  	ld a, " "  	call ByteFill  	ld b, SCGB_SLOT_MACHINE @@ -48,19 +48,19 @@ _SlotMachine:  	call ByteFill  	ld hl, Slots2LZ -	ld de, VTiles0 tile $00 +	ld de, vTiles0 tile $00  	call Decompress  	ld hl, Slots3LZ -	ld de, VTiles0 tile $40 +	ld de, vTiles0 tile $40  	call Decompress  	ld hl, Slots1LZ -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	call Decompress  	ld hl, Slots2LZ -	ld de, VTiles2 tile $25 +	ld de, vTiles2 tile $25  	call Decompress  	ld hl, SlotsTilemap diff --git a/engine/sprites.asm b/engine/sprites.asm index 4a33eb5cf..bee01414f 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -386,7 +386,7 @@ InitSpriteAnimBuffer: ; 8d0ec  GetSpriteAnimVTile: ; 8d109  ; a = wSpriteAnimDict[a] if a in wSpriteAnimDict else 0 -; VTiles offset +; vTiles offset  	push hl  	push bc  	ld hl, wSpriteAnimDict @@ -631,7 +631,7 @@ AnimateEndOfExpBar: ; 8e79d  	ld de, SGBEndOfExpBarGFX  .load -	ld hl, VTiles0 tile $00 +	ld hl, vTiles0 tile $00  	lb bc, BANK(EndOfExpBarGFX), 1  	call Request2bpp  	ld c, 8 diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index da02808b1..fa124e1b3 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -865,7 +865,7 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)  	call IsAPokemon  	ret c  	call StatsScreen_LoadTextBoxSpaceGFX -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	predef GetAnimatedFrontpicPredef  	hlcoord 0, 0  	ld d, $0 @@ -954,7 +954,7 @@ StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307)  	ld [rVBK], a  	ld de, TextBoxSpaceGFX  	lb bc, BANK(TextBoxSpaceGFX), 1 -	ld hl, VTiles2 tile $7f +	ld hl, vTiles2 tile $7f  	call Get2bpp  	pop af  	ld [rVBK], a @@ -1071,7 +1071,7 @@ StatsScreen_AnimateEgg: ; 4e497 (13:6497)  	ld a, $1  	ld [wBoxAlignment], a  	call StatsScreen_LoadTextBoxSpaceGFX -	ld de, VTiles2 tile $00 +	ld de, vTiles2 tile $00  	predef GetAnimatedFrontpicPredef  	pop de  	hlcoord 0, 0 diff --git a/engine/timeset.asm b/engine/timeset.asm index e68f5930a..f05e31ab5 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -24,15 +24,15 @@ InitClock: ; 90672 (24:4672)  	ld [hBGMapMode], a  	call LoadStandardFont  	ld de, TimeSetBackgroundGFX -	ld hl, VTiles2 tile $00 +	ld hl, vTiles2 tile $00  	lb bc, BANK(TimeSetBackgroundGFX), 1  	call Request1bpp  	ld de, TimeSetUpArrowGFX -	ld hl, VTiles2 tile $01 +	ld hl, vTiles2 tile $01  	lb bc, BANK(TimeSetUpArrowGFX), 1  	call Request1bpp  	ld de, TimeSetDownArrowGFX -	ld hl, VTiles2 tile $02 +	ld hl, vTiles2 tile $02  	lb bc, BANK(TimeSetDownArrowGFX), 1  	call Request1bpp  	call .ClearScreen @@ -410,11 +410,11 @@ Special_SetDayOfWeek: ; 90913  	ld a, $1  	ld [hInMenu], a  	ld de, TimeSetUpArrowGFX -	ld hl, VTiles1 tile $6f +	ld hl, vTiles1 tile $6f  	lb bc, BANK(TimeSetUpArrowGFX), 1  	call Request1bpp  	ld de, TimeSetDownArrowGFX -	ld hl, VTiles1 tile $75 +	ld hl, vTiles1 tile $75  	lb bc, BANK(TimeSetDownArrowGFX), 1  	call Request1bpp  	xor a diff --git a/engine/title.asm b/engine/title.asm index 84e7550fd..2ea588cd0 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -26,7 +26,7 @@ _TitleScreen: ; 10ed67  ; Decompress running Suicune gfx  	ld hl, TitleSuicuneGFX -	ld de, VTiles1 +	ld de, vTiles1  	call Decompress @@ -42,7 +42,7 @@ _TitleScreen: ; 10ed67  ; BG Map 1:  ; line 0 (copyright) -	hlbgcoord 0, 0, VBGMap1 +	hlbgcoord 0, 0, vBGMap1  	ld bc, 1 bgrows  	ld a, 7 ; palette  	call ByteFill @@ -99,12 +99,12 @@ _TitleScreen: ; 10ed67  ; Decompress logo  	ld hl, TitleLogoGFX -	ld de, VTiles1 +	ld de, vTiles1  	call Decompress  ; Decompress background crystal  	ld hl, TitleCrystalGFX -	ld de, VTiles0 +	ld de, vTiles0  	call Decompress @@ -122,7 +122,7 @@ _TitleScreen: ; 10ed67  	call DrawTitleGraphic  ; Draw copyright text -	hlbgcoord 3, 0, VBGMap1 +	hlbgcoord 3, 0, vBGMap1  	lb bc, 1, 13  	ld d, $c  	ld e, $10 @@ -260,10 +260,10 @@ SuicuneFrameIterator: ; 10eea7  ; 10eece  .Frames: ; 10eece -	db $80 ; VTiles4 tile $00 -	db $88 ; VTiles4 tile $08 -	db $00 ; VTiles5 tile $00 -	db $08 ; VTiles5 tile $08 +	db $80 ; vTiles4 tile $00 +	db $88 ; vTiles4 tile $08 +	db $00 ; vTiles5 tile $00 +	db $08 ; vTiles5 tile $08  ; 10eed2 diff --git a/engine/trade_animation.asm b/engine/trade_animation.asm index 1305fab5b..d5b97d563 100755 --- a/engine/trade_animation.asm +++ b/engine/trade_animation.asm @@ -149,8 +149,8 @@ RunTradeAnimScript: ; 28fa1  	jr z, .NotCGB  	ld a, $1  	ld [rVBK], a -	ld hl, VTiles0 -	ld bc, sScratch - VTiles0 +	ld hl, vTiles0 +	ld bc, sScratch - vTiles0  	xor a  	call ByteFill  	ld a, $0 @@ -158,19 +158,19 @@ RunTradeAnimScript: ; 28fa1  .NotCGB:  	hlbgcoord 0, 0 -	ld bc, sScratch - VBGMap0 +	ld bc, sScratch - vBGMap0  	ld a, " "  	call ByteFill  	ld hl, TradeGameBoyLZ -	ld de, VTiles2 tile $31 +	ld de, vTiles2 tile $31  	call Decompress  	ld hl, TradeArrowGFX -	ld de, VTiles1 tile $6d +	ld de, vTiles1 tile $6d  	ld bc, $10  	ld a, BANK(TradeArrowGFX)  	call FarCopyBytes  	ld hl, TradeArrowGFX + $10 -	ld de, VTiles1 tile $6e +	ld de, vTiles1 tile $6e  	ld bc, $10  	ld a, BANK(TradeArrowGFX)  	call FarCopyBytes @@ -186,11 +186,11 @@ RunTradeAnimScript: ; 28fa1  	call LoadTradeBallAndCableGFX  	ld a, [wPlayerTrademonSpecies]  	ld hl, wPlayerTrademonDVs -	ld de, VTiles0 +	ld de, vTiles0  	call TradeAnim_GetFrontpic  	ld a, [wOTTrademonSpecies]  	ld hl, wOTTrademonDVs -	ld de, VTiles0 tile $31 +	ld de, vTiles0 tile $31  	call TradeAnim_GetFrontpic  	ld a, [wPlayerTrademonSpecies]  	ld de, wPlayerTrademonSpeciesName @@ -490,7 +490,7 @@ TradeAnim_TubeToPlayer8: ; 29229  	call DisableLCD  	callfar ClearSpriteAnims  	hlbgcoord 0, 0 -	ld bc, sScratch - VBGMap0 +	ld bc, sScratch - vBGMap0  	ld a, " "  	call ByteFill  	xor a @@ -627,7 +627,7 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim: ; 292f6  	push af  	call ClearBGPalettes  	call WaitTop -	ld a, HIGH(VBGMap1) +	ld a, HIGH(vBGMap1)  	ld [hBGMapAddress + 1], a  	call ClearTileMap  	hlcoord 0, 0 @@ -657,7 +657,7 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim: ; 292f6  	call ByteFill  	call WaitBGMap  	call WaitTop -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	ld [hBGMapAddress + 1], a  	call ClearTileMap  	ret @@ -776,7 +776,7 @@ TradeAnim_TextboxScrollStart: ; 293de  TradeAnim_ScrollOutRight: ; 293ea  	call WaitTop -	ld a, HIGH(VBGMap1) +	ld a, HIGH(vBGMap1)  	ld [hBGMapAddress + 1], a  	call WaitBGMap  	ld a, $7 @@ -785,7 +785,7 @@ TradeAnim_ScrollOutRight: ; 293ea  	ld [hWY], a  	call DelayFrame  	call WaitTop -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	ld [hBGMapAddress + 1], a  	call ClearTileMap  	call TradeAnim_IncrementJumptableIndex @@ -802,14 +802,14 @@ TradeAnim_ScrollOutRight2: ; 2940c  	ret  .done -	ld a, HIGH(VBGMap1) +	ld a, HIGH(vBGMap1)  	ld [hBGMapAddress + 1], a  	call WaitBGMap  	ld a, $7  	ld [hWX], a  	ld a, $90  	ld [hWY], a -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	ld [hBGMapAddress + 1], a  	call TradeAnim_AdvanceScriptPointer  	ret @@ -895,14 +895,14 @@ TradeAnim_GetNickname: ; 294a9  ; 294bb  TradeAnim_ShowGivemonFrontpic: ; 294bb -	ld de, VTiles0 +	ld de, vTiles0  	jr TradeAnim_ShowFrontpic  TradeAnim_ShowGetmonFrontpic: ; 294c0 -	ld de, VTiles0 tile $31 +	ld de, vTiles0 tile $31  TradeAnim_ShowFrontpic: ; 294c3  	call DelayFrame -	ld hl, VTiles2 +	ld hl, vTiles2  	lb bc, 10, $31  	call Request2bpp  	call WaitTop @@ -1009,7 +1009,7 @@ ShowOTTrademonStats: ; 29549  TrademonStats_MonTemplate: ; 29573  	call WaitTop  	call TradeAnim_BlankTileMap -	ld a, HIGH(VBGMap1) +	ld a, HIGH(vBGMap1)  	ld [hBGMapAddress + 1], a  	hlcoord 3, 0  	ld b, $6 @@ -1032,7 +1032,7 @@ TrademonStats_MonTemplate: ; 29573  TrademonStats_Egg: ; 295a1  	call WaitTop  	call TradeAnim_BlankTileMap -	ld a, HIGH(VBGMap1) +	ld a, HIGH(vBGMap1)  	ld [hBGMapAddress + 1], a  	hlcoord 3, 0  	ld b, 6 @@ -1055,7 +1055,7 @@ TrademonStats_Egg: ; 295a1  TrademonStats_WaitBGMap: ; 295d8  	call WaitBGMap  	call WaitTop -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	ld [hBGMapAddress + 1], a  	ret @@ -1499,15 +1499,15 @@ TradeAnim_FlashBGPals: ; 2981d  LoadTradeBallAndCableGFX: ; 2982b  	call DelayFrame  	ld de, TradeBallGFX -	ld hl, VTiles0 tile $62 +	ld hl, vTiles0 tile $62  	lb bc, BANK(TradeBallGFX), $6  	call Request2bpp  	ld de, TradePoofGFX -	ld hl, VTiles0 tile $68 +	ld hl, vTiles0 tile $68  	lb bc, BANK(TradePoofGFX), $c  	call Request2bpp  	ld de, TradeCableGFX -	ld hl, VTiles0 tile $74 +	ld hl, vTiles0 tile $74  	lb bc, BANK(TradeCableGFX), $4  	call Request2bpp  	xor a @@ -1523,7 +1523,7 @@ LoadTradeBubbleGFX: ; 2985a  	ld e, $3  	callfar LoadMenuMonIcon  	ld de, TradeBubbleGFX -	ld hl, VTiles0 tile $72 +	ld hl, vTiles0 tile $72  	lb bc, BANK(TradeBubbleGFX), $4  	call Request2bpp  	xor a diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index c4f8e15a6..2905e8eb3 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -37,13 +37,13 @@ TrainerCard: ; 25105  	farcall GetCardPic  	ld hl, CardRightCornerGFX -	ld de, VTiles2 tile $1c +	ld de, vTiles2 tile $1c  	ld bc, 1 tiles  	ld a, BANK(CardRightCornerGFX)  	call FarCopyBytes  	ld hl, CardStatusGFX -	ld de, VTiles2 tile $29 +	ld de, vTiles2 tile $29  	ld bc, 86 tiles  	ld a, BANK(CardStatusGFX)  	call FarCopyBytes @@ -98,7 +98,7 @@ TrainerCard_Page1_LoadGFX: ; 251b6 (9:51b6)  	call TrainerCard_InitBorder  	call WaitBGMap  	ld de, CardStatusGFX -	ld hl, VTiles2 tile $29 +	ld hl, vTiles2 tile $29  	lb bc, BANK(CardStatusGFX), 86  	call Request2bpp  	call TrainerCard_Page1_PrintDexCaught_GameTime @@ -136,11 +136,11 @@ TrainerCard_Page2_LoadGFX: ; 251f4 (9:51f4)  	call TrainerCard_InitBorder  	call WaitBGMap  	ld de, LeaderGFX -	ld hl, VTiles2 tile $29 +	ld hl, vTiles2 tile $29  	lb bc, BANK(LeaderGFX), $56  	call Request2bpp  	ld de, BadgeGFX -	ld hl, VTiles0 tile $00 +	ld hl, vTiles0 tile $00  	lb bc, BANK(BadgeGFX), $2c  	call Request2bpp  	call TrainerCard_Page2_3_InitObjectsAndStrings @@ -185,11 +185,11 @@ TrainerCard_Page3_LoadGFX: ; 2524c (9:524c)  	call TrainerCard_InitBorder  	call WaitBGMap  	ld de, LeaderGFX2 -	ld hl, VTiles2 tile $29 +	ld hl, vTiles2 tile $29  	lb bc, BANK(LeaderGFX2), $56  	call Request2bpp  	ld de, BadgeGFX2 -	ld hl, VTiles0 tile $00 +	ld hl, vTiles0 tile $00  	lb bc, BANK(BadgeGFX2), $2c  	call Request2bpp  	call TrainerCard_Page2_3_InitObjectsAndStrings diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index 6b43df67e..a2b8ac86e 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -19,11 +19,11 @@ UnownPuzzle: ; e1190  	xor a  	call ByteFill  	ld hl, UnownPuzzleCursorGFX -	ld de, VTiles1 tile $60 +	ld de, vTiles1 tile $60  	ld bc, 4 tiles  	call CopyBytes  	ld hl, UnownPuzzleStartCancelLZ -	ld de, VTiles1 tile $6d +	ld de, vTiles1 tile $6d  	call Decompress  	call LoadUnownPuzzlePiecesGFX  	hlcoord 0, 0 @@ -648,8 +648,8 @@ endm  	puzzle_coords 18, 18, 4, 4, 16, 15, PUZZLE_BORDER, 0  ConvertLoadedPuzzlePieces: ; e1631 -	ld hl, VTiles2 -	ld de, VTiles0 +	ld hl, vTiles2 +	ld de, vTiles0  	ld b, 6  .loop  	push bc @@ -821,14 +821,14 @@ endr  ; e1703  GFXHeaders: ; e1703 -	dw .TileBordersGFX + 0 tiles, VTiles0 tile $00 -	dw .TileBordersGFX + 1 tiles, VTiles0 tile $01 -	dw .TileBordersGFX + 2 tiles, VTiles0 tile $02 -	dw .TileBordersGFX + 3 tiles, VTiles0 tile $0c -	dw .TileBordersGFX + 4 tiles, VTiles0 tile $0e -	dw .TileBordersGFX + 5 tiles, VTiles0 tile $18 -	dw .TileBordersGFX + 6 tiles, VTiles0 tile $19 -	dw .TileBordersGFX + 7 tiles, VTiles0 tile $1a +	dw .TileBordersGFX + 0 tiles, vTiles0 tile $00 +	dw .TileBordersGFX + 1 tiles, vTiles0 tile $01 +	dw .TileBordersGFX + 2 tiles, vTiles0 tile $02 +	dw .TileBordersGFX + 3 tiles, vTiles0 tile $0c +	dw .TileBordersGFX + 4 tiles, vTiles0 tile $0e +	dw .TileBordersGFX + 5 tiles, vTiles0 tile $18 +	dw .TileBordersGFX + 6 tiles, vTiles0 tile $19 +	dw .TileBordersGFX + 7 tiles, vTiles0 tile $1a  ; e1723  .TileBordersGFX: ; e1723 @@ -845,7 +845,7 @@ LoadUnownPuzzlePiecesGFX: ; e17a3  	ld a, [hli]  	ld h, [hl]  	ld l, a -	ld de, VTiles2 +	ld de, vTiles2  	call Decompress  	call ConvertLoadedPuzzlePieces  	ret diff --git a/engine/unused_title.asm b/engine/unused_title.asm index 2075d86d9..ca508b593 100644 --- a/engine/unused_title.asm +++ b/engine/unused_title.asm @@ -16,18 +16,18 @@ UnusedTitleScreen: ; 10c000  	ld [hl], a  ; wTitleScreenTimer + 1  	ld hl, UnusedTitleBG_GFX -	ld de, VTiles2 -	ld bc, VBGMap0 - VTiles2 +	ld de, vTiles2 +	ld bc, vBGMap0 - vTiles2  	call CopyBytes  	ld hl, UnusedTitleBG_GFX + $80 tiles -	ld de, VTiles1 -	ld bc, VTiles2 - VTiles1 +	ld de, vTiles1 +	ld bc, vTiles2 - vTiles1  	call CopyBytes  	ld hl, UnusedTitleFG_GFX -	ld de, VTiles0 -	ld bc, VTiles1 - VTiles0 +	ld de, vTiles0 +	ld bc, vTiles1 - vTiles0  	call CopyBytes  	ld hl, UnusedTitleBG_Tilemap diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index ca0daae73..a0784caac 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -233,9 +233,9 @@ LoadMapTimeOfDay: ; 104750  	ret  .ClearBGMap: ; 104770 (41:4770) -	ld a, HIGH(VBGMap0) +	ld a, HIGH(vBGMap0)  	ld [wBGMapAnchor + 1], a -	xor a ; LOW(VBGMap0) +	xor a ; LOW(vBGMap0)  	ld [wBGMapAnchor], a  	ld [hSCY], a  	ld [hSCX], a @@ -247,7 +247,7 @@ LoadMapTimeOfDay: ; 104750  	ld [rVBK], a  	xor a -	ld bc, VBGMap1 - VBGMap0 +	ld bc, vBGMap1 - vBGMap0  	hlbgcoord 0, 0  	call ByteFill @@ -255,7 +255,7 @@ LoadMapTimeOfDay: ; 104750  	ld [rVBK], a  	ld a, "<BLACK>" -	ld bc, VBGMap1 - VBGMap0 +	ld bc, vBGMap1 - vBGMap0  	hlbgcoord 0, 0  	call ByteFill  	ret | 
