diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
| commit | d4532c70cb03962d38517fef2d723f81a9b27c1b (patch) | |
| tree | 70220c06025360d7089011f5d80239b61ac183af /asm/contest_ai.s | |
| parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
| parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/contest_ai.s')
| -rw-r--r-- | asm/contest_ai.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/contest_ai.s b/asm/contest_ai.s index f28492886..f937633da 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -144,7 +144,7 @@ sub_81563B0: @ 81563B0 beq _081564A0 adds r7, r5, 0 ldr r6, =gAIScriptPtr - ldr r0, =gUnknown_02039E1E + ldr r0, =gUnknown_02039E00 + 30 mov r8, r0 _081563CC: ldr r0, [r7] @@ -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 @@ -5030,7 +5030,7 @@ sub_8158948: @ 8158948 push {r4-r6,lr} movs r5, 0 movs r4, 0 - ldr r6, =gUnknown_02039E1E + ldr r6, =gUnknown_02039E00 + 30 _08158950: lsls r1, r4, 1 ldr r0, =gUnknown_02039F34 |