move to item_actions

Author: SethBarberee

include/item_actions.h

@@ -0,0 +1,46 @@
+#ifndef INCLUDE_ITEM_ACTIONS_H
+#define INCLUDE_ITEM_ACTIONS_H
+
+#include "structs/dungeon_entity.h"
+void StunSeedItemAction(Entity *pokemon, Entity *target);
+void MaxElixirAction(Entity *pokemon, Entity *target);
+void ProteinItemAction(Entity *pokemon, Entity *target);
+void CalciumItemAction(Entity *pokemon, Entity *target);
+void IronItemAction(Entity *pokemon, Entity *target);
+void ZincItemAction(Entity *pokemon, Entity *target);
+void sub_80487CC(Entity *pokemon, Entity *target, u32 param_3, u32 param_4);
+void GrimyFoodItemAction(Entity *pokemon, Entity *target);
+void HandleGummiItemAction(Entity *pokemon, Entity *target, u8 r2);
+void IcePartItemAction(Entity *pokemon, Entity *target, u8 r2);
+void SteelPartItemAction(Entity *pokemon, Entity *target, u8 r2);
+void RockPartItemAction(Entity *pokemon, Entity *target, u8 r2);
+void MusicBoxItemAction(Entity *pokemon, Entity *target, u8 r2);
+void nullsub_94(Entity *pokemon, Entity *target, u8 r2);
+void KeyItemAction(Entity *pokemon, Entity *target, u8 r2);
+void sub_8048340(Entity *pokemon, Entity *target, u32 r2);
+void HealSeedItemAction(Entity *pokemon, Entity *target, u8 r2);
+void WishStoneItemAction(Entity *pokemon, Entity *target, u8 r2);
+void OranBerryItemAction(Entity *pokemon, Entity *target);
+void ChestoBerryItemAction(Entity *pokemon, Entity *target);
+void JoySeedItemAction(Entity *pokemon, Entity *target);
+void GinsengItemAction(Entity *pokemon, Entity *target);
+void BlastSeedItemAction(Entity *pokemon, Entity *target, u8 r2);
+void SitrusBerryItemAction(Entity *pokemon, Entity *target);
+void WarpSeedItemAction(Entity *pokemon, Entity *target);
+void PlainSeedItemAction(Entity *pokemon, Entity *target);
+void SleepSeedItemAction(Entity *pokemon, Entity *target);
+void TotterSeedItemAction(Entity *pokemon, Entity *target);
+void CheriBerryItemAction(Entity *pokemon, Entity *target);
+void PechaBerryItemAction(Entity *pokemon, Entity *target);
+void QuickSeedItemAction(Entity *pokemon, Entity *target);
+void HungerSeedItemAction(Entity *pokemon, Entity *target);
+void RawstBerryItemAction(Entity *pokemon, Entity *target);
+void LifeSeedItemAction(Entity *pokemon, Entity *target);
+void AllureSeedItemAction(Entity *pokemon, Entity *target);
+void EyedropSeedItemAction(Entity *pokemon, Entity *target);
+void BlinkerSeedItemAction(Entity *pokemon, Entity *target);
+void DoomSeedItemAction(Entity *pokemon, Entity *target);
+void sub_80482FC(Entity *pokemon, Entity *target, u32 pp, u8 param_4);
+
+
+#endif /* ifndef INCLUDE_ITEM_ACTIONS_H */

include/move_actions.h

@@ -226,7 +226,7 @@ bool8 Conversion2MoveAction(Entity *pokemon, Entity *target, Move *move, s32 par
 bool8 SteelWingMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4, u32 param_5);
 bool8 sub_8058C98(Entity *pokemon, Entity *target, Move *move, u32 param_4, u32 param_5);
 bool32 EarthquakeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 MetalClawMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4, u32 param_5);
+bool8 MetalClawMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4, s32 param_5);
 
 
 

ld_script.txt

@@ -211,7 +211,7 @@ SECTIONS {
         src/code_8045A00.o(.text);
         src/dungeon_items.o(.text);
         asm/code_8046CE4.o(.text);
-        src/code_8048480.o(.text);
+        src/item_actions.o(.text);
         src/dungeon_ai_item_weight.o(.text);
         src/dungeon_map_access.o(.text);
         src/tile_types.o(.text);
@@ -578,7 +578,7 @@ SECTIONS {
         data/data_8109D10.o(.rodata);
         src/pokemon_3.o(.rodata);
         src/items.o(.rodata);
-        src/code_8048480.o(.rodata);
+        src/item_actions.o(.rodata);
         src/friend_area.o(.rodata);
         data/data_810AC60.o(.rodata);
         src/tile_types.o(.rodata);

src/code_8048480.c src/item_actions.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "item_actions.h"
 #include "code_803E668.h"
 #include "code_8041AD0.h"
 #include "code_8045A00.h"
@@ -83,47 +84,6 @@ Entity *sub_80696FC(Entity *);
 extern void DisplayMsgIfNewIqSkillLearned(EntityInfo *, s32);
 extern u32 HandleDamagingMove(struct Entity *, struct Entity *, struct Move *, u32, u32);
 
-void StunSeedItemAction(Entity *, Entity *);
-void MaxElixirAction(Entity *, Entity *);
-void ProteinItemAction(Entity *, Entity *);
-void CalciumItemAction(Entity *, Entity *);
-void IronItemAction(Entity *, Entity *);
-void ZincItemAction(Entity *, Entity *);
-void sub_80487CC(Entity *, Entity *, u32, u32);
-void GrimyFoodItemAction(Entity *, Entity *);
-void HandleGummiItemAction(Entity *, Entity *, u8);
-void IcePartItemAction(Entity *, Entity *, u8);
-void SteelPartItemAction(Entity *, Entity *, u8);
-void RockPartItemAction(Entity *, Entity *, u8);
-void MusicBoxItemAction(Entity *, Entity *, u8);
-void nullsub_94(Entity *, Entity *, u8);
-void KeyItemAction(Entity *, Entity *, u8);
-void sub_8078B5C(Entity *, Entity *, u32, u32, u32);
-void sub_8048340(Entity *, Entity *, u32);
-void HealSeedItemAction(Entity *, Entity *, u8);
-void WishStoneItemAction(Entity *, Entity *, u8);
-void OranBerryItemAction(Entity *, Entity *);
-void ChestoBerryItemAction(Entity *, Entity *);
-void JoySeedItemAction(Entity *, Entity *);
-void GinsengItemAction(Entity *, Entity *);
-void BlastSeedItemAction(Entity *, Entity *, u8);
-void SitrusBerryItemAction(Entity *, Entity *);
-void WarpSeedItemAction(Entity *, Entity *);
-void PlainSeedItemAction(Entity *, Entity *);
-void SleepSeedItemAction(Entity *, Entity *);
-void TotterSeedItemAction(Entity *, Entity *);
-void CheriBerryItemAction(Entity *, Entity *);
-void PechaBerryItemAction(Entity *, Entity *);
-void QuickSeedItemAction(Entity *, Entity *);
-void HungerSeedItemAction(Entity *, Entity *);
-void RawstBerryItemAction(Entity *, Entity *);
-void LifeSeedItemAction(Entity *, Entity *);
-void AllureSeedItemAction(Entity *, Entity *);
-void EyedropSeedItemAction(Entity *, Entity *);
-void BlinkerSeedItemAction(Entity *, Entity *);
-void DoomSeedItemAction(Entity *, Entity *);
-void sub_80482FC(Entity *, Entity *, u32, u8);
-
 extern void sub_8071DA4(Entity *);
 extern void SetShopkeeperAggression(Entity *, Entity *);
 extern void sub_806A6E8(Entity *);