diff --git a/constants/charmap.asm b/constants/charmap.asm index b1f6d5b9f21..3edce65ffa2 100644 --- a/constants/charmap.asm +++ b/constants/charmap.asm @@ -6,10 +6,10 @@ charmap "", $14 ; "くん" or "ちゃん"; same as "" in English charmap "", $15 charmap "", $16 - charmap "¯", $1f ; soft linebreak + charmap "", $1f ; breakable space (usually " ", or "" on the Town Map) charmap "", $22 charmap "", $24 ; "" - charmap "%", $25 ; soft linebreak in landmark names + charmap "", $25 ; word-break opportunity (usually skipped, or "" on the Town Map) charmap "", $38 ; wRedsName charmap "", $39 ; wGreensName charmap "", $3f @@ -191,7 +191,7 @@ charmap "▶", $ed charmap "▼", $ee charmap "♂", $ef - charmap "¥", $f0 + charmap "¥", $f0 ; Poké Dollar sign charmap "×", $f1 charmap "", $f2 ; decimal point; same as "." in English charmap "/", $f3 diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index 173d11b763e..ae6939804eb 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -106,52 +106,52 @@ Landmarks: landmark 140, 116, FastShipName assert_table_length NUM_LANDMARKS -NewBarkTownName: db "NEW BARK¯TOWN@" -CherrygroveCityName: db "CHERRYGROVE¯CITY@" +NewBarkTownName: db "NEW BARKTOWN@" +CherrygroveCityName: db "CHERRYGROVECITY@" VioletCityName: db "VIOLET CITY@" AzaleaTownName: db "AZALEA TOWN@" -GoldenrodCityName: db "GOLDENROD¯CITY@" -EcruteakCityName: db "ECRUTEAK¯CITY@" -OlivineCityName: db "OLIVINE¯CITY@" -CianwoodCityName: db "CIANWOOD¯CITY@" -MahoganyTownName: db "MAHOGANY¯TOWN@" -BlackthornCityName: db "BLACKTHORN¯CITY@" -LakeOfRageName: db "LAKE OF¯RAGE@" +GoldenrodCityName: db "GOLDENRODCITY@" +EcruteakCityName: db "ECRUTEAKCITY@" +OlivineCityName: db "OLIVINECITY@" +CianwoodCityName: db "CIANWOODCITY@" +MahoganyTownName: db "MAHOGANYTOWN@" +BlackthornCityName: db "BLACKTHORNCITY@" +LakeOfRageName: db "LAKE OFRAGE@" SilverCaveName: db "SILVER CAVE@" -SproutTowerName: db "SPROUT¯TOWER@" -RuinsOfAlphName: db "RUINS¯OF ALPH@" +SproutTowerName: db "SPROUTTOWER@" +RuinsOfAlphName: db "RUINSOF ALPH@" UnionCaveName: db "UNION CAVE@" -SlowpokeWellName: db "SLOWPOKE¯WELL@" +SlowpokeWellName: db "SLOWPOKEWELL@" RadioTowerName: db "RADIO TOWER@" PowerPlantName: db "POWER PLANT@" -NationalParkName: db "NATIONAL¯PARK@" +NationalParkName: db "NATIONALPARK@" TinTowerName: db "TIN TOWER@" LighthouseName: db "LIGHTHOUSE@" -WhirlIslandsName: db "WHIRL¯ISLANDS@" +WhirlIslandsName: db "WHIRLISLANDS@" MtMortarName: db "MT.MORTAR@" -DragonsDenName: db "DRAGON'S¯DEN@" +DragonsDenName: db "DRAGON'SDEN@" IcePathName: db "ICE PATH@" NotApplicableName: db "N/A@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese PalletTownName: db "PALLET TOWN@" -ViridianCityName: db "VIRIDIAN¯CITY@" +ViridianCityName: db "VIRIDIANCITY@" PewterCityName: db "PEWTER CITY@" -CeruleanCityName: db "CERULEAN¯CITY@" -LavenderTownName: db "LAVENDER¯TOWN@" -VermilionCityName: db "VERMILION¯CITY@" -CeladonCityName: db "CELADON¯CITY@" -SaffronCityName: db "SAFFRON¯CITY@" -FuchsiaCityName: db "FUCHSIA¯CITY@" -CinnabarIslandName: db "CINNABAR¯ISLAND@" -IndigoPlateauName: db "INDIGO¯PLATEAU@" -VictoryRoadName: db "VICTORY¯ROAD@" +CeruleanCityName: db "CERULEANCITY@" +LavenderTownName: db "LAVENDERTOWN@" +VermilionCityName: db "VERMILIONCITY@" +CeladonCityName: db "CELADONCITY@" +SaffronCityName: db "SAFFRONCITY@" +FuchsiaCityName: db "FUCHSIACITY@" +CinnabarIslandName: db "CINNABARISLAND@" +IndigoPlateauName: db "INDIGOPLATEAU@" +VictoryRoadName: db "VICTORYROAD@" MtMoonName: db "MT.MOON@" RockTunnelName: db "ROCK TUNNEL@" -LavRadioTowerName: db "LAV¯RADIO TOWER@" +LavRadioTowerName: db "LAVRADIO TOWER@" SilphCoName: db "SILPH CO.@" ; unreferenced SafariZoneName: db "SAFARI ZONE@" ; unreferenced -SeafoamIslandsName: db "SEAFOAM¯ISLANDS@" -PokemonMansionName: db "#MON¯MANSION@" ; unreferenced -CeruleanCaveName: db "CERULEAN¯CAVE@" ; unreferenced +SeafoamIslandsName: db "SEAFOAMISLANDS@" +PokemonMansionName: db "#MONMANSION@" ; unreferenced +CeruleanCaveName: db "CERULEANCAVE@" ; 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@" -BurnedTowerName: db "BURNED¯TOWER@" +IlexForestName: db "ILEXFOREST@" +BurnedTowerName: db "BURNEDTOWER@" FastShipName: db "FAST SHIP@" -ViridianForestName: db "VIRIDIAN¯FOREST@" ; unreferenced -DiglettsCaveName: db "DIGLETT'S¯CAVE@" +ViridianForestName: db "VIRIDIANFOREST@" ; unreferenced +DiglettsCaveName: db "DIGLETT'SCAVE@" TohjoFallsName: db "TOHJO FALLS@" UndergroundName: db "UNDERGROUND@" -BattleTowerName: db "BATTLE¯TOWER@" +BattleTowerName: db "BATTLETOWER@" SpecialMapName: db "SPECIAL@" diff --git a/data/moves/grammar.asm b/data/moves/grammar.asm index f247480836c..929b13c6b91 100644 --- a/data/moves/grammar.asm +++ b/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]used [move]!" MoveGrammar: -; 0: originally "[mon]の¯[move]¯つかった!" ("[mon]¯used¯[move]!") +; 0: originally "[mon]の[move]を つかった!" ("[mon]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]の[move]した!" ("[mon]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]の[move]を した!" ("[mon]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]の[move] こうげき!" ("[mon]'s[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]の[move]!" ("[mon]'s[move]!") ; Any move not listed above uses this grammar. db -1 ; end diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm index 3bf9e3863e2..b11a0e0c4c4 100644 --- a/engine/events/map_name_sign.asm +++ b/engine/events/map_name_sign.asm @@ -163,7 +163,7 @@ PlaceMapNameCenterAlign: ld a, [hli] cp "@" jr z, .stop - cp "%" + cp "" jr z, .loop inc c jr .loop diff --git a/engine/pokegear/townmap_convertlinebreakcharacters.asm b/engine/pokegear/townmap_convertlinebreakcharacters.asm index a881b926059..6891d359440 100644 --- a/engine/pokegear/townmap_convertlinebreakcharacters.asm +++ b/engine/pokegear/townmap_convertlinebreakcharacters.asm @@ -4,9 +4,9 @@ TownMap_ConvertLineBreakCharacters: ld a, [hl] cp "@" jr z, .end - cp "%" + cp "" jr z, .line_feed - cp "¯" + cp "" jr z, .line_feed inc hl jr .loop diff --git a/home/text.asm b/home/text.asm index da66edf6bc9..0d6a701b503 100644 --- a/home/text.asm +++ b/home/text.asm @@ -235,8 +235,8 @@ ENDM dict "", PromptText dict "", PlacePKMN dict "", PlacePOKE - dict "%", NextChar - dict "¯", " " + dict "", NextChar + dict "", " " dict "", PlaceDexEnd dict "", PlaceMoveTargetsName dict "", PlaceMoveUsersName diff --git a/macros/legacy.asm b/macros/legacy.asm index 68310da68e6..2b628abf6d2 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -400,6 +400,10 @@ DEF pcscript EQUS "PCScript" DEF gamecornercoinvendor EQUS "GameCornerCoinVendorScript" DEF happinesschecknpc EQUS "HappinessCheckScript" +; constants/charmap.asm +charmap "%", "" +charmap "¯", "" + ; constants/sprite_constants.asm DEF SPRITE_BUENA EQUS "SPRITE_BEAUTY" diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index c4ef4ca59c8..b29631462c0 100644 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -707,10 +707,10 @@ Function11c4be: ret String_11c4db: - db "6つのことば¯くみあわせます" - next "かえたいところ¯えらぶと でてくる" + db "6つのことばくみあわせます" + next "かえたいところえらぶと でてくる" next "ことばのグループから いれかえたい" - next "たんご¯えらんでください" + next "たんごえらんでください" db "@" String_11c51b: @@ -1592,7 +1592,7 @@ Function11ca19: ret String_11ca38: - db "とうろくちゅうあいさつ¯ぜんぶ" + db "とうろくちゅうあいさつぜんぶ" next "けしても よろしいですか?@" String_11ca57: @@ -1718,7 +1718,7 @@ Function11cab3: ret String_11cb1c: - db "あいさつとうろく¯ちゅうし" + db "あいさつとうろくちゅうし" next "しますか?@" String_11cb31: @@ -1874,19 +1874,19 @@ Unknown_11cc7e: String_11cc86: db "じこしょうかい の" - next "あいさつ¯とうろくした!@" + next "あいさつとうろくした!@" String_11cc9d: db "たいせん はじまるとき の" - next "あいさつ¯とうろくした!@" + next "あいさつとうろくした!@" String_11ccb9: db "たいせん かったとき の" - next "あいさつ¯とうろくした!@" + next "あいさつとうろくした!@" String_11ccd4: db "たいせん まけたとき の" - next "あいさつ¯とうろくした!@" + next "あいさつとうろくした!@" Function11ccef: ld de, Unknown_11cfc6 @@ -1907,7 +1907,7 @@ Function11cd04: ret String_11cd10: - db "なにか ことば¯いれてください@" + db "なにか ことばいれてください@" Function11cd20: call EZChat_ClearBottom12Rows @@ -2005,12 +2005,12 @@ Function11cdaa: String_11cdc7: ; Words will be displayed by category - db "ことば¯しゅるいべつに" + db "ことばしゅるいべつに" next "えらべます@" String_11cdd9: ; Words will be displayed in alphabetical order - db "ことば¯アイウエオ の" + db "ことばアイウエオ の" next "じゅんばんで ひょうじ します@" String_11cdf5: diff --git a/mobile/mobile_45_stadium.asm b/mobile/mobile_45_stadium.asm index 429bc7f5532..3a74c6f7601 100644 --- a/mobile/mobile_45_stadium.asm +++ b/mobile/mobile_45_stadium.asm @@ -461,7 +461,7 @@ YessNoString_1179c5: next "いいえ@" AskSavePasswordString: - db "こパスワード¯ほぞんして" + db "こパスワードほぞんして" line "おきますか?@" NotAPokemonPasswordString: @@ -469,7 +469,7 @@ NotAPokemonPasswordString: line "されていません!@" SavedPasswordString: - db "ログインパスワード¯ほぞん" + db "ログインパスワードほぞん" line "しました@" MobilePassword_IncrementJumptable: diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 192c77a153f..15cda1893a7 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -476,8 +476,8 @@ MenuHeader_17d26a: MenuData_17d272: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 4 - db "ニュース¯よみこむ@" - db "ニュース¯みる@" + db "ニュースよみこむ@" + db "ニュースみる@" db "せつめい@" db "やめる@" diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 834690d5abb..f58ae98e22e 100644 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -110,17 +110,17 @@ MobileString1: MobileStrings2: ; string 0 String_0x49fe9: - db "めいし¯つくったり" + db "めいしつくったり" next "ほぞんしておける フォルダーです@" ; string 1 db "モバイルたいせんや じぶんのめいしで" - next "つかう あいさつ¯つくります@" + next "つかう あいさつつくります@" ; string 2 db "あなたじゅうしょや ねんれいの" - next "せい¯かえられます@" + next "せかえられます@" ; string 3 db "モバイルセンターせつぞくするとき" - next "ひつような こと¯きめます@" + next "ひつような こときめます@" ; string 4 db "まえがめん もどります" next "@" @@ -325,8 +325,8 @@ asm_4a19d: jp Function4a195 String_4a1ef: - db "モバイルセンター¯えらぶ" - next "ログインパスワード¯いれる" + db "モバイルセンターえらぶ" + next "ログインパスワードいれる" next "もどる@" Function4a20e: @@ -355,11 +355,11 @@ Function4a239: jp Function4a13b Strings_4a23d: - db "いつも せつぞく¯する" - next "モバイルセンター¯えらびます@" + db "いつも せつぞくする" + next "モバイルセンターえらびます@" db "モバイルセンターせつぞくするとき" - next "つかうパスワード¯ほぞんできます@" + next "つかうパスワードほぞんできます@" db "まえがめん もどります@"