diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-17 20:15:15 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-17 20:15:15 -0500 |
| commit | e2ab2e50a0723b11802e33074e0dd5d9f7d81496 (patch) | |
| tree | 843680a4e5f4e7de6d90f7e7a1e493508f9c1a36 /src/task.c | |
| parent | d4bd4c393e59bb66a8d4f69f23dce694982723e1 (diff) | |
| parent | 67ced1d77ec0d36cc2b6ebcbfc58ba28b357ddbb (diff) | |
fix merge conflicts
Diffstat (limited to 'src/task.c')
| -rw-r--r-- | src/task.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/task.c b/src/task.c index 3c28a66d9..7bd2b5937 100644 --- a/src/task.c +++ b/src/task.c @@ -11,6 +11,9 @@ struct Task gTasks[ACTIVE_SENTINEL]; static void InsertTask(u8 newTaskId); static u8 FindFirstActiveTask(); +// Unused string +const u8 sTaskOverString[] = _("TASK OVER\nタスクがオーバーしました"); + void ResetTasks() { u8 taskId; |