From bd9b81546f4eedae24278b54b02301b8184112a4 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 11 Sep 2017 10:19:03 -0400
Subject: [PATCH] through FieldObjectGetBerryTreeId

---
 asm/field_map_obj.s | 62 ---------------------------------------------
 src/field_map_obj.c | 22 ++++++++++++++++
 2 files changed, 22 insertions(+), 62 deletions(-)

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 3ef34cfd69..5cf4550c36 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,68 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_808F0BC
-sub_808F0BC: @ 808F0BC
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gMapObjects
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrb r0, [r1, 0x7]
-	bx lr
-	.pool
-	thumb_func_end sub_808F0BC
-
-	thumb_func_start sub_808F0D4
-sub_808F0D4: @ 808F0D4
-	push {lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808F108
-	ldr r2, =gMapObjects
-	mov r0, sp
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x1D]
-	b _0808F10A
-	.pool
-_0808F108:
-	movs r0, 0xFF
-_0808F10A:
-	add sp, 0x4
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808F0D4
-
-	thumb_func_start FieldObjectGetBerryTreeId
-@ u8 FieldObjectGetBerryTreeId(u8 fieldObjectId)
-FieldObjectGetBerryTreeId: @ 808F110
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gMapObjects
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrb r0, [r1, 0x1D]
-	bx lr
-	.pool
-	thumb_func_end FieldObjectGetBerryTreeId
-
 	thumb_func_start GetFieldObjectTemplateByLocalIdAndMap
 @ struct FieldObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
 GetFieldObjectTemplateByLocalIdAndMap: @ 808F128
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index b33332661c..d4f7240798 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -1521,3 +1521,25 @@ u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup)
     }
     return gMapObjects[mapObjectId].trainerType;
 }
+
+u8 sub_808F0BC(u8 mapObjectId)
+{
+    return gMapObjects[mapObjectId].trainerType;
+}
+
+u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup)
+{
+    u8 mapObjectId;
+
+    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    {
+        return 0xFF;
+    }
+    return gMapObjects[mapObjectId].trainerRange_berryTreeId;
+}
+
+u8 FieldObjectGetBerryTreeId(u8 mapObjectId)
+{
+    return gMapObjects[mapObjectId].trainerRange_berryTreeId;
+}
+