diff options
| author | JaceCearK1 <JaceCearK1@users.noreply.github.com> | 2017-07-01 21:04:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-01 21:04:18 +0200 |
| commit | 0dd804a99e5455a0eac8ff6ed87d9de16c7380b7 (patch) | |
| tree | 7b3567978b63ee6548a7b945e075ea8ba37bef51 /asm/contest_link_80C857C.s | |
| parent | f1344efd2aff92292f58f7323bd9297a38fe9b02 (diff) | |
| parent | 8d82578d3a101b06f9d2ced31738021007c4e533 (diff) | |
Merge pull request #1 from pret/master
Update fork to match main fork.
Diffstat (limited to 'asm/contest_link_80C857C.s')
| -rw-r--r-- | asm/contest_link_80C857C.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index bef1d4402..12dc3bdb5 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -152,7 +152,7 @@ sub_80C8660: @ 80C8660 lsrs r0, 24 cmp r0, 0x4 bne _080C868E - ldr r1, _080C869C @ =gUnknown_0203869A + ldr r1, _080C869C @ =gIsLinkContest movs r0, 0x1 strb r0, [r1] adds r0, r4, 0 @@ -164,7 +164,7 @@ _080C868E: .align 2, 0 _080C8694: .4byte gReceivedRemoteLinkPlayers _080C8698: .4byte gContestPlayerMonIndex -_080C869C: .4byte gUnknown_0203869A +_080C869C: .4byte gIsLinkContest thumb_func_end sub_80C8660 thumb_func_start sub_80C86A0 |