diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-14 09:52:56 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-14 09:52:56 -0400 |
| commit | a252140f3b462efbeaec392030479e9e12999f23 (patch) | |
| tree | bb85cfb66bc0aa970e9b27eedaa7d9894e83666f /asm/contest_ai.s | |
| parent | 1112af4e1905135a7bc2dd53353b52762ff7d49a (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
Merge branch 'master' into mail
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 af2ee5286..f937633da 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -1352,7 +1352,7 @@ sub_8156CF4: @ 8156CF4 ldr r0, =gUnknown_02039F34 ldr r0, [r0] ldr r1, [r0, 0xC] - ldr r0, =gUnknown_02039F2C + ldr r0, =gScriptContestCategory ldrh r0, [r0] strh r0, [r1, 0x18] ldr r1, =gAIScriptPtr |