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

# Conflicts:
#	macros/scripts/maps.asm

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
@@ -828,11 +828,11 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
 ; 8c792 (23:4792)
 
 .boxes ; 8c792
-zoombox: macro
+zoombox: MACRO
 ; width, height, start y, start x
 	db \1, \2
 	dwcoord \3, \4
-endm
+ENDM
 	zoombox  4,  2,  8, 8
 	zoombox  6,  4,  7, 7
 	zoombox  8,  6,  6, 6

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
 
@@ -6371,8 +6371,14 @@ LoadEnemyMon: ; 3e8eb
 	jr c, .GenerateDVs ; try again
 
 .Magikarp:
-; Skimming this part recommended
+; These filters are untranslated.
+; They expect at wMagikarpLength a 2-byte value in mm,
+; but the value is in feet and inches (one byte each).
 
+; The first filter is supposed to make very large Magikarp even rarer,
+; by targeting those 1600 mm or larger.
+; After the conversion to feet, it is unable to target any,
+; as the largest possible Magikarp is 5'3'', which reads as 1283.
 	ld a, [TempEnemyMonSpecies]
 	cp MAGIKARP
 	jr nz, .Happiness
@@ -6382,27 +6388,27 @@ LoadEnemyMon: ; 3e8eb
 	ld bc, PlayerID
 	callfar CalcMagikarpLength
 
-; We're clear if the length is < 1536
+; No reason to keep going if length > 1536 (i.e. if length / 256 != 6)
 	ld a, [wMagikarpLength]
-	cp HIGH(1536)
+	cp HIGH(1536) ; this compares to 6'0'', should be cp 5
 	jr nz, .CheckMagikarpArea
 
 ; 5% chance of skipping both size checks
 	call Random
 	cp 5 percent
 	jr c, .CheckMagikarpArea
-; Try again if > 1614
+; Try again if length > 1615
 	ld a, [wMagikarpLength + 1]
-	cp LOW(1614) + 2
+	cp LOW(1616) ; this compares to 6'80'', should be cp 3
 	jr nc, .GenerateDVs
 
 ; 20% chance of skipping this check
 	call Random
 	cp 20 percent - 1
 	jr c, .CheckMagikarpArea
-; Try again if > 1598
+; Try again if length > 1599
 	ld a, [wMagikarpLength + 1]
-	cp LOW(1598) + 2
+	cp LOW(1600) ; this compares to 6'64'', should be cp 2
 	jr nc, .GenerateDVs
 
 .CheckMagikarpArea:
@@ -6415,6 +6421,9 @@ LoadEnemyMon: ; 3e8eb
 
 ; Intended behavior enforces a minimum size at Lake of Rage
 ; The real behavior prevents size flooring in the Lake of Rage area
+
+; Moreover, due to the check not being translated to feet, all Magikarp
+; smaller than 4'0'' may be caught by the filter, a lot more than intended
 	ld a, [MapGroup]
 	cp GROUP_LAKE_OF_RAGE
 	jr z, .Happiness
@@ -6427,7 +6436,7 @@ LoadEnemyMon: ; 3e8eb
 	jr c, .Happiness
 ; Floor at length 1024
 	ld a, [wMagikarpLength]
-	cp HIGH(1024)
+	cp HIGH(1024) ; compares to 4'0'', cp 3 would be closer to intended value
 	jr c, .GenerateDVs ; try again
 
 ; Finally done with DVs
@@ -6695,7 +6704,7 @@ CheckSleepingTreeMon: ; 3eb38
 CheckUnownLetter: ; 3eb75
 ; Return carry if the Unown letter hasn't been unlocked yet
 
-	ld a, [UnlockedUnowns]
+	ld a, [wUnlockedUnowns]
 	ld c, a
 	ld de, 0
 
@@ -6779,7 +6788,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
@@ -7074,7 +7083,7 @@ BadgeStatBoosts: ; 3ed45
 	and a
 	ret nz
 
-	ld a, [JohtoBadges]
+	ld a, [wJohtoBadges]
 
 ; Swap badges 3 (PlainBadge) and 5 (MineralBadge).
 	ld d, a
@@ -7155,15 +7164,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 +8295,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 +8334,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 +8391,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 +8437,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 +8451,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 +8476,7 @@ InitEnemyTrainer: ; 3f594
 	ld [OTPartyMon1Item], a
 .ok
 
-	ld de, VTiles2
+	ld de, vTiles2
 	callfar GetTrainerPic
 	xor a
 	ld [hGraphicStartTile], a
@@ -8531,7 +8540,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 +9345,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)
@@ -9349,7 +9358,7 @@ GetTrainerBackpic: ; 3fbff
 	ld a, [wPlayerSpriteSetupFlags]
 	bit 2, a ; transformed to male
 	jr nz, .Chris
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .Chris
 
@@ -9363,7 +9372,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 +9383,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

engine/battle/effect_commands.asm

@@ -726,7 +726,7 @@ BattleCommand_CheckObedience: ; 343db
 
 .obeylevel
 	; The maximum obedience level is constrained by owned badges:
-	ld hl, JohtoBadges
+	ld hl, wJohtoBadges
 
 	; risingbadge
 	bit RISINGBADGE, [hl]

engine/battle/misc.asm

@@ -176,9 +176,9 @@ DoBadgeTypeBoosts: ; fbe24
 
 	ld hl, .BadgeTypes
 
-	ld a, [KantoBadges]
+	ld a, [wKantoBadges]
 	ld b, a
-	ld a, [JohtoBadges]
+	ld a, [wJohtoBadges]
 	ld c, a
 
 .CheckBadge:

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

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

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

engine/battle_anims/bg_effects.asm

@@ -871,7 +871,7 @@ BattleBGEffect_RunPicResizeScript: ; c83ed (32:43ed)
 bgsquare: MACRO
 	dn \1, \2
 	dw \3
-endm
+ENDM
 
 	bgsquare 6, 6, .SixBySix
 	bgsquare 4, 4, .FourByFour

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
@@ -1450,7 +1450,7 @@ ENDC
 	ld a, [wd004]
 	inc a
 	ld [wBillsPC_NumMonsInBox], a
-endm
+ENDM
 
 CopyBoxmonSpecies: ; e2d30 (38:6d30)
 	xor 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

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

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
@@ -1413,7 +1413,7 @@ else
 	dbpixel \1, \2
 	dw \3
 endc
-endm
+ENDM
 
 	cardflip_cursor 11,  2,       .Impossible
 	cardflip_cursor 12,  2,       .Impossible

engine/caught_data.asm

@@ -193,7 +193,7 @@ SetBoxmonOrEggmonCaughtData: ; 4db53
 .NotPokecenter2F:
 	call GetWorldMapLocation
 	ld b, a
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	rrca
 	or b
 	ld [hl], a

engine/cgb_layouts.asm

@@ -183,7 +183,7 @@ InitPartyMenuBGPal0: ; 8e9f
 ; 8eb9
 
 _CGB_PokegearPals: ; 8eb9
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .male
 	ld hl, FemalePokegearPals
@@ -719,7 +719,7 @@ _CGB_TrainerCard: ; 9289
 	; fill screen with opposite-gender palette for the card border
 	hlcoord 0, 0, AttrMap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	and a
 	ld a, $1 ; kris
 	jr z, .got_gender
@@ -729,7 +729,7 @@ _CGB_TrainerCard: ; 9289
 	; fill trainer sprite area with same-gender palette
 	hlcoord 14, 1, AttrMap
 	lb bc, 7, 5
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	and a
 	ld a, $0 ; chris
 	jr z, .got_gender2
@@ -768,7 +768,7 @@ _CGB_TrainerCard: ; 9289
 	ld a, $7 ; pryce
 	call FillBoxCGB
 	; clair uses kris's palette
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	and a
 	push af
 	jr z, .got_gender3
@@ -847,7 +847,7 @@ _CGB_PackPals: ; 93d3
 	cp BATTLETYPE_TUTORIAL
 	jr z, .tutorial_male
 
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .tutorial_male
 

engine/color.asm

@@ -718,7 +718,7 @@ GetPlayerOrMonPalettePointer:
 	ld a, [wPlayerSpriteSetupFlags]
 	bit 2, a ; transformed to male
 	jr nz, .male
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	and a
 	jr z, .male
 	ld hl, KrisPalette
@@ -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

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
 

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

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

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

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
 

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