From da98eb45b9d4235fbdd19fa8eb316dd85bd4d90e Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Tue, 9 Apr 2024 22:00:49 -0700
Subject: [PATCH] update args

---
 include/status_actions.h | 72 +++++++++++++++---------------
 src/move_actions.c       | 58 ++++++++++++-------------
 src/status_actions.c     | 94 ++++++++++++++++++++--------------------
 3 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/include/status_actions.h b/include/status_actions.h
index ff42e09ee..1632e96b8 100644
--- a/include/status_actions.h
+++ b/include/status_actions.h
@@ -5,52 +5,52 @@
 #include "structs/dungeon_entity.h"
 
 bool8 sub_805B668(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805B734(Entity *pokemon, Entity *target);
-bool8 RecycleMoveAction(Entity *pokemon, Entity *target);
+bool8 sub_805B734(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 RecycleMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 ReflectMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 sub_805B808(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805B884(Entity *pokemon, Entity *target);
+bool8 sub_805B884(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 SkullBashMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 sub_805B910(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 sub_805B968(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 RockSmashMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805BA44(Entity *pokemon, Entity *target);
+bool8 sub_805BA44(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 sub_805BA50(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805BB64(Entity *pokemon, Entity *target);
-bool8 sub_805BB74(Entity *pokemon, Entity *target);
-bool8 sub_805BB98(Entity *pokemon, Entity *target);
-bool8 CleanseOrbAction(Entity *pokemon,Entity *target);
-bool8 sub_805BC70(Entity *pokemon, Entity *target);
+bool8 sub_805BB64(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 sub_805BB74(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 sub_805BB98(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 CleanseOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
+bool8 sub_805BC70(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 sub_805BC98(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 SilenceOrbAction(Entity *pokemon,Entity *target);
-bool8 ScannerOrbAction(Entity *pokemon, Entity *target);
-bool8 RadarOrbAction(Entity *pokemon, Entity *target);
-bool8 TransferOrbAction(Entity *pokemon,Entity *target);
-bool8 sub_805BE90(Entity *pokemon, Entity *target);
-bool8 LuminousOrbAction(Entity *pokemon,Entity *target);
-bool8 PetrifyOrbAction(Entity *pokemon, Entity *target);
-bool8 sub_805BEB8(Entity *pokemon, Entity *target);
-bool8 sub_805BEC8(Entity *pokemon, Entity *target);
-bool8 EscapeOrbAction(Entity *pokemon,Entity *target);
-bool8 sub_805BF34(Entity *pokemon, Entity *target);
-bool8 TrapbustOrbAction(Entity *pokemon,Entity *target);
-bool8 sub_805C080(Entity *pokemon, Entity *target);
-bool8 sub_805C128(Entity *pokemon, Entity *target);
+bool8 SilenceOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
+bool8 ScannerOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 RadarOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 TransferOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
+bool8 sub_805BE90(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 LuminousOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
+bool8 PetrifyOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 sub_805BEB8(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 sub_805BEC8(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 EscapeOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
+bool8 sub_805BF34(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 TrapbustOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
+bool8 sub_805C080(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 sub_805C128(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 sub_805C138(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 IdentifyOrbAction(Entity *pokemon, Entity *target);
+bool8 IdentifyOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 sub_805C1BC(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805C1E4(Entity *pokemon, Entity *target);
-bool8 ShockerOrbAction(Entity *pokemon, Entity *target);
+bool8 sub_805C1E4(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 ShockerOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 sub_805C208(Entity *pokemon, Entity *target, Move *move, u32 param_4);
-bool8 sub_805C288(Entity *pokemon, Entity *target);
-bool8 sub_805C2A0(Entity *pokemon, Entity *target);
-bool8 FillInOrbAction(Entity *pokemon,Entity *target);
-bool8 sub_805C3DC(Entity *pokemon, Entity *target);
-bool8 sub_805C3F8(Entity *pokemon, Entity *target);
-bool8 sub_805C45C(Entity *pokemon, Entity *target);
-bool8 MobileOrbAction(Entity *pokemon, Entity *target);
-bool8 StairsOrbAction(Entity *pokemon, Entity *target);
-bool8 LongtossOrbAction(Entity *pokemon, Entity *target);
-bool8 PierceOrbAction(Entity *pokemon, Entity *target);
+bool8 sub_805C288(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 sub_805C2A0(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 FillInOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
+bool8 sub_805C3DC(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 sub_805C3F8(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 sub_805C45C(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 MobileOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 StairsOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 LongtossOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 PierceOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 
 #endif
diff --git a/src/move_actions.c b/src/move_actions.c
index 70b7ecfaf..f87ec6f39 100644
--- a/src/move_actions.c
+++ b/src/move_actions.c
@@ -380,31 +380,31 @@ bool8 sub_805768C(Entity *pokemon, Entity *target, Move *move, s32 param_4)
     return flag;
 }
 
-bool8 YawnMoveAction(Entity * pokemon, Entity *target)
+bool8 YawnMoveAction(Entity * pokemon, Entity *target, Move *move, s32 param_4)
 {
     YawnedStatusTarget(pokemon, target, CalculateStatusTurns(target,gUnknown_80F4F28,TRUE) + 1);
     return TRUE;
 }
 
-bool8 sub_80576F8(Entity * pokemon, Entity *target)
+bool8 sub_80576F8(Entity * pokemon, Entity *target, Move *move, s32 param_4)
 {
     sub_8075C58(pokemon, target, CalculateStatusTurns(target, gUnknown_80F4E74, TRUE), TRUE);
     return TRUE;
 }
 
-bool8 NightmareMoveAction(Entity * pokemon, Entity *target)
+bool8 NightmareMoveAction(Entity * pokemon, Entity *target, Move *move, s32 param_4)
 {
     NightmareStatusTarget(pokemon, target, CalculateStatusTurns(target,gUnknown_80F4E78,TRUE));
     return TRUE;
 }
 
-bool8 sub_8057748(Entity * pokemon,Entity * target)
+bool8 sub_8057748(Entity * pokemon,Entity * target, Move *move, s32 param_4)
 {
     HealTargetHP(pokemon, target, gUnknown_80F502A[GetApparentWeather(pokemon)], 0, TRUE);
     return TRUE;
 }
 
-bool8 VitalThrowMoveAction(Entity * pokemon, Entity * target)
+bool8 VitalThrowMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     VitalThrowStatusTarget(pokemon, target);
     return TRUE;
@@ -433,19 +433,19 @@ bool8 DigMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
     return flag;
 }
 
-bool32 sub_8057824(Entity *pokemon, Entity *target)
+bool32 sub_8057824(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
   LowerAccuracyStageTarget(pokemon,target,gUnknown_8106A50,TRUE);
   return TRUE;
 }
 
-bool32 sub_805783C(Entity *pokemon, Entity *target)
+bool32 sub_805783C(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
   ChangeAttackMultiplierTarget(pokemon,target,gUnknown_8106A4C,0x80,TRUE);
   return TRUE;
 }
 
-bool32 sub_805785C(Entity *pokemon, Entity *target)
+bool32 sub_805785C(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
   gDungeon->unkE26B = gUnknown_80F4F42;
   if (sub_807EAA0(1,0) == 0) {
@@ -455,7 +455,7 @@ bool32 sub_805785C(Entity *pokemon, Entity *target)
   return TRUE;
 }
 
-bool32 sub_80578A4(Entity *pokemon, Entity *target)
+bool32 sub_80578A4(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
   gDungeon->weatherTurns = gUnknown_80F4F42;
   if (sub_807EAA0(1,0) == 0) {
@@ -465,7 +465,7 @@ bool32 sub_80578A4(Entity *pokemon, Entity *target)
   return TRUE;
 }
 
-bool32 sub_80578EC(Entity *pokemon, Entity *target)
+bool32 sub_80578EC(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     sub_8079F20(pokemon, target, 1, 0);
     return TRUE;
@@ -485,13 +485,13 @@ bool32 sub_80578FC(Entity *pokemon, Entity *target, Move * move, u32 param_4)
   return flag;
 }
 
-bool32 EncoreMoveAction(Entity *pokemon, Entity *target)
+bool32 EncoreMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     EncoreStatusTarget(pokemon, target);
     return TRUE;
 }
 
-bool32 RageMoveAction(Entity *pokemon, Entity *target, Move *move)
+bool32 RageMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
   // {ARG_POKEMON_0} is enraged
   SetChargeStatusTarget(pokemon,target,STATUS_ENRAGED,move,gUnknown_80FAC88);
@@ -517,7 +517,7 @@ bool32 sub_8057974(Entity *pokemon, Entity *target, Move *move, u32 param_4)
   return local_24;
 }
 
-bool8 PainSplitMoveAction(Entity *pokemon, Entity *target)
+bool8 PainSplitMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
   s32 newHP;
   EntityInfo *iVar2;
@@ -550,7 +550,7 @@ bool8 PainSplitMoveAction(Entity *pokemon, Entity *target)
   return TRUE;
 }
 
-bool8 TormentMoveAction(Entity *pokemon, Entity *target)
+bool8 TormentMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
   Move *movePtr;
   s32 iVar4;
@@ -607,13 +607,13 @@ bool8 TormentMoveAction(Entity *pokemon, Entity *target)
   return isTormented;
 }
 
-bool8 sub_8057BB4(Entity *pokemon, Entity *target)
+bool8 sub_8057BB4(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     LowerMovementSpeedTarget(pokemon, target, 1, TRUE);
     return TRUE;
 }
 
-bool8 sub_8057BC4(Entity *pokemon, Entity *target)
+bool8 sub_8057BC4(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     ConfuseStatusTarget(pokemon, target, TRUE);
     RaiseAttackStageTarget(pokemon, target, gUnknown_8106A4C, 2);
@@ -639,7 +639,7 @@ bool8 SnoreMoveAction(Entity *pokemon, Entity *target, Move * move, u32 param_4)
   return flag;
 }
 
-bool8 sub_8057C68(Entity *pokemon, Entity *target)
+bool8 sub_8057C68(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     ChangeDefenseMultiplierTarget(pokemon, target, gUnknown_8106A4C, 0x40, 1);
     return TRUE;
@@ -694,13 +694,13 @@ bool8 WhirlpoolMoveAction(Entity * pokemon, Entity * target, Move * move, u32 pa
   return flag;
 }
 
-bool8 sub_8057D7C(Entity * pokemon, Entity * target)
+bool8 sub_8057D7C(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
   LowerDefenseStageTarget(pokemon, target, gUnknown_8106A50, 2, 1, TRUE);
   return TRUE;
 }
 
-NAKED bool8 sub_8057D9C(Entity * pokemon, Entity * target)
+NAKED bool8 sub_8057D9C(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
         asm_unified(
 	"\tpush {r4-r7,lr}\n"
@@ -769,19 +769,19 @@ NAKED bool8 sub_8057D9C(Entity * pokemon, Entity * target)
 "_08057E18: .4byte gUnknown_80FD370");
 }
 
-bool8 FocusEnergyMoveAction(Entity * pokemon, Entity * target)
+bool8 FocusEnergyMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     FocusEnergyStatusTarget(pokemon, target);
     return TRUE;
 }
 
-bool8 SmokescreenMoveAction(Entity *pokemon, Entity *target)
+bool8 SmokescreenMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     WhifferStatusTarget(pokemon, target, CalculateStatusTurns(target, gUnknown_80F4EDC, TRUE));
     return TRUE;
 }
 
-bool8 sub_8057E50(Entity *pokemon, Entity *target)
+bool8 sub_8057E50(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     SendThawedMessage(pokemon, target);
     MirrorMoveStatusTarget(pokemon, target);
@@ -820,7 +820,7 @@ bool8 sub_8057ED0(Entity *pokemon, Entity *target, Move *move, u32 param_4)
   return flag;
 }
 
-bool8 sub_8057F24(Entity *pokemon, Entity *target)
+bool8 sub_8057F24(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
   EntityInfo *entityInfo;
   
@@ -847,14 +847,14 @@ bool8 sub_8057F7C(Entity *pokemon, Entity *target, Move *move, u32 param_4)
   return flag;
 }
 
-bool8 sub_8057FCC(Entity *pokemon, Entity *target)
+bool8 sub_8057FCC(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     ConfuseStatusTarget(pokemon, target, TRUE);
     RaiseAttackStageTarget(pokemon, target, gUnknown_8106A50, 1);
     return TRUE;
 }
 
-bool8 sub_8057FF4(Entity *pokemon, Entity *target)
+bool8 sub_8057FF4(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
   u8 flashFireStatus;
   
@@ -907,7 +907,7 @@ _080580B0:
   return local_24;
 }
 
-bool8 GrudgeMoveAction(Entity *pokemon, Entity * target)
+bool8 GrudgeMoveAction(Entity *pokemon, Entity * target, Move *move, s32 param_4)
 {
   EntityInfo *entityInfo;
   bool8 hasGrudge;
@@ -926,7 +926,7 @@ bool8 GrudgeMoveAction(Entity *pokemon, Entity * target)
   return hasGrudge;
 }
 
-bool8 sub_805815C(Entity *pokemon, Entity *target)
+bool8 sub_805815C(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     CounterStatusTarget(pokemon, target, STATUS_COUNTER);
     return TRUE;
@@ -1829,7 +1829,7 @@ bool8 SkillSwapMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param
 
 // https://decomp.me/scratch/Ul8x5 
 #ifdef NONMATCHING
-bool32 SketchMoveAction(struct Entity *pokemon, struct Entity *target, struct Move *move)
+bool32 SketchMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
   u16 moveID;
   struct EntityInfo *targetInfo;
@@ -1879,7 +1879,7 @@ _moveIDcheck:
 
 #else
 NAKED
-bool32 SketchMoveAction(struct Entity *pokemon, struct Entity *target, struct Move *move)
+bool32 SketchMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     asm_unified(
 	"\tpush {r4-r7,lr}\n"
diff --git a/src/status_actions.c b/src/status_actions.c
index cd3823ed3..1980e2896 100644
--- a/src/status_actions.c
+++ b/src/status_actions.c
@@ -205,7 +205,7 @@ bool8 sub_805B028(Entity * pokemon,Entity * target,Move *move)
     return TRUE;
 }
 
-bool8 TransformMoveAction(Entity * pokemon, Entity * target, Move *move)
+bool8 TransformMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 { 
   if (IsBossFight()) {
     sub_80522F4(pokemon,target,*gUnknown_80FEFF4);
@@ -305,7 +305,7 @@ bool8 sub_805B214(Entity * pokemon,Entity * target,Move *move, s32 param_4)
     return TRUE;
 }
 
-bool8 SpikesMoveAction(Entity * pokemon, Entity * target)
+bool8 SpikesMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     bool8 trapLaid;
     u8 uVar2;
@@ -438,17 +438,17 @@ bool8 sub_805B3FC(Entity * pokemon,Entity * target,Move *move, s32 param_4, s32
     return flag;
 }
 
-bool8 sub_805B454(Entity * pokemon, Entity * target)
+bool8 sub_805B454(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     InfatuateStatusTarget(pokemon, target, TRUE);
     return TRUE;
 }
 
-bool8 MimicMoveAction(Entity * pokemon, Entity * target)
+bool8 MimicMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     EntityInfo *entityInfo;
     EntityInfo *targetEntityInfo;
-    Move *move;
+    Move *movePtr;
     s32 moveCounter;
     s32 moveIndex;
     bool8 mimicSuccess;
@@ -460,11 +460,11 @@ bool8 MimicMoveAction(Entity * pokemon, Entity * target)
 
     for(moveIndex = 0; moveIndex < MAX_MON_MOVES; moveIndex++)
     {
-        move = &targetEntityInfo->moves[moveIndex];
-        if (((move->moveFlags & MOVE_FLAG_EXISTS)) && !sub_805755C(pokemon,move->id)) {
-            if ((move->id != MOVE_MIMIC) && (move->id != MOVE_ASSIST) && (move->id != MOVE_SKETCH) && (move->id != MOVE_MIRROR_MOVE) &&
-                (move->id != MOVE_ENCORE) && ((move->moveFlags & MOVE_FLAG_LAST_USED))) {
-                entityInfo->mimicMoveIDs[moveCounter] = move->id;
+        movePtr = &targetEntityInfo->moves[moveIndex];
+        if (((movePtr->moveFlags & MOVE_FLAG_EXISTS)) && !sub_805755C(pokemon,movePtr->id)) {
+            if ((movePtr->id != MOVE_MIMIC) && (movePtr->id != MOVE_ASSIST) && (movePtr->id != MOVE_SKETCH) && (movePtr->id != MOVE_MIRROR_MOVE) &&
+                (movePtr->id != MOVE_ENCORE) && ((movePtr->moveFlags & MOVE_FLAG_LAST_USED))) {
+                entityInfo->mimicMoveIDs[moveCounter] = movePtr->id;
                 moveCounter++;
             }
         }
@@ -512,7 +512,7 @@ _0805B598:
     return local_24;
 }
 
-bool8 LeechSeedMoveAction(Entity * pokemon, Entity * target)
+bool8 LeechSeedMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     HandleLeechSeed(pokemon, target, TRUE);
     if (pokemon->info->unkFB == 0) {
@@ -572,13 +572,13 @@ bool8 sub_805B668(Entity * pokemon, Entity * target, Move *move, s32 param_4)
   return flag;
 }
 
-bool8 sub_805B734(Entity * pokemon, Entity * target)
+bool8 sub_805B734(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     SnatchStatusTarget(pokemon, target);
     return TRUE;
 }
 
-bool8 RecycleMoveAction(Entity * pokemon, Entity * target)
+bool8 RecycleMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
   Item *item;
   s32 index;
@@ -634,7 +634,7 @@ bool8 sub_805B808(Entity * pokemon, Entity * target, Move *move, s32 param_4)
     return local_20;
 }
 
-bool8 sub_805B884( Entity * pokemon, Entity * target)
+bool8 sub_805B884( Entity * pokemon, Entity * target, Move *move, s32 param_4)
 { 
     RaiseAttackStageTarget(pokemon, target, gUnknown_8106A4C, 1);
     RaiseMovementSpeedTarget(pokemon, target, 0, TRUE);
@@ -724,7 +724,7 @@ bool8 RockSmashMoveAction(Entity * pokemon, Entity * target, Move *move, s32 par
     return flag;
 }
 
-bool8 sub_805BA44(Entity * pokemon, Entity * target)
+bool8 sub_805BA44(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     sub_807D3CC(pokemon, target);
     return TRUE;
@@ -786,13 +786,13 @@ bool8 sub_805BA50(Entity * pokemon, Entity * target, Move *move, s32 param_4)
     return flag;
 }
 
-bool8 sub_805BB64(Entity * pokemon, Entity * target)
+bool8 sub_805BB64(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     CounterStatusTarget(pokemon, target, STATUS_MINI_COUNTER);
     return TRUE;
 }
 
-bool8 sub_805BB74(Entity * pokemon, Entity * target)
+bool8 sub_805BB74(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     if(pokemon->info->unkFB == 0)
     {
@@ -802,13 +802,13 @@ bool8 sub_805BB74(Entity * pokemon, Entity * target)
     return TRUE;
 }
 
-bool8 sub_805BB98(Entity * pokemon, Entity * target)
+bool8 sub_805BB98(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     sub_807D148(pokemon, target, 1, NULL);
     return TRUE;
 }
 
-bool8 CleanseOrbAction(Entity * pokemon, Entity * target)
+bool8 CleanseOrbAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     Item *item;
     Entity *entity;
@@ -856,7 +856,7 @@ bool8 CleanseOrbAction(Entity * pokemon, Entity * target)
     return isItemCleaned;
 }
 
-bool8 sub_805BC70(Entity * pokemon, Entity * target)
+bool8 sub_805BC70(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     sub_8075C58(pokemon,target,CalculateStatusTurns(target, gUnknown_80F4E74, TRUE), TRUE);
     return TRUE;
@@ -895,25 +895,25 @@ bool8 sub_805BC98(Entity * pokemon, Entity * target, Move *move, s32 param_4)
     return flag;
 }
 
-bool8 SilenceOrbAction(Entity * pokemon, Entity * target)
+bool8 SilenceOrbAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     MuzzleTarget(pokemon, target);
     return TRUE;
 }
 
-bool8 ScannerOrbAction(Entity * pokemon, Entity * target)
+bool8 ScannerOrbAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     HandleScannerOrb(pokemon, target);
     return TRUE;
 }
 
-bool8 RadarOrbAction(Entity * pokemon, Entity * target)
+bool8 RadarOrbAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     HandleRadarOrb(pokemon, target);
     return TRUE;
 }
 
-bool8 TransferOrbAction(Entity *pokemon, Entity * target)
+bool8 TransferOrbAction(Entity *pokemon, Entity * target, Move *move, s32 param_4)
 {
     EntityInfo *entityInfo;
     s32 oldID; //r8
@@ -957,37 +957,37 @@ bool8 TransferOrbAction(Entity *pokemon, Entity * target)
     return didTransfer;
 }
 
-bool8 sub_805BE90(Entity *pokemon, Entity *target)
+bool8 sub_805BE90(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
   LowerMovementSpeedTarget(pokemon, target, 1, TRUE);
   return TRUE;
 }
 
-bool8 LuminousOrbAction(Entity * pokemon, Entity * target)
+bool8 LuminousOrbAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     HandleLuminousOrbAction(pokemon);
     return TRUE;
 }
 
-bool8 PetrifyOrbAction(Entity * pokemon, Entity * target)
+bool8 PetrifyOrbAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     PetrifiedStatusTarget(pokemon, target);
     return TRUE;
 }
 
-bool8 sub_805BEB8(Entity * pokemon, Entity * target)
+bool8 sub_805BEB8(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     sub_807DA14(pokemon, target, 8);
     return TRUE;
 }
 
-bool8 sub_805BEC8(Entity * pokemon, Entity * target)
+bool8 sub_805BEC8(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     sub_807D510(pokemon, target);
     return TRUE;
 }
 
-bool8 EscapeOrbAction(Entity * pokemon, Entity * target)
+bool8 EscapeOrbAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     SetMessageArgument(gAvailablePokemonNames,pokemon,0);
     if (gDungeon->unk66E != 0) {
@@ -1001,13 +1001,13 @@ bool8 EscapeOrbAction(Entity * pokemon, Entity * target)
     return FALSE;
 }
 
-bool8 sub_805BF34(Entity * pokemon, Entity * target)
+bool8 sub_805BF34(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     sub_807DB74(pokemon);
     return TRUE;
 }
 
-bool8 TrapbustOrbAction(Entity * pokemon,Entity * target)
+bool8 TrapbustOrbAction(Entity * pokemon,Entity * target, Move *move, s32 param_4)
 {
     struct Tile *tile;
     Entity *object;
@@ -1063,7 +1063,7 @@ bool8 TrapbustOrbAction(Entity * pokemon,Entity * target)
     return foundTrap;
 }
 
-bool8 sub_805C080(Entity * pokemon, Entity *target)
+bool8 sub_805C080(Entity * pokemon, Entity *target, Move *move, s32 param_4)
 {
     Entity **possibleTargets;
     s32 numPossibleTargets;
@@ -1094,7 +1094,7 @@ bool8 sub_805C080(Entity * pokemon, Entity *target)
     return foundTarget;
 }
 
-bool8 InvisifyOrbAction(Entity * pokemon, Entity * target)
+bool8 InvisifyOrbAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
 {
     InvisibleStatusTarget(pokemon, pokemon);
     return TRUE;
@@ -1110,7 +1110,7 @@ bool8 sub_805C138(Entity * pokemon, Entity * target, Move *move, s32 param_4)
     return local_20;
 }
 
-bool8 IdentifyOrbAction(Entity *pokemon, Entity *target)
+bool8 IdentifyOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     IdentityItemHolders(pokemon, target);
     return TRUE;
@@ -1124,13 +1124,13 @@ bool8 sub_805C1BC(Entity *pokemon, Entity *target, Move *move, s32 param_4)
     return flag;
 }
 
-bool8 sub_805C1E4(Entity *pokemon, Entity *target)
+bool8 sub_805C1E4(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     sub_80522F4(pokemon, target, *gUnknown_80FD454);
     return FALSE;
 }
 
-bool8 ShockerOrbAction(Entity *pokemon, Entity *target)
+bool8 ShockerOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     CowerStatusTarget(pokemon, target, TRUE);
     return TRUE;
@@ -1149,19 +1149,19 @@ bool8 sub_805C208(Entity *pokemon, Entity *target, Move *move, u32 param_4)
     return local_24;
 }
 
-bool8 sub_805C288(Entity *pokemon, Entity *target)
+bool8 sub_805C288(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     sub_8078A58(pokemon, target, gUnknown_80F4FC6, 0);
     return TRUE;
 }
 
-bool8 sub_805C2A0(Entity *pokemon, Entity *target)
+bool8 sub_805C2A0(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     sub_807DC68(pokemon, target);
     return TRUE;
 }
 
-bool8 FillInOrbAction(Entity *pokemon,Entity *target)
+bool8 FillInOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4)
 {
     struct Tile *tileToFill;
     EntityInfo *targetInfo;
@@ -1211,7 +1211,7 @@ bool8 FillInOrbAction(Entity *pokemon,Entity *target)
     }
 }
 
-bool8 TrapperOrbAction(Entity *pokemon, Entity *target)
+bool8 TrapperOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     u32 var;
     var = (target->info->isNotTeamMember ? 2 : 1);
@@ -1219,7 +1219,7 @@ bool8 TrapperOrbAction(Entity *pokemon, Entity *target)
     return TRUE;
 }
 
-bool8 sub_805C3F8(Entity *pokemon, Entity *target)
+bool8 sub_805C3F8(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     Item stack;
     Position posStruct = target->pos;
@@ -1239,31 +1239,31 @@ bool8 sub_805C3F8(Entity *pokemon, Entity *target)
     }
 }
 
-bool8 sub_805C45C(Entity *pokemon, Entity *target)
+bool8 sub_805C45C(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     sub_807F43C(pokemon, target);
     return TRUE;
 }
 
-bool8 MobileOrbAction(Entity *pokemon, Entity *target)
+bool8 MobileOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     MobileStatusTarget(pokemon, target);
     return TRUE;
 }
 
-bool8 StairsOrbAction(Entity *pokemon, Entity *target)
+bool8 StairsOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     HandleStairsOrb(pokemon, target);
     return TRUE;
 }
 
-bool8 LongtossOrbAction(Entity *pokemon, Entity *target)
+bool8 LongtossOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     LongTossStatusTarget(pokemon, target);
     return TRUE;
 }
 
-bool8 PierceOrbAction(Entity *pokemon, Entity *target)
+bool8 PierceOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4)
 {
     PierceStatusTarget(pokemon, target);
     return TRUE;