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

1 files changed, 16 insertions, 16 deletions

diff --git a/engine/routines/correcterrorsinplayerparty.asm b/engine/routines/correcterrorsinplayerparty.asm
index 42e550900..5f2bba6bc 100644
--- a/engine/routines/correcterrorsinplayerparty.asm
+++ b/engine/routines/correcterrorsinplayerparty.asm
@@ -1,5 +1,5 @@
 Unreferenced_CorrectErrorsInPlayerParty:
-	ld hl, PartyCount
+	ld hl, wPartyCount
 	ld a, [hl]
 	and a
 	ret z
@@ -27,7 +27,7 @@ Unreferenced_CorrectErrorsInPlayerParty:
 	push hl
 	push bc
 	ld a, c
-	ld hl, PartyMon1Species
+	ld hl, wPartyMon1Species
 	call GetPartyLocation
 	ld [hl], SMEARGLE
 	pop bc
@@ -40,8 +40,8 @@ Unreferenced_CorrectErrorsInPlayerParty:
 	jr nz, .loop1
 	ld [hl], $ff
 
-	ld hl, PartyMon1
-	ld a, [PartyCount]
+	ld hl, wPartyMon1
+	ld a, [wPartyCount]
 	ld d, a
 	ld e, 0
 .loop2
@@ -59,14 +59,14 @@ Unreferenced_CorrectErrorsInPlayerParty:
 	ld [hl], SMEARGLE
 	push de
 	ld d, 0
-	ld hl, PartySpecies
+	ld hl, wPartySpecies
 	add hl, de
 	pop de
 	ld a, SMEARGLE
 	ld [hl], a
 
 .check_level
-	ld [CurSpecies], a
+	ld [wCurSpecies], a
 	call GetBaseData
 	ld hl, MON_LEVEL
 	add hl, bc
@@ -81,7 +81,7 @@ Unreferenced_CorrectErrorsInPlayerParty:
 .invalid_level
 	ld [hl], a
 .load_level
-	ld [CurPartyLevel], a
+	ld [wCurPartyLevel], a
 
 	ld hl, MON_MAXHP
 	add hl, bc
@@ -99,8 +99,8 @@ Unreferenced_CorrectErrorsInPlayerParty:
 	dec d
 	jr nz, .loop2
 
-	ld de, PartyMonNicknames
-	ld a, [PartyCount]
+	ld de, wPartyMonNicknames
+	ld a, [wPartyCount]
 	ld b, a
 	ld c, 0
 .loop3
@@ -114,7 +114,7 @@ Unreferenced_CorrectErrorsInPlayerParty:
 
 	push bc
 	push hl
-	ld hl, PartySpecies
+	ld hl, wPartySpecies
 	push bc
 	ld b, 0
 	add hl, bc
@@ -125,7 +125,7 @@ Unreferenced_CorrectErrorsInPlayerParty:
 	jr z, .got_nickname
 	ld [wd265], a
 	call GetPokemonName
-	ld hl, StringBuffer1
+	ld hl, wStringBuffer1
 .got_nickname
 	pop de
 	ld bc, MON_NAME_LENGTH
@@ -137,8 +137,8 @@ Unreferenced_CorrectErrorsInPlayerParty:
 	dec b
 	jr nz, .loop3
 
-	ld de, PartyMonOT
-	ld a, [PartyCount]
+	ld de, wPartyMonOT
+	ld a, [wPartyCount]
 	ld b, a
 	ld c, 0
 .loop4
@@ -150,7 +150,7 @@ Unreferenced_CorrectErrorsInPlayerParty:
 	jr nc, .valid_ot_name
 	ld d, h
 	ld e, l
-	ld hl, PlayerName
+	ld hl, wPlayerName
 	ld bc, NAME_LENGTH
 	call CopyBytes
 .valid_ot_name
@@ -159,8 +159,8 @@ Unreferenced_CorrectErrorsInPlayerParty:
 	dec b
 	jr nz, .loop4
 
-	ld hl, PartyMon1Moves
-	ld a, [PartyCount]
+	ld hl, wPartyMon1Moves
+	ld a, [wPartyCount]
 	ld b, a
 .loop5
 	push hl