Decomped IsMonsterMuzzled

asm/overlay_29_02300618.s

@@ -1,19 +1,8 @@
 	.include "asm/macros.inc"
-	.include "overlay_29_023005FC.inc"
+	.include "overlay_29_02300618.inc"
 
 	.text
 
-	arm_func_start IsMonsterMuzzled
-IsMonsterMuzzled: ; 0x023005FC
-	ldr r0, [r0, #0xb4]
-	ldrb r0, [r0, #0xf3]
-	cmp r0, #1
-	moveq r0, #1
-	movne r0, #0
-	and r0, r0, #0xff
-	bx lr
-	arm_func_end IsMonsterMuzzled
-
 	arm_func_start MonsterHasMiracleEyeStatus
 MonsterHasMiracleEyeStatus: ; 0x02300618
 	ldr r0, [r0, #0xb4]

include/dungeon_logic_0.h

@@ -21,5 +21,7 @@ bool8 MonsterHasLeechSeedStatus(struct entity *monster);
 bool8 MonsterHasWhifferStatus(struct entity *monster);
 // Checks if a monster's vision is impaired somehow. This includes the checks in IsBlinded, as well as STATUS_CROSS_EYED and STATUS_DROPEYE.
 bool8 IsMonsterVisuallyImpaired(struct entity *monster, bool8 check_held_item);
+// Checks if a monster has the muzzled status.
+bool8 IsMonsterMuzzled(struct entity *monster);
 
 #endif //PMDSKY_DUNGEON_LOGIC_0_H

main.lsf

@@ -297,7 +297,7 @@ Overlay OVY_29
 	Object src/overlay_29_023000E4.o
 	Object asm/overlay_29_02300108.o
 	Object src/dungeon_logic_0.o
-	Object asm/overlay_29_023005FC.o
+	Object asm/overlay_29_02300618.o
 	Object src/dungeon_logic.o
 	Object asm/overlay_29_023007A8.o
 	Object src/dungeon_capabilities.o

src/dungeon_logic.c

@@ -2,7 +2,6 @@
 #include "dungeon_logic_0.h"
 #include "dungeon_util_static.h"
 
-extern bool8 IsMonsterMuzzled(struct entity *monster);
 extern bool8 MonsterHasMiracleEyeStatus(struct entity *monster);
 
 bool8 MonsterHasNegativeStatus(struct entity *monster, bool8 check_held_item)

src/dungeon_logic_0.c

@@ -83,3 +83,11 @@ bool8 IsMonsterVisuallyImpaired(struct entity *monster, bool8 check_held_item)
 
     return FALSE;
 }
+
+bool8 IsMonsterMuzzled(struct entity *monster)
+{
+    if (GetEntInfo(monster)->muzzled == 1)
+        return TRUE;
+
+    return FALSE;
+}