dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-link

Browse Source
This commit is contained in:
GriffinR
2020-06-13 16:15:11 -04:00
committed by GitHub
parent a9a427c6f2 46f4a4bbf7
commit c2a07276ae
64 changed files with 886 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/berry_crush.c
View File

@@ -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();