diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-12-11 02:42:38 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-12-11 02:47:33 +0800 |
| commit | c609b533d46fc95ef3473abdcb0f9dcf11260066 (patch) | |
| tree | f3a4b77ec43892162ba5ea7636ecd746aa58c076 /include | |
| parent | 764b19b470edcd7a7cebe46d730091ecf68bebd3 (diff) | |
sub_815A1F8
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.fieldmap.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 70e806266..186185104 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -62,13 +62,12 @@ struct MapObjectTemplate /*0x06*/ s16 y; /*0x08*/ u8 elevation; /*0x09*/ u8 movementType; - /*0x0A*/ union MapObjectRange range; - ///*0x0B*/ u8 fillerB[1]; - /*0x0C*/ u16 unkC; - /*0x0E*/ u16 unkE; + /*0x0A*/ u16 movementRangeX:4; + u16 movementRangeY:4; + /*0x0C*/ u16 trainerType; + /*0x0E*/ u16 trainerRange_berryTreeId; /*0x10*/ const u8 *script; /*0x14*/ u16 flagId; - /*0x16*/ u8 filler_16[2]; }; /*size = 0x18*/ struct WarpEvent |