summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-08-15 00:25:19 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-08-15 00:25:19 +0200
commitba225f8eaab5e46f7fc825adc6df833f3996b38d (patch)
treedec234e1b50407f251946c009ea69af6a3de9562 /src
parent0b22ad4ab520d007b1d0f8b9e1fe9027a2302c40 (diff)
Fix fakematching in contest effect
Diffstat (limited to 'src')
-rw-r--r--src/contest_effect.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/contest_effect.c b/src/contest_effect.c
index d54fb769e..7c086b799 100644
--- a/src/contest_effect.c
+++ b/src/contest_effect.c
@@ -197,9 +197,10 @@ static void ContestEffect_StartlePrevMon2(void)
static void ContestEffect_StartlePrevMons2(void)
{
u8 numStartled = 0;
- register u32 contestant asm("r5") = shared192D0.contestant;
+ u8 contestant = shared192D0.contestant;
+ u8 turnOrder = shared192D0.turnOrder[contestant];
- if (shared192D0.turnOrder[contestant] != 0)
+ if (turnOrder != 0)
{
int i;