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

diff --git a/engine/overworld.asm b/engine/overworld.asm
index 88356877c..be8fa44af 100755
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -9,9 +9,9 @@ GetEmote2bpp: ; 1412a
 
 _ReplaceKrisSprite:: ; 14135
 	call GetPlayerSprite
-	ld a, [UsedSprites]
+	ld a, [wUsedSprites]
 	ld [hUsedSpriteIndex], a
-	ld a, [UsedSprites + 1]
+	ld a, [wUsedSprites + 1]
 	ld [hUsedSpriteTile], a
 	call GetUsedSprite
 	ret
@@ -49,8 +49,8 @@ RefreshSprites:: ; 14168
 
 .Refresh: ; 1416f
 	xor a
-	ld bc, UsedSpritesEnd - UsedSprites
-	ld hl, UsedSprites
+	ld bc, wUsedSpritesEnd - wUsedSprites
+	ld hl, wUsedSprites
 	call ByteFill
 	call GetPlayerSprite
 	call AddMapSprites
@@ -70,7 +70,7 @@ GetPlayerSprite: ; 14183
 	ld hl, KrisStateSprites
 
 .go
-	ld a, [PlayerState]
+	ld a, [wPlayerState]
 	ld c, a
 .loop
 	ld a, [hli]
@@ -82,7 +82,7 @@ GetPlayerSprite: ; 14183
 
 ; Any player state not in the array defaults to Chris's sprite.
 	xor a ; ld a, PLAYER_NORMAL
-	ld [PlayerState], a
+	ld [wPlayerState], a
 	ld a, SPRITE_CHRIS
 	jr .finish
 
@@ -90,9 +90,9 @@ GetPlayerSprite: ; 14183
 	ld a, [hl]
 
 .finish
-	ld [UsedSprites + 0], a
-	ld [PlayerSprite], a
-	ld [PlayerObjectSprite], a
+	ld [wUsedSprites + 0], a
+	ld [wPlayerSprite], a
+	ld [wPlayerObjectSprite], a
 	ret
 
 INCLUDE "data/sprites/player_sprites.asm"
@@ -112,7 +112,7 @@ AddMapSprites: ; 141c9
 
 
 AddIndoorSprites: ; 141d9
-	ld hl, Map1ObjectSprite
+	ld hl, wMap1ObjectSprite
 	ld a, 1
 .loop
 	push af
@@ -129,7 +129,7 @@ AddIndoorSprites: ; 141d9
 
 
 AddOutdoorSprites: ; 141ee
-	ld a, [MapGroup]
+	ld a, [wMapGroup]
 	dec a
 	ld c, a
 	ld b, 0
@@ -263,7 +263,7 @@ GetMonSprite: ; 14259
 	sub SPRITE_VARS
 	ld e, a
 	ld d, 0
-	ld hl, VariableSprites
+	ld hl, wVariableSprites
 	add hl, de
 	ld a, [hl]
 	and a
@@ -342,7 +342,7 @@ AddSpriteGFX: ; 142e5
 	push hl
 	push bc
 	ld b, a
-	ld hl, UsedSprites + 2
+	ld hl, wUsedSprites + 2
 	ld c, SPRITE_GFX_LIST_CAPACITY - 1
 .loop
 	ld a, [hl]
@@ -379,7 +379,7 @@ LoadSpriteGFX: ; 14306
 ; Bug: b is not preserved, so it's useless as a next count.
 ; Uncomment the lines below to fix.
 
-	ld hl, UsedSprites
+	ld hl, wUsedSprites
 	ld b, SPRITE_GFX_LIST_CAPACITY
 .loop
 	ld a, [hli]
@@ -407,10 +407,10 @@ LoadSpriteGFX: ; 14306
 SortUsedSprites: ; 1431e
 ; Bubble-sort sprites by type.
 
-; Run backwards through UsedSprites to find the last one.
+; Run backwards through wUsedSprites to find the last one.
 
 	ld c, SPRITE_GFX_LIST_CAPACITY
-	ld de, UsedSprites + (SPRITE_GFX_LIST_CAPACITY - 1) * 2
+	ld de, wUsedSprites + (SPRITE_GFX_LIST_CAPACITY - 1) * 2
 .FindLastSprite:
 	ld a, [de]
 	and a
@@ -427,7 +427,7 @@ SortUsedSprites: ; 1431e
 ; higher than a later one, swap them.
 
 	inc de
-	ld hl, UsedSprites + 1
+	ld hl, wUsedSprites + 1
 
 .CheckSprite:
 	push bc
@@ -480,7 +480,7 @@ ArrangeUsedSprites: ; 14355
 ; Get the length of each sprite and space them out in VRAM.
 ; Crystal introduces a second table in VRAM bank 0.
 
-	ld hl, UsedSprites
+	ld hl, wUsedSprites
 	ld c, SPRITE_GFX_LIST_CAPACITY
 	ld b, 0
 .FirstTableLength:
@@ -560,7 +560,7 @@ GetSpriteLength: ; 14386
 
 
 GetUsedSprites: ; 1439b
-	ld hl, UsedSprites
+	ld hl, wUsedSprites
 	ld c, SPRITE_GFX_LIST_CAPACITY
 
 .loop