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

2019-10-26 10:23:13 -04:00
parent fd78afa5a7 1f569f0136
commit 93f0703fcd
188 changed files with 9474 additions and 26062 deletions
@@ -1916,7 +1916,7 @@ bool8 ScrCmd_checktrainerflag(struct ScriptContext *ctx)
 {
    u16 index = VarGet(ScriptReadHalfword(ctx));

-    ctx->comparisonResult = HasTrainerAlreadyBeenFought(index);
+    ctx->comparisonResult = HasTrainerBeenFought(index);
    return FALSE;
 }