diff --git a/graphics/pokedex/hgss/tilemap_search_screen_hoenn.bin b/graphics/pokedex/hgss/tilemap_search_screen_hoenn.bin index ec2f179065..4cc71f167d 100644 Binary files a/graphics/pokedex/hgss/tilemap_search_screen_hoenn.bin and b/graphics/pokedex/hgss/tilemap_search_screen_hoenn.bin differ diff --git a/graphics/pokedex/hgss/tilemap_search_screen_national.bin b/graphics/pokedex/hgss/tilemap_search_screen_national.bin index 34a68f509f..c0b40f1c5e 100644 Binary files a/graphics/pokedex/hgss/tilemap_search_screen_national.bin and b/graphics/pokedex/hgss/tilemap_search_screen_national.bin differ diff --git a/graphics/pokedex/hgss/tilemap_start_menu.bin b/graphics/pokedex/hgss/tilemap_start_menu.bin index 419fe03be0..d3dc73fca0 100644 Binary files a/graphics/pokedex/hgss/tilemap_start_menu.bin and b/graphics/pokedex/hgss/tilemap_start_menu.bin differ diff --git a/graphics/pokedex/hgss/tilemap_start_menu_search_results.bin b/graphics/pokedex/hgss/tilemap_start_menu_search_results.bin index fa94c3be20..9a537760fa 100644 Binary files a/graphics/pokedex/hgss/tilemap_start_menu_search_results.bin and b/graphics/pokedex/hgss/tilemap_start_menu_search_results.bin differ diff --git a/graphics/pokedex/hgss/tileset_menu3.png b/graphics/pokedex/hgss/tileset_menu3.png index 751812bdb6..1ab7a69a51 100755 Binary files a/graphics/pokedex/hgss/tileset_menu3.png and b/graphics/pokedex/hgss/tileset_menu3.png differ diff --git a/graphics/pokedex/hgss/tileset_menu_list.png b/graphics/pokedex/hgss/tileset_menu_list.png index 91bf31eae9..7fed73263d 100644 Binary files a/graphics/pokedex/hgss/tileset_menu_list.png and b/graphics/pokedex/hgss/tileset_menu_list.png differ diff --git a/graphics/pokedex/hgss/tileset_menu_search.png b/graphics/pokedex/hgss/tileset_menu_search.png index 9410eef337..a9e868c80b 100644 Binary files a/graphics/pokedex/hgss/tileset_menu_search.png and b/graphics/pokedex/hgss/tileset_menu_search.png differ diff --git a/graphics/pokenav/left_headers/condition.png b/graphics/pokenav/left_headers/condition.png index 033e6cbd9c..caa135c64f 100644 Binary files a/graphics/pokenav/left_headers/condition.png and b/graphics/pokenav/left_headers/condition.png differ diff --git a/graphics/pokenav/left_headers/hoenn_map.png b/graphics/pokenav/left_headers/hoenn_map.png index 888d8a5098..812ef79185 100644 Binary files a/graphics/pokenav/left_headers/hoenn_map.png and b/graphics/pokenav/left_headers/hoenn_map.png differ diff --git a/graphics/pokenav/left_headers/party.png b/graphics/pokenav/left_headers/party.png index 39e0461b1c..4389e19c36 100644 Binary files a/graphics/pokenav/left_headers/party.png and b/graphics/pokenav/left_headers/party.png differ diff --git a/graphics/pokenav/options/beauty.png b/graphics/pokenav/options/beauty.png index f6c522ef7b..db48b334e3 100644 Binary files a/graphics/pokenav/options/beauty.png and b/graphics/pokenav/options/beauty.png differ diff --git a/graphics/pokenav/options/condition.png b/graphics/pokenav/options/condition.png index 76efdc9a67..c38cc90fd6 100644 Binary files a/graphics/pokenav/options/condition.png and b/graphics/pokenav/options/condition.png differ diff --git a/graphics/pokenav/options/cool.png b/graphics/pokenav/options/cool.png index 539f9320af..5e7007e27c 100644 Binary files a/graphics/pokenav/options/cool.png and b/graphics/pokenav/options/cool.png differ diff --git a/graphics/pokenav/options/cute.png b/graphics/pokenav/options/cute.png index 28b3a22a4b..c768d44e68 100644 Binary files a/graphics/pokenav/options/cute.png and b/graphics/pokenav/options/cute.png differ diff --git a/graphics/pokenav/options/party.png b/graphics/pokenav/options/party.png index 3ac47cc9ef..750f57a311 100644 Binary files a/graphics/pokenav/options/party.png and b/graphics/pokenav/options/party.png differ diff --git a/graphics/pokenav/options/ribbons.png b/graphics/pokenav/options/ribbons.png index d20ebbabcd..d32bc3bd33 100644 Binary files a/graphics/pokenav/options/ribbons.png and b/graphics/pokenav/options/ribbons.png differ diff --git a/graphics/pokenav/options/smart.png b/graphics/pokenav/options/smart.png index fc1fb83c02..914108f0f8 100644 Binary files a/graphics/pokenav/options/smart.png and b/graphics/pokenav/options/smart.png differ diff --git a/graphics/pokenav/options/tough.png b/graphics/pokenav/options/tough.png index 0d731aa877..cd697b0972 100644 Binary files a/graphics/pokenav/options/tough.png and b/graphics/pokenav/options/tough.png differ diff --git a/include/config/general.h b/include/config/general.h index ad06ce0725..aceec2ad0d 100644 --- a/include/config/general.h +++ b/include/config/general.h @@ -68,7 +68,7 @@ // General settings #define EXPANSION_INTRO TRUE // If TRUE, a custom RHH intro will play after the vanilla copyright screen. -#define POKEDEX_PLUS_HGSS FALSE // If TRUE, enables the custom HGSS style Pokedex. +#define POKEDEX_PLUS_HGSS TRUE // If TRUE, enables the custom HGSS style Pokedex. #define SUMMARY_SCREEN_NATURE_COLORS TRUE // If TRUE, nature-based stat boosts and reductions will be red and blue in the summary screen. #define HQ_RANDOM TRUE // If TRUE, replaces the default RNG with an implementation of SFC32 RNG. May break code that relies on RNG. #define COMPETITIVE_PARTY_SYNTAX TRUE // If TRUE, parties are defined in "competitive syntax". diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index 844aec9587..2aed476b83 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -7064,8 +7064,8 @@ static void Task_LoadCryScreen(u8 taskId) gMain.state++; break; case 4: - PrintInfoScreenText(gText_CryOf, 82, 33); - PrintCryScreenSpeciesName(0, sPokedexListItem->dexNum, 82, 49); + PrintCryScreenSpeciesName(0, sPokedexListItem->dexNum, 82, 33); + PrintInfoScreenText(gText_CryOf, 82, 49); gMain.state++; break; case 5: @@ -7246,11 +7246,17 @@ static void Task_LoadSizeScreen(u8 taskId) break; case 3: { - u8 string[64]; + //u8 string[64]; - StringCopy(string, gText_SizeComparedTo); - StringAppend(string, gSaveBlock2Ptr->playerName); - PrintInfoScreenText(string, GetStringCenterAlignXOffset(FONT_NORMAL, string, 0xF0), 0x79); + //StringCopy(string, gText_SizeComparedTo); + //StringAppend(string, gSaveBlock2Ptr->playerName); + //修改，修改名字大小比较文本与日版相同 + StringCopy(gStringVar1, GetSpeciesName(NationalPokedexNumToSpecies(sPokedexListItem->dexNum))); //复制字符串到变量 + StringCopy(gStringVar2, gSaveBlock2Ptr->playerName); //复制字符串到变量 + StringExpandPlaceholders(gStringVar4, gText_SizeComparedTo); //写入变量到文本 + //显示（打印），string由于多余就去除了。 + //PrintInfoScreenText(string, GetStringCenterAlignXOffset(FONT_NORMAL, string, DISPLAY_WIDTH), 121); + PrintInfoScreenText(gStringVar4, GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 0xF0), 0x79); gMain.state++; break; }