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

# Conflicts:
#	maps/KrissHouse2F.asm

engine/color.asm

@@ -716,7 +716,7 @@ GetPlayerOrMonPalettePointer:
 	ret
 
 .male
-	ld hl, wPlayerPalette
+	ld hl, PlayerPalette
 	ret
 
 GetFrontpicPalettePointer:

engine/overworld.asm

@@ -220,9 +220,9 @@ GetMonSprite: ; 14259
 	cp SPRITE_POKEMON
 	jr c, .Normal
 	cp SPRITE_DAY_CARE_MON_1
-	jr z, .wBreedMon1
+	jr z, .BreedMon1
 	cp SPRITE_DAY_CARE_MON_2
-	jr z, .wBreedMon2
+	jr z, .BreedMon2
 	cp SPRITE_VARS
 	jr nc, .Variable
 	jr .Icon
@@ -240,11 +240,11 @@ GetMonSprite: ; 14259
 	ld a, [hl]
 	jr .Mon
 
-.wBreedMon1
+.BreedMon1
 	ld a, [wBreedMon1Species]
 	jr .Mon
 
-.wBreedMon2
+.BreedMon2
 	ld a, [wBreedMon2Species]
 
 .Mon:

engine/pack.asm

@@ -1148,7 +1148,7 @@ TutorialPack: ; 107bb
 ; entries correspond to *_POCKET constants
 	dw .Items
 	dw .Balls
-	dw .wKeyItems
+	dw .KeyItems
 	dw .TMHM
 
 .Items: ; 107e9 (4:47e9)
@@ -1174,7 +1174,7 @@ TutorialPack: ; 107bb
 	dba UpdateItemDescription
 ; 10807
 
-.wKeyItems: ; 10807 (4:4807)
+.KeyItems: ; 10807 (4:4807)
 	ld a, KEY_ITEM_POCKET
 	ld hl, .KeyItemsMenuHeader
 	jr .DisplayPocket