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

Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows

Browse Source
This commit is contained in:
GriffinR
2023-02-01 14:59:45 -05:00
parent c91b13a12b 603d870ea0
commit 4328ed8b19
259 changed files with 4375 additions and 5702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/region_map.c
View File

@@ -564,7 +564,7 @@ bool8 LoadRegionMapGfx(void)
break;
case 2:
if (!FreeTempTileDataBuffersIfPossible())
LoadPalette(sRegionMapBg_Pal, 0x70, 0x60);
LoadPalette(sRegionMapBg_Pal, BG_PLTT_ID(7), 3 * PLTT_SIZE_4BPP);
break;
case 3:
LZ77UnCompWram(sRegionMapCursorSmallGfxLZ, sRegionMap->cursorSmallImage);
@@ -1686,7 +1686,7 @@ void CB2_OpenFlyMap(void)
gMain.state++;
break;
case 3:
LoadUserWindowBorderGfx(0, 0x65, 0xd0);
LoadUserWindowBorderGfx(0, 0x65, BG_PLTT_ID(13));
ClearScheduledBgCopiesToVram();
gMain.state++;
break;
@@ -1709,7 +1709,7 @@ void CB2_OpenFlyMap(void)
gMain.state++;
break;
case 7:
LoadPalette(sRegionMapFramePal, 0x10, sizeof(sRegionMapFramePal));
LoadPalette(sRegionMapFramePal, BG_PLTT_ID(1), sizeof(sRegionMapFramePal));
PutWindowTilemap(WIN_FLY_TO_WHERE);
FillWindowPixelBuffer(WIN_FLY_TO_WHERE, PIXEL_FILL(0));
AddTextPrinterParameterized(WIN_FLY_TO_WHERE, FONT_NORMAL, gText_FlyToWhere, 0, 1, 0, NULL);