diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-12-17 02:40:30 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-12-17 02:40:30 -0500 |
commit | 076d07f6fe24691d6d9d8872c049b18e2e16fa57 (patch) | |
tree | fe67ff21237b8e988484e2a53eecaa50f01844ab /src/script_pokemon_util_80F87D8.c | |
parent | 71a7a8a0759373a8dafcccee82fa2d37cb285b85 (diff) | |
parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'src/script_pokemon_util_80F87D8.c')
-rwxr-xr-x | src/script_pokemon_util_80F87D8.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index 7fc61f953..fc5a06024 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -220,7 +220,7 @@ static void ShowContestWinnerCleanup(void) void ShowContestWinner(void) { - SetMainCallback2(sub_812FDEC); + SetMainCallback2(CB2_ContestPainting); gMain.savedCallback = ShowContestWinnerCleanup; } @@ -563,8 +563,8 @@ u8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unused1, u32 unused2, u8 u { case 0: case 1: - GetSetPokedexFlag(nationalDexNum, 2); - GetSetPokedexFlag(nationalDexNum, 3); + GetSetPokedexFlag(nationalDexNum, FLAG_SET_SEEN); + GetSetPokedexFlag(nationalDexNum, FLAG_SET_CAUGHT); break; } return sentToPc; |