Merge branch 'master' into doc-overworld

This commit is contained in:
GriffinR
2020-07-08 15:51:58 -04:00
committed by GitHub
498 changed files with 8011 additions and 7053 deletions
+4 -4
View File
@@ -1186,22 +1186,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;
}