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

5 files changed, 47 insertions, 47 deletions

diff --git a/engine/pokedex/newpokedexentry.asm b/engine/pokedex/newpokedexentry.asm
index d6b755200..365cf1b70 100644
--- a/engine/pokedex/newpokedexentry.asm
+++ b/engine/pokedex/newpokedexentry.asm
@@ -42,9 +42,9 @@ NewPokedexEntry: ; fb877
 	call WaitBGMap2
 	farcall GetEnemyMonDVs
 	ld a, [hli]
-	ld [TempMonDVs], a
+	ld [wTempMonDVs], a
 	ld a, [hl]
-	ld [TempMonDVs + 1], a
+	ld [wTempMonDVs + 1], a
 	ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
 	call GetSGBLayout
 	call SetPalettes
diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm
index 00321d07a..2e36175ab 100644
--- a/engine/pokedex/pokedex.asm
+++ b/engine/pokedex/pokedex.asm
@@ -27,14 +27,14 @@ Pokedex: ; 40000
 	push hl
 	ld a, [hSCX]
 	push af
-	ld hl, Options
+	ld hl, wOptions
 	ld a, [hl]
 	push af
 	set NO_TEXT_SCROLL, [hl]
-	ld a, [VramState]
+	ld a, [wVramState]
 	push af
 	xor a
-	ld [VramState], a
+	ld [wVramState], a
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -65,9 +65,9 @@ Pokedex: ; 40000
 	pop af
 	ld [hInMenu], a
 	pop af
-	ld [VramState], a
+	ld [wVramState], a
 	pop af
-	ld [Options], a
+	ld [wOptions], a
 	pop af
 	ld [hSCX], a
 	pop hl
@@ -163,18 +163,18 @@ Pokedex_InitCursorPosition: ; 400b4
 	ret
 
 Pokedex_GetLandmark: ; 400ed
-	ld a, [MapGroup]
+	ld a, [wMapGroup]
 	ld b, a
-	ld a, [MapNumber]
+	ld a, [wMapNumber]
 	ld c, a
 	call GetWorldMapLocation
 
 	cp SPECIAL_MAP
 	jr nz, .load
 
-	ld a, [BackupMapGroup]
+	ld a, [wBackupMapGroup]
 	ld b, a
-	ld a, [BackupMapNumber]
+	ld a, [wBackupMapNumber]
 	ld c, a
 	call GetWorldMapLocation
 
@@ -220,7 +220,7 @@ Pokedex_InitMainScreen: ; 4013c (10:413c)
 	ld [hBGMapMode], a
 	call ClearSprites
 	xor a
-	hlcoord 0, 0, AttrMap
+	hlcoord 0, 0, wAttrMap
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	call ByteFill
 	farcall DrawPokedexListWindow
@@ -249,7 +249,7 @@ Pokedex_InitMainScreen: ; 4013c (10:413c)
 
 	call Pokedex_ResetBGMapMode
 	ld a, -1
-	ld [CurPartySpecies], a
+	ld [wCurPartySpecies], a
 	ld a, SCGB_POKEDEX
 	call Pokedex_GetSGBLayout
 	call Pokedex_UpdateCursorOAM
@@ -342,10 +342,10 @@ Pokedex_InitDexEntryScreen: ; 40217 (10:4217)
 	ld a, $a7
 	ld [hWX], a
 	call Pokedex_GetSelectedMon
-	ld [CurPartySpecies], a
+	ld [wCurPartySpecies], a
 	ld a, SCGB_POKEDEX
 	call Pokedex_GetSGBLayout
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	call PlayMonCry
 	call Pokedex_IncrementDexPointer
 	ret
@@ -372,11 +372,11 @@ Pokedex_UpdateDexEntryScreen: ; 40258 (10:4258)
 	jp hl
 
 .return_to_prev_screen
-	ld a, [LastVolume]
+	ld a, [wLastVolume]
 	and a
 	jr z, .max_volume
 	ld a, $77
-	ld [LastVolume], a
+	ld [wLastVolume], a
 
 .max_volume
 	call MaxVolume
@@ -411,10 +411,10 @@ Pokedex_ReinitDexEntryScreen: ; 402aa (10:42aa)
 	call Pokedex_LoadSelectedMonTiles
 	call WaitBGMap
 	call Pokedex_GetSelectedMon
-	ld [CurPartySpecies], a
+	ld [wCurPartySpecies], a
 	ld a, SCGB_POKEDEX
 	call Pokedex_GetSGBLayout
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	call PlayMonCry
 	ld hl, wJumptableIndex
 	dec [hl]
@@ -460,7 +460,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
 	call Pokedex_LoadSelectedMonTiles
 	call WaitBGMap
 	call Pokedex_GetSelectedMon
-	ld [CurPartySpecies], a
+	ld [wCurPartySpecies], a
 	ld a, SCGB_POKEDEX
 	call Pokedex_GetSGBLayout
 	ret
@@ -720,7 +720,7 @@ Pokedex_InitSearchResultsScreen: ; 4050a (10:450a)
 	xor a
 	ld [hBGMapMode], a
 	xor a
-	hlcoord 0, 0, AttrMap
+	hlcoord 0, 0, wAttrMap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	call Pokedex_SetBGMapMode4
@@ -745,7 +745,7 @@ Pokedex_InitSearchResultsScreen: ; 4050a (10:450a)
 	call Pokedex_PlaceSearchResultsTypeStrings
 	call Pokedex_UpdateSearchResultsCursorOAM
 	ld a, -1
-	ld [CurPartySpecies], a
+	ld [wCurPartySpecies], a
 	ld a, SCGB_POKEDEX
 	call Pokedex_GetSGBLayout
 	call Pokedex_IncrementDexPointer
@@ -1088,8 +1088,8 @@ Pokedex_DrawMainScreenBG: ; 4074c (10:474c)
 	hlcoord 1, 11
 	ld de, String_SEEN
 	call Pokedex_PlaceString
-	ld hl, PokedexSeen
-	ld b, EndPokedexSeen - PokedexSeen
+	ld hl, wPokedexSeen
+	ld b, wEndPokedexSeen - wPokedexSeen
 	call CountSetBits
 	ld de, wd265
 	hlcoord 5, 12
@@ -1098,8 +1098,8 @@ Pokedex_DrawMainScreenBG: ; 4074c (10:474c)
 	hlcoord 1, 14
 	ld de, String_OWN
 	call Pokedex_PlaceString
-	ld hl, PokedexCaught
-	ld b, EndPokedexCaught - PokedexCaught
+	ld hl, wPokedexCaught
+	ld b, wEndPokedexCaught - wPokedexCaught
 	call CountSetBits
 	ld de, wd265
 	hlcoord 5, 15
@@ -1322,7 +1322,7 @@ Pokedex_DrawUnownModeBG: ; 409f1 (10:49f1)
 	ld b, 0
 	ld c, 26
 .loop
-	ld hl, UnownDex
+	ld hl, wUnownDex
 	add hl, de
 	ld a, [hl]
 	and a
@@ -1911,7 +1911,7 @@ Pokedex_SearchForMons: ; 41086
 	and a
 	jr z, .next_mon
 	ld [wd265], a
-	ld [CurSpecies], a
+	ld [wCurSpecies], a
 	call Pokedex_CheckCaught
 	jr z, .next_mon
 	push hl
@@ -1921,10 +1921,10 @@ Pokedex_SearchForMons: ; 41086
 	pop hl
 	ld a, [wDexConvertedMonType]
 	ld b, a
-	ld a, [BaseType1]
+	ld a, [wBaseType1]
 	cp b
 	jr z, .match_found
-	ld a, [BaseType2]
+	ld a, [wBaseType2]
 	cp b
 	jr nz, .next_mon
 
@@ -2117,7 +2117,7 @@ Pokedex_UpdateSearchResultsCursorOAM: ; 41281 (10:5281)
 	db -1
 
 Pokedex_LoadCursorOAM: ; 412f1 (10:52f1)
-	ld de, Sprite01
+	ld de, wVirtualOAMSprite00
 .loop
 	ld a, [hl]
 	cp -1
@@ -2366,9 +2366,9 @@ Pokedex_LoadSelectedMonTiles: ; 4143b
 	call Pokedex_CheckSeen
 	jr z, .QuestionMark
 	ld a, [wFirstUnownSeen]
-	ld [UnownLetter], a
+	ld [wUnownLetter], a
 	ld a, [wd265]
-	ld [CurPartySpecies], a
+	ld [wCurPartySpecies], a
 	call GetBaseData
 	ld de, vTiles2
 	predef GetMonFrontpic
@@ -2511,22 +2511,22 @@ Pokedex_LoadUnownFont: ; 41a2c
 	ret
 
 Pokedex_LoadUnownFrontpicTiles: ; 41a58 (10:5a58)
-	ld a, [UnownLetter]
+	ld a, [wUnownLetter]
 	push af
 	ld a, [wDexCurrentUnownIndex]
 	ld e, a
 	ld d, 0
-	ld hl, UnownDex
+	ld hl, wUnownDex
 	add hl, de
 	ld a, [hl]
-	ld [UnownLetter], a
+	ld [wUnownLetter], a
 	ld a, UNOWN
-	ld [CurPartySpecies], a
+	ld [wCurPartySpecies], a
 	call GetBaseData
 	ld de, vTiles2 tile $00
 	predef GetMonFrontpic
 	pop af
-	ld [UnownLetter], a
+	ld [wUnownLetter], a
 	ret
 
 _NewPokedexEntry: ; 41a7f
@@ -2540,7 +2540,7 @@ _NewPokedexEntry: ; 41a7f
 	call Pokedex_LoadGFX
 	call Pokedex_LoadAnyFootprint
 	ld a, [wd265]
-	ld [CurPartySpecies], a
+	ld [wCurPartySpecies], a
 	call Pokedex_DrawDexEntryScreenBG
 	call Pokedex_DrawFootprint
 	hlcoord 0, 17
@@ -2557,7 +2557,7 @@ _NewPokedexEntry: ; 41a7f
 	predef GetMonFrontpic
 	ld a, SCGB_POKEDEX
 	call Pokedex_GetSGBLayout
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	call PlayMonCry
 	ret
 
diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm
index 4dd608ac0..a467fe02c 100644
--- a/engine/pokedex/pokedex_2.asm
+++ b/engine/pokedex/pokedex_2.asm
@@ -41,7 +41,7 @@ AnimateDexSearchSlowpoke: ; 441cf
 DoDexSearchSlowpokeFrame: ; 44207
 	ld a, [wDexSearchSlowpokeFrame]
 	ld hl, .SlowpokeSpriteData
-	ld de, Sprite01
+	ld de, wVirtualOAMSprite00
 .loop
 	ld a, [hli]
 	cp -1
@@ -107,8 +107,8 @@ DisplayDexEntry: ; 4424d
 	pop bc
 	ret z
 ; Get the height of the Pokemon.
-	ld a, [CurPartySpecies]
-	ld [CurSpecies], a
+	ld a, [wCurPartySpecies]
+	ld [wCurSpecies], a
 	inc hl
 	ld a, b
 	push af
diff --git a/engine/pokedex/pokedex_3.asm b/engine/pokedex/pokedex_3.asm
index dc52f83d3..f5247f2da 100644
--- a/engine/pokedex/pokedex_3.asm
+++ b/engine/pokedex/pokedex_3.asm
@@ -140,7 +140,7 @@ DrawDexEntryScreenRightEdge: ; 1de247
 	ld [hl], $3c
 	xor a
 	ld b, SCREEN_HEIGHT
-	hlcoord 19, 0, AttrMap
+	hlcoord 19, 0, wAttrMap
 	call Bank77_FillColumn
 	call WaitBGMap2
 	pop hl
diff --git a/engine/pokedex/unown_dex.asm b/engine/pokedex/unown_dex.asm
index 40138735d..a35a266b7 100755
--- a/engine/pokedex/unown_dex.asm
+++ b/engine/pokedex/unown_dex.asm
@@ -1,8 +1,8 @@
 UpdateUnownDex: ; fba18
-	ld a, [UnownLetter]
+	ld a, [wUnownLetter]
 	ld c, a
 	ld b, NUM_UNOWN
-	ld hl, UnownDex
+	ld hl, wUnownDex
 .loop
 	ld a, [hli]
 	and a
@@ -27,7 +27,7 @@ PrintUnownWord: ; fba2e (3e:7a2e)
 	ld a, [wDexCurrentUnownIndex]
 	ld e, a
 	ld d, 0
-	ld hl, UnownDex
+	ld hl, wUnownDex
 	add hl, de
 	ld a, [hl]
 	ld e, a