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, 18 insertions, 18 deletions

diff --git a/engine/variables.asm b/engine/variables.asm
index 2897cc986..89026fdba 100755
--- a/engine/variables.asm
+++ b/engine/variables.asm
@@ -29,36 +29,36 @@ _GetVarAction:: ; 80648 (20:4648)
 	ret
 
 .loadstringbuffer2 ; 8066c (20:466c)
-	ld de, StringBuffer2
+	ld de, wStringBuffer2
 	ld [de], a
 	ret
 ; 80671 (20:4671)
 
 .VarActionTable: ; 80671
 ; entries correspond to VAR_* constants
-	; RETVAR_STRBUF2: copy [de] to StringBuffer2
+	; RETVAR_STRBUF2: copy [de] to wStringBuffer2
 	; RETVAR_ADDR_DE: return address in de
 	; RETVAR_EXECUTE: call function
-	dwb StringBuffer2,                  RETVAR_STRBUF2
-	dwb PartyCount,                     RETVAR_STRBUF2
+	dwb wStringBuffer2,                 RETVAR_STRBUF2
+	dwb wPartyCount,                    RETVAR_STRBUF2
 	dwb .BattleResult,                  RETVAR_EXECUTE
-	dwb BattleType,                     RETVAR_ADDR_DE
-	dwb TimeOfDay,                      RETVAR_STRBUF2
+	dwb wBattleType,                    RETVAR_ADDR_DE
+	dwb wTimeOfDay,                     RETVAR_STRBUF2
 	dwb .CountCaughtMons,               RETVAR_EXECUTE
 	dwb .CountSeenMons,                 RETVAR_EXECUTE
 	dwb .CountBadges,                   RETVAR_EXECUTE
-	dwb PlayerState,                    RETVAR_ADDR_DE
+	dwb wPlayerState,                   RETVAR_ADDR_DE
 	dwb .PlayerFacing,                  RETVAR_EXECUTE
 	dwb hHours,                         RETVAR_STRBUF2
 	dwb .DayOfWeek,                     RETVAR_EXECUTE
-	dwb MapGroup,                       RETVAR_STRBUF2
-	dwb MapNumber,                      RETVAR_STRBUF2
+	dwb wMapGroup,                      RETVAR_STRBUF2
+	dwb wMapNumber,                     RETVAR_STRBUF2
 	dwb .UnownCaught,                   RETVAR_EXECUTE
 	dwb wEnvironment,                   RETVAR_STRBUF2
 	dwb .BoxFreeSpace,                  RETVAR_EXECUTE
 	dwb wBugContestMinsRemaining,       RETVAR_STRBUF2
-	dwb XCoord,                         RETVAR_STRBUF2
-	dwb YCoord,                         RETVAR_STRBUF2
+	dwb wXCoord,                        RETVAR_STRBUF2
+	dwb wYCoord,                        RETVAR_STRBUF2
 	dwb wSpecialPhoneCallID,            RETVAR_STRBUF2
 	dwb wNrOfBeatenBattleTowerTrainers, RETVAR_STRBUF2
 	dwb wKurtApricornQuantity,          RETVAR_STRBUF2
@@ -71,8 +71,8 @@ _GetVarAction:: ; 80648 (20:4648)
 
 .CountCaughtMons: ; 806c5
 ; Caught mons.
-	ld hl, PokedexCaught
-	ld b, EndPokedexCaught - PokedexCaught
+	ld hl, wPokedexCaught
+	ld b, wEndPokedexCaught - wPokedexCaught
 	call CountSetBits
 	ld a, [wd265]
 	jp .loadstringbuffer2
@@ -80,8 +80,8 @@ _GetVarAction:: ; 80648 (20:4648)
 
 .CountSeenMons: ; 806d3
 ; Seen mons.
-	ld hl, PokedexSeen
-	ld b, EndPokedexSeen - PokedexSeen
+	ld hl, wPokedexSeen
+	ld b, wEndPokedexSeen - wPokedexSeen
 	call CountSetBits
 	ld a, [wd265]
 	jp .loadstringbuffer2
@@ -89,7 +89,7 @@ _GetVarAction:: ; 80648 (20:4648)
 
 .CountBadges: ; 806e1
 ; Number of owned badges.
-	ld hl, Badges
+	ld hl, wBadges
 	ld b, 2
 	call CountSetBits
 	ld a, [wd265]
@@ -98,7 +98,7 @@ _GetVarAction:: ; 80648 (20:4648)
 
 .PlayerFacing: ; 806ef
 ; The direction the player is facing.
-	ld a, [PlayerDirection]
+	ld a, [wPlayerDirection]
 	and $c
 	rrca
 	rrca
@@ -118,7 +118,7 @@ _GetVarAction:: ; 80648 (20:4648)
 	jp .loadstringbuffer2
 
 .count
-	ld hl, UnownDex
+	ld hl, wUnownDex
 	ld b, 0
 .loop
 	ld a, [hli]