rename and add some text macros

cont replaces next, and next becomes a generic newline.
para replaces page (now used for pokedex entries).
dex ends a pokedex entry.

4 files changed, 45 insertions, 45 deletions

diff --git a/text/mapBluesHouse.asm b/text/mapBluesHouse.asm
index 0d94460b..33fd732f 100644
--- a/text/mapBluesHouse.asm
+++ b/text/mapBluesHouse.asm
@@ -1,14 +1,14 @@
 _DaisyInitialText:
 	text "Hi ",$52,"!"
 	line $53," is out at"
-	next "Grandpa's lab."
+	cont "Grandpa's lab."
 	done
 
 _DaisyOfferMapText:
 	text "Grandpa asked you"
 	line "to run an errand?"
-	next "Here, this will"
-	next "help you!"
+	cont "Here, this will"
+	cont "help you!"
 	prompt
 
 _GotMapText:
@@ -25,14 +25,14 @@ _DaisyBagFullText:
 _DaisyUseMapText:
 	text "Use the TOWN MAP"
 	line "to find out where"
-	next "you are."
+	cont "you are."
 	done
 
 _BluesHouseText2:
 	text "#MON are living"
 	line "things! If they"
-	next "get tired, give"
-	next "them a rest!"
+	cont "get tired, give"
+	cont "them a rest!"
 	done
 
 _BluesHouseText3:
diff --git a/text/mapPalletTown.asm b/text/mapPalletTown.asm
index 06f4e379..421959d6 100644
--- a/text/mapPalletTown.asm
+++ b/text/mapPalletTown.asm
@@ -5,14 +5,14 @@ _OakAppearsText:
 _OakWalksUpText:
 	text "OAK: It's unsafe!"
 	line "Wild #MON live"
-	next "in tall grass!"
+	cont "in tall grass!"
 
-	page "You need your own"
+	para "You need your own"
 	line "#MON for your"
-	next "protection."
-	next "I know!"
+	cont "protection."
+	cont "I know!"
 
-	page "Here, come with"
+	para "Here, come with"
 	line "me!"
 	done
 
@@ -20,19 +20,19 @@ _PalletTownText2:
 	text "I'm raising"
 	line "#MON too!"
 
-	page "When they get"
+	para "When they get"
 	line "strong, they can"
-	next "protect me!"
+	cont "protect me!"
 	done
 
 _PalletTownText3:
 	text "Technology is"
 	line "incredible!"
 
-	page "You can now store"
+	para "You can now store"
 	line "and recall items"
-	next "and #MON as"
-	next "data via PC!"
+	cont "and #MON as"
+	cont "data via PC!"
 	done
 
 _PalletTownText4:
@@ -43,7 +43,7 @@ _PalletTownText4:
 _PalletTownText5:
 	text "PALLET TOWN"
 	line "Shades of your"
-	next "journey await!"
+	cont "journey await!"
 	done
 
 _PalletTownText6:
diff --git a/text/mapRedsHouse1F.asm b/text/mapRedsHouse1F.asm
index 77bec0db..4154558e 100644
--- a/text/mapRedsHouse1F.asm
+++ b/text/mapRedsHouse1F.asm
@@ -1,35 +1,35 @@
 _MomWakeUpText:
 	text "MOM: Right."
 	line "All boys leave"
-	next "home some day."
-	next "It said so on TV."
+	cont "home some day."
+	cont "It said so on TV."
 
-	page "PROF.OAK, next"
+	para "PROF.OAK, next"
 	line "door, is looking"
-	next "for you."
+	cont "for you."
 	done
 
 _MomHealText1:
 	text "MOM: ",$52,"!"
 	line "You should take a"
-	next "quick rest."
+	cont "quick rest."
 	prompt
 
 _MomHealText2:
 	text "MOM: Oh good!"
 	line "You and your"
-	next "#MON are"
-	next "looking great!"
-	next "Take care now!"
+	cont "#MON are"
+	cont "looking great!"
+	cont "Take care now!"
 	done
 
 _StandByMeText:
 	text "There's a movie"
 	line "on TV. Four boys"
-	next "are walking on"
-	next "railroad tracks."
+	cont "are walking on"
+	cont "railroad tracks."
 
-	page "I better go too."
+	para "I better go too."
 	done
 
 _TVWrongSideText:
diff --git a/text/oakspeech.asm b/text/oakspeech.asm
index 8494e61a..a5851730 100644
--- a/text/oakspeech.asm
+++ b/text/oakspeech.asm
@@ -1,28 +1,28 @@
 _OakSpeechText1:
 	text "Hello there!"
 	line "Welcome to the"
-	next "world of #MON!"
+	cont "world of #MON!"
 
-	page "My name is OAK!"
+	para "My name is OAK!"
 	line "People call me"
-	next "the #MON PROF!"
+	cont "the #MON PROF!"
 	prompt
 
 _OakSpeechText2A:
 	text "This world is"
 	line "inhabited by"
-	next "creatures called"
-	next "#MON!@@"
+	cont "creatures called"
+	cont "#MON!@@"
 
 _OakSpeechText2B:
 	text $51,"For some people,"
 	line "#MON are"
-	next "pets. Others use"
-	next "them for fights."
+	cont "pets. Others use"
+	cont "them for fights."
 
-	page "Myself..."
+	para "Myself..."
 
-	page "I study #MON"
+	para "I study #MON"
 	line "as a profession."
 	prompt
 
@@ -34,23 +34,23 @@ _IntroducePlayerText:
 _IntroduceRivalText:
 	text "This is my grand-"
 	line "son. He's been"
-	next "your rival since"
-	next "you were a baby."
+	cont "your rival since"
+	cont "you were a baby."
 
-	page "...Erm, what is"
+	para "...Erm, what is"
 	line "his name again?"
 	prompt
 
 _OakSpeechText3:
 	text $52,"!"
 
-	page "Your very own"
+	para "Your very own"
 	line "#MON legend is"
-	next "about to unfold!"
+	cont "about to unfold!"
 
-	page "A world of dreams"
+	para "A world of dreams"
 	line "and adventures"
-	next "with #MON"
-	next "awaits! Let's go!"
+	cont "with #MON"
+	cont "awaits! Let's go!"
 	done