Merge branch 'master' of https://github.com/iimarckus/pokered

Conflicts:
	main.asm

1 files changed, 51 insertions, 39 deletions

diff --git a/text/oakspeech.asm b/text/oakspeech.asm
index f6b8e530..91aaf5c3 100644
--- a/text/oakspeech.asm
+++ b/text/oakspeech.asm
@@ -1,44 +1,56 @@
-_OakSpeechText1:
-	db 0,"Hello there!",$4F
-	db "Welcome to the",$55
-	db "world of #MON!",$51
-	db "My name is OAK!",$4F
-	db "People call me",$55
-	db "the #MON PROF!",$58
+_OakSpeechText1::
+	text "Hello there!"
+	line "Welcome to the"
+	cont "world of #MON!"
 
-_OakSpeechText2A:
-	db 0,"This world is",$4F
-	db "inhabited by",$55
-	db "creatures called",$55
-	db "#MON!@@"
+	para "My name is OAK!"
+	line "People call me"
+	cont "the #MON PROF!"
+	prompt
 
-_OakSpeechText2B:
-	db 0,$51,"For some people,",$4F
-	db "#MON are",$55
-	db "pets. Others use",$55
-	db "them for fights.",$51
-	db "Myself...",$51
-	db "I study #MON",$4F
-	db "as a profession.",$58
+_OakSpeechText2A::
+	text "This world is"
+	line "inhabited by"
+	cont "creatures called"
+	cont "#MON!@@"
 
-_IntroducePlayerText:
-	db 0,"First, what is",$4F
-	db "your name?",$58
+_OakSpeechText2B::
+	text $51,"For some people,"
+	line "#MON are"
+	cont "pets. Others use"
+	cont "them for fights."
 
-_IntroduceRivalText:
-	db 0,"This is my grand-",$4F
-	db "son. He's been",$55
-	db "your rival since",$55
-	db "you were a baby.",$51
-	db "...Erm, what is",$4F
-	db "his name again?",$58
+	para "Myself..."
+
+	para "I study #MON"
+	line "as a profession."
+	prompt
+
+_IntroducePlayerText::
+	text "First, what is"
+	line "your name?"
+	prompt
+
+_IntroduceRivalText::
+	text "This is my grand-"
+	line "son. He's been"
+	cont "your rival since"
+	cont "you were a baby."
+
+	para "...Erm, what is"
+	line "his name again?"
+	prompt
+
+_OakSpeechText3::
+	text $52,"!"
+
+	para "Your very own"
+	line "#MON legend is"
+	cont "about to unfold!"
+
+	para "A world of dreams"
+	line "and adventures"
+	cont "with #MON"
+	cont "awaits! Let's go!"
+	done
 
-_OakSpeechText3:
-	db 0,$52,"!",$51
-	db "Your very own",$4F
-	db "#MON legend is",$55
-	db "about to unfold!",$51
-	db "A world of dreams",$4F
-	db "and adventures",$55
-	db "with #MON",$55
-	db "awaits! Let's go!",$57