diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-10-09 10:23:23 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-10-09 10:40:04 -0700 |
| commit | 72beb410f423cafd35989c0b8dd4c52860cf80f8 (patch) | |
| tree | 155aa1e2c39ebd504e095bc8c1dc218aad3acdc4 /src/script_pokemon_util_80C4BF0.c | |
| parent | a871ce87a74421df64a9ad381d37dc32ff9bdc6d (diff) | |
| parent | 3e03d362fae398fa56c4a6e45d7b999772d0803f (diff) | |
Merge remote-tracking branch 'upstream/master' into party_menu
Diffstat (limited to 'src/script_pokemon_util_80C4BF0.c')
| -rw-r--r-- | src/script_pokemon_util_80C4BF0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index 323df991a..f98293a90 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -433,7 +433,7 @@ void ShowContestEntryMonPic(void) gUnknown_081FAF4C[1], species, var1); - palette = sub_80409C8(species, var2, var1); + palette = GetMonSpritePalStructFromOtIdPersonality(species, var2, var1); LoadCompressedObjectPalette(palette); GetMonSpriteTemplate_803C56C(species, 1); gUnknown_02024E8C.paletteTag = palette->tag; @@ -560,8 +560,8 @@ u8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unused1, u32 unused2, u8 u { case 0: case 1: - GetNationalPokedexFlag(nationalDexNum, 2); - GetNationalPokedexFlag(nationalDexNum, 3); + GetSetPokedexFlag(nationalDexNum, 2); + GetSetPokedexFlag(nationalDexNum, 3); break; } return sentToPc; |