From 01c9b7c20a98da2e4773943c5f1051d6a1cc227f Mon Sep 17 00:00:00 2001
From: leo60228 <leo@60228.dev>
Date: Fri, 3 Nov 2023 22:16:01 -0400
Subject: [PATCH] hgss dex fixes

---
 src/pokedex_plus_hgss.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c
index d1a5705aad..294d42b26e 100644
--- a/src/pokedex_plus_hgss.c
+++ b/src/pokedex_plus_hgss.c
@@ -2801,7 +2801,7 @@ static void CreateMonDexNum(u16 entryNum, u8 left, u8 top, u16 unused)
     if (sPokedexView->dexMode == DEX_MODE_HOENN)
         dexNum = NationalToHoennOrder(dexNum);
     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;
         offset = 1;
@@ -4473,19 +4473,20 @@ static void PrintMonInfo(u32 num, u32 value, u32 owned, u32 newEntry)
     const u8 *name;
     const u8 *category;
     const u8 *description;
+    u8 digitCount = (NATIONAL_DEX_COUNT > 999 && value != 0) ? 4 : 3;
 
     if (value == 0)
         value = NationalToHoennOrder(num);
     else
         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);
     species = NationalPokedexNumToSpeciesHGSS(num);
     if (species)
         name = gSpeciesNames[species];
     else
         name = sText_TenDashes;
-    PrintInfoScreenTextWhite(name, 157, 17);
+    PrintInfoScreenTextWhite(name, 139 + (6 * digitCount), 17);
     if (owned)
     {
         CopyMonCategoryText(num, str2);