diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 9accc0e1ed..9f4168fbcd 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -14042,7 +14042,7 @@ static void Cmd_handleballthrow(void)
                     ballMultiplier = 400;
                 break;
             case ITEM_HEAVY_BALL:
-                i = GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1);
+                i = GetPokedexHeightWeight(gBattleMons[gBattlerTarget].species, 1);
             #if B_HEAVY_BALL_MODIFIER >= GEN_7
                 if (i < 1000)
                     ballAddition = -20;
diff --git a/src/battle_util.c b/src/battle_util.c
index 9f3f2becac..46f62d9c7e 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -7999,7 +7999,7 @@ u8 GetBattleMonMoveSlot(struct BattlePokemon *battleMon, u16 move)
 u32 GetBattlerWeight(u8 battlerId)
 {
     u32 i;
-    u32 weight = GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[battlerId].species), 1);
+    u32 weight = GetPokedexHeightWeight(gBattleMons[battlerId].species, 1);
     u32 ability = GetBattlerAbility(battlerId);
     u32 holdEffect = GetBattlerHoldEffect(battlerId, TRUE);
 
diff --git a/src/pokedex.c b/src/pokedex.c
index 3903bf3c99..0b4ba9db5d 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -3411,7 +3411,7 @@ static void Task_LoadInfoScreen(u8 taskId)
             if (!gTasks[taskId].tSkipCry)
             {
                 StopCryAndClearCrySongs();
-                PlayCry_NormalNoDucking(NationalPokedexNumToSpecies(sPokedexListItem->dexNum), 0, CRY_VOLUME_RS, CRY_PRIORITY_NORMAL);
+                PlayCry_NormalNoDucking(sPokedexListItem->seenSpecies, 0, CRY_VOLUME_RS, CRY_PRIORITY_NORMAL);
             }
             else
             {
@@ -3591,7 +3591,7 @@ static void Task_LoadAreaScreen(u8 taskId)
         gMain.state++;
         break;
     case 2:
-        ShowPokedexAreaScreen(NationalPokedexNumToSpecies(sPokedexListItem->dexNum), &sPokedexView->screenSwitchState);
+        ShowPokedexAreaScreen(sPokedexListItem->seenSpecies, &sPokedexView->screenSwitchState);
         SetVBlankCallback(gPokedexVBlankCB);
         sPokedexView->screenSwitchState = 0;
         gMain.state = 0;
@@ -3740,7 +3740,7 @@ static void Task_HandleCryScreenInput(u8 taskId)
     if (JOY_NEW(A_BUTTON))
     {
         LoadPlayArrowPalette(TRUE);
-        CryScreenPlayButton(NationalPokedexNumToSpecies(sPokedexListItem->dexNum));
+        CryScreenPlayButton(sPokedexListItem->seenSpecies);
         return;
     }
     else if (!gPaletteFade.active)
@@ -4162,7 +4162,7 @@ static void Task_ExitCaughtMonPage(u8 taskId)
         if (buffer)
             Free(buffer);
 
-        species = NationalPokedexNumToSpecies(gTasks[taskId].tDexNum);
+        species = gTasks[taskId].tSpecies;
         otId = ((u16)gTasks[taskId].tOtIdHi << 16) | (u16)gTasks[taskId].tOtIdLo;
         personality = ((u16)gTasks[taskId].tPersonalityHi << 16) | (u16)gTasks[taskId].tPersonalityLo;
         paletteNum = gSprites[gTasks[taskId].tMonSpriteId].oam.paletteNum;