Merge branch 'master' into fix-eventobj

2019-12-10 17:41:08 -05:00
parent b93101bbeb 49b56d0136
commit 8da7a94423
2 changed files with 8 additions and 168 deletions
--- 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;