diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-07 17:06:07 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 17:06:07 -0500 |
| commit | e9908459ed794ea589854fdb98c56db310719803 (patch) | |
| tree | 957427593a9ed4e8bef5a22e355f274909ccf859 | |
| parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) | |
task.c data
| -rw-r--r-- | data/task.s | 7 | ||||
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | src/task.c | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/data/task.s b/data/task.s deleted file mode 100644 index e87c5b1fc..000000000 --- a/data/task.s +++ /dev/null @@ -1,7 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .string "TASK OVER\n" - .string "タスクがオーバーしました$" diff --git a/ld_script.txt b/ld_script.txt index a51f50947..0ade816b7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -374,7 +374,7 @@ SECTIONS { src/rom_8077ABC.o(.rodata); data/map_events.o(.rodata); data/data_8393054.o(.rodata); - data/task.o(.rodata); + src/task.o(.rodata); data/battle_anim_807B69C.o(.rodata); src/title_screen.o(.rodata); data/field_weather.o(.rodata); 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; |