finish decompiling link NPC code

1 files changed, 66 insertions, 46 deletions

diff --git a/include/fieldmap.h b/include/fieldmap.h
index a7a45218d..44f31d5a4 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -57,21 +57,21 @@ struct WarpEvent
 
 struct CoordEvent
 {
-	s16 x, y;
-	u8 filler_4[0x2];
-	u16 trigger;
-	u16 index;
-	u8 filler_A[0x2];
-	u8 *script;
+    s16 x, y;
+    u8 filler_4[0x2];
+    u16 trigger;
+    u16 index;
+    u8 filler_A[0x2];
+    u8 *script;
 };
 
 struct BgEvent
 {
-	s16 x, y;
-	u8 filler_4;
-	u8 kind;
-	s16 filler_6;
-	u8 *script;
+    s16 x, y;
+    u8 filler_4;
+    u8 kind;
+    s16 filler_6;
+    u8 *script;
 };
 
 struct MapEvents
@@ -121,41 +121,61 @@ struct MapHeader
 
 struct MapObject
 {
-    u32 active:1;
-    u32 mapobj_bit_1:1;
-    u32 mapobj_bit_2:1;
-    u32 mapobj_bit_3:1;
-    u32 mapobj_bit_4:1;
-    u32 mapobj_bit_5:1;
-    u32 mapobj_bit_6:1;
-    u32 mapobj_bit_7:1;
-    u32 mapobj_bit_8:1;
-    u32 mapobj_bit_9:1;
-    u32 mapobj_bit_10:1;
-    u32 mapobj_bit_11:1;
-    u32 mapobj_bit_12:1;
-    u32 mapobj_bit_13:1;
-    u32 mapobj_bit_14:1;
-    u32 mapobj_bit_15:1;
-    u32 mapobj_bit_16:1;
-    u32 mapobj_bit_17:1;
-    u32 mapobj_bit_18:1;
-    u32 mapobj_bit_19:1;
-    u32 mapobj_bit_20:1;
-    u32 mapobj_bit_21:1;
-    u32 mapobj_bit_22:1;
-    u32 mapobj_bit_23:1;
-    u32 mapobj_bit_24:1;
-    u32 mapobj_bit_25:1;
-    u32 mapobj_bit_26:1;
-    u32 mapobj_bit_27:1;
-    u32 mapobj_bit_28:1;
-    u32 mapobj_bit_29:1;
-    u32 mapobj_bit_30:1;
-    u32 mapobj_bit_31:1;
-    u8 spriteId;
-    u8 graphicsId;
-    u8 filler[0x1E];
+    /*0x00*/ u32 active:1;
+             u32 mapobj_bit_1:1;
+             u32 mapobj_bit_2:1;
+             u32 mapobj_bit_3:1;
+             u32 mapobj_bit_4:1;
+             u32 mapobj_bit_5:1;
+             u32 mapobj_bit_6:1;
+             u32 mapobj_bit_7:1;
+    /*0x01*/ u32 mapobj_bit_8:1;
+             u32 mapobj_bit_9:1;
+             u32 mapobj_bit_10:1;
+             u32 mapobj_bit_11:1;
+             u32 mapobj_bit_12:1;
+             u32 mapobj_bit_13:1;
+             u32 mapobj_bit_14:1;
+             u32 mapobj_bit_15:1;
+    /*0x02*/ u32 mapobj_bit_16:1;
+             u32 mapobj_bit_17:1;
+             u32 mapobj_bit_18:1;
+             u32 mapobj_bit_19:1;
+             u32 mapobj_bit_20:1;
+             u32 mapobj_bit_21:1;
+             u32 mapobj_bit_22:1;
+             u32 mapobj_bit_23:1;
+    /*0x03*/ u32 mapobj_bit_24:1;
+             u32 mapobj_bit_25:1;
+             u32 mapobj_bit_26:1;
+             u32 mapobj_bit_27:1;
+             u32 mapobj_bit_28:1;
+             u32 mapobj_bit_29:1;
+             u32 mapobj_bit_30:1;
+             u32 mapobj_bit_31:1;
+    /*0x04*/ u8 spriteId;
+    /*0x05*/ u8 graphicsId;
+    /*0x06*/ u8 animPattern;
+    /*0x07*/ u8 trainerType;
+    /*0x08*/ u8 localId;
+    /*0x09*/ u8 mapNum;
+    /*0x0A*/ u8 mapGroup;
+    /*0x0B*/ u8 mapobj_unk_0B_0:4;
+             u8 elevation:4;
+    /*0x0C*/ struct Coords16 coords1;
+    /*0x10*/ struct Coords16 coords2;
+    /*0x14*/ struct Coords16 coords3;
+    /*0x18*/ u8 mapobj_unk_18;
+    /*0x19*/ u8 mapobj_unk_19;
+    /*0x1A*/ u8 mapobj_unk_1A;
+    /*0x1B*/ u8 mapobj_unk_1B;
+    /*0x1C*/ u8 mapobj_unk_1C;
+    /*0x1D*/ u8 trainerRange_berryTreeId;
+    /*0x1E*/ u8 mapobj_unk_1E;
+    /*0x1E*/ u8 mapobj_unk_1F;
+    /*0x20*/ u8 mapobj_unk_20;
+    /*0x21*/ u8 mapobj_unk_21;
+    /*size = 0x24*/
 };
 
 struct MapObjectGraphicsInfo