diff options
| author | Revo <projectrevotpp@hotmail.com> | 2019-07-28 20:26:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-28 20:26:50 -0400 |
| commit | d442be12102ed3493c04b3688f37a4ffad6606f7 (patch) | |
| tree | c5479a8bbf29b7a91ae5e8d41acdae847cb356a1 /src/fldeff_flash.c | |
| parent | e8dda92d7b30268bf2716b0756952510850b0416 (diff) | |
| parent | 00b0b0bb9089684b4b7824e079cbefd006214afd (diff) | |
Merge pull request #749 from camthesaxman/vram
remove hardcoded VRAM and EWRAM addresses
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; |