Expand MatchCallStruct defs, use REMATCH_* enum

2019-04-02 03:22:07 -04:00
parent 65d8b68f9d
commit 6916f09cd5
5 changed files with 298 additions and 120 deletions
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -1,10 +1,11 @@
 #ifndef GUARD_BATTLE_SETUP_H
 #define GUARD_BATTLE_SETUP_H

+#include "gym_leader_rematch.h"
+
 #define REMATCHES_COUNT 5
 #define REMATCH_TABLE_ENTRIES 78
-#define REMATCH_WALLY_ENTRY 64
-#define REMATCH_ELITE_FOUR_ENTRIES 73
+#define REMATCH_ELITE_FOUR_ENTRIES REMATCH_SIDNEY

 struct RematchTrainer
 {