unref_sub_808E504

asm/field_map_obj.s

@@ -5,40 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_808E504
-sub_808E504: @ 808E504
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	lsls r3, 24
-	lsrs r4, r3, 24
-	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808E538
-	mov r0, sp
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gMapObjects
-	adds r0, r1
-	adds r1, r4, 0
-	bl FieldObjectSetGraphicsId
-_0808E538:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808E504
-
 	thumb_func_start FieldObjectTurn
 @ void FieldObjectTurn(struct npc_state *fieldObject, u8 direction)
 FieldObjectTurn: @ 808E544

include/field_map_obj.h

@@ -33,6 +33,7 @@ u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
 u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
 void sub_8093038(s16, s16, s16 *, s16 *);
 void CameraObjectReset1(void);
+void FieldObjectSetGraphicsId(struct MapObject *, u8);
 
 // Exported data declarations
 

src/field_map_obj.c

@@ -782,7 +782,7 @@ static void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject)
     right = gSaveBlock1Ptr->pos.x + 17;
     top = gSaveBlock1Ptr->pos.y;
     bottom = gSaveBlock1Ptr->pos.y + 16;
-    
+
     if (mapObject->coords2.x >= left && mapObject->coords2.x <= right
         && mapObject->coords2.y >= top && mapObject->coords2.y <= bottom)
         return;
@@ -943,3 +943,13 @@ void FieldObjectSetGraphicsId(struct MapObject *mapObject, u8 graphicsId)
         CameraObjectReset1();
     }
 }
+
+void unref_sub_808E504(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId)
+{
+    u8 mapObjectId;
+
+    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    {
+        FieldObjectSetGraphicsId(&gMapObjects[mapObjectId], graphicsId);
+    }
+}