Merge branch 'master' into doc-link

This commit is contained in:
GriffinR
2020-06-13 16:15:11 -04:00
committed by GitHub
64 changed files with 886 additions and 803 deletions

View File

@@ -4644,16 +4644,16 @@ static bool32 sub_802A8E8(void)
LoadPalette(gDodrioBerryBgPal1, 0, sizeof(gDodrioBerryBgPal1));
break;
case 1:
reset_temp_tile_data_buffers();
ResetTempTileDataBuffers();
break;
case 2:
decompress_and_copy_tile_data_to_vram(3, gDodrioBerryBgGfx1, 0, 0, 0);
DecompressAndCopyTileDataToVram(3, gDodrioBerryBgGfx1, 0, 0, 0);
break;
case 3:
decompress_and_copy_tile_data_to_vram(1, gDodrioBerryBgGfx2, 0, 0, 0);
DecompressAndCopyTileDataToVram(1, gDodrioBerryBgGfx2, 0, 0, 0);
break;
case 4:
if (free_temp_tile_data_buffers_if_possible() == TRUE)
if (FreeTempTileDataBuffersIfPossible() == TRUE)
return FALSE;
break;
case 5: