atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hgss dex fixes

Browse source
This commit is contained in:
leo60228 2023-11-03 22:16:01 -04:00
parent eeed9612b4
commit 01c9b7c20a
No known key found for this signature in database
GPG key ID: 6F3EB461799AD95E
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/pokedex_plus_hgss.c
View file

@ -2801,7 +2801,7 @@ static void CreateMonDexNum(u16 entryNum, u8 left, u8 top, u16 unused)
if (sPokedexView->dexMode == DEX_MODE_HOENN) if (sPokedexView->dexMode == DEX_MODE_HOENN)
dexNum = NationalToHoennOrder(dexNum); dexNum = NationalToHoennOrder(dexNum);
memcpy(text, sText_No0000, ARRAY_COUNT(sText_No0000)); memcpy(text, sText_No0000, ARRAY_COUNT(sText_No0000));
if (NATIONAL_DEX_COUNT > 999) if (NATIONAL_DEX_COUNT > 999 && sPokedexView->dexMode != DEX_MODE_HOENN)
{ {
text[0] = CHAR_0 + dexNum / 1000; text[0] = CHAR_0 + dexNum / 1000;
offset = 1; offset = 1;
@ -4473,19 +4473,20 @@ static void PrintMonInfo(u32 num, u32 value, u32 owned, u32 newEntry)
const u8 *name; const u8 *name;
const u8 *category; const u8 *category;
const u8 *description; const u8 *description;
u8 digitCount = (NATIONAL_DEX_COUNT > 999 && value != 0) ? 4 : 3;
if (value == 0) if (value == 0)
value = NationalToHoennOrder(num); value = NationalToHoennOrder(num);
else else
value = num; value = num;
ConvertIntToDecimalStringN(StringCopy(str, gText_NumberClear01), value, STR_CONV_MODE_LEADING_ZEROS, 3); ConvertIntToDecimalStringN(StringCopy(str, gText_NumberClear01), value, STR_CONV_MODE_LEADING_ZEROS, digitCount);
PrintInfoScreenTextWhite(str, 123, 17); PrintInfoScreenTextWhite(str, 123, 17);
species = NationalPokedexNumToSpeciesHGSS(num); species = NationalPokedexNumToSpeciesHGSS(num);
if (species) if (species)
name = gSpeciesNames[species]; name = gSpeciesNames[species];
else else
name = sText_TenDashes; name = sText_TenDashes;
PrintInfoScreenTextWhite(name, 157, 17); PrintInfoScreenTextWhite(name, 139 + (6 * digitCount), 17);
if (owned) if (owned)
{ {
CopyMonCategoryText(num, str2); CopyMonCategoryText(num, str2);