diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
| commit | 455202eca00fd1b51e9ba8b75434d97ae5c750a8 (patch) | |
| tree | 153b1b85ae6864fec7bf880d9dd90fe6ef9a55c6 /asm/contest_ai.s | |
| parent | 14e41d6c508e5c425dff8f2c4933ae4c8b7ab762 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
Merge branch 'master' into decompile_rom3
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 |