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/pokemon_jump.c | |
| parent | a9a427c6f268e04468c8e30242f3ed4f96036848 (diff) | |
| parent | 46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff) | |
Merge branch 'master' into doc-link
Diffstat (limited to 'src/pokemon_jump.c')
| -rwxr-xr-x | src/pokemon_jump.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 738e0089d..33ddee1b5 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -2966,18 +2966,18 @@ static void sub_802D150(void) ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, gUnknown_082FE164, ARRAY_COUNT(gUnknown_082FE164)); InitWindows(gUnknown_082FE174); - reset_temp_tile_data_buffers(); + ResetTempTileDataBuffers(); sub_802C974(gUnknown_02022D00); sub_802DD08(); LoadPalette(gPkmnJumpBgPal, 0, 0x20); - decompress_and_copy_tile_data_to_vram(3, gPkmnJumpBgGfx, 0, 0, 0); - decompress_and_copy_tile_data_to_vram(3, gPkmnJumpBgTilemap, 0, 0, 1); + DecompressAndCopyTileDataToVram(3, gPkmnJumpBgGfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(3, gPkmnJumpBgTilemap, 0, 0, 1); LoadPalette(gPkmnJumpVenusaurPal, 0x30, 0x20); - decompress_and_copy_tile_data_to_vram(2, gPkmnJumpVenusaurGfx, 0, 0, 0); - decompress_and_copy_tile_data_to_vram(2, gPkmnJumpVenusaurTilemap, 0, 0, 1); + DecompressAndCopyTileDataToVram(2, gPkmnJumpVenusaurGfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(2, gPkmnJumpVenusaurTilemap, 0, 0, 1); LoadPalette(gPkmnJumpResultsPal, 0x10, 0x20); - decompress_and_copy_tile_data_to_vram(1, gPkmnJumpResultsGfx, 0, 0, 0); - decompress_and_copy_tile_data_to_vram(1, gPkmnJumpResultsTilemap, 0, 0, 1); + DecompressAndCopyTileDataToVram(1, gPkmnJumpResultsGfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, gPkmnJumpResultsTilemap, 0, 0, 1); LoadPalette(gPkmnJumpPal3, 0x20, 0x20); SetBgTilemapBuffer(0, gUnknown_02022D00->tilemapBuffer); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); @@ -2991,7 +2991,7 @@ static void sub_802D150(void) gUnknown_02022D00->unk4++; break; case 1: - if (!free_temp_tile_data_buffers_if_possible()) + if (!FreeTempTileDataBuffersIfPossible()) { sub_802DBF8(); sub_802CE9C(gUnknown_02022D00); |