diff options
| author | garak <garakmon@gmail.com> | 2019-07-20 12:30:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 12:30:41 -0400 |
| commit | c39d25ff4d3cf6cb8b3a6fea208de0cc3c6a7c8c (patch) | |
| tree | bce0030d8901a6b84e705baca169989fff1a4f71 /include/pokenav.h | |
| parent | dfa3e079c0f55565fc60a6a1ba0ef04de9be94c2 (diff) | |
| parent | 4d5c1ca03b4e7db3c44c71afaa01b1549a282a19 (diff) | |
Merge branch 'master' into navdata
Diffstat (limited to 'include/pokenav.h')
| -rw-r--r-- | include/pokenav.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pokenav.h b/include/pokenav.h index c840fd494..203d14015 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -4,7 +4,7 @@ #include "bg.h" #include "main.h" -typedef u32 (*LoopedTask)(int state); +typedef u32 (*LoopedTask)(s32 state); // Return values of LoopedTask functions. #define LT_INC_AND_PAUSE 0 @@ -111,7 +111,7 @@ void sub_81C7850(u32 a0); u32 sub_81C786C(void); void LoadLeftHeaderGfxForIndex(u32 arg0); void sub_81C7FA0(u32 arg0, bool32 arg1, bool32 arg2); -void sub_81C7AC0(int a0); +void sub_81C7AC0(s32 a0); bool32 sub_81C8010(void); void InitBgTemplates(const struct BgTemplate *templates, int count); bool32 IsPaletteFadeActive(void); |