From 16571da5eb2639fb963601c4c9bc2e65059aa3ea Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 1 Jan 2024 21:58:26 -0500 Subject: [PATCH] =?UTF-8?q?Replace=20"=C2=AF"=20and=20"%"=20(breakable=20w?= =?UTF-8?q?hitespace)=20with=20more=20meaningful=20charmap=20names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/charmap.asm | 6 +- data/maps/landmarks.asm | 66 +++++++++---------- data/moves/grammar.asm | 12 ++-- .../townmap_convertlinebreakcharacters.asm | 4 +- home/text.asm | 4 +- macros/legacy.asm | 4 ++ 6 files changed, 50 insertions(+), 46 deletions(-) diff --git a/constants/charmap.asm b/constants/charmap.asm index dd7abfe06..7f37c9ab2 100644 --- a/constants/charmap.asm +++ b/constants/charmap.asm @@ -4,10 +4,10 @@ charmap "", $00 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 @@ -189,7 +189,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 bfb93686b..23faf5735 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -105,52 +105,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@" @@ -198,11 +198,11 @@ 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@" SpecialMapName: db "SPECIAL@" diff --git a/data/moves/grammar.asm b/data/moves/grammar.asm index f24748083..929b13c6b 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/pokegear/townmap_convertlinebreakcharacters.asm b/engine/pokegear/townmap_convertlinebreakcharacters.asm index a881b9260..6891d3594 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 6e59e8b83..33a9003b4 100644 --- a/home/text.asm +++ b/home/text.asm @@ -222,8 +222,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 a4add9873..0fb47152b 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -395,6 +395,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"