Write palette IDs in hex
This commit is contained in:
@@ -140,7 +140,7 @@ static const struct WindowTemplate sMapSecInfoWindowTemplate =
|
||||
.tilemapTop = 4,
|
||||
.width = 12,
|
||||
.height = 13,
|
||||
.paletteNum = 1,
|
||||
.paletteNum = 0x1,
|
||||
.baseBlock = 0x4C
|
||||
};
|
||||
|
||||
@@ -509,14 +509,14 @@ static void LoadPokenavRegionMapGfx(struct Pokenav_RegionMapGfx *state)
|
||||
CpuFill16(0x1040, state->tilemapBuffer, 0x800);
|
||||
SetBgTilemapBuffer(1, state->tilemapBuffer);
|
||||
state->infoWindowId = AddWindow(&sMapSecInfoWindowTemplate);
|
||||
LoadUserWindowBorderGfx_(state->infoWindowId, 0x42, 0x40);
|
||||
DrawTextBorderOuter(state->infoWindowId, 0x42, 4);
|
||||
LoadUserWindowBorderGfx_(state->infoWindowId, 0x42, BG_PLTT_ID(0x4));
|
||||
DrawTextBorderOuter(state->infoWindowId, 0x42, 0x4);
|
||||
DecompressAndCopyTileDataToVram(1, sRegionMapCityZoomTiles_Gfx, 0, 0, 0);
|
||||
FillWindowPixelBuffer(state->infoWindowId, PIXEL_FILL(1));
|
||||
PutWindowTilemap(state->infoWindowId);
|
||||
CopyWindowToVram(state->infoWindowId, COPYWIN_FULL);
|
||||
CopyPaletteIntoBufferUnfaded(sMapSecInfoWindow_Pal, 0x10, 0x20);
|
||||
CopyPaletteIntoBufferUnfaded(gRegionMapCityZoomTiles_Pal, 0x30, 0x20);
|
||||
CopyPaletteIntoBufferUnfaded(sMapSecInfoWindow_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP);
|
||||
CopyPaletteIntoBufferUnfaded(gRegionMapCityZoomTiles_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP);
|
||||
if (!IsRegionMapZoomed())
|
||||
ChangeBgY(1, -0x6000, BG_COORD_SET);
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user