Merge branch 'master' of https://github.com/pret/pokeemerald into intro

1 files changed, 2 insertions, 2 deletions

diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 906eff4b7..a5be62442 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -198,7 +198,7 @@ static void npcs_clear_ids_and_state(void)
 
 void sub_808D438(void)
 {
-    strange_npc_table_clear();
+    ZeroAllLinkPlayerMapObjects();
     npcs_clear_ids_and_state();
     ClearPlayerAvatarInfo();
     sub_808D450();
@@ -1673,7 +1673,7 @@ struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 m
     }
     else
     {
-        mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum);
+        mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum);
         templates = mapHeader->events->mapObjects;
         count = mapHeader->events->mapObjectCount;
     }