diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
| commit | 9c9bcee1e2fbd3fd374023146f99d0417cd8ab52 (patch) | |
| tree | 848c1688fe743dd0410183b182024ee961f07980 /asm/contest_ai.s | |
| parent | ce74d72c31a3ebda26adc6ae888700213f64b113 (diff) | |
| parent | 62bdd4d480ced306b85791c828ee8497e9fa2acc (diff) | |
fix merge 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 33862eb8c..94347f2ad 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -1315,7 +1315,7 @@ _0812923C: thumb_func_start ContestAICmd_get_contest_type ContestAICmd_get_contest_type: @ 8129244 ldr r1, _08129258 @ =gSharedMem + 0x192E4 - ldr r0, _0812925C @ =gScriptContestCategory + ldr r0, _0812925C @ =gSpecialVar_ContestCategory ldrh r0, [r0] strh r0, [r1, 0x18] ldr r1, _08129260 @ =gAIScriptPtr @@ -1325,7 +1325,7 @@ ContestAICmd_get_contest_type: @ 8129244 bx lr .align 2, 0 _08129258: .4byte gSharedMem + 0x192E4 -_0812925C: .4byte gScriptContestCategory +_0812925C: .4byte gSpecialVar_ContestCategory _08129260: .4byte gAIScriptPtr thumb_func_end ContestAICmd_get_contest_type |