ref: e2c2e20f93f43848542362a5deee677e88f9507d
parent: c00949dddf8498eb6483487792332f10dd074386
author: yenatch <yenatch@gmail.com>
date: Sat Jun 27 17:59:17 EDT 2015
Use charmaps for special string codepoints. Also fix all the text. Also fix some unreferenced scripts that were interpreted as text.
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -1205,9 +1205,10 @@
; 408bd
String_408bd: ; 408bd
- db "NEW #DEX MODE", $4e
- db "OLD #DEX MODE", $4e
- db "A to Z MODE@"
+ db "NEW #DEX MODE"
+ next "OLD #DEX MODE"
+ next "A to Z MODE"
+ db "@"
; 408e5
String_408e5: ; 408e5
@@ -1753,23 +1754,23 @@
; 40e85
String_40e85: ; 40e85
- db $e1, $e2, " are listed by", $4e
- db "evolution type.@"
+ db $e1, $e2, " are listed by"
+ next "evolution type.@"
; 40ea6
String_40ea6: ; 40ea6
- db $e1, $e2, " are listed by", $4e
- db "official type.@"
+ db $e1, $e2, " are listed by"
+ next "official type.@"
; 40ec6
String_40ec6: ; 40ec6
- db $e1, $e2, " are listed", $4e
- db "alphabetically.@"
+ db $e1, $e2, " are listed"
+ next "alphabetically.@"
; 40ee4
String_40ee4: ; 40ee4
- db "UNOWN are listed", $4e
- db "in catching order.@"
+ db "UNOWN are listed"
+ next "in catching order.@"
; 40f08
Function40f08: ; 40f08 (10:4f08)
@@ -2031,8 +2032,8 @@
; 41126
String_41126: ; 41126
- db "The specified type", $4e
- db "was not found.@"
+ db "The specified type"
+ next "was not found.@"
; 41148
Function41148: ; 41148 (10:5148)
--- a/macros/charmap.asm
+++ b/macros/charmap.asm
@@ -273,3 +273,13 @@
charmap "ー", $e3
charmap "ァ", $e9
+
+ charmap "<PLAYER>", $52
+ charmap "<RIVAL>", $53
+ charmap "<RED>", $38
+ charmap "<GREEN>", $39
+ charmap "<TARGET>", $59
+ charmap "<USER>", $5a
+ charmap "<ENEMY>", $3f
+
+ charmap "<PLAY_G>", $14 ; <PLAYER> + gender
--- a/main.asm
+++ b/main.asm
@@ -639,7 +639,7 @@
MenuData2_0x5f03: ; 5f03
db $00 ; flags
db 4 ; items
- db "PLAYER ", $52, "@"
+ db "PLAYER <PLAYER>@"
db "BADGES@"
db " @"
db "TIME@"
@@ -667,7 +667,7 @@
ret
.Player
- db $52, "@"
+ db "<PLAYER>@"
; 5f40
Function5f40: ; 5f40
@@ -13109,7 +13109,7 @@
.PokedexString db "#DEX@"
.PartyString db "#MON@"
.PackString db "PACK@"
-.StatusString db $52, "@"
+.StatusString db "<PLAYER>@"
.SaveString db "SAVE@"
.OptionString db "OPTION@"
.ExitString db "EXIT@"
@@ -13116,17 +13116,34 @@
.PokegearString db $24, "GEAR@"
.QuitString db "QUIT@"
-.PokedexDesc db "#MON", $4e, "database@"
-.PartyDesc db "Party ", $4a, $4e, "status@"
-.PackDesc db "Contains", $4e, "items@"
-.PokegearDesc db "Trainer's", $4e, "key device@"
-.StatusDesc db "Your own", $4e, "status@"
-.SaveDesc db "Save your", $4e, "progress@"
-.OptionDesc db "Change", $4e, "settings@"
-.ExitDesc db "Close this", $4e, "menu@"
-.QuitDesc db "Quit and", $4e, "be judged.@"
+.PokedexDesc db "#MON"
+ next "database@"
+.PartyDesc db "Party ", $4a
+ next "status@"
+.PackDesc db "Contains"
+ next "items@"
+
+.PokegearDesc db "Trainer's"
+ next "key device@"
+
+.StatusDesc db "Your own"
+ next "status@"
+
+.SaveDesc db "Save your"
+ next "progress@"
+
+.OptionDesc db "Change"
+ next "settings@"
+
+.ExitDesc db "Close this"
+ next "menu@"
+
+.QuitDesc db "Quit and"
+ next "be judged.@"
+
+
.OpenMenu ; 127e5
ld a, [MenuSelection]
call .GetMenuAccountTextPointer
@@ -19412,7 +19429,7 @@
dw Function156ab, String_15623
; 155fa
-String_155fa: db $52, "'s PC@"
+String_155fa: db "<PLAYER>'s PC@"
String_15600: db "BILL's PC@"
String_15609: db "PROF.OAK's PC@"
String_15616: db "HALL OF FAME@"
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -270,7 +270,7 @@
; 0x18ee14
UnknownText_0x18ee14: ; 0x18ee14
- text $52, " received"
+ text "<PLAYER> received"
line "HIVEBADGE."
done
; 0x18ee2b
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -387,7 +387,7 @@
done
UnknownText_0x19860b:
- text $52, ", here's"
+ text "<PLAYER>, here's"
line "your GS BALL back!"
done
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -406,78 +406,110 @@
; 0x9e62f
UnknownText_0x9e62f: ; 0x9e62f
- db $0, "BATTLE TOWER is a", $4f
- db "facility made for", $55
- db "#MON battles.", $51
- db "Countless #MON", $4f
- db "trainers gather", $51
- db "from all over to", $4f
- db "hold battles in", $51
- db "specially designed", $4f
- db "BATTLE ROOMS.", $51
- db "There are many", $4f
- db "BATTLE ROOMS in", $55
- db "the BATTLE TOWER.", $51
- db "Each ROOM holds", $4f
- db "seven trainers.", $51
- db "If you defeat the", $4f
- db "seven in a ROOM,", $51
- db "and you have a", $4f
- db "good record, you", $51
- db "could become the", $4f
- db "ROOM's LEADER.", $51
- db "All LEADERS will", $4f
- db "be recorded in the", $51
- db "HONOR ROLL for", $4f
- db "posterity.", $51
- db "You may challenge", $4f
- db "in up to five", $51
- db "BATTLE ROOMS each", $4f
- db "day.", $51
- db "However, you may", $4f
- db "battle only once a", $51
- db "day in any given", $4f
- db "ROOM.", $51
- db "To interrupt a", $4f
- db "session, you must", $51
- db "SAVE. If not, you", $4f
- db "won't be able to", $51
- db "resume your ROOM", $4f
- db "challenge.", $51
- db $57
+ text "BATTLE TOWER is a"
+ line "facility made for"
+ cont "#MON battles."
+
+ para "Countless #MON"
+ line "trainers gather"
+
+ para "from all over to"
+ line "hold battles in"
+
+ para "specially designed"
+ line "BATTLE ROOMS."
+
+ para "There are many"
+ line "BATTLE ROOMS in"
+ cont "the BATTLE TOWER."
+
+ para "Each ROOM holds"
+ line "seven trainers."
+
+ para "If you defeat the"
+ line "seven in a ROOM,"
+
+ para "and you have a"
+ line "good record, you"
+
+ para "could become the"
+ line "ROOM's LEADER."
+
+ para "All LEADERS will"
+ line "be recorded in the"
+
+ para "HONOR ROLL for"
+ line "posterity."
+
+ para "You may challenge"
+ line "in up to five"
+
+ para "BATTLE ROOMS each"
+ line "day."
+
+ para "However, you may"
+ line "battle only once a"
+
+ para "day in any given"
+ line "ROOM."
+
+ para "To interrupt a"
+ line "session, you must"
+
+ para "SAVE. If not, you"
+ line "won't be able to"
+
+ para "resume your ROOM"
+ line "challenge."
+
+ para ""
+ done
; 0x9e886
UnknownText_0x9e886: ; 0x9e886
- db $0, "BATTLE TOWER is a", $4f
- db "facility made for", $55
- db "#MON battles.", $51
- db "Countless #MON", $4f
- db "trainers gather", $51
- db "from all over to", $4f
- db "hold battles in", $51
- db "specially designed", $4f
- db "BATTLE ROOMS.", $51
- db "There are many", $4f
- db "BATTLE ROOMS in", $55
- db "the BATTLE TOWER.", $51
- db "Each ROOM holds", $4f
- db "seven trainers.", $51
- db "Beat them all, and", $4f
- db "win a prize.", $51
- db "To interrupt a", $4f
- db "session, you must", $51
- db "SAVE. If not, you", $4f
- db "won't be able to", $51
- db "resume your ROOM", $4f
- db "challenge.", $51
- db $57
+ text "BATTLE TOWER is a"
+ line "facility made for"
+ cont "#MON battles."
+
+ para "Countless #MON"
+ line "trainers gather"
+
+ para "from all over to"
+ line "hold battles in"
+
+ para "specially designed"
+ line "BATTLE ROOMS."
+
+ para "There are many"
+ line "BATTLE ROOMS in"
+ cont "the BATTLE TOWER."
+
+ para "Each ROOM holds"
+ line "seven trainers."
+
+ para "Beat them all, and"
+ line "win a prize."
+
+ para "To interrupt a"
+ line "session, you must"
+
+ para "SAVE. If not, you"
+ line "won't be able to"
+
+ para "resume your ROOM"
+ line "challenge."
+
+ para ""
+ done
; 0x9e9eb
UnknownText_0x9e9eb: ; 0x9e9eb
- db $0, "Received a list of", $4f
- db "LEADERS on the", $55
- db "HONOR ROLL.", $51
- db $57
+ text "Received a list of"
+ line "LEADERS on the"
+ cont "HONOR ROLL."
+
+ para ""
+ done
; 0x9ea1b
UnknownText_0x9ea1b: ; 0x9ea1b
@@ -487,8 +519,10 @@
; 0x9ea3c
UnknownText_0x9ea3c: ; 0x9ea3c
- db $0, "Thank you!", $51
- db $57
+ text "Thank you!"
+
+ para ""
+ done
; 0x9ea49
UnknownText_0x9ea49: ; 0x9ea49
@@ -498,25 +532,35 @@
; 0x9ea5f
UnknownText_0x9ea5f: ; 0x9ea5f
- db $0, "Congratulations!", $51
- db "You've beaten all", $4f
- db "the trainers!", $51
- db "Your feat may be", $4f
- db "worth registering,", $51
- db $52, ". With your", $4f
- db "results, you may", $51
- db "be chosen as a", $4f
- db "ROOM LEADER.", $51
- db $57
+ text "Congratulations!"
+
+ para "You've beaten all"
+ line "the trainers!"
+
+ para "Your feat may be"
+ line "worth registering,"
+
+ para "<PLAYER>. With your"
+ line "results, you may"
+
+ para "be chosen as a"
+ line "ROOM LEADER."
+
+ para ""
+ done
; 0x9eaef
UnknownText_0x9eaef: ; 0x9eaef
- db $0, "Congratulations!", $51
- db "You've beaten all", $4f
- db "the trainers!", $51
- db "For that, you get", $4f
- db "this great prize!", $51
- db $57
+ text "Congratulations!"
+
+ para "You've beaten all"
+ line "the trainers!"
+
+ para "For that, you get"
+ line "this great prize!"
+
+ para ""
+ done
; 0x9eb45
UnknownText_0x9eb45: ; 0x9eb45
@@ -529,13 +573,13 @@
; 0x9eb7e
UnknownText_0x9eb7e: ; 0x9eb7e
- db $0, $52, " got five", $4f
- db "@"
+ text "<PLAYER> got five"
+ line "@"
text_from_ram StringBuffer4
- db $0, "!@"
+ text "!@"
sound0x0F
text_waitbutton
- db $50
+ db "@"
; 0x9eb94
UnknownText_0x9eb94: ; 0x9eb94
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -19,9 +19,11 @@
end
; 0x195956
-UnknownText_0x195956: ; 0x195956
- limited_interpret_data 2
- db $0, "ズ", $03, $00
+UnknownScript_0x195956:
+ jumpstd picturebookshelf
+
+UnknownScript_0x195959:
+ jumpstd magazinebookshelf
UnknownText_0x19595c: ; 0x19595c
text "A clan of trainers"
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -275,7 +275,7 @@
done
UnknownText_0x1951bf:
- text $52, " received"
+ text "<PLAYER> received"
line "TM24."
done
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -111,7 +111,7 @@
para "determined. Per-"
line "fect for battle!"
- para "Ready, ", $52, "?"
+ para "Ready, <PLAYER>?"
line "You will bow down"
para "to our overwhelm-"
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -261,7 +261,7 @@
para "And you are…?"
- para $52, "? Glad to"
+ para "<PLAYER>? Glad to"
line "meet you!"
para "I heard rumors"
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -222,7 +222,7 @@
para "I'm all choked up!"
- para $52, ", I owe"
+ para "<PLAYER>, I owe"
line "this all to you!"
para "Thank you!"
@@ -239,7 +239,7 @@
para "I'm going to track"
line "SUICUNE."
- para $52, ", let's"
+ para "<PLAYER>, let's"
line "meet again!"
para "Farewell!"
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -207,7 +207,7 @@
done
FoundLeftoversText:
- text $52, " found"
+ text "<PLAYER> found"
line "@"
text_from_ram StringBuffer3
text "!"
@@ -214,7 +214,7 @@
done
NoRoomForLeftoversText:
- text "But ", $52, " can't"
+ text "But <PLAYER> can't"
line "hold another item…"
done
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -110,7 +110,7 @@
para "@"
text_from_ram StringBuffer3
- db $0
+ text ""
line "popped out."
done
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -238,7 +238,7 @@
; 0x72c96
UnknownText_0x72c96: ; 0x72c96
- text $52, " received"
+ text "<PLAYER> received"
line "RAINBOWBADGE."
done
; 0x72cb0
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -15,7 +15,7 @@
jumpstd difficultbookshelf
CeladonMansion2FComputerText:
- text $52, " turned on"
+ text "<PLAYER> turned on"
line "the PC."
para "…"
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -30,7 +30,7 @@
text "There's graffiti"
line "on the wall…"
- para $52, " added a"
+ para "<PLAYER> added a"
line "moustache!"
done
; 0x71ad4
--- a/maps/CeladonPokeCenter1F.asm
+++ b/maps/CeladonPokeCenter1F.asm
@@ -109,7 +109,7 @@
; 0x71f65
UnknownText_0x71f65: ; 0x71f65
- text $52, ", have you"
+ text "<PLAYER>, have you"
line "heard?"
para "There have been"
@@ -126,13 +126,13 @@
line "ECRUTEAK."
para "I'll be seeing"
- line "you, ", $52, "!"
+ line "you, <PLAYER>!"
done
; 0x7201a
UnknownText_0x7201a: ; 0x7201a
text "Oh, by the way,"
- line $52, "."
+ line "<PLAYER>."
para "Have you caught"
line "the legendary"
@@ -149,7 +149,7 @@
cont "you'll inform me."
para "I'm counting on"
- line "you, ", $52, "!"
+ line "you, <PLAYER>!"
done
; 0x720b8
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -335,7 +335,7 @@
; 0x188768
UnknownText_0x188768: ; 0x188768
- text $52, " received"
+ text "<PLAYER> received"
line "CASCADEBADGE."
done
; 0x188782
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -409,7 +409,7 @@
done
GotMapCardText:
- text $52, "'s #GEAR"
+ text "<PLAYER>'s #GEAR"
line "now has a MAP!"
done
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -271,7 +271,7 @@
UnknownText_0x1a0433:
text "EUSINE: Yo,"
- line $52, "."
+ line "<PLAYER>."
para "Wasn't that"
line "SUICUNE just now?"
@@ -303,7 +303,7 @@
line "a trainer to earn"
cont "SUICUNE's respect!"
- para "Come on, ", $52, "."
+ para "Come on, <PLAYER>."
line "Let's battle now!"
done
@@ -314,7 +314,7 @@
UnknownText_0x1a05c3:
text "You're amazing,"
- line $52, "!"
+ line "<PLAYER>!"
para "No wonder #MON"
line "gravitate to you."
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -268,7 +268,7 @@
; 0x9d835
UnknownText_0x9d835: ; 0x9d835
- text $52, " received"
+ text "<PLAYER> received"
line "STORMBADGE."
done
; 0x9d84d
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -59,7 +59,7 @@
done
ReceivedSecretpotionText:
- text $52, " received"
+ text "<PLAYER> received"
line "SECRETPOTION."
done
--- a/maps/CianwoodPokeCenter1F.asm
+++ b/maps/CianwoodPokeCenter1F.asm
@@ -87,7 +87,7 @@
; 0x9ddc5
CianwoodGymGuyWinText: ; 0x9ddc5
- text $52, "! You won!"
+ text "<PLAYER>! You won!"
line "I could tell by"
cont "looking at you!"
done
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -198,13 +198,13 @@
; 0x18afda
UnknownText_0x18afda: ; 0x18afda
- text $52, ": Hi! Do"
+ text "<PLAYER>: Hi! Do"
line "you like #MON?"
- para $52, ": Uh, no, I"
+ para "<PLAYER>: Uh, no, I"
line "just asked you."
- para $52, ": Huh?"
+ para "<PLAYER>: Huh?"
line "You're strange!"
done
; 0x18b028
@@ -219,17 +219,17 @@
; 0x18b064
UnknownText_0x18b064: ; 0x18b064
- text $52, ": Hi!"
+ text "<PLAYER>: Hi!"
line "I heard that you"
para "lost your favorite"
line "# DOLL."
- para $52, ": If I find"
+ para "<PLAYER>: If I find"
line "it, you'll give me"
cont "a rail PASS?"
- para $52, ": I'll go"
+ para "<PLAYER>: I'll go"
line "find it for you."
para "You think you lost"
@@ -286,13 +286,13 @@
; 0x18b298
UnknownText_0x18b298: ; 0x18b298
- text $52, ": Hi!"
+ text "<PLAYER>: Hi!"
line "Thanks a lot for"
cont "the rail PASS!"
- para $52, ": Pardon?"
+ para "<PLAYER>: Pardon?"
- para $52, ": Is it"
+ para "<PLAYER>: Is it"
line "that fun to mimic"
cont "my every move?"
done
@@ -305,29 +305,29 @@
; 0x18b316
UnknownText_0x18b316: ; 0x18b316
- text $52, ": Hi. You"
+ text "<PLAYER>: Hi. You"
line "must like #MON."
- para $52, ": No, not"
+ para "<PLAYER>: No, not"
line "me. I asked you."
- para $52, ": Pardon?"
+ para "<PLAYER>: Pardon?"
line "You're weird!"
done
; 0x18b366
UnknownText_0x18b366: ; 0x18b366
- text $52, ": Hi. Did"
+ text "<PLAYER>: Hi. Did"
line "you really lose"
cont "your # DOLL?"
- para $52, ": You'll"
+ para "<PLAYER>: You'll"
line "really give me a"
para "rail PASS if I"
line "find it for you?"
- para $52, ": Sure,"
+ para "<PLAYER>: Sure,"
line "I'll look for it!"
para "You think you lost"
@@ -337,12 +337,12 @@
; 0x18b415
UnknownText_0x18b415: ; 0x18b415
- text $52, ": Thank you"
+ text "<PLAYER>: Thank you"
line "for the rail PASS!"
- para $52, ": …Pardon?"
+ para "<PLAYER>: …Pardon?"
- para $52, ": Is it"
+ para "<PLAYER>: Is it"
line "really that fun to"
para "copy what I say"
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -143,7 +143,7 @@
; 0x631ae
UnknownText_0x631ae: ; 0x631ae
- text $52, " received"
+ text "<PLAYER> received"
line "ODD EGG!"
done
; 0x631c3
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -503,7 +503,7 @@
para "That conviction is"
line "what is important!"
- para $52, ", don't"
+ para "<PLAYER>, don't"
line "lose that belief."
para "It will see you"
@@ -564,7 +564,7 @@
; 0x18d697
UnknownText_0x18d697: ; 0x18d697
- text $52, " received"
+ text "<PLAYER> received"
line "DRATINI!"
done
; 0x18d6ac
@@ -697,7 +697,7 @@
; 0x18d9f2
UnknownText_0x18d9f2: ; 0x18d9f2
- text $52, " received"
+ text "<PLAYER> received"
line "RISINGBADGE."
done
; 0x18da0b
@@ -722,7 +722,8 @@
; 0x18dab4
UnknownText_0x18dab4: ; 0x18dab4
- db $0, $56, $56, $56, $56, $56, $56, $57
+ text $56, $56, $56, $56, $56, $56
+ done
; 0x18dabc
DragonShrine_MapEventHeader: ; 0x18dabc
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -306,7 +306,7 @@
; 0x18c9fb
UnknownText_0x18c9fb: ; 0x18c9fb
- text $52, " received"
+ text "<PLAYER> received"
line "TM24."
done
; 0x18ca0d
@@ -384,7 +384,7 @@
UnknownText_0x18cc83: ; 0x18cc83
text "…"
- line "What? ", $52, "?"
+ line "What? <PLAYER>?"
para "…No, I won't"
line "battle you now…"
@@ -501,7 +501,7 @@
; 0x18cf41
UnknownText_0x18cf41: ; 0x18cf41
- text $52, " found"
+ text "<PLAYER> found"
line "@"
text_from_ram StringBuffer3
text "!"
@@ -509,7 +509,7 @@
; 0x18cf51
UnknownText_0x18cf51: ; 0x18cf51
- text "But ", $52, " can't"
+ text "But <PLAYER> can't"
line "carry any more"
cont "items."
done
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -309,7 +309,7 @@
; 0x9a043
UnknownText_0x9a043: ; 0x9a043
- text $52, " received"
+ text "<PLAYER> received"
line "FOGBADGE."
done
; 0x9a059
@@ -465,7 +465,7 @@
; 0x9a452
EcruteakGymGuyWinText: ; 0x9a452
- text "Whew, ", $52, "."
+ text "Whew, <PLAYER>."
line "You did great!"
para "I was cowering in"
--- a/maps/EcruteakPokeCenter1F.asm
+++ b/maps/EcruteakPokeCenter1F.asm
@@ -111,7 +111,7 @@
text "Hi, I'm BILL. And"
line "who are you?"
- para "Hmm, ", $52, ", huh?"
+ para "Hmm, <PLAYER>, huh?"
line "You've come at the"
cont "right time."
done
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -18,7 +18,7 @@
jumpstd difficultbookshelf
ElmsWifeText:
- text "Hi, ", $14, "! My"
+ text "Hi, <PLAY_G>! My"
line "husband's always"
para "so busy--I hope"
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -794,7 +794,7 @@
; 0x78fb6
UnknownText_0x78fb6: ; 0x78fb6
- text "ELM: ", $14, "!"
+ text "ELM: <PLAY_G>!"
line "There you are!"
para "I needed to ask"
@@ -807,7 +807,7 @@
line "wondering if you"
para "could help me with"
- line "it, ", $14, "."
+ line "it, <PLAY_G>."
para "You see…"
@@ -834,7 +834,7 @@
; 0x790fa
UnknownText_0x790fa: ; 0x790fa
- text "Thanks, ", $14, "!"
+ text "Thanks, <PLAY_G>!"
para "You're a great"
line "help!"
@@ -902,7 +902,7 @@
para "I know!"
- para $14, ", can you"
+ para "<PLAY_G>, can you"
line "go in our place?"
done
; 0x792ff
@@ -916,7 +916,7 @@
para "You'll be that"
line "#MON's first"
- cont "partner, ", $14, "!"
+ cont "partner, <PLAY_G>!"
para "Go on. Pick one!"
done
@@ -973,7 +973,7 @@
; 0x794ad
ReceivedStarterText: ; 0x794ad
- text $52, " received"
+ text "<PLAYER> received"
line "@"
text_from_ram StringBuffer3
text "!"
@@ -1012,12 +1012,12 @@
done
ElmDirectionsText3: ; 0x795db
- text $14, ", I'm"
+ text "<PLAY_G>, I'm"
line "counting on you!"
done
GotElmsNumberText: ; 0x795f3
- text $52, " got ELM's"
+ text "<PLAYER> got ELM's"
line "phone number."
done
@@ -1048,7 +1048,7 @@
done
ElmAfterTheftText1: ; 0x796cd
- text "ELM: ", $14, ", this"
+ text "ELM: <PLAY_G>, this"
line "is terrible…"
para "Oh, yes, what was"
@@ -1058,7 +1058,7 @@
; 0x79712
ElmAfterTheftText2: ; 0x79712
- text $52, " handed"
+ text "<PLAYER> handed"
line "the MYSTERY EGG to"
cont "PROF.ELM."
done
@@ -1084,7 +1084,7 @@
para "PROF.OAK gave you"
line "a #DEX?"
- para $14, ", is that"
+ para "<PLAY_G>, is that"
line "true? Th-that's"
cont "incredible!"
@@ -1093,7 +1093,7 @@
cont "tial of people as"
cont "trainers."
- para "Wow, ", $14, ". You"
+ para "Wow, <PLAY_G>. You"
line "may have what it"
para "takes to become"
@@ -1114,7 +1114,7 @@
; 0x798cf
ElmAfterTheftText6: ; 0x798cf
- text "…", $14, ". The"
+ text "…<PLAY_G>. The"
line "road to the"
para "championship will"
@@ -1136,7 +1136,7 @@
; 0x7997d
ElmAideHasEggText: ; 0x7997d
- text "ELM: ", $14, "?"
+ text "ELM: <PLAY_G>?"
line "Didn't you meet my"
cont "assistant?"
@@ -1159,7 +1159,7 @@
; 0x79a40
UnknownText_0x79a40: ; 0x79a40
- text $14, "? I thought"
+ text "<PLAY_G>? I thought"
line "the EGG hatched."
para "Where is the"
@@ -1168,7 +1168,7 @@
; 0x79a72
ShowElmTogepiText1: ; 0x79a72
- text "ELM: ", $14, ", you"
+ text "ELM: <PLAY_G>, you"
line "look great!"
done
; 0x79a8b
@@ -1194,7 +1194,7 @@
; 0x79b1c
ElmGiveEverstoneText1: ; 0x79b1c
- text "Thanks, ", $14, "!"
+ text "Thanks, <PLAY_G>!"
line "You're helping"
para "unravel #MON"
@@ -1227,7 +1227,7 @@
; 0x79c37
UnknownText_0x79c37: ; 0x79c37
- text "ELM: ", $14, ", I'll"
+ text "ELM: <PLAY_G>, I'll"
line "call you if any-"
cont "thing comes up."
done
@@ -1249,7 +1249,7 @@
; 0x79cd0
ElmGiveMasterBallText1: ; 0x79cd0
- text "ELM: Hi, ", $14, "!"
+ text "ELM: Hi, <PLAY_G>!"
line "Thanks to you, my"
para "research is going"
@@ -1279,12 +1279,12 @@
line "make much better"
para "use of it than I"
- line "can, ", $14, "!"
+ line "can, <PLAY_G>!"
done
; 0x79df3
ElmGiveTicketText1: ; 0x79df3
- text "ELM: ", $14, "!"
+ text "ELM: <PLAY_G>!"
line "There you are!"
para "I called because I"
@@ -1304,7 +1304,7 @@
line "from OLIVINE CITY."
para "But you knew that"
- line "already, ", $14, "."
+ line "already, <PLAY_G>."
para "After all, you've"
line "traveled all over"
@@ -1323,7 +1323,7 @@
; 0x79f38
UnknownText_0x79f38: ; 0x79f38
- text $14, ", I want"
+ text "<PLAY_G>, I want"
line "you to have this"
cont "for your errand."
done
@@ -1363,7 +1363,7 @@
; 0x7a078
UnknownText_0x7a078: ; 0x7a078
- text $14, "!"
+ text "<PLAY_G>!"
para "Use these on your"
line "#DEX quest!"
@@ -1404,7 +1404,7 @@
; 0x7a1c0
UnknownText_0x7a1c0: ; 0x7a1c0
- text "OK! So ", $53
+ text "OK! So <RIVAL>"
line "was his name."
para "Thanks for helping"
@@ -1425,7 +1425,7 @@
done
ElmsLabTravelTip1Text:
- text $52, " opened a"
+ text "<PLAYER> opened a"
line "book."
para "Travel Tip 1:"
@@ -1435,7 +1435,7 @@
done
ElmsLabTravelTip2Text:
- text $52, " opened a"
+ text "<PLAYER> opened a"
line "book."
para "Travel Tip 2:"
@@ -1445,7 +1445,7 @@
done
ElmsLabTravelTip3Text:
- text $52, " opened a"
+ text "<PLAYER> opened a"
line "book."
para "Travel Tip 3:"
@@ -1456,7 +1456,7 @@
done
ElmsLabTravelTip4Text:
- text $52, " opened a"
+ text "<PLAYER> opened a"
line "book."
para "Travel Tip 4:"
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -405,7 +405,7 @@
; 0x76143
UnknownText_0x76143: ; 0x76143
- text $14, ", was it?"
+ text "<PLAY_G>, was it?"
line "I heard you enter-"
cont "tained my grand-"
cont "daughter."
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -271,7 +271,7 @@
; 0x195feb
UnknownText_0x195feb: ; 0x195feb
- text $52, " received"
+ text "<PLAYER> received"
line "SOULBADGE."
done
; 0x196002
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -76,7 +76,7 @@
; 0x54848
UnknownText_0x54848: ; 0x54848
- text $52, " borrowed a"
+ text "<PLAYER> borrowed a"
line "BICYCLE."
done
; 0x5485f
--- a/maps/GoldenrodBillsHouse.asm
+++ b/maps/GoldenrodBillsHouse.asm
@@ -114,7 +114,7 @@
jumpstd radio2
UnknownText_0x54c74: ; 0x54c74
- text "BILL: Hi, ", $52, "!"
+ text "BILL: Hi, <PLAYER>!"
line "Do us a favor and"
cont "take this EEVEE."
@@ -130,7 +130,7 @@
para "Can I count on you"
line "to play with it,"
- cont $52, "?"
+ cont "<PLAYER>?"
done
; 0x54d3f
@@ -150,7 +150,7 @@
; 0x54dae
UnknownText_0x54dae: ; 0x54dae
- text $52, " received"
+ text "<PLAYER> received"
line "EEVEE!"
done
; 0x54dc1
@@ -230,7 +230,7 @@
; 0x54fd9
UnknownText_0x54fd9: ; 0x54fd9
- text $52, " recorded"
+ text "<PLAYER> recorded"
line "BILL's number."
done
; 0x54ff3
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -536,7 +536,8 @@
done
UnknownText_0x1991cf:
- db $0, $57
+ text ""
+ done
GoldenrodCity_MapEventHeader:
; filler
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -314,7 +314,7 @@
; 0x54273
UnknownText_0x54273: ; 0x54273
- text $52, " received"
+ text "<PLAYER> received"
line "PLAINBADGE."
done
; 0x5428b
--- a/maps/GoldenrodPokeCenter1F.asm
+++ b/maps/GoldenrodPokeCenter1F.asm
@@ -781,7 +781,7 @@
; 0x622f0
UnknownText_0x622f0: ; 0x622f0
- text $52, ", isn't it?"
+ text "<PLAYER>, isn't it?"
para "Congratulations!"
@@ -873,7 +873,7 @@
; 0x62549
UnknownText_0x62549: ; 0x62549
- text $52, " gave away"
+ text "<PLAYER> gave away"
line "the EON MAIL."
done
; 0x62564
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -108,7 +108,7 @@
para "all the makings"
line "of greatness!"
- para $14, ", allow me"
+ para "<PLAY_G>, allow me"
line "to register you"
para "and your partners"
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -990,7 +990,7 @@
; 0x6f43b
UnknownText_0x6f43b: ; 0x6f43b
- text $52, " put in the"
+ text "<PLAYER> put in the"
line "GS BALL."
done
; 0x6f452
@@ -999,7 +999,7 @@
text "Whew, wasn't that"
line "something!"
- para $52, ", that was"
+ para "<PLAYER>, that was"
line "fantastic. Thanks!"
para "The legends about"
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -246,7 +246,7 @@
para "are going to pound"
line "you."
- para $52, "!"
+ para "<PLAYER>!"
line "I challenge you!"
done
; 0x180295
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -94,7 +94,7 @@
text "I am KAREN of the"
line "ELITE FOUR."
- para "You're ", $52, "?"
+ para "You're <PLAYER>?"
line "How amusing."
para "I love dark-type"
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -115,7 +115,7 @@
; 0x7a578
GearName: ; 0x7a578
- db $54, "GEAR@"
+ db "#GEAR@"
; 0x7a57e
UnknownScript_0x7a57e: ; 0x7a57e
@@ -232,7 +232,7 @@
; 0x7a604
UnknownText_0x7a604: ; 0x7a604
- text "Oh, ", $52, "…! Our"
+ text "Oh, <PLAYER>…! Our"
line "neighbor, PROF."
para "ELM, was looking"
@@ -342,7 +342,7 @@
; 0x7a957
UnknownText_0x7a957: ; 0x7a957
- text $52, ", do it!"
+ text "<PLAYER>, do it!"
para "I'm behind you all"
line "the way!"
@@ -351,25 +351,25 @@
NeighborMornIntroText:
text "Good morning,"
- line $14, "!"
+ line "<PLAY_G>!"
para "I'm visiting!"
done
NeighborDayIntroText:
- text "Hello, ", $14, "!"
+ text "Hello, <PLAY_G>!"
line "I'm visiting!"
done
NeighborNiteIntroText:
text "Good evening,"
- line $14, "!"
+ line "<PLAY_G>!"
para "I'm visiting!"
done
NeighborText:
- text $14, ", have you"
+ text "<PLAY_G>, have you"
line "heard?"
para "My daughter is"
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -488,7 +488,7 @@
UnknownText_0x18e473: ; 0x18e473
text "Hm? Who are you?"
- para $52, ", eh? You"
+ para "<PLAYER>, eh? You"
line "want me to make"
cont "some BALLS?"
@@ -528,7 +528,7 @@
; 0x18e615
UnknownText_0x18e615: ; 0x18e615
- text "KURT: Hi, ", $52, "!"
+ text "KURT: Hi, <PLAYER>!"
para "You handled your-"
line "self like a real"
@@ -591,7 +591,7 @@
; 0x18e7fb
UnknownText_0x18e7fb: ; 0x18e7fb
- text "KURT: Ah, ", $52, "!"
+ text "KURT: Ah, <PLAYER>!"
line "I just finished"
cont "your BALL. Here!"
done
@@ -645,7 +645,7 @@
; 0x18e95c
UnknownText_0x18e95c: ; 0x18e95c
- text $52, "!"
+ text "<PLAYER>!"
para "This BALL started"
line "to shake while I"
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -320,7 +320,7 @@
line "because of the"
cont "rumors?"
- para "You're ", $52, "?"
+ para "You're <PLAYER>?"
line "I'm LANCE, a"
cont "trainer like you."
@@ -330,7 +330,7 @@
para "I saw the way you"
line "battled earlier,"
- cont $14, "."
+ cont "<PLAY_G>."
para "I can tell that"
line "you're a trainer"
@@ -359,7 +359,7 @@
line "the cause."
para "I'll be waiting"
- line "for you, ", $14, "."
+ line "for you, <PLAY_G>."
done
UnknownText_0x70371:
@@ -378,7 +378,7 @@
done
UnknownText_0x703df:
- text $52, " obtained a"
+ text "<PLAYER> obtained a"
line "RED SCALE."
done
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -229,7 +229,7 @@
text "LANCE: I've been"
line "waiting for you."
- para $14, "!"
+ para "<PLAY_G>!"
para "I knew that you,"
line "with your skills,"
@@ -281,7 +281,7 @@
para "You have become"
line "truly powerful,"
- cont $14, "."
+ cont "<PLAY_G>."
para "Your #MON have"
line "responded to your"
@@ -308,7 +308,7 @@
UnknownText_0x18121b: ; 0x18121b
text "PROF.OAK: Ah,"
- line $14, "!"
+ line "<PLAY_G>!"
para "It's been a long"
line "while."
@@ -336,7 +336,7 @@
line "severed."
para "Congratulations,"
- line $14, "!"
+ line "<PLAY_G>!"
done
; 0x18134b
@@ -352,7 +352,7 @@
line "getting to be a"
cont "bit too noisy…"
- para $14, ", could you"
+ para "<PLAY_G>, could you"
line "come with me?"
done
; 0x1813c5
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -142,7 +142,7 @@
UnknownText_0x7f0a1: ; 0x7f0a1
text "Ah! So you're the"
- line $14, " who solved"
+ line "<PLAY_G> who solved"
para "the POWER PLANT's"
line "problem?"
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -285,7 +285,7 @@
; 0x199d3b
UnknownText_0x199d3b: ; 0x199d3b
- text $52, " received"
+ text "<PLAYER> received"
line "GLACIERBADGE."
done
; 0x199d55
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -219,7 +219,7 @@
UnknownText_0x6c549: ; 0x6c549
text "What took you,"
- line $14, "?"
+ line "<PLAY_G>?"
para "Just as I thought,"
line "that strange radio"
@@ -236,7 +236,7 @@
; 0x6c5ba
UnknownText_0x6c5ba: ; 0x6c5ba
- text "LANCE: ", $14, ", we"
+ text "LANCE: <PLAY_G>, we"
line "should split up to"
para "check this place."
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -28,10 +28,11 @@
end
; 0x199996
-; TODO wtf?
-UnknownText_0x199996: ; 0x199996
- limited_interpret_data 2
- db $0, "ズ", $03, $00
+UnknownScript_0x195996:
+ jumpstd picturebookshelf
+
+UnknownScript_0x195999:
+ jumpstd magazinebookshelf
UnknownText_0x19999c: ; 0x19999c
text "I heard that a red"
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -142,7 +142,7 @@
; 0x9d41b
UnknownText_0x9d41b: ; 0x9d41b
- text $52, " received a"
+ text "<PLAYER> received a"
line "#MON."
done
; 0x9d42f
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -99,7 +99,7 @@
text $56, " ", $56, " ", $56
para "It's been a while,"
- line $52, "."
+ line "<PLAYER>."
para "…Since I lost to"
line "you, I thought"
@@ -111,7 +111,7 @@
para "And we came up"
line "with an answer."
- para $52, ", now we'll"
+ para "<PLAYER>, now we'll"
line "show you!"
done
; 0x7419d
@@ -147,7 +147,7 @@
para "Because these guys"
line "are behind me."
- para "…Listen, ", $52, "."
+ para "…Listen, <PLAYER>."
para "One of these days"
line "I'm going to prove"
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -116,7 +116,7 @@
; 0x7e355
UnknownText_0x7e355: ; 0x7e355
- text $52, " received"
+ text "<PLAYER> received"
line "TYROGUE."
done
; 0x7e36a
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -189,7 +189,7 @@
UnknownText_0x196f66: ; 0x196f66
text "Hello, hello! You"
- line "must be ", $14, "."
+ line "must be <PLAY_G>."
para "PROF.ELM said that"
line "you would visit."
@@ -204,7 +204,7 @@
; 0x196fd2
UnknownText_0x196fd2: ; 0x196fd2
- text $52, " received"
+ text "<PLAYER> received"
line "MYSTERY EGG."
done
; 0x196feb
@@ -267,7 +267,7 @@
UnknownText_0x197185: ; 0x197185
text "OAK: Aha! So"
- line "you're ", $14, "!"
+ line "you're <PLAY_G>!"
para "I'm OAK! A #MON"
line "researcher."
@@ -331,7 +331,7 @@
; 0x1973cc
UnknownText_0x1973cc: ; 0x1973cc
- text $52, " received"
+ text "<PLAYER> received"
line "#DEX!"
done
; 0x1973de
@@ -350,7 +350,7 @@
line "GOLDENROD for my"
cont "usual radio show."
- para $14, ", I'm"
+ para "<PLAY_G>, I'm"
line "counting on you!"
done
; 0x197476
@@ -363,7 +363,7 @@
para "That's rare! "
line "I, I want it…"
- para $14, ", would you"
+ para "<PLAY_G>, would you"
line "care to trade it?"
para "I can offer this"
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -196,7 +196,7 @@
done
UnknownText_0x1a8134:
- text "Wait, ", $14, "!"
+ text "Wait, <PLAY_G>!"
done
UnknownText_0x1a813e:
@@ -223,7 +223,7 @@
done
UnknownText_0x1a81f2:
- text "Hi, ", $14, "!"
+ text "Hi, <PLAY_G>!"
line "Leaving again?"
para "You should tell"
@@ -240,7 +240,7 @@
done
UnknownText_0x1a8274:
- text "Yo, ", $52, "!"
+ text "Yo, <PLAYER>!"
para "I hear PROF.ELM"
line "discovered some"
@@ -269,7 +269,7 @@
done
UnknownText_0x1a8328:
- text $52, "'s House"
+ text "<PLAYER>'s House"
done
UnknownText_0x1a8332:
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -79,7 +79,7 @@
jumptext OaksLabPCText
OakWelcomeKantoText:
- text "OAK: Ah, ", $14, "!"
+ text "OAK: Ah, <PLAY_G>!"
line "It's good of you"
para "to come all this"
@@ -117,7 +117,7 @@
line "assessment of you."
para "Tell you what,"
- line $14, ". I'll make"
+ line "<PLAY_G>. I'll make"
para "arrangements so"
line "that you can go to"
@@ -137,7 +137,7 @@
para "we can make an"
line "exception in your"
- cont "case, ", $14, "."
+ cont "case, <PLAY_G>."
para "Go up to INDIGO"
line "PLATEAU. You can"
@@ -180,7 +180,7 @@
line "for you."
para "Keep trying hard,"
- line $14, "!"
+ line "<PLAY_G>!"
done
UnknownText_0x19b7fb: ; 0x19b7fb
@@ -246,7 +246,7 @@
line "away."
para "I heard rumors"
- line "that ", $14, " is"
+ line "that <PLAY_G> is"
para "getting quite a"
line "reputation."
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -141,7 +141,7 @@
; 0x9c33a
UnknownText_0x9c33a: ; 0x9c33a
- text $52, " received"
+ text "<PLAYER> received"
line "MINERALBADGE."
done
; 0x9c354
@@ -157,7 +157,7 @@
; 0x9c393
UnknownText_0x9c393: ; 0x9c393
- text $52, " received"
+ text "<PLAYER> received"
line "TM09."
done
; 0x9c3a5
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -209,7 +209,7 @@
; 0x60dc3
UnknownText_0x60dc3: ; 0x60dc3
- text $52, " handed the"
+ text "<PLAYER> handed the"
line "SECRETPOTION to"
cont "JASMINE."
done
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -345,7 +345,7 @@
; 0x74b11
UnknownText_0x74b11: ; 0x74b11
- text $52, " flashed"
+ text "<PLAYER> flashed"
line "the S.S.TICKET."
para "That's it."
@@ -354,7 +354,7 @@
; 0x74b41
UnknownText_0x74b41: ; 0x74b41
- text $52, " tried to"
+ text "<PLAYER> tried to"
line "show the S.S."
cont "TICKET…"
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -133,13 +133,13 @@
; 0x1a2a3d
UnknownText_0x1a2a3d: ; 0x1a2a3d
- text $52, " received"
+ text "<PLAYER> received"
line "BOULDERBADGE."
done
; 0x1a2a57
UnknownText_0x1a2a57: ; 0x1a2a57
- text "BROCK: ", $14, ","
+ text "BROCK: <PLAY_G>,"
line "thanks. I enjoyed"
para "battling you, even"
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -1029,7 +1029,7 @@
UnknownText_0x19308b: ; 0x19308b
text "Sorry--@"
text_from_ram StringBuffer1
- db $0
+ text ""
line "can't be taken."
prompt
; 0x1930a8
@@ -1077,7 +1077,7 @@
UnknownText_0x193190: ; 0x193190
text "Hello! You're"
- line $52, ", right?"
+ line "<PLAYER>, right?"
para "I have some-"
line "thing for you."
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -193,7 +193,7 @@
; 0x191ae0
UnknownText_0x191ae0: ; 0x191ae0
- text "Hello, ", $14, "!"
+ text "Hello, <PLAY_G>!"
para "Did you come see"
line "me about my #-"
@@ -264,7 +264,7 @@
; 0x191d0a
UnknownText_0x191d0a: ; 0x191d0a
- text $52, " received"
+ text "<PLAYER> received"
line "# DOLL."
done
; 0x191d1e
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -285,8 +285,9 @@
; 0x5cf79
UnknownText_0x5cf79: ; 0x5cf79
- db $0, $56, $4f
- db $56, $57
+ text $56
+ line $56
+ done
; 0x5cf7e
UnknownText_0x5cf7e: ; 0x5cf7e
@@ -430,7 +431,7 @@
; 0x5d3c0
UnknownText_0x5d3c0: ; 0x5d3c0
- text $52, "'s #GEAR"
+ text "<PLAYER>'s #GEAR"
line "can now double as"
cont "a radio!"
done
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -626,9 +626,9 @@
para "What was your name"
line "again?"
- para "…", $14, ", OK!"
+ para "…<PLAY_G>, OK!"
- para "Come on, ", $14, "."
+ para "Come on, <PLAY_G>."
line "Join the show."
done
; 0x5dedd
@@ -641,7 +641,7 @@
line "shout out today's"
para "password for"
- line $14, "!"
+ line "<PLAY_G>!"
done
; 0x5df29
@@ -690,7 +690,7 @@
text "BUENA: Yup! Our"
line "contestant was"
- para $14, "."
+ para "<PLAY_G>."
line "Thanks for coming!"
para "I hope all you"
@@ -753,7 +753,7 @@
cont "30 points, but…"
para "You came by so"
- line "often, ", $14, "."
+ line "often, <PLAY_G>."
para "I'll make you a"
line "special deal!"
@@ -764,7 +764,7 @@
; 0x5e2bf
UnknownText_0x5e2bf: ; 0x5e2bf
- text "BUENA: ", $14, ","
+ text "BUENA: <PLAY_G>,"
line "do you want to"
para "register my phone"
@@ -773,7 +773,7 @@
; 0x5e2f3
UnknownText_0x5e2f3: ; 0x5e2f3
- text $52, " registered"
+ text "<PLAYER> registered"
line "BUENA's number."
done
; 0x5e310
@@ -792,7 +792,7 @@
; 0x5e35e
UnknownText_0x5e35e: ; 0x5e35e
- text "BUENA: ", $14, ","
+ text "BUENA: <PLAY_G>,"
line "your phone list"
para "has no room left"
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -416,7 +416,7 @@
; 0x5eabc
UnknownText_0x5eabc: ; 0x5eabc
- text $52, " inserted"
+ text "<PLAYER> inserted"
line "the CARD KEY."
done
; 0x5ead6
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -291,7 +291,7 @@
; 0x60358
UnknownText_0x60358: ; 0x60358
- text $52, ", isn't it?"
+ text "<PLAYER>, isn't it?"
para "A brat like you"
line "won't appreciate"
@@ -361,7 +361,7 @@
; 0x605b2
UnknownText_0x605b2: ; 0x605b2
- text "DIRECTOR: ", $14, ","
+ text "DIRECTOR: <PLAY_G>,"
line "thank you!"
para "Your courageous"
@@ -430,7 +430,7 @@
UnknownText_0x60824: ; 0x60824
text "DIRECTOR: Hello,"
- line $14, "!"
+ line "<PLAY_G>!"
para "You know, I love"
line "#MON."
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -15,7 +15,7 @@
; 0x19b050
UnknownText_0x19b050: ; 0x19b050
- text $52, " played the"
+ text "<PLAYER> played the"
line "N64."
para "Better get going--"
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -467,7 +467,7 @@
CooltrainerfBeth1SeenText: ; 0x1a5136
text "I lost to a train-"
- line "er named ", $53, "."
+ line "er named <RIVAL>."
para "He was really"
line "strong, but…"
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -11,7 +11,7 @@
; 0x9b955
UnknownText_0x9b955: ; 0x9b955
- text "Are you ", $14, "?"
+ text "Are you <PLAY_G>?"
para "I work as PROF."
line "OAK's AIDE."
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -378,7 +378,7 @@
; 0x1a5790
UnknownText_0x1a5790: ; 0x1a5790
- text $52, " handed"
+ text "<PLAYER> handed"
line "over the #MON"
cont "holding the MAIL."
done
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -651,7 +651,7 @@
done
UnknownText_0x1907ab:
- text $52, ", right?"
+ text "<PLAYER>, right?"
line "Some guy wearing"
para "glasses was look-"
--- a/maps/Route35Goldenrodgate.asm
+++ b/maps/Route35Goldenrodgate.asm
@@ -123,7 +123,7 @@
; 0x69eb8
UnknownText_0x69eb8: ; 0x69eb8
- text $52, " received a"
+ text "<PLAYER> received a"
line "#MON with MAIL."
done
; 0x69ed6
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -284,7 +284,7 @@
; 0x6a3c7
UnknownText_0x6a3c7: ; 0x6a3c7
- text $52, " received"
+ text "<PLAYER> received"
line "20 PARK BALLS."
done
; 0x6a3e2
@@ -341,7 +341,7 @@
; 0x6a56b
UnknownText_0x6a56b: ; 0x6a56b
- text $52, "'s #MON"
+ text "<PLAYER>'s #MON"
line "were left with the"
cont "CONTEST HELPER."
done
@@ -415,7 +415,7 @@
UnknownText_0x6a79a: ; 0x6a79a
text "You still have @"
text_from_ram StringBuffer3
- db $0
+ text ""
line "minute(s) left."
para "Do you want to"
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -490,7 +490,7 @@
; 0x194290
UnknownText_0x194290: ; 0x194290
- text $52, " used the"
+ text "<PLAYER> used the"
line "SQUIRTBOTTLE."
done
; 0x1942aa
@@ -572,7 +572,7 @@
; 0x19451a
UnknownText_0x19451a: ; 0x19451a
- text $52, " received"
+ text "<PLAYER> received"
line "TM08."
done
; 0x19452c
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -546,7 +546,7 @@
; 0x6aeb1
UnknownText_0x6aeb1: ; 0x6aeb1
- text $52, " received"
+ text "<PLAYER> received"
line "20 PARK BALLS."
done
; 0x6aecc
@@ -603,7 +603,7 @@
; 0x6b055
UnknownText_0x6b055: ; 0x6b055
- text $52, "'s #MON"
+ text "<PLAYER>'s #MON"
line "were left with the"
cont "CONTEST HELPER."
done
@@ -677,7 +677,7 @@
UnknownText_0x6b284: ; 0x6b284
text "You still have @"
text_from_ram StringBuffer3
- db $0
+ text ""
line "minute(s) left."
para "Do you want to"
@@ -923,7 +923,7 @@
; 0x6b97f
UnknownText_0x6b97f: ; 0x6b97f
- text $52, "?"
+ text "<PLAYER>?"
para "Here's the prize"
line "we were holding"
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -171,7 +171,7 @@
; 0x9cdbc
UnknownText_0x9cdbc: ; 0x9cdbc
- text $52, " gave a"
+ text "<PLAYER> gave a"
line "BERRY to MILTANK."
done
; 0x9cdd8
@@ -195,13 +195,13 @@
; 0x9ce3c
UnknownText_0x9ce3c: ; 0x9ce3c
- text $52, " has no"
+ text "<PLAYER> has no"
line "BERRIES…"
done
; 0x9ce4f
UnknownText_0x9ce4f: ; 0x9ce4f
- text $52, " wouldn't"
+ text "<PLAYER> wouldn't"
line "give a BERRY."
para "MILTANK looks sad."
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -188,7 +188,7 @@
; 0x9d1b5
UnknownText_0x9d1b5: ; 0x9d1b5
- text $52, " received"
+ text "<PLAYER> received"
line "TM13."
done
; 0x9d1c7
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -512,7 +512,7 @@
text "Would you get"
line "this?"
- para "Some ", $53, " guy"
+ para "Some <RIVAL> guy"
line "made fun of my"
cont "#MON!"
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -266,7 +266,7 @@
; 0x19ae1b
UnknownText_0x19ae1b: ; 0x19ae1b
- text $52, " received"
+ text "<PLAYER> received"
line "TM30."
done
; 0x19ae2d
--- a/maps/RuinsofAlphResearchCenter.asm
+++ b/maps/RuinsofAlphResearchCenter.asm
@@ -233,7 +233,7 @@
; 0x592fa
UnknownText_0x592fa: ; 0x592fa
- text $52, "'s #DEX"
+ text "<PLAYER>'s #DEX"
line "was upgraded."
done
; 0x59311
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -229,7 +229,7 @@
; 0x189e95
UnknownText_0x189e95: ; 0x189e95
- text $52, " received"
+ text "<PLAYER> received"
line "MARSHBADGE."
done
; 0x189ead
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -104,7 +104,7 @@
; 0x1ab683
UnknownText_0x1ab683: ; 0x1ab683
- text $52, " received"
+ text "<PLAYER> received"
line "VOLCANOBADGE."
done
; 0x1ab69d
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -36,8 +36,9 @@
; 0x18c637
UnknownText_0x18c637: ; 0x18c637
- db $0, $56, $4f
- db $56, $57
+ text $56
+ line $56
+ done
; 0x18c63c
UnknownText_0x18c63c: ; 0x18c63c
@@ -46,8 +47,9 @@
; 0x18c63f
UnknownText_0x18c63f: ; 0x18c63f
- db $0, $56, $4f
- db $56, $57
+ text $56
+ line $56
+ done
; 0x18c644
SilverCaveRoom3_MapEventHeader: ; 0x18c644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -214,7 +214,7 @@
UnknownText_0x5a6b5: ; 0x5a6b5
text "KURT: Hey there,"
- line $52, "!"
+ line "<PLAYER>!"
para "The guard up top"
line "took off when I"
@@ -237,7 +237,7 @@
para "Ah, it can't be"
line "helped."
- para $52, ", show them"
+ para "<PLAYER>, show them"
line "how gutsy you are"
cont "in my place!"
done
@@ -245,7 +245,7 @@
KurtLeaveSlowpokeWellText: ; 0x5a7ca
text "KURT: Way to go,"
- line $52, "!"
+ line "<PLAYER>!"
para "TEAM ROCKET has"
line "taken off."
@@ -386,7 +386,7 @@
; 0x5ac09
UnknownText_0x5ac09: ; 0x5ac09
- text $52, " read the"
+ text "<PLAYER> read the"
line "MAIL."
para "Be good and look"
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -263,7 +263,7 @@
; 0x184bc8
UnknownText_0x184bc8: ; 0x184bc8
- text $53, " used an"
+ text "<RIVAL> used an"
line "ESCAPE ROPE!"
done
; 0x184be0
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -766,7 +766,7 @@
; 0x6d64e
UnknownText_0x6d64e: ; 0x6d64e
- text "Sorry, ", $14, "."
+ text "Sorry, <PLAY_G>."
line "I saw how well you"
para "were doing, so I"
@@ -806,7 +806,7 @@
para "makes me feel"
line "guilty."
- para $14, ", let's"
+ para "<PLAY_G>, let's"
line "split the job."
done
; 0x6d7ea
@@ -841,7 +841,7 @@
; 0x6d8e6
UnknownText_0x6d8e6: ; 0x6d8e6
- text $52, " received"
+ text "<PLAYER> received"
line "HM06."
done
; 0x6d8f8
@@ -865,7 +865,7 @@
; 0x6d994
UnknownText_0x6d994: ; 0x6d994
- text $14, "…"
+ text "<PLAY_G>…"
para "The journey to be-"
line "coming the #MON"
@@ -909,7 +909,7 @@
; 0x6daf7
UnknownText_0x6daf7: ; 0x6daf7
- text "LANCE: ", $14, ","
+ text "LANCE: <PLAY_G>,"
line "let's give it our"
cont "best for #MON."
done
@@ -1005,7 +1005,7 @@
UnknownText_0x6dd6b: ; 0x6dd6b
text "The door's closed…"
- para $52, " entered"
+ para "<PLAYER> entered"
line "the password."
para "The door opened!"
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -429,7 +429,7 @@
line "very graciously"
cont "told me so."
- para $14, ", let's go"
+ para "<PLAY_G>, let's go"
line "get the passwords."
done
; 0x6e235
@@ -675,7 +675,7 @@
UnknownText_0x6e9a3: ; 0x6e9a3
text "The door's closed…"
- para $52, " entered"
+ para "<PLAYER> entered"
line "the two passwords."
para "The door opened!"
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -349,7 +349,7 @@
line "but you were even"
para "more incredible,"
- line $52, "."
+ line "<PLAYER>."
para "I heard SUICUNE's"
line "mystic power"
@@ -370,7 +370,7 @@
line "me that fantastic"
cont "battle."
- para "Later, ", $52, "!"
+ para "Later, <PLAYER>!"
done
; 0x185386
@@ -483,7 +483,7 @@
line "to see the #MON"
para "of rainbow colors,"
- line $52, "."
+ line "<PLAYER>."
para "It happened just"
line "as I envisioned."
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -190,7 +190,7 @@
; 0x192277
UnknownText_0x192277: ; 0x192277
- text $52, " received"
+ text "<PLAYER> received"
line "THUNDERBADGE."
done
; 0x192291
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -259,7 +259,7 @@
done
UnknownText_0x74fc2:
- text $52, " flashed"
+ text "<PLAYER> flashed"
line "the S.S.TICKET."
para "That's it."
@@ -267,7 +267,7 @@
done
UnknownText_0x74ff2:
- text $52, " tried to"
+ text "<PLAYER> tried to"
line "show the S.S."
cont "TICKET…"
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -203,7 +203,7 @@
para "#MON with me."
line "I'm invincible!"
- para $52, "!"
+ para "<PLAYER>!"
line "I challenge you!"
done
; 0x7463d
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -188,7 +188,7 @@
; 0x685af
UnknownText_0x685af: ; 0x685af
- text $52, " received"
+ text "<PLAYER> received"
line "ZEPHYRBADGE."
done
; 0x685c8
--- a/maps/VioletPokeCenter1F.asm
+++ b/maps/VioletPokeCenter1F.asm
@@ -113,7 +113,7 @@
; 0x69555
UnknownText_0x69555: ; 0x69555
- text $14, ", long"
+ text "<PLAY_G>, long"
line "time, no see."
para "PROF.ELM asked me"
@@ -138,7 +138,7 @@
line "with other active"
cont "#MON to hatch."
- para $14, ", you're"
+ para "<PLAY_G>, you're"
line "the only person"
cont "we can rely on."
@@ -166,7 +166,7 @@
; 0x69712
UnknownText_0x69712: ; 0x69712
- text $14, ", will you"
+ text "<PLAY_G>, will you"
line "take the EGG?"
done
; 0x6972d
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -111,7 +111,7 @@
; 0x9ac0f
UnknownText_0x9ac0f: ; 0x9ac0f
- text $52, " received"
+ text "<PLAYER> received"
line "EARTHBADGE."
done
; 0x9ac27
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -92,7 +92,7 @@
UnknownText_0x180531: ; 0x180531
text "Welcome to #MON"
- line "LEAGUE, ", $52, "."
+ line "LEAGUE, <PLAYER>."
para "Allow me to intro-"
line "duce myself. I am"
@@ -133,7 +133,7 @@
para "stand above all"
line "trainers!"
- para "Now, ", $52, ", move"
+ para "Now, <PLAYER>, move"
line "on and experience"
para "the true ferocity"
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -1324,7 +1324,7 @@
db "─ №", $f2
next ""
next "おや/"
- next $73, "№", $f2, ""
+ next $73, "№", $f2
db "@"
; 108a87
--- a/text/battle.asm
+++ b/text/battle.asm
@@ -1,5 +1,5 @@
BattleText_0x80730: ; 0x80730
- text $52, " picked up"
+ text "<PLAYER> picked up"
line "¥@"
deciram wPayDayMoney, $36
text "!"
@@ -18,8 +18,8 @@
text "The hooked"
line "@"
text_from_ram EnemyMonNick
- text $55
- db "attacked!"
+ text ""
+ cont "attacked!"
prompt
; 0x80778
@@ -39,7 +39,7 @@
; 0x807a9
WantsToBattleText:: ; 0x807a9
- text $3f
+ text "<ENEMY>"
line "wants to battle!"
prompt
; 0x807bd
@@ -61,13 +61,13 @@
; 0x807e2
HurtByPoisonText: ; 0x807e2
- text $5a
+ text "<USER>"
line "is hurt by poison!"
prompt
; 0x807f8
HurtByBurnText: ; 0x807f8
- text $5a, "'s"
+ text "<USER>'s"
line "hurt by its burn!"
prompt
; 0x8080e
@@ -74,18 +74,18 @@
LeechSeedSapsText: ; 0x8080e
text "LEECH SEED saps"
- line $5a, "!"
+ line "<USER>!"
prompt
; 0x80822
HasANightmareText: ; 0x80822
- text $5a
+ text "<USER>"
line "has a NIGHTMARE!"
prompt
; 0x80836
HurtByCurseText: ; 0x80836
- text $5a, "'s"
+ text "<USER>'s"
line "hurt by the CURSE!"
prompt
; 0x8084d
@@ -92,12 +92,12 @@
SandstormHitsText: ; 0x8084d
text "The SANDSTORM hits"
- line $5a, "!"
+ line "<USER>!"
prompt
; 0x80864
PerishCountText: ; 0x80864
- text $5a, "'s"
+ text "<USER>'s"
line "PERISH count is @"
deciram wd265, $11
text "!"
@@ -105,7 +105,7 @@
; 0x80880
BattleText_0x80880: ; 0x80880
- text $59
+ text "<TARGET>"
line "recovered with"
cont "@"
text_from_ram StringBuffer1
@@ -114,7 +114,7 @@
; 0x80899
BattleText_0x80899: ; 0x80899
- text $5a
+ text "<USER>"
line "recovered PP using"
cont "@"
text_from_ram StringBuffer1
@@ -123,7 +123,7 @@
; 0x808b6
BattleText_0x808b6: ; 0x808b6
- text $59
+ text "<TARGET>"
line "was hit by FUTURE"
cont "SIGHT!"
prompt
@@ -130,7 +130,7 @@
; 0x808d2
BattleText_0x808d2: ; 0x808d2
- text $5a, "'s"
+ text "<USER>'s"
line "SAFEGUARD faded!"
prompt
; 0x808e7
@@ -193,7 +193,7 @@
; 0x809be
GotMoneyForWinningText:
- text $52, " got ¥@"
+ text "<PLAYER> got ¥@"
deciram wc686, $36
text ""
line "for winning!"
@@ -200,7 +200,7 @@
prompt
BattleText_0x809da: ; 0x809da
- text $3f
+ text "<ENEMY>"
line "was defeated!"
prompt
; 0x809eb
@@ -207,12 +207,12 @@
TiedAgainstText: ; 0x809eb
text "Tied against"
- line $3f, "!"
+ line "<ENEMY>!"
prompt
; 0x809fc
SentSomeToMomText:
- text $52, " got ¥@"
+ text "<PLAYER> got ¥@"
deciram wc686, $36
text ""
line "for winning!"
@@ -228,7 +228,7 @@
prompt
BattleText_0x80a4f: ; 0x80a4f
- text $53, ": Huh? I"
+ text "<RIVAL>: Huh? I"
line "should've chosen"
cont "your #MON!"
prompt
@@ -247,7 +247,7 @@
; 0x80a93
BattleText_0x80a93: ; 0x80a93
- text $53, ": Yes!"
+ text "<RIVAL>: Yes!"
line "I guess I chose a"
cont "good #MON!"
prompt
@@ -255,24 +255,24 @@
LostAgainstText: ; 0x80ab9
text "Lost against"
- line $3f, "!"
+ line "<ENEMY>!"
prompt
; 0x80aca
BattleText_0x80aca: ; 0x80aca
- text $3f
+ text "<ENEMY>"
line "is about to use"
cont "@"
text_from_ram EnemyMonNick
text "."
- para "Will ", $52
+ para "Will <PLAYER>"
line "change #MON?"
done
; 0x80af8
BattleText_0x80af8: ; 0x80af8
- text $3f
+ text "<ENEMY>"
line "sent out"
cont "@"
text_from_ram EnemyMonNick
@@ -310,7 +310,7 @@
; 0x80b89
BattleText_0x80b89: ; 0x80b89
- text $5a
+ text "<USER>"
line "fled using a"
cont "@"
text_from_ram StringBuffer1
@@ -324,13 +324,13 @@
; 0x80bae
BattleText_0x80bae: ; 0x80bae
- text $5a, "'s"
+ text "<USER>'s"
line "hurt by SPIKES!"
prompt
; 0x80bc2
RecoveredUsingText: ; 0x80bc2
- text $59
+ text "<TARGET>"
line "recovered using a"
cont "@"
text_from_ram StringBuffer1
@@ -339,11 +339,11 @@
; 0x80bde
BattleText_0x80bde: ; 0x80bde
- text $5a, "'s"
+ text "<USER>'s"
line "@"
text_from_ram StringBuffer1
- text $55
- db "activated!"
+ text ""
+ cont "activated!"
prompt
; 0x80bf3
@@ -387,7 +387,7 @@
; 0x80c8a
BattleText_0x80c8a: ; 0x80c8a
- text $59, "'s"
+ text "<TARGET>'s"
line "ENCORE ended!"
prompt
; 0x80c9c
@@ -423,43 +423,43 @@
; 0x80ce7
FastAsleepText: ; 0x80ce7
- text $5a
+ text "<USER>"
line "is fast asleep!"
prompt
; 0x80cfa
WokeUpText: ; 0x80cfa
- text $5a
+ text "<USER>"
line "woke up!"
prompt
; 0x80d06
FrozenSolidText: ; 0x80d06
- text $5a
+ text "<USER>"
line "is frozen solid!"
prompt
; 0x80d1a
FlinchedText: ; 0x80d1a
- text $5a
+ text "<USER>"
line "flinched!"
prompt
; 0x80d27
MustRechargeText: ; 0x80d27
- text $5a
+ text "<USER>"
line "must recharge!"
prompt
; 0x80d39
DisabledNoMoreText: ; 0x80d39
- text $5a, "'s"
+ text "<USER>'s"
line "disabled no more!"
prompt
; 0x80d4f
IsConfusedText: ; 0x80d4f
- text $5a
+ text "<USER>"
line "is confused!"
prompt
; 0x80d5f
@@ -471,13 +471,13 @@
; 0x80d81
ConfusedNoMoreText: ; 0x80d81
- text $5a, "'s"
+ text "<USER>'s"
line "confused no more!"
prompt
; 0x80d97
BecameConfusedText: ; 0x80d97
- text $59
+ text "<TARGET>"
line "became confused!"
prompt
; 0x80dab
@@ -486,19 +486,19 @@
text "A @"
text_from_ram StringBuffer1
text " rid"
- line $59
+ line "<TARGET>"
cont "of its confusion."
prompt
; 0x80dcc
AlreadyConfusedText: ; 0x80dcc
- text $59, "'s"
+ text "<TARGET>'s"
line "already confused!"
prompt
; 0x80de2
BattleText_0x80de2: ; 0x80de2
- text $5a, "'s"
+ text "<USER>'s"
line "hurt by"
cont "@"
text_from_ram StringBuffer1
@@ -507,7 +507,7 @@
; 0x80df5
BattleText_0x80df5: ; 0x80df5
- text $5a
+ text "<USER>"
line "was released from"
cont "@"
text_from_ram StringBuffer1
@@ -516,52 +516,52 @@
; 0x80e11
UsedBindText: ; 0x80e11
- text $5a
+ text "<USER>"
line "used BIND on"
- cont $59, "!"
+ cont "<TARGET>!"
prompt
; 0x80e24
WhirlpoolTrapText: ; 0x80e24
- text $59
+ text "<TARGET>"
line "was trapped!"
prompt
; 0x80e34
FireSpinTrapText: ; 0x80e34
- text $59
+ text "<TARGET>"
line "was trapped!"
prompt
; 0x80e44
WrappedByText: ; 0x80e44
- text $59
+ text "<TARGET>"
line "was WRAPPED by"
- cont $5a, "!"
+ cont "<USER>!"
prompt
; 0x80e59
ClampedByText: ; 0x80e59
- text $59
+ text "<TARGET>"
line "was CLAMPED by"
- cont $5a, "!"
+ cont "<USER>!"
prompt
; 0x80e6e
StoringEnergyText: ; 0x80e6e
- text $5a
+ text "<USER>"
line "is storing energy!"
prompt
; 0x80e84
UnleashedEnergyText: ; 0x80e84
- text $5a
+ text "<USER>"
line "unleashed energy!"
prompt
; 0x80e99
HungOnText: ; 0x80e99
- text $59
+ text "<TARGET>"
line "hung on with"
cont "@"
text_from_ram StringBuffer1
@@ -570,20 +570,20 @@
; 0x80eb0
EnduredText: ; 0x80eb0
- text $59
+ text "<TARGET>"
line "ENDURED the hit!"
prompt
; 0x80ec4
InLoveWithText: ; 0x80ec4
- text $5a
+ text "<USER>"
line "is in love with"
- cont $59, "!"
+ cont "<TARGET>!"
prompt
; 0x80eda
InfatuationText: ; 0x80eda
- text $5a, "'s"
+ text "<USER>'s"
line "infatuation kept"
cont "it from attacking!"
prompt
@@ -590,7 +590,7 @@
; 0x80f02
DisabledMoveText: ; 0x80f02
- text $5a, "'s"
+ text "<USER>'s"
line "@"
text_from_ram StringBuffer1
text " is"
@@ -647,7 +647,7 @@
; 0x80fba
HasNoPPLeftText: ; 0x80fba
- text $5a
+ text "<USER>"
line "has no PP left for"
cont "@"
text_from_ram StringBuffer2
@@ -656,13 +656,13 @@
; 0x80fd7
WentToSleepText: ; 0x80fd7
- text $5a
+ text "<USER>"
line "went to sleep!"
done
; 0x80fe9
RestedText: ; 0x80fe9
- text $5a
+ text "<USER>"
line "fell asleep and"
cont "became healthy!"
done
@@ -669,25 +669,25 @@
; 0x8100c
RegainedHealthText: ; 0x8100c
- text $5a
+ text "<USER>"
line "regained health!"
prompt
; 0x81020
AttackMissedText: ; 0x81020
- text $5a, "'s"
+ text "<USER>'s"
line "attack missed!"
prompt
; 0x81033
AttackMissed2Text: ; 0x81033
- text $5a, "'s"
+ text "<USER>'s"
line "attack missed!"
prompt
; 0x81046
CrashedText: ; 0x81046
- text $5a
+ text "<USER>"
line "kept going and"
cont "crashed!"
prompt
@@ -694,7 +694,7 @@
; 0x81061
UnaffectedText: ; 0x81061
- text $59, "'s"
+ text "<TARGET>'s"
line "unaffected!"
prompt
; 0x81071
@@ -701,7 +701,7 @@
DoesntAffectText: ; 0x81071
text "It doesn't affect"
- line $59, "!"
+ line "<TARGET>!"
prompt
; 0x81086
@@ -728,20 +728,20 @@
; 0x810da
TookDownWithItText: ; 0x810da
- text $59
+ text "<TARGET>"
line "took down with it,"
- cont $5a, "!"
+ cont "<USER>!"
prompt
; 0x810f3
RageBuildingText: ; 0x810f3
- text $5a, "'s"
+ text "<USER>'s"
line "RAGE is building!"
prompt
; 0x81109
GotAnEncoreText: ; 0x81109
- text $59
+ text "<TARGET>"
line "got an ENCORE!"
prompt
; 0x8111b
@@ -753,13 +753,13 @@
; 0x81136
TookAimText: ; 0x81136
- text $5a
+ text "<USER>"
line "took aim!"
prompt
; 0x81143
SketchedText: ; 0x81143
- text $5a
+ text "<USER>"
line "SKETCHED"
cont "@"
text_from_ram StringBuffer1
@@ -768,7 +768,7 @@
; 0x81156
DestinyBondEffectText: ; 0x81156
- text $5a, "'s"
+ text "<USER>'s"
line "trying to take its"
cont "opponent with it!"
prompt
@@ -775,7 +775,7 @@
; 0x8117f
SpiteEffectText: ; 0x8117f
- text $59, "'s"
+ text "<TARGET>'s"
line "@"
text_from_ram StringBuffer1
text " was"
@@ -792,31 +792,31 @@
; 0x811b1
FellAsleepText: ; 0x811b1
- text $59
+ text "<TARGET>"
line "fell asleep!"
prompt
; 0x811c1
AlreadyAsleepText: ; 0x811c1
- text $59, "'s"
+ text "<TARGET>'s"
line "already asleep!"
prompt
; 0x811d5
WasPoisonedText: ; 0x811d5
- text $59
+ text "<TARGET>"
line "was poisoned!"
prompt
; 0x811e6
BadlyPoisonedText: ; 0x811e6
- text $59, "'s"
+ text "<TARGET>'s"
line "badly poisoned!"
prompt
; 0x811fa
AlreadyPoisonedText: ; 0x811fa
- text $59, "'s"
+ text "<TARGET>'s"
line "already poisoned!"
prompt
; 0x81210
@@ -823,36 +823,36 @@
SuckedHealthText: ; 0x81210
text "Sucked health from"
- line $59, "!"
+ line "<TARGET>!"
prompt
; 0x81227
DreamEatenText: ; 0x81227
- text $59, "'s"
+ text "<TARGET>'s"
line "dream was eaten!"
prompt
; 0x8123c
WasBurnedText: ; 0x8123c
- text $59
+ text "<TARGET>"
line "was burned!"
prompt
; 0x8124b
DefrostedOpponentText: ; 0x8124b
- text $59
+ text "<TARGET>"
line "was defrosted!"
prompt
; 0x8125d
WasFrozenText: ; 0x8125d
- text $59
+ text "<TARGET>"
line "was frozen solid!"
prompt
; 0x81272
WontRiseAnymoreText: ; 0x81272
- text $5a, "'s"
+ text "<USER>'s"
line "@"
text_from_ram StringBuffer2
text " won't"
@@ -861,7 +861,7 @@
; 0x8128f
WontDropAnymoreText: ; 0x8128f
- text $59, "'s"
+ text "<TARGET>'s"
line "@"
text_from_ram StringBuffer2
text " won't"
@@ -870,19 +870,19 @@
; 0x812ac
FledFromBattleText:: ; 0x812ac
- text $5a
+ text "<USER>"
line "fled from battle!"
prompt
; 0x812c1
FledInFearText: ; 0x812c1
- text $59
+ text "<TARGET>"
line "fled in fear!"
prompt
; 0x812d2
BlownAwayText: ; 0x812d2
- text $59
+ text "<TARGET>"
line "was blown away!"
prompt
; 0x812e5
@@ -902,13 +902,13 @@
; 0x8130b
MistText: ; 0x8130b
- text $5a, "'s"
+ text "<USER>'s"
line "shrouded in MIST!"
prompt
; 0x81321
ProtectedByMistText: ; 0x81321
- text $59, "'s"
+ text "<TARGET>'s"
line "protected by MIST."
prompt
; 0x81338
@@ -915,25 +915,25 @@
GettingPumpedText: ; 0x81338
interpret_data
- text $5a, "'s"
+ text "<USER>'s"
line "getting pumped!"
prompt
; 0x8134d
RecoilText: ; 0x8134d
- text $5a, "'s"
+ text "<USER>'s"
line "hit with recoil!"
prompt
; 0x81362
MadeSubstituteText: ; 0x81362
- text $5a
+ text "<USER>"
line "made a SUBSTITUTE!"
prompt
; 0x81378
HasSubstituteText: ; 0x81378
- text $5a
+ text "<USER>"
line "has a SUBSTITUTE!"
prompt
; 0x8138d
@@ -947,18 +947,18 @@
SubTookDamageText: ; 0x813ad
text "The SUBSTITUTE"
line "took damage for"
- cont $59, "!"
+ cont "<TARGET>!"
prompt
; 0x813d0
SubFadedText: ; 0x813d0
- text $59, "'s"
+ text "<TARGET>'s"
line "SUBSTITUTE faded!"
prompt
; 0x813e6
LearnedMoveText: ; 0x813e6
- text $5a
+ text "<USER>"
line "learned"
cont "@"
text_from_ram StringBuffer1
@@ -967,19 +967,19 @@
; 0x813f8
WasSeededText: ; 0x813f8
- text $59
+ text "<TARGET>"
line "was seeded!"
prompt
; 0x81407
EvadedText: ; 0x81407
- text $59
+ text "<TARGET>"
line "evaded the attack!"
prompt
; 0x8141d
WasDisabledText: ; 0x8141d
- text $59, "'s"
+ text "<TARGET>'s"
line "@"
text_from_ram StringBuffer1
text " was"
@@ -994,7 +994,7 @@
; 0x81452
TransformedTypeText: ; 0x81452
- text $5a
+ text "<USER>"
line "transformed into"
cont "the @"
text_from_ram StringBuffer1
@@ -1009,7 +1009,7 @@
; 0x81499
TransformedText: ; 0x81499
- text $5a
+ text "<USER>"
line "TRANSFORMED into"
cont "@"
text_from_ram StringBuffer1
@@ -1018,13 +1018,13 @@
; 0x814b4
LightScreenEffectText: ; 0x814b4
- text $5a, "'s"
+ text "<USER>'s"
line "SPCL.DEF rose!"
prompt
; 0x814c7
ReflectEffectText: ; 0x814c7
- text $5a, "'s"
+ text "<USER>'s"
line "DEFENSE rose!"
prompt
; 0x814d9
@@ -1047,30 +1047,30 @@
DidntAffect1Text: ; 0x8150c
text "It didn't affect"
- line $59, "!"
+ line "<TARGET>!"
prompt
; 0x81520
DidntAffect2Text: ; 0x81520
text "It didn't affect"
- line $59, "!"
+ line "<TARGET>!"
prompt
; 0x81534
HPIsFullText: ; 0x81534
- text $5a, "'s"
+ text "<USER>'s"
line "HP is full!"
prompt
; 0x81544
DraggedOutText: ; 0x81544
- text $5a
+ text "<USER>"
line "was dragged out!"
prompt
; 0x81558
ParalyzedText: ; 0x81558
- text $59, "'s"
+ text "<TARGET>'s"
line "paralyzed! Maybe"
cont "it can't attack!"
prompt
@@ -1077,19 +1077,19 @@
; 0x8157d
FullyParalyzedText: ; 0x8157d
- text $5a, "'s"
+ text "<USER>'s"
line "fully paralyzed!"
prompt
; 0x81592
AlreadyParalyzedText: ; 0x81592
- text $59, "'s"
+ text "<TARGET>'s"
line "already paralyzed!"
prompt
; 0x815a9
ProtectedByText: ; 0x815a9
- text $59, "'s"
+ text "<TARGET>'s"
line "protected by"
cont "@"
text_from_ram StringBuffer1
@@ -1098,27 +1098,28 @@
; 0x815c1
MirrorMoveFailedText: ; 0x815c1
- text "The MIRROR MOVE", $4e, "failed!"
+ text "The MIRROR MOVE"
+ next "failed!"
prompt
; 0x815da
StoleText: ; 0x815da
- text $5a
+ text "<USER>"
line "stole @"
text_from_ram StringBuffer1
- text $55
- db "from its foe!"
+ text ""
+ cont "from its foe!"
prompt
; 0x815f7
CantEscapeNowText: ; 0x815f7
- text $59
+ text "<TARGET>"
line "can't escape now!"
prompt
; 0x8160b
StartedNightmareText: ; 0x8160b
- text $59
+ text "<TARGET>"
line "started to have a"
cont "NIGHTMARE!"
prompt
@@ -1125,28 +1126,28 @@
; 0x8162b
WasDefrostedText: ; 0x8162b
- text $5a
+ text "<USER>"
line "was defrosted!"
prompt
; 0x8163d
PutACurseText: ; 0x8163d
- text $5a
+ text "<USER>"
line "cut its own HP and"
para "put a CURSE on"
- line $59, "!"
+ line "<TARGET>!"
prompt
; 0x81665
ProtectedItselfText: ; 0x81665
- text $5a
+ text "<USER>"
line "PROTECTED itself!"
prompt
; 0x8167a
ProtectingItselfText: ; 0x8167a
- text $59, "'s"
+ text "<TARGET>'s"
line "PROTECTING itself!"
done
; 0x81691
@@ -1154,14 +1155,14 @@
SpikesText: ; 0x81691
text "SPIKES scattered"
line "all around"
- cont $59, "!"
+ cont "<TARGET>!"
prompt
; 0x816b1
IdentifiedText: ; 0x816b1
- text $5a
+ text "<USER>"
line "identified"
- cont $59, "!"
+ cont "<TARGET>!"
prompt
; 0x816c2
@@ -1178,25 +1179,25 @@
; 0x816f9
BracedItselfText: ; 0x816f9
- text $5a
+ text "<USER>"
line "braced itself!"
prompt
; 0x8170b
FellInLoveText: ; 0x8170b
- text $59
+ text "<TARGET>"
line "fell in love!"
prompt
; 0x8171c
CoveredByVeilText: ; 0x8171c
- text $5a, "'s"
+ text "<USER>'s"
line "covered by a veil!"
prompt
; 0x81733
SafeguardProtectText: ; 0x81733
- text $59
+ text "<TARGET>"
line "is protected by"
cont "SAFEGUARD!"
prompt
@@ -1210,20 +1211,20 @@
; 0x81764
ReleasedByText: ; 0x81764
- text $5a
+ text "<USER>"
line "was released by"
- cont $59, "!"
+ cont "<TARGET>!"
prompt
; 0x8177a
ShedLeechSeedText: ; 0x8177a
- text $5a
+ text "<USER>"
line "shed LEECH SEED!"
prompt
; 0x8178e
BlewSpikesText: ; 0x8178e
- text $5a
+ text "<USER>"
line "blew away SPIKES!"
prompt
; 0x817a3
@@ -1241,7 +1242,7 @@
; 0x817d2
BellyDrumText: ; 0x817d2
- text $5a
+ text "<USER>"
line "cut its HP and"
cont "maximized ATTACK!"
prompt
@@ -1248,16 +1249,16 @@
; 0x817f6
CopiedStatsText: ; 0x817f6
- text $5a
+ text "<USER>"
line "copied the stat"
para "changes of"
- line $59, "!"
+ line "<TARGET>!"
prompt
; 0x81817
ForesawAttackText: ; 0x81817
- text $5a
+ text "<USER>"
line "foresaw an attack!"
prompt
; 0x8182d
@@ -1270,13 +1271,13 @@
; 0x8183b
RefusedGiftText: ; 0x8183b
- text $59
+ text "<TARGET>"
line "refused the gift!"
prompt
; 0x81850
IgnoredOrders2Text: ; 0x81850
- text $5a
+ text "<USER>"
line "ignored orders!"
prompt
; 0x81863
--- a/text/common.asm
+++ b/text/common.asm
@@ -247,9 +247,9 @@
; 0x1b0621
UnknownText_0x1b0621: ; 0x1b0621
- text $52, ", the No.@"
+ text "<PLAYER>, the No.@"
text_from_ram StringBuffer3
- db $0
+ text ""
line "finisher, wins"
cont "@"
text_from_ram StringBuffer4
@@ -258,7 +258,7 @@
; 0x1b0648
UnknownText_0x1b0648: ; 0x1b0648
- text $52, " received"
+ text "<PLAYER> received"
line "@"
text_from_ram StringBuffer4
text "."
@@ -304,7 +304,7 @@
UnknownText_0x1b074e: ; 0x1b074e
text_from_ram StringBuffer3
- db $0
+ text ""
line "#MON GYM"
done
; 0x1b075c
@@ -312,9 +312,10 @@
UnknownText_0x1b075c: ; 0x1b075c
text "LEADER: @"
text_from_ram StringBuffer4
- db $0, $51
- db "WINNING TRAINERS:"
- line $52, $57
+ text ""
+ para "WINNING TRAINERS:"
+ line "<PLAYER>"
+ done
; 0x1b077f
UnknownText_0x1b077f: ; 0x1b077f
@@ -408,7 +409,7 @@
done
RegisteredNumber1Text:
- text $52, " registered"
+ text "<PLAYER> registered"
line "@"
text_from_ram StringBuffer3
text "'s number."
@@ -415,7 +416,7 @@
done
RegisteredNumber2Text:
- text $52, " registered"
+ text "<PLAYER> registered"
line "@"
text_from_ram StringBuffer3
text "'s number."
--- a/text/common_2.asm
+++ b/text/common_2.asm
@@ -144,27 +144,31 @@
UnknownText_0x1bc1eb: ; 0x1bc1eb
text "Your PASSCODE has"
- line "been set.", $51
- db "Enter this number"
- line "next time to open", $55
- db "the CARD FOLDER.", $51
- db $57
+ line "been set."
+ para "Enter this number"
+ line "next time to open"
+ cont "the CARD FOLDER."
+ para ""
+ done
; 0x1bc23e
UnknownText_0x1bc23e: ; 0x1bc23e
- text "0000 is invalid!", $51
- db $57
+ text "0000 is invalid!"
+ para ""
+ done
; 0x1bc251
UnknownText_0x1bc251: ; 0x1bc251
- text "Enter the CARD", $4e, "FOLDER PASSCODE."
+ text "Enter the CARD"
+ next "FOLDER PASSCODE."
done
; 0x1bc272
UnknownText_0x1bc272: ; 0x1bc272
text "Incorrect"
- line "PASSCODE!", $51
- db $57
+ line "PASSCODE!"
+ para ""
+ done
; 0x1bc288
UnknownText_0x1bc288: ; 0x1bc288
@@ -283,7 +287,8 @@
UnknownText_0x1bc42c: ; 0x1bc42c
text "The password is:"
- line $57
+ line ""
+ done
; 0x1bc43f
UnknownText_0x1bc43f: ; 0x1bc43f
@@ -347,8 +352,8 @@
text "Put away the"
line "@"
text_from_ram StringBuffer3
- text $51
- db "and set up the"
+ text ""
+ para "and set up the"
line "@"
text_from_ram StringBuffer4
text "."
@@ -399,7 +404,7 @@
; 0x1bc615
UnknownText_0x1bc615: ; 0x1bc615
- text "Hi, ", $52, "!"
+ text "Hi, <PLAYER>!"
line "How are you?"
prompt
; 0x1bc62a
@@ -1286,11 +1291,12 @@
UnknownText_0x1bcf99: ; 0x1bcf99
text ""
- line $57
+ line ""
+ done
; 0x1bcf9c
UnknownText_0x1bcf9c: ; 0x1bcf9c
- text $3f
+ text "<ENEMY>"
line "withdrew"
cont "@"
text_from_ram EnemyMonNick
@@ -1299,11 +1305,11 @@
; 0x1bcfaf
UnknownText_0x1bcfaf: ; 0x1bcfaf
- text $3f
+ text "<ENEMY>"
line "used @"
text_from_ram wd050
- text $55
- db "on @"
+ text ""
+ cont "on @"
text_from_ram EnemyMonNick
text "!"
prompt
@@ -1383,7 +1389,8 @@
UnknownText_0x1bd109: ; 0x1bd109
text "There is no EGG."
- line $58
+ line ""
+ prompt
; 0x1bd11c
UnknownText_0x1bd11c: ; 0x1bd11c
@@ -1528,7 +1535,7 @@
; 0x1bd321
UnknownText_0x1bd321: ; 0x1bd321
- text $52, " found"
+ text "<PLAYER> found"
line "@"
text_from_ram StringBuffer3
text "!"
@@ -1536,7 +1543,7 @@
; 0x1bd331
UnknownText_0x1bd331: ; 0x1bd331
- text "But ", $52, " has"
+ text "But <PLAYER> has"
line "no space left…"
done
; 0x1bd34b
@@ -1595,11 +1602,11 @@
; 0x1bd429
UnknownText_0x1bd429: ; 0x1bd429
- text $52, " traded"
+ text "<PLAYER> traded"
line "@"
text_from_ram wd050
- text " for", $55
- db "@"
+ text " for"
+ cont "@"
text_from_ram StringBuffer2
text ".@"
db "@"
@@ -1815,8 +1822,9 @@
UnknownText_0x1bd868: ; 0x1bd868
text "OK, I'll take care"
- line "of your money.", $51
- db $56, $56, $56, $58
+ line "of your money."
+ para $56, $56, $56
+ prompt
; 0x1bd88e
UnknownText_0x1bd88e: ; 0x1bd88e
@@ -1895,7 +1903,7 @@
text "OK, I'll save your"
line "money. Trust me!"
- para $52, ", stick"
+ para "<PLAYER>, stick"
line "with it!"
done
; 0x1bda5b
@@ -1907,7 +1915,7 @@
; 0x1bda7e
UnknownText_0x1bda7e: ; 0x1bda7e
- text $52, ", don't"
+ text "<PLAYER>, don't"
line "give up!"
done
; 0x1bda90
@@ -2059,7 +2067,7 @@
; 0x1bde1f
UnknownText_0x1bde1f: ; 0x1bde1f
- text $52, " got back"
+ text "<PLAYER> got back"
line "@"
text_from_ram StringBuffer1
text "."
@@ -2070,8 +2078,8 @@
text "Huh? Back already?"
line "Your @"
text_from_ram StringBuffer1
- text $51
- db "needs a little"
+ text ""
+ para "needs a little"
line "more time with us."
para "If you want your"
@@ -2128,7 +2136,7 @@
; 0x1bdfa5
UnknownText_0x1bdfa5: ; 0x1bdfa5
- text $52, " received"
+ text "<PLAYER> received"
line "the EGG!"
done
; 0x1bdfba
--- a/text/common_3.asm
+++ b/text/common_3.asm
@@ -292,8 +292,8 @@
text " sent"
line "@"
text_from_ram StringBuffer1
- text $55
- db "to @"
+ text ""
+ cont "to @"
text_from_ram wc950 + 3
text "'s home."
prompt
@@ -422,7 +422,7 @@
; 1c06ed
UnknownText_0x1c06ed: ; 1c06ed
- text $52, " used an"
+ text "<PLAYER> used an"
line "ESCAPE ROPE."
done
; 1c0705
@@ -441,8 +441,9 @@
UnknownText_0x1c073b: ; 1c073b
text "Can't use that"
- line "here.", $51
- db $57
+ line "here."
+ para ""
+ done
; 1c0751
UnknownText_0x1c0751: ; 1c0751
@@ -578,7 +579,7 @@
; 1c09b2
UnknownText_0x1c09b2: ; 1c09b2
- text $52, " got on the"
+ text "<PLAYER> got on the"
line "@"
text_from_ram StringBuffer2
text "."
@@ -586,7 +587,7 @@
; 1c09c7
UnknownText_0x1c09c7: ; 1c09c7
- text $52, " got off"
+ text "<PLAYER> got off"
line "the @"
text_from_ram StringBuffer2
text "."
@@ -608,7 +609,7 @@
; 1c0a1c
UnknownText_0x1c0a1c: ; 1c0a1c
- text $52, " found"
+ text "<PLAYER> found"
line "@"
text_from_ram StringBuffer3
text "!"
@@ -616,7 +617,7 @@
; 1c0a2c
UnknownText_0x1c0a2c: ; 1c0a2c
- text "But ", $52, " can't"
+ text "But <PLAYER> can't"
line "carry any more"
cont "items."
done
@@ -623,10 +624,10 @@
; 1c0a4e
UnknownText_0x1c0a4e: ; 1c0a4e
- text $52, " is out of"
+ text "<PLAYER> is out of"
line "useable #MON!"
- para $52, " whited"
+ para "<PLAYER> whited"
line "out!"
done
; 1c0a77
@@ -652,10 +653,10 @@
; 1c0ada
UnknownText_0x1c0ada: ; 1c0ada
- text $52, " is out of"
+ text "<PLAYER> is out of"
line "useable #MON!"
- para $52, " whited"
+ para "<PLAYER> whited"
line "out!"
prompt
; 1c0b03
@@ -674,7 +675,7 @@
; 1c0b3b
UnknownText_0x1c0b3b: ; 1c0b3b
- text $52, " sprinkled"
+ text "<PLAYER> sprinkled"
line "water."
para "But nothing"
@@ -683,7 +684,7 @@
; 1c0b65
UnknownText_0x1c0b65: ; 1c0b65
- text $52, "'s #MON"
+ text "<PLAYER>'s #MON"
line "were all healed!"
done
; 1c0b7f
@@ -724,7 +725,7 @@
; 1c0bee
UnknownText_0x1c0bee: ; 1c0bee
- text "OAK: ", $52, "!"
+ text "OAK: <PLAYER>!"
line "This isn't the"
cont "time to use that!"
prompt
@@ -774,7 +775,7 @@
; 1c0cc6
UnknownText_0x1c0cc6: ; 1c0cc6
- text $5a, "'s"
+ text "<USER>'s"
line "@"
text_from_ram StringBuffer2
db "@"
@@ -796,7 +797,7 @@
; 1c0ceb
UnknownText_0x1c0ceb: ; 1c0ceb
- text $59, "'s"
+ text "<TARGET>'s"
line "@"
text_from_ram StringBuffer2
db "@"
@@ -818,7 +819,7 @@
; 1c0d0e
UnknownText_0x1c0d0e: ; 1c0d0e
- text $5a, "@"
+ text "<USER>@"
db "@"
; 1c0d12
@@ -859,7 +860,7 @@
; 1c0d7a
_ActorNameText: ; 1c0d7a
- text $5a, "@"
+ text "<USER>@"
db "@"
; 1c0d7e
@@ -876,9 +877,9 @@
; 1c0d90
_UsedInsteadText: ; 1c0d90
- text "instead,", $55
+ text "instead,"
+ cont "@"
db "@"
- db "@"
; 1c0d9c
_MoveNameText: ; 1c0d9c
@@ -916,9 +917,9 @@
; 1c0db0
UnknownText_0x1c0db0: ; 1c0db0
- text "Huh?", $51
+ text "Huh?"
+ para "@"
db "@"
- db "@"
; 1c0db8
UnknownText_0x1c0db8: ; 1c0db8
@@ -1142,12 +1143,12 @@
text "This Bug-Catching"
line "Contest winner is@"
interpret_data
- text "…", $51
- db "@"
+ text "…"
+ para "@"
text_from_ram wd016
text ","
- line "who caught a", $55
- db "@"
+ line "who caught a"
+ cont "@"
text_from_ram StringBuffer1
text "!@"
db "@"
@@ -1154,8 +1155,8 @@
; 1c113f
UnknownText_0x1c113f: ; 1c113f
- text $51
- db "The winning score"
+ text ""
+ para "The winning score"
line "was @"
deciram wd004, $23
text " points!"
@@ -1166,8 +1167,8 @@
text "Placing second was"
line "@"
text_from_ram wd016
- text ",", $51
- db "who caught a"
+ text ","
+ para "who caught a"
line "@"
text_from_ram StringBuffer1
text "!@"
@@ -1175,8 +1176,8 @@
; 1c1196
UnknownText_0x1c1196: ; 1c1196
- text $51
- db "The score was"
+ text ""
+ para "The score was"
line "@"
deciram wd008, $23
text " points!"
@@ -1187,8 +1188,8 @@
text "Placing third was"
line "@"
text_from_ram wd016
- text ",", $51
- db "who caught a"
+ text ","
+ para "who caught a"
line "@"
text_from_ram StringBuffer1
text "!@"
@@ -1196,8 +1197,8 @@
; 1c11e4
UnknownText_0x1c11e4: ; 1c11e4
- text $51
- db "The score was"
+ text ""
+ para "The score was"
line "@"
deciram wd00c, $23
text " points!"
@@ -1216,8 +1217,8 @@
; 1c123a
UnknownText_0x1c123a: ; 1c123a
- text "CURRENT RECORD", $51
- db "@"
+ text "CURRENT RECORD"
+ para "@"
text_from_ram StringBuffer1
text " caught by"
line "@"
@@ -1273,7 +1274,7 @@
; 1c1353
UnknownText_0x1c1353: ; 1c1353
- text $52, " turned on"
+ text "<PLAYER> turned on"
line "the PC."
prompt
; 1c1368
@@ -1334,7 +1335,7 @@
; 1c144d
UnknownText_0x1c144d: ; 1c144d
- text $52, " turned on"
+ text "<PLAYER> turned on"
line "the PC."
prompt
; 1c1462
@@ -1566,19 +1567,21 @@
UnknownText_0x1c19cd: ; 1c19cd
text "Triple-theme"
- line "trainer ranking!", $51
- db "The SAVE file you"
- line "just sent might", $55
- db "make the rankings!", $51
- db $57
+ line "trainer ranking!"
+ para "The SAVE file you"
+ line "just sent might"
+ cont "make the rankings!"
+ para ""
+ done
; 1c1a22
UnknownText_0x1c1a22: ; 1c1a22
text "There is no"
- line "ranking data.", $51
- db "Link to obtain"
- line "ranking data.", $51
- db $57
+ line "ranking data."
+ para "Link to obtain"
+ line "ranking data."
+ para ""
+ done
; 1c1a5b
UnknownText_0x1c1a5b: ; 1c1a5b
@@ -1630,7 +1633,7 @@
; 1c1b03
UnknownText_0x1c1b03: ; 1c1b03
- text "OAK: ", $52, "!"
+ text "OAK: <PLAYER>!"
line "This isn't the"
cont "time to use that!"
done
@@ -1776,9 +1779,9 @@
_OakText2: ; 1c1da4
text "This world is in-"
- line "habited by crea-", $55
- db "tures that we call", $55
- db "#MON.@"
+ line "habited by crea-"
+ cont "tures that we call"
+ cont "#MON.@"
db "@"
; 1c1de2
--- a/text/common_4.asm
+++ b/text/common_4.asm
@@ -5,7 +5,7 @@
; 0x1c4026
_OakText7: ; 0x1c4026
- text $52, ", are you"
+ text "<PLAYER>, are you"
line "ready?"
para "Your very own"
@@ -219,7 +219,7 @@
; 0x1c4590
UnknownText_0x1c4590: ; 0x1c4590
- text $52, " saved"
+ text "<PLAYER> saved"
line "the game."
done
; 0x1c45a3
@@ -291,7 +291,7 @@
; 0x1c4719
UnknownText_0x1c4719:: ; 0x1c4719
- text $52, " received"
+ text "<PLAYER> received"
line "@"
text_from_ram StringBuffer4
text "."
@@ -299,7 +299,7 @@
; 0x1c472c
UnknownText_0x1c472c:: ; 0x1c472c
- text $52, " put the"
+ text "<PLAYER> put the"
line "@"
text_from_ram StringBuffer1
text " in"
@@ -366,8 +366,8 @@
text ""
line "came from @"
text_from_ram wd02a
- text $55
- db "in a trade?"
+ text ""
+ cont "in a trade?"
para "@"
text_from_ram wd00e
@@ -374,8 +374,8 @@
text ""
line "was where @"
text_from_ram wd02a
- text $55
- db "met @"
+ text ""
+ cont "met @"
text_from_ram wd003
text "!"
prompt
@@ -489,8 +489,8 @@
para "I'm sure that"
line "seeing @"
text_from_ram wd003
- text $51
- db "in battle would"
+ text ""
+ para "in battle would"
line "excite anyone."
done
; 0x1c4b92
@@ -507,8 +507,8 @@
; 0x1c4baf
UnknownText_0x1c4baf: ; 0x1c4baf
- text $51
- db "evolved into"
+ text ""
+ para "evolved into"
line "@"
text_from_ram StringBuffer1
text "!"
@@ -826,12 +826,13 @@
_MobileStadiumSuccessText: ; 0x1c5121
text "Data transfer is"
- line "complete.", $51
- db "We hope you enjoy"
- line "MOBILE STADIUM", $51
- db "battles in the N64"
- line "#MON STADIUM 2.", $51
- db $57
+ line "complete."
+ para "We hope you enjoy"
+ line "MOBILE STADIUM"
+ para "battles in the N64"
+ line "#MON STADIUM 2."
+ para ""
+ done
; 0x1c5182
UnknownText_0x1c5182: ; 0x1c5182
@@ -879,45 +880,49 @@
UnknownText_0x1c5238: ; 0x1c5238
text "The CARD FOLDER"
- line "stores your and", $51
- db "your friends'"
- line "CARDS.", $51
- db "A CARD contains"
- line "information like", $51
- db "the person's name,"
- line "phone number and", $55
- db "profile.", $51
- db $57
+ line "stores your and"
+ para "your friends'"
+ line "CARDS."
+ para "A CARD contains"
+ line "information like"
+ para "the person's name,"
+ line "phone number and"
+ cont "profile."
+ para ""
+ done
; 0x1c52bc
UnknownText_0x1c52bc: ; 0x1c52bc
- text "This is your CARD.", $51
- db "Once you've"
- line "entered your phone", $51
- db "number, you can"
- line "trade CARDS with", $55
- db "your friends.", $51
- db $57
+ text "This is your CARD."
+ para "Once you've"
+ line "entered your phone"
+ para "number, you can"
+ line "trade CARDS with"
+ cont "your friends."
+ para ""
+ done
; 0x1c531e
UnknownText_0x1c531e: ; 0x1c531e
text "If you have your"
- line "friend's CARD, you", $51
- db "can use it to make"
- line "a call from a", $51
- db "mobile phone on"
- line "the 2nd floor of a", $55
- db "#MON CENTER.", $51
- db $57
+ line "friend's CARD, you"
+ para "can use it to make"
+ line "a call from a"
+ para "mobile phone on"
+ line "the 2nd floor of a"
+ cont "#MON CENTER."
+ para ""
+ done
; 0x1c5394
UnknownText_0x1c5394: ; 0x1c5394
text "To safely store"
- line "your collection of", $51
- db "CARDS, you must"
- line "set a PASSCODE for", $55
- db "your CARD FOLDER.", $51
- db $57
+ line "your collection of"
+ para "CARDS, you must"
+ line "set a PASSCODE for"
+ cont "your CARD FOLDER."
+ para ""
+ done
; 0x1c53ee
UnknownText_0x1c53ee: ; 0x1c53ee
@@ -945,8 +950,9 @@
UnknownText_0x1c54b9: ; 0x1c54b9
text "The CARD FOLDER"
- line "has been deleted.", $51
- db $57
+ line "has been deleted."
+ para ""
+ done
; 0x1c54dd
UnknownText_0x1c54dd: ; 0x1c54dd
@@ -983,7 +989,8 @@
; 0x1c5588
UnknownText_0x1c5588: ; 0x1c5588
- text "", $56, $57
+ text $56
+ done
; 0x1c558b
UnknownText_0x1c558b: ; 0x1c558b
@@ -1053,7 +1060,8 @@
; 0x1c5678
UnknownText_0x1c5678: ; 0x1c5678
- text "Which move should", $4e, "be forgotten?"
+ text "Which move should"
+ next "be forgotten?"
done
; 0x1c5699
@@ -1110,8 +1118,8 @@
UnknownText_0x1c574e: ; 0x1c574e
text " Poof!@"
interpret_data
- text $51
- db "@"
+ text ""
+ para "@"
text_from_ram wd050
text " forgot"
line "@"
@@ -1181,7 +1189,8 @@
; 0x1c5824
UnknownText_0x1c5824: ; 0x1c5824
- text "", $56, $57
+ text $56
+ done
; 0x1c5827
UnknownText_0x1c5827: ; 0x1c5827
@@ -1222,20 +1231,23 @@
; 0x1c58d1
UnknownText_0x1c58d1: ; 0x1c58d1
- text "Here you go!", $51
- db $57
+ text "Here you go!"
+ para ""
+ done
; 0x1c58e0
UnknownText_0x1c58e0: ; 0x1c58e0
text "You don't have"
- line "enough points.", $51
- db $57
+ line "enough points."
+ para ""
+ done
; 0x1c58ff
UnknownText_0x1c58ff: ; 0x1c58ff
text "You have no room"
- line "for it.", $51
- db $57
+ line "for it."
+ para ""
+ done
; 0x1c591a
UnknownText_0x1c591a: ; 0x1c591a
@@ -1245,14 +1257,16 @@
; 0x1c5937
UnknownText_0x1c5937: ; 0x1c5937
- text "Excuse me!", $51
- db $57
+ text "Excuse me!"
+ para ""
+ done
; 0x1c5944
UnknownText_0x1c5944: ; 0x1c5944
text "Excuse me."
- line "You're not ready.", $51
- db $57
+ line "You're not ready."
+ para ""
+ done
; 0x1c5962
UnknownText_0x1c5962: ; 0x1c5962
@@ -1263,20 +1277,23 @@
UnknownText_0x1c5983: ; 0x1c5983
text "You need at least"
- line "three #MON.", $51
- db $57
+ line "three #MON."
+ para ""
+ done
; 0x1c59a3
UnknownText_0x1c59a3: ; 0x1c59a3
text "Sorry, an EGG"
- line "doesn't qualify.", $51
- db $57
+ line "doesn't qualify."
+ para ""
+ done
; 0x1c59c3
UnknownText_0x1c59c3: ; 0x1c59c3
text "Only three #MON"
- line "may be entered.", $51
- db $57
+ line "may be entered."
+ para ""
+ done
; 0x1c59e5
UnknownText_0x1c59e5: ; 0x1c59e5
@@ -1283,9 +1300,10 @@
text "The @"
text_from_ram StringBuffer2
text " #MON"
- line "must all be", $55
- db "different kinds.", $51
- db $57
+ line "must all be"
+ cont "different kinds."
+ para ""
+ done
; 0x1c5a13
UnknownText_0x1c5a13: ; 0x1c5a13
@@ -1292,15 +1310,17 @@
text "The @"
text_from_ram StringBuffer2
text " #MON"
- line "must not hold the", $55
- db "same items.", $51
- db $57
+ line "must not hold the"
+ cont "same items."
+ para ""
+ done
; 0x1c5a42
UnknownText_0x1c5a42: ; 0x1c5a42
text "You can't take an"
- line "EGG!", $51
- db $57
+ line "EGG!"
+ para ""
+ done
; 0x1c5a5a
UnknownText_0x1c5a5a: ; 0x1c5a5a
@@ -1374,8 +1394,8 @@
UnknownText_0x1c5b53: ; 0x1c5b53
text_from_ram EnemyMonNick
text "'s data"
- line "was newly added to", $55
- db "the #DEX.@"
+ line "was newly added to"
+ cont "the #DEX.@"
sound0x2C
text_waitbutton
db "@"
@@ -1431,7 +1451,7 @@
; 0x1c5c44
UnknownText_0x1c5c44: ; 0x1c5c44
- text $52, " played the"
+ text "<PLAYER> played the"
line "# FLUTE.@"
text_waitbutton
db "@"
@@ -1495,8 +1515,8 @@
text "There was a trophy"
line "inside!@"
sound0
- text $51
- db "@"
+ text ""
+ para "@"
text_from_ram PlayerName
text " sent the"
line "trophy home."
@@ -1515,7 +1535,7 @@
; 0x1c5d6e
UnknownText_0x1c5d6e: ; 0x1c5d6e
- text "OAK: ", $52, "!"
+ text "OAK: <PLAYER>!"
line "This isn't the"
cont "time to use that!"
prompt
@@ -1566,7 +1586,7 @@
; 0x1c5e68
UnknownText_0x1c5e68: ; 0x1c5e68
- text $52, " used the@"
+ text "<PLAYER> used the@"
text_dunno1
text_from_ram StringBuffer2
text "."
@@ -1574,7 +1594,7 @@
; 0x1c5e7b
UnknownText_0x1c5e7b: ; 0x1c5e7b
- text $52, " got on the@"
+ text "<PLAYER> got on the@"
text_dunno1
text_from_ram StringBuffer2
text "."
@@ -1582,7 +1602,7 @@
; 0x1c5e90
UnknownText_0x1c5e90: ; 0x1c5e90
- text $52, " got off@"
+ text "<PLAYER> got off@"
text_dunno1
text "the @"
text_from_ram StringBuffer2
--- a/text/phone/beverly_overworld.asm
+++ b/text/phone/beverly_overworld.asm
@@ -44,7 +44,7 @@
done
BeverlyGiftText:
- text "Oh? ", $52, "? "
+ text "Oh? <PLAYER>? "
line "I waited here for"
para "you. I brought you"
--- a/text/phone/bill.asm
+++ b/text/phone/bill.asm
@@ -29,21 +29,24 @@
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 @@
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 @@
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 @@
done
BillPhoneNewlyFullText: ; 0x1b4652
- text "Hi, ", $14, "?"
+ text "Hi, <PLAY_G>?"
line "It's me, BILL!"
para "Thanks for using"
--- a/text/phone/buena.asm
+++ b/text/phone/buena.asm
@@ -2,7 +2,7 @@
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_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_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 @@
; 0xa0d96
UnknownText_0xa0d96: ; 0xa0d96
- text $14, "!"
+ text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I got up early, so"
@@ -58,7 +58,7 @@
; 0xa0dcf
UnknownText_0xa0dcf: ; 0xa0dcf
- text $14, "!"
+ text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I needed someone"
@@ -67,7 +67,7 @@
; 0xa0e01
UnknownText_0xa0e01: ; 0xa0e01
- text $14, "!"
+ text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I'm just on my"
@@ -76,7 +76,7 @@
; 0xa0e29
UnknownText_0xa0e29: ; 0xa0e29
- text $14, "!"
+ text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I couldn't sleep,"
@@ -85,7 +85,7 @@
; 0xa0e5e
UnknownText_0xa0e5e: ; 0xa0e5e
- text "Oh. Hi, ", $14, "!"
+ text "Oh. Hi, <PLAY_G>!"
para "You are how?"
@@ -98,7 +98,7 @@
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 @@
; 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 @@
; 0xa13d8
UnknownText_0xa13d8: ; 0xa13d8
- text "Hey, ", $14, "."
+ text "Hey, <PLAY_G>."
line "You won that RADIO"
para "CARD by beating"
@@ -334,7 +334,7 @@
; 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 @@
; 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 @@
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 @@
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 @@
; 0xa1d5f
UnknownText_0xa1d5f: ; 0xa1d5f
- text "Hey, ", $14, ". You"
+ text "Hey, <PLAY_G>. You"
line "use your #GEAR"
para "to listen to the"
--- a/text/phone/elm.asm
+++ b/text/phone/elm.asm
@@ -1,5 +1,5 @@
ElmPhoneStartText: ; 0x1b46fc
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "Try not to overdo"
line "it."
@@ -10,7 +10,7 @@
done
ElmPhoneSawMrPokemonText: ; 0x1b4749
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "Did you meet MR."
line "#MON? Great!"
@@ -18,7 +18,7 @@
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 @@
done
ElmPhoneCheckingEggText: ; 0x1b47d5
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "We're checking the"
line "EGG now. It does"
@@ -39,7 +39,7 @@
done
ElmPhoneAssistantText: ; 0x1b481c
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "Did you see my"
line "assistant? He's at"
@@ -49,7 +49,7 @@
done
ElmPhoneEggUnhatchedText: ; 0x1b4868
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "How's the EGG? Has"
line "anything changed?"
@@ -59,7 +59,7 @@
done
ElmPhoneEggHatchedText: ; 0x1b48bb
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
line "How is the EGG?"
para "What? It hatched?"
@@ -71,7 +71,7 @@
done
ElmPhoneDiscovery1Text: ; 0x1b491f
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "I just made a new"
line "discovery."
@@ -84,7 +84,7 @@
done
ElmPhoneDiscovery2Text: ; 0x1b4982
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "It's still a"
line "mystery what kinds"
@@ -97,7 +97,7 @@
done
ElmPhonePokerusText: ; 0x1b49e7
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "I discovered an"
line "odd thing."
@@ -130,7 +130,7 @@
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 @@
done
ElmPhoneEggAssistantText: ; 0x1b4b87
- text "Hello, ", $14, "? We"
+ text "Hello, <PLAY_G>? We"
line "discovered some-"
para "thing about the"
@@ -159,7 +159,7 @@
done
ElmPhoneRocketText: ; 0x1b4c06
- text $14, ", how are"
+ text "<PLAY_G>, how are"
line "things going?"
para "I called because"
@@ -171,7 +171,7 @@
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 @@
done
ElmPhoneGiftText: ; 0x1b4d09
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "I have something"
line "here for you."
@@ -198,7 +198,7 @@
done
ElmPhoneUnusedText: ; 0x1b4d5d
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
line "How's it going?"
para "I got ahold of"
--- a/text/phone/extra.asm
+++ b/text/phone/extra.asm
@@ -8,7 +8,7 @@
; 0x64032
UnknownText_0x64032: ; 0x64032
- text $14, ", have you"
+ text "<PLAY_G>, have you"
line "heard?"
para "GOLDENROD's RADIO"
@@ -23,7 +23,7 @@
; 0x64099
UnknownText_0x64099: ; 0x64099
- text $14, ", I heard!"
+ text "<PLAY_G>, I heard!"
para "You defeated that"
line "WHITNEY?"
@@ -43,7 +43,7 @@
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 @@
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 @@
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 @@
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 @@
; 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 @@
para "to @"
text_from_ram StringBuffer5
- db $0
+ text ""
line "and pick it up?"
done
; 0x64e90
@@ -561,8 +561,8 @@
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 @@
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_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 @@
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 @@
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 @@
; 0x66ad1
UnknownText_0x66ad1: ; 0x66ad1
- text "Oh, ", $14, "!"
+ text "Oh, <PLAY_G>!"
line "Hurry, hurry!"
para "@"
@@ -1808,7 +1808,7 @@
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 @@
para "A wild @"
text_from_ram StringBuffer4
- db $0
+ text ""
line "got away from me"
para "again. It's just"
@@ -1869,7 +1869,7 @@
; 0x672d5
UnknownText_0x672d5: ; 0x672d5
- text "Oh, ", $14, "!"
+ text "Oh, <PLAY_G>!"
line "Come battle ERIN!"
para "I'll be waiting on"
--- a/text/phone/extra3.asm
+++ b/text/phone/extra3.asm
@@ -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 @@
; 0x174638
UnknownText_0x174638: ; 0x174638
- text "Hey, ", $14, "!"
+ text "Hey, <PLAY_G>!"
para "Do you remember"
line "your promise?"
@@ -316,7 +316,7 @@
para "in @"
text_from_ram StringBuffer5
- db $0
+ text ""
line "when you can."
done
; 0x1748ea
@@ -372,7 +372,7 @@
UnknownText_0x174a24: ; 0x174a24
text "My @"
text_from_ram StringBuffer4
- db $0
+ text ""
line "might be greater"
cont "than I imagined."
@@ -452,7 +452,7 @@
; 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 @@
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 @@
; 0x174ee2
UnknownText_0x174ee2: ; 0x174ee2
- text "Um… ", $14, "?"
+ text "Um… <PLAY_G>?"
line "What's wrong?"
para "Did you forget our"
@@ -671,7 +671,7 @@
; 0x17520a
UnknownText_0x17520a: ; 0x17520a
- text $14, ", could you"
+ text "<PLAY_G>, could you"
line "hurry over?"
para "FARFETCH'D is"
@@ -823,8 +823,8 @@
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_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 @@
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 @@
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 @@
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 @@
para "wild @"
text_from_ram StringBuffer4
- db $0
+ text ""
line "quite often."
para "They're easily"
@@ -1599,27 +1599,27 @@
; 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 @@
; 0x1774c1
UnknownText_0x1774c1: ; 0x1774c1
- text "Oh, ", $14, "!"
+ text "Oh, <PLAY_G>!"
line "How soon can I"
para "expect to see you"
--- a/text/phone/huey_overworld.asm
+++ b/text/phone/huey_overworld.asm
@@ -57,7 +57,7 @@
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 @@
line "it is…"
para "Here, take this,"
- line $52, "."
+ line "<PLAYER>."
para "I won't be needing"
line "it anymore…"
--- a/text/phone/jose_overworld.asm
+++ b/text/phone/jose_overworld.asm
@@ -1,7 +1,7 @@
JoseAskNumber1Text:
text "If my @"
text_from_ram StringBuffer4
- db $0
+ text ""
line "sees anything"
para "pretty, it goes"
--- a/text/phone/kenji_overworld.asm
+++ b/text/phone/kenji_overworld.asm
@@ -43,7 +43,7 @@
KenjiGiftText:
text "I wish to thank"
- line "you, ", $52, "!"
+ line "you, <PLAYER>!"
para "I've been training"
line "all alone…"
--- a/text/phone/mom.asm
+++ b/text/phone/mom.asm
@@ -1,7 +1,7 @@
MomPhoneGreetingText: ; 0x1b4000
text "Hello?"
- para "Oh, hi, ", $52, "!"
+ para "Oh, hi, <PLAYER>!"
line "Working hard?"
done
@@ -14,8 +14,8 @@
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 @@
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 @@
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 @@
done
UnknownText_0x1b420d: ; 0x1b420d
- text "Oh, ", $52, ","
+ text "Oh, <PLAYER>,"
line "you're not saving"
para "any money. Would"
@@ -115,7 +115,7 @@
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 @@
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 @@
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 @@
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 @@
MomPhoneLectureText: ; 0x1b43a1
text "Hello?"
- para "…… ", $52, "?"
+ para "…… <PLAYER>?"
line "I heard from PROF."
para "ELM that you went"
--- a/text/phone/trainers1.asm
+++ b/text/phone/trainers1.asm
@@ -5,7 +5,7 @@
text "…"
para "Good morning,"
- line $14, "!"
+ line "<PLAY_G>!"
done
UnknownText_0x1b4ded: ; 0x1b4ded
@@ -15,7 +15,7 @@
text "…"
para "How's it going,"
- line $14, "?"
+ line "<PLAY_G>?"
done
UnknownText_0x1b4e16: ; 0x1b4e16
@@ -25,11 +25,11 @@
text "…"
para "Good evening,"
- line $14, "!"
+ line "<PLAY_G>!"
done
UnknownText_0x1b4e3e: ; 0x1b4e3e
- text $14, ", good"
+ text "<PLAY_G>, good"
line "morning!"
para "It's me, @"
@@ -39,7 +39,7 @@
done
UnknownText_0x1b4e72: ; 0x1b4e72
- text $14, ", howdy!"
+ text "<PLAY_G>, howdy!"
para "It's me, @"
TX_RAM StringBuffer3
@@ -48,7 +48,7 @@
done
UnknownText_0x1b4e9e: ; 0x1b4e9e
- text $14, ", good"
+ text "<PLAY_G>, good"
line "evening!"
para "It's me, @"
@@ -77,7 +77,7 @@
text "."
para "Oh! Good morning,"
- line $52, "."
+ line "<PLAYER>."
done
UnknownText_0x1b4f4d: ; 0x1b4f4d
@@ -87,7 +87,7 @@
text "."
para "Oh! Good day,"
- line $52, "."
+ line "<PLAYER>."
done
UnknownText_0x1b4f75: ; 0x1b4f75
@@ -97,11 +97,11 @@
text "."
para "Oh! Good evening,"
- line $52, "."
+ line "<PLAYER>."
done
UnknownText_0x1b4fa1: ; 0x1b4fa1
- text "Hello, ", $52, "."
+ text "Hello, <PLAYER>."
line "Good morning."
para "This is @"
@@ -111,7 +111,7 @@
done
UnknownText_0x1b4fda: ; 0x1b4fda
- text "Hi, ", $52, "."
+ text "Hi, <PLAYER>."
line "This is @"
TX_RAM StringBuffer3
text "."
@@ -120,7 +120,7 @@
done
UnknownText_0x1b5004: ; 0x1b5004
- text "Hi, ", $52, "."
+ text "Hi, <PLAYER>."
line "This is @"
TX_RAM StringBuffer3
text "."
@@ -146,7 +146,7 @@
text "."
para "Huh? What's up,"
- line $52, "?"
+ line "<PLAYER>?"
done
UnknownText_0x1b509b: ; 0x1b509b
@@ -156,7 +156,7 @@
text "."
para "Huh? What's up"
- line $52, "?"
+ line "<PLAYER>?"
done
UnknownText_0x1b50c2: ; 0x1b50c2
@@ -166,11 +166,11 @@
text "."
para "Huh? What's up"
- line $52, "?"
+ line "<PLAYER>?"
done
UnknownText_0x1b50e9: ; 0x1b50e9
- text "Yo, ", $52, "!"
+ text "Yo, <PLAYER>!"
line "You awake?"
para "It's me, @"
@@ -180,7 +180,7 @@
done
UnknownText_0x1b511a: ; 0x1b511a
- text "Yo, ", $52, "! You"
+ text "Yo, <PLAYER>! You"
line "free right now?"
para "It's me, @"
@@ -190,7 +190,7 @@
done
UnknownText_0x1b5154: ; 0x1b5154
- text "Yo, ", $52, "!"
+ text "Yo, <PLAYER>!"
line "Were you asleep?"
para "It's me, @"
@@ -236,7 +236,7 @@
TX_RAM StringBuffer3
text " speaking…"
- para "Hi, ", $14, "!"
+ para "Hi, <PLAY_G>!"
line "Good morning!"
done
@@ -246,7 +246,7 @@
TX_RAM StringBuffer3
text " speaking…"
- para "Hi, ", $14, "!"
+ para "Hi, <PLAY_G>!"
done
UnknownText_0x1b52cc: ; 0x1b52cc
@@ -255,12 +255,12 @@
TX_RAM StringBuffer3
text " speaking…"
- para "Hi, ", $14, "!"
+ para "Hi, <PLAY_G>!"
line "Good evening!"
done
UnknownText_0x1b5301: ; 0x1b5301
- text $14, ", good"
+ text "<PLAY_G>, good"
line "morning!"
para "It's me, @"
@@ -270,7 +270,7 @@
done
UnknownText_0x1b5335: ; 0x1b5335
- text "Hi, ", $14, "!"
+ text "Hi, <PLAY_G>!"
para "It's me, @"
TX_RAM StringBuffer3
@@ -279,7 +279,7 @@
done
UnknownText_0x1b535f: ; 0x1b535f
- text $14, ", good"
+ text "<PLAY_G>, good"
line "evening!"
para "It's me, @"
@@ -304,13 +304,14 @@
done
UnknownText_0x1b53f7: ; 0x1b53f7
- db $0, "Hello, this is", $4f
- db "@"
+ text "Hello, this is"
+ line "@"
TX_RAM StringBuffer3
- db $0, ".", $51
- db "Oh, ", $14, ".", $4f
- db "Good morning.", $51
- db $57
+ text "."
+ para "Oh, <PLAY_G>."
+ line "Good morning."
+ para ""
+ done
UnknownText_0x1b5424: ; 0x1b5424
text "Hello, this is"
@@ -318,7 +319,7 @@
TX_RAM StringBuffer3
text "."
- para "Oh. Hi, ", $14, "."
+ para "Oh. Hi, <PLAY_G>."
done
UnknownText_0x1b5446: ; 0x1b5446
@@ -327,13 +328,13 @@
TX_RAM StringBuffer3
text "."
- para "Oh, ", $14, "."
+ para "Oh, <PLAY_G>."
line "Good evening."
done
UnknownText_0x1b5472: ; 0x1b5472
text "Good morning,"
- line $14, "!"
+ line "<PLAY_G>!"
para "This is @"
TX_RAM StringBuffer3
@@ -342,7 +343,7 @@
done
UnknownText_0x1b54a6: ; 0x1b54a6
- text $14, ", hi!"
+ text "<PLAY_G>, hi!"
line "This is @"
TX_RAM StringBuffer3
text "."
@@ -352,7 +353,7 @@
done
UnknownText_0x1b54d4: ; 0x1b54d4
- text "Hi, ", $14, "."
+ text "Hi, <PLAY_G>."
line "Good evening."
para "This is @"
@@ -386,7 +387,7 @@
TX_RAM StringBuffer3
text "…"
- para "Oh, ", $14, "?"
+ para "Oh, <PLAY_G>?"
line "Good morning!"
done
@@ -396,7 +397,7 @@
TX_RAM StringBuffer3
text "…"
- para "Oh, ", $14, "? Hi!"
+ para "Oh, <PLAY_G>? Hi!"
done
UnknownText_0x1b55fc: ; 0x1b55fc
@@ -405,12 +406,12 @@
TX_RAM StringBuffer3
text "…"
- para "Oh, ", $14, "?"
+ para "Oh, <PLAY_G>?"
line "Good evening!"
done
UnknownText_0x1b5628: ; 0x1b5628
- text "Oh, ", $14, "?"
+ text "Oh, <PLAY_G>?"
para "Tweet! Yeah, it's"
line "me, @"
@@ -419,7 +420,7 @@
done
UnknownText_0x1b564c: ; 0x1b564c
- text "Oh, ", $14, "?"
+ text "Oh, <PLAY_G>?"
para "Tweet! Yeah, it's"
line "me, @"
@@ -428,7 +429,7 @@
done
UnknownText_0x1b5670: ; 0x1b5670
- text "Oh, ", $14, "?"
+ text "Oh, <PLAY_G>?"
para "Tweet! Yeah, it's"
line "me, @"
@@ -456,7 +457,7 @@
TX_RAM StringBuffer3
text "…"
- para "Oh. Hi, ", $52, "."
+ para "Oh. Hi, <PLAYER>."
line "What's up?"
done
@@ -466,7 +467,7 @@
TX_RAM StringBuffer3
text "…"
- para "Oh, hi, ", $52, ","
+ para "Oh, hi, <PLAYER>,"
line "what's up?"
done
@@ -476,7 +477,7 @@
TX_RAM StringBuffer3
text "…"
- para "Oh, hi, ", $52, ","
+ para "Oh, hi, <PLAYER>,"
line "what's up?"
done
@@ -528,7 +529,7 @@
TX_RAM StringBuffer3
text " here!"
- para "Oh, ", $52, "? You"
+ para "Oh, <PLAYER>? You"
line "doing well?"
done
@@ -537,7 +538,7 @@
TX_RAM StringBuffer3
text " here!"
- para "Oh, ", $52, "? You"
+ para "Oh, <PLAYER>? You"
line "doing well?"
done
@@ -546,12 +547,12 @@
TX_RAM StringBuffer3
text " here!"
- para "Oh, ", $52, "? You"
+ para "Oh, <PLAYER>? You"
line "doing well?"
done
UnknownText_0x1b5912: ; 0x1b5912
- text "Yo, ", $52, "!"
+ text "Yo, <PLAYER>!"
line "How're you doing?"
para "This is @"
@@ -561,7 +562,7 @@
done
UnknownText_0x1b5948: ; 0x1b5948
- text "Yo, ", $52, "! How's"
+ text "Yo, <PLAYER>! How's"
line "it going?"
para "This is @"
@@ -571,7 +572,7 @@
done
UnknownText_0x1b597c: ; 0x1b597c
- text "Yo, ", $52, "!"
+ text "Yo, <PLAYER>!"
line "How're you doing?"
para "This is @"
@@ -603,7 +604,7 @@
TX_RAM StringBuffer3
text " speaking."
- para "Oh. Hi, ", $14, "!"
+ para "Oh. Hi, <PLAY_G>!"
line "Good morning!"
done
@@ -613,7 +614,7 @@
TX_RAM StringBuffer3
text " speaking."
- para "Oh, hi, ", $14, "!"
+ para "Oh, hi, <PLAY_G>!"
done
UnknownText_0x1b5a9f: ; 0x1b5a9f
@@ -622,12 +623,12 @@
TX_RAM StringBuffer3
text " speaking."
- para "Oh, hi, ", $14, "!"
+ para "Oh, hi, <PLAY_G>!"
line "Good evening!"
done
UnknownText_0x1b5ad8: ; 0x1b5ad8
- text $14, ", good"
+ text "<PLAY_G>, good"
line "morning!"
para "It's me, @"
@@ -637,7 +638,7 @@
done
UnknownText_0x1b5b0b: ; 0x1b5b0b
- text $14, ", howdy!"
+ text "<PLAY_G>, howdy!"
para "It's me, @"
TX_RAM StringBuffer3
@@ -647,7 +648,7 @@
UnknownText_0x1b5b37: ; 0x1b5b37
text "Good evening,"
- line $14, "!"
+ line "<PLAY_G>!"
para "It's me, @"
TX_RAM StringBuffer3
@@ -676,7 +677,7 @@
done
UnknownText_0x1b5c10: ; 0x1b5c10
- text "Yes? Ah, ", $14, "."
+ text "Yes? Ah, <PLAY_G>."
para "You're courteous"
line "enough to state"
@@ -686,7 +687,7 @@
done
UnknownText_0x1b5c63: ; 0x1b5c63
- text "Yes? Ah, ", $14, "."
+ text "Yes? Ah, <PLAY_G>."
para "You're courteous"
line "enough to state"
@@ -696,7 +697,7 @@
done
UnknownText_0x1b5cb6: ; 0x1b5cb6
- text "Yes? Ah, ", $14, "."
+ text "Yes? Ah, <PLAY_G>."
para "You're courteous"
line "enough to state"
@@ -738,10 +739,10 @@
UnknownText_0x1b5d9f: ; 0x1b5d9f
text "Hello, @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "speaking."
- para "Oh, ", $14, "."
+ para "Oh, <PLAY_G>."
line "Good morning."
done
@@ -748,10 +749,10 @@
UnknownText_0x1b5dcc: ; 0x1b5dcc
text "Hello, @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "speaking."
- para "Oh, ", $14, "."
+ para "Oh, <PLAY_G>."
line "How are you?"
done
@@ -758,16 +759,16 @@
UnknownText_0x1b5df8: ; 0x1b5df8
text "Hello, @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "speaking."
- para "Oh, ", $14, "."
+ para "Oh, <PLAY_G>."
line "Good evening."
done
UnknownText_0x1b5e25: ; 0x1b5e25
text "Good morning,"
- line $14, "."
+ line "<PLAY_G>."
para "This is @"
TX_RAM StringBuffer3
@@ -776,7 +777,7 @@
done
UnknownText_0x1b5e59: ; 0x1b5e59
- text "Hi, ", $14, "."
+ text "Hi, <PLAY_G>."
line "This is @"
TX_RAM StringBuffer3
text "."
@@ -787,7 +788,7 @@
UnknownText_0x1b5e8e: ; 0x1b5e8e
text "Good evening,"
- line $14, "."
+ line "<PLAY_G>."
para "This is @"
TX_RAM StringBuffer3
@@ -823,7 +824,7 @@
text " the"
line "HIKER here."
- para "Ah, ", $52, "!"
+ para "Ah, <PLAYER>!"
done
UnknownText_0x1b5f9e: ; 0x1b5f9e
@@ -832,7 +833,7 @@
text " the"
line "HIKER here."
- para "Ah, ", $52, ","
+ para "Ah, <PLAYER>,"
line "right?"
done
@@ -842,36 +843,36 @@
text " the"
line "HIKER here."
- para "Ah, ", $52, ", isn't"
+ para "Ah, <PLAYER>, isn't"
line "it?"
done
UnknownText_0x1b5ff6: ; 0x1b5ff6
- text "Yo, ", $52, "?"
+ text "Yo, <PLAYER>?"
para "This is @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "the HIKER!"
done
UnknownText_0x1b6017: ; 0x1b6017
text "Hey, is this"
- line $52, "?"
+ line "<PLAYER>?"
para "This is @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "the HIKER!"
done
UnknownText_0x1b6041: ; 0x1b6041
- text $52, ", you still"
+ text "<PLAYER>, you still"
line "awake?"
para "This is @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "the HIKER!"
done
@@ -897,7 +898,7 @@
TX_RAM StringBuffer3
text " speaking."
- para "Hey, ", $14, "!"
+ para "Hey, <PLAY_G>!"
done
UnknownText_0x1b611b: ; 0x1b611b
@@ -907,7 +908,7 @@
text " speaking."
para "This must be"
- line $14, "."
+ line "<PLAY_G>."
done
UnknownText_0x1b6149: ; 0x1b6149
@@ -916,7 +917,7 @@
TX_RAM StringBuffer3
text " speaking."
- para "Ah, ", $14, "!"
+ para "Ah, <PLAY_G>!"
done
UnknownText_0x1b616e: ; 0x1b616e
@@ -925,7 +926,7 @@
TX_RAM StringBuffer3
text "."
- para $14, ", right?"
+ para "<PLAY_G>, right?"
done
UnknownText_0x1b618f: ; 0x1b618f
@@ -934,7 +935,7 @@
TX_RAM StringBuffer3
text "."
- para $14, ", what are"
+ para "<PLAY_G>, what are"
line "you doing?"
done
@@ -944,7 +945,7 @@
TX_RAM StringBuffer3
text "."
- para $14, ", sorry to"
+ para "<PLAY_G>, sorry to"
line "call you so late."
done
@@ -968,7 +969,7 @@
TX_RAM StringBuffer3
text "…"
- para "Oh, ", $14, "!"
+ para "Oh, <PLAY_G>!"
line "Good morning!"
done
@@ -978,7 +979,7 @@
TX_RAM StringBuffer3
text "…"
- para "Oh, ", $14, "!"
+ para "Oh, <PLAY_G>!"
line "Hi, how are you?"
done
@@ -988,12 +989,12 @@
TX_RAM StringBuffer3
text "…"
- para "Oh, ", $14, "!"
+ para "Oh, <PLAY_G>!"
line "Good evening!"
done
UnknownText_0x1b62f1: ; 0x1b62f1
- text $14, "?"
+ text "<PLAY_G>?"
para "It's @"
TX_RAM StringBuffer3
@@ -1002,7 +1003,7 @@
done
UnknownText_0x1b630e: ; 0x1b630e
- text $14, "?"
+ text "<PLAY_G>?"
para "It's @"
TX_RAM StringBuffer3
@@ -1011,7 +1012,7 @@
done
UnknownText_0x1b6331: ; 0x1b6331
- text $14, "?"
+ text "<PLAY_G>?"
para "It's @"
TX_RAM StringBuffer3
@@ -1032,33 +1033,33 @@
UnknownText_0x1b638c: ; 0x1b638c
text "Hello? @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "here…"
- para "Hey, ", $14, "!"
+ para "Hey, <PLAY_G>!"
done
UnknownText_0x1b63a8: ; 0x1b63a8
text "Hello? @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "here…"
- para "Wow, ", $14, "!"
+ para "Wow, <PLAY_G>!"
done
UnknownText_0x1b63c4: ; 0x1b63c4
text "Hello? @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "here…"
- para "Yippee, ", $14, "!"
+ para "Yippee, <PLAY_G>!"
done
UnknownText_0x1b63e3: ; 0x1b63e3
text "Uh, hello."
- line $14, "?"
+ line "<PLAY_G>?"
para "It's your pal,"
line "@"
@@ -1068,7 +1069,7 @@
UnknownText_0x1b6407: ; 0x1b6407
text "Uh, hello,"
- line $14, "?"
+ line "<PLAY_G>?"
para "It's your buddy"
line "@"
@@ -1078,7 +1079,7 @@
UnknownText_0x1b642c: ; 0x1b642c
text "Uh, hello,"
- line $14, "?"
+ line "<PLAY_G>?"
para "It's your sidekick"
line "@"
@@ -1092,7 +1093,7 @@
TX_RAM StringBuffer3
text "."
- para "…Huh, ", $14, "? Yo!"
+ para "…Huh, <PLAY_G>? Yo!"
done
UnknownText_0x1b647e: ; 0x1b647e
@@ -1101,7 +1102,7 @@
TX_RAM StringBuffer3
text "."
- para "…Huh, ", $14, "? Yo!"
+ para "…Huh, <PLAY_G>? Yo!"
done
UnknownText_0x1b64a8: ; 0x1b64a8
@@ -1110,7 +1111,7 @@
TX_RAM StringBuffer3
text "."
- para "…Huh, ", $14, "? Yo!"
+ para "…Huh, <PLAY_G>? Yo!"
done
UnknownText_0x1b64d2: ; 0x1b64d2
@@ -1120,7 +1121,7 @@
text " calling."
para "What are you up"
- line "to, ", $14, "?"
+ line "to, <PLAY_G>?"
done
UnknownText_0x1b6506: ; 0x1b6506
@@ -1130,7 +1131,7 @@
text " calling."
para "Where are you now,"
- line $14, "?"
+ line "<PLAY_G>?"
done
UnknownText_0x1b6539: ; 0x1b6539
@@ -1140,7 +1141,7 @@
text " calling."
para "Are you awake now,"
- line $14, "?"
+ line "<PLAY_G>?"
done
UnknownText_0x1b656c: ; 0x1b656c
@@ -1154,7 +1155,7 @@
TX_RAM StringBuffer3
text "!"
- para "Is this ", $14, "?"
+ para "Is this <PLAY_G>?"
line "Good morning!"
done
@@ -1163,7 +1164,7 @@
TX_RAM StringBuffer3
text "!"
- para "Is that ", $14, "?"
+ para "Is that <PLAY_G>?"
done
UnknownText_0x1b65e3: ; 0x1b65e3
@@ -1171,7 +1172,7 @@
TX_RAM StringBuffer3
text "!"
- para "Is that ", $14, "?"
+ para "Is that <PLAY_G>?"
line "Good evening!"
done
@@ -1197,7 +1198,7 @@
done
UnknownText_0x1b6652: ; 0x1b6652
- text $14, ", are you"
+ text "<PLAY_G>, are you"
line "raising your"
cont "#MON properly?"
@@ -1215,7 +1216,7 @@
text " on the"
line "line."
- para "Hey! It's ", $14, "!"
+ para "Hey! It's <PLAY_G>!"
done
UnknownText_0x1b66ec: ; 0x1b66ec
@@ -1225,7 +1226,7 @@
line "line."
para "I know!"
- line "It's ", $14, "!"
+ line "It's <PLAY_G>!"
done
UnknownText_0x1b6713: ; 0x1b6713
@@ -1234,12 +1235,12 @@
text " on the"
line "line."
- para $14, "?"
+ para "<PLAY_G>?"
line "What's up?"
done
UnknownText_0x1b6738: ; 0x1b6738
- text "Uh, ", $14, "?"
+ text "Uh, <PLAY_G>?"
para "It's me!"
line "It's me, @"
@@ -1248,7 +1249,7 @@
done
UnknownText_0x1b6757: ; 0x1b6757
- text "Uh, ", $14, "?"
+ text "Uh, <PLAY_G>?"
para "It's me!"
line "It's me, @"
@@ -1257,7 +1258,7 @@
done
UnknownText_0x1b6776: ; 0x1b6776
- text "Uh, ", $14, "?"
+ text "Uh, <PLAY_G>?"
para "It's me!"
line "It's me, @"
@@ -1284,7 +1285,7 @@
TX_RAM StringBuffer3
text "…"
- para "Hi, ", $14, "!"
+ para "Hi, <PLAY_G>!"
line "Good morning!"
done
@@ -1294,7 +1295,7 @@
TX_RAM StringBuffer3
text "…"
- para "Hi, ", $14, ", good"
+ para "Hi, <PLAY_G>, good"
line "day!"
done
@@ -1304,12 +1305,12 @@
TX_RAM StringBuffer3
text "…"
- para "Hi, ", $14, ", good"
+ para "Hi, <PLAY_G>, good"
line "evening!"
done
UnknownText_0x1b6862: ; 0x1b6862
- text "Hi, ", $14, ", good"
+ text "Hi, <PLAY_G>, good"
line "morning!"
para "It's @"
@@ -1319,7 +1320,7 @@
done
UnknownText_0x1b6890: ; 0x1b6890
- text "Hi, ", $14, ", good"
+ text "Hi, <PLAY_G>, good"
line "day!"
para "It's @"
@@ -1329,7 +1330,7 @@
done
UnknownText_0x1b68ba: ; 0x1b68ba
- text "Hi, ", $14, ", good"
+ text "Hi, <PLAY_G>, good"
line "evening!"
para "It's @"
@@ -1358,7 +1359,7 @@
done
UnknownText_0x1b69a8: ; 0x1b69a8
- text "Hi, ", $14, "?"
+ text "Hi, <PLAY_G>?"
para "Good morning pika."
line "What's up pika?"
@@ -1365,7 +1366,7 @@
done
UnknownText_0x1b69d2: ; 0x1b69d2
- text "Hi, ", $14, "?"
+ text "Hi, <PLAY_G>?"
para "Good day pika,"
line "what's up pika?"
@@ -1372,7 +1373,7 @@
done
UnknownText_0x1b69f8: ; 0x1b69f8
- text "Hi, ", $14, "?"
+ text "Hi, <PLAY_G>?"
para "Good evening pika,"
line "what's up pika?"
@@ -1379,7 +1380,7 @@
done
UnknownText_0x1b6a22: ; 0x1b6a22
- text $14, " pika, good"
+ text "<PLAY_G> pika, good"
line "morning!"
para "It's @"
@@ -1389,7 +1390,7 @@
done
UnknownText_0x1b6a56: ; 0x1b6a56
- text $14, " pika, good"
+ text "<PLAY_G> pika, good"
line "pika day!"
para "It's @"
@@ -1399,7 +1400,7 @@
done
UnknownText_0x1b6a8b: ; 0x1b6a8b
- text $14, " pika, good"
+ text "<PLAY_G> pika, good"
line "evening!"
para "It's @"
@@ -1429,7 +1430,7 @@
text "…"
para "Oh, Good morning,"
- line $14, "."
+ line "<PLAY_G>."
done
UnknownText_0x1b6b65: ; 0x1b6b65
@@ -1439,7 +1440,7 @@
text "…"
para "That voice…"
- line $14, ", right?"
+ line "<PLAY_G>, right?"
done
UnknownText_0x1b6b92: ; 0x1b6b92
@@ -1449,7 +1450,7 @@
text "…"
para "This must be"
- line $14, "!"
+ line "<PLAY_G>!"
done
UnknownText_0x1b6bb9: ; 0x1b6bb9
@@ -1495,7 +1496,7 @@
TX_RAM StringBuffer3
text " here…"
- para "Ah, ", $52, ". What"
+ para "Ah, <PLAYER>. What"
line "can I do for you?"
done
@@ -1504,7 +1505,7 @@
TX_RAM StringBuffer3
text " here…"
- para "Ah, ", $52, ". What"
+ para "Ah, <PLAYER>. What"
line "can I do for you?"
done
@@ -1513,12 +1514,12 @@
TX_RAM StringBuffer3
text " here…"
- para "Ah, ", $52, ". What"
+ para "Ah, <PLAYER>. What"
line "can I do for you?"
done
UnknownText_0x1b6d26: ; 0x1b6d26
- text "Hiya, ", $52, ". How"
+ text "Hiya, <PLAYER>. How"
line "are you doing?"
para "Hey! It's me,"
@@ -1528,7 +1529,7 @@
done
UnknownText_0x1b6d57: ; 0x1b6d57
- text "Hiya, ", $52, ", how"
+ text "Hiya, <PLAYER>, how"
line "are you doing?"
para "Hey, it's me,"
@@ -1538,7 +1539,7 @@
done
UnknownText_0x1b6d88: ; 0x1b6d88
- text "Hiya, ", $52, ", how"
+ text "Hiya, <PLAYER>, how"
line "are you doing?"
para "Hey, it's me,"
@@ -1562,7 +1563,7 @@
para "Heh, my @"
TX_RAM StringBuffer4
- db $0
+ text ""
line "is so tough, it"
para "doesn't need to go"
@@ -1576,7 +1577,7 @@
TX_RAM StringBuffer3
text "."
- para "Oh, ", $14, "."
+ para "Oh, <PLAY_G>."
line "Good morning."
done
@@ -1586,7 +1587,7 @@
TX_RAM StringBuffer3
text "."
- para "Oh, ", $14, "."
+ para "Oh, <PLAY_G>."
line "Hello."
done
@@ -1596,12 +1597,12 @@
TX_RAM StringBuffer3
text "."
- para "Oh, ", $14, ", good"
+ para "Oh, <PLAY_G>, good"
line "evening."
done
UnknownText_0x1b6ef3: ; 0x1b6ef3
- text "Is this ", $14, "?"
+ text "Is this <PLAY_G>?"
para "Good morning. This"
line "is @"
@@ -1610,7 +1611,7 @@
done
UnknownText_0x1b6f1c: ; 0x1b6f1c
- text "Is this ", $14, "?"
+ text "Is this <PLAY_G>?"
para "Hi, it's @"
TX_RAM StringBuffer3
@@ -1618,7 +1619,7 @@
done
UnknownText_0x1b6f37: ; 0x1b6f37
- text "Is this ", $14, "?"
+ text "Is this <PLAY_G>?"
para "Good evening. This"
line "is @"
@@ -1655,7 +1656,7 @@
TX_RAM StringBuffer3
text " here!"
- para "Morning, ", $14, "!"
+ para "Morning, <PLAY_G>!"
para "Are you using bird"
line "#MON?"
@@ -1667,7 +1668,7 @@
TX_RAM StringBuffer3
text " here!"
- para "Hi, ", $14, "!"
+ para "Hi, <PLAY_G>!"
para "Are your bird"
line "#MON flying?"
@@ -1679,7 +1680,7 @@
TX_RAM StringBuffer3
text " here!"
- para "Evening, ", $14, "!"
+ para "Evening, <PLAY_G>!"
line "Are you letting"
para "your bird #MON"
@@ -1688,7 +1689,7 @@
UnknownText_0x1b70e7: ; 0x1b70e7
text "Good morning,"
- line $14, "!"
+ line "<PLAY_G>!"
para "It's @"
TX_RAM StringBuffer3
@@ -1697,7 +1698,7 @@
done
UnknownText_0x1b7112: ; 0x1b7112
- text "Hi, ", $14, "!"
+ text "Hi, <PLAY_G>!"
para "It's @"
TX_RAM StringBuffer3
@@ -1707,7 +1708,7 @@
UnknownText_0x1b7132: ; 0x1b7132
text "Good evening,"
- line $14, "!"
+ line "<PLAY_G>!"
para "It's @"
TX_RAM StringBuffer3
@@ -1721,7 +1722,7 @@
para "My @"
TX_RAM StringBuffer4
- db $0
+ text ""
line "looks like it will"
para "get tough enough"
@@ -1737,7 +1738,7 @@
TX_RAM StringBuffer3
text "…"
- para "Ah, ", $14, "."
+ para "Ah, <PLAY_G>."
done
UnknownText_0x1b71fc: ; 0x1b71fc
@@ -1746,7 +1747,7 @@
TX_RAM StringBuffer3
text "…"
- para "Ah, ", $14, ", is"
+ para "Ah, <PLAY_G>, is"
line "it?"
done
@@ -1757,7 +1758,7 @@
text "…"
para "Ah, if it isn't"
- line $14, "."
+ line "<PLAY_G>."
done
UnknownText_0x1b725c: ; 0x1b725c
@@ -1800,7 +1801,7 @@
TX_RAM StringBuffer3
text " here…"
- para $52, "! Beautiful"
+ para "<PLAYER>! Beautiful"
line "morning, hey?"
done
@@ -1808,7 +1809,7 @@
TX_RAM StringBuffer3
text " here…"
- para $52, "! Beautiful"
+ para "<PLAYER>! Beautiful"
line "weather, hey?"
done
@@ -1816,12 +1817,12 @@
TX_RAM StringBuffer3
text " here…"
- para $52, "! Beautiful"
+ para "<PLAYER>! Beautiful"
line "moonlight, hey?"
done
UnknownText_0x1b737f: ; 0x1b737f
- text "Hey, ", $52, "!"
+ text "Hey, <PLAYER>!"
line "This is @"
TX_RAM StringBuffer3
text "!"
@@ -1828,7 +1829,7 @@
done
UnknownText_0x1b7397: ; 0x1b7397
- text "Hey, ", $52, "!"
+ text "Hey, <PLAYER>!"
line "This is @"
TX_RAM StringBuffer3
text "!"
@@ -1835,7 +1836,7 @@
done
UnknownText_0x1b73af: ; 0x1b73af
- text "Hey, ", $52, "!"
+ text "Hey, <PLAYER>!"
line "This is @"
TX_RAM StringBuffer3
text "!"
@@ -1848,7 +1849,7 @@
text "!"
para "Hah, and here's"
- line $14, "!"
+ line "<PLAY_G>!"
done
UnknownText_0x1b73ef: ; 0x1b73ef
@@ -1858,7 +1859,7 @@
text "!"
para "Hah, and here's"
- line $14, "!"
+ line "<PLAY_G>!"
done
UnknownText_0x1b7417: ; 0x1b7417
@@ -1868,11 +1869,11 @@
text "!"
para "Hah, and here's"
- line $14, "!"
+ line "<PLAY_G>!"
done
UnknownText_0x1b743f: ; 0x1b743f
- text $14, ", it's"
+ text "<PLAY_G>, it's"
line "@"
TX_RAM StringBuffer3
text "!"
@@ -1882,7 +1883,7 @@
done
UnknownText_0x1b746f: ; 0x1b746f
- text $14, ", it's"
+ text "<PLAY_G>, it's"
line "@"
TX_RAM StringBuffer3
text "!"
@@ -1892,7 +1893,7 @@
done
UnknownText_0x1b749b: ; 0x1b749b
- text $14, ", it's"
+ text "<PLAY_G>, it's"
line "@"
TX_RAM StringBuffer3
text "!"
@@ -1920,7 +1921,7 @@
TX_RAM StringBuffer3
text "…"
- para "Oh. Hi, ", $14, "!"
+ para "Oh. Hi, <PLAY_G>!"
line "Good morning!"
done
@@ -1930,7 +1931,7 @@
TX_RAM StringBuffer3
text "…"
- para "Oh, hi, ", $14, "!"
+ para "Oh, hi, <PLAY_G>!"
line "Yahoo!"
done
@@ -1940,11 +1941,11 @@
TX_RAM StringBuffer3
text "…"
- para "Oh, hi, ", $14, "!"
+ para "Oh, hi, <PLAY_G>!"
done
UnknownText_0x1b758f: ; 0x1b758f
- text $14, "!"
+ text "<PLAY_G>!"
para "It's @"
TX_RAM StringBuffer3
@@ -1953,7 +1954,7 @@
done
UnknownText_0x1b75ac: ; 0x1b75ac
- text $14, "!"
+ text "<PLAY_G>!"
para "It's @"
TX_RAM StringBuffer3
@@ -1962,7 +1963,7 @@
done
UnknownText_0x1b75c9: ; 0x1b75c9
- text $14, "!"
+ text "<PLAY_G>!"
para "It's @"
TX_RAM StringBuffer3
--- a/text/sweethoney.asm
+++ b/text/sweethoney.asm
@@ -31,7 +31,7 @@
done
UnusedGotSweetHoneyText: ; 0x5583e
- text $52, " received"
+ text "<PLAYER> received"
line "SWEET HONEY."
done