diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
| commit | 32153295edc1e93bd27894f75f2ab01f9140bed5 (patch) | |
| tree | 397bb2852fbacc95b66a2b121c0a7eeb31c5c44d /asm/contest.s | |
| parent | e78f49f1efc2eadb674d00c00ffc9a4018b3cdbd (diff) | |
| parent | 242af849cb56ce0c4469c4e2be82a3ad5dbd3434 (diff) | |
Merge remote-tracking branch 'upstream/master' into decompile_battle_2
Diffstat (limited to 'asm/contest.s')
| -rw-r--r-- | asm/contest.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/contest.s b/asm/contest.s index 3f53a31e9..214935952 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -11,15 +11,15 @@ nullsub_89: @ 80AB1AC bx lr thumb_func_end nullsub_89 - thumb_func_start sub_80AB1B0 -sub_80AB1B0: @ 80AB1B0 + thumb_func_start ResetLinkContestBoolean +ResetLinkContestBoolean: @ 80AB1B0 ldr r1, _080AB1B8 @ =gIsLinkContest movs r0, 0 strb r0, [r1] bx lr .align 2, 0 _080AB1B8: .4byte gIsLinkContest - thumb_func_end sub_80AB1B0 + thumb_func_end ResetLinkContestBoolean thumb_func_start sub_80AB1BC sub_80AB1BC: @ 80AB1BC |