From e53d5b620f6164861a2e026d3d3736bc05d4fc9e Mon Sep 17 00:00:00 2001
From: "brotenko@gmail.com" <brotenko@gmail.com>
Date: Fri, 12 Feb 2021 22:31:22 +0100
Subject: [PATCH] Decompiled dispatch_event_partner

---
 include/common_structs.h |  6 +++
 include/functions.h      |  2 +
 src/code_1AC760.c        | 93 +++++++++++++++++++++++++++++++++++++---
 3 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/include/common_structs.h b/include/common_structs.h
index 8f712bd2bd..d51945b7d2 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -1723,4 +1723,10 @@ typedef struct {
     /* 0x11630 */ Matrix4s matrixStack[0x200];
 } DisplayContext; // size = 0x19630
 
+// Size and purpose unknown
+typedef struct ScriptOwner {
+    /* 0x000 */ u16 unk_00; // ActorID??
+    /* 0x003 */ u8 unk_03; // ActorPartIndex??
+} ScriptOwner;
+
 #endif
diff --git a/include/functions.h b/include/functions.h
index d73f525ae3..9e5bdf05b4 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -239,4 +239,6 @@ void exec_entity_updatecmd(Entity* entity);
 void func_802D7460(f32 x, f32 y, f32 z, s32 arg3);
 void func_802D74C0(f32 x, f32 y, f32 z, s32 arg3);
 
+void show_damage_popup(f32 x, f32 y, f32 z, s32 damageAmount);
+
 #endif
diff --git a/src/code_1AC760.c b/src/code_1AC760.c
index 559cea7510..7be08adb0d 100644
--- a/src/code_1AC760.c
+++ b/src/code_1AC760.c
@@ -1,7 +1,31 @@
 #include "common.h"
 #include "battle/battle.h"
 
-INCLUDE_ASM(s32, "code_1AC760", dispatch_event_partner);
+//INCLUDE_ASM(s32, "code_1AC760", dispatch_event_partner);
+void dispatch_event_partner(s8 lastEventType) {
+    BattleStatus* battleStatus = &gBattleStatus;
+    s32 temp_ret;
+    Actor* partnerActor = battleStatus->partnerActor;
+    ScriptInstance* onHitScript = partnerActor->onHitScript;
+    ScriptID onHitID = partnerActor->onHitID;
+    ScriptInstance* script;
+
+    partnerActor->lastEventType = lastEventType;
+    script = start_script(partnerActor->onHitCode, 10, 0x20);
+    partnerActor->onHitScript = script;
+    partnerActor->onHitID = script->id;
+    script->owner1.actorID = ActorID_PARTNER;
+
+    if (partnerActor->takeTurnScript != NULL) {
+        kill_script_by_ID(partnerActor->takeTurnID);
+        partnerActor->takeTurnScript = NULL;
+    }
+
+    if (onHitScript != NULL) {
+        kill_script_by_ID(onHitID);
+    }
+}
+
 
 void dispatch_event_partner_continue_turn(s8 lastEventType) {
     BattleStatus* battleStatus = &gBattleStatus;
@@ -35,9 +59,68 @@ s32 dispatch_damage_event_partner_1(s32 damageAmount, s32 event, s32 stopMotion)
     return dispatch_damage_event_partner(damageAmount, event, TRUE);
 }
 
-INCLUDE_ASM(s32, "code_1AC760", MakeOwnerTargetIndex);
+#ifdef NON_MATCHING
+ApiStatus MakeOwnerTargetIndex(ScriptInstance* script, s32 isInitialCall) {
+    s32 temp_v0;
+    s8 targetListLength;
+    Bytecode* args = script->ptrReadPos;
+    Bytecode* temp_s0_2;
+    Actor* actor;
+    SelectableTarget* selectableTarget;
+    s32 temp;
+    s32 outVal;
 
+    temp_s0_2 = *args++;
+    actor = get_actor(script->owner1.actorID);
+    targetListLength = actor->targetListLength;
+    get_variable(script, *args);
+    temp_v0 = get_variable(script, *temp_s0_2);
+    if (targetListLength == 0) {
+        outVal = -1;
+    } else {
+        temp = temp_v0;
+        if (temp_v0 != 0) {
+            temp = temp_v0 - 1;
+            if (temp_v0 >= (s32) targetListLength) {
+                temp = targetListLength - 1;
+            }
+        }
+        selectableTarget = &actor->targetData[actor->targetIndexList[temp]];
+        actor->targetActorID = (u16) selectableTarget->actorID;
+        actor->targetPartIndex = ((u8*)&selectableTarget->partID)[1]; // Should access only lower part of byte
+        outVal = temp;
+    }
+    set_variable(script, *temp_s0_2++, outVal);
+    return ApiStatus_DONE2;
+}
+#else
+INCLUDE_ASM(s32, "code_1AC760", MakeOwnerTargetIndex);
+#endif
+
+#ifdef NON_MATCHING
+ApiStatus func_8027FC90(ScriptInstance* script, s32 isInitialCall) {
+    BattleStatus* battleStatus = &gBattleStatus;
+    s32 hitResult;
+    Actor* actor;
+    Bytecode* args = script->ptrReadPos;
+    s32 outVar = args[0];
+    s32 enemyID = get_variable(script, args[0]);
+
+    if (enemyID == -0x7F) {
+        enemyID = script->owner1.enemyID;
+    }
+
+    actor = get_actor(enemyID);
+    battleStatus->flags1 |= 0x20;
+    hitResult = calc_partner_damage_enemy();
+    show_damage_popup(actor->movePos.goal.x, actor->movePos.goal.y, actor->movePos.goal.z, battleStatus->lastAttackDamage);
+    set_variable(script, outVar, hitResult);
+    
+    return ApiStatus_DONE2;
+}
+#else
 INCLUDE_ASM(s32, "code_1AC760", func_8027FC90);
+#endif
 
 ApiStatus GetActorLevel(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -65,12 +148,12 @@ INCLUDE_ASM(s32, "code_1AC760", PartnerTestEnemy);
 ApiStatus func_8028070C(ScriptInstance* script, s32 isInitialCall) {
     BattleStatus* battleStatus = &gBattleStatus;
     Bytecode* args = script->ptrReadPos;
-    Actor* actorID = get_actor(script->owner1.actorID);
+    Actor* actor = get_actor(script->owner1.actorID);
     s32 damageAmount = get_variable(script, *args++);
     s32 event = get_variable(script, *args++);
     
-    battleStatus->currentTargetID = actorID->targetActorID;
-    battleStatus->currentTargetPart = actorID->targetPartIndex;
+    battleStatus->currentTargetID = actor->targetActorID;
+    battleStatus->currentTargetPart = actor->targetPartIndex;
 
     if (dispatch_damage_event_partner_0(damageAmount, event, battleStatus) >= 0) {
         return does_script_exist_by_ref(script) ? ApiStatus_DONE2 : ApiStatus_BLOCK;