diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-10-01 11:17:34 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-10-01 11:17:34 -0500 |
| commit | f91da8a21072836d18b77380f45030bc8bd87743 (patch) | |
| tree | d5a0e2e90f11420115c2dd7a998976cc87e80ce9 /src/script_pokemon_util_80C4BF0.c | |
| parent | e926119b726839bc687c503db3680899906aad0d (diff) | |
| parent | 83efcc9c3d1e81b78c2cd9ceab3ac6420a5f4070 (diff) | |
Merge remote-tracking branch 'upstream/master' into script_cmd_renaming
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; |