From 3f1288e3e055013e0ab847ba5fea4b566bc31996 Mon Sep 17 00:00:00 2001
From: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Date: Sun, 26 Aug 2018 11:12:22 -0700
Subject: Add Defines for Pokedex Related Numbers and Fixed Comment in
 birch_pc.c (#680)

* Changed pokedex_orders.h to use defines from species.h

* Fixed leading white space by converting tabs to 4 spaces.

* Removed comments as they are redundant.

* Added German comments back.

* Added defines for Pokedex Count and Species Count related numbers

* Fix a comment in birch_pc.c

* Added HOENN_DEX_COUNT to birch_pc.
---
 src/pokedex.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/pokedex.c')

diff --git a/src/pokedex.c b/src/pokedex.c
index eb4d1d918..caa6a1565 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -26,7 +26,6 @@
 #include "scanline_effect.h"
 #include "ewram.h"
 
-#define NATIONAL_DEX_COUNT 386
 
 struct PokedexListItem
 {
@@ -1971,7 +1970,7 @@ static void SortPokedex(u8 dexMode, u8 sortMode)
     {
     default:
     case DEX_MODE_HOENN:
-        vars[0] = 202;
+        vars[0] = HOENN_DEX_COUNT;
         vars[1] = 1;
         break;
     case DEX_MODE_NATIONAL:
@@ -1982,7 +1981,7 @@ static void SortPokedex(u8 dexMode, u8 sortMode)
         }
         else
         {
-            vars[0] = 202;
+            vars[0] = HOENN_DEX_COUNT;
             vars[1] = 1;
         }
         break;
@@ -2028,7 +2027,7 @@ static void SortPokedex(u8 dexMode, u8 sortMode)
         }
         break;
     case 1:
-        for (i = 0; i < 411; i++)
+        for (i = 0; i < POKEMON_SLOTS_NUMBER - 1; i++)
         {
             vars[2] = gPokedexOrder_Alphabetical[i];
 
@@ -4060,7 +4059,7 @@ u16 GetHoennPokedexCount(u8 caseID)
     u16 count = 0;
     u16 i;
 
-    for (i = 0; i < 202; i++)
+    for (i = 0; i < HOENN_DEX_COUNT; i++)
     {
         switch (caseID)
         {
-- 
cgit v1.2.3