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

@@ -53,7 +53,7 @@ GetPlayerBackpicCoords: ; fbd9d (3e:7d9d)
 DoWeatherModifiers: ; fbda4
 
 	ld de, WeatherTypeModifiers
-	ld a, [Weather]
+	ld a, [wBattleWeather]
 	ld b, a
 	ld a, [wd265] ; move type
 	ld c, a
@@ -105,7 +105,7 @@ DoWeatherModifiers: ; fbda4
 .ApplyModifier:
 	xor a
 	ld [hMultiplicand + 0], a
-	ld hl, CurDamage
+	ld hl, wCurDamage
 	ld a, [hli]
 	ld [hMultiplicand + 1], a
 	ld a, [hl]
@@ -138,9 +138,9 @@ DoWeatherModifiers: ; fbda4
 
 .Update:
 	ld a, b
-	ld [CurDamage], a
+	ld [wCurDamage], a
 	ld a, c
-	ld [CurDamage + 1], a
+	ld [wCurDamage + 1], a
 
 .done
 	ret
@@ -153,7 +153,7 @@ DoBadgeTypeBoosts: ; fbe24
 	and a
 	ret nz
 
-	ld a, [InBattleTowerBattle]
+	ld a, [wInBattleTowerBattle]
 	and a
 	ret nz
 
@@ -189,10 +189,10 @@ DoBadgeTypeBoosts: ; fbe24
 	jr .CheckBadge
 
 .ApplyBoost:
-	ld a, [CurDamage]
+	ld a, [wCurDamage]
 	ld h, a
 	ld d, a
-	ld a, [CurDamage + 1]
+	ld a, [wCurDamage + 1]
 	ld l, a
 	ld e, a
 
@@ -216,9 +216,9 @@ DoBadgeTypeBoosts: ; fbe24
 
 .Update:
 	ld a, h
-	ld [CurDamage], a
+	ld [wCurDamage], a
 	ld a, l
-	ld [CurDamage + 1], a
+	ld [wCurDamage + 1], a
 
 .done
 	pop bc