diff options
| author | garak <garakmon@gmail.com> | 2018-12-16 20:05:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 20:05:31 -0500 |
| commit | e292d0ca8375a8c54907d6bcf404e2e084344156 (patch) | |
| tree | b9c59449d47bf73d98d3e38fa26804a163d871ab /data/data2c.s | |
| parent | 10237e8d13b35474ea999b4e9139f9a48a80c53d (diff) | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
Merge branch 'master' into fldeff
Diffstat (limited to 'data/data2c.s')
| -rw-r--r-- | data/data2c.s | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/data/data2c.s b/data/data2c.s index 1946f5bdb..5bfea56ae 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -9,10 +9,13 @@ .section .rodata .align 2 -gUnknown_0831AC70:: @ 831AC70 +gBattleIntroSlideScanlineEffectParams:: @ 831AC70 .4byte REG_BG3HOFS .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 .4byte 1 + + .align 2 +gUnknown_0831AC7C:: @ 831AC7C .4byte REG_BG3HOFS .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 .4byte 1 |