From 5a3d289bd1c45b60ebe8347c55ebf4233cb2b059 Mon Sep 17 00:00:00 2001
From: Narishma-gb <194818981+Narishma-gb@users.noreply.github.com>
Date: Wed, 20 May 2026 00:17:19 +0200
Subject: [PATCH] Use `vTiles3-5`, `vBGMap2-3` for VRAM Bank 1 loads

---
 engine/events/fishing_gfx.asm        |  8 ++++----
 engine/gfx/color.asm                 |  2 +-
 engine/gfx/dma_transfer.asm          |  2 +-
 engine/movie/intro.asm               | 20 ++++++++++----------
 engine/movie/title.asm               | 10 +++++-----
 engine/overworld/warp_connection.asm |  6 +++---
 engine/pokemon/stats_screen.asm      |  2 +-
 mobile/mobile_40.asm                 |  2 +-
 mobile/mobile_42.asm                 | 16 ++++++++--------
 mobile/mobile_5c.asm                 |  4 ++--
 mobile/mobile_5f.asm                 | 16 ++++++++--------
 11 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/engine/events/fishing_gfx.asm b/engine/events/fishing_gfx.asm
index e8878b6f2..20fbf484a 100644
--- a/engine/events/fishing_gfx.asm
+++ b/engine/events/fishing_gfx.asm
@@ -11,13 +11,13 @@ LoadFishingGFX:
 	ld de, KrisFishingGFX
 .got_gender
 
-	ld hl, vTiles0 tile $02
+	ld hl, vTiles3 tile $02
 	call .LoadGFX
-	ld hl, vTiles0 tile $06
+	ld hl, vTiles3 tile $06
 	call .LoadGFX
-	ld hl, vTiles0 tile $0a
+	ld hl, vTiles3 tile $0a
 	call .LoadGFX
-	ld hl, vTiles0 tile $fc
+	ld hl, vTiles3 tile $fc
 	call .LoadGFX
 
 	pop af
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
index 59876c737..793be6c4e 100644
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -601,7 +601,7 @@ ApplyAttrmap:
 
 .UpdateVBank1:
 	hlcoord 0, 0, wAttrmap
-	debgcoord 0, 0
+	debgcoord 0, 0 ; vBGMap2
 	ld b, SCREEN_HEIGHT
 	ld a, $1
 	ldh [rVBK], a
diff --git a/engine/gfx/dma_transfer.asm b/engine/gfx/dma_transfer.asm
index a7462c25c..62cc02d2d 100644
--- a/engine/gfx/dma_transfer.asm
+++ b/engine/gfx/dma_transfer.asm
@@ -572,7 +572,7 @@ HDMATransfer_OnlyTopFourRows:
 	ldh [rVBK], a
 	ld c, $8
 	ld hl, wScratchTilemap + $80
-	debgcoord 0, 0, vBGMap1
+	debgcoord 0, 0, vBGMap3
 	call HDMATransfer_WaitForScanline128
 	ld a, $0
 	ldh [rVBK], a
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index 43f0d40d5..92bdd1391 100644
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -103,7 +103,7 @@ IntroScene1:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, IntroUnownAAttrmap
-	debgcoord 0, 0
+	debgcoord 0, 0 ; vBGMap2
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
 	ldh [rVBK], a
@@ -179,7 +179,7 @@ IntroScene3:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, IntroBackgroundAttrmap
-	debgcoord 0, 0
+	debgcoord 0, 0 ; vBGMap2
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
 	ldh [rVBK], a
@@ -242,7 +242,7 @@ IntroScene5:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, IntroUnownHIAttrmap
-	debgcoord 0, 0
+	debgcoord 0, 0 ; vBGMap2
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
 	ldh [rVBK], a
@@ -340,7 +340,7 @@ IntroScene7:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, IntroBackgroundAttrmap
-	debgcoord 0, 0
+	debgcoord 0, 0 ; vBGMap2
 	call Intro_DecompressRequest2bpp_64Tiles
 
 	ld hl, IntroPichuWooperGFX
@@ -510,7 +510,7 @@ IntroScene11:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, IntroUnownsAttrmap
-	debgcoord 0, 0
+	debgcoord 0, 0 ; vBGMap2
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
 	ldh [rVBK], a
@@ -633,7 +633,7 @@ IntroScene13:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, IntroBackgroundAttrmap
-	debgcoord 0, 0
+	debgcoord 0, 0 ; vBGMap2
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
 	ldh [rVBK], a
@@ -737,7 +737,7 @@ IntroScene15:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, IntroSuicuneJumpAttrmap
-	debgcoord 0, 0
+	debgcoord 0, 0 ; vBGMap2
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
 	ldh [rVBK], a
@@ -819,7 +819,7 @@ IntroScene17:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, IntroSuicuneCloseAttrmap
-	debgcoord 0, 0
+	debgcoord 0, 0 ; vBGMap2
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
 	ldh [rVBK], a
@@ -885,7 +885,7 @@ IntroScene19:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, IntroSuicuneBackAttrmap
-	debgcoord 0, 0
+	debgcoord 0, 0 ; vBGMap2
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
 	ldh [rVBK], a
@@ -1063,7 +1063,7 @@ IntroScene26:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, IntroCrystalUnownsAttrmap
-	debgcoord 0, 0
+	debgcoord 0, 0 ; vBGMap2
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
 	ldh [rVBK], a
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index d4f070fe1..32d77c534 100644
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -23,26 +23,26 @@ _TitleScreen:
 
 ; Decompress running Suicune gfx
 	ld hl, TitleSuicuneGFX
-	ld de, vTiles1
+	ld de, vTiles4
 	call Decompress
 
 ; Clear screen palettes
-	hlbgcoord 0, 0
+	hlbgcoord 0, 0 ; vBGMap2
 	ld bc, 20 * TILEMAP_WIDTH
 	xor a
 	call ByteFill
 
 ; Fill tile palettes:
 
-; BG Map 1:
+; BG Attr Map 1:
 
 ; line 0 (copyright)
-	hlbgcoord 0, 0, vBGMap1
+	hlbgcoord 0, 0, vBGMap3
 	ld bc, TILEMAP_WIDTH
 	ld a, 7 ; palette
 	call ByteFill
 
-; BG Map 0:
+; BG Attr Map 0:
 
 ; Apply logo gradient:
 
diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm
index 05d9416f9..21a597170 100644
--- a/engine/overworld/warp_connection.asm
+++ b/engine/overworld/warp_connection.asm
@@ -252,8 +252,8 @@ LoadMapTimeOfDay:
 	ldh [rVBK], a
 
 	xor a
-	ld bc, vBGMap1 - vBGMap0
-	hlbgcoord 0, 0
+	ld bc, vBGMap3 - vBGMap2
+	hlbgcoord 0, 0 ; vBGMap2
 	call ByteFill
 
 	pop af
@@ -276,7 +276,7 @@ LoadMapTimeOfDay:
 	ld a, $1
 	ldh [rVBK], a
 .copy
-	hlbgcoord 0, 0
+	hlbgcoord 0, 0 ; vBGMap2
 	ld c, SCREEN_WIDTH
 	ld b, SCREEN_HEIGHT
 .row
diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm
index aabec23b7..8a958a413 100644
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -980,7 +980,7 @@ StatsScreen_LoadTextboxSpaceGFX:
 	ldh [rVBK], a
 	ld de, TextboxSpaceGFX
 	lb bc, BANK(TextboxSpaceGFX), 1
-	ld hl, vTiles2 tile ' '
+	ld hl, vTiles5 tile ' '
 	call Get2bpp
 	pop af
 	ldh [rVBK], a
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm
index b8198e932..e1daab947 100644
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -1501,7 +1501,7 @@ Function1009d2:
 	ldh [rVBK], a
 
 	ld hl, w3_d800
-	debgcoord 0, 0
+	debgcoord 0, 0 ; vBGMap2
 	lb bc, $03, $24
 	call Get2bpp
 
diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm
index 02991cce5..69efa0629 100644
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -159,7 +159,7 @@ Function1080b7:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, MobileTradeGFX
-	ld de, vTiles2
+	ld de, vTiles5
 	call Decompress
 
 	ld a, $0
@@ -258,7 +258,7 @@ Function108157:
 MobileTradeAnim_ClearTiles:
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, vTiles0
+	ld hl, vTiles3
 	ld bc, 3 * $80 tiles
 	xor a
 	call ByteFill
@@ -273,7 +273,7 @@ MobileTradeAnim_ClearTiles:
 MobileTradeAnim_ClearBGMap:
 	ld a, $1
 	ldh [rVBK], a
-	hlbgcoord 0, 0
+	hlbgcoord 0, 0 ; vBGMap2
 	ld bc, 2 * TILEMAP_AREA
 	ld a, $0
 	call ByteFill
@@ -827,7 +827,7 @@ MobileTradeAnim_10:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, MobileTradeGFX
-	ld de, vTiles2
+	ld de, vTiles5
 	call Decompress
 	ld a, $0
 	ldh [rVBK], a
@@ -870,7 +870,7 @@ MobileTradeAnim_11:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, MobileTradeGFX
-	ld de, vTiles2
+	ld de, vTiles5
 	call Decompress
 	ld a, $0
 	ldh [rVBK], a
@@ -1372,7 +1372,7 @@ Function108ad4:
 .asm_108adf
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, vTiles2 tile $4a
+	ld hl, vTiles5 tile $4a
 	lb bc, BANK(MobileCable1GFX), 16 ; aka BANK(MobileCable2GFX)
 	call Get2bppViaHDMA
 	call DelayFrame
@@ -1627,10 +1627,10 @@ Function108c80:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, MobileTradeAttrmapLZ
-	debgcoord 0, 0
+	debgcoord 0, 0 ; vBGMap2
 	call Decompress
 	ld hl, MobileTradeAttrmapLZ
-	debgcoord 0, 0, vBGMap1
+	debgcoord 0, 0, vBGMap3
 	call Decompress
 	ld a, $0
 	ldh [rVBK], a
diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm
index 0690ec7ce..5b7e6801a 100644
--- a/mobile/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
@@ -259,7 +259,7 @@ Function170cc6:
 	ld a, 1
 	ldh [rVBK], a
 	ld de, wDecompressScratch
-	ld hl, vTiles0
+	ld hl, vTiles3
 	lb bc, BANK(wDecompressScratch), 193
 	call Get2bpp
 	xor a
@@ -279,7 +279,7 @@ Function170d02:
 	ld a, $1
 	ldh [rVBK], a
 	ld de, PichuBorderMobileGFX
-	ld hl, vTiles0 tile $c1
+	ld hl, vTiles3 tile $c1
 	lb bc, BANK(PichuBorderMobileGFX), 24
 	call Get2bpp
 	xor a
diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm
index a06d42a28..04f85a9d5 100644
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -64,12 +64,12 @@ Function17c000:
 	ldh [rVBK], a
 
 	ld hl, HaveWantGFX
-	ld de, vTiles2
+	ld de, vTiles5
 	ld bc, $80 tiles
 	call CopyBytes
 
 	ld hl, HaveWantGFX + $80 tiles
-	ld de, vTiles1
+	ld de, vTiles4
 	ld bc, $10 tiles
 	call CopyBytes
 
@@ -613,15 +613,15 @@ Function17d370:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, PokemonNewsGFX
-	ld de, vTiles1
+	ld de, vTiles4
 	ld bc, $48 tiles
 	call CopyBytes
 	xor a
-	ld hl, vTiles2 tile $7f
+	ld hl, vTiles5 tile $7f
 	ld bc, 1 tiles
 	call ByteFill
 	ld hl, wc608
-	ld de, vTiles0 tile $ee
+	ld de, vTiles3 tile $ee
 	ld bc, 1 tiles
 	call CopyBytes
 	xor a
@@ -660,15 +660,15 @@ Function17d405:
 	ld a, $1
 	ldh [rVBK], a
 	ld hl, PokemonNewsGFX
-	ld de, vTiles1
+	ld de, vTiles4
 	ld bc, $48 tiles
 	call CopyBytes
 	xor a
-	ld hl, vTiles2 tile $7f
+	ld hl, vTiles5 tile $7f
 	ld bc, 1 tiles
 	call ByteFill
 	ld hl, wc608
-	ld de, vTiles0 tile $ee
+	ld de, vTiles3 tile $ee
 	ld bc, 1 tiles
 	call CopyBytes
 	xor a