summaryrefslogtreecommitdiff
path: root/src/pokedex.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2019-01-19 23:04:33 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2019-01-19 23:04:33 +0100
commit576d1b3474e9ebec6a16d3ca68378d0f92fb4026 (patch)
tree7e8703ba4a5ab4af71dd6b0fe9b1e382c25193bb /src/pokedex.c
parentf06c0749bcebc10fe146ca038a6a8597952a0f21 (diff)
Document and match somne trainer card
Diffstat (limited to 'src/pokedex.c')
-rw-r--r--src/pokedex.c106
1 files changed, 53 insertions, 53 deletions
diff --git a/src/pokedex.c b/src/pokedex.c
index 3d294e9e9..f99a8226a 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -4271,46 +4271,46 @@ s8 GetSetPokedexFlag(u16 nationalDexNo, u8 caseID)
retVal = 0;
switch (caseID)
{
- case FLAG_GET_SEEN:
- if (gSaveBlock2Ptr->pokedex.seen[index] & mask)
+ case FLAG_GET_SEEN:
+ if (gSaveBlock2Ptr->pokedex.seen[index] & mask)
+ {
+ if ((gSaveBlock2Ptr->pokedex.seen[index] & mask) == (gSaveBlock1Ptr->seen1[index] & mask)
+ && (gSaveBlock2Ptr->pokedex.seen[index] & mask) == (gSaveBlock1Ptr->seen2[index] & mask))
+ retVal = 1;
+ else
{
- if ((gSaveBlock2Ptr->pokedex.seen[index] & mask) == (gSaveBlock1Ptr->seen1[index] & mask)
- && (gSaveBlock2Ptr->pokedex.seen[index] & mask) == (gSaveBlock1Ptr->seen2[index] & mask))
- retVal = 1;
- else
- {
- gSaveBlock2Ptr->pokedex.seen[index] &= ~mask;
- gSaveBlock1Ptr->seen1[index] &= ~mask;
- gSaveBlock1Ptr->seen2[index] &= ~mask;
- retVal = 0;
- }
+ gSaveBlock2Ptr->pokedex.seen[index] &= ~mask;
+ gSaveBlock1Ptr->seen1[index] &= ~mask;
+ gSaveBlock1Ptr->seen2[index] &= ~mask;
+ retVal = 0;
}
- break;
- case FLAG_GET_CAUGHT:
- if (gSaveBlock2Ptr->pokedex.owned[index] & mask)
+ }
+ break;
+ case FLAG_GET_CAUGHT:
+ if (gSaveBlock2Ptr->pokedex.owned[index] & mask)
+ {
+ if ((gSaveBlock2Ptr->pokedex.owned[index] & mask) == (gSaveBlock2Ptr->pokedex.seen[index] & mask)
+ && (gSaveBlock2Ptr->pokedex.owned[index] & mask) == (gSaveBlock1Ptr->seen1[index] & mask)
+ && (gSaveBlock2Ptr->pokedex.owned[index] & mask) == (gSaveBlock1Ptr->seen2[index] & mask))
+ retVal = 1;
+ else
{
- if ((gSaveBlock2Ptr->pokedex.owned[index] & mask) == (gSaveBlock2Ptr->pokedex.seen[index] & mask)
- && (gSaveBlock2Ptr->pokedex.owned[index] & mask) == (gSaveBlock1Ptr->seen1[index] & mask)
- && (gSaveBlock2Ptr->pokedex.owned[index] & mask) == (gSaveBlock1Ptr->seen2[index] & mask))
- retVal = 1;
- else
- {
- gSaveBlock2Ptr->pokedex.owned[index] &= ~mask;
- gSaveBlock2Ptr->pokedex.seen[index] &= ~mask;
- gSaveBlock1Ptr->seen1[index] &= ~mask;
- gSaveBlock1Ptr->seen2[index] &= ~mask;
- retVal = 0;
- }
+ gSaveBlock2Ptr->pokedex.owned[index] &= ~mask;
+ gSaveBlock2Ptr->pokedex.seen[index] &= ~mask;
+ gSaveBlock1Ptr->seen1[index] &= ~mask;
+ gSaveBlock1Ptr->seen2[index] &= ~mask;
+ retVal = 0;
}
- break;
- case FLAG_SET_SEEN:
- gSaveBlock2Ptr->pokedex.seen[index] |= mask;
- gSaveBlock1Ptr->seen1[index] |= mask;
- gSaveBlock1Ptr->seen2[index] |= mask;
- break;
- case FLAG_SET_CAUGHT:
- gSaveBlock2Ptr->pokedex.owned[index] |= mask;
- break;
+ }
+ break;
+ case FLAG_SET_SEEN:
+ gSaveBlock2Ptr->pokedex.seen[index] |= mask;
+ gSaveBlock1Ptr->seen1[index] |= mask;
+ gSaveBlock1Ptr->seen2[index] |= mask;
+ break;
+ case FLAG_SET_CAUGHT:
+ gSaveBlock2Ptr->pokedex.owned[index] |= mask;
+ break;
}
return retVal;
}
@@ -4324,14 +4324,14 @@ u16 GetNationalPokedexCount(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;
@@ -4346,14 +4346,14 @@ u16 GetHoennPokedexCount(u8 caseID)
{
switch (caseID)
{
- case FLAG_GET_SEEN:
- if (GetSetPokedexFlag(HoennToNationalOrder(i + 1), FLAG_GET_SEEN))
- count++;
- break;
- case FLAG_GET_CAUGHT:
- if (GetSetPokedexFlag(HoennToNationalOrder(i + 1), FLAG_GET_CAUGHT))
- count++;
- break;
+ case FLAG_GET_SEEN:
+ if (GetSetPokedexFlag(HoennToNationalOrder(i + 1), FLAG_GET_SEEN))
+ count++;
+ break;
+ case FLAG_GET_CAUGHT:
+ if (GetSetPokedexFlag(HoennToNationalOrder(i + 1), FLAG_GET_CAUGHT))
+ count++;
+ break;
}
}
return count;
@@ -4381,7 +4381,7 @@ u16 sub_80C089C(u8 caseID)
return count;
}
-bool16 sub_80C08E4(void)
+bool16 HasAllHoennMons(void)
{
u16 i;