ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix misleading RecordMixTrainerNames name

Browse Source
This commit is contained in:
GriffinR 2021-10-11 10:39:37 -04:00
parent 7c5c41f23c
commit 3a7995bc7c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/link_rfu.h
View File

@ -287,7 +287,7 @@ bool32 WaitRfuState(bool32 force);
void GetOtherPlayersInfoFlags(void); void GetOtherPlayersInfoFlags(void);
void InitializeRfuLinkManager_JoinGroup(void); void InitializeRfuLinkManager_JoinGroup(void);
void SendLeaveGroupNotice(void); void SendLeaveGroupNotice(void);
void RecordMixTrainerNames(void); void SaveLinkTrainerNames(void);
void LinkRfu_CreateConnectionAsParent(void); void LinkRfu_CreateConnectionAsParent(void);
void LinkRfu_StopManagerBeforeEnteringChat(void); void LinkRfu_StopManagerBeforeEnteringChat(void);
void UpdateGameData_SetActivity(u8 activity, u32 partnerInfo, bool32 startedActivity); void UpdateGameData_SetActivity(u8 activity, u32 partnerInfo, bool32 startedActivity);

2
src/link_rfu_3.c
View File

@ -905,7 +905,7 @@ static bool32 NameIsNotEmpty(const u8 *name)
} }
// Save the currently connected players into the trainer records, shifting all previous records down. // Save the currently connected players into the trainer records, shifting all previous records down.
void RecordMixTrainerNames(void) void SaveLinkTrainerNames(void)
{ {
if (gWirelessCommType != 0) if (gWirelessCommType != 0)
{ {

6
src/union_room.c
View File

@ -1649,7 +1649,7 @@ static void Task_StartActivity(u8 taskId)
case ACTIVITY_BERRY_PICK: case ACTIVITY_BERRY_PICK:
case ACTIVITY_SPIN_TRADE: case ACTIVITY_SPIN_TRADE:
case ACTIVITY_RECORD_CORNER: case ACTIVITY_RECORD_CORNER:
RecordMixTrainerNames(); SaveLinkTrainerNames();
break; break;
} }
@ -1762,7 +1762,7 @@ static void Task_RunScriptAndFadeToActivity(u8 taskId)
sendBuff[1] = GetMonData(&gPlayerParty[gSelectedOrderFromParty[1] - 1], MON_DATA_SPECIES, NULL); sendBuff[1] = GetMonData(&gPlayerParty[gSelectedOrderFromParty[1] - 1], MON_DATA_SPECIES, NULL);
gMain.savedCallback = NULL; gMain.savedCallback = NULL;
data[0] = 4; data[0] = 4;
RecordMixTrainerNames(); SaveLinkTrainerNames();
ResetBlockReceivedFlags(); ResetBlockReceivedFlags();
break; break;
case ACTIVITY_BERRY_BLENDER: case ACTIVITY_BERRY_BLENDER:
@ -1771,7 +1771,7 @@ static void Task_RunScriptAndFadeToActivity(u8 taskId)
case ACTIVITY_CONTEST_CUTE: case ACTIVITY_CONTEST_CUTE:
case ACTIVITY_CONTEST_SMART: case ACTIVITY_CONTEST_SMART:
case ACTIVITY_CONTEST_TOUGH: case ACTIVITY_CONTEST_TOUGH:
RecordMixTrainerNames(); SaveLinkTrainerNames();
DestroyTask(taskId); DestroyTask(taskId);
default: default:
EnableBothScriptContexts(); EnableBothScriptContexts();