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/pokeblock_feed.c | |
| parent | a9a427c6f268e04468c8e30242f3ed4f96036848 (diff) | |
| parent | 46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff) | |
Merge branch 'master' into doc-link
Diffstat (limited to 'src/pokeblock_feed.c')
| -rw-r--r-- | src/pokeblock_feed.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 5edf14309..f6e6a19b2 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -607,11 +607,11 @@ void CB2_PreparePokeblockFeedScene(void) { while (1) { - if (sub_81221EC() == TRUE) + if (MenuHelpers_CallLinkSomething() == TRUE) break; if (TransitionToPokeblockFeedScene() == TRUE) break; - if (sub_81221AC() == TRUE) + if (MenuHelpers_LinkSomething() == TRUE) break; } } @@ -624,7 +624,7 @@ static void HandleInitBackgrounds(void) InitBgsFromTemplates(0, sBackgroundTemplates, ARRAY_COUNT(sBackgroundTemplates)); SetBgTilemapBuffer(1, sPokeblockFeed->tilemapBuffer); ResetAllBgsCoordinates(); - schedule_bg_copy_tilemap_to_vram(1); + ScheduleBgCopyTilemapToVram(1); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); @@ -676,12 +676,12 @@ static bool8 LoadMonAndSceneGfx(struct Pokemon *mon) sPokeblockFeed->loadGfxState++; break; case 6: - reset_temp_tile_data_buffers(); - decompress_and_copy_tile_data_to_vram(1, gBattleTerrainTiles_Building, 0, 0, 0); + ResetTempTileDataBuffers(); + DecompressAndCopyTileDataToVram(1, gBattleTerrainTiles_Building, 0, 0, 0); sPokeblockFeed->loadGfxState++; break; case 7: - if (free_temp_tile_data_buffers_if_possible() != TRUE) + if (FreeTempTileDataBuffersIfPossible() != TRUE) { LZDecompressWram(gUnknown_08D9BA44, sPokeblockFeed->tilemapBuffer); sPokeblockFeed->loadGfxState++; @@ -704,7 +704,7 @@ static void HandleInitWindows(void) LoadPalette(gUnknown_0860F074, 0xF0, 0x20); FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); } static void SetPokeblockSpritePal(u8 pokeblockCaseId) |