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

1 files changed, 22 insertions, 22 deletions

diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm
index e9f51b1cc..978f9e968 100755
--- a/engine/evolution_animation.asm
+++ b/engine/evolution_animation.asm
@@ -2,21 +2,21 @@ EvolutionAnimation: ; 4e5e1
 	push hl
 	push de
 	push bc
-	ld a, [CurSpecies]
+	ld a, [wCurSpecies]
 	push af
 	ld a, [rOBP0]
 	push af
-	ld a, [BaseDexNo]
+	ld a, [wBaseDexNo]
 	push af
 
 	call .EvolutionAnimation
 
 	pop af
-	ld [BaseDexNo], a
+	ld [wBaseDexNo], a
 	pop af
 	ld [rOBP0], a
 	pop af
-	ld [CurSpecies], a
+	ld [wCurSpecies], a
 	pop bc
 	pop de
 	pop hl
@@ -44,18 +44,18 @@ EvolutionAnimation: ; 4e5e1
 	call Request2bpp
 
 	xor a
-	ld [Danger], a
+	ld [wLowHealthAlarm], a
 	call WaitBGMap
 	xor a
 	ld [hBGMapMode], a
 	ld a, [wEvolutionOldSpecies]
-	ld [PlayerHPPal], a
+	ld [wPlayerHPPal], a
 
 	ld c, $0
 	call .GetSGBLayout
 	ld a, [wEvolutionOldSpecies]
-	ld [CurPartySpecies], a
-	ld [CurSpecies], a
+	ld [wCurPartySpecies], a
+	ld [wCurSpecies], a
 	call .PlaceFrontpic
 
 	ld de, vTiles2
@@ -67,12 +67,12 @@ EvolutionAnimation: ; 4e5e1
 	ld [wEvolutionPicOffset], a
 	call .ReplaceFrontpic
 	ld a, [wEvolutionNewSpecies]
-	ld [CurPartySpecies], a
-	ld [CurSpecies], a
+	ld [wCurPartySpecies], a
+	ld [wCurSpecies], a
 	call .LoadFrontpic
 	ld a, [wEvolutionOldSpecies]
-	ld [CurPartySpecies], a
-	ld [CurSpecies], a
+	ld [wCurPartySpecies], a
+	ld [wCurSpecies], a
 
 	ld a, $1
 	ld [hBGMapMode], a
@@ -101,7 +101,7 @@ EvolutionAnimation: ; 4e5e1
 	ld [wEvolutionCanceled], a
 
 	ld a, [wEvolutionNewSpecies]
-	ld [PlayerHPPal], a
+	ld [wPlayerHPPal], a
 
 	ld c, $0
 	call .GetSGBLayout
@@ -114,18 +114,18 @@ EvolutionAnimation: ; 4e5e1
 	push af
 	ld a, $1
 	ld [wBoxAlignment], a
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	push af
 
-	ld a, [PlayerHPPal]
-	ld [CurPartySpecies], a
+	ld a, [wPlayerHPPal]
+	ld [wCurPartySpecies], a
 	hlcoord 7, 2
 	ld d, $0
 	ld e, ANIM_MON_EVOLVE
 	predef AnimateFrontpic
 
 	pop af
-	ld [CurPartySpecies], a
+	ld [wCurPartySpecies], a
 	pop af
 	ld [wBoxAlignment], a
 	ret
@@ -138,7 +138,7 @@ EvolutionAnimation: ; 4e5e1
 	ld [wEvolutionCanceled], a
 
 	ld a, [wEvolutionOldSpecies]
-	ld [PlayerHPPal], a
+	ld [wPlayerHPPal], a
 
 	ld c, $0
 	call .GetSGBLayout
@@ -147,7 +147,7 @@ EvolutionAnimation: ; 4e5e1
 	call .check_statused
 	ret c
 
-	ld a, [PlayerHPPal]
+	ld a, [wPlayerHPPal]
 	call PlayMonCry
 	ret
 ; 4e703
@@ -258,8 +258,8 @@ EvolutionAnimation: ; 4e5e1
 ; 4e794
 
 .check_statused ; 4e794
-	ld a, [CurPartyMon]
-	ld hl, PartyMon1Species
+	ld a, [wCurPartyMon]
+	ld hl, wPartyMon1Species
 	call GetPartyLocation
 	ld b, h
 	ld c, l
@@ -346,7 +346,7 @@ EvolutionAnimation: ; 4e5e1
 	inc a
 	and $7
 	ld b, a
-	ld hl, Sprite01Attributes
+	ld hl, wVirtualOAMSprite00Attributes
 	ld c, NUM_SPRITE_OAM_STRUCTS
 .loop6
 	ld a, [hl]