merge with newest update

2015-10-26 03:26:53 +01:00
parent 3b9a3cc3be 0d17d4a758
commit 9a9cb38e39
446 changed files with 17108 additions and 16475 deletions
--- a/text/common_4.asm
+++ b/text/common_4.asm
@@ -1464,7 +1464,7 @@ UnknownText_0x1c5c5d: ; 0x1c5c5d
 UnknownText_0x1c5c5e: ; 0x1c5c5e
 	text "You now have"
 	line "@"
-	deciram wdc4b, $12
+	deciram wBlueCardBalance, $12
 	text " points."
 	done
 ; 0x1c5c7b