berry blender merge conflicts

2017-11-19 22:58:13 +01:00
parent a3b5af17ea 5dc8beb034
commit ad3a97e178
16 changed files with 1777 additions and 2892 deletions
--- a/include/link.h
+++ b/include/link.h
@@ -69,7 +69,7 @@ struct LinkPlayer
    /* 0x08 */ u8 name[11];
    /* 0x13 */ u8 gender;
    /* 0x14 */ u32 linkType;
-    /* 0x18 */ u16 lp_field_18;
+    /* 0x18 */ u16 lp_field_18; // battle bank in battles
    /* 0x1A */ u16 language;
 };