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/overworld.c | |
| parent | a9a427c6f268e04468c8e30242f3ed4f96036848 (diff) | |
| parent | 46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff) | |
Merge branch 'master' into doc-link
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/overworld.c b/src/overworld.c index 87e394e39..ea0d633bc 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1858,7 +1858,7 @@ static bool32 map_loading_iteration_3(u8 *state) (*state)++; break; case 8: - if (free_temp_tile_data_buffers_if_possible() != TRUE) + if (FreeTempTileDataBuffersIfPossible() != TRUE) { apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); (*state)++; @@ -1933,7 +1933,7 @@ static bool32 load_map_stuff(u8 *state, u32 a2) (*state)++; break; case 8: - if (free_temp_tile_data_buffers_if_possible() != TRUE) + if (FreeTempTileDataBuffersIfPossible() != TRUE) { apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); (*state)++; @@ -2030,7 +2030,7 @@ static bool32 map_loading_iteration_2_link(u8 *state) (*state)++; break; case 7: - if (free_temp_tile_data_buffers_if_possible() != TRUE) + if (FreeTempTileDataBuffersIfPossible() != TRUE) { apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); (*state)++; @@ -2101,7 +2101,7 @@ static void sub_8086860(void) static void InitOverworldGraphicsRegisters(void) { clear_scheduled_bg_copies_to_vram(); - reset_temp_tile_data_buffers(); + ResetTempTileDataBuffers(); SetGpuReg(REG_OFFSET_MOSAIC, 0); SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ); SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WINOBJ_BG0); @@ -2113,9 +2113,9 @@ static void InitOverworldGraphicsRegisters(void) | BLDCNT_TGT2_OBJ | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(13, 7)); InitOverworldBgs(); - schedule_bg_copy_tilemap_to_vram(1); - schedule_bg_copy_tilemap_to_vram(2); - schedule_bg_copy_tilemap_to_vram(3); + ScheduleBgCopyTilemapToVram(1); + ScheduleBgCopyTilemapToVram(2); + ScheduleBgCopyTilemapToVram(3); ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); ChangeBgX(1, 0, 0); |