diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-01-30 15:37:34 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-30 15:37:34 -0600 |
| commit | 232dea1a63929ce10f000ddc18c36c22a72827a4 (patch) | |
| tree | 2b371cf05eec75a81eac09bdcbef80e8e91da278 /asm/contest.s | |
| parent | ef4313d42f38199f8420b985e4b2c7b96c62997d (diff) | |
| parent | db3ecf5012612ed08aab55f4a8993afea74a4216 (diff) | |
Merge pull request #193 from DizzyEggg/decompile_scanline_effect
decompile scanline effect
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 3c34965ad..e81ce8d5c 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 |