diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-10 20:43:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 20:43:27 -0500 |
| commit | 47b0d8a5970a75862279bde9d19a06c3d7f96eee (patch) | |
| tree | 462ebc6e6bce61be28d862cd89c8bec08ebfa61e /include/global.fieldmap.h | |
| parent | 77bf40d32b7bbab40db36030399586430ae57010 (diff) | |
| parent | 49f1a90534180445d293761e2bdac165b49319a2 (diff) | |
Merge branch 'master' into doc-matchcall
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 de08fd1ec..e6421f37c 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -59,8 +59,8 @@ struct EventObjectTemplate /*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; |