From 5ad282c82c79205045fce2e8d7db993846d86b17 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 11 Sep 2017 10:29:00 -0400
Subject: [PATCH] GetFieldObjectTemplateByLocalIdAndMap

---
 asm/field_map_obj.s | 42 ------------------------------------------
 include/rom4.h      |  1 +
 src/field_map_obj.c | 21 +++++++++++++++++++++
 3 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 5cf4550c36..f3c2929fd7 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,48 +5,6 @@
 
 	.text
 
-	thumb_func_start GetFieldObjectTemplateByLocalIdAndMap
-@ struct FieldObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
-GetFieldObjectTemplateByLocalIdAndMap: @ 808F128
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r1, 24
-	lsrs r3, r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	movs r0, 0x5
-	ldrsb r0, [r1, r0]
-	cmp r0, r3
-	bne _0808F160
-	movs r0, 0x4
-	ldrsb r0, [r1, r0]
-	cmp r0, r2
-	bne _0808F160
-	movs r0, 0xC7
-	lsls r0, 4
-	adds r1, r0
-	ldr r0, =gMapHeader
-	ldr r0, [r0, 0x4]
-	b _0808F16C
-	.pool
-_0808F160:
-	adds r0, r2, 0
-	adds r1, r3, 0
-	bl get_mapheader_by_bank_and_number
-	ldr r0, [r0, 0x4]
-	ldr r1, [r0, 0x4]
-_0808F16C:
-	ldrb r2, [r0]
-	adds r0, r4, 0
-	bl FindFieldObjectTemplateInArrayByLocalId
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end GetFieldObjectTemplateByLocalIdAndMap
-
 	thumb_func_start FindFieldObjectTemplateInArrayByLocalId
 @ struct FieldObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct FieldObjectTemplate *templates, u8 numTemplates)
 FindFieldObjectTemplateInArrayByLocalId: @ 808F17C
diff --git a/include/rom4.h b/include/rom4.h
index 655ce3fde6..0c7b873530 100644
--- a/include/rom4.h
+++ b/include/rom4.h
@@ -25,5 +25,6 @@ struct UCoords32
 extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
 
 void strange_npc_table_clear(void);
+const struct MapHeader *get_mapheader_by_bank_and_number(u8, u8);
 
 #endif //POKEEMERALD_ROM4_H
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index d4f7240798..78269fd589 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -51,6 +51,7 @@ static bool8 FieldObjectDoesZCoordMatch(struct MapObject *, u8);
 //static void CameraObject_0(struct Sprite *);
 /*static*/ void CameraObject_1(struct Sprite *);
 //static void CameraObject_2(struct Sprite *);
+/*static*/ struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count);
 
 // ROM data
 
@@ -1543,3 +1544,23 @@ u8 FieldObjectGetBerryTreeId(u8 mapObjectId)
     return gMapObjects[mapObjectId].trainerRange_berryTreeId;
 }
 
+struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+{
+    struct MapObjectTemplate *templates;
+    const struct MapHeader *mapHeader;
+    u8 count;
+
+    if (gSaveBlock1Ptr->location.mapNum == mapNum && gSaveBlock1Ptr->location.mapGroup == mapGroup)
+    {
+        templates = gSaveBlock1Ptr->mapObjectTemplates;
+        count = gMapHeader.events->mapObjectCount;
+    }
+    else
+    {
+        mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum);
+        templates = mapHeader->events->mapObjects;
+        count = mapHeader->events->mapObjectCount;
+    }
+    return FindFieldObjectTemplateInArrayByLocalId(localId, templates, count);
+}
+