summaryrefslogtreecommitdiff
path: root/src/scene/credits.c
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-09-30 20:28:46 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-09-30 20:28:46 -0400
commitc7e71bc47d322fc7da3a07910ba36fe236b51e13 (patch)
treeb24d817d82621d758804fc995189fffc7413f72e /src/scene/credits.c
parent044e8cc93b46fccb2e4e5ed5accf4c55917a3f7f (diff)
parent5fb9b9052276243d54ecfc27d0514e9c35825e8c (diff)
Merge branch 'master' of https://github.com/pret/pokeruby into refactor_src
Diffstat (limited to 'src/scene/credits.c')
-rw-r--r--src/scene/credits.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scene/credits.c b/src/scene/credits.c
index df70674b6..cf10137c1 100644
--- a/src/scene/credits.c
+++ b/src/scene/credits.c
@@ -1387,7 +1387,7 @@ static u8 sub_81456B4(u16 species, u16 x, u16 y, u16 position)
1
);
- lzPaletteData = species_and_otid_get_pal(species, 0, 0xFFFF);
+ lzPaletteData = GetMonSpritePalFromOtIdPersonality(species, 0, 0xFFFF);
LoadCompressedPalette(lzPaletteData, 0x100 + (position * 16), 0x20);
sub_8143648(position, position);
@@ -1433,7 +1433,7 @@ static void sub_81458DC(void)
for (dexNum = 1, seenTypesCount = 0; dexNum < 386; dexNum++)
{
- if (GetNationalPokedexFlag(dexNum, 1))
+ if (GetSetPokedexFlag(dexNum, 1))
{
unk201C000->unk90[seenTypesCount] = dexNum;
seenTypesCount++;