diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 19:58:45 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 19:58:45 +0200 |
| commit | 72ed86171500c58644655bac7d33c07749cbf299 (patch) | |
| tree | 66ef93a15092fa5978fe4c1409605fc3236390ef /asm/contest_ai.s | |
| parent | 20d158cf4a17e8d362cdafbf13906c59d9916e24 (diff) | |
| parent | 3040c1e1aa07a8a6466dd3653462595c2dd0fc9c (diff) | |
fix rom3 conflicts
Diffstat (limited to 'asm/contest_ai.s')
| -rw-r--r-- | asm/contest_ai.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/contest_ai.s b/asm/contest_ai.s index f28492886..af2ee5286 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] @@ -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 |