wild encounter, fix merge conflicts

2017-11-18 21:45:52 +01:00
parent f8b40754c7 5dc8beb034
commit 3de416662b
59 changed files with 4681 additions and 7626 deletions
--- a/include/link.h
+++ b/include/link.h
@@ -68,7 +68,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;
 };