Text macros in text/.

2014-03-06 00:45:28 -05:00
parent e703b5ef48
commit fd6cfc73ee
15 changed files with 10740 additions and 7414 deletions
--- a/text/battle.asm
+++ b/text/battle.asm
--- a/text/battle_tower.asm
+++ b/text/battle_tower.asm
--- a/text/buena.asm
+++ b/text/buena.asm
@@ -1,389 +1,551 @@
 UnknownText_0xa0c28: ; 0xa0c28
-	db $0, "Hi, this is BUENA…", $51
+	text "Hi, this is BUENA…"
-	db "Oh! Good morning,", $4f
+
-	db $14, "!", $51
+	para "Oh! Good morning,"
-	db "I'm kind of foggy", $4f
+	line $14, "!"
-	db "in the morning…", $57
+
 	para "I'm kind of foggy"
 	line "in the morning…"
 	done
 ; 0xa0c72
 UnknownText_0xa0c72: ; 0xa0c72
-	db $0, "Hi, this is BUENA…", $4f
+	text "Hi, this is BUENA…"
-	db "Oh! Hi, ", $14, "!", $51
+	line "Oh! Hi, ", $14, "!"
-	db "Do you tune into", $4f
+
-	db "BUENA's show?", $57
+	para "Do you tune into"
 	line "BUENA's show?"
 	done
 ; 0xa0caf
 UnknownText_0xa0caf: ; 0xa0caf
-	db $0, "This is BUENA.", $4f
+	text "This is BUENA."
-	db "I can't come to", $51
+	line "I can't come to"
-	db "the phone right", $4f
+
-	db "now.", $51
+	para "the phone right"
-	db "If you want to", $4f
+	line "now."
-	db "chat, tune into", $51
+
-	db "BUENA's PASSWORD", $4f
+	para "If you want to"
-	db "on the radio and", $51
+	line "chat, tune into"
-	db "give me a call", $4f
+
-	db "after midnight!", $57
+	para "BUENA's PASSWORD"
 	line "on the radio and"
 	para "give me a call"
 	line "after midnight!"
 	done
 ; 0xa0d42
 UnknownText_0xa0d42: ; 0xa0d42
-	db $0, "Hi, this is BUENA…", $4f
+	text "Hi, this is BUENA…"
-	db "Oh! Hi, ", $14, "!", $51
+	line "Oh! Hi, ", $14, "!"
-	db "I just got off", $4f
+
-	db "work. ", $51
+	para "I just got off"
-	db "Let me tell you,", $4f
+	line "work. "
-	db "I'm exhausted!", $57
+
 	para "Let me tell you,"
 	line "I'm exhausted!"
 	done
 ; 0xa0d96
 UnknownText_0xa0d96: ; 0xa0d96
-	db $0, $14, "!", $4f
+	text $14, "!"
-	db "Hi, it's BUENA!", $51
+	line "Hi, it's BUENA!"
-	db "I got up early, so", $4f
+
-	db "I decided to call!", $57
+	para "I got up early, so"
 	line "I decided to call!"
 	done
 ; 0xa0dcf
 UnknownText_0xa0dcf: ; 0xa0dcf
-	db $0, $14, "!", $4f
+	text $14, "!"
-	db "Hi, it's BUENA!", $51
+	line "Hi, it's BUENA!"
-	db "I needed someone", $4f
+
-	db "to chat with!", $57
+	para "I needed someone"
 	line "to chat with!"
 	done
 ; 0xa0e01
 UnknownText_0xa0e01: ; 0xa0e01
-	db $0, $14, "!", $4f
+	text $14, "!"
-	db "Hi, it's BUENA!", $51
+	line "Hi, it's BUENA!"
-	db "I'm just on my", $4f
+
-	db "break.", $57
+	para "I'm just on my"
 	line "break."
 	done
 ; 0xa0e29
 UnknownText_0xa0e29: ; 0xa0e29
-	db $0, $14, "!", $4f
+	text $14, "!"
-	db "Hi, it's BUENA!", $51
+	line "Hi, it's BUENA!"
-	db "I couldn't sleep,", $4f
+
-	db "so I called you.", $57
+	para "I couldn't sleep,"
 	line "so I called you."
 	done
 ; 0xa0e5e
 UnknownText_0xa0e5e: ; 0xa0e5e
-	db $0, "Oh. Hi, ", $14, "!", $51
+	text "Oh. Hi, ", $14, "!"
-	db "You are how?", $51
+
-	db "Aiyee! This isn't", $4f
+	para "You are how?"
-	db "the time for me to", $51
+
-	db "be cracking silly", $4f
+	para "Aiyee! This isn't"
-	db "gag greetings!", $51
+	line "the time for me to"
-	db "The RADIO TOWER is", $4f
+
-	db "in deep trouble!", $51
+	para "be cracking silly"
-	db $14, ", you'd", $4f
+	line "gag greetings!"
-	db "better be careful!", $57
+
 	para "The RADIO TOWER is"
 	line "in deep trouble!"
 	para $14, ", you'd"
 	line "better be careful!"
 	done
 ; 0xa0efb
 UnknownText_0xa0efb: ; 0xa0efb
-	db $0, "The other day, I", $4f
+	text "The other day, I"
-	db "went out to eat", $51
+	line "went out to eat"
-	db "with DJ BEN!", $4f
+
-	db "Isn't it great?", $51
+	para "with DJ BEN!"
-	db "Not only that, he", $4f
+	line "Isn't it great?"
-	db "said the music on", $51
+
-	db "my program is", $4f
+	para "Not only that, he"
-	db "cool!", $51
+	line "said the music on"
-	db "Oh, wow! Like,", $4f
+
-	db "what should I do?", $51
+	para "my program is"
-	db "…Oops, I have to", $4f
+	line "cool!"
-	db "get ready for my", $51
+
-	db "show! I'll catch", $4f
+	para "Oh, wow! Like,"
-	db "you later!", $57
+	line "what should I do?"
 	para "…Oops, I have to"
 	line "get ready for my"
 	para "show! I'll catch"
 	line "you later!"
 	done
 ; 0xa0fcf
 UnknownText_0xa0fcf: ; 0xa0fcf
-	db $0, "You know the", $4f
+	text "You know the"
-	db "receptionist at", $55
+	line "receptionist at"
-	db "the RADIO TOWER?", $51
+	cont "the RADIO TOWER?"
-	db "'Welcome,' is all", $4f
+
-	db "she ever says.", $51
+	para "'Welcome,' is all"
-	db "But she's really", $4f
+	line "she ever says."
-	db "the chattiest", $51
+
-	db "person at the", $4f
+	para "But she's really"
-	db "RADIO TOWER.", $51
+	line "the chattiest"
-	db "So she must be", $4f
+
-	db "holding back.", $51
+	para "person at the"
-	db "Isn't that fun to", $4f
+	line "RADIO TOWER."
-	db "know?", $51
+
-	db "Catch you later!", $57
+	para "So she must be"
 	line "holding back."
 	para "Isn't that fun to"
 	line "know?"
 	para "Catch you later!"
 	done
 ; 0xa109d
 UnknownText_0xa109d: ; 0xa109d
-	db $0, "Tell me, ", $14, ".", $4f
+	text "Tell me, ", $14, "."
-	db "Have you ever won", $51
+	line "Have you ever won"
-	db "a prize on the", $4f
+
-	db "LUCKY NUMBER SHOW?", $51
+	para "a prize on the"
-	db "REED moans that", $4f
+	line "LUCKY NUMBER SHOW?"
-	db "he's never won, so", $51
+
-	db "he vows to keep", $4f
+	para "REED moans that"
-	db "the show on the", $55
+	line "he's never won, so"
-	db "air till he does.", $51
+
-	db "Let's chat again!", $57
+	para "he vows to keep"
 	line "the show on the"
 	cont "air till he does."
 	para "Let's chat again!"
 	done
 ; 0xa1143
 UnknownText_0xa1143: ; 0xa1143
-	db $0, "You know, last", $4f
+	text "You know, last"
-	db "night…", $51
+	line "night…"
-	db "I was so stressed", $4f
+
-	db "out from work, I", $51
+	para "I was so stressed"
-	db "ate a ton of junk", $4f
+	line "out from work, I"
-	db "food!", $51
+
-	db "MARY and I have", $4f
+	para "ate a ton of junk"
-	db "this deal about", $55
+	line "food!"
-	db "losing weight…", $51
+
-	db "This won't do…", $51
+	para "MARY and I have"
-	db "Huh? What's the", $4f
+	line "this deal about"
-	db "weight?", $51
+	cont "losing weight…"
-	db "This has to be a", $4f
+
-	db "total secret!", $51
+	para "This won't do…"
-	db "MARY weighs…", $51
+
-	db "Aiyee! M-MARY!", $51
+	para "Huh? What's the"
-	db "Uh… Um… I… Sorry,", $4f
+	line "weight?"
-	db "wrong number!", $57
+
 	para "This has to be a"
 	line "total secret!"
 	para "MARY weighs…"
 	para "Aiyee! M-MARY!"
 	para "Uh… Um… I… Sorry,"
 	line "wrong number!"
 	done
 ; 0xa1244
 UnknownText_0xa1244: ; 0xa1244
-	db $0, "Yesterday, PROF.", $4f
+	text "Yesterday, PROF."
-	db "OAK was in the", $51
+	line "OAK was in the"
-	db "studio to tape his", $4f
+
-	db "show.", $51
+	para "studio to tape his"
-	db "So I went over and", $4f
+	line "show."
-	db "introduced myself.", $51
+
-	db "Get this--he tunes", $4f
+	para "So I went over and"
-	db "in to my program!", $51
+	line "introduced myself."
-	db "Oh! Here comes", $4f
+
-	db "PROF.OAK again!", $51
+	para "Get this--he tunes"
-	db "I'm going to chat", $4f
+	line "in to my program!"
-	db "him up again!", $51
+
-	db "Catch you later!", $57
+	para "Oh! Here comes"
 	line "PROF.OAK again!"
 	para "I'm going to chat"
 	line "him up again!"
 	para "Catch you later!"
 	done
 ; 0xa1318
 UnknownText_0xa1318: ; 0xa1318
-	db $0, "…Cough, cough!", $51
+	text "…Cough, cough!"
-	db "Uhm sorry uh got", $4f
+
-	db "uh code dite now.", $51
+	para "Uhm sorry uh got"
-	db "Buh uma pro so uh", $4f
+	line "uh code dite now."
-	db "hav to cover id ub", $51
+
-	db "so no un notice", $4f
+	para "Buh uma pro so uh"
-	db "while uhm on air.", $51
+	line "hav to cover id ub"
-	db "Uh fidz muh voice", $4f
+
-	db "now.", $51
+	para "so no un notice"
-	db "I'll catch you on", $4f
+	line "while uhm on air."
-	db "the fly. This has", $55
+
-	db "been BUENA!", $57
+	para "Uh fidz muh voice"
 	line "now."
 	para "I'll catch you on"
 	line "the fly. This has"
 	cont "been BUENA!"
 	done
 ; 0xa13d8
 UnknownText_0xa13d8: ; 0xa13d8
-	db $0, "Hey, ", $14, ".", $4f
+	text "Hey, ", $14, "."
-	db "You won that RADIO", $51
+	line "You won that RADIO"
-	db "CARD by beating", $4f
+
-	db "the quiz at the", $51
+	para "CARD by beating"
-	db "reception desk,", $4f
+	line "the quiz at the"
-	db "didn't you?", $51
+
-	db "Guess what? I made", $4f
+	para "reception desk,"
-	db "up the questions!", $51
+	line "didn't you?"
-	db "…Were they too", $4f
+
-	db "easy for you?", $51
+	para "Guess what? I made"
-	db "Well, let's chat", $4f
+	line "up the questions!"
-	db "again!", $57
+
 	para "…Were they too"
 	line "easy for you?"
 	para "Well, let's chat"
 	line "again!"
 	done
 ; 0xa1488
 UnknownText_0xa1488: ; 0xa1488
-	db $0, "I'm elated that", $4f
+	text "I'm elated that"
-	db "more people are", $51
+	line "more people are"
-	db "taking part in my", $4f
+
-	db "PASSWORD show.", $51
+	para "taking part in my"
-	db "But when PIKACHU", $4f
+	line "PASSWORD show."
-	db "was the password,", $51
+
-	db "it was uh… whew…", $4f
+	para "But when PIKACHU"
-	db "overwhelming.", $51
+	line "was the password,"
-	db "FAN CLUB people", $4f
+
-	db "came in out in", $51
+	para "it was uh… whew…"
-	db "droves, shouting", $4f
+	line "overwhelming."
-	db "'PIKACHU!' over", $51
+
-	db "and over. I mean,", $4f
+	para "FAN CLUB people"
-	db "they were loud.", $51
+	line "came in out in"
-	db "Anyone tuning in", $4f
+
-	db "around then must", $51
+	para "droves, shouting"
-	db "have been shocked", $4f
+	line "'PIKACHU!' over"
-	db "by the racket!", $51
+
-	db "Anyway, back to", $4f
+	para "and over. I mean,"
-	db "work for me!", $51
+	line "they were loud."
-	db "Let's chat again!", $57
+
 	para "Anyone tuning in"
 	line "around then must"
 	para "have been shocked"
 	line "by the racket!"
 	para "Anyway, back to"
 	line "work for me!"
 	para "Let's chat again!"
 	done
 ; 0xa15de
 UnknownText_0xa15de: ; 0xa15de
-	db $0, "Guess what?", $4f
+	text "Guess what?"
-	db "The RADIO TOWER's", $51
+	line "The RADIO TOWER's"
-	db "DIRECTOR is a big", $4f
+
-	db "fan of TV!", $51
+	para "DIRECTOR is a big"
-	db "A while ago, a", $4f
+	line "fan of TV!"
-	db "fashion show on TV", $51
+
-	db "said that black", $4f
+	para "A while ago, a"
-	db "suits were in.", $51
+	line "fashion show on TV"
-	db "Now all he wears", $4f
+
-	db "are black suits.", $51
+	para "said that black"
-	db "But it's a secret", $4f
+	line "suits were in."
-	db "that our DIRECTOR", $51
+
-	db "is a TV fan, so if", $4f
+	para "Now all he wears"
-	db "you see him, don't", $51
+	line "are black suits."
-	db "you dare mention", $4f
+
-	db "it!", $51
+	para "But it's a secret"
-	db "Oh! The DIRECTOR", $4f
+	line "that our DIRECTOR"
-	db "will be here soon!", $51
+
-	db "Later! Tune into", $4f
+	para "is a TV fan, so if"
-	db "my show!", $57
+	line "you see him, don't"
 	para "you dare mention"
 	line "it!"
 	para "Oh! The DIRECTOR"
 	line "will be here soon!"
 	para "Later! Tune into"
 	line "my show!"
 	done
 ; 0xa1717
 UnknownText_0xa1717: ; 0xa1717
-	db $0, $14, ", tell me.", $51
+	text $14, ", tell me."
-	db "When do you relax", $4f
+
-	db "the most?", $51
+	para "When do you relax"
-	db "For me, it has to", $4f
+	line "the most?"
-	db "be in the studio", $51
+
-	db "right after my", $4f
+	para "For me, it has to"
-	db "show, enjoying a", $51
+	line "be in the studio"
-	db "nice cup of tea.", $4f
+
-	db "It's so pleasant", $51
+	para "right after my"
-	db "that it gradually", $4f
+	line "show, enjoying a"
-	db "makes me drowsy…", $51
+
-	db $56, " ", $56, " ", $56, $51
+	para "nice cup of tea."
-	db $56, " ", $56, " ", $56, "Zzz", $51
+	line "It's so pleasant"
-	db "Oops, I drifted", $4f
+
-	db "off just thinking", $51
+	para "that it gradually"
-	db "about it! How, uh…", $4f
+	line "makes me drowsy…"
-	db "embarrassing!", $51
+
-	db "Please forget this", $4f
+	para $56, " ", $56, " ", $56
-	db "happened! Later!", $57
+
 	para $56, " ", $56, " ", $56, "Zzz"
 	para "Oops, I drifted"
 	line "off just thinking"
 	para "about it! How, uh…"
 	line "embarrassing!"
 	para "Please forget this"
 	line "happened! Later!"
 	done
 ; 0xa183d
 UnknownText_0xa183d: ; 0xa183d
-	db $0, $14, ", what was", $4f
+	text $14, ", what was"
-	db "the first #MON", $55
+	line "the first #MON"
-	db "you ever caught?", $51
+	cont "you ever caught?"
-	db "…Oh, really?", $51
+
-	db "I've seen lots of", $4f
+	para "…Oh, really?"
-	db "#MON around,", $51
+
-	db "but I've never", $4f
+	para "I've seen lots of"
-	db "caught one.", $51
+	line "#MON around,"
-	db "I should give it a", $4f
+
-	db "try sometime.", $51
+	para "but I've never"
-	db "Did you know that", $4f
+	line "caught one."
-	db "the first #MON", $51
+
-	db "MARY caught was a", $4f
+	para "I should give it a"
-	db "DROWZEE?", $51
+	line "try sometime."
-	db "Isn't that so out", $4f
+
-	db "of character?", $51
+	para "Did you know that"
-	db "But MARY's DROWZEE", $4f
+	line "the first #MON"
-	db "kept making her", $51
+
-	db "fall asleep on the", $4f
+	para "MARY caught was a"
-	db "job, so she traded", $51
+	line "DROWZEE?"
-	db "with a fan for a", $4f
+
-	db "MEOWTH.", $51
+	para "Isn't that so out"
-	db "Let's chat about", $4f
+	line "of character?"
-	db "#MON again!", $51
+
-	db "Bye-bye!", $57
+	para "But MARY's DROWZEE"
 	line "kept making her"
 	para "fall asleep on the"
 	line "job, so she traded"
 	para "with a fan for a"
 	line "MEOWTH."
 	para "Let's chat about"
 	line "#MON again!"
 	para "Bye-bye!"
 	done
 ; 0xa19b1
 UnknownText_0xa19b1: ; 0xa19b1
-	db $0, "Guess what? All of", $4f
+	text "Guess what? All of"
-	db "us from the RADIO", $51
+	line "us from the RADIO"
-	db "TOWER are going on", $4f
+
-	db "a company vacation", $51
+	para "TOWER are going on"
-	db "to the RADIO TOWER", $4f
+	line "a company vacation"
-	db "in LAVENDER.", $51
+
-	db "We're wasting our", $4f
+	para "to the RADIO TOWER"
-	db "vacation on a trip", $51
+	line "in LAVENDER."
-	db "to another RADIO", $4f
+
-	db "TOWER?", $51
+	para "We're wasting our"
-	db "I'd much rather go", $4f
+	line "vacation on a trip"
-	db "to the beach!", $51
+
-	db $14, ", I hope", $4f
+	para "to another RADIO"
-	db "you have enough", $51
+	line "TOWER?"
-	db "fun for both of us", $4f
+
-	db "on your journey!", $51
+	para "I'd much rather go"
-	db "Bye-bye!", $57
+	line "to the beach!"
 	para $14, ", I hope"
 	line "you have enough"
 	para "fun for both of us"
 	line "on your journey!"
 	para "Bye-bye!"
 	done
 ; 0xa1ac0
 UnknownText_0xa1ac0: ; 0xa1ac0
-	db $0, "Did you know…?", $51
+	text "Did you know…?"
-	db "BEN and FERN talk", $4f
+
-	db "on the phone for", $51
+	para "BEN and FERN talk"
-	db "hours about what", $4f
+	line "on the phone for"
-	db "#MON music they", $51
+
-	db "should play on", $4f
+	para "hours about what"
-	db "different days of", $55
+	line "#MON music they"
-	db "the week.", $51
+
-	db "One time, FERN's", $4f
+	para "should play on"
-	db "rapping style kind", $51
+	line "different days of"
-	db "of rubbed off on", $4f
+	cont "the week."
-	db "BEN weirdly.", $51
+
-	db "So we ended up", $4f
+	para "One time, FERN's"
-	db "enduring BEN's", $51
+	line "rapping style kind"
-	db "silly, chilly, a", $4f
+
-	db "willy-nilly jive-", $55
+	para "of rubbed off on"
-	db "talking shtick for", $55
+	line "BEN weirdly."
-	db "a while.", $51
+
-	db "Let's chat again!", $57
+	para "So we ended up"
 	line "enduring BEN's"
 	para "silly, chilly, a"
 	line "willy-nilly jive-"
 	cont "talking shtick for"
 	cont "a while."
 	para "Let's chat again!"
 	done
 ; 0xa1bed
 UnknownText_0xa1bed: ; 0xa1bed
-	db $0, "I'm going shopping", $4f
+	text "I'm going shopping"
-	db "with MARY and LILY", $55
+	line "with MARY and LILY"
-	db "soon.", $51
+	cont "soon."
-	db "It'll be great if", $4f
+
-	db "GOLDENROD DEPT.", $51
+	para "It'll be great if"
-	db "STORE has a sale", $4f
+	line "GOLDENROD DEPT."
-	db "on when we go…", $51
+
-	db $14, ", maybe we", $4f
+	para "STORE has a sale"
-	db "can hook up too!", $51
+	line "on when we go…"
-	db "Catch you later!", $57
+
 	para $14, ", maybe we"
 	line "can hook up too!"
 	para "Catch you later!"
 	done
 ; 0xa1c88
 UnknownText_0xa1c88: ; 0xa1c88
-	db $0, "I'm thinking of", $4f
+	text "I'm thinking of"
-	db "going to the GAME", $51
+	line "going to the GAME"
-	db "CORNER tomorrow.", $4f
+
-	db "It's been a while.", $51
+	para "CORNER tomorrow."
-	db "You see, I have my", $4f
+	line "It's been a while."
-	db "favorite machine…", $51
+
-	db "It pays out a lot,", $4f
+	para "You see, I have my"
-	db "I kid you not!", $51
+	line "favorite machine…"
-	db "Huh? Nuh-uh, it's", $4f
+
-	db "my secret!", $51
+	para "It pays out a lot,"
-	db "You have to find", $4f
+	line "I kid you not!"
-	db "it yourself!", $51
+
-	db "Catch you later!", $57
+	para "Huh? Nuh-uh, it's"
 	line "my secret!"
 	para "You have to find"
 	line "it yourself!"
 	para "Catch you later!"
 	done
 ; 0xa1d5f
 UnknownText_0xa1d5f: ; 0xa1d5f
-	db $0, "Hey, ", $14, ". You", $4f
+	text "Hey, ", $14, ". You"
-	db "use your #GEAR", $51
+	line "use your #GEAR"
-	db "to listen to the", $4f
+
-	db "radio, right?", $51
+	para "to listen to the"
-	db "I heard that you", $4f
+	line "radio, right?"
-	db "can even display", $51
+
-	db "town maps with", $4f
+	para "I heard that you"
-	db "#GEAR.", $51
+	line "can even display"
-	db "I have a bad sense", $4f
+
-	db "of direction, so", $51
+	para "town maps with"
-	db "#GEAR would be", $4f
+	line "#GEAR."
-	db "handy…", $51
+
-	db "Anyway, thanks for", $4f
+	para "I have a bad sense"
-	db "calling! Later!", $57
+	line "of direction, so"
 	para "#GEAR would be"
 	line "handy…"
 	para "Anyway, thanks for"
 	line "calling! Later!"
 	done
 ; 0xa1e2f
 UnknownText_0xa1e2f: ; 0xa1e2f
-	db $0, "Is it sunny", $4f
+	text "Is it sunny"
-	db "outside today?", $51
+	line "outside today?"
-	db "When you're cooped", $4f
+
-	db "up in the RADIO", $51
+	para "When you're cooped"
-	db "TOWER as much as I", $4f
+	line "up in the RADIO"
-	db "am, you lose touch", $51
+
-	db "with the outside.", $4f
+	para "TOWER as much as I"
-	db "It can be boring.", $51
+	line "am, you lose touch"
-	db "Please call again!", $57
+
 	para "with the outside."
 	line "It can be boring."
 	para "Please call again!"
 	done
 ; 0xa1eca
--- a/text/common.asm
+++ b/text/common.asm
--- a/text/common_2.asm
+++ b/text/common_2.asm
--- a/text/common_3.asm
+++ b/text/common_3.asm
--- a/text/common_4.asm
+++ b/text/common_4.asm
--- a/text/phone/bill.asm
+++ b/text/phone/bill.asm
@@ -1,23 +1,32 @@
 BillPhoneMornGreetingText: ; 0x1b4427
-	db $0, "Good morning!", $51
+	text "Good morning!"
-	db "This is the #-", $4f
+
-	db "MON STORAGE SYSTEM", $51
+	para "This is the #-"
-	db "ADMINISTRATION", $4f
+	line "MON STORAGE SYSTEM"
-	db "SERVICE.", $57
+
 	para "ADMINISTRATION"
 	line "SERVICE."
 	done
 BillPhoneDayGreetingText: ; 0x1b4470
-	db $0, "Good day!", $51
+	text "Good day!"
-	db "This is the #-", $4f
+
-	db "MON STORAGE SYSTEM", $51
+	para "This is the #-"
-	db "ADMINISTRATION", $4f
+	line "MON STORAGE SYSTEM"
-	db "SERVICE.", $57
+
 	para "ADMINISTRATION"
 	line "SERVICE."
 	done
 BillPhoneNiteGreetingText: ; 0x1b44b5
-	db $0, "Good evening!", $51
+	text "Good evening!"
-	db "This is the #-", $4f
+
-	db "MON STORAGE SYSTEM", $51
+	para "This is the #-"
-	db "ADMINISTRATION", $4f
+	line "MON STORAGE SYSTEM"
-	db "SERVICE.", $57
+
 	para "ADMINISTRATION"
 	line "SERVICE."
 	done
 BillPhoneGeneriText: ; 0x1b44fe
 	db $0, "Who's calling?", $51
@@ -27,47 +36,63 @@ BillPhoneGeneriText: ; 0x1b44fe
 	db $56, $57
 BillPhoneNotFullText: ; 0x1b452a
-	db $0, "Thanks for", $4f
+	text "Thanks for"
-	db "waiting!", $51
+	line "waiting!"
-	db $14, ", your BOX", $4f
+
-	db "has room for @"
+	para $14, ", your BOX"
 	line "has room for @"
 	TX_RAM StringBuffer3
-	db $0, $55
+	text $55
-	db "more #MON.", $51
+	db "more #MON."
-	db "Get out there and", $4f
+
-	db "fill it up!", $57
+	para "Get out there and"
 	line "fill it up!"
 	done
 BillPhoneNearlyFullText: ; 0x1b4587
-	db $0, "Thanks for", $4f
+	text "Thanks for"
-	db "waiting!", $51
+	line "waiting!"
-	db $14, ", your BOX", $4f
+
-	db "has room for only", $55
+	para $14, ", your BOX"
-	db "@"
+	line "has room for only"
 	cont "@"
 	TX_RAM StringBuffer3
-	db $0, " more #MON.", $51
+	text " more #MON."
-	db "Maybe you should", $4f
+
-	db "switch your BOX.", $57
+	para "Maybe you should"
 	line "switch your BOX."
 	done
 BillPhoneFullText: ; 0x1b45ed
-	db $0, "Thanks for", $4f
+	text "Thanks for"
-	db "waiting!", $51
+	line "waiting!"
-	db $14, ", your BOX", $4f
+
-	db "is full!", $51
+	para $14, ", your BOX"
-	db "You'll have to", $4f
+	line "is full!"
-	db "switch BOXES if", $51
+
-	db "you want to catch", $4f
+	para "You'll have to"
-	db "more #MON.", $57
+	line "switch BOXES if"
 	para "you want to catch"
 	line "more #MON."
 	done
 BillPhoneNewlyFullText: ; 0x1b4652
-	db $0, "Hi, ", $14, "?", $4f
+	text "Hi, ", $14, "?"
-	db "It's me, BILL!", $51
+	line "It's me, BILL!"
-	db "Thanks for using", $4f
+
-	db "my STORAGE SYSTEM.", $51
+	para "Thanks for using"
-	db "That last #MON", $4f
+	line "my STORAGE SYSTEM."
-	db "you sent filled", $55
+
-	db "your BOX up.", $51
+	para "That last #MON"
-	db "You'll have to", $4f
+	line "you sent filled"
-	db "switch BOXES if", $51
+	cont "your BOX up."
-	db "you want to catch", $4f
+
-	db "more #MON.", $51
+	para "You'll have to"
-	db "Bye now!", $57
+	line "switch BOXES if"
 	para "you want to catch"
 	line "more #MON."
 	para "Bye now!"
 	done
--- a/text/phone/elm.asm
+++ b/text/phone/elm.asm
@@ -1,149 +1,211 @@
 ElmPhoneStartText: ; 0x1b46fc
-	db $0, "Hello, ", $14, "?", $51
+	text "Hello, ", $14, "?"
-	db "Try not to overdo", $4f
+
-	db "it.", $51
+	para "Try not to overdo"
-	db "Be sure to heal", $4f
+	line "it."
-	db "your #MON if", $55
+
-	db "they are hurt.", $57
+	para "Be sure to heal"
 	line "your #MON if"
 	cont "they are hurt."
 	done
 ElmPhoneSawMrPokemonText: ; 0x1b4749
-	db $0, "Hello, ", $14, "?", $51
+	text "Hello, ", $14, "?"
-	db "Did you meet MR.", $4f
+
-	db "#MON? Great!", $55
+	para "Did you meet MR."
-	db "Come back safely!", $57
+	line "#MON? Great!"
 	cont "Come back safely!"
 	done
 ElmPhonePokemonStolenText: ; 0x1b4784
-	db $0, $14, "? I'm very", $4f
+	text $14, "? I'm very"
-	db "upset now.", $51
+	line "upset now."
-	db "We had a #MON", $4f
+
-	db "stolen from here.", $51
+	para "We had a #MON"
-	db "How could anyone", $4f
+	line "stolen from here."
-	db "do that?", $57
+
 	para "How could anyone"
 	line "do that?"
 	done
 ElmPhoneCheckingEggText: ; 0x1b47d5
-	db $0, "Hello, ", $14, "?", $51
+	text "Hello, ", $14, "?"
-	db "We're checking the", $4f
+
-	db "EGG now. It does", $51
+	para "We're checking the"
-	db "appear to be a", $4f
+	line "EGG now. It does"
-	db "#MON EGG.", $57
+
 	para "appear to be a"
 	line "#MON EGG."
 	done
 ElmPhoneAssistantText: ; 0x1b481c
-	db $0, "Hello, ", $14, "?", $51
+	text "Hello, ", $14, "?"
-	db "Did you see my", $4f
+
-	db "assistant? He's at", $51
+	para "Did you see my"
-	db "the #MON CENTER", $4f
+	line "assistant? He's at"
-	db "in VIOLET CITY.", $57
+
 	para "the #MON CENTER"
 	line "in VIOLET CITY."
 	done
 ElmPhoneEggUnhatchedText: ; 0x1b4868
-	db $0, "Hello, ", $14, "?", $51
+	text "Hello, ", $14, "?"
-	db "How's the EGG? Has", $4f
+
-	db "anything changed?", $51
+	para "How's the EGG? Has"
-	db "If anything hap-", $4f
+	line "anything changed?"
-	db "pens, please call.", $57
+
 	para "If anything hap-"
 	line "pens, please call."
 	done
 ElmPhoneEggHatchedText: ; 0x1b48bb
-	db $0, "Hello, ", $14, "?", $4f
+	text "Hello, ", $14, "?"
-	db "How is the EGG?", $51
+	line "How is the EGG?"
-	db "What? It hatched?", $4f
+
-	db "Wow! What kind of", $55
+	para "What? It hatched?"
-	db "#MON is it?", $51
+	line "Wow! What kind of"
-	db "Please come show", $4f
+	cont "#MON is it?"
-	db "me now!", $57
+
 	para "Please come show"
 	line "me now!"
 	done
 ElmPhoneDiscovery1Text: ; 0x1b491f
-	db $0, "Hello, ", $14, "?", $51
+	text "Hello, ", $14, "?"
-	db "I just made a new", $4f
+
-	db "discovery.", $51
+	para "I just made a new"
-	db "The time it takes", $4f
+	line "discovery."
-	db "for an EGG to", $51
+
-	db "hatch depends on", $4f
+	para "The time it takes"
-	db "the #MON.", $57
+	line "for an EGG to"
 	para "hatch depends on"
 	line "the #MON."
 	done
 ElmPhoneDiscovery2Text: ; 0x1b4982
-	db $0, "Hello, ", $14, "?", $51
+	text "Hello, ", $14, "?"
-	db "It's still a", $4f
+
-	db "mystery what kinds", $51
+	para "It's still a"
-	db "of moves hatched", $4f
+	line "mystery what kinds"
-	db "#MON have.", $51
+
-	db "We're investigat-", $4f
+	para "of moves hatched"
-	db "ing that now.", $57
+	line "#MON have."
 	para "We're investigat-"
 	line "ing that now."
 	done
 ElmPhonePokerusText: ; 0x1b49e7
-	db $0, "Hello, ", $14, "?", $51
+	text "Hello, ", $14, "?"
-	db "I discovered an", $4f
+
-	db "odd thing.", $51
+	para "I discovered an"
-	db "Apparently there's", $4f
+	line "odd thing."
-	db "something called", $51
+
-	db "#RUS that in-", $4f
+	para "Apparently there's"
-	db "fects #MON.", $51
+	line "something called"
-	db "Yes, it's like a", $4f
+
-	db "virus, so it's", $55
+	para "#RUS that in-"
-	db "called #RUS.", $51
+	line "fects #MON."
-	db "It multiplies fast", $4f
+
-	db "and infects other", $51
+	para "Yes, it's like a"
-	db "#MON too. But", $4f
+	line "virus, so it's"
-	db "that's all.", $51
+	cont "called #RUS."
-	db "It doesn't seem to", $4f
+
-	db "do anything, and", $51
+	para "It multiplies fast"
-	db "it goes away over", $4f
+	line "and infects other"
-	db "time.", $51
+
-	db "I guess it's", $4f
+	para "#MON too. But"
-	db "nothing to worry", $55
+	line "that's all."
-	db "about. Bye!", $57
+
 	para "It doesn't seem to"
 	line "do anything, and"
 	para "it goes away over"
 	line "time."
 	para "I guess it's"
 	line "nothing to worry"
 	cont "about. Bye!"
 	done
 ElmPhoneDisasterText: ; 0x1b4b17
-	db $0, "H-hello? ", $14, "?", $4f
+	text "H-hello? ", $14, "?"
-	db "It's a disaster!", $51
+	line "It's a disaster!"
-	db "Uh, um, it's just", $4f
+
-	db "terrible!", $51
+	para "Uh, um, it's just"
-	db "What should I do?", $4f
+	line "terrible!"
-	db "It… Oh, no…", $51
+
-	db "Please get back", $4f
+	para "What should I do?"
-	db "here now!", $57
+	line "It… Oh, no…"
 	para "Please get back"
 	line "here now!"
 	done
 ElmPhoneEggAssistantText: ; 0x1b4b87
-	db $0, "Hello, ", $14, "? We", $4f
+	text "Hello, ", $14, "? We"
-	db "discovered some-", $51
+	line "discovered some-"
-	db "thing about the", $4f
+
-	db "EGG!", $51
+	para "thing about the"
-	db "My assistant is at", $4f
+	line "EGG!"
-	db "the #MON CENTER", $51
+
-	db "in VIOLET CITY. ", $4f
+	para "My assistant is at"
-	db "Could you talk to", $55
+	line "the #MON CENTER"
-	db "him?", $57
+
 	para "in VIOLET CITY. "
 	line "Could you talk to"
 	cont "him?"
 	done
 ElmPhoneRocketText: ; 0x1b4c06
-	db $0, $14, ", how are", $4f
+	text $14, ", how are"
-	db "things going?", $51
+	line "things going?"
-	db "I called because", $4f
+
-	db "something weird is", $51
+	para "I called because"
-	db "happening with the", $4f
+	line "something weird is"
-	db "radio broadcasts.", $51
+
-	db "They were talking", $4f
+	para "happening with the"
-	db "about TEAM ROCKET.", $51
+	line "radio broadcasts."
-	db $14, ", do you", $4f
+
-	db "know anything", $55
+	para "They were talking"
-	db "about it?", $51
+	line "about TEAM ROCKET."
-	db "Maybe TEAM ROCKET", $4f
+
-	db "has returned. No,", $51
+	para $14, ", do you"
-	db "that just can't", $4f
+	line "know anything"
-	db "be true.", $51
+	cont "about it?"
-	db "Sorry to bug you.", $4f
+
-	db "Take care!", $57
+	para "Maybe TEAM ROCKET"
 	line "has returned. No,"
 	para "that just can't"
 	line "be true."
 	para "Sorry to bug you."
 	line "Take care!"
 	done
 ElmPhoneGiftText: ; 0x1b4d09
-	db $0, "Hello, ", $14, "?", $51
+	text "Hello, ", $14, "?"
-	db "I have something", $4f
+
-	db "here for you.", $51
+	para "I have something"
-	db "Could you swing by", $4f
+	line "here for you."
-	db "my LAB?", $51
+
-	db "See you later!", $57
+	para "Could you swing by"
 	line "my LAB?"
 	para "See you later!"
 	done
 ElmPhoneUnusedText: ; 0x1b4d5d
-	db $0, "Hello, ", $14, "?", $4f
+	text "Hello, ", $14, "?"
-	db "How's it going?", $51
+	line "How's it going?"
-	db "I got ahold of", $4f
+
-	db "something neat.", $51
+	para "I got ahold of"
-	db "Swing by my LAB", $4f
+	line "something neat."
-	db "and pick it up!", $51
+
-	db "See you later!", $57
+	para "Swing by my LAB"
 	line "and pick it up!"
 	para "See you later!"
 	done
--- a/text/phone/extra.asm
+++ b/text/phone/extra.asm
--- a/text/phone/extra2.asm
+++ b/text/phone/extra2.asm
--- a/text/phone/extra3.asm
+++ b/text/phone/extra3.asm
--- a/text/phone/mom.asm
+++ b/text/phone/mom.asm
@@ -1,127 +1,165 @@
 MomPhoneGreetingText: ; 0x1b4000
-	db $0, "Hello?", $51
+	text "Hello?"
-	db "Oh, hi, ", $52, "!", $4f
+
-	db "Working hard?", $57
+	para "Oh, hi, ", $52, "!"
 	line "Working hard?"
 	done
 UnknownText_0x1b4021: ; 0x1b4021
-	db $0, "Oh, so you're in", $4f
+	text "Oh, so you're in"
-	db "@"
+	line "@"
 	TX_RAM StringBuffer3
-	db $0, "…", $51
+	text "…"
-	db "Isn't that where", $4f
+
-	db "@"
+	para "Isn't that where"
 	line "@"
 	TX_RAM StringBuffer4
-	db $0, $51
+	text $51
-	db "is? Did you go", $4f
+	db "is? Did you go"
-	db "take a look?", $57
+	line "take a look?"
 	done
 MomPhoneGenericAreaText: ; 0x1b406b
-	db $0, "Really, you're in", $4f
+	text "Really, you're in"
-	db "@"
+	line "@"
 	TX_RAM StringBuffer3
-	db $0, "?", $51
+	text "?"
-	db "I've never gone", $4f
+
-	db "there. That's kind", $55
+	para "I've never gone"
-	db "of neat, ", $52, ".", $57
+	line "there. That's kind"
 	cont "of neat, ", $52, "."
 	done
 MomPhoneNewBarkText: ; 0x1b40b1
-	db $0, "What? You're in", $4f
+	text "What? You're in"
-	db "@"
+	line "@"
 	TX_RAM StringBuffer3
-	db $0, "?", $51
+	text "?"
-	db "Come see your MOM", $4f
+
-	db "sometime!", $57
+	para "Come see your MOM"
 	line "sometime!"
 	done
 MomPhoneCherrygroveText: ; 0x1b40e4
-	db $0, "You're visiting", $4f
+	text "You're visiting"
-	db "@"
+	line "@"
 	TX_RAM StringBuffer3
-	db $0, "?", $51
+	text "?"
-	db "How about coming", $4f
+
-	db "home for a bit?", $57
+	para "How about coming"
 	line "home for a bit?"
 	done
 UnknownText_0x1b411c: ; 0x1b411c
-	db $0, "Wow, you're in", $4f
+	text "Wow, you're in"
-	db "@"
+	line "@"
 	TX_RAM StringBuffer3
-	db $0, "?", $51
+	text "?"
-	db "Good luck on your", $4f
+
-	db "#MON quest!", $57
+	para "Good luck on your"
 	line "#MON quest!"
 	done
 UnknownText_0x1b4150: ; 0x1b4150
-	db $0, "That sounds really", $4f
+	text "That sounds really"
-	db "tough.", $51
+	line "tough."
-	db "But, ", $52, ", I", $4f
+
-	db "know you're really", $51
+	para "But, ", $52, ", I"
-	db "determined. You'll", $4f
+	line "know you're really"
-	db "be OK, right?", $57
+
 	para "determined. You'll"
 	line "be OK, right?"
 	done
 UnknownText_0x1b41a7: ; 0x1b41a7
-	db $0, "By the way, you've", $4f
+	text "By the way, you've"
-	db "saved up ¥@"
+	line "saved up ¥@"
 	TX_RAM StringBuffer3
-	db $0, ".", $51
+	text "."
-	db "Do you want to", $4f
+
-	db "keep on saving?", $57
+	para "Do you want to"
 	line "keep on saving?"
 	done
 UnknownText_0x1b41ea: ; 0x1b41ea
-	db $0, "It's important to", $4f
+	text "It's important to"
-	db "save your money.", $57
+	line "save your money."
 	done
 UnknownText_0x1b420d: ; 0x1b420d
-	db $0, "Oh, ", $52, ",", $4f
+	text "Oh, ", $52, ","
-	db "you're not saving", $51
+	line "you're not saving"
-	db "any money. Would", $4f
+
-	db "you like to save?", $57
+	para "any money. Would"
 	line "you like to save?"
 	done
 UnknownText_0x1b4249: ; 0x1b4249
-	db $0, "By the way, you've", $4f
+	text "By the way, you've"
-	db "saved up ¥@"
+	line "saved up ¥@"
 	TX_RAM StringBuffer3
-	db $0, ".", $51
+	text "."
-	db "Want to start", $4f
+
-	db "saving again?", $57
+	para "Want to start"
 	line "saving again?"
 	done
 UnknownText_0x1b4289: ; 0x1b4289
-	db $0, "OK. I'll save your", $4f
+	text "OK. I'll save your"
-	db "money.", $57
+	line "money."
 	done
 MomPhoneWontSaveMoneyText: ; 0x1b42a3
-	db $0, "OK. I won't save", $4f
+	text "OK. I won't save"
-	db "your money.", $57
+	line "your money."
 	done
 MomPhoneHangUpText: ; 0x1b42c0
-	db $0, $52, ", keep it", $4f
+	text $52, ", keep it"
-	db "up! I'm rooting", $55
+	line "up! I'm rooting"
-	db "for you, baby!", $57
+	cont "for you, baby!"
 	done
 MomPhoneNoPokemonText: ; 0x1b42ea
-	db $0, "Hello?", $51
+	text "Hello?"
-	db "Oh, hi, ", $52, "!", $4f
+
-	db "Wasn't PROF.ELM", $55
+	para "Oh, hi, ", $52, "!"
-	db "waiting for you?", $57
+	line "Wasn't PROF.ELM"
 	cont "waiting for you?"
 	done
 MomPhoneNoPokedexText: ; 0x1b431d
-	db $0, "Hello?", $51
+	text "Hello?"
-	db "Oh, hi, ", $52, "!", $4f
+
-	db "You're on a big", $51
+	para "Oh, hi, ", $52, "!"
-	db "mission for PROF.", $4f
+	line "You're on a big"
-	db "ELM? Be good!", $57
+
 	para "mission for PROF."
 	line "ELM? Be good!"
 	done
 MomPhoneNoGymQuestText: ; 0x1b435f
-	db $0, "Hello?", $51
+	text "Hello?"
-	db "Hi, ", $52, "! If", $4f
+
-	db "you're done with", $51
+	para "Hi, ", $52, "! If"
-	db "your errand come", $4f
+	line "you're done with"
-	db "on home, dear.", $57
+
 	para "your errand come"
 	line "on home, dear."
 	done
 MomPhoneLectureText: ; 0x1b43a1
-	db $0, "Hello?", $51
+	text "Hello?"
-	db "…… ", $52, "?", $4f
+
-	db "I heard from PROF.", $51
+	para "…… ", $52, "?"
-	db "ELM that you went", $4f
+	line "I heard from PROF."
-	db "on a long trip.", $51
+
-	db "I wish you would", $4f
+	para "ELM that you went"
-	db "have told me…", $51
+	line "on a long trip."
-	db "What about money?", $4f
+
-	db "Should I save it?", $57
+	para "I wish you would"
 	line "have told me…"
 	para "What about money?"
 	line "Should I save it?"
 	done
--- a/text/phone/trainers1.asm
+++ b/text/phone/trainers1.asm
--- a/text/sweethoney.asm
+++ b/text/sweethoney.asm
@@ -9,46 +9,60 @@
 ; The last text is associated with a second NPC, probably a Butterfree.
 UnusedSweetHoneyText: ; 0x5578a
-	db 0, "My #MON is an", $4f
+	text "My #MON is an"
-	db "expert at collect-", $55
+	line "expert at collect-"
-	db "ing SWEET HONEY.", $51
+	cont "ing SWEET HONEY."
-	db "I'll share some", $4f
+
-	db "with you.", $57
+	para "I'll share some"
 	line "with you."
 	done
 UnusedSweetHoneyBagFullText: ; 0x557d6
-	db 0, "I want to give you", $4f
+	text "I want to give you"
-	db "some SWEET HONEY,", $51
+	line "some SWEET HONEY,"
-	db "but you have no", $4f
+
-	db "room for it.", $57
+	para "but you have no"
 	line "room for it."
 	done
 UnusedSweetHoneyGiveText: ; 0x55819
-	db 0, "Here you go! Have", $4f
+	text "Here you go! Have"
-	db "some SWEET HONEY!", $57
+	line "some SWEET HONEY!"
 	done
 UnusedGotSweetHoneyText: ; 0x5583e
-	db 0, $52, " received", $4f
+	text $52, " received"
-	db "SWEET HONEY.", $57
+	line "SWEET HONEY."
 	done
 UnusedSweetHoneyAfterText1: ; 0x55856
-	db 0, "My little brother", $4f
+	text "My little brother"
-	db "takes SWEET HONEY", $51
+	line "takes SWEET HONEY"
-	db "and goes somewhere", $4f
+
-	db "with it.", $51
+	para "and goes somewhere"
-	db "I wonder what he's", $4f
+	line "with it."
-	db "up to?", $57
+
 	para "I wonder what he's"
 	line "up to?"
 	done
 UnusedSweetHoneyAfterText2: ; 0x558b1
-	db 0, "Did you put SWEET", $4f
+	text "Did you put SWEET"
-	db "HONEY on a tree?", $51
+	line "HONEY on a tree?"
-	db "What happened to", $4f
+
-	db "it?", $57
+	para "What happened to"
 	line "it?"
 	done
 UnusedSweetHoneyAfterText3: ; 0x558ea
-	db 0, "Did you put SWEET", $4f
+	text "Did you put SWEET"
-	db "HONEY on a tree?", $51
+	line "HONEY on a tree?"
-	db "It takes about a", $4f
+
-	db "day for #MON to", $55
+	para "It takes about a"
-	db "be drawn to it.", $57
+	line "day for #MON to"
 	cont "be drawn to it."
 	done
 UnusedSweetHoneyButterfreeText: ; 0x5593f
-	db 0, "BUTTERFREE: Freeh!", $57
+	text "BUTTERFREE: Freeh!"
 	done