diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-16 07:51:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-16 07:51:08 -0400 |
| commit | f44f89a463d7280a95094e8f37a56873a90da843 (patch) | |
| tree | 194662b15b39fb223bd20b17ea696ff525ebab0d /src/scrcmd.c | |
| parent | 4a7c1d888a9f90b9102f469aab12beeab89ffff6 (diff) | |
| parent | e1f7efb8e67fb5587a8baf20f421c20e134e8b24 (diff) | |
Merge pull request #300 from ultima-soul/event_object_movement
Decompile/port event_object_movement
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 7eaa98c76..32ac5c4e2 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1082,7 +1082,7 @@ bool8 ScrCmd_setobjectxy(struct ScriptContext * ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - sub_805F7C4(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, x, y); + TryMoveObjectEventToMapCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, x, y); return FALSE; } @@ -1100,7 +1100,7 @@ bool8 ScrCmd_moveobjectoffscreen(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - sub_805FE94(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TryOverrideObjectEventTemplateCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); return FALSE; } |