From 3acf4be38a3900f0d9c79268eff948c703f761d1 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Fri, 4 Nov 2016 13:17:48 -0700
Subject: badge flags

---
 data/data2.s       |  2 +-
 src/battle_setup.c | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/data/data2.s b/data/data2.s
index 4c3593ec8..b39e5924f 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -11022,7 +11022,7 @@ gTrainerBattleSpecs_4:: @ 839AE28
 	.include "data/trainer_eye_trainers.inc"
 
 	.align 2
-gUnknown_0839B1F0:: @ 839B1F0
+gBadgeFlags:: @ 839B1F0
 	.2byte 0x0807, 0x0808, 0x0809, 0x080a, 0x080b, 0x080c, 0x080d, 0x080e
 
 TrainerCardColorName_Bronze:
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 78cb76646..6089430e6 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -116,7 +116,7 @@ extern u32 gOtherText_CancelWithTerminator[];
 extern u16 gUnknown_020239F8;
 extern u16 gUnknown_0202E8DE;
 extern u8 gUnknown_02024D26;
-extern u16 gUnknown_0839B1F0[];
+extern u16 gBadgeFlags[];
 
 extern struct MapObject gMapObjects[];
 
@@ -1109,15 +1109,20 @@ bool8 sub_8082B10(struct TrainerEyeTrainer *a1, u16 a2)
 
 bool32 sub_8082B44(void)
 {
-    int j = 0;
-    u32 i = 0;
-    
-    for(i = 0; i < 8; ++i)
+    int badgeCount = 0;
+    u32 i;
+
+    for(i = 0; i < 8; i++)
     {
-        if (FlagGet(gUnknown_0839B1F0[i]) == 1 && ++j > 4)
-            return 1;
+        if (FlagGet(gBadgeFlags[i]) == TRUE)
+        {
+            badgeCount++;
+            if (badgeCount >= 5)
+                return TRUE;
+        }
     }
-    return 0;
+
+    return FALSE;
 }
 
 void sub_8082B78(void)
-- 
cgit v1.2.3