diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-11 10:34:51 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-11 10:56:14 -0500 |
| commit | eb8dbff4a783e880d950be73963e523c86a54615 (patch) | |
| tree | 0f4b63177727fa9c5db911a99bc076edbc93e056 /include/global.fieldmap.h | |
| parent | 73327f0d44195f26d1af8b894326e1b98b609681 (diff) | |
Move event_object_movement_helpers into event_object_movement
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 06f3cebb2..fa142e4fe 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -81,14 +81,12 @@ struct MapObjectTemplate /*0x06*/ s16 y; /*0x08*/ u8 elevation; /*0x09*/ u8 movementType; - /*0x0A*/ u8 unkA_0:4; - u8 unkA_4:4; - ///*0x0B*/ u8 fillerB[1]; - /*0x0C*/ u16 unkC; - /*0x0E*/ u16 unkE; + /*0x0A*/ u8 movementRangeX:4; + u8 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 |