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/fruit_trees.asm

@@ -1,7 +1,7 @@
 FruitTreeScript:: ; 44000
 	callasm GetCurTreeFruit
 	opentext
-	copybytetovar CurFruit
+	copybytetovar wCurFruit
 	itemtotext USE_SCRIPT_VAR, MEM_BUFFER_0
 	writetext FruitBearingTreeText
 	buttonsound
@@ -14,7 +14,7 @@ FruitTreeScript:: ; 44000
 
 .fruit
 	writetext HeyItsFruitText
-	copybytetovar CurFruit
+	copybytetovar wCurFruit
 	giveitem ITEM_FROM_MEM
 	iffalse .packisfull
 	buttonsound
@@ -35,10 +35,10 @@ FruitTreeScript:: ; 44000
 ; 44041
 
 GetCurTreeFruit: ; 44041
-	ld a, [CurFruitTree]
+	ld a, [wCurFruitTree]
 	dec a
 	call GetFruitTreeItem
-	ld [CurFruit], a
+	ld [wCurFruit], a
 	ret
 ; 4404c
 
@@ -53,7 +53,7 @@ CheckFruitTree: ; 44055
 	ld b, 2
 	call GetFruitTreeFlag
 	ld a, c
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 ; 4405f
 
@@ -65,7 +65,7 @@ PickedFruitTree: ; 4405f
 
 ResetFruitTrees: ; 4406a
 	xor a
-	ld hl, FruitTreeFlags
+	ld hl, wFruitTreeFlags
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
@@ -78,11 +78,11 @@ ResetFruitTrees: ; 4406a
 GetFruitTreeFlag: ; 44078
 	push hl
 	push de
-	ld a, [CurFruitTree]
+	ld a, [wCurFruitTree]
 	dec a
 	ld e, a
 	ld d, 0
-	ld hl, FruitTreeFlags
+	ld hl, wFruitTreeFlags
 	call FlagAction
 	pop de
 	pop hl