diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-07-08 16:01:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 16:01:27 -0400 |
| commit | ebade7affb31d5bcdc17cdcd3895758010ee6f66 (patch) | |
| tree | 31c604514512b6bb3cd9e52bee799f35de1e3fad /src/scrcmd.c | |
| parent | 9ff261ac2a249a669a42381509ef288287535b4f (diff) | |
| parent | 431c60c92c59ba0c2d5a658e0c490f46162bb5d2 (diff) | |
Merge pull request #1079 from GriffinRichards/doc-confetti
Document Contest Util and confetti effects
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 d7c18fb38..4a7f4ea73 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" @@ -1469,7 +1469,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(); @@ -1953,14 +1955,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; } |