diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-06 10:48:51 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-06 10:48:51 -0400 |
| commit | 1087d1c8227fbcdb768bc96b96c969dd2c9cb598 (patch) | |
| tree | c72ba738fc6cf4556b8016410b466edb5aef85a5 /include | |
| parent | f15191bfc28effef4155b26186bd4236182b88aa (diff) | |
GetFieldObjectIdByLocalIdAndMapInternal; rename gUnknown_02037350 to gMapObjects
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_map_obj.h | 2 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 4 |
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; |