dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Begin item_menu.c cleanup

Browse Source
This commit is contained in:
Sierraffinity
2020-05-14 01:37:09 -07:00
parent 70c5f923ad
commit 74edaed426
63 changed files with 885 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/region_map.c
View File

@@ -547,15 +547,15 @@ bool8 LoadRegionMapGfx(void)
{
case 0:
if (gRegionMap->bgManaged)
decompress_and_copy_tile_data_to_vram(gRegionMap->bgNum, sRegionMapBg_GfxLZ, 0, 0, 0);
DecompressAndCopyTileDataToVram(gRegionMap->bgNum, sRegionMapBg_GfxLZ, 0, 0, 0);
else
LZ77UnCompVram(sRegionMapBg_GfxLZ, (u16 *)BG_CHAR_ADDR(2));
break;
case 1:
if (gRegionMap->bgManaged)
{
if (!free_temp_tile_data_buffers_if_possible())
decompress_and_copy_tile_data_to_vram(gRegionMap->bgNum, sRegionMapBg_TilemapLZ, 0, 0, 1);
if (!FreeTempTileDataBuffersIfPossible())
DecompressAndCopyTileDataToVram(gRegionMap->bgNum, sRegionMapBg_TilemapLZ, 0, 0, 1);
}
else
{
@@ -563,7 +563,7 @@ bool8 LoadRegionMapGfx(void)
}
break;
case 2:
if (!free_temp_tile_data_buffers_if_possible())
if (!FreeTempTileDataBuffersIfPossible())
LoadPalette(sRegionMapBg_Pal, 0x70, 0x60);
break;
case 3:
@@ -1710,7 +1710,7 @@ void CB2_OpenFlyMap(void)
PutWindowTilemap(2);
FillWindowPixelBuffer(2, PIXEL_FILL(0));
AddTextPrinterParameterized(2, 1, gText_FlyToWhere, 0, 1, 0, NULL);
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
gMain.state++;
break;
case 8:
@@ -1778,7 +1778,7 @@ static void DrawFlyDestTextWindow(void)
AddTextPrinterParameterized(1, 1, sFlyMap->regionMap.mapSecName, 0, 1, 0, NULL);
name = sMultiNameFlyDestinations[i].name[sFlyMap->regionMap.posWithinMapSec];
AddTextPrinterParameterized(1, 1, name, GetStringRightAlignXOffset(1, name, 96), 17, 0, NULL);
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
gUnknown_03001180 = TRUE;
}
break;
@@ -1796,7 +1796,7 @@ static void DrawFlyDestTextWindow(void)
FillWindowPixelBuffer(0, PIXEL_FILL(1));
}
AddTextPrinterParameterized(0, 1, sFlyMap->regionMap.mapSecName, 0, 1, 0, NULL);
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
gUnknown_03001180 = FALSE;
}
}
@@ -1809,7 +1809,7 @@ static void DrawFlyDestTextWindow(void)
}
FillWindowPixelBuffer(0, PIXEL_FILL(1));
CopyWindowToVram(0, 2);
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
gUnknown_03001180 = FALSE;
}
}