dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti

Browse Source
This commit is contained in:
GriffinR
2020-07-08 15:45:31 -04:00
parent 8b462f3f6c 8b80b417e2
commit 431c60c92c
109 changed files with 7618 additions and 6664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scrcmd.c
+4 -4
View File
@@ -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;
}