text macros in text/

4 files changed, 144 insertions, 104 deletions

diff --git a/text/mapBluesHouse.asm b/text/mapBluesHouse.asm
index d2bb54de..0d94460b 100644
--- a/text/mapBluesHouse.asm
+++ b/text/mapBluesHouse.asm
@@ -1,34 +1,42 @@
 _DaisyInitialText:
-	db 0,"Hi ",$52,"!",$4F
-	db $53," is out at",$55
-	db "Grandpa's lab.",$57
+	text "Hi ",$52,"!"
+	line $53," is out at"
+	next "Grandpa's lab."
+	done
 
 _DaisyOfferMapText:
-	db 0,"Grandpa asked you",$4F
-	db "to run an errand?",$55
-	db "Here, this will",$55
-	db "help you!",$58
+	text "Grandpa asked you"
+	line "to run an errand?"
+	next "Here, this will"
+	next "help you!"
+	prompt
 
 _GotMapText:
-	db 0,$52," got a",$4F,"@",1
-	dw $CF4B
-	db 0,"!@@"
+	text $52," got a"
+	line "@"
+	TX_RAM $CF4B
+	text "!@@"
 
 _DaisyBagFullText:
-	db 0,"You have too much",$4F
-	db "stuff with you.",$57
+	text "You have too much"
+	line "stuff with you."
+	done
 
 _DaisyUseMapText:
-	db 0,"Use the TOWN MAP",$4F
-	db "to find out where",$55
-	db "you are.",$57
+	text "Use the TOWN MAP"
+	line "to find out where"
+	next "you are."
+	done
 
 _BluesHouseText2:
-	db 0,"#MON are living",$4F
-	db "things! If they",$55
-	db "get tired, give",$55
-	db "them a rest!",$57
+	text "#MON are living"
+	line "things! If they"
+	next "get tired, give"
+	next "them a rest!"
+	done
 
 _BluesHouseText3:
-	db 0,"It's a big map!",$4F
-	db "This is useful!",$57
+	text "It's a big map!"
+	line "This is useful!"
+	done
+
diff --git a/text/mapPalletTown.asm b/text/mapPalletTown.asm
index 6ed9b755..06f4e379 100644
--- a/text/mapPalletTown.asm
+++ b/text/mapPalletTown.asm
@@ -1,44 +1,56 @@
 _OakAppearsText:
-	db 0,"OAK: Hey! Wait!",$4F
-	db "Don't go out!@@"
+	text "OAK: Hey! Wait!"
+	line "Don't go out!@@"
 
 _OakWalksUpText:
-	db 0,"OAK: It's unsafe!",$4F
-	db "Wild #MON live",$55
-	db "in tall grass!",$51
-	db "You need your own",$4F
-	db "#MON for your",$55
-	db "protection.",$55
-	db "I know!",$51
-	db "Here, come with",$4F
-	db "me!",$57
+	text "OAK: It's unsafe!"
+	line "Wild #MON live"
+	next "in tall grass!"
+
+	page "You need your own"
+	line "#MON for your"
+	next "protection."
+	next "I know!"
+
+	page "Here, come with"
+	line "me!"
+	done
 
 _PalletTownText2:
-	db 0,"I",$E5," raising",$4F
-	db "#MON too!",$51
-	db "When they get",$4F
-	db "strong, they can",$55
-	db "protect me!",$57
+	text "I'm raising"
+	line "#MON too!"
+
+	page "When they get"
+	line "strong, they can"
+	next "protect me!"
+	done
 
 _PalletTownText3:
-	db 0,"Technology is",$4F
-	db "incredible!",$51
-	db "You can now store",$4F
-	db "and recall items",$55
-	db "and #MON as",$55
-	db "data via PC!",$57
+	text "Technology is"
+	line "incredible!"
+
+	page "You can now store"
+	line "and recall items"
+	next "and #MON as"
+	next "data via PC!"
+	done
 
 _PalletTownText4:
-	db 0,"OAK #MON",$4F
-	db "RESEARCH LAB",$57
+	text "OAK #MON"
+	line "RESEARCH LAB"
+	done
 
 _PalletTownText5:
-	db 0,"PALLET TOWN",$4F
-	db "Shades of your",$55
-	db "journey await!",$57
+	text "PALLET TOWN"
+	line "Shades of your"
+	next "journey await!"
+	done
 
 _PalletTownText6:
-	db 0,$52,"'s house ",$57
+	text $52,"'s house "
+	done
 
 _PalletTownText7:
-	db 0,$53,"'s house ",$57
+	text $53,"'s house "
+	done
+
diff --git a/text/mapRedsHouse1F.asm b/text/mapRedsHouse1F.asm
index 69bed285..77bec0db 100644
--- a/text/mapRedsHouse1F.asm
+++ b/text/mapRedsHouse1F.asm
@@ -1,30 +1,38 @@
 _MomWakeUpText:
-	db 0,"MOM: Right.",$4F
-	db "All boys leave",$55
-	db "home some day.",$55
-	db "It said so on TV.",$51
-	db "PROF.OAK, next",$4F
-	db "door, is looking",$55
-	db "for you.",$57
+	text "MOM: Right."
+	line "All boys leave"
+	next "home some day."
+	next "It said so on TV."
+
+	page "PROF.OAK, next"
+	line "door, is looking"
+	next "for you."
+	done
 
 _MomHealText1:
-	db 0,"MOM: ",$52,"!",$4F
-	db "You should take a",$55
-	db "quick rest.",$58
+	text "MOM: ",$52,"!"
+	line "You should take a"
+	next "quick rest."
+	prompt
 
 _MomHealText2:
-	db 0,"MOM: Oh good!",$4F
-	db "You and your",$55
-	db "#MON are",$55
-	db "looking great!",$55
-	db "Take care now!",$57
+	text "MOM: Oh good!"
+	line "You and your"
+	next "#MON are"
+	next "looking great!"
+	next "Take care now!"
+	done
 
 _StandByMeText:
-	db 0,"There's a movie",$4F
-	db "on TV. Four boys",$55
-	db "are walking on",$55
-	db "railroad tracks.",$51
-	db "I better go too.",$57
+	text "There's a movie"
+	line "on TV. Four boys"
+	next "are walking on"
+	next "railroad tracks."
+
+	page "I better go too."
+	done
 
 _TVWrongSideText:
-	db 0,"Oops, wrong side.",$57
+	text "Oops, wrong side."
+	done
+
diff --git a/text/oakspeech.asm b/text/oakspeech.asm
index f6b8e530..8494e61a 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
+	text "Hello there!"
+	line "Welcome to the"
+	next "world of #MON!"
+
+	page "My name is OAK!"
+	line "People call me"
+	next "the #MON PROF!"
+	prompt
 
 _OakSpeechText2A:
-	db 0,"This world is",$4F
-	db "inhabited by",$55
-	db "creatures called",$55
-	db "#MON!@@"
+	text "This world is"
+	line "inhabited by"
+	next "creatures called"
+	next "#MON!@@"
 
 _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
+	text $51,"For some people,"
+	line "#MON are"
+	next "pets. Others use"
+	next "them for fights."
+
+	page "Myself..."
+
+	page "I study #MON"
+	line "as a profession."
+	prompt
 
 _IntroducePlayerText:
-	db 0,"First, what is",$4F
-	db "your name?",$58
+	text "First, what is"
+	line "your name?"
+	prompt
 
 _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
+	text "This is my grand-"
+	line "son. He's been"
+	next "your rival since"
+	next "you were a baby."
+
+	page "...Erm, what is"
+	line "his name again?"
+	prompt
 
 _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
+	text $52,"!"
+
+	page "Your very own"
+	line "#MON legend is"
+	next "about to unfold!"
+
+	page "A world of dreams"
+	line "and adventures"
+	next "with #MON"
+	next "awaits! Let's go!"
+	done
+