diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-15 09:01:56 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-15 09:01:56 -0500 |
| commit | 89b695278d0a126279ac232d534aebdc351cc2be (patch) | |
| tree | 2b22248f02a30a906187553274dee989c6ddb74e /asm/contest_ai.s | |
| parent | 79609d52c8d8489b490589a1150b0754c0f61568 (diff) | |
| parent | 055a419830c0725a629f971b0299c89082c192fd (diff) | |
Merge branch 'master' into heal_location
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 |