Decimal paletteNums

This commit is contained in:
Martin Griffin committed 2022-08-19 17:05:22 +01:00
1 parent 5719a7f7bc
commit d57442a511
103 files changed
+1032 -1032

No files matched your search

+5 -5
View File
@@ -140,7 +140,7 @@ static const struct WindowTemplate sMapSecInfoWindowTemplate =
.tilemapTop = 4,
.width = 12,
.height = 13,
.paletteNum = 0x1,
.paletteNum = 1,
.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, BG_PLTT_ID(0x4));
DrawTextBorderOuter(state->infoWindowId, 0x42, 0x4);
LoadUserWindowBorderGfx_(state->infoWindowId, 0x42, BG_PLTT_ID(4));
DrawTextBorderOuter(state->infoWindowId, 0x42, 4);
DecompressAndCopyTileDataToVram(1, sRegionMapCityZoomTiles_Gfx, 0, 0, 0);
FillWindowPixelBuffer(state->infoWindowId, PIXEL_FILL(1));
PutWindowTilemap(state->infoWindowId);
CopyWindowToVram(state->infoWindowId, COPYWIN_FULL);
CopyPaletteIntoBufferUnfaded(sMapSecInfoWindow_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP);
CopyPaletteIntoBufferUnfaded(gRegionMapCityZoomTiles_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP);
CopyPaletteIntoBufferUnfaded(sMapSecInfoWindow_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP);
CopyPaletteIntoBufferUnfaded(gRegionMapCityZoomTiles_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP);
if (!IsRegionMapZoomed())
ChangeBgY(1, -0x6000, BG_COORD_SET);
else