Replace "¯" and "%" (breakable whitespace) with more meaningful charmap names (#1094)

constants/charmap.asm

@@ -6,10 +6,10 @@
 	charmap "<PLAY_G>",  $14 ; "<PLAYER>くん" or "<PLAYER>ちゃん"; same as "<PLAYER>" in English
 	charmap "<MOBILE>",  $15
 	charmap "<CR>",      $16
-	charmap "¯",         $1f ; soft linebreak
+	charmap "<BSP>",     $1f ; breakable space (usually " ", or "<LF>" on the Town Map)
 	charmap "<LF>",      $22
 	charmap "<POKE>",    $24 ; "<PO><KE>"
-	charmap "%",         $25 ; soft linebreak in landmark names
+	charmap "<WBR>",     $25 ; word-break opportunity (usually skipped, or "<LF>" on the Town Map)
 	charmap "<RED>",     $38 ; wRedsName
 	charmap "<GREEN>",   $39 ; wGreensName
 	charmap "<ENEMY>",   $3f
@@ -191,7 +191,7 @@
 	charmap "▶",         $ed
 	charmap "▼",         $ee
 	charmap "♂",         $ef
-	charmap "¥",         $f0
+	charmap "¥",         $f0 ; Poké Dollar sign
 	charmap "×",         $f1
 	charmap "<DOT>",     $f2 ; decimal point; same as "." in English
 	charmap "/",         $f3

data/maps/landmarks.asm

@@ -106,52 +106,52 @@ Landmarks:
 	landmark 140, 116, FastShipName
 	assert_table_length NUM_LANDMARKS
 
-NewBarkTownName:     db "NEW BARK¯TOWN@"
+NewBarkTownName:     db "NEW BARK<BSP>TOWN@"
-CherrygroveCityName: db "CHERRYGROVE¯CITY@"
+CherrygroveCityName: db "CHERRYGROVE<BSP>CITY@"
 VioletCityName:      db "VIOLET CITY@"
 AzaleaTownName:      db "AZALEA TOWN@"
-GoldenrodCityName:   db "GOLDENROD¯CITY@"
+GoldenrodCityName:   db "GOLDENROD<BSP>CITY@"
-EcruteakCityName:    db "ECRUTEAK¯CITY@"
+EcruteakCityName:    db "ECRUTEAK<BSP>CITY@"
-OlivineCityName:     db "OLIVINE¯CITY@"
+OlivineCityName:     db "OLIVINE<BSP>CITY@"
-CianwoodCityName:    db "CIANWOOD¯CITY@"
+CianwoodCityName:    db "CIANWOOD<BSP>CITY@"
-MahoganyTownName:    db "MAHOGANY¯TOWN@"
+MahoganyTownName:    db "MAHOGANY<BSP>TOWN@"
-BlackthornCityName:  db "BLACKTHORN¯CITY@"
+BlackthornCityName:  db "BLACKTHORN<BSP>CITY@"
-LakeOfRageName:      db "LAKE OF¯RAGE@"
+LakeOfRageName:      db "LAKE OF<BSP>RAGE@"
 SilverCaveName:      db "SILVER CAVE@"
-SproutTowerName:     db "SPROUT¯TOWER@"
+SproutTowerName:     db "SPROUT<BSP>TOWER@"
-RuinsOfAlphName:     db "RUINS¯OF ALPH@"
+RuinsOfAlphName:     db "RUINS<BSP>OF ALPH@"
 UnionCaveName:       db "UNION CAVE@"
-SlowpokeWellName:    db "SLOWPOKE¯WELL@"
+SlowpokeWellName:    db "SLOWPOKE<BSP>WELL@"
 RadioTowerName:      db "RADIO TOWER@"
 PowerPlantName:      db "POWER PLANT@"
-NationalParkName:    db "NATIONAL¯PARK@"
+NationalParkName:    db "NATIONAL<BSP>PARK@"
 TinTowerName:        db "TIN TOWER@"
 LighthouseName:      db "LIGHTHOUSE@"
-WhirlIslandsName:    db "WHIRL¯ISLANDS@"
+WhirlIslandsName:    db "WHIRL<BSP>ISLANDS@"
 MtMortarName:        db "MT.MORTAR@"
-DragonsDenName:      db "DRAGON'S¯DEN@"
+DragonsDenName:      db "DRAGON'S<BSP>DEN@"
 IcePathName:         db "ICE PATH@"
 NotApplicableName:   db "N/A@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
 PalletTownName:      db "PALLET TOWN@"
-ViridianCityName:    db "VIRIDIAN¯CITY@"
+ViridianCityName:    db "VIRIDIAN<BSP>CITY@"
 PewterCityName:      db "PEWTER CITY@"
-CeruleanCityName:    db "CERULEAN¯CITY@"
+CeruleanCityName:    db "CERULEAN<BSP>CITY@"
-LavenderTownName:    db "LAVENDER¯TOWN@"
+LavenderTownName:    db "LAVENDER<BSP>TOWN@"
-VermilionCityName:   db "VERMILION¯CITY@"
+VermilionCityName:   db "VERMILION<BSP>CITY@"
-CeladonCityName:     db "CELADON¯CITY@"
+CeladonCityName:     db "CELADON<BSP>CITY@"
-SaffronCityName:     db "SAFFRON¯CITY@"
+SaffronCityName:     db "SAFFRON<BSP>CITY@"
-FuchsiaCityName:     db "FUCHSIA¯CITY@"
+FuchsiaCityName:     db "FUCHSIA<BSP>CITY@"
-CinnabarIslandName:  db "CINNABAR¯ISLAND@"
+CinnabarIslandName:  db "CINNABAR<BSP>ISLAND@"
-IndigoPlateauName:   db "INDIGO¯PLATEAU@"
+IndigoPlateauName:   db "INDIGO<BSP>PLATEAU@"
-VictoryRoadName:     db "VICTORY¯ROAD@"
+VictoryRoadName:     db "VICTORY<BSP>ROAD@"
 MtMoonName:          db "MT.MOON@"
 RockTunnelName:      db "ROCK TUNNEL@"
-LavRadioTowerName:   db "LAV¯RADIO TOWER@"
+LavRadioTowerName:   db "LAV<BSP>RADIO TOWER@"
 SilphCoName:         db "SILPH CO.@" ; unreferenced
 SafariZoneName:      db "SAFARI ZONE@" ; unreferenced
-SeafoamIslandsName:  db "SEAFOAM¯ISLANDS@"
+SeafoamIslandsName:  db "SEAFOAM<BSP>ISLANDS@"
-PokemonMansionName:  db "#MON¯MANSION@" ; unreferenced
+PokemonMansionName:  db "#MON<BSP>MANSION@" ; unreferenced
-CeruleanCaveName:    db "CERULEAN¯CAVE@" ; unreferenced
+CeruleanCaveName:    db "CERULEAN<BSP>CAVE@" ; unreferenced
 Route1Name:          db "ROUTE 1@"
 Route2Name:          db "ROUTE 2@"
 Route3Name:          db "ROUTE 3@"
@@ -199,12 +199,12 @@ Route44Name:         db "ROUTE 44@"
 Route45Name:         db "ROUTE 45@"
 Route46Name:         db "ROUTE 46@"
 DarkCaveName:        db "DARK CAVE@"
-IlexForestName:      db "ILEX¯FOREST@"
+IlexForestName:      db "ILEX<BSP>FOREST@"
-BurnedTowerName:     db "BURNED¯TOWER@"
+BurnedTowerName:     db "BURNED<BSP>TOWER@"
 FastShipName:        db "FAST SHIP@"
-ViridianForestName:  db "VIRIDIAN¯FOREST@" ; unreferenced
+ViridianForestName:  db "VIRIDIAN<BSP>FOREST@" ; unreferenced
-DiglettsCaveName:    db "DIGLETT'S¯CAVE@"
+DiglettsCaveName:    db "DIGLETT'S<BSP>CAVE@"
 TohjoFallsName:      db "TOHJO FALLS@"
 UndergroundName:     db "UNDERGROUND@"
-BattleTowerName:     db "BATTLE¯TOWER@"
+BattleTowerName:     db "BATTLE<BSP>TOWER@"
 SpecialMapName:      db "SPECIAL@"

data/moves/grammar.asm

@@ -1,9 +1,9 @@
 ; Used by GetMoveGrammar (see engine/battle/used_move_text.asm)
 ; Each move is given an identifier for what usedmovetext to use (0-4).
-; Made redundant in English localization, where all are just "[mon]¯used [move]!"
+; Made redundant in English localization, where all are just "[mon]<LINE>used [move]!"
 
 MoveGrammar:
-; 0: originally "[mon]の¯[move]¯つかった!" ("[mon]¯used¯[move]!")
+; 0: originally "[mon]の<LINE>[move]を　つかった!" ("[mon]<LINE>used [move]!")
 	db SWORDS_DANCE
 	db GROWTH
 	db STRENGTH
@@ -35,7 +35,7 @@ MoveGrammar:
 	db EXTREMESPEED
 	db 0 ; end set
 
-; 1: originally "[mon]の¯[move]した!" ("[mon]¯did [move]!")
+; 1: originally "[mon]の<LINE>[move]した!" ("[mon]<LINE>did [move]!")
 	db RECOVER
 	db TELEPORT
 	db BIDE
@@ -44,7 +44,7 @@ MoveGrammar:
 	db FLAIL
 	db 0 ; end set
 
-; 2: originally "[mon]の¯[move]¯した!" ("[mon]¯did¯[move]!")
+; 2: originally "[mon]の<LINE>[move]を　した!" ("[mon]<LINE>did [move]!")
 	db MEDITATE
 	db AGILITY
 	db MIMIC
@@ -55,7 +55,7 @@ MoveGrammar:
 	db SCARY_FACE
 	db 0 ; end set
 
-; 3: originally "[mon]の¯[move]　こうげき!" ("[mon]'s¯[move] attack!")
+; 3: originally "[mon]の<LINE>[move]　こうげき!" ("[mon]'s<LINE>[move] attack!")
 	db POUND
 	db SCRATCH
 	db VICEGRIP
@@ -96,6 +96,6 @@ MoveGrammar:
 	db ROCK_SMASH
 	db 0 ; end set
 
-; 4: originally "[mon]の¯[move]!" ("[mon]'s¯[move]!")
+; 4: originally "[mon]の<LINE>[move]!" ("[mon]'s<LINE>[move]!")
 ; Any move not listed above uses this grammar.
 	db -1 ; end

engine/events/map_name_sign.asm

@@ -163,7 +163,7 @@ PlaceMapNameCenterAlign:
 	ld a, [hli]
 	cp "@"
 	jr z, .stop
-	cp "%"
+	cp "<WBR>"
 	jr z, .loop
 	inc c
 	jr .loop

engine/pokegear/townmap_convertlinebreakcharacters.asm

@@ -4,9 +4,9 @@ TownMap_ConvertLineBreakCharacters:
 	ld a, [hl]
 	cp "@"
 	jr z, .end
-	cp "%"
+	cp "<WBR>"
 	jr z, .line_feed
-	cp "¯"
+	cp "<BSP>"
 	jr z, .line_feed
 	inc hl
 	jr .loop

home/text.asm

@@ -235,8 +235,8 @@ ENDM
 	dict "<PROMPT>",  PromptText
 	dict "<PKMN>",    PlacePKMN
 	dict "<POKE>",    PlacePOKE
-	dict "%",         NextChar
+	dict "<WBR>",     NextChar
-	dict "¯",         " "
+	dict "<BSP>",     " "
 	dict "<DEXEND>",  PlaceDexEnd
 	dict "<TARGET>",  PlaceMoveTargetsName
 	dict "<USER>",    PlaceMoveUsersName

macros/legacy.asm

@@ -400,6 +400,10 @@ DEF pcscript              EQUS "PCScript"
 DEF gamecornercoinvendor  EQUS "GameCornerCoinVendorScript"
 DEF happinesschecknpc     EQUS "HappinessCheckScript"
 
+; constants/charmap.asm
+charmap "%", "<BSP>"
+charmap "¯", "<WBR>"
+
 ; constants/sprite_constants.asm
 DEF SPRITE_BUENA EQUS "SPRITE_BEAUTY"
 

mobile/fixed_words.asm

@@ -707,10 +707,10 @@ Function11c4be:
 	ret
 
 String_11c4db:
-	db   "６つのことば¯くみあわせます"
+	db   "６つのことば<WO>くみあわせます"
-	next "かえたいところ¯えらぶと　でてくる"
+	next "かえたいところ<WO>えらぶと　でてくる"
 	next "ことばのグループから　いれかえたい"
-	next "たんご¯えらんでください"
+	next "たんご<WO>えらんでください"
 	db   "@"
 
 String_11c51b:
@@ -1592,7 +1592,7 @@ Function11ca19:
 	ret
 
 String_11ca38:
-	db   "とうろくちゅう<NO>あいさつ¯ぜんぶ"
+	db   "とうろくちゅう<NO>あいさつ<WO>ぜんぶ"
 	next "けしても　よろしいですか？@"
 
 String_11ca57:
@@ -1718,7 +1718,7 @@ Function11cab3:
 	ret
 
 String_11cb1c:
-	db   "あいさつ<NO>とうろく¯ちゅうし"
+	db   "あいさつ<NO>とうろく<WO>ちゅうし"
 	next "しますか？@"
 
 String_11cb31:
@@ -1874,19 +1874,19 @@ Unknown_11cc7e:
 
 String_11cc86:
 	db   "じこしょうかい　の"
-	next "あいさつ¯とうろくした！@"
+	next "あいさつ<WO>とうろくした！@"
 
 String_11cc9d:
 	db   "たいせん　<GA>はじまるとき　の"
-	next "あいさつ¯とうろくした！@"
+	next "あいさつ<WO>とうろくした！@"
 
 String_11ccb9:
 	db   "たいせん　<NI>かったとき　の"
-	next "あいさつ¯とうろくした！@"
+	next "あいさつ<WO>とうろくした！@"
 
 String_11ccd4:
 	db   "たいせん　<NI>まけたとき　の"
-	next "あいさつ¯とうろくした！@"
+	next "あいさつ<WO>とうろくした！@"
 
 Function11ccef:
 	ld de, Unknown_11cfc6
@@ -1907,7 +1907,7 @@ Function11cd04:
 	ret
 
 String_11cd10:
-	db "なにか　ことば¯いれてください@"
+	db "なにか　ことば<WO>いれてください@"
 
 Function11cd20:
 	call EZChat_ClearBottom12Rows
@@ -2005,12 +2005,12 @@ Function11cdaa:
 
 String_11cdc7:
 ; Words will be displayed by category
-	db   "ことば¯しゅるいべつに"
+	db   "ことば<WO>しゅるいべつに"
 	next "えらべます@"
 
 String_11cdd9:
 ; Words will be displayed in alphabetical order
-	db   "ことば¯アイウエオ　の"
+	db   "ことば<WO>アイウエオ　の"
 	next "じゅんばんで　ひょうじ　します@"
 
 String_11cdf5:

mobile/mobile_45_stadium.asm

@@ -461,7 +461,7 @@ YessNoString_1179c5:
 	next "いいえ@"
 
 AskSavePasswordString:
-	db   "こ<NO>パスワード¯ほぞんして"
+	db   "こ<NO>パスワード<WO>ほぞんして"
 	line "おきますか？@"
 
 NotAPokemonPasswordString:
@@ -469,7 +469,7 @@ NotAPokemonPasswordString:
 	line "されていません！@"
 
 SavedPasswordString:
-	db   "ログインパスワード¯ほぞん"
+	db   "ログインパスワード<WO>ほぞん"
 	line "しました@"
 
 MobilePassword_IncrementJumptable:

mobile/mobile_5f.asm

@@ -476,8 +476,8 @@ MenuHeader_17d26a:
 MenuData_17d272:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 4
-	db "ニュース¯よみこむ@"
+	db "ニュース<WO>よみこむ@"
-	db "ニュース¯みる@"
+	db "ニュース<WO>みる@"
 	db "せつめい@"
 	db "やめる@"
 

mobile/mobile_menu.asm

@@ -110,17 +110,17 @@ MobileString1:
 MobileStrings2:
 ; string 0
 String_0x49fe9:
-	db   "めいし¯つくったり"
+	db   "めいし<WO>つくったり"
 	next "ほぞんしておける　フォルダーです@"
 ; string 1
 	db   "モバイルたいせんや　じぶんのめいしで"
-	next "つかう　あいさつ¯つくります@"
+	next "つかう　あいさつ<WO>つくります@"
 ; string 2
 	db   "あなた<NO>じゅうしょや　ねんれいの"
-	next "せ<TTE>い¯かえられます@"
+	next "せ<TTE>い<WO>かえられます@"
 ; string 3
 	db  "モバイルセンター<NI>せつぞくするとき"
-	next "ひつような　こと¯きめます@"
+	next "ひつような　こと<WO>きめます@"
 ; string 4
 	db   "まえ<NO>がめん　<NI>もどります"
 	next "@"
@@ -325,8 +325,8 @@ asm_4a19d:
 	jp Function4a195
 
 String_4a1ef:
-	db   "モバイルセンター¯えらぶ"
+	db   "モバイルセンター<WO>えらぶ"
-	next "ログインパスワード¯いれる"
+	next "ログインパスワード<WO>いれる"
 	next "もどる@"
 
 Function4a20e:
@@ -355,11 +355,11 @@ Function4a239:
 	jp Function4a13b
 
 Strings_4a23d:
-	db   "いつも　せつぞく¯する"
+	db   "いつも　せつぞく<WO>する"
-	next "モバイルセンター¯えらびます@"
+	next "モバイルセンター<WO>えらびます@"
 
 	db   "モバイルセンター<NI>せつぞくするとき"
-	next "つかうパスワード¯ほぞんできます@"
+	next "つかうパスワード<WO>ほぞんできます@"
 
 	db   "まえ<NO>がめん　<NI>もどります@"