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/bug_contest/contest_2.asm

@@ -78,12 +78,12 @@ CheckBugContestContestantFlag: ; 139ed
 INCLUDE "data/events/bug_contest_flags.asm"
 
 ContestDropOffMons: ; 13a12
-	ld hl, PartyMon1HP
+	ld hl, wPartyMon1HP
 	ld a, [hli]
 	or [hl]
 	jr z, .fainted
 ; Mask the rest of your party by setting the count to 1...
-	ld hl, PartyCount
+	ld hl, wPartyCount
 	ld a, 1
 	ld [hli], a
 	inc hl
@@ -93,18 +93,18 @@ ContestDropOffMons: ; 13a12
 ; ... and replacing it with the terminator byte
 	ld [hl], -1
 	xor a
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 
 .fainted
 	ld a, $1
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 ; 13a31
 
 ContestReturnMons: ; 13a31
 ; Restore the species of the second mon.
-	ld hl, PartySpecies + 1
+	ld hl, wPartySpecies + 1
 	ld a, [wBugContestSecondPartySpecies]
 	ld [hl], a
 ; Restore the party count, which must be recomputed.
@@ -118,6 +118,6 @@ ContestReturnMons: ; 13a31
 
 .done
 	ld a, b
-	ld [PartyCount], a
+	ld [wPartyCount], a
 	ret
 ; 13a47