diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 19:54:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 19:54:16 -0500 |
| commit | 7b7f4bb7d6f5d29b40e15aa4c6285c6885359e0d (patch) | |
| tree | 8da3f8fae8c1c165e3435ee079f48631479b7611 /include/global.fieldmap.h | |
| parent | c6207577802db057298917089e427a6ab9e6edf9 (diff) | |
| parent | 8bf4b1a917786c683ac30278108f74d31961274d (diff) | |
Merge pull request #636 from huderlem/assets
Map organization
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 dc8558146..799a12a19 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -53,7 +53,7 @@ struct Tileset /*0x14*/ TilesetCB callback; }; -struct MapData +struct MapLayout { /*0x00*/ s32 width; /*0x04*/ s32 height; @@ -63,7 +63,7 @@ struct MapData /*0x14*/ struct Tileset *secondaryTileset; }; -struct BackupMapData +struct BackupMapLayout { s32 width; s32 height; @@ -157,12 +157,12 @@ struct MapConnections struct MapHeader { - /* 0x00 */ struct MapData *mapData; + /* 0x00 */ struct MapLayout *mapLayout; /* 0x04 */ struct MapEvents *events; /* 0x08 */ u8 *mapScripts; /* 0x0C */ struct MapConnections *connections; /* 0x10 */ u16 music; - /* 0x12 */ u16 mapDataId; + /* 0x12 */ u16 mapLayoutId; /* 0x14 */ u8 regionMapSectionId; /* 0x15 */ u8 cave; /* 0x16 */ u8 weather; |