Use charmaps for special string codepoints.

Also fix all the text.
Also fix some unreferenced scripts that were interpreted as text.
This commit is contained in:
yenatch
2015-06-27 21:59:17 -07:00
parent c00949dddf
commit e2c2e20f93
113 changed files with 1068 additions and 951 deletions

View File

@@ -44,7 +44,7 @@ BeverlyPhoneFullText:
done
BeverlyGiftText:
text "Oh? ", $52, "? "
text "Oh? <PLAYER>? "
line "I waited here for"
para "you. I brought you"

View File

@@ -29,21 +29,24 @@ BillPhoneNiteGreetingText: ; 0x1b44b5
done
BillPhoneGeneriText: ; 0x1b44fe
db $0, "Who's calling?", $51
db $14, ", is it?", $4f
db "Hang on a sec…", $51
db $56, $4f
db $56, $57
text "Who's calling?"
para "<PLAY_G>, is it?"
line "Hang on a sec…"
para $56
line $56
done
BillPhoneNotFullText: ; 0x1b452a
text "Thanks for"
line "waiting!"
para $14, ", your BOX"
para "<PLAY_G>, your BOX"
line "has room for @"
TX_RAM StringBuffer3
text $55
db "more #MON."
text ""
cont "more #MON."
para "Get out there and"
line "fill it up!"
@@ -53,7 +56,7 @@ BillPhoneNearlyFullText: ; 0x1b4587
text "Thanks for"
line "waiting!"
para $14, ", your BOX"
para "<PLAY_G>, your BOX"
line "has room for only"
cont "@"
TX_RAM StringBuffer3
@@ -67,7 +70,7 @@ BillPhoneFullText: ; 0x1b45ed
text "Thanks for"
line "waiting!"
para $14, ", your BOX"
para "<PLAY_G>, your BOX"
line "is full!"
para "You'll have to"
@@ -78,7 +81,7 @@ BillPhoneFullText: ; 0x1b45ed
done
BillPhoneNewlyFullText: ; 0x1b4652
text "Hi, ", $14, "?"
text "Hi, <PLAY_G>?"
line "It's me, BILL!"
para "Thanks for using"

View File

@@ -2,7 +2,7 @@ UnknownText_0xa0c28: ; 0xa0c28
text "Hi, this is BUENA…"
para "Oh! Good morning,"
line $14, "!"
line "<PLAY_G>!"
para "I'm kind of foggy"
line "in the morning…"
@@ -11,7 +11,7 @@ UnknownText_0xa0c28: ; 0xa0c28
UnknownText_0xa0c72: ; 0xa0c72
text "Hi, this is BUENA…"
line "Oh! Hi, ", $14, "!"
line "Oh! Hi, <PLAY_G>!"
para "Do you tune into"
line "BUENA's show?"
@@ -38,7 +38,7 @@ UnknownText_0xa0caf: ; 0xa0caf
UnknownText_0xa0d42: ; 0xa0d42
text "Hi, this is BUENA…"
line "Oh! Hi, ", $14, "!"
line "Oh! Hi, <PLAY_G>!"
para "I just got off"
line "work. "
@@ -49,7 +49,7 @@ UnknownText_0xa0d42: ; 0xa0d42
; 0xa0d96
UnknownText_0xa0d96: ; 0xa0d96
text $14, "!"
text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I got up early, so"
@@ -58,7 +58,7 @@ UnknownText_0xa0d96: ; 0xa0d96
; 0xa0dcf
UnknownText_0xa0dcf: ; 0xa0dcf
text $14, "!"
text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I needed someone"
@@ -67,7 +67,7 @@ UnknownText_0xa0dcf: ; 0xa0dcf
; 0xa0e01
UnknownText_0xa0e01: ; 0xa0e01
text $14, "!"
text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I'm just on my"
@@ -76,7 +76,7 @@ UnknownText_0xa0e01: ; 0xa0e01
; 0xa0e29
UnknownText_0xa0e29: ; 0xa0e29
text $14, "!"
text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I couldn't sleep,"
@@ -85,7 +85,7 @@ UnknownText_0xa0e29: ; 0xa0e29
; 0xa0e5e
UnknownText_0xa0e5e: ; 0xa0e5e
text "Oh. Hi, ", $14, "!"
text "Oh. Hi, <PLAY_G>!"
para "You are how?"
@@ -98,7 +98,7 @@ UnknownText_0xa0e5e: ; 0xa0e5e
para "The RADIO TOWER is"
line "in deep trouble!"
para $14, ", you'd"
para "<PLAY_G>, you'd"
line "better be careful!"
done
; 0xa0efb
@@ -152,7 +152,7 @@ UnknownText_0xa0fcf: ; 0xa0fcf
; 0xa109d
UnknownText_0xa109d: ; 0xa109d
text "Tell me, ", $14, "."
text "Tell me, <PLAY_G>."
line "Have you ever won"
para "a prize on the"
@@ -245,7 +245,7 @@ UnknownText_0xa1318: ; 0xa1318
; 0xa13d8
UnknownText_0xa13d8: ; 0xa13d8
text "Hey, ", $14, "."
text "Hey, <PLAY_G>."
line "You won that RADIO"
para "CARD by beating"
@@ -334,7 +334,7 @@ UnknownText_0xa15de: ; 0xa15de
; 0xa1717
UnknownText_0xa1717: ; 0xa1717
text $14, ", tell me."
text "<PLAY_G>, tell me."
para "When do you relax"
line "the most?"
@@ -367,7 +367,7 @@ UnknownText_0xa1717: ; 0xa1717
; 0xa183d
UnknownText_0xa183d: ; 0xa183d
text $14, ", what was"
text "<PLAY_G>, what was"
line "the first #MON"
cont "you ever caught?"
@@ -426,7 +426,7 @@ UnknownText_0xa19b1: ; 0xa19b1
para "I'd much rather go"
line "to the beach!"
para $14, ", I hope"
para "<PLAY_G>, I hope"
line "you have enough"
para "fun for both of us"
@@ -478,7 +478,7 @@ UnknownText_0xa1bed: ; 0xa1bed
para "STORE has a sale"
line "on when we go…"
para $14, ", maybe we"
para "<PLAY_G>, maybe we"
line "can hook up too!"
para "Catch you later!"
@@ -509,7 +509,7 @@ UnknownText_0xa1c88: ; 0xa1c88
; 0xa1d5f
UnknownText_0xa1d5f: ; 0xa1d5f
text "Hey, ", $14, ". You"
text "Hey, <PLAY_G>. You"
line "use your #GEAR"
para "to listen to the"

View File

@@ -1,5 +1,5 @@
ElmPhoneStartText: ; 0x1b46fc
text "Hello, ", $14, "?"
text "Hello, <PLAY_G>?"
para "Try not to overdo"
line "it."
@@ -10,7 +10,7 @@ ElmPhoneStartText: ; 0x1b46fc
done
ElmPhoneSawMrPokemonText: ; 0x1b4749
text "Hello, ", $14, "?"
text "Hello, <PLAY_G>?"
para "Did you meet MR."
line "#MON? Great!"
@@ -18,7 +18,7 @@ ElmPhoneSawMrPokemonText: ; 0x1b4749
done
ElmPhonePokemonStolenText: ; 0x1b4784
text $14, "? I'm very"
text "<PLAY_G>? I'm very"
line "upset now."
para "We had a #MON"
@@ -29,7 +29,7 @@ ElmPhonePokemonStolenText: ; 0x1b4784
done
ElmPhoneCheckingEggText: ; 0x1b47d5
text "Hello, ", $14, "?"
text "Hello, <PLAY_G>?"
para "We're checking the"
line "EGG now. It does"
@@ -39,7 +39,7 @@ ElmPhoneCheckingEggText: ; 0x1b47d5
done
ElmPhoneAssistantText: ; 0x1b481c
text "Hello, ", $14, "?"
text "Hello, <PLAY_G>?"
para "Did you see my"
line "assistant? He's at"
@@ -49,7 +49,7 @@ ElmPhoneAssistantText: ; 0x1b481c
done
ElmPhoneEggUnhatchedText: ; 0x1b4868
text "Hello, ", $14, "?"
text "Hello, <PLAY_G>?"
para "How's the EGG? Has"
line "anything changed?"
@@ -59,7 +59,7 @@ ElmPhoneEggUnhatchedText: ; 0x1b4868
done
ElmPhoneEggHatchedText: ; 0x1b48bb
text "Hello, ", $14, "?"
text "Hello, <PLAY_G>?"
line "How is the EGG?"
para "What? It hatched?"
@@ -71,7 +71,7 @@ ElmPhoneEggHatchedText: ; 0x1b48bb
done
ElmPhoneDiscovery1Text: ; 0x1b491f
text "Hello, ", $14, "?"
text "Hello, <PLAY_G>?"
para "I just made a new"
line "discovery."
@@ -84,7 +84,7 @@ ElmPhoneDiscovery1Text: ; 0x1b491f
done
ElmPhoneDiscovery2Text: ; 0x1b4982
text "Hello, ", $14, "?"
text "Hello, <PLAY_G>?"
para "It's still a"
line "mystery what kinds"
@@ -97,7 +97,7 @@ ElmPhoneDiscovery2Text: ; 0x1b4982
done
ElmPhonePokerusText: ; 0x1b49e7
text "Hello, ", $14, "?"
text "Hello, <PLAY_G>?"
para "I discovered an"
line "odd thing."
@@ -130,7 +130,7 @@ ElmPhonePokerusText: ; 0x1b49e7
done
ElmPhoneDisasterText: ; 0x1b4b17
text "H-hello? ", $14, "?"
text "H-hello? <PLAY_G>?"
line "It's a disaster!"
para "Uh, um, it's just"
@@ -144,7 +144,7 @@ ElmPhoneDisasterText: ; 0x1b4b17
done
ElmPhoneEggAssistantText: ; 0x1b4b87
text "Hello, ", $14, "? We"
text "Hello, <PLAY_G>? We"
line "discovered some-"
para "thing about the"
@@ -159,7 +159,7 @@ ElmPhoneEggAssistantText: ; 0x1b4b87
done
ElmPhoneRocketText: ; 0x1b4c06
text $14, ", how are"
text "<PLAY_G>, how are"
line "things going?"
para "I called because"
@@ -171,7 +171,7 @@ ElmPhoneRocketText: ; 0x1b4c06
para "They were talking"
line "about TEAM ROCKET."
para $14, ", do you"
para "<PLAY_G>, do you"
line "know anything"
cont "about it?"
@@ -186,7 +186,7 @@ ElmPhoneRocketText: ; 0x1b4c06
done
ElmPhoneGiftText: ; 0x1b4d09
text "Hello, ", $14, "?"
text "Hello, <PLAY_G>?"
para "I have something"
line "here for you."
@@ -198,7 +198,7 @@ ElmPhoneGiftText: ; 0x1b4d09
done
ElmPhoneUnusedText: ; 0x1b4d5d
text "Hello, ", $14, "?"
text "Hello, <PLAY_G>?"
line "How's it going?"
para "I got ahold of"

View File

@@ -8,7 +8,7 @@ UnknownText_0x64000: ; 0x64000
; 0x64032
UnknownText_0x64032: ; 0x64032
text $14, ", have you"
text "<PLAY_G>, have you"
line "heard?"
para "GOLDENROD's RADIO"
@@ -23,7 +23,7 @@ UnknownText_0x64032: ; 0x64032
; 0x64099
UnknownText_0x64099: ; 0x64099
text $14, ", I heard!"
text "<PLAY_G>, I heard!"
para "You defeated that"
line "WHITNEY?"
@@ -43,7 +43,7 @@ UnknownText_0x640e6: ; 0x640e6
para "LIGHTHOUSE, didn't"
line "you?"
para $14, ", I wish"
para "<PLAY_G>, I wish"
line "you'd come see me"
para "when I'm sick in"
@@ -100,7 +100,7 @@ UnknownText_0x642bb: ; 0x642bb
line "lady who looked a"
para "lot like you,"
line $14, "."
line "<PLAY_G>."
para "What? That lady"
line "was your mom?"
@@ -127,7 +127,7 @@ UnknownText_0x643d4: ; 0x643d4
line "I saw!"
para "You striding onto"
line "a ship, ", $14, "!"
line "a ship, <PLAY_G>!"
para "I can't get over"
line "how good you look"
@@ -192,7 +192,7 @@ UnknownText_0x645ff: ; 0x645ff
cont "the place."
para "It just makes me"
line "sigh, ", $14, "."
line "sigh, <PLAY_G>."
para "How did you get so"
line "strong?"
@@ -241,7 +241,7 @@ UnknownText_0x646df: ; 0x646df
; 0x647d8
UnknownText_0x647d8: ; 0x647d8
text $14, ", I heard!"
text "<PLAY_G>, I heard!"
para "You're kicking up"
line "a mighty ruckus"
@@ -491,7 +491,7 @@ UnknownText_0x64e2f: ; 0x64e2f
para "to @"
text_from_ram StringBuffer5
db $0
text ""
line "and pick it up?"
done
; 0x64e90
@@ -561,8 +561,8 @@ UnknownText_0x6501c: ; 0x6501c
text "You know what?"
line "A wild @"
text_from_ram StringBuffer4
text $51
db "got away from me"
text ""
para "got away from me"
line "again."
para "It was so close!"
@@ -918,8 +918,8 @@ UnknownText_0x65ab2: ; 0x65ab2
text "Listen to this."
line "My @"
text_from_ram StringBuffer4
text $51
db "grins happily when"
text ""
para "grins happily when"
line "I pinch its cheek."
para "But it never grins"
@@ -1121,7 +1121,7 @@ UnknownText_0x65ff2: ; 0x65ff2
UnknownText_0x66043: ; 0x66043
text "Yup, TULLY here…"
para $14, "? What?"
para "<PLAY_G>? What?"
line "You're lost?"
para "Our battle will be"
@@ -1401,7 +1401,7 @@ UnknownText_0x66796: ; 0x66796
para "It's awful."
line "My CLEFAIRY…"
para "Huh? ", $14, "?"
para "Huh? <PLAY_G>?"
para "Oh, sorry! I was"
line "in a hurry, and I…"
@@ -1497,8 +1497,8 @@ UnknownText_0x669ed: ; 0x669ed
text "But get this, a"
line "wild @"
text_from_ram StringBuffer4
text $51
db "just barely eluded"
text ""
para "just barely eluded"
line "us."
para "I wanted to FLY"
@@ -1533,7 +1533,7 @@ UnknownText_0x66aa5: ; 0x66aa5
; 0x66ad1
UnknownText_0x66ad1: ; 0x66ad1
text "Oh, ", $14, "!"
text "Oh, <PLAY_G>!"
line "Hurry, hurry!"
para "@"
@@ -1808,7 +1808,7 @@ UnknownText_0x6717a: ; 0x6717a
text_from_ram StringBuffer3
text "'s @"
text_from_ram StringBuffer4
db $0
text ""
line "is much stronger"
cont "than before!"
done
@@ -1831,7 +1831,7 @@ UnknownText_0x671eb: ; 0x671eb
para "A wild @"
text_from_ram StringBuffer4
db $0
text ""
line "got away from me"
para "again. It's just"
@@ -1869,7 +1869,7 @@ UnknownText_0x67294: ; 0x67294
; 0x672d5
UnknownText_0x672d5: ; 0x672d5
text "Oh, ", $14, "!"
text "Oh, <PLAY_G>!"
line "Come battle ERIN!"
para "I'll be waiting on"

View File

@@ -1,5 +1,5 @@
UnknownText_0x174000: ; 0x174000
text "Hi, ", $14, "!"
text "Hi, <PLAY_G>!"
line "Our BICYCLE sales"
para "have gone through"
@@ -216,7 +216,7 @@ UnknownText_0x1745c2: ; 0x1745c2
; 0x174638
UnknownText_0x174638: ; 0x174638
text "Hey, ", $14, "!"
text "Hey, <PLAY_G>!"
para "Do you remember"
line "your promise?"
@@ -316,7 +316,7 @@ UnknownText_0x174895: ; 0x174895
para "in @"
text_from_ram StringBuffer5
db $0
text ""
line "when you can."
done
; 0x1748ea
@@ -372,7 +372,7 @@ UnknownText_0x1749c7: ; 0x1749c7
UnknownText_0x174a24: ; 0x174a24
text "My @"
text_from_ram StringBuffer4
db $0
text ""
line "might be greater"
cont "than I imagined."
@@ -452,7 +452,7 @@ UnknownText_0x174c29: ; 0x174c29
; 0x174c49
UnknownText_0x174c49: ; 0x174c49
text $14, ", why"
text "<PLAY_G>, why"
line "aren't you here?"
para "I'll take you down"
@@ -485,8 +485,8 @@ UnknownText_0x174cf6: ; 0x174cf6
text "Oh, have you ever"
line "seen a @"
text_from_ram StringBuffer4
text $55
db "before?"
text ""
cont "before?"
para "I just battled"
line "one…"
@@ -553,7 +553,7 @@ UnknownText_0x174ec5: ; 0x174ec5
; 0x174ee2
UnknownText_0x174ee2: ; 0x174ee2
text "Um… ", $14, "?"
text "Um… <PLAY_G>?"
line "What's wrong?"
para "Did you forget our"
@@ -671,7 +671,7 @@ UnknownText_0x17519b: ; 0x17519b
; 0x17520a
UnknownText_0x17520a: ; 0x17520a
text $14, ", could you"
text "<PLAY_G>, could you"
line "hurry over?"
para "FARFETCH'D is"
@@ -823,8 +823,8 @@ UnknownText_0x175591: ; 0x175591
text "Oh yeah, I took"
line "down a @"
text_from_ram StringBuffer4
text $51
db "in the wild the"
text ""
para "in the wild the"
line "other day."
para "It was a cakewalk."
@@ -891,7 +891,7 @@ UnknownText_0x17571d: ; 0x17571d
UnknownText_0x175786: ; 0x175786
text "What's keeping"
line "you, ", $52, "!"
line "you, <PLAYER>!"
para "Let's get down and"
line "battle already!"
@@ -927,8 +927,8 @@ UnknownText_0x175869: ; 0x175869
text "Oh yeah, we KO'd a"
line "wild @"
text_from_ram StringBuffer4
text $51
db "with one hit a"
text ""
para "with one hit a"
line "while back."
para "It went down so"
@@ -989,7 +989,7 @@ UnknownText_0x1759f7: ; 0x1759f7
line "today."
para "Are you going,"
line $14, "?"
line "<PLAY_G>?"
para "I'm trying to make"
line "up my mind."
@@ -1146,7 +1146,7 @@ UnknownText_0x175dd9: ; 0x175dd9
para "Heh, they're some"
line "kind of feisty!"
para $14, ", you have"
para "<PLAY_G>, you have"
line "to see this rare"
para "sight! Get ready"
@@ -1549,7 +1549,7 @@ UnknownText_0x176aef: ; 0x176aef
para "wild @"
text_from_ram StringBuffer4
db $0
text ""
line "quite often."
para "They're easily"
@@ -1599,27 +1599,27 @@ UnknownText_0x176c47: ; 0x176c47
; 0x176c61
UnknownText_0x176c61: ; 0x176c61
text $52, "! It's"
text "<PLAYER>! It's"
line "mind-blowing!"
para "I took a hike in"
line "@"
text_from_ram StringBuffer5
text $55
db "yesterday, see?"
text ""
cont "yesterday, see?"
para "Well, there were"
line "tons of @"
text_from_ram StringBuffer4
text $51
db "around! You have"
text ""
para "around! You have"
line "to see it!"
para "I get this feeling"
line "that @"
text_from_ram StringBuffer4
text $51
db "may be timid."
text ""
para "may be timid."
line "I didn't see any"
para "where there are"
@@ -1899,7 +1899,7 @@ UnknownText_0x177465: ; 0x177465
; 0x1774c1
UnknownText_0x1774c1: ; 0x1774c1
text "Oh, ", $14, "!"
text "Oh, <PLAY_G>!"
line "How soon can I"
para "expect to see you"

View File

@@ -57,7 +57,7 @@ HueyRematchGiftText:
para "I've battled you"
line "over and over, but"
para $52, ", I haven't"
para "<PLAYER>, I haven't"
line "won once."
para "I bought tons of"
@@ -73,7 +73,7 @@ HueyRematchGiftText:
line "it is…"
para "Here, take this,"
line $52, "."
line "<PLAYER>."
para "I won't be needing"
line "it anymore…"

View File

@@ -1,7 +1,7 @@
JoseAskNumber1Text:
text "If my @"
text_from_ram StringBuffer4
db $0
text ""
line "sees anything"
para "pretty, it goes"

View File

@@ -43,7 +43,7 @@ KenjiPhoneFullText:
KenjiGiftText:
text "I wish to thank"
line "you, ", $52, "!"
line "you, <PLAYER>!"
para "I've been training"
line "all alone…"

View File

@@ -1,7 +1,7 @@
MomPhoneGreetingText: ; 0x1b4000
text "Hello?"
para "Oh, hi, ", $52, "!"
para "Oh, hi, <PLAYER>!"
line "Working hard?"
done
@@ -14,8 +14,8 @@ UnknownText_0x1b4021: ; 0x1b4021
para "Isn't that where"
line "@"
TX_RAM StringBuffer4
text $51
db "is? Did you go"
text ""
para "is? Did you go"
line "take a look?"
done
@@ -27,7 +27,7 @@ MomPhoneGenericAreaText: ; 0x1b406b
para "I've never gone"
line "there. That's kind"
cont "of neat, ", $52, "."
cont "of neat, <PLAYER>."
done
MomPhoneNewBarkText: ; 0x1b40b1
@@ -64,7 +64,7 @@ UnknownText_0x1b4150: ; 0x1b4150
text "That sounds really"
line "tough."
para "But, ", $52, ", I"
para "But, <PLAYER>, I"
line "know you're really"
para "determined. You'll"
@@ -87,7 +87,7 @@ UnknownText_0x1b41ea: ; 0x1b41ea
done
UnknownText_0x1b420d: ; 0x1b420d
text "Oh, ", $52, ","
text "Oh, <PLAYER>,"
line "you're not saving"
para "any money. Would"
@@ -115,7 +115,7 @@ MomPhoneWontSaveMoneyText: ; 0x1b42a3
done
MomPhoneHangUpText: ; 0x1b42c0
text $52, ", keep it"
text "<PLAYER>, keep it"
line "up! I'm rooting"
cont "for you, baby!"
done
@@ -123,7 +123,7 @@ MomPhoneHangUpText: ; 0x1b42c0
MomPhoneNoPokemonText: ; 0x1b42ea
text "Hello?"
para "Oh, hi, ", $52, "!"
para "Oh, hi, <PLAYER>!"
line "Wasn't PROF.ELM"
cont "waiting for you?"
done
@@ -131,7 +131,7 @@ MomPhoneNoPokemonText: ; 0x1b42ea
MomPhoneNoPokedexText: ; 0x1b431d
text "Hello?"
para "Oh, hi, ", $52, "!"
para "Oh, hi, <PLAYER>!"
line "You're on a big"
para "mission for PROF."
@@ -141,7 +141,7 @@ MomPhoneNoPokedexText: ; 0x1b431d
MomPhoneNoGymQuestText: ; 0x1b435f
text "Hello?"
para "Hi, ", $52, "! If"
para "Hi, <PLAYER>! If"
line "you're done with"
para "your errand come"
@@ -151,7 +151,7 @@ MomPhoneNoGymQuestText: ; 0x1b435f
MomPhoneLectureText: ; 0x1b43a1
text "Hello?"
para "…… ", $52, "?"
para "…… <PLAYER>?"
line "I heard from PROF."
para "ELM that you went"

File diff suppressed because it is too large Load Diff