summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/field_map_obj.h2
-rw-r--r--include/global.fieldmap.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 3100f72ff..93a90d2c8 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -5,8 +5,6 @@
// Exported RAM declarations
-extern struct MapObject gUnknown_02037350[16];
-
// Exported ROM declarations
void sub_808D438(void);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 4029132e8..3e0c7729a 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -1,6 +1,8 @@
#ifndef GUARD_GLOBAL_FIELDMAP_H
#define GUARD_GLOBAL_FIELDMAP_H
+#define NUM_FIELD_OBJECTS 16
+
enum
{
CONNECTION_SOUTH = 1,
@@ -381,7 +383,7 @@ struct Camera
s32 y;
};
-extern struct MapObject gMapObjects[];
+extern struct MapObject gMapObjects[NUM_FIELD_OBJECTS];
extern u8 gSelectedMapObject;
extern struct MapHeader gMapHeader;
extern struct PlayerAvatar gPlayerAvatar;