Sync palette macros
This commit is contained in:
+7
-7
@@ -59,7 +59,7 @@ ALIGNED(4) EWRAM_DATA u16 gPlttBufferFaded[PLTT_BUFFER_SIZE] = {0};
|
||||
static EWRAM_DATA struct PaletteStruct sPaletteStructs[NUM_PALETTE_STRUCTS] = {0};
|
||||
EWRAM_DATA struct PaletteFadeControl gPaletteFade = {0};
|
||||
static EWRAM_DATA u32 sPlttBufferTransferPending = 0;
|
||||
EWRAM_DATA u8 gPaletteDecompressionBuffer[PLTT_DECOMP_BUFFER_SIZE] = {0};
|
||||
EWRAM_DATA u8 gPaletteDecompressionBuffer[PLTT_SIZE] = {0};
|
||||
|
||||
static const struct PaletteStructTemplate sDummyPaletteStructTemplate =
|
||||
{
|
||||
@@ -141,7 +141,7 @@ void ReadPlttIntoBuffers(void)
|
||||
u16 i;
|
||||
u16 *pltt = (u16 *)PLTT;
|
||||
|
||||
for (i = 0; i < PLTT_SIZE / 2; ++i)
|
||||
for (i = 0; i < PLTT_BUFFER_SIZE; ++i)
|
||||
{
|
||||
gPlttBufferUnfaded[i] = pltt[i];
|
||||
gPlttBufferFaded[i] = pltt[i];
|
||||
@@ -420,7 +420,7 @@ static u8 UpdateNormalPaletteFade(void)
|
||||
else
|
||||
{
|
||||
selectedPalettes = gPaletteFade_selectedPalettes >> 16;
|
||||
paletteOffset = 256;
|
||||
paletteOffset = OBJ_PLTT_OFFSET;
|
||||
}
|
||||
while (selectedPalettes)
|
||||
{
|
||||
@@ -559,13 +559,13 @@ static u8 UpdateFastPaletteFade(void)
|
||||
return gPaletteFade.active ? PALETTE_FADE_STATUS_ACTIVE : PALETTE_FADE_STATUS_DONE;
|
||||
if (gPaletteFade.objPaletteToggle)
|
||||
{
|
||||
paletteOffsetStart = 256;
|
||||
paletteOffsetEnd = 512;
|
||||
paletteOffsetStart = OBJ_PLTT_OFFSET;
|
||||
paletteOffsetEnd = PLTT_BUFFER_SIZE;
|
||||
}
|
||||
else
|
||||
{
|
||||
paletteOffsetStart = 0;
|
||||
paletteOffsetEnd = 256;
|
||||
paletteOffsetEnd = OBJ_PLTT_OFFSET;
|
||||
}
|
||||
switch (gPaletteFade_submode)
|
||||
{
|
||||
@@ -791,7 +791,7 @@ void BlendPalettes(u32 selectedPalettes, u8 coeff, u16 color)
|
||||
void BlendPalettesUnfaded(u32 selectedPalettes, u8 coeff, u16 color)
|
||||
{
|
||||
// This copy is done via DMA in both RUBY and EMERALD
|
||||
CpuFastCopy(gPlttBufferUnfaded, gPlttBufferFaded, 0x400);
|
||||
CpuFastCopy(gPlttBufferUnfaded, gPlttBufferFaded, PLTT_SIZE);
|
||||
BlendPalettes(selectedPalettes, coeff, color);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user