Merge branch 'master' of https://github.com/pret/pokecrystal

# Conflicts:
#	macros/scripts/maps.asm

3 files changed, 26 insertions, 26 deletions

diff --git a/gfx/font.asm b/gfx/font.asm
index 2688618ca..e307d619c 100755
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -104,26 +104,26 @@ Functionfb43f: ; fb43f
 
 _LoadStandardFont:: ; fb449
 	ld de, Font
-	ld hl, VTiles1
+	ld hl, vTiles1
 	lb bc, BANK(Font), $80
 	ld a, [rLCDC]
 	bit 7, a
 	jp z, Copy1bpp
 
 	ld de, Font
-	ld hl, VTiles1
+	ld hl, vTiles1
 	lb bc, BANK(Font), $20
 	call Get1bpp_2
 	ld de, Font + $20 * LEN_1BPP_TILE
-	ld hl, VTiles1 tile $20
+	ld hl, vTiles1 tile $20
 	lb bc, BANK(Font), $20
 	call Get1bpp_2
 	ld de, Font + $40 * LEN_1BPP_TILE
-	ld hl, VTiles1 tile $40
+	ld hl, vTiles1 tile $40
 	lb bc, BANK(Font), $20
 	call Get1bpp_2
 	ld de, Font + $60 * LEN_1BPP_TILE
-	ld hl, VTiles1 tile $60
+	ld hl, vTiles1 tile $60
 	lb bc, BANK(Font), $20
 	call Get1bpp_2
 	ret
@@ -131,15 +131,15 @@ _LoadStandardFont:: ; fb449
 
 _LoadFontsExtra1:: ; fb48a
 	ld de, MobilePhoneTilesGFX
-	ld hl, VTiles2 tile "<BLACK>" ; $60
+	ld hl, vTiles2 tile "<BLACK>" ; $60
 	lb bc, BANK(MobilePhoneTilesGFX), 1
 	call Get1bpp_2
 	ld de, OverworldPhoneIconGFX
-	ld hl, VTiles2 tile "<PHONE>" ; $62
+	ld hl, vTiles2 tile "<PHONE>" ; $62
 	lb bc, BANK(OverworldPhoneIconGFX), 1
 	call Get2bpp_2
 	ld de, FontExtra + 3 * LEN_2BPP_TILE
-	ld hl, VTiles2 tile $63
+	ld hl, vTiles2 tile $63
 	lb bc, BANK(FontExtra), $16
 	call Get2bpp_2
 	jr LoadFrame
@@ -147,7 +147,7 @@ _LoadFontsExtra1:: ; fb48a
 
 _LoadFontsExtra2:: ; fb4b0
 	ld de, FontsExtra2_UpArrowGFX
-	ld hl, VTiles2 tile "▲" ; $61
+	ld hl, vTiles2 tile "▲" ; $61
 	ld b, BANK(FontsExtra2_UpArrowGFX)
 	ld c, 1
 	call Get2bpp_2
@@ -156,7 +156,7 @@ _LoadFontsExtra2:: ; fb4b0
 
 _LoadFontsBattleExtra:: ; fb4be
 	ld de, FontBattleExtra
-	ld hl, VTiles2 tile $60
+	ld hl, vTiles2 tile $60
 	lb bc, BANK(FontBattleExtra), $19
 	call Get2bpp_2
 	jr LoadFrame
@@ -170,10 +170,10 @@ LoadFrame: ; fb4cc
 	call AddNTimes
 	ld d, h
 	ld e, l
-	ld hl, VTiles2 tile "┌" ; $79
+	ld hl, vTiles2 tile "┌" ; $79
 	lb bc, BANK(Frames), 6
 	call Get1bpp_2
-	ld hl, VTiles2 tile " " ; $7f
+	ld hl, vTiles2 tile " " ; $7f
 	ld de, TextBoxSpaceGFX
 	lb bc, BANK(TextBoxSpaceGFX), 1
 	call Get1bpp_2
@@ -182,10 +182,10 @@ LoadFrame: ; fb4cc
 
 LoadBattleFontsHPBar: ; fb4f2
 	ld de, FontBattleExtra
-	ld hl, VTiles2 tile $60
+	ld hl, vTiles2 tile $60
 	lb bc, BANK(FontBattleExtra), $c
 	call Get2bpp_2
-	ld hl, VTiles2 tile $70
+	ld hl, vTiles2 tile $70
 	ld de, FontBattleExtra tile $10
 	lb bc, BANK(FontBattleExtra), 3
 	call Get2bpp_2
@@ -193,19 +193,19 @@ LoadBattleFontsHPBar: ; fb4f2
 
 LoadHPBar: ; fb50d
 	ld de, EnemyHPBarBorderGFX
-	ld hl, VTiles2 tile $6c
+	ld hl, vTiles2 tile $6c
 	lb bc, BANK(EnemyHPBarBorderGFX), 4
 	call Get1bpp_2
 	ld de, HPExpBarBorderGFX
-	ld hl, VTiles2 tile $73
+	ld hl, vTiles2 tile $73
 	lb bc, BANK(HPExpBarBorderGFX), 6
 	call Get1bpp_2
 	ld de, ExpBarGFX
-	ld hl, VTiles2 tile $55
+	ld hl, vTiles2 tile $55
 	lb bc, BANK(ExpBarGFX), 9
 	call Get2bpp_2
 	ld de, MobilePhoneTilesGFX + 9 * LEN_2BPP_TILE
-	ld hl, VTiles2 tile $5e
+	ld hl, vTiles2 tile $5e
 	lb bc, BANK(MobilePhoneTilesGFX), 2
 	call Get2bpp_2
 	ret
@@ -214,24 +214,24 @@ LoadHPBar: ; fb50d
 StatsScreen_LoadFont: ; fb53e
 	call _LoadFontsBattleExtra
 	ld de, EnemyHPBarBorderGFX
-	ld hl, VTiles2 tile $6c
+	ld hl, vTiles2 tile $6c
 	lb bc, BANK(EnemyHPBarBorderGFX), 4
 	call Get1bpp_2
 	ld de, HPExpBarBorderGFX
-	ld hl, VTiles2 tile $78
+	ld hl, vTiles2 tile $78
 	lb bc, BANK(HPExpBarBorderGFX), 1
 	call Get1bpp_2
 	ld de, HPExpBarBorderGFX + 3 * LEN_1BPP_TILE
-	ld hl, VTiles2 tile $76
+	ld hl, vTiles2 tile $76
 	lb bc, BANK(HPExpBarBorderGFX), 2
 	call Get1bpp_2
 	ld de, ExpBarGFX
-	ld hl, VTiles2 tile $55
+	ld hl, vTiles2 tile $55
 	lb bc, BANK(ExpBarGFX), 8
 	call Get2bpp_2
 LoadStatsScreenPageTilesGFX: ; fb571
 	ld de, StatsScreenPageTilesGFX
-	ld hl, VTiles2 tile $31
+	ld hl, vTiles2 tile $31
 	lb bc, BANK(StatsScreenPageTilesGFX), $11
 	call Get2bpp_2
 	ret
diff --git a/gfx/load_pics.asm b/gfx/load_pics.asm
index b8ddde182..1d685f1dd 100755
--- a/gfx/load_pics.asm
+++ b/gfx/load_pics.asm
@@ -132,7 +132,7 @@ GLOBAL PokemonPicPointers, UnownPicPointers
 	ret
 
 GetAnimatedFrontpic: ; 51103
-	ld a, BANK(VTiles3)
+	ld a, BANK(vTiles3)
 	ld [rVBK], a
 	push hl
 	ld de, wDecompressScratch
diff --git a/gfx/overworld_font.asm b/gfx/overworld_font.asm
index 203b18fa0..43dd08c66 100644
--- a/gfx/overworld_font.asm
+++ b/gfx/overworld_font.asm
@@ -1,10 +1,10 @@
 LoadOverworldFont:: ; 106594
 	ld de, .font
-	ld hl, VTiles1
+	ld hl, vTiles1
 	lb bc, BANK(.font), $80
 	call Get2bpp
 	ld de, .space
-	ld hl, VTiles2 tile $7f
+	ld hl, vTiles2 tile $7f
 	lb bc, BANK(.space), 1
 	call Get2bpp
 	ret