diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-31 00:02:16 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-31 00:02:16 +0100 |
| commit | 9fbedcc41c2c888b612efd1b3797c181ff7cb107 (patch) | |
| tree | 49dbac1e2b3aa0ff7e4451a0d64e9299ae030357 /asm/title_screen.s | |
| parent | e6fb626c1fddb2f696b26219156d2591867295e7 (diff) | |
| parent | b3315b64a1ecefc04f36ed50dd341f1f90d3ba97 (diff) | |
coord weather fix conflicts
Diffstat (limited to 'asm/title_screen.s')
| -rw-r--r-- | asm/title_screen.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/title_screen.s b/asm/title_screen.s index 54c1b5353..32594424a 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -464,7 +464,7 @@ _080AA766: @ void title_screen_vblank_callback() title_screen_vblank_callback: @ 80AA780 push {lr} - bl sub_80BA0A8 + bl ScanlineEffect_InitHBlankDmaTransfer bl LoadOam bl ProcessSpriteCopyRequests bl TransferPlttBuffer @@ -779,7 +779,7 @@ _080AAAF0: movs r1, 0xA0 movs r2, 0x4 movs r3, 0x4 - bl sub_80BA384 + bl ScanlineEffect_InitWave ldr r0, =c2_title_screen_2 bl SetMainCallback2 _080AAB1E: |