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

# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm

engine/events/heal_machine_anim.asm

@@ -9,28 +9,28 @@
 
 HealMachineAnim: ; 12324
 	; If you have no Pokemon, don't change the buffer.  This can lead to some glitchy effects if you have no Pokemon.
-	ld a, [PartyCount]
+	ld a, [wPartyCount]
 	and a
 	ret z
-	; The location of the healing machine relative to the player is stored in ScriptVar.
+	; The location of the healing machine relative to the player is stored in wScriptVar.
 	; 0: Up and left (Pokemon Center)
 	; 1: Left (Elm's Lab)
 	; 2: Up (Hall of Fame)
-	ld a, [ScriptVar]
-	ld [Buffer1], a
+	ld a, [wScriptVar]
+	ld [wBuffer1], a
 	ld a, [rOBP1]
-	ld [Buffer2], a
+	ld [wBuffer2], a
 	call .DoJumptableFunctions
-	ld a, [Buffer2]
+	ld a, [wBuffer2]
 	call DmgToCgbObjPal1
 	ret
 ; 1233e
 
 .DoJumptableFunctions: ; 1233e
 	xor a
-	ld [Buffer3], a
+	ld [wBuffer3], a
 .jumpable_loop
-	ld a, [Buffer1]
+	ld a, [wBuffer1]
 	ld e, a
 	ld d, 0
 	ld hl, .Pointers
@@ -39,10 +39,10 @@ HealMachineAnim: ; 12324
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [Buffer3]
+	ld a, [wBuffer3]
 	ld e, a
 	inc a
-	ld [Buffer3], a
+	ld [wBuffer3], a
 	add hl, de
 	ld a, [hl]
 	cp HEALMACHINESTATE_FINISH
@@ -97,18 +97,18 @@ ENDM
 ; 12393
 
 .PC_LoadBallsOntoMachine: ; 12393
-	ld hl, Sprite33
+	ld hl, wVirtualOAMSprite32
 	ld de, .PC_ElmsLab_OAM
 	call .PlaceHealingMachineTile
 	call .PlaceHealingMachineTile
 	jr .LoadBallsOntoMachine
 
 .HOF_LoadBallsOntoMachine: ; 123a1
-	ld hl, Sprite33
+	ld hl, wVirtualOAMSprite32
 	ld de, .HOF_OAM
 
 .LoadBallsOntoMachine: ; 123a7
-	ld a, [PartyCount]
+	ld a, [wPartyCount]
 	ld b, a
 .party_loop
 	call .PlaceHealingMachineTile
@@ -254,7 +254,7 @@ INCLUDE "gfx/overworld/heal_machine.pal"
 
 .PlaceHealingMachineTile: ; 124a3
 	push bc
-	ld a, [Buffer1]
+	ld a, [wBuffer1]
 	bcpixel 2, 4
 	cp HEALMACHINE_ELMS_LAB
 	jr z, .okay