diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 09:46:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 09:46:02 -0400 |
| commit | 78535eea89e8b71f37e188289793e3e18c9bb985 (patch) | |
| tree | c3d7ec29b849e810cc6bc90827f9053a4f486b64 /src/fldeff_flash.c | |
| parent | f4e6816db9622dfa93466138ed075075009295b8 (diff) | |
| parent | 3f477dae36c99bcb03a38be251dbef2f7e344ebc (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/fldeff_flash.c')
| -rw-r--r-- | src/fldeff_flash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 22da8e501..a49802af1 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -220,8 +220,8 @@ static void sub_810CE5C(u8 taskId) static void sub_810CE78(u8 taskId) { REG_DISPCNT = 0; - LZ77UnCompVram(gCaveTransitionTiles, (void *)0x600C000); - LZ77UnCompVram(gCaveTransitionTilemap, (void *)0x600F800); + LZ77UnCompVram(gCaveTransitionTiles, (void *)(VRAM + 0xC000)); + LZ77UnCompVram(gCaveTransitionTilemap, (void *)(VRAM + 0xF800)); LoadPalette(gCaveTransitionPalette_White, 0xE0, 0x20); LoadPalette(gUnknown_083F809C, 0xE0, 0x10); REG_BLDCNT = 15937; @@ -292,8 +292,8 @@ static void sub_810D00C(u8 taskId) static void sub_810D028(u8 taskId) { REG_DISPCNT = 0; - LZ77UnCompVram(gCaveTransitionTiles, (void *)0x600C000); - LZ77UnCompVram(gCaveTransitionTilemap, (void *)0x600F800); + LZ77UnCompVram(gCaveTransitionTiles, (void *)(VRAM + 0xC000)); + LZ77UnCompVram(gCaveTransitionTilemap, (void *)(VRAM + 0xF800)); REG_BLDCNT = 0; REG_BLDALPHA = 0; REG_BLDY = 0; |