callers of callers of sub_80940C4

2 files changed, 18 insertions, 34 deletions

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 980edf29c..a0d55e64c 100755
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,40 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80941B0
-sub_80941B0: @ 80941B0
-	push {lr}
-	bl sub_8094188
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xFF
-	beq _080941C2
-	movs r0, 0
-	b _080941C4
-_080941C2:
-	movs r0, 0x1
-_080941C4:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80941B0
-
-	thumb_func_start sub_80941C8
-sub_80941C8: @ 80941C8
-	push {lr}
-	bl sub_809419C
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xFF
-	beq _080941DA
-	movs r0, 0
-	b _080941DC
-_080941DA:
-	movs r0, 0x1
-_080941DC:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80941C8
-
 	thumb_func_start sub_80941E0
 sub_80941E0: @ 80941E0
 	push {r4,r5,lr}
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 7ef901eec..bc8c7512d 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -4326,3 +4326,21 @@ u8 sub_809419C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     return sub_80940C4(mapObject, sprite, sub_80978E4);
 }
+
+bool8 sub_80941B0(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (sub_8094188(mapObject, sprite) == 0xFF)
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 sub_80941C8(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (sub_809419C(mapObject, sprite) == 0xFF)
+    {
+        return TRUE;
+    }
+    return FALSE;
+}