diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2019-08-02 00:45:49 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2019-08-02 00:45:49 +0200 |
| commit | 9306c142b3d566c1309caae9cd54b11ea433a570 (patch) | |
| tree | 9dabdb5b4128510d23da9d5ac72a1ef1c93689bd /src/fldeff_flash.c | |
| parent | 4d2d8779bfb56385b5e35d3010d28a248780f134 (diff) | |
| parent | 242bed733fb960743701e0ab088e5b2bc1d92e79 (diff) | |
Merge dodrio with master
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 c002f700f..a2457307b 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -219,8 +219,8 @@ static void sub_8137404(u8 taskId) static void sub_8137420(u8 taskId) { SetGpuReg(REG_OFFSET_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_085B28A0, 0xE0, 0x10); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 @@ -304,8 +304,8 @@ static void sub_81375BC(u8 taskId) static void sub_81375D8(u8 taskId) { SetGpuReg(REG_OFFSET_DISPCNT, 0); - LZ77UnCompVram(gCaveTransitionTiles, (void *)0x600C000); - LZ77UnCompVram(gCaveTransitionTilemap, (void *)0x600F800); + LZ77UnCompVram(gCaveTransitionTiles, (void *)(VRAM + 0xC000)); + LZ77UnCompVram(gCaveTransitionTilemap, (void *)(VRAM + 0xF800)); SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 0); |