Decomped ShouldMonsterFollowLeader

Author: AnonymousRandomPerson

asm/include/overlay_29_023082A0.inc renamed to asm/include/overlay_29_023082C4.inc

@@ -1,5 +1,4 @@
 #pragma once
 .public CanTargetEntity
-.public DoesTacticFollowLeader
 .public GetLeader
 .public GetTreatmentBetweenMonsters

asm/overlay_29_023082A0.s renamed to asm/overlay_29_023082C4.s

@@ -1,21 +1,8 @@
 	.include "asm/macros.inc"
-	.include "overlay_29_023082A0.inc"
+	.include "overlay_29_023082C4.inc"
 
 	.text
 
-	arm_func_start ShouldMonsterFollowLeader
-ShouldMonsterFollowLeader: ; 0x023082A0
-	stmdb sp!, {r3, lr}
-	ldr r1, [r0, #0xb4]
-	ldrb r0, [r1, #6]
-	cmp r0, #0
-	movne r0, #0
-	ldmneia sp!, {r3, pc}
-	ldrb r0, [r1, #0xa8]
-	bl DoesTacticFollowLeader
-	ldmia sp!, {r3, pc}
-	arm_func_end ShouldMonsterFollowLeader
-
 	arm_func_start GetLeaderIfVisible
 GetLeaderIfVisible: ; 0x023082C4
 	stmdb sp!, {r3, r4, r5, lr}

include/dungeon_ai_leader.h

@@ -0,0 +1,12 @@
+#ifndef PMDSKY_DUNGEON_AI_LEADER_H
+#define PMDSKY_DUNGEON_AI_LEADER_H
+
+#include "dungeon_mode.h"
+
+// Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity).
+bool8 EntityIsValid__0230827C(struct entity *entity);
+// Checks if the monster should follow the leader. Always returns false for enemy monsters.
+// This function may actually be should monster target leader position.
+bool8 ShouldMonsterFollowLeader(struct entity *monster);
+
+#endif //PMDSKY_DUNGEON_AI_LEADER_H

include/overlay_29_0230827C.h

@@ -499,8 +499,8 @@ Overlay OVY_29
 	Object asm/overlay_29_02305C28.o
 	Object src/overlay_29_02307EF8.o
 	Object asm/overlay_29_02307F4C.o
-	Object src/overlay_29_0230827C.o
-	Object asm/overlay_29_023082A0.o
+	Object src/dungeon_ai_leader.o
+	Object asm/overlay_29_023082C4.o
 	Object src/dungeon_ai.o
 	Object asm/overlay_29_023085DC.o
 	Object src/overlay_29_02308FBC.o

main.lsf

@@ -0,0 +1,20 @@
+#include "dungeon_ai_leader.h"
+#include "dungeon_util_static.h"
+
+extern bool8 DoesTacticFollowLeader(enum tactic_id tactic_id);
+
+bool8 EntityIsValid__0230827C(struct entity *entity)
+{
+    if (entity == NULL)
+        return FALSE;
+
+    return GetEntityType(entity) != ENTITY_NOTHING;
+}
+
+bool8 ShouldMonsterFollowLeader(struct entity *monster)
+{
+    if (GetEntInfo(monster)->is_not_team_member)
+        return FALSE;
+
+    return DoesTacticFollowLeader(GetEntInfo(monster)->tactic);
+}

src/dungeon_ai_leader.c

@@ -2,6 +2,7 @@
 #include "dg_camera.h"
 #include "dg_random.h"
 #include "dungeon_action.h"
+#include "dungeon_ai_leader.h"
 #include "dungeon_ai_targeting.h"
 #include "dungeon_ai_targeting_1.h"
 #include "dungeon_capabilities_1.h"
@@ -19,7 +20,6 @@
 #include "number_util.h"
 #include "overlay_29_022E1610.h"
 #include "overlay_29_022FA430.h"
-#include "overlay_29_0230827C.h"
 #include "overlay_29_02348D00.h"
 #include "position_util.h"
 
@@ -48,7 +48,6 @@ const s32 FACING_DIRECTION_INCREMENTS[] = {0, 1, -1, 2, -2, 3, -3, 4};
 
 extern bool8 CanTargetEntity(struct entity *user, struct entity *target);
 extern bool8 CanTargetPosition(struct entity *monster, struct position *position);
-extern bool8 ShouldMonsterFollowLeader(struct entity *monster);
 extern bool8 IsPositionWithinTwoTiles(struct position *origin, struct position *target);
 extern s32 ov29_022FBE04(struct monster*);
 extern bool8 CanMoveThroughWalls(struct entity *monster);