diff --git a/charmap.txt b/charmap.txt index 608e224d65..b0f79a7c2b 100644 --- a/charmap.txt +++ b/charmap.txt @@ -7898,4 +7898,5 @@ EMOJI_BIGANGER = F9 FE '、' = 3A '。' = 37 '—' = 3F -'~' = 39 \ No newline at end of file +'~' = 39 +'・' = 30 \ No newline at end of file diff --git a/graphics/fonts/latin_normal.png b/graphics/fonts/latin_normal.png index 0d960b1efa..2ad717a430 100644 Binary files a/graphics/fonts/latin_normal.png and b/graphics/fonts/latin_normal.png differ diff --git a/graphics/fonts/latin_small.png b/graphics/fonts/latin_small.png index 73f2d693b2..0eb26996a3 100644 Binary files a/graphics/fonts/latin_small.png and b/graphics/fonts/latin_small.png differ diff --git a/src/data/moves_info.h b/src/data/moves_info.h index 00bba4b35c..209114cb16 100644 --- a/src/data/moves_info.h +++ b/src/data/moves_info.h @@ -21484,7 +21484,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = }, [MOVE_GUARDIAN_OF_ALOLA] = { - .name = COMPOUND_STRING("巨人卫士阿罗拉"), + .name = COMPOUND_STRING("巨人卫士・阿罗拉"), .description = COMPOUND_STRING( "土地神宝可梦以Z力量攻击。\n" "对手的剩余HP会减少很多。"), diff --git a/src/data/pokemon/species_info/gen_7_families.h b/src/data/pokemon/species_info/gen_7_families.h index db1cc07e97..0dad14a3cb 100644 --- a/src/data/pokemon/species_info/gen_7_families.h +++ b/src/data/pokemon/species_info/gen_7_families.h @@ -5496,7 +5496,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_ELECTRIC_SURGE, ABILITY_NONE, ABILITY_TELEPATHY }, .bodyColor = BODY_COLOR_YELLOW, - .speciesName = _("卡璞鸣鸣"), + .speciesName = _("卡璞・鸣鸣"), .cryId = CRY_TAPU_KOKO, .natDexNum = NATIONAL_DEX_TAPU_KOKO, .categoryName = _("土地神"), @@ -5571,7 +5571,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PSYCHIC_SURGE, ABILITY_NONE, ABILITY_TELEPATHY }, .bodyColor = BODY_COLOR_PINK, - .speciesName = _("卡璞蝶蝶"), + .speciesName = _("卡璞・蝶蝶"), .cryId = CRY_TAPU_LELE, .natDexNum = NATIONAL_DEX_TAPU_LELE, .categoryName = _("土地神"), @@ -5642,7 +5642,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_GRASSY_SURGE, ABILITY_NONE, ABILITY_TELEPATHY }, .bodyColor = BODY_COLOR_RED, - .speciesName = _("卡璞哞哞"), + .speciesName = _("卡璞・哞哞"), .cryId = CRY_TAPU_BULU, .natDexNum = NATIONAL_DEX_TAPU_BULU, .categoryName = _("土地神"), @@ -5715,7 +5715,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_MISTY_SURGE, ABILITY_NONE, ABILITY_TELEPATHY }, .bodyColor = BODY_COLOR_PURPLE, - .speciesName = _("卡璞鳍鳍"), + .speciesName = _("卡璞・鳍鳍"), .cryId = CRY_TAPU_FINI, .natDexNum = NATIONAL_DEX_TAPU_FINI, .categoryName = _("土地神"), diff --git a/src/fonts.c b/src/fonts.c index 2f6b1ff11c..fc8a844c57 100644 --- a/src/fonts.c +++ b/src/fonts.c @@ -41,7 +41,7 @@ ALIGNED(4) const u8 gFontSmallLatinGlyphWidths[] = { 3, 5, 5, 5, 5, 5, 5, 5, 5, 4, 3, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 3, 5, 5, 5, 5, 5, 4, 3, 4, 4, 5, 5, 5, 6, 5, 5, 5, 5, 5, 5, 8, 7, 8, 3, - 3, 3, 3, 3, 8, 8, 7, 6, 7, 7, 5, 5 , 5, 5, 5, 7, + 5, 3, 3, 3, 8, 8, 7, 6, 7, 7, 5, 5 , 5, 5, 5, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 5, 8, 8, 8, 8, 8, 8, 8, 4, 7, 5, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 3, 3, 3, 3, 3, 4, @@ -149,7 +149,7 @@ ALIGNED(4) const u8 gFontNormalLatinGlyphWidths[] = { 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 9, 7, 6, 3, - 3, 3, 3, 3, 10, 12, 12, 12, 3, 12, 12, 12, 12, 12, 12, 12, + 7, 3, 3, 3, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 6, 6, 4, 8, 8, 8, 7, 8, 8, 4, 6, 6, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 6, diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index 0b1e469f4d..a91b69cf5e 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -2764,7 +2764,7 @@ static u8 CreateMonName(u16 num, u8 left, u8 top) str = GetSpeciesName(num); else str = sText_TenDashes; - PrintMonDexNumAndName_2(0, FONT_NARROW, str, left, top); + PrintMonDexNumAndName_2(0, FONT_NORMAL, str, left, top); return StringLength(str); }