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

data/phone/text/bill.asm

@@ -44,7 +44,7 @@ BillPhoneNotFullText: ; 0x1b452a
 
 	para "<PLAY_G>, your BOX"
 	line "has room for @"
-	text_from_ram StringBuffer3
+	text_from_ram wStringBuffer3
 	text_start
 	cont "more #MON."
 
@@ -59,7 +59,7 @@ BillPhoneNearlyFullText: ; 0x1b4587
 	para "<PLAY_G>, your BOX"
 	line "has room for only"
 	cont "@"
-	text_from_ram StringBuffer3
+	text_from_ram wStringBuffer3
 	text " more #MON."
 
 	para "Maybe you should"

data/phone/text/gaven_overworld.asm

@@ -12,7 +12,7 @@ GavenAskNumber1Text:
 	line "again when I heal"
 
 	para "@"
-	text_from_ram StringBuffer4
+	text_from_ram wStringBuffer4
 	text " and the"
 	line "rest of my team."
 	done
@@ -25,7 +25,7 @@ GavenAskNumber2Text:
 	line "again when I heal"
 
 	para "@"
-	text_from_ram StringBuffer4
+	text_from_ram wStringBuffer4
 	text " and the"
 	line "rest of my team."
 	done

data/phone/text/jose_overworld.asm

@@ -1,6 +1,6 @@
 JoseAskNumber1Text:
 	text "If my @"
-	text_from_ram StringBuffer4
+	text_from_ram wStringBuffer4
 	text_start
 	line "sees anything"
 

data/phone/text/mom.asm

@@ -8,12 +8,12 @@ MomPhoneGreetingText: ; 0x1b4000
 MomPhoneLandmarkText: ; 0x1b4021
 	text "Oh, so you're in"
 	line "@"
-	text_from_ram StringBuffer3
+	text_from_ram wStringBuffer3
 	text "…"
 
 	para "Isn't that where"
 	line "@"
-	text_from_ram StringBuffer4
+	text_from_ram wStringBuffer4
 	text_start
 	para "is? Did you go"
 	line "take a look?"
@@ -22,7 +22,7 @@ MomPhoneLandmarkText: ; 0x1b4021
 MomPhoneGenericAreaText: ; 0x1b406b
 	text "Really, you're in"
 	line "@"
-	text_from_ram StringBuffer3
+	text_from_ram wStringBuffer3
 	text "?"
 
 	para "I've never gone"
@@ -33,7 +33,7 @@ MomPhoneGenericAreaText: ; 0x1b406b
 MomPhoneNewBarkText: ; 0x1b40b1
 	text "What? You're in"
 	line "@"
-	text_from_ram StringBuffer3
+	text_from_ram wStringBuffer3
 	text "?"
 
 	para "Come see your MOM"
@@ -43,7 +43,7 @@ MomPhoneNewBarkText: ; 0x1b40b1
 MomPhoneCherrygroveText: ; 0x1b40e4
 	text "You're visiting"
 	line "@"
-	text_from_ram StringBuffer3
+	text_from_ram wStringBuffer3
 	text "?"
 
 	para "How about coming"
@@ -53,7 +53,7 @@ MomPhoneCherrygroveText: ; 0x1b40e4
 MomOtherAreaText: ; 0x1b411c
 	text "Wow, you're in"
 	line "@"
-	text_from_ram StringBuffer3
+	text_from_ram wStringBuffer3
 	text "?"
 
 	para "Good luck on your"
@@ -74,7 +74,7 @@ MomDeterminedText: ; 0x1b4150
 MomCheckBalanceText: ; 0x1b41a7
 	text "By the way, you've"
 	line "saved up ¥@"
-	text_from_ram StringBuffer3
+	text_from_ram wStringBuffer3
 	text "."
 
 	para "Do you want to"
@@ -97,7 +97,7 @@ MomYoureNotSavingText: ; 0x1b420d
 MomYouveSavedText: ; 0x1b4249
 	text "By the way, you've"
 	line "saved up ¥@"
-	text_from_ram StringBuffer3
+	text_from_ram wStringBuffer3
 	text "."
 
 	para "Want to start"