diff --git a/src/caps.c b/src/caps.c
index 941509c2a4..f8e171c898 100644
--- a/src/caps.c
+++ b/src/caps.c
@@ -84,17 +84,16 @@ u32 GetSoftLevelCapExpValue(u32 level, u32 expValue)
 
 u32 GetCurrentEVCap(void)
 {
-
     static const u16 sEvCapFlagMap[][2] = {
         // Define EV caps for each milestone
-        {FLAG_BADGE01_GET, 30},
-        {FLAG_BADGE02_GET, 90},
-        {FLAG_BADGE03_GET, 150},
-        {FLAG_BADGE04_GET, 210},
-        {FLAG_BADGE05_GET, 270},
-        {FLAG_BADGE06_GET, 330},
-        {FLAG_BADGE07_GET, 390},
-        {FLAG_BADGE08_GET, 450},
+        {FLAG_BADGE01_GET, MAX_TOTAL_EVS *  1 / 17},
+        {FLAG_BADGE02_GET, MAX_TOTAL_EVS *  3 / 17},
+        {FLAG_BADGE03_GET, MAX_TOTAL_EVS *  5 / 17},
+        {FLAG_BADGE04_GET, MAX_TOTAL_EVS *  7 / 17},
+        {FLAG_BADGE05_GET, MAX_TOTAL_EVS *  9 / 17},
+        {FLAG_BADGE06_GET, MAX_TOTAL_EVS * 11 / 17},
+        {FLAG_BADGE07_GET, MAX_TOTAL_EVS * 13 / 17},
+        {FLAG_BADGE08_GET, MAX_TOTAL_EVS * 15 / 17},
         {FLAG_IS_CHAMPION, MAX_TOTAL_EVS},
     };