From f46e941f306a3f9b6a527e33f3657657da0436cb Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 26 Feb 2018 08:23:17 -0500
Subject: Name functions, variables, and that one flag constant

---
 include/constants/flags.h    |  2 +-
 include/gym_leader_rematch.h | 87 ++++++++++++++++++++++++++++++++++++++++++++
 include/trainer_rematch.h    | 87 --------------------------------------------
 3 files changed, 88 insertions(+), 88 deletions(-)
 create mode 100644 include/gym_leader_rematch.h
 delete mode 100644 include/trainer_rematch.h

(limited to 'include')

diff --git a/include/constants/flags.h b/include/constants/flags.h
index 63e053cbd..2e40a8eba 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -91,7 +91,7 @@
 #define FLAG_0x058               0x58
 #define FLAG_0x059               0x59
 #define FLAG_0x05A               0x5A
-#define FLAG_0x05B               0x5B
+#define FLAG_WATTSON_REMATCH_AVAILABLE               0x5B
 #define FLAG_0x05C               0x5C
 #define FLAG_0x05D               0x5D
 #define FLAG_0x05E               0x5E
diff --git a/include/gym_leader_rematch.h b/include/gym_leader_rematch.h
new file mode 100644
index 000000000..ef0e5fef1
--- /dev/null
+++ b/include/gym_leader_rematch.h
@@ -0,0 +1,87 @@
+#ifndef GUARD_TRAINER_REMATCH_H
+#define GUARD_TRAINER_REMATCH_H
+
+enum {
+    REMATCH_ROSE,
+    REMATCH_ANDRES,
+    REMATCH_DUSTY,
+    REMATCH_LOLA,
+    REMATCH_RICKY,
+    REMATCH_LILA_AND_ROY,
+    REMATCH_CRISTIN,
+    REMATCH_BROOKE,
+    REMATCH_WILTON,
+    REMATCH_VALERIE,
+    REMATCH_CINDY,
+    REMATCH_THALIA,
+    REMATCH_JESSICA,
+    REMATCH_WINSTON,
+    REMATCH_STEVE,
+    REMATCH_TONY,
+    REMATCH_NOB,
+    REMATCH_KOJI,
+    REMATCH_FERNANDO,
+    REMATCH_DALTON,
+    REMATCH_BERNIE,
+    REMATCH_ETHAN,
+    REMATCH_JOHN_AND_JAY,
+    REMATCH_JEFFREY,
+    REMATCH_CAMERON,
+    REMATCH_JACKI,
+    REMATCH_WALTER,
+    REMATCH_KAREN,
+    REMATCH_JERRY,
+    REMATCH_ANNA_AND_MEG,
+    REMATCH_ISABEL,
+    REMATCH_MIGUEL,
+    REMATCH_TIMOTHY,
+    REMATCH_SHELBY,
+    REMATCH_CALVIN,
+    REMATCH_ELLIOT,
+    REMATCH_ISAIAH,
+    REMATCH_MARIA,
+    REMATCH_ABIGAIL,
+    REMATCH_DYLAN,
+    REMATCH_KATELYN,
+    REMATCH_BENJAMIN,
+    REMATCH_PABLO,
+    REMATCH_NICOLAS,
+    REMATCH_ROBERT,
+    REMATCH_LAO,
+    REMATCH_CYNDY,
+    REMATCH_MADELINE,
+    REMATCH_JENNY,
+    REMATCH_DIANA,
+    REMATCH_AMY_AND_LIV,
+    REMATCH_ERNEST,
+    REMATCH_CORY,
+    REMATCH_EDWIN,
+    REMATCH_LYDIA,
+    REMATCH_ISAAC,
+    REMATCH_GABRIELLE,
+    REMATCH_CATHERINE,
+    REMATCH_JACKSON,
+    REMATCH_HALEY,
+    REMATCH_JAMES,
+    REMATCH_TRENT,
+    REMATCH_SAWYER,
+    REMATCH_KIRA_AND_DAN,
+    REMATCH_WALLY_3,
+    REMATCH_ROXANNE,
+    REMATCH_BRAWLY,
+    REMATCH_WATTSON,
+    REMATCH_FLANNERY,
+    REMATCH_NORMAN,
+    REMATCH_WINONA,
+    REMATCH_TATE_AND_LIZA,
+    REMATCH_JUAN,
+    REMATCH_SIDNEY,
+    REMATCH_PHOEBE,
+    REMATCH_GLACIA,
+    REMATCH_DRAKE,
+    REMATCH_WALLACE
+};
+
+void UpdateGymLeaderRematch(void);
+
+#endif //GUARD_TRAINER_REMATCH_H
diff --git a/include/trainer_rematch.h b/include/trainer_rematch.h
deleted file mode 100644
index faf459846..000000000
--- a/include/trainer_rematch.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef GUARD_TRAINER_REMATCH_H
-#define GUARD_TRAINER_REMATCH_H
-
-enum {
-    REMATCH_ROSE,
-    REMATCH_ANDRES,
-    REMATCH_DUSTY,
-    REMATCH_LOLA,
-    REMATCH_RICKY,
-    REMATCH_LILA_AND_ROY,
-    REMATCH_CRISTIN,
-    REMATCH_BROOKE,
-    REMATCH_WILTON,
-    REMATCH_VALERIE,
-    REMATCH_CINDY,
-    REMATCH_THALIA,
-    REMATCH_JESSICA,
-    REMATCH_WINSTON,
-    REMATCH_STEVE,
-    REMATCH_TONY,
-    REMATCH_NOB,
-    REMATCH_KOJI,
-    REMATCH_FERNANDO,
-    REMATCH_DALTON,
-    REMATCH_BERNIE,
-    REMATCH_ETHAN,
-    REMATCH_JOHN_AND_JAY,
-    REMATCH_JEFFREY,
-    REMATCH_CAMERON,
-    REMATCH_JACKI,
-    REMATCH_WALTER,
-    REMATCH_KAREN,
-    REMATCH_JERRY,
-    REMATCH_ANNA_AND_MEG,
-    REMATCH_ISABEL,
-    REMATCH_MIGUEL,
-    REMATCH_TIMOTHY,
-    REMATCH_SHELBY,
-    REMATCH_CALVIN,
-    REMATCH_ELLIOT,
-    REMATCH_ISAIAH,
-    REMATCH_MARIA,
-    REMATCH_ABIGAIL,
-    REMATCH_DYLAN,
-    REMATCH_KATELYN,
-    REMATCH_BENJAMIN,
-    REMATCH_PABLO,
-    REMATCH_NICOLAS,
-    REMATCH_ROBERT,
-    REMATCH_LAO,
-    REMATCH_CYNDY,
-    REMATCH_MADELINE,
-    REMATCH_JENNY,
-    REMATCH_DIANA,
-    REMATCH_AMY_AND_LIV,
-    REMATCH_ERNEST,
-    REMATCH_CORY,
-    REMATCH_EDWIN,
-    REMATCH_LYDIA,
-    REMATCH_ISAAC,
-    REMATCH_GABRIELLE,
-    REMATCH_CATHERINE,
-    REMATCH_JACKSON,
-    REMATCH_HALEY,
-    REMATCH_JAMES,
-    REMATCH_TRENT,
-    REMATCH_SAWYER,
-    REMATCH_KIRA_AND_DAN,
-    REMATCH_WALLY_3,
-    REMATCH_ROXANNE,
-    REMATCH_BRAWLY,
-    REMATCH_WATTSON,
-    REMATCH_FLANNERY,
-    REMATCH_NORMAN,
-    REMATCH_WINONA,
-    REMATCH_TATE_AND_LIZA,
-    REMATCH_JUAN,
-    REMATCH_SIDNEY,
-    REMATCH_PHOEBE,
-    REMATCH_GLACIA,
-    REMATCH_DRAKE,
-    REMATCH_WALLACE
-};
-
-void sub_81DA57C(void);
-
-#endif //GUARD_TRAINER_REMATCH_H
-- 
cgit v1.2.3