diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-10 14:13:41 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-10 14:13:41 -0500 |
| commit | 6645ad8ccf92b74cb00098601a4dafcc8349de62 (patch) | |
| tree | c797b65413a0b5e8e5fb25d8d3d34353b450c568 /include | |
| parent | 30f74d1c371dbf324a28613554ee9027c4918dd6 (diff) | |
| parent | 7526b2ccf1ab02a975ee477341f8accbf3f108c5 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen
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 |