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/battle/move_effects/bide.asm

@@ -6,11 +6,11 @@ BattleCommand_StoreEnergy: ; 36671
 	bit SUBSTATUS_BIDE, a
 	ret z
 
-	ld hl, PlayerRolloutCount
+	ld hl, wPlayerRolloutCount
 	ld a, [hBattleTurn]
 	and a
 	jr z, .check_still_storing_energy
-	ld hl, EnemyRolloutCount
+	ld hl, wEnemyRolloutCount
 .check_still_storing_energy
 	dec [hl]
 	jr nz, .still_storing
@@ -26,30 +26,30 @@ BattleCommand_StoreEnergy: ; 36671
 	call GetBattleVarAddr
 	ld a, 1
 	ld [hl], a
-	ld hl, PlayerDamageTaken + 1
+	ld hl, wPlayerDamageTaken + 1
 	ld de, wPlayerCharging ; player
 	ld a, [hBattleTurn]
 	and a
 	jr z, .player
-	ld hl, EnemyDamageTaken + 1
+	ld hl, wEnemyDamageTaken + 1
 	ld de, wEnemyCharging ; enemy
 .player
 	ld a, [hld]
 	add a
 	ld b, a
-	ld [CurDamage + 1], a
+	ld [wCurDamage + 1], a
 	ld a, [hl]
 	rl a
-	ld [CurDamage], a
+	ld [wCurDamage], a
 	jr nc, .not_maxed
 	ld a, $ff
-	ld [CurDamage], a
-	ld [CurDamage + 1], a
+	ld [wCurDamage], a
+	ld [wCurDamage + 1], a
 .not_maxed
 	or b
 	jr nz, .built_up_something
 	ld a, 1
-	ld [AttackMissed], a
+	ld [wAttackMissed], a
 .built_up_something
 	xor a
 	ld [hli], a
@@ -75,13 +75,13 @@ BattleCommand_StoreEnergy: ; 36671
 BattleCommand_UnleashEnergy: ; 366e5
 ; unleashenergy
 
-	ld de, PlayerDamageTaken
-	ld bc, PlayerRolloutCount
+	ld de, wPlayerDamageTaken
+	ld bc, wPlayerRolloutCount
 	ld a, [hBattleTurn]
 	and a
 	jr z, .got_damage
-	ld de, EnemyDamageTaken
-	ld bc, EnemyRolloutCount
+	ld de, wEnemyDamageTaken
+	ld bc, wEnemyRolloutCount
 .got_damage
 	ld a, BATTLE_VARS_SUBSTATUS3
 	call GetBattleVarAddr