summaryrefslogtreecommitdiff
path: root/include/script_movement.h
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-09-28 21:41:17 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-09-28 21:41:17 -0400
commit6235276ca255a2b345c3a97be23c6b53be6eba0f (patch)
tree81930ebec5d50f4b44575b28979549c34f2e1b0e /include/script_movement.h
parent170c82f299905b6e55b20a5c2c04f92353131d0e (diff)
parentc1c2015f7046676b043641c0d1f9d9e29bc73647 (diff)
Merge branch 'master' into daycare
Diffstat (limited to 'include/script_movement.h')
-rw-r--r--include/script_movement.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/script_movement.h b/include/script_movement.h
index e3cdc25b3..dc6d7e51b 100644
--- a/include/script_movement.h
+++ b/include/script_movement.h
@@ -1,8 +1,8 @@
#ifndef GUARD_SCRIPT_MOVEMENT_H
#define GUARD_SCRIPT_MOVEMENT_H
-bool8 exec_movement(u8, u8, u8, u8 *);
-bool8 sub_80A212C(u8, u8, u8);
+bool8 ScriptMovement_StartObjectMovementScript(u8, u8, u8, u8 *);
+bool8 ScriptMovement_IsObjectMovementFinished(u8, u8, u8);
void sub_80A2178(void);
#endif // GUARD_SCRIPT_MOVEMENT_H