diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-28 19:58:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-28 19:58:34 -0800 |
| commit | 047c35d6f1ff8888cd25d449d544ce898e0b9fec (patch) | |
| tree | cbd42a9459031e6bef0dd0e0a5d68ff18c13185d /include/global.fieldmap.h | |
| parent | 347cc310070f8642057ea083db97752668435557 (diff) | |
| parent | c4c0e1d7d5630987b6d5f7f4522fc49f29bcbad5 (diff) | |
Merge pull request #223 from camthesaxman/field_map_obj
decompile more of field_map_obj
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index bf356fecf..d2e2b1bd0 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -66,14 +66,20 @@ struct MapData struct MapObjectTemplate { /*0x00*/ u8 localId; - /*0x01*/ u8 filler_1[0x3]; + /*0x01*/ u8 graphicsId; + /*0x02*/ u8 filler_2[0x2]; /*0x04*/ s16 x; /*0x06*/ s16 y; /*0x08*/ u8 elevation; /*0x09*/ u8 movementType; - /*0x0A*/ u8 filler_A[0x6]; + /*0x0A*/ u8 unkA_0:4; + u8 unkA_4:4; + ///*0x0B*/ u8 fillerB[1]; + /*0x0C*/ u16 unkC; + /*0x0E*/ u16 unkE; /*0x10*/ u8 *script; - /*0x14*/ u8 filler_14[0x4]; + /*0x14*/ u16 unk14; + /*0x16*/ u8 filler_16[2]; }; /*size = 0x18*/ struct WarpEvent |