summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorultima-soul <akshayjhanji@hotmail.com>2019-08-05 16:15:25 -0700
committerultima-soul <akshayjhanji@hotmail.com>2019-08-05 16:15:25 -0700
commitf0a86aec2db32b9d97b271d157bbdf8d8fe4a967 (patch)
tree77fe83d5e34604e3bb2d134814738453f582882e /src
parented90bf2430290853bd9376d53c70055fa07634be (diff)
Fix formatting errors and implement review suggestions.
Diffstat (limited to 'src')
-rw-r--r--src/pokedex.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/pokedex.c b/src/pokedex.c
index 42c9326e3..84ca59549 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -18,12 +18,12 @@ u16 GetPokedexHeightWeight(u16 dexNum, u8 data)
{
switch (data)
{
- case 0: // height
- return gPokedexEntries[dexNum].height;
- case 1: // weight
- return gPokedexEntries[dexNum].weight;
- default:
- return 1;
+ case 0: // height
+ return gPokedexEntries[dexNum].height;
+ case 1: // weight
+ return gPokedexEntries[dexNum].weight;
+ default:
+ return 1;
}
}
@@ -63,14 +63,14 @@ u16 GetKantoPokedexCount(u8 caseID)
{
switch (caseID)
{
- case FLAG_GET_SEEN:
- if (GetSetPokedexFlag(i + 1, FLAG_GET_SEEN))
- count++;
- break;
- case FLAG_GET_CAUGHT:
- if (GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT))
- count++;
- break;
+ case FLAG_GET_SEEN:
+ if (GetSetPokedexFlag(i + 1, FLAG_GET_SEEN))
+ count++;
+ break;
+ case FLAG_GET_CAUGHT:
+ if (GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT))
+ count++;
+ break;
}
}
return count;
@@ -100,24 +100,24 @@ bool8 HasAllKantoMons(void)
return TRUE;
}
-u16 HasAllMons(void)
+bool16 HasAllMons(void)
{
u16 i;
for (i = 0; i < NATIONAL_DEX_MEWTWO; i++)
{
if (!GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT))
- return 0;
+ return FALSE;
}
for (i = NATIONAL_DEX_MEW; i < NATIONAL_DEX_TYRANITAR; i++)
{
if (!GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT))
- return 0;
+ return FALSE;
}
for (i = NATIONAL_DEX_CELEBI; i < NATIONAL_DEX_RAYQUAZA; i++)
{
if (!GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT))
- return 0;
+ return FALSE;
}
- return 1;
+ return TRUE;
}