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_menu_handler_2.c | |
| parent | a9a427c6f268e04468c8e30242f3ed4f96036848 (diff) | |
| parent | 46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff) | |
Merge branch 'master' into doc-link
Diffstat (limited to 'src/pokenav_menu_handler_2.c')
| -rw-r--r-- | src/pokenav_menu_handler_2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/pokenav_menu_handler_2.c b/src/pokenav_menu_handler_2.c index 1dfbf3417..86ad8c744 100644 --- a/src/pokenav_menu_handler_2.c +++ b/src/pokenav_menu_handler_2.c @@ -410,7 +410,7 @@ static u32 LoopedTask_OpenMenu(s32 state) { case 0: InitBgTemplates(gUnknown_08620194, ARRAY_COUNT(gUnknown_08620194)); - decompress_and_copy_tile_data_to_vram(1, gPokenavMessageBox_Gfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, gPokenavMessageBox_Gfx, 0, 0, 0); SetBgTilemapBuffer(1, unk->bg1TilemapBuffer); CopyToBgTilemapBuffer(1, gPokenavMessageBox_Tilemap, 0, 0); CopyBgTilemapBufferToVram(1); @@ -423,23 +423,23 @@ static u32 LoopedTask_OpenMenu(s32 state) ChangeBgY(3, 0, 0); return LT_INC_AND_PAUSE; case 1: - if (free_temp_tile_data_buffers_if_possible()) + if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; - decompress_and_copy_tile_data_to_vram(2, gUnknown_0861FD6C, 0, 0, 0); - decompress_and_copy_tile_data_to_vram(2, gUnknown_0861FFF4, 0, 0, 1); + DecompressAndCopyTileDataToVram(2, gUnknown_0861FD6C, 0, 0, 0); + DecompressAndCopyTileDataToVram(2, gUnknown_0861FFF4, 0, 0, 1); CopyPaletteIntoBufferUnfaded(gUnknown_0861FD4C, 0x20, 0x20); return LT_INC_AND_PAUSE; case 2: - if (free_temp_tile_data_buffers_if_possible()) + if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; - decompress_and_copy_tile_data_to_vram(3, gUnknown_0861FC98, 0, 0, 0); - decompress_and_copy_tile_data_to_vram(3, gUnknown_0861FCAC, 0, 0, 1); + DecompressAndCopyTileDataToVram(3, gUnknown_0861FC98, 0, 0, 0); + DecompressAndCopyTileDataToVram(3, gUnknown_0861FCAC, 0, 0, 1); CopyPaletteIntoBufferUnfaded(gUnknown_0861FC78, 0x30, 0x20); if (GetPokenavMenuType() == POKENAV_MENU_TYPE_CONDITION || GetPokenavMenuType() == POKENAV_MENU_TYPE_CONDITION_SEARCH) sub_81CA850(); return LT_INC_AND_PAUSE; case 3: - if (free_temp_tile_data_buffers_if_possible()) + if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; AddOptionDescriptionWindow(); sub_81CA7D4(); |