diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-10 17:41:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 17:41:08 -0500 |
| commit | 8da7a94423b11f52a1e9ea74df3ec0e6f16e96d0 (patch) | |
| tree | b2d603e8b2bb2a16bbfa58e4e56cbe40571e6624 /include | |
| parent | b93101bbebaae9be44b9b4ada81766264135cca9 (diff) | |
| parent | 49b56d01364cbe3cb3ce1e7df39c41a1fd1d3147 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'include')
| -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 82ffc8530..5b12568fd 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -59,8 +59,8 @@ struct ObjectEventTemplate /*0x06*/ s16 y; /*0x08*/ u8 elevation; /*0x09*/ u8 movementType; - /*0x0A*/ u8 movementRangeX:4; - u8 movementRangeY:4; + /*0x0A*/ u16 movementRangeX:4; + u16 movementRangeY:4; /*0x0C*/ u16 trainerType; /*0x0E*/ u16 trainerRange_berryTreeId; /*0x10*/ const u8 *script; |