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

home/text.asm

@@ -22,11 +22,11 @@ FillBoxWithByte::
 
 
 ClearTileMap:: ; fc8
-; Fill TileMap with blank tiles.
+; Fill wTileMap with blank tiles.
 
 	hlcoord 0, 0
 	ld a, " "
-	ld bc, TileMapEnd - TileMap
+	ld bc, wTileMapEnd - wTileMap
 	call ByteFill
 
 	; Update the BG Map.
@@ -39,7 +39,7 @@ ClearTileMap:: ; fc8
 
 ClearScreen:: ; fdb
 	ld a, PAL_BG_TEXT
-	hlcoord 0, 0, AttrMap
+	hlcoord 0, 0, wAttrMap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	jr ClearTileMap
@@ -111,7 +111,7 @@ TextBoxBorder:: ; ff1
 
 TextBoxPalette:: ; 1024
 ; Fill text box width c height b at hl with pal 7
-	ld de, AttrMap - TileMap
+	ld de, wAttrMap - wTileMap
 	add hl, de
 	inc b
 	inc b
@@ -313,11 +313,11 @@ print_name: MACRO
 	jp PlaceCommandCharacter
 ENDM
 
-PrintMomsName:   print_name MomsName   ; 1186
-PrintPlayerName: print_name PlayerName ; 118d
-PrintRivalName:  print_name RivalName  ; 1194
-PrintRedsName:   print_name RedsName   ; 119b
-PrintGreensName: print_name GreensName ; 11a2
+PrintMomsName:   print_name wMomsName   ; 1186
+PrintPlayerName: print_name wPlayerName ; 118d
+PrintRivalName:  print_name wRivalName  ; 1194
+PrintRedsName:   print_name wRedsName   ; 119b
+PrintGreensName: print_name wGreensName ; 11a2
 
 TrainerChar:  print_name TrainerCharText ; 11a9
 TMChar:       print_name TMCharText      ; 11b0
@@ -346,7 +346,7 @@ PlaceMoveUsersName:: ; 1203
 	and a
 	jr nz, .enemy
 
-	ld de, BattleMonNick
+	ld de, wBattleMonNick
 	jr PlaceCommandCharacter
 
 .enemy
@@ -354,7 +354,7 @@ PlaceMoveUsersName:: ; 1203
 	call PlaceString
 	ld h, b
 	ld l, c
-	ld de, EnemyMonNick
+	ld de, wEnemyMonNick
 	jr PlaceCommandCharacter
 
 
@@ -365,13 +365,13 @@ PlaceEnemysName:: ; 121b
 	and a
 	jr nz, .linkbattle
 
-	ld a, [TrainerClass]
+	ld a, [wTrainerClass]
 	cp RIVAL1
 	jr z, .rival
 	cp RIVAL2
 	jr z, .rival
 
-	ld de, OTClassName
+	ld de, wOTClassName
 	call PlaceString
 	ld h, b
 	ld l, c
@@ -380,21 +380,21 @@ PlaceEnemysName:: ; 121b
 	push bc
 	callfar Battle_GetTrainerName
 	pop hl
-	ld de, StringBuffer1
+	ld de, wStringBuffer1
 	jr PlaceCommandCharacter
 
 .rival
-	ld de, RivalName
+	ld de, wRivalName
 	jr PlaceCommandCharacter
 
 .linkbattle
-	ld de, OTClassName
+	ld de, wOTClassName
 	jr PlaceCommandCharacter
 
 
 PlaceGenderedPlayerName:: ; 1252
 	push de
-	ld de, PlayerName
+	ld de, wPlayerName
 	call PlaceString
 	ld h, b
 	ld l, c
@@ -452,7 +452,7 @@ LineBreakChar:: ; 12b0
 TextFar:: ; 12b9
 	pop hl
 	push de
-	ld bc, -TileMap + $10000
+	ld bc, -wTileMap + $10000
 	add hl, bc
 	ld de, -SCREEN_WIDTH
 	ld c, 1
@@ -696,15 +696,15 @@ PokeFluteTerminatorCharacter:: ; 13e0
 
 
 PlaceHLTextAtBC:: ; 13e5
-	ld a, [TextBoxFlags]
+	ld a, [wTextBoxFlags]
 	push af
 	set NO_TEXT_DELAY_F, a
-	ld [TextBoxFlags], a
+	ld [wTextBoxFlags], a
 
 	call DoTextUntilTerminator
 
 	pop af
-	ld [TextBoxFlags], a
+	ld [wTextBoxFlags], a
 	ret
 ; 13f6
 
@@ -1082,13 +1082,13 @@ Text_LINK_WAIT_BUTTON:: ; 1562
 
 Text_TX_STRINGBUFFER:: ; 156a
 ; Print a string from one of the following:
-; 0: StringBuffer3
-; 1: StringBuffer4
-; 2: StringBuffer5
-; 3: StringBuffer2
-; 4: StringBuffer1
-; 5: EnemyMonNick
-; 6: BattleMonNick
+; 0: wStringBuffer3
+; 1: wStringBuffer4
+; 2: wStringBuffer5
+; 3: wStringBuffer2
+; 4: wStringBuffer1
+; 5: wEnemyMonNick
+; 6: wBattleMonNick
 ; [$14][id]
 
 	ld a, [hli]