Use charmaps for special string codepoints.

Also fix all the text.
Also fix some unreferenced scripts that were interpreted as text.

engine/pokedex.asm

@@ -1205,9 +1205,10 @@ Unknown_408b2: ; 408b2
 ; 408bd
 
 String_408bd: ; 408bd
-	db "NEW #DEX MODE", $4e
+	db   "NEW #DEX MODE"
-	db "OLD #DEX MODE", $4e
+	next "OLD #DEX MODE"
-	db "A to Z MODE@"
+	next "A to Z MODE"
+	db "@"
 ; 408e5
 
 String_408e5: ; 408e5
@@ -1753,23 +1754,23 @@ Unknown_40e7d: ; 40e7d
 ; 40e85
 
 String_40e85: ; 40e85
-	db $e1, $e2, " are listed by", $4e
+	db   $e1, $e2, " are listed by"
-	db "evolution type.@"
+	next "evolution type.@"
 ; 40ea6
 
 String_40ea6: ; 40ea6
-	db $e1, $e2, " are listed by", $4e
+	db   $e1, $e2, " are listed by"
-	db "official type.@"
+	next "official type.@"
 ; 40ec6
 
 String_40ec6: ; 40ec6
-	db $e1, $e2, " are listed", $4e
+	db   $e1, $e2, " are listed"
-	db "alphabetically.@"
+	next "alphabetically.@"
 ; 40ee4
 
 String_40ee4: ; 40ee4
-	db "UNOWN are listed", $4e
+	db   "UNOWN are listed"
-	db "in catching order.@"
+	next "in catching order.@"
 ; 40f08
 
 Function40f08: ; 40f08 (10:4f08)
@@ -2031,8 +2032,8 @@ Function41107: ; 41107
 ; 41126
 
 String_41126: ; 41126
-	db "The specified type", $4e
+	db   "The specified type"
-	db "was not found.@"
+	next "was not found.@"
 ; 41148
 
 Function41148: ; 41148 (10:5148)

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

main.asm

@@ -639,7 +639,7 @@ MenuDataHeader_0x5efb: ; 5efb
 MenuData2_0x5f03: ; 5f03
 	db $00 ; flags
 	db 4 ; items
-	db "PLAYER ", $52, "@"
+	db "PLAYER <PLAYER>@"
 	db "BADGES@"
 	db " @"
 	db "TIME@"
@@ -667,7 +667,7 @@ Function5f1c: ; 5f1c
 	ret
 
 .Player
-	db $52, "@"
+	db "<PLAYER>@"
 ; 5f40
 
 Function5f40: ; 5f40
@@ -13109,22 +13109,39 @@ StartMenu:: ; 125cd
 .PokedexString 	db "#DEX@"
 .PartyString   	db "#MON@"
 .PackString    	db "PACK@"
-.StatusString  	db $52, "@"
+.StatusString  	db "<PLAYER>@"
 .SaveString    	db "SAVE@"
 .OptionString  	db "OPTION@"
 .ExitString    	db "EXIT@"
 .PokegearString	db $24, "GEAR@"
 .QuitString    	db "QUIT@"
 
-.PokedexDesc 	db "#MON", $4e, "database@"
+.PokedexDesc  db   "#MON"
-.PartyDesc   	db "Party ", $4a, $4e, "status@"
+              next "database@"
-.PackDesc    	db "Contains", $4e, "items@"
+
-.PokegearDesc	db "Trainer's", $4e, "key device@"
+.PartyDesc    db   "Party ", $4a
-.StatusDesc  	db "Your own", $4e, "status@"
+              next "status@"
-.SaveDesc    	db "Save your", $4e, "progress@"
+
-.OptionDesc  	db "Change", $4e, "settings@"
+.PackDesc     db   "Contains"
-.ExitDesc    	db "Close this", $4e, "menu@"
+              next "items@"
-.QuitDesc    	db "Quit and", $4e, "be judged.@"
+
+.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
@@ -19412,7 +19429,7 @@ Unknown_155e6: ; 155e6
 	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@"

maps/AzaleaGym.asm

@@ -270,7 +270,7 @@ UnknownText_0x18edae: ; 0x18edae
 ; 0x18ee14
 
 UnknownText_0x18ee14: ; 0x18ee14
-	text $52, " received"
+	text "<PLAYER> received"
 	line "HIVEBADGE."
 	done
 ; 0x18ee2b

maps/AzaleaTown.asm

@@ -387,7 +387,7 @@ UnknownText_0x1985df:
 	done
 
 UnknownText_0x19860b:
-	text $52, ", here's"
+	text "<PLAYER>, here's"
 	line "your GS BALL back!"
 	done
 

maps/BattleTower1F.asm

@@ -406,78 +406,110 @@ UnknownText_0x9e60a: ; 0x9e60a
 ; 0x9e62f
 
 UnknownText_0x9e62f: ; 0x9e62f
-	db $0, "BATTLE TOWER is a", $4f
+	text "BATTLE TOWER is a"
-	db "facility made for", $55
+	line "facility made for"
-	db "#MON battles.", $51
+	cont "#MON battles."
-	db "Countless #MON", $4f
+
-	db "trainers gather", $51
+	para "Countless #MON"
-	db "from all over to", $4f
+	line "trainers gather"
-	db "hold battles in", $51
+
-	db "specially designed", $4f
+	para "from all over to"
-	db "BATTLE ROOMS.", $51
+	line "hold battles in"
-	db "There are many", $4f
+
-	db "BATTLE ROOMS in", $55
+	para "specially designed"
-	db "the BATTLE TOWER.", $51
+	line "BATTLE ROOMS."
-	db "Each ROOM holds", $4f
+
-	db "seven trainers.", $51
+	para "There are many"
-	db "If you defeat the", $4f
+	line "BATTLE ROOMS in"
-	db "seven in a ROOM,", $51
+	cont "the BATTLE TOWER."
-	db "and you have a", $4f
+
-	db "good record, you", $51
+	para "Each ROOM holds"
-	db "could become the", $4f
+	line "seven trainers."
-	db "ROOM's LEADER.", $51
+
-	db "All LEADERS will", $4f
+	para "If you defeat the"
-	db "be recorded in the", $51
+	line "seven in a ROOM,"
-	db "HONOR ROLL for", $4f
+
-	db "posterity.", $51
+	para "and you have a"
-	db "You may challenge", $4f
+	line "good record, you"
-	db "in up to five", $51
+
-	db "BATTLE ROOMS each", $4f
+	para "could become the"
-	db "day.", $51
+	line "ROOM's LEADER."
-	db "However, you may", $4f
+
-	db "battle only once a", $51
+	para "All LEADERS will"
-	db "day in any given", $4f
+	line "be recorded in the"
-	db "ROOM.", $51
+
-	db "To interrupt a", $4f
+	para "HONOR ROLL for"
-	db "session, you must", $51
+	line "posterity."
-	db "SAVE. If not, you", $4f
+
-	db "won't be able to", $51
+	para "You may challenge"
-	db "resume your ROOM", $4f
+	line "in up to five"
-	db "challenge.", $51
+
-	db $57
+	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
+	text "BATTLE TOWER is a"
-	db "facility made for", $55
+	line "facility made for"
-	db "#MON battles.", $51
+	cont "#MON battles."
-	db "Countless #MON", $4f
+
-	db "trainers gather", $51
+	para "Countless #MON"
-	db "from all over to", $4f
+	line "trainers gather"
-	db "hold battles in", $51
+
-	db "specially designed", $4f
+	para "from all over to"
-	db "BATTLE ROOMS.", $51
+	line "hold battles in"
-	db "There are many", $4f
+
-	db "BATTLE ROOMS in", $55
+	para "specially designed"
-	db "the BATTLE TOWER.", $51
+	line "BATTLE ROOMS."
-	db "Each ROOM holds", $4f
+
-	db "seven trainers.", $51
+	para "There are many"
-	db "Beat them all, and", $4f
+	line "BATTLE ROOMS in"
-	db "win a prize.", $51
+	cont "the BATTLE TOWER."
-	db "To interrupt a", $4f
+
-	db "session, you must", $51
+	para "Each ROOM holds"
-	db "SAVE. If not, you", $4f
+	line "seven trainers."
-	db "won't be able to", $51
+
-	db "resume your ROOM", $4f
+	para "Beat them all, and"
-	db "challenge.", $51
+	line "win a prize."
-	db $57
+
+	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
+	text "Received a list of"
-	db "LEADERS on the", $55
+	line "LEADERS on the"
-	db "HONOR ROLL.", $51
+	cont "HONOR ROLL."
-	db $57
+
+	para ""
+	done
 ; 0x9ea1b
 
 UnknownText_0x9ea1b: ; 0x9ea1b
@@ -487,8 +519,10 @@ UnknownText_0x9ea1b: ; 0x9ea1b
 ; 0x9ea3c
 
 UnknownText_0x9ea3c: ; 0x9ea3c
-	db $0, "Thank you!", $51
+	text "Thank you!"
-	db $57
+
+	para ""
+	done
 ; 0x9ea49
 
 UnknownText_0x9ea49: ; 0x9ea49
@@ -498,25 +532,35 @@ UnknownText_0x9ea49: ; 0x9ea49
 ; 0x9ea5f
 
 UnknownText_0x9ea5f: ; 0x9ea5f
-	db $0, "Congratulations!", $51
+	text "Congratulations!"
-	db "You've beaten all", $4f
+
-	db "the trainers!", $51
+	para "You've beaten all"
-	db "Your feat may be", $4f
+	line "the trainers!"
-	db "worth registering,", $51
+
-	db $52, ". With your", $4f
+	para "Your feat may be"
-	db "results, you may", $51
+	line "worth registering,"
-	db "be chosen as a", $4f
+
-	db "ROOM LEADER.", $51
+	para "<PLAYER>. With your"
-	db $57
+	line "results, you may"
+
+	para "be chosen as a"
+	line "ROOM LEADER."
+
+	para ""
+	done
 ; 0x9eaef
 
 UnknownText_0x9eaef: ; 0x9eaef
-	db $0, "Congratulations!", $51
+	text "Congratulations!"
-	db "You've beaten all", $4f
+
-	db "the trainers!", $51
+	para "You've beaten all"
-	db "For that, you get", $4f
+	line "the trainers!"
-	db "this great prize!", $51
+
-	db $57
+	para "For that, you get"
+	line "this great prize!"
+
+	para ""
+	done
 ; 0x9eb45
 
 UnknownText_0x9eb45: ; 0x9eb45
@@ -529,13 +573,13 @@ UnknownText_0x9eb45: ; 0x9eb45
 ; 0x9eb7e
 
 UnknownText_0x9eb7e: ; 0x9eb7e
-	db $0, $52, " got five", $4f
+	text "<PLAYER> got five"
-	db "@"
+	line "@"
 	text_from_ram StringBuffer4
-	db $0, "!@"
+	text "!@"
 	sound0x0F
 	text_waitbutton
-	db $50
+	db "@"
 ; 0x9eb94
 
 UnknownText_0x9eb94: ; 0x9eb94

maps/BlackthornDragonSpeechHouse.asm

@@ -19,9 +19,11 @@ EkansScript_0x19594c: ; 0x19594c
 	end
 ; 0x195956
 
-UnknownText_0x195956: ; 0x195956
+UnknownScript_0x195956:
-	limited_interpret_data 2
+	jumpstd picturebookshelf
-	db $0, "ズ", $03, $00
+
+UnknownScript_0x195959:
+	jumpstd magazinebookshelf
 
 UnknownText_0x19595c: ; 0x19595c
 	text "A clan of trainers"

maps/BlackthornGym1F.asm

@@ -275,7 +275,7 @@ UnknownText_0x195196:
 	done
 
 UnknownText_0x1951bf:
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM24."
 	done
 

maps/BrunosRoom.asm

@@ -111,7 +111,7 @@ UnknownText_0x1809fe: ; 0x1809fe
 	para "determined. Per-"
 	line "fect for battle!"
 
-	para "Ready, ", $52, "?"
+	para "Ready, <PLAYER>?"
 	line "You will bow down"
 
 	para "to our overwhelm-"

maps/BurnedTower1F.asm

@@ -261,7 +261,7 @@ UnknownText_0x185ecc: ; 0x185ecc
 
 	para "And you are…?"
 
-	para $52, "? Glad to"
+	para "<PLAYER>? Glad to"
 	line "meet you!"
 
 	para "I heard rumors"

maps/BurnedTowerB1F.asm

@@ -222,7 +222,7 @@ UnknownText_0x18626a: ; 0x18626a
 
 	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 @@ UnknownText_0x18626a: ; 0x18626a
 	para "I'm going to track"
 	line "SUICUNE."
 
-	para $52, ", let's"
+	para "<PLAYER>, let's"
 	line "meet again!"
 
 	para "Farewell!"

maps/CeladonCafe.asm

@@ -207,14 +207,14 @@ EatathonContestPosterText:
 	done
 
 FoundLeftoversText:
-	text $52, " found"
+	text "<PLAYER> found"
 	line "@"
 	text_from_ram StringBuffer3
 	text "!"
 	done
 
 NoRoomForLeftoversText:
-	text "But ", $52, " can't"
+	text "But <PLAYER> can't"
 	line "hold another item…"
 	done
 

maps/CeladonDeptStore6F.asm

@@ -110,7 +110,7 @@ CeladonClangText:
 
 	para "@"
 	text_from_ram StringBuffer3
-	db $0
+	text ""
 	line "popped out."
 	done
 

maps/CeladonGym.asm

@@ -238,7 +238,7 @@ UnknownText_0x72c3e: ; 0x72c3e
 ; 0x72c96
 
 UnknownText_0x72c96: ; 0x72c96
-	text $52, " received"
+	text "<PLAYER> received"
 	line "RAINBOWBADGE."
 	done
 ; 0x72cb0

maps/CeladonMansion2F.asm

@@ -15,7 +15,7 @@ CeladonMansion2FBookshelf:
 	jumpstd difficultbookshelf
 
 CeladonMansion2FComputerText:
-	text $52, " turned on"
+	text "<PLAYER> turned on"
 	line "the PC."
 
 	para "…"

maps/CeladonMansionRoof.asm

@@ -30,7 +30,7 @@ UnknownText_0x71aa1: ; 0x71aa1
 	text "There's graffiti"
 	line "on the wall…"
 
-	para $52, " added a"
+	para "<PLAYER> added a"
 	line "moustache!"
 	done
 ; 0x71ad4

maps/CeladonPokeCenter1F.asm

@@ -109,7 +109,7 @@ UnknownText_0x71f22: ; 0x71f22
 ; 0x71f65
 
 UnknownText_0x71f65: ; 0x71f65
-	text $52, ", have you"
+	text "<PLAYER>, have you"
 	line "heard?"
 
 	para "There have been"
@@ -126,13 +126,13 @@ UnknownText_0x71f65: ; 0x71f65
 	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 @@ UnknownText_0x7201a: ; 0x7201a
 	cont "you'll inform me."
 
 	para "I'm counting on"
-	line "you, ", $52, "!"
+	line "you, <PLAYER>!"
 	done
 ; 0x720b8
 

maps/CeruleanGym.asm

@@ -335,7 +335,7 @@ UnknownText_0x18870c: ; 0x18870c
 ; 0x188768
 
 UnknownText_0x188768: ; 0x188768
-	text $52, " received"
+	text "<PLAYER> received"
 	line "CASCADEBADGE."
 	done
 ; 0x188782

maps/CherrygroveCity.asm

@@ -409,7 +409,7 @@ GuideGentGiftText:
 	done
 
 GotMapCardText:
-	text $52, "'s #GEAR"
+	text "<PLAYER>'s #GEAR"
 	line "now has a MAP!"
 	done
 

maps/CianwoodCity.asm

@@ -271,7 +271,7 @@ UnknownText_0x1a03cc:
 
 UnknownText_0x1a0433:
 	text "EUSINE: Yo,"
-	line $52, "."
+	line "<PLAYER>."
 
 	para "Wasn't that"
 	line "SUICUNE just now?"
@@ -303,7 +303,7 @@ UnknownText_0x1a0433:
 	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_0x1a05a1:
 
 UnknownText_0x1a05c3:
 	text "You're amazing,"
-	line $52, "!"
+	line "<PLAYER>!"
 
 	para "No wonder #MON"
 	line "gravitate to you."