diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-30 18:24:14 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-30 18:24:14 -0500 |
| commit | c5f1b576f2bb3aacf4c4a64c15dcb7220c4ffb86 (patch) | |
| tree | 4409a4e75cd8701e20b75f532042b7da3adab554 /asm/use_pokeblock.s | |
| parent | 536a338ff9aac796c542b3bb01a822c2a28df0a5 (diff) | |
| parent | b3315b64a1ecefc04f36ed50dd341f1f90d3ba97 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into field_map_obj_helpers
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 |