diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
| commit | e130a00cdf69c58dbff8e98a69559aeb33f87b60 (patch) | |
| tree | e128e502a2229f5d934f0436a0eb31dc86350bbb /include/global.fieldmap.h | |
| parent | ef4c86fbfdd18b78700f61b629907a85579197c0 (diff) | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index a14905cc2..3623737ea 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; - /*0x14*/ TilesetCB callback; - /*0x10*/ void *metatileAttributes; + /*0x10*/ TilesetCB callback; + /*0x14*/ void *metatileAttributes; }; struct MapData |