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

@@ -1,28 +1,28 @@
 BattleCommand_PainSplit: ; 35926
 ; painsplit
 
-	ld a, [AttackMissed]
+	ld a, [wAttackMissed]
 	and a
 	jp nz, .ButItFailed
 	call CheckSubstituteOpp
 	jp nz, .ButItFailed
 	call AnimateCurrentMove
-	ld hl, BattleMonMaxHP + 1
-	ld de, EnemyMonMaxHP + 1
+	ld hl, wBattleMonMaxHP + 1
+	ld de, wEnemyMonMaxHP + 1
 	call .PlayerShareHP
 	ld a, $1
 	ld [wWhichHPBar], a
 	hlcoord 10, 9
 	predef AnimateHPBar
-	ld hl, EnemyMonHP
+	ld hl, wEnemyMonHP
 	ld a, [hli]
-	ld [Buffer4], a
+	ld [wBuffer4], a
 	ld a, [hli]
-	ld [Buffer3], a
+	ld [wBuffer3], a
 	ld a, [hli]
-	ld [Buffer2], a
+	ld [wBuffer2], a
 	ld a, [hl]
-	ld [Buffer1], a
+	ld [wBuffer1], a
 	call .EnemyShareHP
 	xor a
 	ld [wWhichHPBar], a
@@ -36,28 +36,28 @@ BattleCommand_PainSplit: ; 35926
 
 .PlayerShareHP:
 	ld a, [hld]
-	ld [Buffer1], a
+	ld [wBuffer1], a
 	ld a, [hld]
-	ld [Buffer2], a
+	ld [wBuffer2], a
 	ld a, [hld]
 	ld b, a
-	ld [Buffer3], a
+	ld [wBuffer3], a
 	ld a, [hl]
-	ld [Buffer4], a
+	ld [wBuffer4], a
 	dec de
 	dec de
 	ld a, [de]
 	dec de
 	add b
-	ld [CurDamage + 1], a
+	ld [wCurDamage + 1], a
 	ld b, [hl]
 	ld a, [de]
 	adc b
 	srl a
-	ld [CurDamage], a
-	ld a, [CurDamage + 1]
+	ld [wCurDamage], a
+	ld a, [wCurDamage + 1]
 	rr a
-	ld [CurDamage + 1], a
+	ld [wCurDamage + 1], a
 	inc hl
 	inc hl
 	inc hl
@@ -68,25 +68,25 @@ BattleCommand_PainSplit: ; 35926
 .EnemyShareHP: ; 359ac
 	ld c, [hl]
 	dec hl
-	ld a, [CurDamage + 1]
+	ld a, [wCurDamage + 1]
 	sub c
 	ld b, [hl]
 	dec hl
-	ld a, [CurDamage]
+	ld a, [wCurDamage]
 	sbc b
 	jr nc, .skip
 
-	ld a, [CurDamage]
+	ld a, [wCurDamage]
 	ld b, a
-	ld a, [CurDamage + 1]
+	ld a, [wCurDamage + 1]
 	ld c, a
 .skip
 	ld a, c
 	ld [hld], a
-	ld [Buffer5], a
+	ld [wBuffer5], a
 	ld a, b
 	ld [hli], a
-	ld [Buffer6], a
+	ld [wBuffer6], a
 	ret
 
 ; 359cd