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/pokenav_match_call_2.c | |
| parent | a9a427c6f268e04468c8e30242f3ed4f96036848 (diff) | |
| parent | 46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff) | |
Merge branch 'master' into doc-link
Diffstat (limited to 'src/pokenav_match_call_2.c')
| -rwxr-xr-x | src/pokenav_match_call_2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pokenav_match_call_2.c b/src/pokenav_match_call_2.c index aa69c592f..d03bad88b 100755 --- a/src/pokenav_match_call_2.c +++ b/src/pokenav_match_call_2.c @@ -325,7 +325,7 @@ static u32 LoopedTask_OpenMatchCall(s32 taskState) InitBgTemplates(gUnknown_0862278C, ARRAY_COUNT(gUnknown_0862278C)); ChangeBgX(2, 0, 0); ChangeBgY(2, 0, 0); - decompress_and_copy_tile_data_to_vram(2, sMatchCallUI_Gfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(2, sMatchCallUI_Gfx, 0, 0, 0); SetBgTilemapBuffer(2, state->unk1024); CopyToBgTilemapBuffer(2, sMatchCallUI_Tilemap, 0, 0); CopyBgTilemapBufferToVram(2); @@ -333,7 +333,7 @@ static u32 LoopedTask_OpenMatchCall(s32 taskState) CopyBgTilemapBufferToVram(2); return LT_INC_AND_PAUSE; case 1: - if (free_temp_tile_data_buffers_if_possible()) + if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; sub_8199DF0(1, 0, 0, 1); @@ -343,16 +343,16 @@ static u32 LoopedTask_OpenMatchCall(s32 taskState) CopyBgTilemapBufferToVram(1); return LT_INC_AND_PAUSE; case 2: - if (free_temp_tile_data_buffers_if_possible()) + if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; sub_81CC034(state); - decompress_and_copy_tile_data_to_vram(3, gUnknown_08622760, 0, 0, 0); + DecompressAndCopyTileDataToVram(3, gUnknown_08622760, 0, 0, 0); CopyPaletteIntoBufferUnfaded(gUnknown_08622700, 0x30, 0x20); CopyPaletteIntoBufferUnfaded(gUnknown_08622720, 0x50, 0x20); return LT_INC_AND_PAUSE; case 3: - if (free_temp_tile_data_buffers_if_possible() || !sub_81CAE28()) + if (FreeTempTileDataBuffersIfPossible() || !sub_81CAE28()) return LT_PAUSE; sub_81CBBB8(); |