From ddc846fa6a0d9a13cfba6f52488a66f6f4562a2d Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Thu, 27 Apr 2017 15:43:31 +0200 Subject: Sort includes --- include/asm.h | 4 ++-- include/battle_party_menu.h | 2 ++ include/field_control_avatar.h | 2 ++ include/naming_screen.h | 2 ++ include/trainer_see.h | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/asm.h b/include/asm.h index 0b0fc3006..fe1b3139f 100644 --- a/include/asm.h +++ b/include/asm.h @@ -1,10 +1,10 @@ #ifndef PROJECT_ASM_H #define PROJECT_ASM_H -#include "task.h" +#include "asm_fieldmap.h" #include "main.h" #include "sprite.h" -#include "asm_fieldmap.h" +#include "task.h" struct FieldInput { diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h index d0ae8da35..b9c3ad707 100644 --- a/include/battle_party_menu.h +++ b/include/battle_party_menu.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_PARTY_MENU_H #define GUARD_BATTLE_PARTY_MENU_H +#include "task.h" + struct UnknownStruct1 { u8 filler0[0x259]; diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index 3f17ebee9..0f8b74d59 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELDCONTROLAVATAR_H #define GUARD_FIELDCONTROLAVATAR_H +#include "asm.h" + void FieldClearPlayerInput(struct FieldInput *pStruct); void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys); int sub_8068024(struct FieldInput *pStruct); diff --git a/include/naming_screen.h b/include/naming_screen.h index b6b464538..62d0c0029 100644 --- a/include/naming_screen.h +++ b/include/naming_screen.h @@ -1,6 +1,8 @@ #ifndef GUARD_NAMINGSCREEN_H #define GUARD_NAMINGSCREEN_H +#include "main.h" + #define KBEVENT_NONE 0 #define KBEVENT_PRESSED_A 5 #define KBEVENT_PRESSED_B 6 diff --git a/include/trainer_see.h b/include/trainer_see.h index dd04912e7..0113143b6 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -1,6 +1,7 @@ #ifndef GUARD_TRAINER_SEE_H #define GUARD_TRAINER_SEE_H +#include "sprite.h" #include "task.h" bool8 CheckTrainers(void); -- cgit v1.2.3