summaryrefslogtreecommitdiff
path: root/include/battle_setup.h
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-04-07 20:20:22 -0400
committerPhlosioneer <mattmdrr2@gmail.com>2019-04-07 20:20:22 -0400
commit50350cc2e1c26082f9d852e97e1698f7254d4145 (patch)
tree3217b352dae2be8da75ad08a8d94ddc7f81a5017 /include/battle_setup.h
parent1360b3a477f1107785900cd0c4e73ebf018f058c (diff)
parenta4ea0ac816f799b76ac4bec1b66c569d6b684e64 (diff)
Merge branch 'master' into contest-ai-cleanup
Diffstat (limited to 'include/battle_setup.h')
-rw-r--r--include/battle_setup.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h
index 3b327e3f7..984c820bb 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -1,10 +1,10 @@
#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
{