diff --git a/src/data/contest_opponents.h b/src/data/contest_opponents.h
index 19019be918..7c3aad3151 100644
--- a/src/data/contest_opponents.h
+++ b/src/data/contest_opponents.h
@@ -2,102 +2,104 @@
 #include "global.h"
 #include "contest.h"
 
-#define CONTEST_OPPONENT_JIMMY 0
-#define CONTEST_OPPONENT_EDITH 1
-#define CONTEST_OPPONENT_EVAN 2
-#define CONTEST_OPPONENT_KELSEY 3
-#define CONTEST_OPPONENT_MADISON 4
-#define CONTEST_OPPONENT_RAYMOND 5
-#define CONTEST_OPPONENT_GRANT 6
-#define CONTEST_OPPONENT_PAIGE 7
-#define CONTEST_OPPONENT_ALEC 8
-#define CONTEST_OPPONENT_SYDNEY 9
-#define CONTEST_OPPONENT_MORRIS 10
-#define CONTEST_OPPONENT_MARIAH 11
-#define CONTEST_OPPONENT_RUSSELL 12
-#define CONTEST_OPPONENT_MELANIE 13
-#define CONTEST_OPPONENT_CHANCE 14
-#define CONTEST_OPPONENT_AGATHA 15
-#define CONTEST_OPPONENT_BEAU 16
-#define CONTEST_OPPONENT_KAY 17
-#define CONTEST_OPPONENT_CALE 18
-#define CONTEST_OPPONENT_CAITLIN 19
-#define CONTEST_OPPONENT_COLBY 20
-#define CONTEST_OPPONENT_KYLIE 21
-#define CONTEST_OPPONENT_LIAM 22
-#define CONTEST_OPPONENT_MILO 23
-#define CONTEST_OPPONENT_KARINA 24
-#define CONTEST_OPPONENT_BOBBY 25
-#define CONTEST_OPPONENT_CLAIRE 26
-#define CONTEST_OPPONENT_WILLIE 27
-#define CONTEST_OPPONENT_CASSIDY 28
-#define CONTEST_OPPONENT_MORGAN 29
-#define CONTEST_OPPONENT_SUMMER 30
-#define CONTEST_OPPONENT_MILES 31
-#define CONTEST_OPPONENT_AUDREY 32
-#define CONTEST_OPPONENT_AVERY 33
-#define CONTEST_OPPONENT_ARIANA 34
-#define CONTEST_OPPONENT_ASHTON 35
-#define CONTEST_OPPONENT_SANDRA 36
-#define CONTEST_OPPONENT_CARSON 37
-#define CONTEST_OPPONENT_KATRINA 38
-#define CONTEST_OPPONENT_LUKE 39
-#define CONTEST_OPPONENT_RAUL 40
-#define CONTEST_OPPONENT_JADA 41
-#define CONTEST_OPPONENT_ZEEK 42
-#define CONTEST_OPPONENT_DIEGO 43
-#define CONTEST_OPPONENT_ALIYAH 44
-#define CONTEST_OPPONENT_NATALIA 45
-#define CONTEST_OPPONENT_DEVIN 46
-#define CONTEST_OPPONENT_TYLOR 47
-#define CONTEST_OPPONENT_RONNIE 48
-#define CONTEST_OPPONENT_CLAUDIA 49
-#define CONTEST_OPPONENT_ELIAS 50
-#define CONTEST_OPPONENT_JADE 51
-#define CONTEST_OPPONENT_FRANCIS 52
-#define CONTEST_OPPONENT_ALISHA 53
-#define CONTEST_OPPONENT_SAUL 54
-#define CONTEST_OPPONENT_FELICIA 55
-#define CONTEST_OPPONENT_EMILIO 56
-#define CONTEST_OPPONENT_KARLA 57
-#define CONTEST_OPPONENT_DARRYL 58
-#define CONTEST_OPPONENT_SELENA 59
-#define CONTEST_OPPONENT_NOEL 60
-#define CONTEST_OPPONENT_LACEY 61
-#define CONTEST_OPPONENT_CORBIN 62
-#define CONTEST_OPPONENT_GRACIE 63
-#define CONTEST_OPPONENT_COLTIN 64
-#define CONTEST_OPPONENT_ELLIE 65
-#define CONTEST_OPPONENT_MARCUS 66
-#define CONTEST_OPPONENT_KIARA 67
-#define CONTEST_OPPONENT_BRYCE 68
-#define CONTEST_OPPONENT_JAMIE 69
-#define CONTEST_OPPONENT_JORGE 70
-#define CONTEST_OPPONENT_DEVON 71
-#define CONTEST_OPPONENT_JUSTINA 72
-#define CONTEST_OPPONENT_RALPH 73
-#define CONTEST_OPPONENT_ROSA 74
-#define CONTEST_OPPONENT_KEATON 75
-#define CONTEST_OPPONENT_MAYRA 76
-#define CONTEST_OPPONENT_LAMAR 77
-#define CONTEST_OPPONENT_AUBREY 78
-#define CONTEST_OPPONENT_NIGEL 79
-#define CONTEST_OPPONENT_CAMILLE 80
-#define CONTEST_OPPONENT_DEON 81
-#define CONTEST_OPPONENT_JANELLE 82
-#define CONTEST_OPPONENT_HEATH 83
-#define CONTEST_OPPONENT_SASHA 84
-#define CONTEST_OPPONENT_FRANKIE 85
-#define CONTEST_OPPONENT_HELEN 86
-#define CONTEST_OPPONENT_CAMILE 87
-#define CONTEST_OPPONENT_MARTIN 88
-#define CONTEST_OPPONENT_SERGIO 89
-#define CONTEST_OPPONENT_KAILEY 90
-#define CONTEST_OPPONENT_PERLA 91
-#define CONTEST_OPPONENT_CLARA 92
-#define CONTEST_OPPONENT_JAKOB 93
-#define CONTEST_OPPONENT_TREY 94
-#define CONTEST_OPPONENT_LANE 95
+enum {
+    CONTEST_OPPONENT_JIMMY,
+    CONTEST_OPPONENT_EDITH,
+    CONTEST_OPPONENT_EVAN,
+    CONTEST_OPPONENT_KELSEY,
+    CONTEST_OPPONENT_MADISON,
+    CONTEST_OPPONENT_RAYMOND,
+    CONTEST_OPPONENT_GRANT,
+    CONTEST_OPPONENT_PAIGE,
+    CONTEST_OPPONENT_ALEC,
+    CONTEST_OPPONENT_SYDNEY,
+    CONTEST_OPPONENT_MORRIS,
+    CONTEST_OPPONENT_MARIAH,
+    CONTEST_OPPONENT_RUSSELL,
+    CONTEST_OPPONENT_MELANIE,
+    CONTEST_OPPONENT_CHANCE,
+    CONTEST_OPPONENT_AGATHA,
+    CONTEST_OPPONENT_BEAU,
+    CONTEST_OPPONENT_KAY,
+    CONTEST_OPPONENT_CALE,
+    CONTEST_OPPONENT_CAITLIN,
+    CONTEST_OPPONENT_COLBY,
+    CONTEST_OPPONENT_KYLIE,
+    CONTEST_OPPONENT_LIAM,
+    CONTEST_OPPONENT_MILO,
+    CONTEST_OPPONENT_KARINA,
+    CONTEST_OPPONENT_BOBBY,
+    CONTEST_OPPONENT_CLAIRE,
+    CONTEST_OPPONENT_WILLIE,
+    CONTEST_OPPONENT_CASSIDY,
+    CONTEST_OPPONENT_MORGAN,
+    CONTEST_OPPONENT_SUMMER,
+    CONTEST_OPPONENT_MILES,
+    CONTEST_OPPONENT_AUDREY,
+    CONTEST_OPPONENT_AVERY,
+    CONTEST_OPPONENT_ARIANA,
+    CONTEST_OPPONENT_ASHTON,
+    CONTEST_OPPONENT_SANDRA,
+    CONTEST_OPPONENT_CARSON,
+    CONTEST_OPPONENT_KATRINA,
+    CONTEST_OPPONENT_LUKE,
+    CONTEST_OPPONENT_RAUL,
+    CONTEST_OPPONENT_JADA,
+    CONTEST_OPPONENT_ZEEK,
+    CONTEST_OPPONENT_DIEGO,
+    CONTEST_OPPONENT_ALIYAH,
+    CONTEST_OPPONENT_NATALIA,
+    CONTEST_OPPONENT_DEVIN,
+    CONTEST_OPPONENT_TYLOR,
+    CONTEST_OPPONENT_RONNIE,
+    CONTEST_OPPONENT_CLAUDIA,
+    CONTEST_OPPONENT_ELIAS,
+    CONTEST_OPPONENT_JADE,
+    CONTEST_OPPONENT_FRANCIS,
+    CONTEST_OPPONENT_ALISHA,
+    CONTEST_OPPONENT_SAUL,
+    CONTEST_OPPONENT_FELICIA,
+    CONTEST_OPPONENT_EMILIO,
+    CONTEST_OPPONENT_KARLA,
+    CONTEST_OPPONENT_DARRYL,
+    CONTEST_OPPONENT_SELENA,
+    CONTEST_OPPONENT_NOEL,
+    CONTEST_OPPONENT_LACEY,
+    CONTEST_OPPONENT_CORBIN,
+    CONTEST_OPPONENT_GRACIE,
+    CONTEST_OPPONENT_COLTIN,
+    CONTEST_OPPONENT_ELLIE,
+    CONTEST_OPPONENT_MARCUS,
+    CONTEST_OPPONENT_KIARA,
+    CONTEST_OPPONENT_BRYCE,
+    CONTEST_OPPONENT_JAMIE,
+    CONTEST_OPPONENT_JORGE,
+    CONTEST_OPPONENT_DEVON,
+    CONTEST_OPPONENT_JUSTINA,
+    CONTEST_OPPONENT_RALPH,
+    CONTEST_OPPONENT_ROSA,
+    CONTEST_OPPONENT_KEATON,
+    CONTEST_OPPONENT_MAYRA,
+    CONTEST_OPPONENT_LAMAR,
+    CONTEST_OPPONENT_AUBREY,
+    CONTEST_OPPONENT_NIGEL,
+    CONTEST_OPPONENT_CAMILLE,
+    CONTEST_OPPONENT_DEON,
+    CONTEST_OPPONENT_JANELLE,
+    CONTEST_OPPONENT_HEATH,
+    CONTEST_OPPONENT_SASHA,
+    CONTEST_OPPONENT_FRANKIE,
+    CONTEST_OPPONENT_HELEN,
+    CONTEST_OPPONENT_CAMILE,
+    CONTEST_OPPONENT_MARTIN,
+    CONTEST_OPPONENT_SERGIO,
+    CONTEST_OPPONENT_KAILEY,
+    CONTEST_OPPONENT_PERLA,
+    CONTEST_OPPONENT_CLARA,
+    CONTEST_OPPONENT_JAKOB,
+    CONTEST_OPPONENT_TREY,
+    CONTEST_OPPONENT_LANE
+};
 
 // All contest opponents have a common set of AI flags (which contains all of the actually
 // useful AI scripts, as well as some dummys) and a random combination of 2-3 dummy flags.