Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs

1 files changed, 5 insertions, 5 deletions

diff --git a/src/battle_tower.c b/src/battle_tower.c
index c74cfd9a0..f9dfcabd1 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -973,7 +973,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount)
     // Attempt to fill the trainer's party with random Pokemon until 3 have been
     // successfully chosen. The trainer's party may not have duplicate pokemon species
     // or duplicate held items.
-    for (bfMonCount = 0; monSets[bfMonCount] != INVALID_U16; bfMonCount++)
+    for (bfMonCount = 0; monSets[bfMonCount] != 0xFFFF; bfMonCount++)
         ;
     i = 0;
     otID = Random32();
@@ -1081,11 +1081,11 @@ u16 RandomizeFacilityTrainerMonSet(u16 trainerId)
     u8 bfMonCount = 0;
     u32 monSetId = monSets[bfMonCount];
 
-    while (monSetId != INVALID_U16)
+    while (monSetId != 0xFFFF)
     {
         bfMonCount++;
         monSetId = monSets[bfMonCount];
-        if (monSetId == INVALID_U16)
+        if (monSetId == 0xFFFF)
             break;
     }
 
@@ -2641,11 +2641,11 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount)
 
     bfMonCount = 0;
     monSetId = monSets[bfMonCount];
-    while (monSetId != INVALID_U16)
+    while (monSetId != 0xFFFF)
     {
         bfMonCount++;
         monSetId = monSets[bfMonCount];
-        if (monSetId == INVALID_U16)
+        if (monSetId == 0xFFFF)
             break;
     }