Merge branch 'master' of github.com:pret/pokefirered into dodrio_berry_picking

1 files changed, 3 insertions, 3 deletions

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 77b87aaa8..3f1927cbf 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1892,7 +1892,7 @@ bool8 ScrCmd_trainerbattle(struct ScriptContext *ctx)
 
 bool8 ScrCmd_dotrainerbattle(struct ScriptContext *ctx)
 {
-    BattleSetup_StartTrainerBattle();
+    StartTrainerBattle();
     return TRUE;
 }
 
@@ -1944,7 +1944,7 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
 
 bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx)
 {
-    BattleSetup_StartScriptedWildBattle();
+    StartScriptedWildBattle();
     ScriptContext1_Stop();
     return TRUE;
 }
@@ -2111,7 +2111,7 @@ bool8 ScrCmd_setmetatile(struct ScriptContext *ctx)
     if (!v8)
         MapGridSetMetatileIdAt(x, y, tileId);
     else
-        MapGridSetMetatileIdAt(x, y, tileId | 0xC00);
+        MapGridSetMetatileIdAt(x, y, tileId | METATILE_COLLISION_MASK);
     return FALSE;
 }