summaryrefslogtreecommitdiff
path: root/src/pokenav_main_menu.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-06-13 16:15:11 -0400
committerGitHub <noreply@github.com>2020-06-13 16:15:11 -0400
commitc2a07276ae095a2345f68e34fcd76cdaffd889ea (patch)
tree9daf711e52915bee634e3a051f5a4f88db1d4a8f /src/pokenav_main_menu.c
parenta9a427c6f268e04468c8e30242f3ed4f96036848 (diff)
parent46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff)
Merge branch 'master' into doc-link
Diffstat (limited to 'src/pokenav_main_menu.c')
-rw-r--r--src/pokenav_main_menu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c
index fdd27b087..d9aae7e4e 100644
--- a/src/pokenav_main_menu.c
+++ b/src/pokenav_main_menu.c
@@ -342,18 +342,18 @@ static u32 LoopedTask_InitPokenavMenu(s32 a0)
ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, gPokenavMainMenuBgTemplates, ARRAY_COUNT(gPokenavMainMenuBgTemplates));
ResetBgPositions();
- reset_temp_tile_data_buffers();
+ ResetTempTileDataBuffers();
return LT_INC_AND_CONTINUE;
case 1:
structPtr = GetSubstructPtr(0);
- decompress_and_copy_tile_data_to_vram(0, &gPokenavHeader_Gfx, 0, 0, 0);
+ DecompressAndCopyTileDataToVram(0, &gPokenavHeader_Gfx, 0, 0, 0);
SetBgTilemapBuffer(0, structPtr->tilemapBuffer);
CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0);
CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, 0, 0x20);
CopyBgTilemapBufferToVram(0);
return LT_INC_AND_PAUSE;
case 2:
- if (free_temp_tile_data_buffers_if_possible())
+ if (FreeTempTileDataBuffersIfPossible())
return LT_PAUSE;
InitHelpBar();