summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/phone/text/bill.asm4
-rw-r--r--data/phone/text/extra.asm148
-rw-r--r--data/phone/text/extra2.asm172
-rw-r--r--data/phone/text/gaven_overworld.asm4
-rw-r--r--data/phone/text/jose_overworld.asm2
-rw-r--r--data/phone/text/mom.asm16
-rw-r--r--data/phone/text/trainers.asm364
-rw-r--r--data/text/battle.asm116
-rw-r--r--data/text/common_1.asm252
-rw-r--r--data/text/common_2.asm285
-rw-r--r--data/text/common_3.asm200
-rw-r--r--data/text/std_text.asm14
12 files changed, 827 insertions, 750 deletions
diff --git a/data/phone/text/bill.asm b/data/phone/text/bill.asm
index 0db92c198..7363741c4 100644
--- a/data/phone/text/bill.asm
+++ b/data/phone/text/bill.asm
@@ -44,7 +44,7 @@ BillPhoneNotFullText:
para "<PLAY_G>, your BOX"
line "has room for @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
cont "more #MON."
@@ -59,7 +59,7 @@ BillPhoneNearlyFullText:
para "<PLAY_G>, your BOX"
line "has room for only"
cont "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " more #MON."
para "Maybe you should"
diff --git a/data/phone/text/extra.asm b/data/phone/text/extra.asm
index 101f46ba9..f7c2bb380 100644
--- a/data/phone/text/extra.asm
+++ b/data/phone/text/extra.asm
@@ -292,7 +292,7 @@ UnknownText_0x648dc:
ArnieLovesTheCuteText:
text "I'm always with my"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "!"
para "It's so cute!"
@@ -304,7 +304,7 @@ UnknownText_0x64a13:
line "here, I saw this"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " for the"
line "first time."
@@ -316,7 +316,7 @@ UnknownText_0x64a71:
text "I was wondering,"
line "do you happen to"
cont "have @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "?"
para "I can't seem to"
@@ -338,7 +338,7 @@ UnknownText_0x64ada:
para "I'll be here on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
@@ -353,12 +353,12 @@ UnknownText_0x64b5f:
para "A whole bunch of"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " have"
para "appeared around"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
para "You have to see"
@@ -381,7 +381,7 @@ UnknownText_0x64c13:
para "Let's battle. I'll"
line "be waiting for you"
cont "on @"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
@@ -398,7 +398,7 @@ UnknownText_0x64c5a:
AlanGettingStrongerText:
text "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "'s"
line "getting stronger,"
@@ -411,7 +411,7 @@ UnknownText_0x64cf3:
line "knocked out a wild"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " just"
line "the other day."
@@ -422,7 +422,7 @@ UnknownText_0x64cf3:
UnknownText_0x64d4f:
text "By the way, a wild"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " escaped"
cont "on me yesterday."
@@ -439,7 +439,7 @@ UnknownText_0x64da4:
para "I'm hanging out on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
para "Can you come down"
@@ -458,7 +458,7 @@ UnknownText_0x64e2f:
line "Why don't you come"
para "to @"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text_start
line "and pick it up?"
done
@@ -478,7 +478,7 @@ UnknownText_0x64ed4:
para "I'm waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
@@ -491,13 +491,13 @@ UnknownText_0x64f1a:
para "I'm waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
UnknownText_0x64f74:
text "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " is"
line "getting prettier!"
@@ -509,7 +509,7 @@ UnknownText_0x64fb2:
text "It took only an"
line "instant to KO a"
cont "wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
para "It must be because"
@@ -522,7 +522,7 @@ UnknownText_0x64fb2:
UnknownText_0x6501c:
text "You know what?"
line "A wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
para "got away from me"
line "again."
@@ -537,7 +537,7 @@ UnknownText_0x6501c:
UnknownText_0x65091:
text "Right now, I'm on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
para "If you're close"
@@ -563,7 +563,7 @@ UnknownText_0x650ec:
para "it! I'm waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
@@ -587,7 +587,7 @@ UnknownText_0x651bf:
para "I'm waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
@@ -602,7 +602,7 @@ UnknownText_0x6520f:
para "I'm waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
@@ -610,7 +610,7 @@ ChadObservingWildText:
text "I recently began"
line "observing wild"
cont "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
para "I've been learning"
@@ -631,7 +631,7 @@ UnknownText_0x65318:
line "to knock out a"
para "wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " a"
line "while back."
@@ -647,7 +647,7 @@ UnknownText_0x65399:
line "close to catching"
para "a wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text ","
line "but it got away."
@@ -656,7 +656,7 @@ UnknownText_0x65399:
para "wanting to observe"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text ". Rats…"
done
@@ -669,7 +669,7 @@ UnknownText_0x65419:
para "I'll be on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
@@ -845,7 +845,7 @@ UnknownText_0x65a63:
para "The place is"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
para "Hurry over--I'm"
@@ -855,7 +855,7 @@ UnknownText_0x65a63:
DerekCheekPincherText:
text "Listen to this."
line "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
para "grins happily when"
line "I pinch its cheek."
@@ -870,11 +870,11 @@ UnknownText_0x65b29:
text "Oh, and recently,"
line "my PIKACHU beat a"
cont "wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "!"
para "A wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text ","
line "I tell you!"
@@ -891,7 +891,7 @@ UnknownText_0x65b29:
UnknownText_0x65bc8:
text "Oh, and I saw a"
line "wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " a"
cont "little while ago."
@@ -951,7 +951,7 @@ UnknownText_0x65da6:
para "I'm waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
para "Come pick this up"
@@ -960,7 +960,7 @@ UnknownText_0x65da6:
TullyGrownText:
text "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " has"
line "grown again."
@@ -974,7 +974,7 @@ TullyGrownText:
UnknownText_0x65e42:
text "Oh yeah, I KO'd a"
line "wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
para "It was huge, like"
@@ -988,7 +988,7 @@ UnknownText_0x65e42:
UnknownText_0x65eac:
text "Oh yeah, I lost a"
line "wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
para "It was huge, like"
@@ -1005,7 +1005,7 @@ UnknownText_0x65f17:
para "I'll be fishing on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
para "Swing by if you"
@@ -1027,7 +1027,7 @@ UnknownText_0x65f88:
para "I'll be waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
done
@@ -1049,7 +1049,7 @@ UnknownText_0x66043:
para "Our battle will be"
line "on @"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
done
@@ -1059,7 +1059,7 @@ UnknownText_0x66087:
para "Hustle over to"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
done
@@ -1082,7 +1082,7 @@ UnknownText_0x6613c:
line "down this wild"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
line "It wasn't rare"
@@ -1120,7 +1120,7 @@ UnknownText_0x66214:
para "You know where--"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
done
@@ -1223,13 +1223,13 @@ UnknownText_0x66579:
para "Hurry over to"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
done
UnknownText_0x665ad:
text "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "'s"
line "adorable, don't"
@@ -1245,7 +1245,7 @@ UnknownText_0x66605:
line "battle a wild"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " a while"
line "ago…"
@@ -1256,7 +1256,7 @@ UnknownText_0x66605:
para "I hate those nasty"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "!"
done
@@ -1265,7 +1265,7 @@ UnknownText_0x66688:
line "battle a wild"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " a while"
line "ago…"
@@ -1290,12 +1290,12 @@ UnknownText_0x66730:
para "I'll be waiting"
line "with CLEFAIRY on"
cont "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
done
TiffanyItsAwfulText:
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "!"
para "It's awful."
@@ -1326,7 +1326,7 @@ UnknownText_0x66801:
para "Come collect it on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
done
@@ -1347,7 +1347,7 @@ UnknownText_0x668a3:
para "Please hurry to"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
@@ -1361,13 +1361,13 @@ UnknownText_0x6691d:
para "Please hurry to"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
VanceLiftoffText:
text "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "'s"
line "become tougher."
@@ -1378,7 +1378,7 @@ VanceLiftoffText:
UnknownText_0x669b2:
text "We can easily beat"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "!"
para "…Huh? You too?"
@@ -1388,7 +1388,7 @@ UnknownText_0x669b2:
UnknownText_0x669ed:
text "But get this, a"
line "wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
para "just barely eluded"
line "us."
@@ -1400,7 +1400,7 @@ UnknownText_0x669ed:
UnknownText_0x66a3a:
text "Right now, I'm on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
para "You know, where I"
@@ -1425,14 +1425,14 @@ VanceHurryHurryText:
line "Hurry, hurry!"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
line "FLY over now!"
done
WiltonGrownText:
text "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "'s"
line "grown impressive!"
@@ -1443,7 +1443,7 @@ WiltonGrownText:
UnknownText_0x66b3e:
text "We beat a wild"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "…"
para "You know, I have"
@@ -1459,7 +1459,7 @@ UnknownText_0x66b8f:
para "to landing a wild"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
para "I tell you, it was"
@@ -1469,7 +1469,7 @@ UnknownText_0x66b8f:
UnknownText_0x66bf3:
text "I'm fishing on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text ","
para "but nothing's"
@@ -1490,7 +1490,7 @@ UnknownText_0x66c6b:
para "Come pick it up on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
done
@@ -1511,7 +1511,7 @@ WiltonNotBitingText:
para "like before on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "…"
para "You have to come"
@@ -1526,7 +1526,7 @@ WiltonWantThisText:
line "know where?"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "…"
line "Just head from"
@@ -1601,14 +1601,14 @@ UnknownText_0x66f52:
ParryNoMatchText:
text "Nothing can match"
line "my @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " now."
done
UnknownText_0x66fc0:
text "Yeah, we KO'd a"
line "wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "!"
para "That was OK, but I"
@@ -1620,7 +1620,7 @@ UnknownText_0x67001:
line "spotted a wild"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
line "We were debating"
@@ -1643,7 +1643,7 @@ UnknownText_0x67096:
para "Yep! We'll meet on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
@@ -1660,7 +1660,7 @@ ParryBattleWithMeText:
ParryHaventYouGottenToText:
text "Haven't you gotten"
line "to @"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "?"
para "Waiting here isn't"
@@ -1669,9 +1669,9 @@ ParryHaventYouGottenToText:
done
UnknownText_0x6717a:
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "'s @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
line "is much stronger"
cont "than before!"
@@ -1681,7 +1681,7 @@ UnknownText_0x671a4:
text "And, and…"
line "I just battled and"
cont "beat @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "!"
para "I've raised my"
@@ -1692,7 +1692,7 @@ UnknownText_0x671eb:
text "But, but…"
para "A wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
line "got away from me"
@@ -1709,7 +1709,7 @@ UnknownText_0x6722e:
para "I'll be waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
@@ -1732,6 +1732,6 @@ ErinComeBattleText:
para "I'll be waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
diff --git a/data/phone/text/extra2.asm b/data/phone/text/extra2.asm
index e14378832..da6acc40c 100644
--- a/data/phone/text/extra2.asm
+++ b/data/phone/text/extra2.asm
@@ -20,7 +20,7 @@ UnknownText_0x174000:
JackIntelligenceText:
text "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "'s"
line "intelligence keeps"
@@ -33,7 +33,7 @@ JackDefeatedMonText:
text "The other day, I"
line "easily defeated a"
cont "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
para "I think swapping"
@@ -46,7 +46,7 @@ UnknownText_0x174165:
line "I missed catching"
para "a @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " by"
line "just a tiny bit."
@@ -66,7 +66,7 @@ UnknownText_0x1741e1:
para "I'll be in"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
para "Give me a shout if"
@@ -208,14 +208,14 @@ UnknownText_0x174638:
para "I'll be at"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
done
UnknownText_0x174688:
text "I fancied up my"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " and"
para "made it even cuter"
@@ -245,7 +245,7 @@ UnknownText_0x174734:
line "showed it was"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text ". I was"
line "quite miffed."
done
@@ -267,7 +267,7 @@ BeverlyFoundNuggetText:
para "I'll be at"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
para "Please come see me"
@@ -290,7 +290,7 @@ UnknownText_0x174895:
line "hurry. Come see me"
para "in @"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text_start
line "when you can."
done
@@ -303,7 +303,7 @@ UnknownText_0x1748ea:
line "last time!"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "'s"
line "where I'm waiting"
@@ -332,7 +332,7 @@ UnknownText_0x1749c7:
cont "about our battle!"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
para "Hustle over quick!"
@@ -341,14 +341,14 @@ UnknownText_0x1749c7:
GavenGreaterText:
text "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
line "might be greater"
cont "than I imagined."
para "I doubt I'll see a"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " that's"
cont "better than mine."
done
@@ -358,13 +358,13 @@ UnknownText_0x174a80:
line "to barely defeat"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " the"
line "other day."
para "I've never seen a"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " get"
cont "that strong…"
@@ -380,7 +380,7 @@ UnknownText_0x174b2d:
text "And a while back,"
line "I tried to catch a"
cont "wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
para "But it managed to"
@@ -398,7 +398,7 @@ UnknownText_0x174bc5:
para "I'll be waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
para "Give me a shout"
@@ -421,18 +421,18 @@ UnknownText_0x174c49:
para "I'll take you down"
line "with @"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
UnknownText_0x174c7f:
text "Do you remember my"
line "sweet @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "?"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " runs"
line "very fast."
@@ -446,7 +446,7 @@ UnknownText_0x174c7f:
UnknownText_0x174cf6:
text "Oh, have you ever"
line "seen a @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
cont "before?"
@@ -466,7 +466,7 @@ UnknownText_0x174cf6:
UnknownText_0x174d86:
text "Oh, I just saw a"
line "wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
para "I was trying to"
@@ -495,7 +495,7 @@ UnknownText_0x174e4e:
line "for you around"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
line "Look for me, OK?"
done
@@ -517,7 +517,7 @@ BethForgetDealText:
line "deal?"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
para "That's where I'm"
@@ -527,7 +527,7 @@ BethForgetDealText:
JoseAromaText:
text "Hey listen, my"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "'s stick"
para "has this really"
@@ -541,7 +541,7 @@ UnknownText_0x174f90:
text "A while ago, my"
line "FARFETCH'D KO'd"
cont "this @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
para "You should have"
@@ -554,7 +554,7 @@ UnknownText_0x174f90:
UnknownText_0x174ffd:
text "I ran into a wild"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "…"
para "I was trying to"
@@ -578,7 +578,7 @@ UnknownText_0x17507d:
line "raring to go."
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "'s"
line "where I'm at."
@@ -600,7 +600,7 @@ JoseFoundSomethingText:
para "Catch up to me on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text ","
para "and I'll let you"
@@ -633,7 +633,7 @@ UnknownText_0x17520a:
line "stick!"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
para "Please come as"
@@ -648,7 +648,7 @@ UnknownText_0x17529c:
para "Catch up to me on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text ","
para "and I'll let you"
@@ -660,12 +660,12 @@ UnknownText_0x1752f5:
para "Do you recall my"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "?"
para "Yes, exactly. That"
line "lovely @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
para "Wouldn't you agree"
@@ -676,13 +676,13 @@ UnknownText_0x1752f5:
UnknownText_0x17536b:
text "Have I ever faced"
line "a wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "?"
para "You need to ask?"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " I've"
line "beaten on numerous"
cont "occasions!"
@@ -699,7 +699,7 @@ UnknownText_0x1753c5:
line "to catch a wild"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "…"
line "Oh! Never mind!"
done
@@ -710,7 +710,7 @@ UnknownText_0x17543a:
para "The place shall be"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
para "Don't make me"
@@ -739,14 +739,14 @@ UnknownText_0x1754e5:
line "the place was"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
line "Don't try to run!"
done
JoeySharperText:
text "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "'s"
line "looking sharper"
cont "than before!"
@@ -761,7 +761,7 @@ JoeySharperText:
UnknownText_0x175591:
text "Oh yeah, I took"
line "down a @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
para "in the wild the"
line "other day."
@@ -776,7 +776,7 @@ UnknownText_0x175591:
UnknownText_0x175611:
text "Oh yeah, I saw a"
line "wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "!"
para "I thought about"
@@ -797,7 +797,7 @@ UnknownText_0x175693:
line "will be different!"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "'s"
line "where I'll be."
@@ -812,7 +812,7 @@ UnknownText_0x17570a:
UnknownText_0x17571d:
text "I'm checking out"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "'s moves"
para "and devising some"
@@ -832,7 +832,7 @@ UnknownText_0x175786:
para "I'm waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
@@ -847,7 +847,7 @@ WadeAreYouGrowingText:
line "It's overwhelming!"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "'s grow-"
line "ing especially"
@@ -858,7 +858,7 @@ WadeAreYouGrowingText:
UnknownText_0x175869:
text "Oh yeah, we KO'd a"
line "wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
para "with one hit a"
line "while back."
@@ -873,7 +873,7 @@ UnknownText_0x175869:
UnknownText_0x1758e4:
text "Oh yeah, a wild"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " got"
para "away from me at"
@@ -897,7 +897,7 @@ UnknownText_0x175976:
line "last time!"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "'s"
line "where I'll be."
@@ -932,7 +932,7 @@ WadeFoundBerryText:
para "I'll be waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
done
@@ -952,7 +952,7 @@ UnknownText_0x175b1e:
line "already!"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text " is"
line "where I am."
@@ -965,7 +965,7 @@ UnknownText_0x175b6d:
line "not here yet?"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text " is"
line "where I am."
@@ -978,7 +978,7 @@ RalphNeglectingKidsText:
line "more time with my"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " than I"
line "have with my kids."
@@ -989,7 +989,7 @@ RalphNeglectingKidsText:
UnknownText_0x175c24:
text "I just beat a wild"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
para "I told my kid, but"
@@ -1005,7 +1005,7 @@ UnknownText_0x175c24:
UnknownText_0x175c9f:
text "Yesterday a wild"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " slipped"
para "away from me, in"
@@ -1032,7 +1032,7 @@ UnknownText_0x175d40:
line "quite agreeable."
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text " is"
line "the spot!"
done
@@ -1047,7 +1047,7 @@ UnknownText_0x175dd9:
para "Uh, sorry! See,"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " are"
para "biting like there"
@@ -1055,7 +1055,7 @@ UnknownText_0x175dd9:
para "over here on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
para "Aiyee! Ouch!"
@@ -1088,7 +1088,7 @@ UnknownText_0x175f11:
para "you to show up on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
para "You shouldn't make"
@@ -1112,7 +1112,7 @@ UnknownText_0x175fda:
line "hear this."
para "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " is"
line "so adorable!"
@@ -1125,7 +1125,7 @@ UnknownText_0x17602d:
para "We beat a wild"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " with"
para "just one hit a"
@@ -1141,7 +1141,7 @@ UnknownText_0x176095:
para "We just saw a"
line "really gorgeous"
cont "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
para "But I was on the"
@@ -1163,7 +1163,7 @@ UnknownText_0x17610a:
para "I'll be waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
para "Let me know when"
@@ -1350,13 +1350,13 @@ UnknownText_0x176816:
para "I saw a beautiful"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "!"
para "I wish I could"
line "become a beautiful"
cont "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " too."
done
@@ -1373,7 +1373,7 @@ UnknownText_0x1768b0:
text "Listen, listen!"
para "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "…"
line "it… so pretty…"
@@ -1412,7 +1412,7 @@ UnknownText_0x1769da:
para "I'll be waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
@@ -1421,7 +1421,7 @@ AnthonyAteBerriesText:
line "was watching my"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " eat"
line "some BERRIES."
@@ -1443,7 +1443,7 @@ UnknownText_0x176aef:
line "running across"
para "wild @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
line "quite often."
@@ -1456,7 +1456,7 @@ UnknownText_0x176b45:
line "battling this"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " the"
line "other day…"
@@ -1476,7 +1476,7 @@ UnknownText_0x176bee:
line "battle right now!"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text " is"
line "where I am."
@@ -1495,20 +1495,20 @@ UnknownText_0x176c61:
para "I took a hike in"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text_start
cont "yesterday, see?"
para "Well, there were"
line "tons of @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
para "around! You have"
line "to see it!"
para "I get this feeling"
line "that @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
para "may be timid."
line "I didn't see any"
@@ -1535,7 +1535,7 @@ UnknownText_0x176d85:
line "you?"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
line "I'm waiting!"
done
@@ -1558,7 +1558,7 @@ UnknownText_0x176dd1:
ToddLooksCuteLikeMeText:
text "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " is"
line "looking more and"
@@ -1571,7 +1571,7 @@ UnknownText_0x176e9c:
para "Now we can KO"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " easily."
para "I should challenge"
@@ -1583,7 +1583,7 @@ UnknownText_0x176eee:
line "We just failed to"
para "beat @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " by"
line "a tiny margin."
@@ -1606,7 +1606,7 @@ UnknownText_0x176f60:
para "I'll be waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
done
@@ -1656,7 +1656,7 @@ UnknownText_0x177138:
para "I'll be waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
done
@@ -1676,7 +1676,7 @@ UnknownText_0x17717c:
UnknownText_0x1771fd:
text "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " and"
line "I are getting more"
@@ -1687,7 +1687,7 @@ UnknownText_0x1771fd:
UnknownText_0x177237:
text "We battled a wild"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " and"
para "managed to drop it"
@@ -1702,7 +1702,7 @@ UnknownText_0x177297:
para "I still haven't"
line "caught @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
para "It's getting past"
@@ -1716,7 +1716,7 @@ UnknownText_0x1772e2:
para "I'll be waiting on"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "."
para "…Could you take it"
@@ -1752,7 +1752,7 @@ UnknownText_0x1773e7:
line "it, won't you?"
para "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text " is"
line "where I am."
done
@@ -1777,7 +1777,7 @@ UnknownText_0x1774c1:
para "Don't forget,"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
@@ -1790,6 +1790,6 @@ UnknownText_0x17750e:
para "Hurry over to"
line "@"
- text_from_ram wStringBuffer5
+ text_ram wStringBuffer5
text "!"
done
diff --git a/data/phone/text/gaven_overworld.asm b/data/phone/text/gaven_overworld.asm
index a43c4080b..aba0625e0 100644
--- a/data/phone/text/gaven_overworld.asm
+++ b/data/phone/text/gaven_overworld.asm
@@ -12,7 +12,7 @@ GavenAskNumber1Text:
line "again when I heal"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " and the"
line "rest of my team."
done
@@ -25,7 +25,7 @@ GavenAskNumber2Text:
line "again when I heal"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " and the"
line "rest of my team."
done
diff --git a/data/phone/text/jose_overworld.asm b/data/phone/text/jose_overworld.asm
index e57e78a9e..94db33dca 100644
--- a/data/phone/text/jose_overworld.asm
+++ b/data/phone/text/jose_overworld.asm
@@ -1,6 +1,6 @@
JoseAskNumber1Text:
text "If my @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
line "sees anything"
diff --git a/data/phone/text/mom.asm b/data/phone/text/mom.asm
index e392a609e..8ef86603d 100644
--- a/data/phone/text/mom.asm
+++ b/data/phone/text/mom.asm
@@ -8,12 +8,12 @@ MomPhoneGreetingText:
MomPhoneLandmarkText:
text "Oh, so you're in"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Isn't that where"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
para "is? Did you go"
line "take a look?"
@@ -22,7 +22,7 @@ MomPhoneLandmarkText:
MomPhoneGenericAreaText:
text "Really, you're in"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "?"
para "I've never gone"
@@ -33,7 +33,7 @@ MomPhoneGenericAreaText:
MomPhoneNewBarkText:
text "What? You're in"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "?"
para "Come see your MOM"
@@ -43,7 +43,7 @@ MomPhoneNewBarkText:
MomPhoneCherrygroveText:
text "You're visiting"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "?"
para "How about coming"
@@ -53,7 +53,7 @@ MomPhoneCherrygroveText:
MomOtherAreaText:
text "Wow, you're in"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "?"
para "Good luck on your"
@@ -74,7 +74,7 @@ MomDeterminedText:
MomCheckBalanceText:
text "By the way, you've"
line "saved up ¥@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Do you want to"
@@ -97,7 +97,7 @@ MomYoureNotSavingText:
MomYouveSavedText:
text "By the way, you've"
line "saved up ¥@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Want to start"
diff --git a/data/phone/text/trainers.asm b/data/phone/text/trainers.asm
index a907f62fe..5e99f60a0 100644
--- a/data/phone/text/trainers.asm
+++ b/data/phone/text/trainers.asm
@@ -1,7 +1,7 @@
UnknownText_0x1b4dc5:
text "Hello. This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Good morning,"
@@ -11,7 +11,7 @@ UnknownText_0x1b4dc5:
UnknownText_0x1b4ded:
text "Hello. This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "How's it going,"
@@ -21,7 +21,7 @@ UnknownText_0x1b4ded:
UnknownText_0x1b4e16:
text "Hello. This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Good evening,"
@@ -33,7 +33,7 @@ UnknownText_0x1b4e3e:
line "morning!"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "How are you doing?"
done
@@ -42,7 +42,7 @@ UnknownText_0x1b4e72:
text "<PLAY_G>, howdy!"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "Isn't it nice out?"
done
@@ -52,7 +52,7 @@ UnknownText_0x1b4e9e:
line "evening!"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "Got a minute?"
done
@@ -62,7 +62,7 @@ UnknownText_0x1b4ecd:
line "#MON doing?"
para "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " is"
line "so curious, it's a"
@@ -73,7 +73,7 @@ UnknownText_0x1b4ecd:
UnknownText_0x1b4f21:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Oh! Good morning,"
@@ -83,7 +83,7 @@ UnknownText_0x1b4f21:
UnknownText_0x1b4f4d:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Oh! Good day,"
@@ -93,7 +93,7 @@ UnknownText_0x1b4f4d:
UnknownText_0x1b4f75:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Oh! Good evening,"
@@ -105,7 +105,7 @@ UnknownText_0x1b4fa1:
line "Good morning."
para "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "Were you asleep?"
done
@@ -113,7 +113,7 @@ UnknownText_0x1b4fa1:
UnknownText_0x1b4fda:
text "Hi, <PLAYER>."
line "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "How are you doing?"
@@ -122,7 +122,7 @@ UnknownText_0x1b4fda:
UnknownText_0x1b5004:
text "Hi, <PLAYER>."
line "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Were you awake?"
@@ -133,7 +133,7 @@ UnknownText_0x1b502b:
line "#MON happy?"
para "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " is"
line "healthy. It eats a"
cont "lot every day."
@@ -142,7 +142,7 @@ UnknownText_0x1b502b:
UnknownText_0x1b5073:
text "Yeah, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Huh? What's up,"
@@ -152,7 +152,7 @@ UnknownText_0x1b5073:
UnknownText_0x1b509b:
text "Yeah, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Huh? What's up"
@@ -162,7 +162,7 @@ UnknownText_0x1b509b:
UnknownText_0x1b50c2:
text "Yeah, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Huh? What's up"
@@ -174,7 +174,7 @@ UnknownText_0x1b50e9:
line "You awake?"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
line "How's it going?"
done
@@ -184,7 +184,7 @@ UnknownText_0x1b511a:
line "free right now?"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
line "How's it going?"
done
@@ -194,7 +194,7 @@ UnknownText_0x1b5154:
line "Were you asleep?"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
line "How's it going?"
done
@@ -207,7 +207,7 @@ UnknownText_0x1b518b:
line "bit too energetic."
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text ","
line "especially."
@@ -221,7 +221,7 @@ UnknownText_0x1b518b:
UnknownText_0x1b522b:
text "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "'s"
line "looking tougher"
cont "than ever."
@@ -233,7 +233,7 @@ UnknownText_0x1b522b:
UnknownText_0x1b5270:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " speaking…"
para "Hi, <PLAY_G>!"
@@ -243,7 +243,7 @@ UnknownText_0x1b5270:
UnknownText_0x1b52a5:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " speaking…"
para "Hi, <PLAY_G>!"
@@ -252,7 +252,7 @@ UnknownText_0x1b52a5:
UnknownText_0x1b52cc:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " speaking…"
para "Hi, <PLAY_G>!"
@@ -264,7 +264,7 @@ UnknownText_0x1b5301:
line "morning!"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "How are you doing?"
done
@@ -273,7 +273,7 @@ UnknownText_0x1b5335:
text "Hi, <PLAY_G>!"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "How are you doing?"
done
@@ -283,7 +283,7 @@ UnknownText_0x1b535f:
line "evening!"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "How are you doing?"
done
@@ -293,7 +293,7 @@ UnknownText_0x1b5393:
line "#MON doing?"
para "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "'s"
line "doing as great as"
cont "ever."
@@ -306,7 +306,7 @@ UnknownText_0x1b5393:
UnknownText_0x1b53f7:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Oh, <PLAY_G>."
@@ -318,7 +318,7 @@ UnknownText_0x1b53f7:
UnknownText_0x1b5424:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Oh. Hi, <PLAY_G>."
@@ -327,7 +327,7 @@ UnknownText_0x1b5424:
UnknownText_0x1b5446:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Oh, <PLAY_G>."
@@ -339,7 +339,7 @@ UnknownText_0x1b5472:
line "<PLAY_G>!"
para "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "Were you sleeping?"
done
@@ -347,7 +347,7 @@ UnknownText_0x1b5472:
UnknownText_0x1b54a6:
text "<PLAY_G>, hi!"
line "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Do you have some"
@@ -359,7 +359,7 @@ UnknownText_0x1b54d4:
line "Good evening."
para "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "I hope you were"
@@ -386,7 +386,7 @@ UnknownText_0x1b5510:
UnknownText_0x1b55ae:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Oh, <PLAY_G>?"
@@ -396,7 +396,7 @@ UnknownText_0x1b55ae:
UnknownText_0x1b55da:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Oh, <PLAY_G>? Hi!"
@@ -405,7 +405,7 @@ UnknownText_0x1b55da:
UnknownText_0x1b55fc:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Oh, <PLAY_G>?"
@@ -417,7 +417,7 @@ UnknownText_0x1b5628:
para "Tweet! Yeah, it's"
line "me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
@@ -426,7 +426,7 @@ UnknownText_0x1b564c:
para "Tweet! Yeah, it's"
line "me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
@@ -435,7 +435,7 @@ UnknownText_0x1b5670:
para "Tweet! Yeah, it's"
line "me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
@@ -444,7 +444,7 @@ UnknownText_0x1b5694:
line "still cooking?"
para "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " has"
line "too much energy."
@@ -456,7 +456,7 @@ UnknownText_0x1b5694:
UnknownText_0x1b5702:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Oh. Hi, <PLAYER>."
@@ -466,7 +466,7 @@ UnknownText_0x1b5702:
UnknownText_0x1b572e:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Oh, hi, <PLAYER>,"
@@ -476,7 +476,7 @@ UnknownText_0x1b572e:
UnknownText_0x1b575a:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Oh, hi, <PLAYER>,"
@@ -488,7 +488,7 @@ UnknownText_0x1b5786:
line "up and answer!"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -497,7 +497,7 @@ UnknownText_0x1b57b7:
line "up and answer!"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -506,7 +506,7 @@ UnknownText_0x1b57e8:
line "up and answer!"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -528,7 +528,7 @@ UnknownText_0x1b5819:
UnknownText_0x1b589a:
text "Hi, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here!"
para "Oh, <PLAYER>? You"
@@ -537,7 +537,7 @@ UnknownText_0x1b589a:
UnknownText_0x1b58c2:
text "Hi, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here!"
para "Oh, <PLAYER>? You"
@@ -546,7 +546,7 @@ UnknownText_0x1b58c2:
UnknownText_0x1b58ea:
text "Hi, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here!"
para "Oh, <PLAYER>? You"
@@ -558,7 +558,7 @@ UnknownText_0x1b5912:
line "How're you doing?"
para "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text ","
line "got a minute?"
done
@@ -568,7 +568,7 @@ UnknownText_0x1b5948:
line "it going?"
para "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "Got a minute?"
done
@@ -578,7 +578,7 @@ UnknownText_0x1b597c:
line "How're you doing?"
para "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text ","
line "got a minute?"
done
@@ -588,7 +588,7 @@ UnknownText_0x1b59b2:
line "#MON doing?"
para "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "'s"
line "raring to go, just"
cont "like always."
@@ -603,7 +603,7 @@ UnknownText_0x1b59b2:
UnknownText_0x1b5a3b:
text "Hello? This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " speaking."
para "Oh. Hi, <PLAY_G>!"
@@ -613,7 +613,7 @@ UnknownText_0x1b5a3b:
UnknownText_0x1b5a74:
text "Hello? This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " speaking."
para "Oh, hi, <PLAY_G>!"
@@ -622,7 +622,7 @@ UnknownText_0x1b5a74:
UnknownText_0x1b5a9f:
text "Hello? This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " speaking."
para "Oh, hi, <PLAY_G>!"
@@ -634,7 +634,7 @@ UnknownText_0x1b5ad8:
line "morning!"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "Isn't it nice out?"
done
@@ -643,7 +643,7 @@ UnknownText_0x1b5b0b:
text "<PLAY_G>, howdy!"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "Isn't it nice out?"
done
@@ -653,7 +653,7 @@ UnknownText_0x1b5b37:
line "<PLAY_G>!"
para "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "Were you awake?"
done
@@ -670,7 +670,7 @@ UnknownText_0x1b5b68:
para "Of all my #MON,"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " is the"
cont "hardest to handle."
@@ -711,21 +711,21 @@ UnknownText_0x1b5cb6:
UnknownText_0x1b5d09:
text "Hiya, it's Uncle"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
UnknownText_0x1b5d21:
text "Hiya, it's Uncle"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
UnknownText_0x1b5d39:
text "Hiya, it's Uncle"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
@@ -740,7 +740,7 @@ UnknownText_0x1b5d51:
UnknownText_0x1b5d9f:
text "Hello, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "speaking."
@@ -750,7 +750,7 @@ UnknownText_0x1b5d9f:
UnknownText_0x1b5dcc:
text "Hello, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "speaking."
@@ -760,7 +760,7 @@ UnknownText_0x1b5dcc:
UnknownText_0x1b5df8:
text "Hello, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "speaking."
@@ -773,7 +773,7 @@ UnknownText_0x1b5e25:
line "<PLAY_G>."
para "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "Were you sleeping?"
done
@@ -781,7 +781,7 @@ UnknownText_0x1b5e25:
UnknownText_0x1b5e59:
text "Hi, <PLAY_G>."
line "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "How are things"
@@ -793,7 +793,7 @@ UnknownText_0x1b5e8e:
line "<PLAY_G>."
para "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "Are you awake?"
done
@@ -807,7 +807,7 @@ UnknownText_0x1b5ebe:
para "Me, I take my"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " to the"
para "#MON CENTER in"
@@ -822,7 +822,7 @@ UnknownText_0x1b5ebe:
UnknownText_0x1b5f7a:
text "Yeah, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " the"
line "HIKER here."
@@ -831,7 +831,7 @@ UnknownText_0x1b5f7a:
UnknownText_0x1b5f9e:
text "Yeah, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " the"
line "HIKER here."
@@ -841,7 +841,7 @@ UnknownText_0x1b5f9e:
UnknownText_0x1b5fc9:
text "Yeah, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " the"
line "HIKER here."
@@ -853,7 +853,7 @@ UnknownText_0x1b5ff6:
text "Yo, <PLAYER>?"
para "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "the HIKER!"
done
@@ -863,7 +863,7 @@ UnknownText_0x1b6017:
line "<PLAYER>?"
para "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "the HIKER!"
done
@@ -873,7 +873,7 @@ UnknownText_0x1b6041:
line "awake?"
para "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "the HIKER!"
done
@@ -883,7 +883,7 @@ UnknownText_0x1b606f:
line "as feisty as ever?"
para "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " and"
line "me--we have energy"
@@ -897,7 +897,7 @@ UnknownText_0x1b606f:
UnknownText_0x1b60f5:
text "Yes? This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " speaking."
para "Hey, <PLAY_G>!"
@@ -906,7 +906,7 @@ UnknownText_0x1b60f5:
UnknownText_0x1b611b:
text "Yes? This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " speaking."
para "This must be"
@@ -916,7 +916,7 @@ UnknownText_0x1b611b:
UnknownText_0x1b6149:
text "Yes? This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " speaking."
para "Ah, <PLAY_G>!"
@@ -925,7 +925,7 @@ UnknownText_0x1b6149:
UnknownText_0x1b616e:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "<PLAY_G>, right?"
@@ -934,7 +934,7 @@ UnknownText_0x1b616e:
UnknownText_0x1b618f:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "<PLAY_G>, what are"
@@ -944,7 +944,7 @@ UnknownText_0x1b618f:
UnknownText_0x1b61bd:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "<PLAY_G>, sorry to"
@@ -968,7 +968,7 @@ UnknownText_0x1b61f2:
UnknownText_0x1b626a:
text "Hello? This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Oh, <PLAY_G>!"
@@ -978,7 +978,7 @@ UnknownText_0x1b626a:
UnknownText_0x1b6296:
text "Hello? This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Oh, <PLAY_G>!"
@@ -988,7 +988,7 @@ UnknownText_0x1b6296:
UnknownText_0x1b62c5:
text "Hello? This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Oh, <PLAY_G>!"
@@ -999,7 +999,7 @@ UnknownText_0x1b62f1:
text "<PLAY_G>?"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "Good morning!"
done
@@ -1008,7 +1008,7 @@ UnknownText_0x1b630e:
text "<PLAY_G>?"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text ". Is"
line "this a bad time?"
done
@@ -1017,7 +1017,7 @@ UnknownText_0x1b6331:
text "<PLAY_G>?"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "Got time to chat?"
done
@@ -1028,13 +1028,13 @@ UnknownText_0x1b6352:
para "I train every day"
line "with @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
done
UnknownText_0x1b638c:
text "Hello? @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "here…"
@@ -1043,7 +1043,7 @@ UnknownText_0x1b638c:
UnknownText_0x1b63a8:
text "Hello? @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "here…"
@@ -1052,7 +1052,7 @@ UnknownText_0x1b63a8:
UnknownText_0x1b63c4:
text "Hello? @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "here…"
@@ -1065,7 +1065,7 @@ UnknownText_0x1b63e3:
para "It's your pal,"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -1075,7 +1075,7 @@ UnknownText_0x1b6407:
para "It's your buddy"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -1085,14 +1085,14 @@ UnknownText_0x1b642c:
para "It's your sidekick"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
UnknownText_0x1b6454:
text "Yeah, hello."
line "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "…Huh, <PLAY_G>? Yo!"
@@ -1101,7 +1101,7 @@ UnknownText_0x1b6454:
UnknownText_0x1b647e:
text "Yeah, hello, you"
line "got @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "…Huh, <PLAY_G>? Yo!"
@@ -1110,7 +1110,7 @@ UnknownText_0x1b647e:
UnknownText_0x1b64a8:
text "Yeah, hello, you"
line "got @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "…Huh, <PLAY_G>? Yo!"
@@ -1119,7 +1119,7 @@ UnknownText_0x1b64a8:
UnknownText_0x1b64d2:
text "Yeah, hello?"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " calling."
para "What are you up"
@@ -1129,7 +1129,7 @@ UnknownText_0x1b64d2:
UnknownText_0x1b6506:
text "Yeah, hello?"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " calling."
para "Where are you now,"
@@ -1139,7 +1139,7 @@ UnknownText_0x1b6506:
UnknownText_0x1b6539:
text "Yeah, hello?"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " calling."
para "Are you awake now,"
@@ -1154,7 +1154,7 @@ UnknownText_0x1b656c:
UnknownText_0x1b659d:
text "Yup, it's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
para "Is this <PLAY_G>?"
@@ -1163,7 +1163,7 @@ UnknownText_0x1b659d:
UnknownText_0x1b65c7:
text "Yup, it's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
para "Is that <PLAY_G>?"
@@ -1171,7 +1171,7 @@ UnknownText_0x1b65c7:
UnknownText_0x1b65e3:
text "Yup, it's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
para "Is that <PLAY_G>?"
@@ -1181,21 +1181,21 @@ UnknownText_0x1b65e3:
UnknownText_0x1b660d:
text "Hello! It's me,"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
UnknownText_0x1b6624:
text "Hello! It's me,"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
UnknownText_0x1b663b:
text "Hello! It's me,"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -1214,7 +1214,7 @@ UnknownText_0x1b6652:
UnknownText_0x1b66c8:
text "Hi, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " on the"
line "line."
@@ -1223,7 +1223,7 @@ UnknownText_0x1b66c8:
UnknownText_0x1b66ec:
text "Hi, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " on the"
line "line."
@@ -1233,7 +1233,7 @@ UnknownText_0x1b66ec:
UnknownText_0x1b6713:
text "Hi, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " on the"
line "line."
@@ -1246,7 +1246,7 @@ UnknownText_0x1b6738:
para "It's me!"
line "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -1255,7 +1255,7 @@ UnknownText_0x1b6757:
para "It's me!"
line "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -1264,13 +1264,13 @@ UnknownText_0x1b6776:
para "It's me!"
line "It's me, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
UnknownText_0x1b6795:
text "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " is"
line "so full of energy,"
@@ -1284,7 +1284,7 @@ UnknownText_0x1b6795:
UnknownText_0x1b67e2:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Hi, <PLAY_G>!"
@@ -1294,7 +1294,7 @@ UnknownText_0x1b67e2:
UnknownText_0x1b680e:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Hi, <PLAY_G>, good"
@@ -1304,7 +1304,7 @@ UnknownText_0x1b680e:
UnknownText_0x1b6836:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Hi, <PLAY_G>, good"
@@ -1316,7 +1316,7 @@ UnknownText_0x1b6862:
line "morning!"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "How are you?"
done
@@ -1326,7 +1326,7 @@ UnknownText_0x1b6890:
line "day!"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "How are you?"
done
@@ -1336,7 +1336,7 @@ UnknownText_0x1b68ba:
line "evening!"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "How are you?"
done
@@ -1386,7 +1386,7 @@ UnknownText_0x1b6a22:
line "morning!"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text ", how"
line "pika are you?"
done
@@ -1396,7 +1396,7 @@ UnknownText_0x1b6a56:
line "pika day!"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text ", how"
line "pika are you?"
done
@@ -1406,7 +1406,7 @@ UnknownText_0x1b6a8b:
line "evening!"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text ". Were"
line "you pika awake?"
done
@@ -1416,7 +1416,7 @@ UnknownText_0x1b6ac2:
line "this! My lovable"
para "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " looked"
line "at me and grinned!"
@@ -1428,7 +1428,7 @@ UnknownText_0x1b6ac2:
UnknownText_0x1b6b39:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Oh, Good morning,"
@@ -1438,7 +1438,7 @@ UnknownText_0x1b6b39:
UnknownText_0x1b6b65:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "That voice…"
@@ -1448,7 +1448,7 @@ UnknownText_0x1b6b65:
UnknownText_0x1b6b92:
text "Hello, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "This must be"
@@ -1458,7 +1458,7 @@ UnknownText_0x1b6b92:
UnknownText_0x1b6bb9:
text "Hello!"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here…"
para "Good morning! The"
@@ -1468,7 +1468,7 @@ UnknownText_0x1b6bb9:
UnknownText_0x1b6bef:
text "Hello!"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here…"
para "What a perfect day"
@@ -1478,7 +1478,7 @@ UnknownText_0x1b6bef:
UnknownText_0x1b6c23:
text "Hello!"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here…"
para "It's a great night"
@@ -1495,7 +1495,7 @@ UnknownText_0x1b6c56:
UnknownText_0x1b6c96:
text "Yes? @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here…"
para "Ah, <PLAYER>. What"
@@ -1504,7 +1504,7 @@ UnknownText_0x1b6c96:
UnknownText_0x1b6cc6:
text "Yes? @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here…"
para "Ah, <PLAYER>. What"
@@ -1513,7 +1513,7 @@ UnknownText_0x1b6cc6:
UnknownText_0x1b6cf6:
text "Yes? @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here…"
para "Ah, <PLAYER>. What"
@@ -1526,7 +1526,7 @@ UnknownText_0x1b6d26:
para "Hey! It's me,"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
@@ -1536,7 +1536,7 @@ UnknownText_0x1b6d57:
para "Hey, it's me,"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
@@ -1546,7 +1546,7 @@ UnknownText_0x1b6d88:
para "Hey, it's me,"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
@@ -1564,7 +1564,7 @@ UnknownText_0x1b6db9:
line "I'm impressed."
para "Heh, my @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
line "is so tough, it"
@@ -1576,7 +1576,7 @@ UnknownText_0x1b6db9:
UnknownText_0x1b6e7c:
text "Yes? This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Oh, <PLAY_G>."
@@ -1586,7 +1586,7 @@ UnknownText_0x1b6e7c:
UnknownText_0x1b6ea6:
text "Yes? This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Oh, <PLAY_G>."
@@ -1596,7 +1596,7 @@ UnknownText_0x1b6ea6:
UnknownText_0x1b6ec9:
text "Yes? This is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
para "Oh, <PLAY_G>, good"
@@ -1608,7 +1608,7 @@ UnknownText_0x1b6ef3:
para "Good morning. This"
line "is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
@@ -1616,7 +1616,7 @@ UnknownText_0x1b6f1c:
text "Is this <PLAY_G>?"
para "Hi, it's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
@@ -1625,7 +1625,7 @@ UnknownText_0x1b6f37:
para "Good evening. This"
line "is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
@@ -1641,7 +1641,7 @@ UnknownText_0x1b6f60:
line "too hard."
para "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " is"
line "cute and lively"
@@ -1655,7 +1655,7 @@ UnknownText_0x1b6f60:
UnknownText_0x1b7019:
text "Yes, hello?"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here!"
para "Morning, <PLAY_G>!"
@@ -1667,7 +1667,7 @@ UnknownText_0x1b7019:
UnknownText_0x1b7057:
text "Yes, hello?"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here!"
para "Hi, <PLAY_G>!"
@@ -1679,7 +1679,7 @@ UnknownText_0x1b7057:
UnknownText_0x1b7092:
text "Yes, hello?"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here!"
para "Evening, <PLAY_G>!"
@@ -1694,7 +1694,7 @@ UnknownText_0x1b70e7:
line "<PLAY_G>!"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
line "Good morning!"
done
@@ -1703,7 +1703,7 @@ UnknownText_0x1b7112:
text "Hi, <PLAY_G>!"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
line "Remember me?"
done
@@ -1713,7 +1713,7 @@ UnknownText_0x1b7132:
line "<PLAY_G>!"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
line "Are you free now?"
done
@@ -1723,7 +1723,7 @@ UnknownText_0x1b7161:
line "#MON fine?"
para "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
line "looks like it will"
@@ -1737,7 +1737,7 @@ UnknownText_0x1b7161:
UnknownText_0x1b71d5:
text "Hello, you have"
line "reached @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Ah, <PLAY_G>."
@@ -1746,7 +1746,7 @@ UnknownText_0x1b71d5:
UnknownText_0x1b71fc:
text "Hello, you have"
line "reached @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Ah, <PLAY_G>, is"
@@ -1756,7 +1756,7 @@ UnknownText_0x1b71fc:
UnknownText_0x1b722a:
text "Hello, you have"
line "reached @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Ah, if it isn't"
@@ -1765,7 +1765,7 @@ UnknownText_0x1b722a:
UnknownText_0x1b725c:
text "Ah, it's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Have you got a"
@@ -1774,7 +1774,7 @@ UnknownText_0x1b725c:
UnknownText_0x1b7283:
text "Ah, it's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Can you talk now?"
@@ -1782,7 +1782,7 @@ UnknownText_0x1b7283:
UnknownText_0x1b72a5:
text "Ah, it's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Sorry for calling"
@@ -1794,13 +1794,13 @@ UnknownText_0x1b72d0:
line "grown any?"
para "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " has"
line "grown quite a bit."
done
UnknownText_0x1b730b:
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here…"
para "<PLAYER>! Beautiful"
@@ -1808,7 +1808,7 @@ UnknownText_0x1b730b:
done
UnknownText_0x1b7331:
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here…"
para "<PLAYER>! Beautiful"
@@ -1816,7 +1816,7 @@ UnknownText_0x1b7331:
done
UnknownText_0x1b7357:
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " here…"
para "<PLAYER>! Beautiful"
@@ -1826,28 +1826,28 @@ UnknownText_0x1b7357:
UnknownText_0x1b737f:
text "Hey, <PLAYER>!"
line "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
UnknownText_0x1b7397:
text "Hey, <PLAYER>!"
line "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
UnknownText_0x1b73af:
text "Hey, <PLAYER>!"
line "This is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
UnknownText_0x1b73c7:
text "Yup, yup!"
line "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
para "Hah, and here's"
@@ -1857,7 +1857,7 @@ UnknownText_0x1b73c7:
UnknownText_0x1b73ef:
text "Yup, yup!"
line "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
para "Hah, and here's"
@@ -1867,7 +1867,7 @@ UnknownText_0x1b73ef:
UnknownText_0x1b7417:
text "Yup, yup!"
line "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
para "Hah, and here's"
@@ -1877,7 +1877,7 @@ UnknownText_0x1b7417:
UnknownText_0x1b743f:
text "<PLAY_G>, it's"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
para "Have you had a"
@@ -1887,7 +1887,7 @@ UnknownText_0x1b743f:
UnknownText_0x1b746f:
text "<PLAY_G>, it's"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
para "Have you had a"
@@ -1897,7 +1897,7 @@ UnknownText_0x1b746f:
UnknownText_0x1b749b:
text "<PLAY_G>, it's"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
para "Have you had a"
@@ -1909,7 +1909,7 @@ UnknownText_0x1b74c8:
line "looking good?"
para "My @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " and"
line "me--we're looking"
@@ -1920,7 +1920,7 @@ UnknownText_0x1b74c8:
UnknownText_0x1b751a:
text "Yes, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Oh. Hi, <PLAY_G>!"
@@ -1930,7 +1930,7 @@ UnknownText_0x1b751a:
UnknownText_0x1b7548:
text "Yes, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Oh, hi, <PLAY_G>!"
@@ -1940,7 +1940,7 @@ UnknownText_0x1b7548:
UnknownText_0x1b756f:
text "Yes, this is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
para "Oh, hi, <PLAY_G>!"
@@ -1950,7 +1950,7 @@ UnknownText_0x1b758f:
text "<PLAY_G>!"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
line "Good morning!"
done
@@ -1959,7 +1959,7 @@ UnknownText_0x1b75ac:
text "<PLAY_G>!"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
line "Working hard?"
done
@@ -1968,7 +1968,7 @@ UnknownText_0x1b75c9:
text "<PLAY_G>!"
para "It's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
line "Were you up?"
done
@@ -1978,10 +1978,10 @@ UnknownText_0x1b75e5:
line "your #MON?"
para "Hey, @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "'s"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " is"
cont "looking good!"
done
diff --git a/data/text/battle.asm b/data/text/battle.asm
index 9ac62c122..56a1cb8e1 100644
--- a/data/text/battle.asm
+++ b/data/text/battle.asm
@@ -3,13 +3,13 @@ BattleText:: ; used only for BANK(BattleText)
BattleText_PlayerPickedUpPayDayMoney:
text "<PLAYER> picked up"
line "¥@"
- deciram wPayDayMoney, 3, 6
+ text_decimal wPayDayMoney, 3, 6
text "!"
prompt
WildPokemonAppearedText:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "appeared!"
prompt
@@ -17,20 +17,20 @@ WildPokemonAppearedText:
HookedPokemonAttackedText:
text "The hooked"
line "@"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
cont "attacked!"
prompt
PokemonFellFromTreeText:
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text " fell"
line "out of the tree!"
prompt
WildCelebiAppearedText:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "appeared!"
prompt
@@ -42,14 +42,14 @@ WantsToBattleText::
BattleText_WildFled:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "fled!"
prompt
BattleText_EnemyFled:
text "Enemy @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "fled!"
prompt
@@ -87,7 +87,7 @@ SandstormHitsText:
PerishCountText:
text "<USER>'s"
line "PERISH count is @"
- deciram wDeciramBuffer, 1, 1
+ text_decimal wDeciramBuffer, 1, 1
text "!"
prompt
@@ -95,7 +95,7 @@ BattleText_TargetRecoveredWithItem:
text "<TARGET>"
line "recovered with"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -103,7 +103,7 @@ BattleText_UserRecoveredPPUsing:
text "<USER>"
line "recovered PP using"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -119,13 +119,13 @@ BattleText_SafeguardFaded:
prompt
BattleText_MonsLightScreenFell:
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " #MON's"
line "LIGHT SCREEN fell!"
prompt
BattleText_MonsReflectFaded:
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " #MON's"
line "REFLECT faded!"
prompt
@@ -161,14 +161,14 @@ BattleText_TheSandstormSubsided:
BattleText_EnemyMonFainted:
text "Enemy @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "fainted!"
prompt
GotMoneyForWinningText:
text "<PLAYER> got ¥@"
- deciram wBattleReward, 3, 6
+ text_decimal wBattleReward, 3, 6
text_start
line "for winning!"
prompt
@@ -185,7 +185,7 @@ TiedAgainstText:
SentSomeToMomText:
text "<PLAYER> got ¥@"
- deciram wBattleReward, 3, 6
+ text_decimal wBattleReward, 3, 6
text_start
line "for winning!"
cont "Sent some to MOM!"
@@ -206,7 +206,7 @@ BattleText_0x80a4f:
prompt
BattleText_MonFainted:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text_start
line "fainted!"
prompt
@@ -230,7 +230,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
text "<ENEMY>"
line "is about to use"
cont "@"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "."
para "Will <PLAYER>"
@@ -241,7 +241,7 @@ BattleText_EnemySentOut:
text "<ENEMY>"
line "sent out"
cont "@"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "!"
done
@@ -273,7 +273,7 @@ BattleText_UserFledUsingAStringBuffer1:
text "<USER>"
line "fled using a"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -290,14 +290,14 @@ RecoveredUsingText:
text "<TARGET>"
line "recovered using a"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
BattleText_UsersStringBuffer1Activated:
text "<USER>'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
cont "activated!"
prompt
@@ -308,13 +308,13 @@ BattleText_ItemsCantBeUsedHere:
prompt
BattleText_MonIsAlreadyOut:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text_start
line "is already out."
prompt
BattleText_MonCantBeRecalled:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text_start
line "can't be recalled!"
prompt
@@ -330,7 +330,7 @@ BattleText_TheMoveIsDisabled:
prompt
BattleText_MonHasNoMovesLeft:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text_start
line "has no moves left!"
done
@@ -341,24 +341,26 @@ BattleText_TargetsEncoreEnded:
prompt
BattleText_StringBuffer1GrewToLevel:
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " grew to"
line "level @"
- deciram wCurPartyLevel, 1, 3
+ text_decimal wCurPartyLevel, 1, 3
text "!@"
sound_dex_fanfare_50_79
- db "@@"
+ text_end
+
+ text_end ; unused
BattleText_WildMonIsEating:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "is eating!"
prompt
BattleText_WildMonIsAngry:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "is angry!"
prompt
@@ -416,7 +418,7 @@ BecameConfusedText:
BattleText_ItemHealedConfusion: ; ItemHealedConfusion
text "A @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " rid"
line "<TARGET>"
cont "of its confusion."
@@ -431,7 +433,7 @@ BattleText_UsersHurtByStringBuffer1:
text "<USER>'s"
line "hurt by"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -439,7 +441,7 @@ BattleText_UserWasReleasedFromStringBuffer1:
text "<USER>"
line "was released from"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -485,7 +487,7 @@ HungOnText:
text "<TARGET>"
line "hung on with"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -509,43 +511,43 @@ InfatuationText:
DisabledMoveText:
text "<USER>'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " is"
cont "DISABLED!"
prompt
LoafingAroundText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " is"
line "loafing around."
prompt
BeganToNapText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " began"
line "to nap!"
prompt
WontObeyText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " won't"
line "obey!"
prompt
TurnedAwayText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " turned"
line "away!"
prompt
IgnoredOrdersText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " ignored"
line "orders!"
prompt
IgnoredSleepingText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " ignored"
line "orders…sleeping!"
prompt
@@ -559,7 +561,7 @@ HasNoPPLeftText:
text "<USER>"
line "has no PP left for"
cont "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "!"
prompt
@@ -653,7 +655,7 @@ SketchedText:
text "<USER>"
line "SKETCHED"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -666,10 +668,10 @@ DestinyBondEffectText:
SpiteEffectText:
text "<TARGET>'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " was"
cont "reduced by @"
- deciram wDeciramBuffer, 1, 1
+ text_decimal wDeciramBuffer, 1, 1
text "!"
prompt
@@ -731,7 +733,7 @@ WasFrozenText:
WontRiseAnymoreText:
text "<USER>'s"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " won't"
cont "rise anymore!"
prompt
@@ -739,7 +741,7 @@ WontRiseAnymoreText:
WontDropAnymoreText:
text "<TARGET>'s"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " won't"
cont "drop anymore!"
prompt
@@ -761,13 +763,13 @@ BlownAwayText:
PlayerHitTimesText:
text "Hit @"
- deciram wPlayerDamageTaken, 1, 1
+ text_decimal wPlayerDamageTaken, 1, 1
text " times!"
prompt
EnemyHitTimesText:
text "Hit @"
- deciram wEnemyDamageTaken, 1, 1
+ text_decimal wEnemyDamageTaken, 1, 1
text " times!"
prompt
@@ -782,7 +784,7 @@ ProtectedByMistText:
prompt
GettingPumpedText:
- interpret_data
+ text_pause
text "<USER>'s"
line "getting pumped!"
prompt
@@ -822,7 +824,7 @@ LearnedMoveText:
text "<USER>"
line "learned"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -839,7 +841,7 @@ EvadedText:
WasDisabledText:
text "<TARGET>'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " was"
cont "DISABLED!"
prompt
@@ -853,7 +855,7 @@ TransformedTypeText:
text "<USER>"
line "transformed into"
cont "the @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "-type!"
prompt
@@ -866,7 +868,7 @@ TransformedText:
text "<USER>"
line "TRANSFORMED into"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -933,7 +935,7 @@ ProtectedByText:
text "<TARGET>'s"
line "protected by"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -945,7 +947,7 @@ MirrorMoveFailedText:
StoleText:
text "<USER>"
line "stole @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
cont "from its foe!"
prompt
@@ -1029,7 +1031,7 @@ SafeguardProtectText:
MagnitudeText:
text "Magnitude @"
- deciram wDeciramBuffer, 1, 1
+ text_decimal wDeciramBuffer, 1, 1
text "!"
prompt
@@ -1079,7 +1081,7 @@ ForesawAttackText:
prompt
BeatUpAttackText:
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "attack!"
done
diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index cf6e3ce8c..617de0f49 100644
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -6,14 +6,14 @@ _FruitBearingTreeText::
_HeyItsFruitText::
text "Hey! It's"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
_ObtainedFruitText::
text "Obtained"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -38,67 +38,69 @@ UnknownText_0x1bc089::
done
UnknownText_0x1bc0a2::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "recovered @"
- deciram wCurHPAnimDeltaHP, 2, 3
+ text_decimal wCurHPAnimDeltaHP, 2, 3
text "HP!"
done
UnknownText_0x1bc0bb::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "cured of poison."
done
UnknownText_0x1bc0d2::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "rid of paralysis."
done
UnknownText_0x1bc0ea::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "burn was healed."
done
UnknownText_0x1bc101::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "was defrosted."
done
UnknownText_0x1bc115::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "woke up."
done
UnknownText_0x1bc123::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "health returned."
done
UnknownText_0x1bc13a::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "is revitalized."
done
UnknownText_0x1bc14f::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " grew to"
line "level @"
- deciram wCurPartyLevel, 1, 3
+ text_decimal wCurPartyLevel, 1, 3
text "!@"
sound_dex_fanfare_50_79 ; plays SFX_DEX_FANFARE_50_79, identical to SFX_LEVEL_UP
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1bc16e::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " came"
line "to its senses."
done
@@ -148,7 +150,8 @@ UnknownText_0x1bc272::
done
UnknownText_0x1bc288::
- text "CARD FOLDER open.@@"
+ text "CARD FOLDER open.@"
+ text_end
UnknownText_0x1bc29c::
text "<……><……><……><……><……><……>"
@@ -166,7 +169,8 @@ UnknownText_0x1bc2eb::
done
UnknownText_0x1bc2fd::
- text "What?@@"
+ text "What?@"
+ text_end
UnknownText_0x1bc305::
text "?"
@@ -177,7 +181,8 @@ UnknownText_0x1bc308::
done
UnknownText_0x1bc31b::
- text "Whoa!@@"
+ text "Whoa!@"
+ text_end
UnknownText_0x1bc323::
text "?"
@@ -276,7 +281,7 @@ UnknownText_0x1bc4b2::
UnknownText_0x1bc4d7::
text "Put away the"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
prompt
@@ -288,19 +293,19 @@ UnknownText_0x1bc4ec::
UnknownText_0x1bc509::
text "Set up the"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
prompt
UnknownText_0x1bc51c::
text "Put away the"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
para "and set up the"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
prompt
@@ -331,7 +336,7 @@ UnknownText_0x1bc5b3::
UnknownText_0x1bc5d7::
text "It's an adorable"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
@@ -372,10 +377,10 @@ UnknownText_0x1bc6c7::
done
UnknownText_0x1bc6e9::
- text_from_ram wPlayerTrademonSpeciesName
+ text_ram wPlayerTrademonSpeciesName
text " was"
line "sent to @"
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text "."
done
@@ -384,104 +389,108 @@ UnknownText_0x1bc701::
done
UnknownText_0x1bc703::
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text " bids"
line "farewell to"
done
UnknownText_0x1bc719::
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc71f::
text "Take good care of"
line "@"
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc739::
text "For @"
- text_from_ram wPlayerTrademonSenderName
+ text_ram wPlayerTrademonSenderName
text "'s"
line "@"
- text_from_ram wPlayerTrademonSpeciesName
+ text_ram wPlayerTrademonSpeciesName
text ","
done
UnknownText_0x1bc74c::
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text " sends"
line "@"
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc75e::
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text " will"
line "trade @"
- text_from_ram wOTTrademonSpeciesName
- db "@@"
+ text_ram wOTTrademonSpeciesName
+ text_end
+
+ text_end ; unused
UnknownText_0x1bc774::
text "for @"
- text_from_ram wPlayerTrademonSenderName
+ text_ram wPlayerTrademonSenderName
text "'s"
line "@"
- text_from_ram wPlayerTrademonSpeciesName
+ text_ram wPlayerTrademonSpeciesName
text "."
done
UnknownText_0x1bc787::
- text_from_ram wPlayerTrademonSenderName
+ text_ram wPlayerTrademonSenderName
text " will"
line "trade @"
- text_from_ram wPlayerTrademonSpeciesName
- db "@@"
+ text_ram wPlayerTrademonSpeciesName
+ text_end
+
+ text_end ; unused
UnknownText_0x1bc79d::
text "for @"
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text "'s"
line "@"
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc7b0::
- text_from_ram wPlayerTrademonSenderName
+ text_ram wPlayerTrademonSenderName
text "'s"
line "@"
- text_from_ram wPlayerTrademonSpeciesName
+ text_ram wPlayerTrademonSpeciesName
text " trade…"
done
UnknownText_0x1bc7c3::
text "Take good care of"
line "@"
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc7dd::
- text_from_ram wPlayerTrademonSenderName
+ text_ram wPlayerTrademonSenderName
text "'s"
line "@"
- text_from_ram wPlayerTrademonSpeciesName
+ text_ram wPlayerTrademonSpeciesName
text " trade…"
done
UnknownText_0x1bc7f0::
text "Take good care of"
line "@"
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc80a::
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text " came"
line "back!"
done
@@ -506,8 +515,10 @@ _OPT_IntroText3::
_OPT_OakText1::
text_start
line "OAK: @"
- text_from_ram wMonOrItemNameBuffer
- db "@@"
+ text_ram wMonOrItemNameBuffer
+ text_end
+
+ text_end ; unused
_OPT_OakText2::
text_start
@@ -517,14 +528,14 @@ _OPT_OakText2::
_OPT_OakText3::
text_start
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
done
_OPT_MaryText1::
text_start
line "MARY: @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
done
@@ -695,8 +706,10 @@ _OPT_PokemonChannelText::
_PokedexShowText::
text_start
line "@"
- text_from_ram wStringBuffer1
- db "@@"
+ text_ram wStringBuffer1
+ text_end
+
+ text_end ; unused
; Pokémon Music Channel / Pokémusic
@@ -728,7 +741,7 @@ _FernIntroText2::
_BenFernText1::
text_start
line "Today's @"
- current_day
+ text_today
text ","
done
@@ -792,8 +805,8 @@ _LC_Text7::
_LC_Text8::
text_start
line "Number is @"
- interpret_data
- text_from_ram wStringBuffer1
+ text_pause
+ text_ram wStringBuffer1
text "!"
done
@@ -842,10 +855,12 @@ _PnP_Text3::
_PnP_Text4::
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " @"
- text_from_ram wStringBuffer1
- db "@@"
+ text_ram wStringBuffer1
+ text_end
+
+ text_end ; unused
_PnP_cute::
text_start
@@ -930,8 +945,10 @@ _PnP_odd::
_PnP_Text5::
text_start
line "@"
- text_from_ram wStringBuffer1
- db "@@"
+ text_ram wStringBuffer1
+ text_end
+
+ text_end ; unused
_RocketRadioText1::
text_start
@@ -966,28 +983,28 @@ _RocketRadioText6::
_RocketRadioText7::
text_start
line "GIOVANNI! @"
- interpret_data
+ text_pause
text "Can you"
done
_RocketRadioText8::
text_start
line "hear?@"
- interpret_data
+ text_pause
text " We did it!"
done
_RocketRadioText9::
text_start
line "@"
- interpret_data
+ text_pause
text "Where is our boss?"
done
_RocketRadioText10::
text_start
line "@"
- interpret_data
+ text_pause
text "Is he listening?"
done
@@ -1009,7 +1026,7 @@ _BuenaRadioText3::
_BuenaRadioText4::
text_start
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
done
@@ -1085,17 +1102,17 @@ Text_EnemyWithdrew::
text "<ENEMY>"
line "withdrew"
cont "@"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "!"
prompt
Text_EnemyUsedOn::
text "<ENEMY>"
line "used @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
cont "on @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "!"
prompt
@@ -1111,7 +1128,7 @@ Text_ThatItemCantBePutInThePack::
Text_TheItemWasPutInThePack::
text "The @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "was put in the"
cont "PACK."
@@ -1138,7 +1155,7 @@ UnknownText_0x1bd05e::
UnknownText_0x1bd07f::
text "Will you play with"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
@@ -1155,7 +1172,7 @@ Text_BreedingIsNotPossible::
UnknownText_0x1bd0d8::
text "The compatibility"
line "is @"
- deciram wBreedingCompatibility, 1, 3
+ text_decimal wBreedingCompatibility, 1, 3
text "."
cont "Should they breed?"
done
@@ -1173,7 +1190,7 @@ UnknownText_0x1bd11c::
UnknownText_0x1bd131::
text "Test event"
line "@"
- deciram wStringBuffer2, 1, 2
+ text_decimal wStringBuffer2, 1, 2
text "?"
done
@@ -1205,7 +1222,7 @@ UnknownText_0x1bd188::
UnknownText_0x1bd19a::
text "A new CARD arrived"
line "from @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
done
@@ -1215,10 +1232,10 @@ UnknownText_0x1bd1ba::
done
UnknownText_0x1bd1dd::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "'s CARD was"
line "listed as no.@"
- deciram wStringBuffer1, 1, 2
+ text_decimal wStringBuffer1, 1, 2
text "."
prompt
@@ -1251,10 +1268,10 @@ UnknownText_0x1bd266::
UnknownText_0x1bd286::
text "Trading @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text_start
line "for @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "…"
done
@@ -1286,7 +1303,7 @@ UnknownText_0x1bd308::
UnknownText_0x1bd321::
text "<PLAYER> found"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -1298,10 +1315,10 @@ UnknownText_0x1bd331::
UnknownText_0x1bd34b::
text "I just saw some"
line "rare @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " in"
cont "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
para "I'll call you if I"
@@ -1315,14 +1332,16 @@ UnknownText_0x1bd39e::
done
UnknownText_0x1bd3be::
- text_from_ram wPlayerName
+ text_ram wPlayerName
text " received"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!@"
sound_item
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1bd3d7::
text "You have no coins."
@@ -1341,27 +1360,30 @@ UnknownText_0x1bd407::
UnknownText_0x1bd429::
text "<PLAYER> traded"
line "@"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " for"
cont "@"
- text_from_ram wStringBuffer2
- text ".@@"
+ text_ram wStringBuffer2
+ text ".@"
+ text_end
UnknownText_0x1bd445::
sound_dex_fanfare_80_109
- interpret_data
- db "@@"
+ text_pause
+ text_end
+
+ text_end ; unused
UnknownText_0x1bd449::
text "I collect #MON."
line "Do you have"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
para "Want to trade it"
line "for my @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
@@ -1373,7 +1395,7 @@ UnknownText_0x1bd48c::
UnknownText_0x1bd4aa::
text "Huh? That's not"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text ". "
cont "What a letdown…"
done
@@ -1381,7 +1403,7 @@ UnknownText_0x1bd4aa::
UnknownText_0x1bd4d2::
text "Yay! I got myself"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
cont "Thanks!"
done
@@ -1389,7 +1411,7 @@ UnknownText_0x1bd4d2::
UnknownText_0x1bd4f4::
text "Hi, how's my old"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " doing?"
done
@@ -1399,12 +1421,12 @@ UnknownText_0x1bd512::
para "If you have"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text ", would"
para "you trade it for"
line "my @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
@@ -1419,7 +1441,7 @@ UnknownText_0x1bd565::
UnknownText_0x1bd5a1::
text "You don't have"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "? That's"
cont "too bad, then."
done
@@ -1429,31 +1451,31 @@ UnknownText_0x1bd5cc::
para "I finally got"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
done
UnknownText_0x1bd5f4::
text "Hi! The @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
line "you traded me is"
cont "doing great!"
done
UnknownText_0x1bd621::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "'s cute,"
line "but I don't have"
para "it. Do you have"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
para "Want to trade it"
line "for my @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
@@ -1465,7 +1487,7 @@ UnknownText_0x1bd673::
UnknownText_0x1bd696::
text "That's not"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
para "Please trade with"
@@ -1476,19 +1498,19 @@ UnknownText_0x1bd6cd::
text "Wow! Thank you!"
line "I always wanted"
cont "@"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "!"
done
UnknownText_0x1bd6f5::
text "How is that"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " I"
cont "traded you doing?"
para "Your @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "'s"
line "so cute!"
done
@@ -1709,7 +1731,7 @@ UnknownText_0x1bdcff::
UnknownText_0x1bdd30::
text "OK. I'll raise"
line "your @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -1722,25 +1744,25 @@ UnknownText_0x1bdd64::
text "Are we geniuses or"
line "what? Want to see"
cont "your @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
UnknownText_0x1bdd96::
text "Your @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "has grown a lot."
para "By level, it's"
line "grown by @"
- deciram wStringBuffer2 + 1, 1, 3
+ text_decimal wStringBuffer2 + 1, 1, 3
text "."
para "If you want your"
line "#MON back, it"
cont "will cost ¥@"
- deciram wStringBuffer2 + 2, 3, 4
+ text_decimal wStringBuffer2 + 2, 3, 4
text "."
done
@@ -1752,14 +1774,14 @@ UnknownText_0x1bde04::
UnknownText_0x1bde1f::
text "<PLAYER> got back"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1bde32::
text "Huh? Back already?"
line "Your @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
para "needs a little"
line "more time with us."
diff --git a/data/text/common_2.asm b/data/text/common_2.asm
index 679c207d8..6e2d21800 100644
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -27,7 +27,7 @@ UnknownText_0x1c00a0::
UnknownText_0x1c00cd::
text "Hm… @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "…"
line "That's a fairly"
cont "decent name."
@@ -60,13 +60,13 @@ UnknownText_0x1c019e::
UnknownText_0x1c01be::
text "Hm… @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
line "What a great name!"
cont "It's perfect."
para "Treat @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "with loving care."
done
@@ -90,63 +90,72 @@ UnknownText_0x1c0272::
text "All right. This"
line "#MON is now"
cont "named @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
Text_Gained::
- text_from_ram wStringBuffer1
- text " gained@@"
+ text_ram wStringBuffer1
+ text " gained@"
+ text_end
Text_ABoostedStringBuffer2ExpPoints::
text_start
line "a boosted"
cont "@"
- deciram wStringBuffer2, 2, 4
+ text_decimal wStringBuffer2, 2, 4
text " EXP. Points!"
prompt
Text_StringBuffer2ExpPoints::
text_start
line "@"
- deciram wStringBuffer2, 2, 4
+ text_decimal wStringBuffer2, 2, 4
text " EXP. Points!"
prompt
Text_GoMon::
- text "Go! @@"
+ text "Go! @"
+ text_end
Text_DoItMon::
- text "Do it! @@"
+ text "Do it! @"
+ text_end
Text_GoForItMon::
text "Go for it,"
- line "@@"
+ line "@"
+ text_end
Text_YourFoesWeakGetmMon::
text "Your foe's weak!"
- line "Get'm, @@"
+ line "Get'm, @"
+ text_end
Text_BattleMonNick01::
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text "!"
done
Text_BattleMonNickComma::
- text_from_ram wBattleMonNick
- text ",@@"
+ text_ram wBattleMonNick
+ text ",@"
+ text_end
Text_ThatsEnoughComeBack::
text " that's"
- line "enough! Come back!@@"
+ line "enough! Come back!@"
+ text_end
Text_OKComeBack::
text " OK!"
- line "Come back!@@"
+ line "Come back!@"
+ text_end
Text_GoodComeBack::
text " good!"
- line "Come back!@@"
+ line "Come back!@"
+ text_end
Text_ComeBack::
text " come"
@@ -164,26 +173,26 @@ UnknownText_0x1c0384::
UnknownText_0x1c0396::
text "It contained"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
para "Teach @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text_start
line "to a #MON?"
done
UnknownText_0x1c03c2::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " is"
line "not compatible"
cont "with @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
para "It can't learn"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -191,14 +200,14 @@ UnknownText_0x1c03fa::
text "You have no room"
line "for any more"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "S."
prompt
UnknownText_0x1c0421::
text "You received"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -233,36 +242,36 @@ UnknownText_0x1c04c6::
prompt
UnknownText_0x1c04e9::
- text_from_ram wMysteryGiftPartnerName
+ text_ram wMysteryGiftPartnerName
text " sent"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c04fa::
- text_from_ram wMysteryGiftPartnerName
+ text_ram wMysteryGiftPartnerName
text " sent"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
cont "to @"
- text_from_ram wMysteryGiftPlayerName
+ text_ram wMysteryGiftPlayerName
text "'s home."
prompt
UnknownText_0x1c051a::
text "Received"
line "@"
- text_from_ram wc850
+ text_ram wc850
text "'s CARD."
prompt
UnknownText_0x1c0531::
- text_from_ram wc850
+ text_ram wc850
text "'s CARD was"
line "listed as no.@"
- deciram wDeciramBuffer, 1, 2
+ text_decimal wDeciramBuffer, 1, 2
text "."
prompt
@@ -292,7 +301,7 @@ UnknownText_0x1c05c8::
prompt
UnknownText_0x1c05dd::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "CUT!"
prompt
@@ -306,10 +315,12 @@ UnknownText_0x1c0609::
text "A blinding FLASH"
line "lights the area!@"
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
_UsedSurfText::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "SURF!"
done
@@ -330,7 +341,7 @@ _AskSurfText::
done
UnknownText_0x1c068e::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "WATERFALL!"
done
@@ -346,7 +357,7 @@ UnknownText_0x1c06bf::
done
UnknownText_0x1c06de::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "DIG!"
done
@@ -379,13 +390,13 @@ UnknownText_0x1c0751::
prompt
UnknownText_0x1c0774::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "STRENGTH!"
done
UnknownText_0x1c0788::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " can"
line "move boulders."
prompt
@@ -409,7 +420,7 @@ UnknownText_0x1c07f4::
done
UnknownText_0x1c0816::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "WHIRLPOOL!"
prompt
@@ -431,7 +442,7 @@ UnknownText_0x1c0864::
done
UnknownText_0x1c0897::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " did a"
line "HEADBUTT!"
prompt
@@ -449,7 +460,7 @@ UnknownText_0x1c08bc::
done
UnknownText_0x1c08f0::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "ROCK SMASH!"
prompt
@@ -489,14 +500,14 @@ UnknownText_0x1c099a::
UnknownText_0x1c09b2::
text "<PLAYER> got on the"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
done
UnknownText_0x1c09c7::
text "<PLAYER> got off"
line "the @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
done
@@ -515,7 +526,7 @@ UnknownText_0x1c0a05::
UnknownText_0x1c0a1c::
text "<PLAYER> found"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -545,7 +556,7 @@ UnknownText_0x1c0aa9::
prompt
UnknownText_0x1c0acc::
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "fainted!"
prompt
@@ -559,7 +570,7 @@ UnknownText_0x1c0ada::
prompt
UnknownText_0x1c0b03::
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " used"
line "SWEET SCENT!"
done
@@ -598,17 +609,17 @@ UnknownText_0x1c0ba5::
UnknownText_0x1c0bbb::
text "Throw away @"
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)?"
done
UnknownText_0x1c0bd8::
text "Threw away"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)."
prompt
@@ -626,7 +637,7 @@ Text_YouDontHaveAMon::
UnknownText_0x1c0c2e::
text "Registered the"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -657,11 +668,13 @@ Text_AreYouABoyOrAreYouAGirl::
UnknownText_0x1c0cc6::
text "<USER>'s"
line "@"
- text_from_ram wStringBuffer2
- db "@@"
+ text_ram wStringBuffer2
+ text_end
+
+ text_end ; unused
UnknownText_0x1c0cd0::
- interpret_data
+ text_pause
text "<SCROLL>went way up!"
prompt
@@ -672,11 +685,13 @@ UnknownText_0x1c0ce0::
UnknownText_0x1c0ceb::
text "<TARGET>'s"
line "@"
- text_from_ram wStringBuffer2
- db "@@"
+ text_ram wStringBuffer2
+ text_end
+
+ text_end ; unused
UnknownText_0x1c0cf5::
- interpret_data
+ text_pause
text "<SCROLL>sharply fell!"
prompt
@@ -685,7 +700,8 @@ UnknownText_0x1c0d06::
prompt
UnknownText_0x1c0d0e::
- text "<USER>@@"
+ text "<USER>@"
+ text_end
UnknownText_0x1c0d12::
text_start
@@ -718,23 +734,29 @@ UnknownText_0x1c0d6c::
prompt
_ActorNameText::
- text "<USER>@@"
+ text "<USER>@"
+ text_end
_UsedMove1Text::
text_start
- line "used @@"
+ line "used @"
+ text_end
_UsedMove2Text::
text_start
- line "used @@"
+ line "used @"
+ text_end
_UsedInsteadText::
text "instead,"
- cont "@@"
+ cont "@"
+ text_end
_MoveNameText::
- text_from_ram wStringBuffer2
- db "@@"
+ text_ram wStringBuffer2
+ text_end
+
+ text_end ; unused
_EndUsedMove1Text::
text "!"
@@ -759,30 +781,33 @@ _EndUsedMove5Text::
UnknownText_0x1c0db0::
text "Huh?"
- para "@@"
+ para "@"
+ text_end
UnknownText_0x1c0db8::
text_start
done
UnknownText_0x1c0dba::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " came"
line "out of its EGG!@"
sound_caught_mon
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1c0dd8::
text "Give a nickname to"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
UnknownText_0x1c0df3::
text "It's @"
- text_from_ram wBreedMon2Nick
+ text_ram wBreedMon2Nick
text_start
line "that was left with"
cont "the DAY-CARE LADY."
@@ -790,7 +815,7 @@ UnknownText_0x1c0df3::
UnknownText_0x1c0e24::
text "It's @"
- text_from_ram wBreedMon1
+ text_ram wBreedMon1
text_start
line "that was left with"
cont "the DAY-CARE MAN."
@@ -804,28 +829,28 @@ UnknownText_0x1c0e54::
UnknownText_0x1c0e6f::
text "It has no interest"
line "in @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c0e8d::
text "It appears to care"
line "for @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c0eac::
text "It's friendly with"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c0ec6::
text "It shows interest"
line "in @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -872,20 +897,22 @@ UnknownText_0x1c0fb8::
prompt
UnknownText_0x1c0fbc::
- deciram wcf64, 1, 3
+ text_decimal wcf64, 1, 3
text " @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "Animation type @"
- text_from_ram wStringBuffer2
- db "@@"
+ text_ram wStringBuffer2
+ text_end
+
+ text_end ; unused
UnknownText_0x1c0fdd::
text "#MON number?"
done
Text_WasSentToBillsPC::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " was"
line "sent to BILL's PC."
prompt
@@ -924,7 +951,7 @@ UnknownText_0x1c10a2::
UnknownText_0x1c10c0::
text "Caught @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -935,70 +962,73 @@ UnknownText_0x1c10cf::
UnknownText_0x1c10dd::
text "You already caught"
line "a @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
ContestJudging_FirstPlaceText::
text "This Bug-Catching"
line "Contest winner is@"
- interpret_data
+ text_pause
text "…"
para "@"
- text_from_ram wBugContestWinnerName
+ text_ram wBugContestWinnerName
text ","
line "who caught a"
cont "@"
- text_from_ram wStringBuffer1
- text "!@@"
+ text_ram wStringBuffer1
+ text "!@"
+ text_end
ContestJudging_FirstPlaceScoreText::
text_start
para "The winning score"
line "was @"
- deciram wBugContestFirstPlaceScore, 2, 3
+ text_decimal wBugContestFirstPlaceScore, 2, 3
text " points!"
prompt
ContestJudging_SecondPlaceText::
text "Placing second was"
line "@"
- text_from_ram wBugContestWinnerName
+ text_ram wBugContestWinnerName
text ","
para "who caught a"
line "@"
- text_from_ram wStringBuffer1
- text "!@@"
+ text_ram wStringBuffer1
+ text "!@"
+ text_end
ContestJudging_SecondPlaceScoreText::
text_start
para "The score was"
line "@"
- deciram wBugContestSecondPlaceScore, 2, 3
+ text_decimal wBugContestSecondPlaceScore, 2, 3
text " points!"
prompt
ContestJudging_ThirdPlaceText::
text "Placing third was"
line "@"
- text_from_ram wBugContestWinnerName
+ text_ram wBugContestWinnerName
text ","
para "who caught a"
line "@"
- text_from_ram wStringBuffer1
- text "!@@"
+ text_ram wStringBuffer1
+ text "!@"
+ text_end
ContestJudging_ThirdPlaceScoreText::
text_start
para "The score was"
line "@"
- deciram wBugContestThirdPlaceScore, 2, 3
+ text_decimal wBugContestThirdPlaceScore, 2, 3
text " points!"
prompt
@@ -1008,7 +1038,7 @@ UnknownText_0x1c1203::
para "…Hm, it measures"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -1016,12 +1046,14 @@ UnknownText_0x1c123a::
text "CURRENT RECORD"
para "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " caught by"
line "@"
- text_from_ram wMagikarpRecordHoldersName
+ text_ram wMagikarpRecordHoldersName
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1c1261::
text "Congratulations!"
@@ -1030,7 +1062,7 @@ UnknownText_0x1c1261::
line "with the ID number"
para "of @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " in"
line "your party."
prompt
@@ -1042,7 +1074,7 @@ UnknownText_0x1c12ae::
line "with the ID number"
para "of @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " in"
line "your PC BOX."
prompt
@@ -1050,7 +1082,7 @@ UnknownText_0x1c12ae::
UnknownText_0x1c12fc::
text "Give a nickname to"
line "the @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " you"
cont "received?"
done
@@ -1078,10 +1110,10 @@ _PlayersPCHowManyWithdrawText::
_PlayersPCWithdrewItemsText::
text "Withdrew @"
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)."
prompt
@@ -1101,10 +1133,10 @@ _PlayersPCHowManyDepositText::
_PlayersPCDepositItemsText::
text "Deposited @"
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)."
prompt
@@ -1161,10 +1193,10 @@ _OakPCText2::
prompt
_OakPCText3::
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " #MON seen"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " #MON owned"
para "PROF.OAK's"
@@ -1352,23 +1384,23 @@ UnknownText_0x1c1a6c::
UnknownText_0x1c1a90::
text "Toss out how many"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)?"
done
UnknownText_0x1c1aad::
text "Throw away @"
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)?"
done
UnknownText_0x1c1aca::
text "Discarded"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "(S)."
prompt
@@ -1385,24 +1417,24 @@ UnknownText_0x1c1b03::
UnknownText_0x1c1b2c::
text "Took @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " and"
para "made it hold"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
UnknownText_0x1c1b57::
text "Made @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
line "hold @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -1412,7 +1444,7 @@ UnknownText_0x1c1b6f::
prompt
UnknownText_0x1c1b8e::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " isn't"
line "holding anything."
prompt
@@ -1424,20 +1456,20 @@ UnknownText_0x1c1baa::
UnknownText_0x1c1bc4::
text "Took @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "from @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "."
prompt
UnknownText_0x1c1bdc::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " is"
line "already holding"
para "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
line "Switch items?"
done
@@ -1455,7 +1487,7 @@ UnknownText_0x1c1c22::
UnknownText_0x1c1c47::
text "MAIL detached from"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -1508,11 +1540,14 @@ _OakText2::
text "This world is in-"
line "habited by crea-"
cont "tures that we call"
- cont "#MON.@@"
+ cont "#MON.@"
+ text_end
_OakText3::
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
_OakText4::
text "People and #MON"
diff --git a/data/text/common_3.asm b/data/text/common_3.asm
index 4ed12258b..53fa047c4 100644
--- a/data/text/common_3.asm
+++ b/data/text/common_3.asm
@@ -65,17 +65,17 @@ UnknownText_0x1c41b1::
UnknownText_0x1c41e6::
text "Your friend's"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " appears"
cont "to be abnormal!"
prompt
UnknownText_0x1c4212::
text "Trade @"
- text_from_ram wd004
+ text_ram wd004
text_start
line "for @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
@@ -124,7 +124,7 @@ UnknownText_0x1c4298::
UnknownText_0x1c439c::
text "Today's remaining"
line "time is @"
- deciram wStringBuffer2, 1, 2
+ text_decimal wStringBuffer2, 1, 2
text " min."
para "Would you like to"
@@ -133,7 +133,7 @@ UnknownText_0x1c439c::
UnknownText_0x1c43dc::
text "There are only @"
- deciram wStringBuffer2, 1, 2
+ text_decimal wStringBuffer2, 1, 2
text_start
line "min. left today."
@@ -180,7 +180,7 @@ UnknownText_0x1c4508::
UnknownText_0x1c4525::
text "Today's remaining"
line "time is @"
- deciram wStringBuffer2, 1, 2
+ text_decimal wStringBuffer2, 1, 2
text " min."
done
@@ -257,23 +257,23 @@ UnknownText_0x1c4706::
UnknownText_0x1c4719::
text "<PLAYER> received"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
done
UnknownText_0x1c472c::
text "<PLAYER> put the"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " in"
cont "the @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
prompt
UnknownText_0x1c474b::
text "The @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "is full…"
prompt
@@ -297,21 +297,21 @@ UnknownText_0x1c4797::
UnknownText_0x1c47d4::
text "Hm… I see you met"
line "@"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text " here:"
cont "@"
- text_from_ram wSeerCaughtLocation
+ text_ram wSeerCaughtLocation
text "!"
prompt
UnknownText_0x1c47fa::
text "The time was"
line "@"
- text_from_ram wSeerTimeOfDay
+ text_ram wSeerTimeOfDay
text "!"
para "Its level was @"
- text_from_ram wSeerCaughtLevelString
+ text_ram wSeerCaughtLevelString
text "!"
para "Am I good or what?"
@@ -319,21 +319,21 @@ UnknownText_0x1c47fa::
UnknownText_0x1c4837::
text "Hm… @"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text_start
line "came from @"
- text_from_ram wSeerOTName
+ text_ram wSeerOTName
text_start
cont "in a trade?"
para "@"
- text_from_ram wSeerCaughtLocation
+ text_ram wSeerCaughtLocation
text_start
line "was where @"
- text_from_ram wSeerOTName
+ text_ram wSeerOTName
text_start
cont "met @"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text "!"
prompt
@@ -349,7 +349,7 @@ UnknownText_0x1c487f::
para "I can't tell where"
line "you met it, but it"
cont "was at level @"
- text_from_ram wSeerCaughtLevelString
+ text_ram wSeerCaughtLevelString
text "."
para "Am I good or what?"
@@ -386,7 +386,7 @@ UnknownText_0x1c49c6::
line "grown a little."
para "@"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text " seems"
line "to be becoming"
cont "more confident."
@@ -396,7 +396,7 @@ UnknownText_0x1c4a21::
text "Incidentally…"
para "@"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text " has"
line "grown. It's gained"
cont "much strength."
@@ -409,7 +409,7 @@ UnknownText_0x1c4a5b::
line "grown mighty!"
para "This @"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text_start
line "must have come"
@@ -432,12 +432,12 @@ UnknownText_0x1c4ae5::
para "seen a #MON as"
line "mighty as this"
cont "@"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text "."
para "I'm sure that"
line "seeing @"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text_start
para "in battle would"
@@ -447,28 +447,30 @@ UnknownText_0x1c4ae5::
UnknownText_0x1c4b92::
text "Congratulations!"
line "Your @"
- text_from_ram wStringBuffer2
- db "@@"
+ text_ram wStringBuffer2
+ text_end
+
+ text_end ; unused
UnknownText_0x1c4baf::
text_start
para "evolved into"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
done
UnknownText_0x1c4bc5::
text "Huh? @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text_start
line "stopped evolving!"
prompt
UnknownText_0x1c4be3::
text "What? @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text_start
line "is evolving!"
done
@@ -478,12 +480,12 @@ UnknownText_0x1c4bfd::
done
UnknownText_0x1c4c08::
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text " @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)"
line "will be ¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text "."
done
@@ -507,12 +509,12 @@ UnknownText_0x1c4ca3::
done
UnknownText_0x1c4cae::
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text " @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)"
line "will be ¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text "."
done
@@ -548,10 +550,10 @@ UnknownText_0x1c4d47::
done
UnknownText_0x1c4db0::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " costs"
line "¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text ". Want it?"
done
@@ -590,12 +592,12 @@ UnknownText_0x1c4e7e::
done
UnknownText_0x1c4e89::
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text " @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)"
line "will cost ¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text "."
done
@@ -630,7 +632,7 @@ UnknownText_0x1c4f33::
UnknownText_0x1c4f3e::
text "I can pay you"
line "¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text "."
para "Is that OK?"
@@ -672,10 +674,10 @@ UnknownText_0x1c500d::
UnknownText_0x1c502e::
text "Got ¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text " for"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)."
done
@@ -705,7 +707,7 @@ UnknownText_0x1c5092::
UnknownText_0x1c509f::
text "lined up!"
line "Won @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " coins!"
done
@@ -757,13 +759,13 @@ UnknownText_0x1c51d7::
prompt
UnknownText_0x1c51f4::
- text_from_ram wMobileParticipant1Nickname
+ text_ram wMobileParticipant1Nickname
text ","
line "@"
- text_from_ram wMobileParticipant2Nickname
+ text_ram wMobileParticipant2Nickname
text " and"
cont "@"
- text_from_ram wMobileParticipant3Nickname
+ text_ram wMobileParticipant3Nickname
text "."
para "Use these three?"
@@ -932,14 +934,16 @@ UnknownText_0x1c564a::
done
UnknownText_0x1c5660::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " learned"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "!@"
sound_dex_fanfare_50_79
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1c5678::
text "Which move should"
@@ -949,29 +953,29 @@ UnknownText_0x1c5678::
UnknownText_0x1c5699::
text "Stop learning"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
UnknownText_0x1c56af::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
line "did not learn"
cont "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
UnknownText_0x1c56c9::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " is"
line "trying to learn"
cont "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
para "But @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
line "can't learn more"
cont "than four moves."
@@ -979,25 +983,27 @@ UnknownText_0x1c56c9::
para "Delete an older"
line "move to make room"
cont "for @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
UnknownText_0x1c5740::
text "1, 2 and…@"
- interpret_data
- db "@@"
+ text_pause
+ text_end
+
+ text_end ; unused
UnknownText_0x1c574e::
text " Poof!@"
- interpret_data
+ text_pause
text_start
para "@"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " forgot"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
para "And…"
@@ -1044,8 +1050,10 @@ UnknownText_0x1c581a::
done
UnknownText_0x1c5821::
- current_day
- db "@@"
+ text_today
+ text_end
+
+ text_end ; unused
UnknownText_0x1c5824::
text "<……>"
@@ -1077,7 +1085,7 @@ UnknownText_0x1c589f::
done
UnknownText_0x1c58bc::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
line "Is that right?"
done
@@ -1148,7 +1156,7 @@ Text_OnlyThreeMonMayBeEntered::
Text_TheMonMustAllBeDifferentKinds::
text "The @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " #MON"
line "must all be"
cont "different kinds."
@@ -1158,7 +1166,7 @@ Text_TheMonMustAllBeDifferentKinds::
Text_TheMonMustNotHoldTheSameItems::
text "The @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " #MON"
line "must not hold the"
cont "same items."
@@ -1208,43 +1216,49 @@ UnknownText_0x1c5afa::
UnknownText_0x1c5b17::
text "Gotcha! @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "was caught!@"
sound_caught_mon
- db "@@"
+ text_end
+
+ text_end ; unused
Text_Waitbutton_2::
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1c5b38::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " was"
line "sent to BILL's PC."
prompt
UnknownText_0x1c5b53::
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "'s data"
line "was newly added to"
cont "the #DEX.@"
sound_slot_machine_start
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1c5b7f::
text "Give a nickname to"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
UnknownText_0x1c5b9a::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " rose."
prompt
@@ -1276,20 +1290,24 @@ UnknownText_0x1c5c44::
text "<PLAYER> played the"
line "# FLUTE.@"
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1c5c5e::
text "You now have"
line "@"
- deciram wBlueCardBalance, 1, 2
+ text_decimal wBlueCardBalance, 1, 2
text " points."
done
UnknownText_0x1c5c7b::
text "Coins:"
line "@"
- deciram wCoins, 2, 4
- db "@@"
+ text_decimal wCoins, 2, 4
+ text_end
+
+ text_end ; unused
Text_RaiseThePPOfWhichMove::
text "Raise the PP of"
@@ -1302,13 +1320,13 @@ Text_RestoreThePPOfWhichMove::
done
Text_PPIsMaxedOut::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "'s PP"
line "is maxed out."
prompt
Text_PPsIncreased::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "'s PP"
line "increased."
prompt
@@ -1324,7 +1342,7 @@ UnknownText_0x1c5d03::
text_start
para "@"
- text_from_ram wPlayerName
+ text_ram wPlayerName
text " sent the"
line "trophy home."
prompt
@@ -1371,7 +1389,7 @@ UnknownText_0x1c5e01::
UnknownText_0x1c5e1d::
text "Can't get on your"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " now."
prompt
@@ -1384,14 +1402,14 @@ UnknownText_0x1c5e3a::
UnknownText_0x1c5e68::
text "<PLAYER> used the@"
text_low
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
done
UnknownText_0x1c5e7b::
text "<PLAYER> got on the@"
text_low
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -1399,15 +1417,15 @@ UnknownText_0x1c5e90::
text "<PLAYER> got off@"
text_low
text "the @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
UnknownText_0x1c5ea8::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " knows"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -1419,7 +1437,7 @@ UnknownText_0x1c5eba::
UnknownText_0x1c5eda::
text "Oh, make it forget"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
diff --git a/data/text/std_text.asm b/data/text/std_text.asm
index 238f0ac5d..18edf239b 100644
--- a/data/text/std_text.asm
+++ b/data/text/std_text.asm
@@ -231,18 +231,18 @@ ContestResults_ReadyToJudgeText:
ContestResults_PlayerWonAPrizeText:
text "<PLAYER>, the No.@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "finisher, wins"
cont "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "!"
done
ReceivedItemText:
text "<PLAYER> received"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
done
@@ -279,14 +279,14 @@ ContestResults_PartyFullText:
done
GymStatue_CityGymText:
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "#MON GYM"
done
GymStatue_WinningTrainersText:
text "LEADER: @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
para "WINNING TRAINERS:"
line "<PLAYER>"
@@ -376,13 +376,13 @@ HappinessText1:
RegisteredNumber1Text:
text "<PLAYER> registered"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "'s number."
done
RegisteredNumber2Text:
text "<PLAYER> registered"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "'s number."
done