diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-06-13 16:15:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-13 16:15:11 -0400 |
| commit | c2a07276ae095a2345f68e34fcd76cdaffd889ea (patch) | |
| tree | 9daf711e52915bee634e3a051f5a4f88db1d4a8f /src/berry_crush.c | |
| parent | a9a427c6f268e04468c8e30242f3ed4f96036848 (diff) | |
| parent | 46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff) | |
Merge branch 'master' into doc-link
Diffstat (limited to 'src/berry_crush.c')
| -rwxr-xr-x | src/berry_crush.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/berry_crush.c b/src/berry_crush.c index da00f0d14..af1fc4686 100755 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -1031,7 +1031,7 @@ int sub_802104C(void) SetHBlankCallback(NULL); SetGpuReg(REG_OFFSET_DISPCNT, 0); ScanlineEffect_Stop(); - reset_temp_tile_data_buffers(); + ResetTempTileDataBuffers(); break; case 1: CpuFill16(0, (void *)OAM, OAM_SIZE); @@ -1069,10 +1069,10 @@ int sub_802104C(void) CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(2); CopyBgTilemapBufferToVram(3); - decompress_and_copy_tile_data_to_vram(1, gUnknown_08DE34B8, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, gUnknown_08DE34B8, 0, 0, 0); break; case 6: - if (free_temp_tile_data_buffers_if_possible()) + if (FreeTempTileDataBuffersIfPossible()) return 0; InitStandardTextBoxWindows(); |