diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
| commit | 31ded7cc6f40876421c7186e15f8a9fa606ff569 (patch) | |
| tree | 831d96edb6d2b4d239affc57ef98d6ccb2f1bccb /include/global.fieldmap.h | |
| parent | 2e789dbbdc18f56cba62aef51156d44136b20632 (diff) | |
| parent | 8e1537fb57dc7ed17079b30f7a3851132cf462bd (diff) | |
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 74a8363bb..e35d900d8 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -1,6 +1,13 @@ #ifndef GUARD_GLOBAL_FIELDMAP_H #define GUARD_GLOBAL_FIELDMAP_H +#define METATILE_COLLISION_MASK 0x0C00 +#define METATILE_ID_MASK 0x03FF +#define METATILE_ID_UNDEFINED 0x03FF +#define METATILE_ELEVATION_SHIFT 12 +#define METATILE_COLLISION_SHIFT 10 +#define METATILE_ELEVATION_MASK 0xF000 + enum { CONNECTION_SOUTH = 1, @@ -19,8 +26,8 @@ struct Tileset /*0x01*/ bool8 isSecondary; /*0x04*/ void *tiles; /*0x08*/ void *palettes; - /*0x0c*/ void *metatiles; - /*0x10*/ void *metatileAttributes; + /*0x0c*/ u16 *metatiles; + /*0x10*/ u16 *metatileAttributes; /*0x14*/ TilesetCB callback; }; |