diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-23 10:24:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 10:24:11 -0500 |
| commit | a01d83a4341cd0cdad01fe2d0b96920301257f2a (patch) | |
| tree | ac4f4ce6086d4664ea49d515759a8044ecd1d973 /src/link_rfu_3.c | |
| parent | e7cd8c59f4ca0f6c56a3b3782c21e896c203694e (diff) | |
| parent | 91099dbd0c451188742bf045a26a036e0e8d9f89 (diff) | |
Merge branch 'master' into sync-ai
Diffstat (limited to 'src/link_rfu_3.c')
| -rw-r--r-- | src/link_rfu_3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/link_rfu_3.c b/src/link_rfu_3.c index 87197f57f..31ea0830b 100644 --- a/src/link_rfu_3.c +++ b/src/link_rfu_3.c @@ -603,7 +603,7 @@ static u8 GetConnectedChildStrength(u8 maxFlags) } #endif -void InitHostRFUtgtGname(struct GFtgtGname *data, u8 r9, bool32 r2, s32 r3) +void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 r2, s32 r3) { s32 i; @@ -617,7 +617,7 @@ void InitHostRFUtgtGname(struct GFtgtGname *data, u8 r9, bool32 r2, s32 r3) r3 >>= 8; } data->playerGender = gSaveBlock2Ptr->playerGender; - data->unk_0a_0 = r9; + data->unk_0a_0 = activity; data->unk_0a_7 = r2; data->unk_00.unk_00_0 = GAME_LANGUAGE; data->unk_00.unk_01_2 = GAME_VERSION; @@ -681,7 +681,7 @@ bool8 sub_80FCCF4(struct GFtgtGname *gname, u8 *uname, u8 idx) return retVal; } -void sub_80FCD50(struct GFtgtGname *gname, u8 *uname) +void LinkRfu3_SetGnameUnameFromStaticBuffers(struct GFtgtGname *gname, u8 *uname) { memcpy(gname, &gHostRFUtgtGnameBuffer, RFU_GAME_NAME_LENGTH); memcpy(uname, gHostRFUtgtUnameBuffer, RFU_USER_NAME_LENGTH); @@ -929,7 +929,7 @@ void RecordMixTrainerNames(void) } } -bool32 sub_80FD338(u16 id, u8 *name) +bool32 PlayerHasMetTrainerBefore(u16 id, u8 *name) { s32 i; |