4 files changed, 6 insertions, 6 deletions
diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c
index 947dc3e56..52e66f16e 100644
--- a/src/field/field_control_avatar.c
+++ b/src/field/field_control_avatar.c
@@ -493,7 +493,7 @@ bool8 sub_8068870(u16 a)
 
 bool8 sub_8068894(void)
 {
-    sub_8082B78();
+    IncrementRematchStepCounter();
     happiness_algorithm_step();
     if (overworld_poison_step() == TRUE)
     {
diff --git a/src/field/overworld.c b/src/field/overworld.c
index c4d01f907..e239daec7 100644
--- a/src/field/overworld.c
+++ b/src/field/overworld.c
@@ -600,7 +600,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
     ClearTempFieldEventData();
     ResetCyclingRoadChallengeData();
     prev_quest_postbuffer_cursor_backup_reset();
-    sub_8082BD0(mapGroup, mapNum);
+    TryUpdateRandomTrainerRematches(mapGroup, mapNum);
     DoTimeBasedEvents();
     SetSav1WeatherFromCurrMapHeader();
     ChooseAmbientCrySpecies();
@@ -635,7 +635,7 @@ void sub_8053994(u32 a1)
     ClearTempFieldEventData();
     ResetCyclingRoadChallengeData();
     prev_quest_postbuffer_cursor_backup_reset();
-    sub_8082BD0(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
+    TryUpdateRandomTrainerRematches(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
     if (a1 != 1)
         DoTimeBasedEvents();
     SetSav1WeatherFromCurrMapHeader();
diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c
index d5fc56e8d..05a909e81 100644
--- a/src/field/scrcmd.c
+++ b/src/field/scrcmd.c
@@ -1722,7 +1722,7 @@ bool8 ScrCmd_settrainerflag(struct ScriptContext *ctx)
 {
     u16 index = VarGet(ScriptReadHalfword(ctx));
 
-    trainer_flag_set(index);
+    SetTrainerFlag(index);
     return FALSE;
 }
 
@@ -1730,7 +1730,7 @@ bool8 ScrCmd_cleartrainerflag(struct ScriptContext *ctx)
 {
     u16 index = VarGet(ScriptReadHalfword(ctx));
 
-    trainer_flag_clear(index);
+    ClearTrainerFlag(index);
     return FALSE;
 }
 
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index 400074604..5c53e1e28 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -1197,7 +1197,7 @@ u8 sub_80BCCA4(u8 secretBaseIndex)
         + gSaveBlock1.secretBases[secretBaseIndex].gender * 5;
 }
 
-const u8 *sub_80BCCE8(void)
+const u8 *GetSecretBaseTrainerLoseText(void)
 {
     u8 param = sub_80BCCA4(VarGet(VAR_CURRENT_SECRET_BASE));
     if (param == 0) return UnknownString_81A1BB2;