From 4c10f3f4651d6ac523eaabf34c20614b3cf03df8 Mon Sep 17 00:00:00 2001
From: Kurausukun <lord.uber1@gmail.com>
Date: Sun, 25 Oct 2020 23:55:38 -0400
Subject: [PATCH] port GetFrontierOpponentClass fakematch fix

---
 src/battle_tower.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/battle_tower.c b/src/battle_tower.c
index 0333c4397d..9d632b444a 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -1447,7 +1447,7 @@ u8 GetFrontierOpponentClass(u16 trainerId)
     }
     else if (trainerId == TRAINER_FRONTIER_BRAIN)
     {
-        trainerClass = GetFrontierBrainTrainerClass();
+        return GetFrontierBrainTrainerClass();
     }
     else if (trainerId == TRAINER_STEVEN_PARTNER)
     {
@@ -1466,9 +1466,6 @@ u8 GetFrontierOpponentClass(u16 trainerId)
         else
         {
             trainerClass = gFacilityClassToTrainerClass[gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].facilityClass];
-            #ifndef NONMATCHING
-                asm("");
-            #endif
         }
     }
     else
@@ -1480,9 +1477,6 @@ u8 GetFrontierOpponentClass(u16 trainerId)
         else
         {
             trainerClass = gFacilityClassToTrainerClass[gApprentices[gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id].facilityClass];
-            #ifndef NONMATCHING
-                asm("");
-            #endif
         }
     }