summaryrefslogtreecommitdiff
path: root/src/pokemon_storage_system.c
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-02-21 22:24:25 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-02-21 22:24:25 -0500
commit399d646e3fb24c8b4532267a4ab7aee4d2aaee92 (patch)
tree4805fda152bee21eb8bfb96f70f33e5f958c06b2 /src/pokemon_storage_system.c
parent9e8a841bfa0271a603b5e4895be3067cfa26f8ab (diff)
parentb105d20d1e0297d0c858fe99a0946e5c07da81c1 (diff)
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'src/pokemon_storage_system.c')
-rw-r--r--src/pokemon_storage_system.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 12f41d4d0..d0a7ed80c 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -3927,7 +3927,7 @@ static void SetScrollingBackground(void)
{
SetGpuReg(REG_OFFSET_BG3CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(3) | BGCNT_16COLOR | BGCNT_SCREENBASE(31));
DecompressAndLoadBgGfxUsingHeap(3, gPokemonStorageScrollingBGTileset, 0, 0, 0);
- LZ77UnCompVram(gPokemonStorageScrollingBGTilemap, (void *)VRAM + 0xF800);
+ LZ77UnCompVram(gPokemonStorageScrollingBGTilemap, (void *)BG_SCREEN_ADDR(31));
}
static void ScrollBackground(void)