From 6f9ad223a51eab0a2d39296c963486689392d0b5 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 10 Sep 2017 16:21:30 -0500
Subject: stuff

---
 src/scrcmd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 1cacb7348..813e041e1 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1578,7 +1578,7 @@ bool8 ScrCmd_updatecoins(struct ScriptContext *ctx)
 
 bool8 ScrCmd_trainerbattle(struct ScriptContext *ctx)
 {
-    ctx->scriptPtr = TrainerBattleConfigure(ctx->scriptPtr);
+    ctx->scriptPtr = BattleSetup_ConfigureTrainerBattle(ctx->scriptPtr);
     return FALSE;
 }
 
@@ -1603,7 +1603,7 @@ bool8 ScrCmd_endtrainerbattle2(struct ScriptContext *ctx)
 bool8 ScrCmd_checktrainerflag(struct ScriptContext *ctx)
 {
     u16 index = VarGet(ScriptReadHalfword(ctx));
-    ctx->comparisonResult = trainer_flag_check(index);
+    ctx->comparisonResult = HasTrainerAlreadyBeenFought(index);
     return FALSE;
 }
 
@@ -1632,7 +1632,7 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
 
 bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx)
 {
-    StartBattle_ScriptedWild();
+    BattleSetup_StartScriptedWildBattle();
     ScriptContext1_Stop();
     return TRUE;
 }
-- 
cgit v1.2.3