diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/pokenav.h | 4 | ||||
| -rw-r--r-- | include/text.h | 6 |
2 files changed, 7 insertions, 3 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); diff --git a/include/text.h b/include/text.h index eba3d0c4e..d3ff663bb 100644 --- a/include/text.h +++ b/include/text.h @@ -166,7 +166,11 @@ struct TextPrinter void (*callback)(struct TextPrinterTemplate *, u16); // 0x10 - union __attribute__((packed)) { + union +#if !MODERN + __attribute__((packed)) +#endif + { struct TextPrinterSubStruct sub; u8 fields[7]; } subUnion; |