diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-18 21:45:52 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-18 21:45:52 +0100 |
commit | 3de416662b5a83d96cbe010462971ed2c246d70d (patch) | |
tree | 7070ce944c7ef2d46cde333faec6a9930d1399c2 /include/link.h | |
parent | f8b40754c70679bb3ec4c0611613a0658f679225 (diff) | |
parent | 5dc8beb034e70b4e1eba61cca4009d5e06356605 (diff) |
wild encounter, fix merge conflicts
Diffstat (limited to 'include/link.h')
-rw-r--r-- | include/link.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/link.h b/include/link.h index ddd809ebe..ccde9818c 100644 --- 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; }; |