summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-10-07 01:13:34 -0400
committerGriffinR <griffin.richards@comcast.net>2019-10-07 01:13:34 -0400
commit81ee8f07efeba516947e0289c5d58d58e5220332 (patch)
tree705aca3a34468e80c41d4ba230a68f2c6bc9d166 /src
parentc0b06025168778705ceb044c875561a694739c74 (diff)
Document pc.inc and prof_birch.inc
Diffstat (limited to 'src')
-rw-r--r--src/birch_pc.c8
-rw-r--r--src/main_menu.c4
-rw-r--r--src/menu.c4
-rw-r--r--src/pokedex.c12
-rw-r--r--src/start_menu.c2
-rw-r--r--src/tv.c4
6 files changed, 17 insertions, 17 deletions
diff --git a/src/birch_pc.c b/src/birch_pc.c
index 5179b1920..5b574b05d 100644
--- a/src/birch_pc.c
+++ b/src/birch_pc.c
@@ -9,13 +9,13 @@ bool16 ScriptGetPokedexInfo(void)
{
if (gSpecialVar_0x8004 == 0) // is national dex not present?
{
- gSpecialVar_0x8005 = GetHoennPokedexCount(0);
- gSpecialVar_0x8006 = GetHoennPokedexCount(1);
+ gSpecialVar_0x8005 = GetHoennPokedexCount(FLAG_GET_SEEN);
+ gSpecialVar_0x8006 = GetHoennPokedexCount(FLAG_GET_CAUGHT);
}
else
{
- gSpecialVar_0x8005 = GetNationalPokedexCount(0);
- gSpecialVar_0x8006 = GetNationalPokedexCount(1);
+ gSpecialVar_0x8005 = GetNationalPokedexCount(FLAG_GET_SEEN);
+ gSpecialVar_0x8006 = GetNationalPokedexCount(FLAG_GET_CAUGHT);
}
return IsNationalPokedexEnabled();
diff --git a/src/main_menu.c b/src/main_menu.c
index 0cb91ae09..95c64b3bd 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -2172,9 +2172,9 @@ static void MainMenu_FormatSavegamePokedex(void)
if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
{
if (IsNationalPokedexEnabled())
- dexCount = GetNationalPokedexCount(1);
+ dexCount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
else
- dexCount = GetHoennPokedexCount(1);
+ dexCount = GetHoennPokedexCount(FLAG_GET_CAUGHT);
StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPokedex);
AddTextPrinterParameterized3(2, 1, 0, 33, sTextColor_PlayerGenderColor, -1, gStringVar4);
ConvertIntToDecimalStringN(str, dexCount, STR_CONV_MODE_LEFT_ALIGN, 3);
diff --git a/src/menu.c b/src/menu.c
index 7495d7ebc..e349ff43a 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -2148,9 +2148,9 @@ void sub_819A344(u8 a0, u8 *dest, u8 color)
break;
case 1:
if (IsNationalPokedexEnabled())
- string = ConvertIntToDecimalStringN(string, GetNationalPokedexCount(1), STR_CONV_MODE_LEFT_ALIGN, 3);
+ string = ConvertIntToDecimalStringN(string, GetNationalPokedexCount(FLAG_GET_CAUGHT), STR_CONV_MODE_LEFT_ALIGN, 3);
else
- string = ConvertIntToDecimalStringN(string, GetHoennPokedexCount(1), STR_CONV_MODE_LEFT_ALIGN, 3);
+ string = ConvertIntToDecimalStringN(string, GetHoennPokedexCount(FLAG_GET_CAUGHT), STR_CONV_MODE_LEFT_ALIGN, 3);
*string = EOS;
break;
case 2:
diff --git a/src/pokedex.c b/src/pokedex.c
index 98ac962db..0b04ae3b9 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1347,13 +1347,13 @@ void CB2_Pokedex(void)
sPokedexView->selectedScreen = 0;
if (!IsNationalPokedexEnabled())
{
- sPokedexView->seenCount = GetHoennPokedexCount(0);
- sPokedexView->ownCount = GetHoennPokedexCount(1);
+ sPokedexView->seenCount = GetHoennPokedexCount(FLAG_GET_SEEN);
+ sPokedexView->ownCount = GetHoennPokedexCount(FLAG_GET_CAUGHT);
}
else
{
- sPokedexView->seenCount = GetNationalPokedexCount(0);
- sPokedexView->ownCount = GetNationalPokedexCount(1);
+ sPokedexView->seenCount = GetNationalPokedexCount(FLAG_GET_SEEN);
+ sPokedexView->ownCount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
}
sPokedexView->initialVOffset = 8;
gMain.state++;
@@ -2583,7 +2583,7 @@ static void CreateInterfaceSprites(u8 a)
spriteId = CreateSprite(&gUnknown_0855D20C, 17, 91, 1);
StartSpriteAnim(&gSprites[spriteId], 1);
- r6 = GetHoennPokedexCount(0);
+ r6 = GetHoennPokedexCount(FLAG_GET_SEEN);
_a = 0;
spriteId = CreateSprite(&gUnknown_0855D23C, 40, 45, 1);
@@ -2626,7 +2626,7 @@ static void CreateInterfaceSprites(u8 a)
r5 = (sPokedexView->seenCount % 100) % 10;
StartSpriteAnim(&gSprites[spriteId], r5);
- r6 = GetHoennPokedexCount(1);
+ r6 = GetHoennPokedexCount(FLAG_GET_CAUGHT);
_a = 0;
spriteId = CreateSprite(&gUnknown_0855D23C, 40, 81, 1);
diff --git a/src/start_menu.c b/src/start_menu.c
index fcde176ac..c24497d74 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -570,7 +570,7 @@ static bool8 HandleStartMenuInput(void)
PlaySE(SE_SELECT);
if (sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func.u8_void == StartMenuPokedexCallback)
{
- if (GetNationalPokedexCount(0) == 0)
+ if (GetNationalPokedexCount(FLAG_GET_SEEN) == 0)
return FALSE;
}
diff --git a/src/tv.c b/src/tv.c
index 4696a25e3..b9478a3ea 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1955,11 +1955,11 @@ void sub_80EDB44(void)
show->rivalTrainer.badgeCount = nBadges;
if (IsNationalPokedexEnabled())
{
- show->rivalTrainer.dexCount = GetNationalPokedexCount(0x01);
+ show->rivalTrainer.dexCount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
}
else
{
- show->rivalTrainer.dexCount = GetHoennPokedexCount(0x01);
+ show->rivalTrainer.dexCount = GetHoennPokedexCount(FLAG_GET_CAUGHT);
}
show->rivalTrainer.location = gMapHeader.regionMapSectionId;
show->rivalTrainer.mapLayoutId = gMapHeader.mapLayoutId;