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

diff --git a/home/map_objects.asm b/home/map_objects.asm
index 44182d422..c99e27088 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -18,7 +18,7 @@ GetSpritePalette:: ; 17ff
 GetSpriteVTile:: ; 180e
 	push hl
 	push bc
-	ld hl, UsedSprites + 2
+	ld hl, wUsedSprites + 2
 	ld c, SPRITE_GFX_LIST_CAPACITY - 1
 	ld b, a
 	ld a, [hMapObjectIndexBuffer]
@@ -32,12 +32,12 @@ GetSpriteVTile:: ; 180e
 	inc hl
 	dec c
 	jr nz, .loop
-	ld a, [UsedSprites + 1]
+	ld a, [wUsedSprites + 1]
 	scf
 	jr .done
 
 .nope
-	ld a, [UsedSprites + 1]
+	ld a, [wUsedSprites + 1]
 	jr .done
 
 .found
@@ -75,14 +75,14 @@ DoesSpriteHaveFacings:: ; 1836
 ; 184a
 
 GetPlayerStandingTile:: ; 184a
-	ld a, [PlayerStandingTile]
+	ld a, [wPlayerStandingTile]
 	call GetTileCollision
 	ld b, a
 	ret
 ; 1852
 
 CheckOnWater:: ; 1852
-	ld a, [PlayerStandingTile]
+	ld a, [wPlayerStandingTile]
 	call GetTileCollision
 	sub WATERTILE
 	ret z
@@ -204,7 +204,7 @@ CheckWaterfallTile:: ; 18bd
 ; 18c3
 
 CheckStandingOnEntrance:: ; 18c3
-	ld a, [PlayerStandingTile]
+	ld a, [wPlayerStandingTile]
 	cp COLL_DOOR
 	ret z
 	cp COLL_DOOR_79
@@ -217,7 +217,7 @@ CheckStandingOnEntrance:: ; 18c3
 
 GetMapObject:: ; 18d2
 ; Return the location of map object a in bc.
-	ld hl, MapObjects
+	ld hl, wMapObjects
 	ld bc, OBJECT_LENGTH
 	call AddNTimes
 	ld b, h
@@ -256,7 +256,7 @@ CheckObjectTime:: ; 18f5
 	cp -1
 	jr z, .timeofday_always
 	ld hl, .TimeOfDayValues_191e
-	ld a, [TimeOfDay]
+	ld a, [wTimeOfDay]
 	add l
 	ld l, a
 	jr nc, .ok
@@ -437,7 +437,7 @@ LoadMovementDataPointer:: ; 19e9
 	add hl, bc
 	ld [hl], STEP_TYPE_00
 
-	ld hl, VramState
+	ld hl, wVramState
 	set 7, [hl]
 	and a
 	ret
@@ -449,7 +449,7 @@ FindFirstEmptyObjectStruct:: ; 1a13
 ; Preserves BC and DE.
 	push bc
 	push de
-	ld hl, ObjectStructs
+	ld hl, wObjectStructs
 	ld de, OBJECT_STRUCT_LENGTH
 	ld c, NUM_OBJECT_STRUCTS
 .loop
@@ -607,19 +607,19 @@ _GetMovementByte:: ; 1aae
 ; 1ac6
 
 SetVramState_Bit0:: ; 1ac6
-	ld hl, VramState
+	ld hl, wVramState
 	set 0, [hl]
 	ret
 ; 1acc
 
 ResetVramState_Bit0:: ; 1acc
-	ld hl, VramState
+	ld hl, wVramState
 	res 0, [hl]
 	ret
 ; 1ad2
 
 UpdateSprites:: ; 1ad2
-	ld a, [VramState]
+	ld a, [wVramState]
 	bit 0, a
 	ret z
 
@@ -630,7 +630,7 @@ UpdateSprites:: ; 1ad2
 
 GetObjectStruct:: ; 1ae5
 	ld bc, OBJECT_STRUCT_LENGTH
-	ld hl, ObjectStructs
+	ld hl, wObjectStructs
 	call AddNTimes
 	ld b, h
 	ld c, l