diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:42:18 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:42:18 +0000 |
| commit | 7c79b030e90ae6f4b3b3c91518c315959ede456e (patch) | |
| tree | b12fe2ca0d42b900fb1d45491e81a1bc6d86a348 /asm/contest_ai.s | |
| parent | 2acab81713aac51f96a50dc42a67ec7761901aa4 (diff) | |
| parent | 055a419830c0725a629f971b0299c89082c192fd (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'asm/contest_ai.s')
| -rw-r--r-- | asm/contest_ai.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/contest_ai.s b/asm/contest_ai.s index a213c393c..3438107eb 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -1352,7 +1352,7 @@ sub_8156CF4: @ 8156CF4 ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0xC] - ldr r0, =gScriptContestCategory + ldr r0, =gSpecialVar_ContestCategory ldrh r0, [r0] strh r0, [r1, 0x18] ldr r1, =gAIScriptPtr |