Merge pull request #220 from PikalaxALT/trainer_rematch

Decompile trainer_rematch

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
@@ -208,8 +208,8 @@
 #define FLAG_0x0CD               0xCD
 #define FLAG_0x0CE               0xCE
 #define FLAG_0x0CF               0xCF
-#define FLAG_0x0D0               0xD0
-#define FLAG_0x0D1               0xD1
+#define FLAG_GOT_BASEMENT_KEY_FROM_WATTSON               0xD0
+#define FLAG_GOT_TM24_FROM_WATTSON               0xD1
 #define FLAG_0x0D2               0xD2
 #define FLAG_0x0D3               0xD3
 #define FLAG_0x0D4               0xD4
@@ -912,8 +912,8 @@
 #define FLAG_0x38D               0x38D
 #define FLAG_0x38E               0x38E
 #define FLAG_0x38F               0x38F
-#define FLAG_0x390               0x390
-#define FLAG_0x391               0x391
+#define FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON               0x390
+#define FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON               0x391
 #define FLAG_0x392               0x392
 #define FLAG_0x393               0x393
 #define FLAG_0x394               0x394
@@ -961,7 +961,7 @@
 #define FLAG_0x3BE               0x3BE
 #define FLAG_0x3BF               0x3BF
 #define FLAG_0x3C0               0x3C0
-#define FLAG_0x3C1               0x3C1
+#define FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION               0x3C1
 #define FLAG_0x3C2               0x3C2
 #define FLAG_0x3C3               0x3C3
 #define FLAG_0x3C4               0x3C4

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