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

4 files changed, 22 insertions, 22 deletions

diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm
index 5d423f466..4bad01829 100644
--- a/engine/events/bug_contest/caught_mon.asm
+++ b/engine/events/bug_contest/caught_mon.asm
@@ -11,7 +11,7 @@ BugContest_SetCaughtContestMon: ; e6ce
 
 .firstcatch
 	call .generatestats
-	ld a, [TempEnemyMonSpecies]
+	ld a, [wTempEnemyMonSpecies]
 	ld [wd265], a
 	call GetPokemonName
 	ld hl, .caughttext
@@ -19,16 +19,16 @@ BugContest_SetCaughtContestMon: ; e6ce
 	ret
 
 .generatestats ; e6fd
-	ld a, [TempEnemyMonSpecies]
-	ld [CurSpecies], a
-	ld [CurPartySpecies], a
+	ld a, [wTempEnemyMonSpecies]
+	ld [wCurSpecies], a
+	ld [wCurPartySpecies], a
 	call GetBaseData
 	xor a
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, wContestMon
 	call ByteFill
 	xor a
-	ld [MonType], a
+	ld [wMonType], a
 	ld hl, wContestMon
 	jp GeneratePartyMonStats
 
diff --git a/engine/events/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm
index fdc8e7586..3e3b16b21 100755
--- a/engine/events/bug_contest/contest_2.asm
+++ b/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
diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm
index 92b89a38f..13b90d0a3 100644
--- a/engine/events/bug_contest/display_stats.asm
+++ b/engine/events/bug_contest/display_stats.asm
@@ -4,7 +4,7 @@ DisplayCaughtContestMonStats: ; cc000
 	call ClearSprites
 	call LoadFontsBattleExtra
 
-	ld hl, Options
+	ld hl, wOptions
 	ld a, [hl]
 	push af
 	set 4, [hl]
@@ -38,24 +38,24 @@ DisplayCaughtContestMonStats: ; cc000
 	ld a, [wContestMon]
 	ld [wd265], a
 	call GetPokemonName
-	ld de, StringBuffer1
+	ld de, wStringBuffer1
 	hlcoord 1, 2
 	call PlaceString
 
 	ld h, b
 	ld l, c
 	ld a, [wContestMonLevel]
-	ld [TempMonLevel], a
+	ld [wTempMonLevel], a
 	call PrintLevel
 
-	ld de, EnemyMonNick
+	ld de, wEnemyMonNick
 	hlcoord 1, 8
 	call PlaceString
 
 	ld h, b
 	ld l, c
-	ld a, [EnemyMonLevel]
-	ld [TempMonLevel], a
+	ld a, [wEnemyMonLevel]
+	ld [wTempMonLevel], a
 	call PrintLevel
 
 	hlcoord 11, 4
@@ -64,14 +64,14 @@ DisplayCaughtContestMonStats: ; cc000
 	call PrintNum
 
 	hlcoord 11, 10
-	ld de, EnemyMonMaxHP
+	ld de, wEnemyMonMaxHP
 	call PrintNum
 
 	ld hl, SwitchMonText
 	call PrintText
 
 	pop af
-	ld [Options], a
+	ld [wOptions], a
 
 	call WaitBGMap
 	ld b, SCGB_DIPLOMA
diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm
index d8e46100b..a338e83ec 100755
--- a/engine/events/bug_contest/judging.asm
+++ b/engine/events/bug_contest/judging.asm
@@ -97,7 +97,7 @@ LoadContestantName: ; 13730
 	push bc
 ; Get the Trainer Class name and copy it into wBugContestWinnerName.
 	callfar GetTrainerClassName
-	ld hl, StringBuffer1
+	ld hl, wStringBuffer1
 	ld de, wBugContestWinnerName
 	ld bc, TRAINER_CLASS_NAME_LENGTH
 	call CopyBytes
@@ -121,13 +121,13 @@ LoadContestantName: ; 13730
 	ld b, a
 	callfar GetTrainerName
 ; Append the name to wBugContestWinnerName.
-	ld hl, StringBuffer1
+	ld hl, wStringBuffer1
 	pop de
 	ld bc, NAME_LENGTH - 1
 	jp CopyBytes
 
 .player
-	ld hl, PlayerName
+	ld hl, wPlayerName
 	ld de, wBugContestWinnerName
 	ld bc, NAME_LENGTH
 	jp CopyBytes