diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:00:47 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:14:15 -0700 |
commit | 415fb6738308a9bfa2217419d3861784dcd8e5d9 (patch) | |
tree | 8793240342d37104610f34756f6fee9db706ee8f /include/field_special_scene.h | |
parent | ae56f7859fe17915d3fb33713dfef2fe31fe2a1d (diff) | |
parent | 1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff) |
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'include/field_special_scene.h')
-rw-r--r-- | include/field_special_scene.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/field_special_scene.h b/include/field_special_scene.h index d674f09df..240e9ecb6 100644 --- a/include/field_special_scene.h +++ b/include/field_special_scene.h @@ -1,8 +1,8 @@ #ifndef GUARD_FIELD_SPECIAL_SCENE_H #define GUARD_FIELD_SPECIAL_SCENE_H -s32 GetTruckCameraBobbingY(int a1); -s32 GetTruckBoxMovement(int a1); +s16 GetTruckCameraBobbingY(int a1); +s16 GetTruckBoxMovement(int a1); void Task_Truck1(u8 taskId); void Task_Truck2(u8 taskId); void Task_Truck3(u8 taskId); |