diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-03 09:42:19 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-03 09:42:19 -0500 |
| commit | d52f52fa734b856361b04ea5d70877a6f265df0c (patch) | |
| tree | 60444b7ba53b8e4c9030a694acb03c54e4144778 /asm/contest.s | |
| parent | d4e8c20f840996049f269ffcd22d7e3feb489696 (diff) | |
| parent | eb6aed50e56f36ce416f7ecc8edfacea1da61bf1 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'asm/contest.s')
| -rw-r--r-- | asm/contest.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/contest.s b/asm/contest.s index 10e6ee591..f46c1bee9 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -563,7 +563,7 @@ _080D7B4E: bl sub_80D779C bl sub_80D77E4 bl sub_80D7678 - bl dp12_8087EA4 + bl ScanlineEffect_Clear bl ResetPaletteFade ldr r2, =gPaletteFade ldrb r0, [r2, 0x8] @@ -1367,7 +1367,7 @@ vblank_cb_battle: @ 80D827C bl TransferPlttBuffer bl LoadOam bl ProcessSpriteCopyRequests - bl sub_80BA0A8 + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .pool |