diff --git a/graphics/frontier_pass/medals.png b/graphics/frontier_pass/medals.png index 1c0d366882..eab8220ddf 100644 Binary files a/graphics/frontier_pass/medals.png and b/graphics/frontier_pass/medals.png differ diff --git a/graphics/frontier_pass/medals_jp.png b/graphics/frontier_pass/medals_jp.png new file mode 100644 index 0000000000..dd18955bc1 Binary files /dev/null and b/graphics/frontier_pass/medals_jp.png differ diff --git a/graphics/pokedex/hgss/tileset_menu_list.png b/graphics/pokedex/hgss/tileset_menu_list.png index 7fed73263d..e04fcc17e8 100644 Binary files a/graphics/pokedex/hgss/tileset_menu_list.png and b/graphics/pokedex/hgss/tileset_menu_list.png differ diff --git a/src/battle_interface.c b/src/battle_interface.c index 26b6036581..ea3397397e 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -2583,7 +2583,6 @@ static void PrintBattlerOnAbilityPopUp(u8 battler, u8 spriteId1, u8 spriteId2) textPtr++; textPtr[0] = 0x0B; //手动写入汉字第二部分 textPtr++; - textPtr[0] = EOS; PrintOnAbilityPopUp((const u8 *)monName, diff --git a/src/menu.c b/src/menu.c index 08f205a101..94f861ad57 100644 --- a/src/menu.c +++ b/src/menu.c @@ -2252,11 +2252,9 @@ void BufferSaveMenuText(u8 textId, u8 *dest, u8 color) string = ConvertIntToDecimalStringN(string, GetNationalPokedexCount(FLAG_GET_CAUGHT), STR_CONV_MODE_LEFT_ALIGN, 4); else string = ConvertIntToDecimalStringN(string, GetHoennPokedexCount(FLAG_GET_CAUGHT), STR_CONV_MODE_LEFT_ALIGN, 3); - //*string = EOS; //修改,增加图鉴单位显示 - *string++ = 0x10; - *string++ = 0x8C; //手动写入汉字「只」的编码 - *string++ = EOS; //结束 + StringAppend(string, COMPOUND_STRING("只")); + //*string = EOS; //修正错误 break; case SAVE_MENU_PLAY_TIME: string = ConvertIntToDecimalStringN(string, gSaveBlock2Ptr->playTimeHours, STR_CONV_MODE_LEFT_ALIGN, 3); @@ -2276,9 +2274,8 @@ void BufferSaveMenuText(u8 textId, u8 *dest, u8 color) *string = flagCount + CHAR_0; string++; //修改,增加徽章单位显示 - *string++ = 0x04; - *string++ = 0x60; //手动写入汉字「个」的编码 - //*string++ = EOS; //结束 + StringAppend(string, COMPOUND_STRING("个")); + //*string++ = EOS; //修正错误 *endOfString = EOS; break; }