From 382442c4c8754262c77acb50930df31c63a62355 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 12 Feb 2018 15:01:43 +0100 Subject: start decompiling overworld.s --- src/field_map_obj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/field_map_obj.c') diff --git a/src/field_map_obj.c b/src/field_map_obj.c index 906eff4b7..84613365c 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -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; } -- cgit v1.2.3 From 94b47c0686d3f4c5da962011797cc89a2efdd88c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 14 Feb 2018 00:58:22 +0100 Subject: decompile overworld --- src/field_map_obj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/field_map_obj.c') diff --git a/src/field_map_obj.c b/src/field_map_obj.c index 84613365c..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(); -- cgit v1.2.3