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
         }
     }