diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-07 14:14:08 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-07 14:14:08 -0500 |
| commit | b67afb9490ce7fce8c7d478e9b436c5b849fb4ad (patch) | |
| tree | b07bb0bb43aeba2c7cfef97213578fb815ccb266 /include/scanline_effect.h | |
| parent | 5f7709dc8bf1bf4eb75d9481e285980f347d5dd7 (diff) | |
| parent | 802b505d7bc4f60e6dda62c9a2a4948b8ba765df (diff) | |
I hope this fixes the conflicts
Diffstat (limited to 'include/scanline_effect.h')
| -rw-r--r-- | include/scanline_effect.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/scanline_effect.h b/include/scanline_effect.h index 54dfe17bd..eb837e7e2 100644 --- a/include/scanline_effect.h +++ b/include/scanline_effect.h @@ -1,7 +1,7 @@ #ifndef GUARD_SCANLINE_EFFECT_H #define GUARD_SCANLINE_EFFECT_H -// DMA control value to ransfer a single 16-bit value at HBlank +// DMA control value to transfer a single 16-bit value at HBlank #define SCANLINE_EFFECT_DMACNT_16BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_16BIT | DMA_DEST_RELOAD) << 16) | 1) #define SCANLINE_EFFECT_REG_BG0HOFS (REG_ADDR_BG0HOFS - REG_ADDR_BG0HOFS) @@ -36,7 +36,7 @@ struct ScanlineEffect extern struct ScanlineEffect gScanlineEffect; -extern u16 gScanlineEffectRegBuffers[][0x3C0]; +extern u16 gScanlineEffectRegBuffers[2][0x3C0]; void ScanlineEffect_Stop(void); void ScanlineEffect_Clear(void); |