From 14c5c79f3e3f903e3e7b34b5c0c9bb3b90e7ab75 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Wed, 17 May 2017 17:40:04 -0500
Subject: fill holes in party_menu.c and add battle_interface.h header

---
 include/asm.inc.h          |  2 +-
 include/battle_interface.h | 36 ++++++++++++++++++++++++++++++++++++
 include/menu.h             |  2 +-
 include/songs.h            |  4 ++--
 4 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 include/battle_interface.h

(limited to 'include')

diff --git a/include/asm.inc.h b/include/asm.inc.h
index 0c111a991..62a8ac1cc 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -158,7 +158,7 @@ bool8 pokemon_has_move(struct Pokemon *, u16);
 void sub_806FA18(u8 taskId);
 
 // src/party_menu.o
-void sub_806E834();
+u8 sub_806E834(const u8 *message, u8 arg1);
 
 // src/rom_8077ABC.o
 u8 battle_side_get_owner(u8);
diff --git a/include/battle_interface.h b/include/battle_interface.h
new file mode 100644
index 000000000..e85f87a30
--- /dev/null
+++ b/include/battle_interface.h
@@ -0,0 +1,36 @@
+#ifndef GUARD_BATTLE_INTERFACE_H
+#define GUARD_BATTLE_INTERFACE_H
+
+struct BattleInterfaceStruct1
+{
+    s32 unk0;
+    s32 unk4;
+    s32 unk8;
+    u32 unkC_0:5;
+    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);
+void sub_8043DB0(u8);
+void sub_8043DFC(u8);
+void nullsub_11();
+void sub_8043EB4(u8);
+void sub_8043F44(u8);
+void sub_804454C(void);
+u8 sub_8044804(u8, const struct BattleInterfaceStruct2 *, u8, u8);
+void sub_8044CA0(u8);
+void sub_8045A5C(u8, struct Pokemon *, u8);
+s32 sub_8045C78(u8, u8, u8, u8);
+s16 sub_80460C8(struct BattleInterfaceStruct1 *, int *, void *, int);
+u8 GetScaledHPFraction(s16, s16, u8);
+int GetHPBarLevel(s16, s16);
+
+#endif  // GUARD_BATTLE_INTERFACE_H
diff --git a/include/menu.h b/include/menu.h
index c3dcbc969..6a11ffdc2 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -49,7 +49,7 @@ void PrintMenuItemsReordered(u8, u8, u8, const struct MenuAction[], u8*);
 void InitYesNoMenu(u8, u8, u8);
 void DisplayYesNoMenu(u8, u8, u32);
 s8 ProcessMenuInputNoWrap_(void);
-u8 MenuPrint_PixelCoords(u8 *, u8, u16, u8);
+u8 MenuPrint_PixelCoords(const u8 *, u8, u16, u8);
 u8 sub_8072A18(u8 *, u8, u16, u8, u32);
 u8 unref_sub_8072A5C(u8 *, u8 *, u8, u16, u8, u32);
 int sub_8072AB0(u8 *, u8, u16, u8, u8, u32);
diff --git a/include/songs.h b/include/songs.h
index 244bb9808..c465ac562 100644
--- a/include/songs.h
+++ b/include/songs.h
@@ -120,7 +120,7 @@ enum
     /*0x72*/ SE_TB_START,
     /*0x73*/ SE_TB_KON,
     /*0x74*/ SE_TB_KARA,
-    SE_BIDORO,
+    /*0x75*/ SE_BIDORO,
     SE_W085,
     SE_W085B,
     SE_W231,
@@ -269,7 +269,7 @@ enum
     BGM_GIM,
     BGM_NAMINORI,
     BGM_DAN01,
-    BGM_FANFA1,
+    /*0x16F*/ BGM_FANFA1,
     BGM_ME_ASA,
     BGM_ME_BACHI,
     BGM_FANFA4,
-- 
cgit v1.2.3