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

# Conflicts:
#	macros/scripts/maps.asm

16 files changed, 125 insertions, 125 deletions

diff --git a/mobile/battle_tower_5c.asm b/mobile/battle_tower_5c.asm
index 8770505c1..f89e83b5a 100755
--- a/mobile/battle_tower_5c.asm
+++ b/mobile/battle_tower_5c.asm
@@ -110,7 +110,7 @@ Function170139: ; 170139
 	ld bc, NAME_LENGTH_JAPANESE - 1
 	call CopyBytes
 	ld bc, PlayerID
-	ld de, PlayerGender
+	ld de, wPlayerGender
 	farcall GetMobileOTTrainerClass
 	ld de, wBT_OTTempPkmn1CaughtGender
 	ld a, c
diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm
index a0f65599c..b3f33fafe 100755
--- a/mobile/fixed_words.asm
+++ b/mobile/fixed_words.asm
@@ -322,11 +322,11 @@ Function11c1b9: ; 11c1b9
 	call SetPalettes
 	call DisableLCD
 	ld hl, GFX_11d67e
-	ld de, VTiles2
+	ld de, vTiles2
 	ld bc, $60
 	call CopyBytes
 	ld hl, LZ_11d6de
-	ld de, VTiles0
+	ld de, vTiles0
 	call Decompress
 	call EnableLCD
 	farcall ReloadMapPart
@@ -4209,7 +4209,7 @@ MobileEZChatCategoryPointers: ; 11daac
 ; 11f220
 
 MobileEZChatData_WordAndPageCounts:
-macro_11f220: macro
+macro_11f220: MACRO
 ; parameter: number of words
 	db \1
 ; 12 words per page (0-based indexing)
@@ -4218,7 +4218,7 @@ if \1 % 12 == 0
 x = x +- 1
 endc
 	db x
-endm
+ENDM
 	macro_11f220 18 ; 01: Types
 	macro_11f220 36 ; 02: Greetings
 	macro_11f220 69 ; 03: People
@@ -4240,10 +4240,10 @@ EZChat_SortedWords:
 ; allocated size for each.
 ; These arrays are expanded dynamically to accomodate
 ; any Pokemon you've seen that starts with each kana.\
-macro_11f23c: macro
+macro_11f23c: MACRO
 	dw x - w3_d000, \1
 x = x + 2 * \1
-endm
+ENDM
 x = $d012
 	macro_11f23c $2f ; a
 	macro_11f23c $1e ; i
diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm
index b6e20ef03..14b787645 100755
--- a/mobile/mobile_12.asm
+++ b/mobile/mobile_12.asm
@@ -22,11 +22,11 @@ InitMobileProfile: ; 4802f (12:402f)
 	call Function486bf
 	call LoadFontsExtra
 	ld de, MobileUpArrowGFX
-	ld hl, VTiles2 tile $10
+	ld hl, vTiles2 tile $10
 	lb bc, BANK(MobileUpArrowGFX), 1
 	call Request1bpp
 	ld de, MobileDownArrowGFX
-	ld hl, VTiles2 tile $11
+	ld hl, vTiles2 tile $11
 	lb bc, BANK(MobileDownArrowGFX), 1
 	call Request1bpp
 	call Function4a3a7
@@ -84,7 +84,7 @@ InitMobileProfile: ; 4802f (12:402f)
 	ld a, [wd002]
 	bit 6, a
 	jr nz, .asm_48113
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	ld hl, Strings_484fb
 	call GetNthString
 	ld d, h
@@ -298,7 +298,7 @@ asm_4828d: ; 4828d (12:428d)
 	ld de, String_484ff
 	call PlaceString
 	call WaitBGMap
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	inc a
 	ld [wMenuCursorBuffer], a
 	call StaticMenuJoypad
@@ -316,11 +316,11 @@ asm_4828d: ; 4828d (12:428d)
 	cp $50
 	jr nz, .asm_482e1
 	ld a, $1
-	ld [PlayerGender], a
+	ld [wPlayerGender], a
 	jr .asm_482f1
 .asm_482ed
 	xor a
-	ld [PlayerGender], a
+	ld [wPlayerGender], a
 .asm_482f1
 	ld d, h
 	ld e, l
@@ -804,10 +804,10 @@ Function4873c: ; 4873c (12:473c)
 	ld a, A_BUTTON
 	add B_BUTTON
 	ld [hli], a ; joypad filter
-	; ld a, [PlayerGender]
+	; ld a, [wPlayerGender]
 	; xor 1
 	; inc a
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	and a
 	jr z, .male
 	ld a, 2
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm
index 6fbda0146..b82280482 100644
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -25,17 +25,17 @@ OpenSRAMBank4: ; 89160
 
 
 Function89168: ; 89168 (22:5168)
-	ld hl, GameTimerPause
+	ld hl, wGameTimerPause
 	set 7, [hl]
 	ret
 
 Function8916e: ; 8916e (22:516e)
-	ld hl, GameTimerPause
+	ld hl, wGameTimerPause
 	res 7, [hl]
 	ret
 
 Function89174: ; 89174 (22:5174)
-	ld hl, GameTimerPause
+	ld hl, wGameTimerPause
 	bit 7, [hl]
 	ret
 
@@ -535,7 +535,7 @@ Function893e2: ; 893e2 (22:53e2)
 	ret
 
 Function893ef: ; 893ef
-	ld de, VTiles0
+	ld de, vTiles0
 	ld hl, GFX_8940b
 	ld bc, $20
 	ld a, BANK(GFX_8940b)
@@ -556,12 +556,12 @@ INCBIN "gfx/unknown/08940b.2bpp"
 ; 8942b
 
 Function8942b: ; 8942b (22:542b)
-	ld de, VTiles0 tile $02
+	ld de, vTiles0 tile $02
 	ld hl, MobileAdapterGFX + $7d0
 	ld bc, $80
 	ld a, BANK(MobileAdapterGFX)
 	call FarCopyBytes
-	ld de, VTiles0 tile $0a
+	ld de, vTiles0 tile $0a
 	ld hl, MobileAdapterGFX + $c60
 	ld bc, $40
 	ld a, BANK(MobileAdapterGFX)
@@ -583,7 +583,7 @@ Function89448: ; 89448 (22:5448)
 
 Function89455: ; 89455 (22:5455)
 	ld hl, MobileAdapterGFX + $7d0
-	ld de, VTiles2 tile $0c
+	ld de, vTiles2 tile $0c
 	ld bc, $490
 	ld a, BANK(MobileAdapterGFX)
 	call FarCopyBytes
@@ -591,12 +591,12 @@ Function89455: ; 89455 (22:5455)
 
 Function89464: ; 89464
 	ld hl, MobileAdapterGFX
-	ld de, VTiles2
+	ld de, vTiles2
 	ld bc, $200
 	ld a, BANK(MobileAdapterGFX)
 	call FarCopyBytes
 	ld hl, MobileAdapterGFX + $660
-	ld de, VTiles2 tile $20
+	ld de, vTiles2 tile $20
 	ld bc, $170
 	ld a, BANK(MobileAdapterGFX)
 	call FarCopyBytes
@@ -619,7 +619,7 @@ Function89481: ; 89481
 
 Function89492: ; 89492 (22:5492)
 	ld d, 0
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	ret z
 	inc d
@@ -1227,7 +1227,7 @@ Function897af: ; 897af
 	ld [TrainerClass], a
 	xor a
 	ld [CurPartySpecies], a
-	ld de, VTiles2 tile $37
+	ld de, vTiles2 tile $37
 	farcall GetTrainerPic
 	pop bc
 	ret
@@ -1269,13 +1269,13 @@ Function897d5: ; 897d5
 
 Function89807: ; 89807 (22:5807)
 	ld hl, MobileAdapterGFX + $200
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .asm_89814
 	ld hl, MobileAdapterGFX + $200 + $230
 .asm_89814
 	call DisableLCD
-	ld de, VTiles2 tile $37
+	ld de, vTiles2 tile $37
 	ld bc, $230
 	ld a, BANK(MobileAdapterGFX)
 	call FarCopyBytes
diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm
index 49780d4aa..824643632 100644
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -597,17 +597,17 @@ Function8b677: ; 8b677
 
 Function8b690: ; 8b690
 	ld hl, GFX_17afa5 + $514
-	ld de, VTiles2
+	ld de, vTiles2
 	ld bc, $160
 	ld a, BANK(GFX_17afa5)
 	call FarCopyBytes
 	ld hl, GFX_17afa5 + $514 + $160 - $10
-	ld de, VTiles2 tile $61
+	ld de, vTiles2 tile $61
 	ld bc, $10
 	ld a, BANK(GFX_17afa5)
 	call FarCopyBytes
 	ld hl, GFX_17afa5 + $514 + $160
-	ld de, VTiles1 tile $6e
+	ld de, vTiles1 tile $6e
 	ld bc, $10
 	ld a, BANK(GFX_17afa5)
 	call FarCopyBytes
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm
index c25178715..0d29239e0 100644
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -2543,7 +2543,7 @@ Unknown_100ff3: ; 100ff3
 	dbwww $80, PlayerName, NAME_LENGTH, NULL
 	dbwww $80, PlayerID, 2, NULL
 	dbwww $80, wSecretID, 2, NULL
-	dbwww $80, PlayerGender, 1, NULL
+	dbwww $80, wPlayerGender, 1, NULL
 	dbwww $04, $a603, 8, NULL
 	dbwww $04, $a007, PARTYMON_STRUCT_LENGTH, NULL
 	db -1
@@ -2812,7 +2812,7 @@ Function1011f1: ; 1011f1
 	call CloseSRAM
 	ld hl, wdc41
 	res 4, [hl]
-	ld hl, GameTimerPause
+	ld hl, wGameTimerPause
 	bit 7, [hl]
 	jr z, .skip
 	ld hl, wdc41
@@ -4703,7 +4703,7 @@ Function101e98: ; 101e98
 	call ClearSprites
 	farcall Function8adb3
 	ret c
-	ld hl, GameTimerPause
+	ld hl, wGameTimerPause
 	set 7, [hl]
 	ld hl, wdc41
 	set 4, [hl]
@@ -4711,7 +4711,7 @@ Function101e98: ; 101e98
 ; 101ead
 
 Function101ead: ; 101ead
-	ld hl, GameTimerPause
+	ld hl, wGameTimerPause
 	bit 7, [hl]
 	jr nz, .asm_101ec8
 	ld hl, wdc41
@@ -6843,7 +6843,7 @@ Function102dc3: ; 102dc3
 Function102dd3: ; 102dd3
 	call DisableLCD
 	ld de, GFX_1032a2
-	ld hl, VTiles0
+	ld hl, vTiles0
 	lb bc, BANK(GFX_1032a2), 4
 	call Get2bpp
 	farcall __LoadTradeScreenBorder
@@ -7896,7 +7896,7 @@ Function1036f9: ; 1036f9
 
 Function103700: ; 103700
 	ld c, $0a
-	ld hl, SwarmFlags
+	ld hl, wSwarmFlags
 	bit 4, [hl]
 	jr z, .asm_10370f
 	farcall Function1008a6
@@ -7994,11 +7994,11 @@ Function103780: ; 103780
 
 Function10378c: ; 10378c
 	ld c, 0
-	ld hl, SwarmFlags
+	ld hl, wSwarmFlags
 	bit 4, [hl]
 	jr nz, .already_set
 	ld c, $01
-	ld hl, SwarmFlags
+	ld hl, wSwarmFlags
 	set 4, [hl]
 
 .already_set
@@ -8020,7 +8020,7 @@ Function10378c: ; 10378c
 	ld a, c
 	and a
 	ret z
-	ld hl, SwarmFlags
+	ld hl, wSwarmFlags
 	res 4, [hl]
 	ret
 ; 1037c2
diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm
index 7e1d20db6..b92af19fe 100755
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -1011,20 +1011,20 @@ MobileFunc_106462: mobile
 
 Function106464:: ; 106464
 	ld de, MobilePhoneTilesGFX
-	ld hl, VTiles2 tile $60
+	ld hl, vTiles2 tile $60
 	lb bc, BANK(MobilePhoneTilesGFX), 1
 	call Get2bpp
 	ld de, FontsExtra2_UpArrowGFX
-	ld hl, VTiles2 tile $61
+	ld hl, vTiles2 tile $61
 	lb bc, BANK(FontsExtra2_UpArrowGFX), 1
 	call Get2bpp
 	ld de, GFX_106514
-	ld hl, VTiles2 tile $62
+	ld hl, vTiles2 tile $62
 	ld c, 9
 	ld b, BANK(GFX_106514)
 	call Get2bpp
 	ld de, $40b0
-	ld hl, VTiles2 tile $6b
+	ld hl, vTiles2 tile $6b
 	ld b, $f ; XXX no graphics at 0f:40b0
 	call Get2bpp
 	farcall LoadFrame
@@ -1039,11 +1039,11 @@ Function10649b: ; 10649b
 	call AddNTimes
 	ld d, h
 	ld e, l
-	ld hl, VTiles2 tile $79
+	ld hl, vTiles2 tile $79
 	ld c, 6
 	ld b, BANK(Frames)
 	call Function1064c3
-	ld hl, VTiles2 tile $7f
+	ld hl, vTiles2 tile $7f
 	ld de, TextBoxSpaceGFX
 	ld c, 1
 	ld b, BANK(TextBoxSpaceGFX)
diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm
index bdb002757..313d8c1f8 100644
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -149,7 +149,7 @@ Function1080b7: ; 1080b7
 	call ClearSprites
 	call ClearTileMap
 	call DisableLCD
-	call MobileTradeAnim_ClearVTiles
+	call MobileTradeAnim_ClearTiles
 	call MobileTradeAnim_ClearBGMap
 	call LoadStandardFont
 	call LoadFontsBattleExtra
@@ -157,13 +157,13 @@ Function1080b7: ; 1080b7
 	ld a, $1
 	ld [rVBK], a
 	ld hl, LZ_108da7
-	ld de, VTiles2
+	ld de, vTiles2
 	call Decompress
 
 	ld a, $0
 	ld [rVBK], a
 	ld hl, LZ_108d27
-	ld de, VTiles0 tile $20
+	ld de, vTiles0 tile $20
 	call Decompress
 
 	call EnableLCD
@@ -180,12 +180,12 @@ Function1080b7: ; 1080b7
 	call DelayFrame
 
 	ld de, TradeBallGFX
-	ld hl, VTiles0
+	ld hl, vTiles0
 	lb bc, BANK(TradeBallGFX), $06
 	call Request2bpp
 
 	ld de, TradePoofGFX
-	ld hl, VTiles0 tile $06
+	ld hl, vTiles0 tile $06
 	lb bc, BANK(TradePoofGFX), $0c
 	call Request2bpp
 
@@ -196,12 +196,12 @@ Function1080b7: ; 1080b7
 
 	ld a, [wPlayerTrademonSpecies]
 	ld hl, wPlayerTrademonDVs
-	ld de, VTiles0 tile $30
+	ld de, vTiles0 tile $30
 	call MobileTradeAnim_GetFrontpic
 
 	ld a, [wOTTrademonSpecies]
 	ld hl, wOTTrademonDVs
-	ld de, VTiles2 tile $31
+	ld de, vTiles2 tile $31
 	call MobileTradeAnim_GetFrontpic
 
 	ld a, [wPlayerTrademonSpecies]
@@ -225,7 +225,7 @@ Function108157: ; 108157
 	call ClearSprites
 	call ClearTileMap
 	call DisableLCD
-	call MobileTradeAnim_ClearVTiles
+	call MobileTradeAnim_ClearTiles
 	call MobileTradeAnim_ClearBGMap
 	call LoadStandardFont
 	call LoadFontsBattleExtra
@@ -255,16 +255,16 @@ Function108157: ; 108157
 	ret
 ; 1081ad
 
-MobileTradeAnim_ClearVTiles: ; 1081ad
+MobileTradeAnim_ClearTiles: ; 1081ad
 	ld a, $1
 	ld [rVBK], a
-	ld hl, VTiles0
+	ld hl, vTiles0
 	ld bc, 3 * $80 tiles
 	xor a
 	call ByteFill
 	ld a, $0
 	ld [rVBK], a
-	ld hl, VTiles0
+	ld hl, vTiles0
 	ld bc, 3 * $80 tiles
 	xor a
 	call ByteFill
@@ -549,7 +549,7 @@ MobileTradeAnim_ShowOTMonFromTrade: ; 10839b
 	ld a, [wOTTrademonSpecies]
 	ld [CurPartySpecies], a
 	ld hl, wOTTrademonDVs
-	ld de, VTiles2
+	ld de, vTiles2
 	call Function108201
 	call EnableLCD
 	farcall DeinitializeAllSprites
@@ -616,11 +616,11 @@ MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c
 	call Function10898a
 	call DelayFrame
 	ld de, TradeBallGFX
-	ld hl, VTiles0
+	ld hl, vTiles0
 	lb bc, BANK(TradeBallGFX), $06
 	call Request2bpp
 	ld de, TradePoofGFX
-	ld hl, VTiles0 tile $06
+	ld hl, vTiles0 tile $06
 	lb bc, BANK(TradePoofGFX), $0c
 	call Request2bpp
 	ld a, [wPlayerTrademonDVs]
@@ -684,17 +684,17 @@ MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7
 	ld a, [wOTTrademonSpecies]
 	ld [CurPartySpecies], a
 	ld hl, wOTTrademonDVs
-	ld de, VTiles2
+	ld de, vTiles2
 	call Function108201
 	call EnableLCD
 	farcall DeinitializeAllSprites
 	call DelayFrame
 	ld de, TradeBallGFX
-	ld hl, VTiles0
+	ld hl, vTiles0
 	lb bc, BANK(TradeBallGFX), $06
 	call Request2bpp
 	ld de, TradePoofGFX
-	ld hl, VTiles0 tile $06
+	ld hl, vTiles0 tile $06
 	lb bc, BANK(TradePoofGFX), $0c
 	call Request2bpp
 	xor a
@@ -753,17 +753,17 @@ MobileTradeAnim_GetOddEgg: ; 108589
 	ld a, [wOTTrademonSpecies]
 	ld [CurPartySpecies], a
 	ld hl, wOTTrademonDVs
-	ld de, VTiles2
+	ld de, vTiles2
 	call Function108201
 	call EnableLCD
 	farcall DeinitializeAllSprites
 	call DelayFrame
 	ld de, TradeBallGFX
-	ld hl, VTiles0
+	ld hl, vTiles0
 	lb bc, BANK(TradeBallGFX), $06
 	call Request2bpp
 	ld de, TradePoofGFX
-	ld hl, VTiles0 tile $06
+	ld hl, vTiles0 tile $06
 	lb bc, BANK(TradePoofGFX), $0c
 	call Request2bpp
 	xor a
@@ -860,12 +860,12 @@ MobileTradeAnim_10: ; 108689
 	ld a, $1
 	ld [rVBK], a
 	ld hl, LZ_108da7
-	ld de, VTiles2
+	ld de, vTiles2
 	call Decompress
 	ld a, $0
 	ld [rVBK], a
 	ld hl, LZ_108d27
-	ld de, VTiles0 tile $20
+	ld de, vTiles0 tile $20
 	call Decompress
 	call Function108c80
 	call Function108c6d
@@ -904,12 +904,12 @@ MobileTradeAnim_11: ; 1086f4
 	ld a, $1
 	ld [rVBK], a
 	ld hl, LZ_108da7
-	ld de, VTiles2
+	ld de, vTiles2
 	call Decompress
 	ld a, $0
 	ld [rVBK], a
 	ld hl, LZ_108d27
-	ld de, VTiles0 tile $20
+	ld de, vTiles0 tile $20
 	call Decompress
 	call Function108c80
 	call Function108c6d
@@ -1194,7 +1194,7 @@ MobileTradeAnim_0f: ; 108919
 	call ClearSprites
 	call ClearTileMap
 	call DisableLCD
-	call MobileTradeAnim_ClearVTiles
+	call MobileTradeAnim_ClearTiles
 	call MobileTradeAnim_ClearBGMap
 	call EnableLCD
 	call GetMobileTradeAnimByte
@@ -1223,14 +1223,14 @@ MobileTradeAnim_FadeToBlack: ; 10893d
 ; 10895e
 
 Function10895e: ; 10895e
-	ld de, VTiles0 tile $30
+	ld de, vTiles0 tile $30
 	jr asm_108966
 
 Function108963:
-	ld de, VTiles2 tile $31
+	ld de, vTiles2 tile $31
 asm_108966
 	call DelayFrame
-	ld hl, VTiles2
+	ld hl, vTiles2
 	lb bc, $a, $31 ; $a is the bank of ?????
 	call Request2bpp
 	call WaitTop
@@ -1245,7 +1245,7 @@ asm_108966
 ; 10898a
 
 Function10898a: ; 10898a
-	ld de, VTiles2
+	ld de, vTiles2
 	call MobileTradeAnim_GetFrontpic
 	call WaitTop
 	call MobileTradeAnim_ClearTilemap
@@ -1297,7 +1297,7 @@ MobileTradeAnim_DisplayReceivedMon:
 MobileTradeAnim_DisplayEggData
 	call WaitTop
 	call MobileTradeAnim_ClearTilemap
-	ld a, HIGH(VBGMap1)
+	ld a, HIGH(vBGMap1)
 	ld [hBGMapAddress + 1], a
 	hlcoord 5, 0
 	ld b, 6
@@ -1320,7 +1320,7 @@ MobileTradeAnim_DisplayEggData
 Function108a33: ; 108a33
 	call WaitTop
 	call MobileTradeAnim_ClearTilemap
-	ld a, HIGH(VBGMap1)
+	ld a, HIGH(vBGMap1)
 	ld [hBGMapAddress + 1], a
 	hlcoord 5, 0
 	ld b, 6
@@ -1340,7 +1340,7 @@ Function108a33: ; 108a33
 MobileTradeAnim_LoadMonTemplate: ; 108a5b
 	call WaitTop
 	call MobileTradeAnim_ClearTilemap
-	ld a, HIGH(VBGMap1)
+	ld a, HIGH(vBGMap1)
 	ld [hBGMapAddress + 1], a
 	hlcoord 4, 0
 	ld b,  6
@@ -1363,7 +1363,7 @@ MobileTradeAnim_LoadMonTemplate: ; 108a5b
 MobileTradeAnim_MonDisplay_UpdateBGMap: ; 108a87
 	call WaitBGMap
 	call WaitTop
-	ld a, HIGH(VBGMap0)
+	ld a, HIGH(vBGMap0)
 	ld [hBGMapAddress + 1], a
 	ret
 ; 108a92
@@ -1432,7 +1432,7 @@ Function108ad4: ; 108ad4
 .asm_108adf
 	ld a, $1
 	ld [rVBK], a
-	ld hl, VTiles2 tile $4a
+	ld hl, vTiles2 tile $4a
 	lb bc, BANK(GFX_1092c7), 16
 	call Get2bpp_2
 	call DelayFrame
@@ -1698,7 +1698,7 @@ Function108c6d: ; 108c6d
 	debgcoord 0, 0
 	call Decompress
 	ld hl, LZ_108fe7
-	debgcoord 0, 0, VBGMap1
+	debgcoord 0, 0, vBGMap1
 	call Decompress
 	ret
 ; 108c80
@@ -1710,7 +1710,7 @@ Function108c80: ; 108c80
 	debgcoord 0, 0
 	call Decompress
 	ld hl, LZ_1090a7
-	debgcoord 0, 0, VBGMap1
+	debgcoord 0, 0, vBGMap1
 	call Decompress
 	ld a, $0
 	ld [rVBK], a
diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm
index b2abfe9b9..180ab3758 100644
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -4401,7 +4401,7 @@ Function11581e: ; 11581e
 
 Function1158c2: ; 1158c2
 	ld a, e
-	ld [SwarmFlags], a
+	ld [wSwarmFlags], a
 	ld a, d
 	ld [$dc21], a
 	xor a
@@ -4422,7 +4422,7 @@ Function1158c2: ; 1158c2
 	ld l, c
 	ld h, b
 	xor a
-	ld [WeeklyFlags], a
+	ld [wWeeklyFlags], a
 
 .asm_1158e5
 	ld b, $3
@@ -4447,7 +4447,7 @@ Function1158c2: ; 1158c2
 	push hl
 	dec hl
 	ld a, c
-	ld [WeeklyFlags], a
+	ld [wWeeklyFlags], a
 .asm_115908
 	xor a
 	ld [hld], a
@@ -4468,7 +4468,7 @@ Function1158c2: ; 1158c2
 	ld [$dc1a], a
 	push de
 	push hl
-	ld hl, SwarmFlags
+	ld hl, wSwarmFlags
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -4562,7 +4562,7 @@ endr
 	ld a, $a
 	ld [hli], a
 	push hl
-	ld hl, SwarmFlags
+	ld hl, wSwarmFlags
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -4587,7 +4587,7 @@ endr
 	jp nz, .asm_1158e5
 
 .asm_1159c4
-	ld a, [WeeklyFlags]
+	ld a, [wWeeklyFlags]
 	cp $0
 	jr z, .asm_1159d8
 	push hl
@@ -5061,9 +5061,9 @@ Function115bc8: ; 115bc8
 
 Function115c49: ; 115c49
 	ld a, e
-	ld [WeeklyFlags], a
+	ld [wWeeklyFlags], a
 	ld a, d
-	ld [SwarmFlags], a
+	ld [wSwarmFlags], a
 	xor a
 	ld [de], a
 	inc de
@@ -5131,7 +5131,7 @@ endr
 	ld [$dc1a], a
 	push de
 	push hl
-	ld hl, WeeklyFlags
+	ld hl, wWeeklyFlags
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -5243,9 +5243,9 @@ Function115cfd: ; 115cfd
 .asm_115d38
 	push de
 	push hl
-	ld a, [WeeklyFlags]
+	ld a, [wWeeklyFlags]
 	ld l, a
-	ld a, [SwarmFlags]
+	ld a, [wSwarmFlags]
 	ld h, a
 	ld e, [hl]
 	inc hl
diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm
index e2382fc38..de1fc8e9c 100755
--- a/mobile/mobile_45_sprite_engine.asm
+++ b/mobile/mobile_45_sprite_engine.asm
@@ -1,6 +1,6 @@
 Function115d99: ; 115d99
 	ld de, GFX_11601a
-	ld hl, VTiles0 tile $60
+	ld hl, vTiles0 tile $60
 	lb bc, BANK(GFX_11601a), $14
 	call Get2bpp
 	xor a
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm
index 1cf9a8351..bdf85464c 100755
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -1198,7 +1198,7 @@ BattleTowerRoomMenu_PlacePickLevelMenu:
 	ld [wcd4f], a
 	ld a, $1
 	ld [rSVBK], a
-	ld a, [StatusFlags]
+	ld a, [wStatusFlags]
 	bit 6, a ; Hall Of Fame
 	jr nz, .asm_11896b
 	ld hl, Strings_Ll0ToL40		; Address to list of strings with the choosable levels
diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm
index 08cb86426..5d2e3277b 100755
--- a/mobile/mobile_5b.asm
+++ b/mobile/mobile_5b.asm
@@ -170,7 +170,7 @@ Function16c0fa: ; 16c0fa
 
 MobileSystemSplashScreen_InitGFX: ; 16c108
 	call DisableLCD
-	ld hl, VTiles2
+	ld hl, vTiles2
 	ld de, .Tiles
 	lb bc, BANK(.Tiles), $68
 	call Get2bpp
@@ -708,7 +708,7 @@ Function16cc02: ; 16cc02
 ; 16cc18
 
 Function16cc18: ; 16cc18
-	ld hl, VTiles1
+	ld hl, vTiles1
 	ld de, GFX_16cca3
 	lb bc, BANK(GFX_16cca3), $2e
 	call Get2bpp
@@ -763,7 +763,7 @@ Function16cc62: ; 16cc62
 ; 16cc6e
 
 Function16cc6e: ; 16cc6e
-	hlbgcoord 0, 0, VBGMap1
+	hlbgcoord 0, 0, vBGMap1
 	jr Function16cc73
 
 Function16cc73:
diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm
index 005bb1a1b..f6d6cdf3f 100755
--- a/mobile/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
@@ -273,7 +273,7 @@ Function170cc6: ; 170cc6
 	ld a, $1
 	ld [rVBK], a
 	ld de, wd000
-	ld hl, VTiles0
+	ld hl, vTiles0
 	lb bc, $6, $c1
 	call Get2bpp
 	xor a
@@ -282,7 +282,7 @@ Function170cc6: ; 170cc6
 	ld de, wd000
 	call Decompress
 	ld de, UnknBGPals
-	ld hl, VTiles0
+	ld hl, vTiles0
 	lb bc, $6, $53
 	call Get2bpp
 	pop af
@@ -295,7 +295,7 @@ Function170d02: ; 170d02
 	ld a, $1
 	ld [rVBK], a
 	ld de, GFX_171848
-	ld hl, VTiles1 tile $41
+	ld hl, vTiles1 tile $41
 	lb bc, BANK(GFX_171848), $18
 	call Get2bpp
 	xor a
@@ -687,11 +687,11 @@ String_171c73: ; 171c73
 Function171c87: ; 171c87 (5c:5c87)
 	call DisableLCD
 	ld hl, GFX_171db1
-	ld de, VTiles2 tile $00
+	ld de, vTiles2 tile $00
 	ld bc, $6e0
 	call CopyBytes
 	ld hl, LZ_172abd
-	ld de, VTiles0 tile $00
+	ld de, vTiles0 tile $00
 	call Decompress
 	call EnableLCD
 	ld hl, Tilemap_172491
@@ -759,11 +759,11 @@ Function171cf0: ; 171cf0 (5c:5cf0)
 Function171d2b: ; 171d2b (5c:5d2b)
 	call DisableLCD
 	ld hl, GFX_171db1
-	ld de, VTiles2 tile $00
+	ld de, vTiles2 tile $00
 	ld bc, $6e0
 	call CopyBytes
 	ld hl, LZ_172abd
-	ld de, VTiles0 tile $00
+	ld de, vTiles0 tile $00
 	call Decompress
 	call EnableLCD
 	ld hl, Tilemap_172685
@@ -862,7 +862,7 @@ Function172e78: ; 172e78 (5c:6e78)
 	call ByteFill
 	call DisableLCD
 	ld hl, GameBoyN64GFX
-	ld de, VTiles2 tile $00
+	ld de, vTiles2 tile $00
 	ld bc, $610
 	call CopyBytes
 	call EnableLCD
diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm
index c8cae6654..78a9e5211 100644
--- a/mobile/mobile_5e.asm
+++ b/mobile/mobile_5e.asm
@@ -738,7 +738,7 @@ Function17aba0: ; 17aba0 (5e:6ba0)
 	ld a, $1
 	ld [rVBK], a
 
-	ld hl, VTiles5 tile $00
+	ld hl, vTiles5 tile $00
 	ld de, GFX_17afa5
 	lb bc, BANK(GFX_17afa5), $80
 	call Get2bpp
@@ -746,12 +746,12 @@ Function17aba0: ; 17aba0 (5e:6ba0)
 	pop af
 	ld [rVBK], a
 
-	ld hl, VTiles0 tile $00
+	ld hl, vTiles0 tile $00
 	ld de, GFX_17afa5 + $4c0
 	lb bc, BANK(GFX_17afa5), 5
 	call Get2bpp
 
-	ld hl, VTiles0 tile $05
+	ld hl, vTiles0 tile $05
 	ld de, GFX_11601a
 	lb bc, BANK(GFX_11601a), 4
 	call Get2bpp
diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm
index ea485089c..0228c8030 100644
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -1,7 +1,7 @@
 Function17c000: ; 17c000
 	call DisableLCD
 
-	ld hl, VTiles2
+	ld hl, vTiles2
 	ld bc, $31 tiles
 	xor a
 	call ByteFill
@@ -56,7 +56,7 @@ Function17c000: ; 17c000
 	ld [rSVBK], a
 
 	ld hl, MobileSelectGFX
-	ld de, VTiles0 tile $30
+	ld de, vTiles0 tile $30
 	ld bc, $20 tiles
 	call CopyBytes
 
@@ -64,12 +64,12 @@ Function17c000: ; 17c000
 	ld [rVBK], a
 
 	ld hl, HaveWantGFX
-	ld de, VTiles2
+	ld de, vTiles2
 	ld bc, $80 tiles
 	call CopyBytes
 
 	ld hl, HaveWantGFX + $800
-	ld de, VTiles1
+	ld de, vTiles1
 	ld bc, $10 tiles
 	call CopyBytes
 
@@ -629,28 +629,28 @@ Function17d370: ; 17d370
 	call ClearScreen
 	farcall ReloadMapPart
 	call DisableLCD
-	ld hl, VTiles1 tile $6e
+	ld hl, vTiles1 tile $6e
 	ld de, $c608
 	ld bc, 1 tiles
 	call CopyBytes
 	ld a, $1
 	ld [rVBK], a
 	ld hl, PokemonNewsGFX
-	ld de, VTiles1
+	ld de, vTiles1
 	ld bc, $48 tiles
 	call CopyBytes
 	xor a
-	ld hl, VTiles2 tile $7f
+	ld hl, vTiles2 tile $7f
 	ld bc, 1 tiles
 	call ByteFill
 	ld hl, $c608
-	ld de, VTiles1 tile $6e
+	ld de, vTiles1 tile $6e
 	ld bc, 1 tiles
 	call CopyBytes
 	xor a
 	ld [rVBK], a
 	ld hl, GFX_17eb7e
-	ld de, VTiles2 tile $60
+	ld de, vTiles2 tile $60
 	ld bc, 1 tiles
 	call CopyBytes
 	call EnableLCD
@@ -677,22 +677,22 @@ Function17d3f6: ; 17d3f6
 
 Function17d405:
 	call DisableLCD
-	ld hl, VTiles1 tile $6e
+	ld hl, vTiles1 tile $6e
 	ld de, $c608
 	ld bc, 1 tiles
 	call CopyBytes
 	ld a, $1
 	ld [rVBK], a
 	ld hl, PokemonNewsGFX
-	ld de, VTiles1
+	ld de, vTiles1
 	ld bc, $48 tiles
 	call CopyBytes
 	xor a
-	ld hl, VTiles2 tile $7f
+	ld hl, vTiles2 tile $7f
 	ld bc, 1 tiles
 	call ByteFill
 	ld hl, $c608
-	ld de, VTiles1 tile $6e
+	ld de, vTiles1 tile $6e
 	ld bc, 1 tiles
 	call CopyBytes
 	xor a
@@ -1531,7 +1531,7 @@ Function17d98b: ; 17d98b
 	ld a, [$c709]
 	ld d, a
 	push de
-	ld de, VTiles2
+	ld de, vTiles2
 	farcall GetTrainerPic
 	pop hl
 	decoord 0, 0
@@ -2952,7 +2952,7 @@ Function17e2a7: ; 17e2a7
 	ld [wcf66], a
 	farcall Function118233
 	ld de, GFX_17eb7e
-	ld hl, VTiles2 tile $60
+	ld hl, vTiles2 tile $60
 	lb bc, BANK(GFX_17eb7e), 1
 	call Get2bpp
 	ld a, [wc300]
diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm
index 468d77fff..e36e779ae 100755
--- a/mobile/mobile_menu.asm
+++ b/mobile/mobile_menu.asm
@@ -628,7 +628,7 @@ Function4a449: ; 4a449
 
 Function4a485: ; 4a485 (12:6485)
 	ld de, GFX_49c0c
-	ld hl, VTiles2 tile $00
+	ld hl, vTiles2 tile $00
 	lb bc, BANK(GFX_49c0c), 13
 	call Get2bpp
 	ret