diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
| commit | 06bf25405c98257e47953b5d3c327e314ea371b3 (patch) | |
| tree | 81be5b612621bdd74f632dbedb9f85c4d1d203b9 /include/field_special_scene.h | |
| parent | 282cae4a9fbd019a973fb6618337d29a61f97f42 (diff) | |
| parent | be05c5bd52769b58316986bd7451cb2483571099 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-pika
Conflicts:
include/use_pokeblock.h
Diffstat (limited to 'include/field_special_scene.h')
| -rw-r--r-- | include/field_special_scene.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/field_special_scene.h b/include/field_special_scene.h index 5841d6bce..ef3f07120 100644 --- a/include/field_special_scene.h +++ b/include/field_special_scene.h @@ -8,6 +8,6 @@ void Task_Truck2(u8 taskId); void Task_Truck3(u8 taskId); void Task_HandleTruckSequence(u8 taskId); void ExecuteTruckSequence(void); -void EndTruckSequence(void); +void EndTruckSequence(u8); #endif // GUARD_FIELD_SPECIAL_SCENE_H |