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/use_pokeblock.s | |
| parent | e6fb626c1fddb2f696b26219156d2591867295e7 (diff) | |
| parent | b3315b64a1ecefc04f36ed50dd341f1f90d3ba97 (diff) | |
coord weather fix conflicts
Diffstat (limited to 'asm/use_pokeblock.s')
| -rw-r--r-- | asm/use_pokeblock.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s index 60c11524a..5047ec65e 100644 --- a/asm/use_pokeblock.s +++ b/asm/use_pokeblock.s @@ -732,10 +732,10 @@ _08166C28: b _08166D18 .pool _08166C40: - ldr r1, =gUnknown_02039B28 + ldr r1, =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] - bl sub_80BA0A8 + bl ScanlineEffect_InitHBlankDmaTransfer _08166C4A: ldr r1, [r4] adds r1, 0x50 |