diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-01-07 18:39:27 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-01-07 18:39:27 -0500 |
| commit | f7eef0735bb70a7fed17b6fabb15f30c092209bc (patch) | |
| tree | 17f9256f07ff23163cf13af85fdc36847549cbbe /include/global.fieldmap.h | |
| parent | f50bc217ae5daeb2c2788f502f604e3684249256 (diff) | |
| parent | 8f7400809626c0f72dfe751665126f94181fd7c1 (diff) | |
Merge branch 'master' into trainer_tower
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index ed5054b7d..b602741a6 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -51,8 +51,8 @@ struct Tileset /*0x04*/ void *tiles; /*0x08*/ void *palettes; /*0x0c*/ void *metatiles; - /*0x10*/ void *metatileAttributes; /*0x14*/ TilesetCB callback; + /*0x10*/ void *metatileAttributes; }; struct MapData @@ -63,12 +63,14 @@ struct MapData /*0x0c*/ u16 *map; /*0x10*/ struct Tileset *primaryTileset; /*0x14*/ struct Tileset *secondaryTileset; + /*0x18*/ u8 unk18; + /*0x19*/ u8 unk19; }; struct BackupMapData { - s32 width; - s32 height; + s32 Xsize; + s32 Ysize; u16 *map; }; @@ -149,9 +151,9 @@ struct MapEvents struct MapConnection { /*0x00*/ u8 direction; - /*0x01*/ u32 offset; - /*0x05*/ u8 mapGroup; - /*0x06*/ u8 mapNum; + /*0x04*/ u32 offset; + /*0x08*/ u8 mapGroup; + /*0x09*/ u8 mapNum; }; struct MapConnections |