diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-19 22:58:13 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-19 22:58:13 +0100 |
| commit | ad3a97e178b93c38b1d43f8120449b042ac23a0e (patch) | |
| tree | 1c0e790d275ae85cc82360406fd2e655ae262d1f /include/link.h | |
| parent | a3b5af17eabb255e983e61c6306e30f27de82524 (diff) | |
| parent | 5dc8beb034e70b4e1eba61cca4009d5e06356605 (diff) | |
berry blender 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 b3f7c8d60..a693e80a6 100644 --- 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; }; |