Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加“・”字符，调整部分标点字符的样式，更新卡璞家族名称

Browse Source
This commit is contained in:
RoamerX 2025-07-12 16:27:02 +08:00
parent ec8950fca1
commit 3615447727
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charmap.txt
View File

@ -7898,4 +7898,5 @@ EMOJI_BIGANGER = F9 FE
'、' = 3A
'。' = 37
'—' = 3F
'～' = 39
'～' = 39
'・' = 30

BIN
graphics/fonts/latin_normal.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
graphics/fonts/latin_small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

2
src/data/moves_info.h
View File

@ -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会减少很多。"),

8
src/data/pokemon/species_info/gen_7_families.h
View File

@ -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 = _("土地神"),

4
src/fonts.c
View File

@ -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,

2
src/pokedex_plus_hgss.c
View File

@ -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);
}