diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
| commit | 6748ef72fb31e1b0af250472a34e50cb3966c5f8 (patch) | |
| tree | f6dafca53a0e45e5a2a6cdb262a2766f2bde8753 /data/data2c.s | |
| parent | 2265d49ac2e8868e0b3362f8e7a4d22355eed202 (diff) | |
| parent | 170b6ef44992f4b7decb31451a3756b6bd4e2d46 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
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 |