diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:45:31 -0400 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:45:31 -0400 |
commit | 431c60c92c59ba0c2d5a658e0c490f46162bb5d2 (patch) | |
tree | 7f03009ed9475a0f8e7aac6ed6ca2ab89a527577 /src/scrcmd.c | |
parent | 8b462f3f6c30de55767808136861e892fc3f0356 (diff) | |
parent | 8b80b417e2172a44098a22473717da20585bd15d (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti
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 326d46a56..4a7f4ea73 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1185,22 +1185,22 @@ bool8 ScrCmd_setobjectmovementtype(struct ScriptContext *ctx) bool8 ScrCmd_createvobject(struct ScriptContext *ctx) { u8 graphicsId = ScriptReadByte(ctx); - u8 v2 = ScriptReadByte(ctx); + u8 objectEventId = ScriptReadByte(ctx); u16 x = VarGet(ScriptReadHalfword(ctx)); u32 y = VarGet(ScriptReadHalfword(ctx)); u8 elevation = ScriptReadByte(ctx); u8 direction = ScriptReadByte(ctx); - sprite_new(graphicsId, v2, x, y, elevation, direction); + CreateObjectSprite(graphicsId, objectEventId, x, y, elevation, direction); return FALSE; } bool8 ScrCmd_turnvobject(struct ScriptContext *ctx) { - u8 v1 = ScriptReadByte(ctx); + u8 objectEventId = ScriptReadByte(ctx); u8 direction = ScriptReadByte(ctx); - sub_8097B78(v1, direction); + TurnObjectEventSprite(objectEventId, direction); return FALSE; } |