diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-04 11:11:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 11:11:45 -0400 |
| commit | e06b63efc9ea39875b17f00e5ff20c2e0fcb0415 (patch) | |
| tree | e8d37347ae000823943ef57973dc34dd98633b40 /include/global.fieldmap.h | |
| parent | 9acd55ae4f9e455a92765aaee5929240097f9f8f (diff) | |
| parent | efebc51972b23ddffa2700b1dd6895d4728646a3 (diff) | |
Merge pull request #1 from pret/master
synching with source repo
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 7b38f9ddc..5b2944a2b 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -55,7 +55,7 @@ struct Tileset /*0x14*/ TilesetCB callback; }; -struct MapData +struct MapLayout { /*0x00*/ s32 width; /*0x04*/ s32 height; @@ -65,7 +65,7 @@ struct MapData /*0x14*/ struct Tileset *secondaryTileset; }; -struct BackupMapData +struct BackupMapLayout { s32 width; s32 height; @@ -160,12 +160,12 @@ struct MapConnections struct MapHeader { - /* 0x00 */ const struct MapData *mapData; + /* 0x00 */ const struct MapLayout *mapLayout; /* 0x04 */ const struct MapEvents *events; /* 0x08 */ const u8 *mapScripts; /* 0x0C */ const struct MapConnections *connections; /* 0x10 */ u16 music; - /* 0x12 */ u16 mapDataId; + /* 0x12 */ u16 mapLayoutId; /* 0x14 */ u8 regionMapSectionId; /* 0x15 */ u8 cave; /* 0x16 */ u8 weather; |