summaryrefslogtreecommitdiff
path: root/src/scrcmd.c
diff options
context:
space:
mode:
authorSewef <elagroum@gmail.com>2019-10-16 19:35:33 +0200
committerGitHub <noreply@github.com>2019-10-16 19:35:33 +0200
commit19fb0fb2205cf719daeb705098c685e2062d3c83 (patch)
treef869cb7ec87f204f236a0d173e54b047adfd97eb /src/scrcmd.c
parented1f5a74556d3a856f868e1b67edd2453122cff6 (diff)
parent60a592a2c32d07d47c892204659a8576017584d1 (diff)
Merge branch 'master' into patch-2
Diffstat (limited to 'src/scrcmd.c')
-rw-r--r--src/scrcmd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 8ddd23d6d..bdeee0524 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -607,7 +607,7 @@ bool8 ScrCmd_incrementgamestat(struct ScriptContext *ctx)
bool8 ScrCmd_animateflash(struct ScriptContext *ctx)
{
- sub_80B009C(ScriptReadByte(ctx));
+ AnimateFlash(ScriptReadByte(ctx));
ScriptContext1_Stop();
return TRUE;
}
@@ -1930,9 +1930,9 @@ bool8 ScrCmd_setberrytree(struct ScriptContext *ctx)
bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx)
{
- u16 value = VarGet(ScriptReadHalfword(ctx));
+ u16 newsKind = VarGet(ScriptReadHalfword(ctx));
- gSpecialVar_Result = GetPriceReduction(value);
+ gSpecialVar_Result = GetPriceReduction(newsKind);
return FALSE;
}