diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-11-13 19:25:41 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-13 19:25:41 -0500 |
commit | ff7e11c0b0b34fce0891b7bc1731971b2e0bfbc4 (patch) | |
tree | daa010cdfdbf3fbf8868ac72d88fc40e2f332e28 /src/scrcmd.c | |
parent | 7455bd9b9a6c02e5ff567400fde3ea6315be5837 (diff) | |
parent | ef8370566f14c22b9927db09b8ff69a98049c796 (diff) |
Merge branch 'master' into doc-scriptclean
Diffstat (limited to 'src/scrcmd.c')
-rw-r--r-- | src/scrcmd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 02bc026d9..a9be5c3ef 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -461,13 +461,13 @@ bool8 ScrCmd_compare_var_to_var(struct ScriptContext *ctx) return FALSE; } +// Note: addvar doesn't support adding from a variable in vanilla. If you were to +// add a VarGet() to the above, make sure you change the `addvar VAR_*, -1` +// in the contest scripts to `subvar VAR_*, 1`, else contests will break. bool8 ScrCmd_addvar(struct ScriptContext *ctx) { u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx)); *ptr += ScriptReadHalfword(ctx); - // Note: addvar doesn't support adding from a variable in vanilla. If you were to - // add a VarGet() to the above, make sure you change the `addvar VAR_0x8006, 65535` - // in the contest scripts to `subvar VAR_0x8006, 1`, else contests will break. return FALSE; } @@ -1945,7 +1945,7 @@ bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx) bool8 ScrCmd_startcontest(struct ScriptContext *ctx) { - sub_80F840C(); + StartContest(); ScriptContext1_Stop(); return TRUE; } |