diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-03 15:40:14 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-03 15:40:14 -0400 |
commit | f6c10b27e4a605ba6ab4a18d49a628daa43e7963 (patch) | |
tree | 44400108becac5811454198d4f39c7791c098beb /include/link.h | |
parent | 14954c546383611dde2a944b2dfc49ad4e5c9b50 (diff) | |
parent | 83cdfb52f7c9695d2d14084ae00b0daa1b23da41 (diff) |
Merge remote-tracking branch 'origin/master' into doc_tileset_anims
Diffstat (limited to 'include/link.h')
-rw-r--r-- | include/link.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/link.h b/include/link.h index 564180b2b..7747bd7a9 100644 --- a/include/link.h +++ b/include/link.h @@ -127,7 +127,10 @@ struct LinkPlayer /* 0x00 */ u16 version; /* 0x02 */ u16 lp_field_2; /* 0x04 */ u32 trainerId; - /* 0x08 */ u8 name[11]; + /* 0x08 */ u8 name[PLAYER_NAME_LENGTH + 1]; + /* 0x10 */ u8 progressFlags; // (& 0x0F) is hasNationalDex, (& 0xF0) is hasClearedGame + /* 0x11 */ u8 neverRead; + /* 0x12 */ u8 progressFlagsCopy; /* 0x13 */ u8 gender; /* 0x14 */ u32 linkType; /* 0x18 */ u16 id; // battle bank in battles @@ -277,7 +280,7 @@ void CreateWirelessStatusIndicatorSprite(u8, u8); void sub_8009FE8(void); void ClearLinkCallback_2(void); void Rfu_SetLinkStandbyCallback(void); -void IntlConvertLinkPlayerName(struct LinkPlayer * linkPlayer); +void ConvertLinkPlayerName(struct LinkPlayer * linkPlayer); bool8 IsWirelessAdapterConnected(void); bool8 Link_PrepareCmd0xCCCC_Rfu0xA100(u8 blockRequestType); void LinkVSync(void); |