1 files changed, 6 insertions, 8 deletions
diff --git a/include/gym_leader_rematch.h b/include/gym_leader_rematch.h
index 778d7a1e8..dd9ead8b7 100644
--- a/include/gym_leader_rematch.h
+++ b/include/gym_leader_rematch.h
@@ -66,7 +66,7 @@ enum {
     REMATCH_TRENT,
     REMATCH_SAWYER,
     REMATCH_KIRA_AND_DAN,
-    REMATCH_WALLY_3,
+    REMATCH_WALLY_3,  // Entries above WALLY are considered normal trainers, from Wally below are special trainers
     REMATCH_ROXANNE,
     REMATCH_BRAWLY,
     REMATCH_WATTSON,
@@ -75,19 +75,17 @@ enum {
     REMATCH_WINONA,
     REMATCH_TATE_AND_LIZA,
     REMATCH_JUAN,
-
-    // Entries below SIDNEY are considered part of REMATCH_ELITE_FOUR_ENTRIES.
-    REMATCH_SIDNEY,
+    REMATCH_SIDNEY, // Entries below SIDNEY are considered part of REMATCH_ELITE_FOUR_ENTRIES.
     REMATCH_PHOEBE,
     REMATCH_GLACIA,
     REMATCH_DRAKE,
     REMATCH_WALLACE,
-
-    // The total number of rematch entries. This must be the last element
-    // in the enum.
-    REMATCH_TABLE_ENTRIES
+    REMATCH_TABLE_ENTRIES // The total number of rematch entries. Must be last in enum
 };
 
+#define REMATCH_SPECIAL_TRAINER_START   REMATCH_WALLY_3
+#define REMATCH_ELITE_FOUR_ENTRIES      REMATCH_SIDNEY
+
 void UpdateGymLeaderRematch(void);
 
 #endif //GUARD_TRAINER_REMATCH_H