diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-06-12 19:10:28 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-06-12 19:10:28 -0400 |
| commit | 13a7274a1649a8cb8f3bc165ee1eb403c12430dc (patch) | |
| tree | bf08a44b86a3e5b5ae3200470f16843fa1ce2358 /include/global.fieldmap.h | |
| parent | da3eaf350d8ff4b61ba919a0a987ab2468525b9d (diff) | |
| parent | e09e1da6c252e17cf6db429ad142b05dbf156548 (diff) | |
merge
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 0b72bbec5..a0fe0e6ab 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -63,6 +63,13 @@ struct MapData struct Tileset *secondaryTileset; }; +struct BackupMapData +{ + s32 width; + s32 height; + u16 *map; +}; + struct MapObjectTemplate { /*0x00*/ u8 localId; @@ -153,20 +160,20 @@ struct MapConnections struct MapHeader { - struct MapData *mapData; - struct MapEvents *events; - u8 *mapScripts; - struct MapConnections *connections; - u16 music; - u16 mapDataId; - u8 name; - u8 cave; - u8 weather; + /* 0x00 */ struct MapData *mapData; + /* 0x04 */ struct MapEvents *events; + /* 0x08 */ u8 *mapScripts; + /* 0x0C */ struct MapConnections *connections; + /* 0x10 */ u16 music; + /* 0x12 */ u16 mapDataId; + /* 0x14 */ u8 name; + /* 0x15 */ u8 cave; + /* 0x16 */ u8 weather; /* 0x17 */ u8 mapType; - u8 filler_18; - u8 escapeRope; - u8 flags; - u8 battleType; + /* 0x18 */ u8 filler_18; + /* 0x19 */ u8 escapeRope; + /* 0x1A */ u8 flags; + /* 0x1B */ u8 battleType; }; struct MapObject |