From a500cfc5facbc262757b902c9b0b82a4a1821d3f Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 27 Jan 2017 15:58:28 -0600 Subject: start decompiling more of field_map_obj --- include/global.fieldmap.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'include/global.fieldmap.h') diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 5c498de49..6f9ba8a94 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -66,12 +66,17 @@ 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*/ u16 unkA_0:4; + u16 unkA_4:4; + ///*0x0B*/ u8 fillerB[1]; + /*0x0C*/ u16 unkC; + /*0x0E*/ u16 unkE; /*0x10*/ u8 *script; /*0x14*/ u8 filler_14[0x4]; }; /*size = 0x18*/ -- cgit v1.2.3 From c4c0e1d7d5630987b6d5f7f4522fc49f29bcbad5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 28 Jan 2017 21:23:50 -0600 Subject: decompile some more --- include/global.fieldmap.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include/global.fieldmap.h') diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 6f9ba8a94..536e08cb3 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -72,13 +72,14 @@ struct MapObjectTemplate /*0x06*/ s16 y; /*0x08*/ u8 elevation; /*0x09*/ u8 movementType; - /*0x0A*/ u16 unkA_0:4; - u16 unkA_4:4; + /*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 -- cgit v1.2.3