diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-15 00:40:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 00:40:47 -0400 |
| commit | e129d04b931a4fc0e6584b4340dc57b9162264d5 (patch) | |
| tree | a6ae1eb111f652b1cfffdd9a4bccba4a65a0de35 /src/scrcmd.c | |
| parent | ebb6c4ee661758874972956a94eb06d38eaa18a8 (diff) | |
| parent | 3c356a1d7af543d84c06f28f670b6ddc4b27fdd6 (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 188084cc3..224d7adb5 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -5,7 +5,7 @@ #include "clock.h" #include "coins.h" #include "contest.h" -#include "contest_link_80F57C4.h" +#include "contest_util.h" #include "contest_painting.h" #include "data.h" #include "decoration.h" @@ -1470,7 +1470,9 @@ bool8 ScrCmd_hidemonpic(struct ScriptContext *ctx) bool8 ScrCmd_showcontestwinner(struct ScriptContext *ctx) { u8 contestWinnerId = ScriptReadByte(ctx); - if (contestWinnerId) + + // Don't save artist's painting yet + if (contestWinnerId != CONTEST_WINNER_ARTIST) SetContestWinnerForPainting(contestWinnerId); ShowContestWinner(); @@ -1954,14 +1956,14 @@ bool8 ScrCmd_startcontest(struct ScriptContext *ctx) bool8 ScrCmd_showcontestresults(struct ScriptContext *ctx) { - sub_80F8484(); + ShowContestResults(); ScriptContext1_Stop(); return TRUE; } bool8 ScrCmd_contestlinktransfer(struct ScriptContext *ctx) { - sub_80F84C4(gSpecialVar_ContestCategory); + ContestLinkTransfer(gSpecialVar_ContestCategory); ScriptContext1_Stop(); return TRUE; } |