summaryrefslogtreecommitdiff
path: root/include/battle_interface.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/battle_interface.h')
-rw-r--r--include/battle_interface.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/include/battle_interface.h b/include/battle_interface.h
index a3e00fd12..11d7cbf19 100644
--- a/include/battle_interface.h
+++ b/include/battle_interface.h
@@ -1,6 +1,8 @@
#ifndef GUARD_BATTLE_INTERFACE_H
#define GUARD_BATTLE_INTERFACE_H
+#include "battle_controllers.h" // for struct HpAndStatus
+
struct BattleInterfaceStruct1
{
s32 unk0;
@@ -10,12 +12,6 @@ struct BattleInterfaceStruct1
u32 unk10;
};
-struct BattleInterfaceStruct2
-{
- u16 unk0;
- u32 unk4;
-};
-
u8 battle_make_oam_normal_battle(u8);
u8 battle_make_oam_safari_battle(void);
void sub_8043D84(u8, u8, u32, u32, u32);
@@ -25,7 +21,7 @@ void nullsub_11();
void UpdateOamPriorityInAllHealthboxes(u8);
void sub_8043F44(u8);
void sub_804454C(void);
-u8 sub_8044804(u8, const struct BattleInterfaceStruct2 *, u8, u8);
+u8 sub_8044804(u8, const struct HpAndStatus *, u8, u8);
void sub_8044CA0(u8);
void sub_8045A5C(u8, struct Pokemon *, u8);
s32 sub_8045C78(u8, u8, u8, u8);