diff options
| author | garak <garakmon@gmail.com> | 2019-07-29 13:06:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 13:06:45 -0400 |
| commit | 5b57c001f5fe653542b6289540e3b6c6b67a8cfe (patch) | |
| tree | 26a9ba631960bc56d01daca1777164801d4e0075 /src/pokenav.c | |
| parent | 54c635683c1d2573885987acc4e99728f38e5131 (diff) | |
| parent | 136da953d6888562e76b0694a98988888adcd6d8 (diff) | |
Merge branch 'master' into navdata
Diffstat (limited to 'src/pokenav.c')
| -rw-r--r-- | src/pokenav.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokenav.c b/src/pokenav.c index be3826bed..132e4123b 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -318,7 +318,7 @@ void Task_RunLoopedTask_LinkMode(u8 taskId) if (sub_8087598()) return; - + task = (LoopedTask)GetWordTaskArg(taskId, 1); state = &gTasks[taskId].data[0]; action = task(*state); @@ -605,7 +605,7 @@ void sub_81C7694(u32 a0) gPokenavResources->fieldA = value; } -u16 sub_81C76AC(void) +u32 sub_81C76AC(void) { return gPokenavResources->fieldA; } |