continue the pruning

Author: SethBarberee

include/item_actions.h

@@ -2,6 +2,11 @@
 #define INCLUDE_ITEM_ACTIONS_H
 
 #include "structs/dungeon_entity.h"
+void sub_80479B8(bool8 param_1, bool8 param_2, u8 param_3, Entity *pokemon, Entity *target, Item *item);
+bool8 sub_8048D50(Entity * pokemon, Item *item);
+bool8 sub_8048950(Entity *param_1, Item *item);
+bool8 sub_8048A68(Entity *param_1,Item *item);
+bool8 sub_8048B9C(Entity *entity, Item *item);
 void StunSeedItemAction(Entity *pokemon, Entity *target);
 void MaxElixirAction(Entity *pokemon, Entity *target);
 void ProteinItemAction(Entity *pokemon, Entity *target);

src/code_8066D04.c

@@ -2,12 +2,14 @@
 #include "globaldata.h"
 #include "code_8045A00.h"
 #include "dungeon_message.h"
+#include "code_803E668.h"
 #include "code_807CD9C.h"
 #include "code_8041AD0.h"
 #include "code_806CD90.h"
 #include "dungeon_map_access.h"
 #include "dungeon_movement.h"
 #include "dungeon_music.h"
+#include "item_actions.h"
 #include "position_util.h"
 #include "dungeon_util.h"
 #include "items.h"
@@ -89,14 +91,9 @@ extern bool8 sub_806A564(s16 r0);
 extern void sub_8045C08(u8 *buffer, Item *item);
 extern bool8 sub_8045888(Entity *);
 extern Item *sub_8044D90(Entity *, s32, u32);
-void sub_8045BF8(u8 *, Item *);
-u8 sub_8048D50();
 void SetActionUnusableInDungeonSubMenu(u16 param_1);
 void AddActionToDungeonSubMenu(u16 param_1, u8 param_2);
-void sub_8044DF0();
 void sub_8042208(Entity *pokemon, u8 r1);
-void sub_803E708();
-void sub_80479B8();
 extern void sub_807AB38(Entity *, u32);
 extern Entity * sub_8044DA4(Entity *param_1,int param_2);
 extern void sub_806A6E8(Entity *);
@@ -514,7 +511,7 @@ void sub_8067110(Entity *entity)
         item2 = *item;
         sub_8044DF0(entity,0,0x66);
         sub_803E708(0x1e,0x11);
-        sub_80479B8(0,0,0,entity,entity,&item2);
+        sub_80479B8(FALSE,FALSE,FALSE,entity,entity,&item2);
         sub_807AB38(entity,gDungeon->forceMonsterHouse);
     }
 }

src/dungeon_main.c

@@ -1,6 +1,7 @@
 #include "global.h"
 #include "globaldata.h"
 #include "dungeon_main.h"
+#include "item_actions.h"
 #include "structs/str_dungeon.h"
 #include "number_util.h"
 #include "input.h"
@@ -61,9 +62,6 @@
 
 extern void HandleSetItemAction(Entity *,bool8);
 extern void HandleUnsetItemAction(Entity *,bool8);
-extern bool8 sub_8048A68(Entity *param_1,Item *item);
-extern bool8 sub_8048950(Entity *param_1,Item *item);
-extern bool8 sub_8048B9C(Entity *param_1,Item *item);
 extern Item *sub_8044D90(Entity *, s32, u32);
 extern void sub_806A6E8(Entity *);
 bool8 sub_807EF48(void);
@@ -91,7 +89,6 @@ extern void sub_803F508(Entity *);
 extern void sub_8041AD0(Entity *pokemon);
 extern void sub_8041AE0(Entity *pokemon);
 extern void sub_807EC28(bool8);
-extern const u8 *GetCurrentDungeonName(void);
 
 extern Entity *gLeaderPointer;
 

src/dungeon_menu_team.c

@@ -46,9 +46,6 @@
 #include "code_8097DD0.h"
 #include "move_util.h"
 
-extern bool8 sub_8048A68(Entity *param_1,Item *item);
-extern bool8 sub_8048950(Entity *param_1,Item *item);
-extern bool8 sub_8048B9C(Entity *param_1,Item *item);
 extern Item *sub_8044D90(Entity *, s32, u32);
 extern void sub_806A6E8(Entity *);
 bool8 sub_807EF48(void);

src/item_actions.c

@@ -119,7 +119,7 @@ bool8 sub_8047930(Entity *pokemon, Entity *target)
   return flag;
 }
 
-void sub_80479B8(char param_1, char param_2, u8 param_3, Entity *pokemon, Entity *target, Item *item)
+void sub_80479B8(bool8 param_1, bool8 param_2, u8 param_3, Entity *pokemon, Entity *target, Item *item)
 {
   EntityInfo *info;
   u32 flag;