dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync palette macros

Browse Source
This commit is contained in:
GriffinR
2023-05-23 13:02:51 -04:00
parent f93d5a8ae1
commit dcdb9024d8
117 changed files with 1248 additions and 1251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tm_case.c
+16 -16
View File
@@ -615,9 +615,9 @@ static bool8 HandleLoadTMCaseGraphicsAndPalettes(void)
break;
case 3:
if (gSaveBlock2Ptr->playerGender == MALE)
LoadCompressedPalette(gTMCaseMenu_Male_Pal, 0, 0x80);
LoadCompressedPalette(gTMCaseMenu_Male_Pal, BG_PLTT_ID(0), 4 * PLTT_SIZE_4BPP);
else
LoadCompressedPalette(gTMCaseMenu_Female_Pal, 0, 0x80);
LoadCompressedPalette(gTMCaseMenu_Female_Pal, BG_PLTT_ID(0), 4 * PLTT_SIZE_4BPP);
sTMCaseDynamicResources->seqId++;
break;
case 4:
@@ -1458,7 +1458,7 @@ static void Task_Pokedude_Run(u8 taskId)
sTMCaseStaticResources.selectedRow = sPokedudeBagBackup->selectedRow;
sTMCaseStaticResources.scrollOffset = sPokedudeBagBackup->scrollOffset;
Free(sPokedudeBagBackup);
CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, PLTT_SIZE);
CB2_SetUpReshowBattleScreenAfterMenu();
BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, 0);
tPokedudeState++;
@@ -1482,14 +1482,14 @@ static void InitWindowTemplatesAndPals(void)
InitWindows(sWindowTemplates);
DeactivateAllTextPrinters();
LoadUserWindowGfx(0, 0x5B, 0xE0);
LoadMenuMessageWindowGfx(0, 0x64, 0xB0);
LoadStdWindowGfx(0, 0x78, 0xD0);
LoadPalette(gStandardMenuPalette, 0xF0, 0x20);
LoadPalette(gStandardMenuPalette, 0xA0, 0x20);
LoadPalette(sPal3Override, 0xF6, 0x04);
LoadPalette(sPal3Override, 0xD6, 0x04);
ListMenuLoadStdPalAt(0xc0, 0x01);
LoadUserWindowGfx(0, 0x5B, BG_PLTT_ID(14));
LoadMenuMessageWindowGfx(0, 0x64, BG_PLTT_ID(11));
LoadStdWindowGfx(0, 0x78, BG_PLTT_ID(13));
LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
LoadPalette(gStandardMenuPalette, BG_PLTT_ID(10), PLTT_SIZE_4BPP);
LoadPalette(sPal3Override, BG_PLTT_ID(15) + 6, sizeof(sPal3Override));
LoadPalette(sPal3Override, BG_PLTT_ID(13) + 6, sizeof(sPal3Override));
ListMenuLoadStdPalAt(BG_PLTT_ID(12), 1);
for (i = 0; i < ARRAY_COUNT(sWindowTemplates) - 1; i++)
FillWindowPixelBuffer(i, 0x00);
PutWindowTilemap(WIN_LIST);
@@ -1507,12 +1507,12 @@ static void TMCase_Print(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8
static void TMCase_SetWindowBorder1(u8 windowId)
{
DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, 0x5B, 0x0E);
DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, 0x5B, 14);
}
static void TMCase_SetWindowBorder2(u8 windowId)
{
DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, 0x78, 0x0D);
DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, 0x78, 13);
}
static void PrintMessageWithFollowupTask(u8 taskId, u8 fontId, const u8 * str, TaskFunc func)
@@ -1647,10 +1647,10 @@ static void SetDiscSpriteAnim(struct Sprite *sprite, u8 tmIdx)
static void TintDiscpriteByType(u8 type)
{
u8 palIndex = IndexOfSpritePaletteTag(TAG_DISC) << 4;
LoadPalette(sTMSpritePaletteBuffer + sTMSpritePaletteOffsetByType[type], 0x100 | palIndex, 0x20);
u8 palOffset = PLTT_ID(IndexOfSpritePaletteTag(TAG_DISC));
LoadPalette(sTMSpritePaletteBuffer + sTMSpritePaletteOffsetByType[type], OBJ_PLTT_OFFSET + palOffset, PLTT_SIZE_4BPP);
if (sTMCaseStaticResources.menuType == TMCASE_POKEDUDE)
BlendPalettes(1 << (0x10 + palIndex), 4, RGB_BLACK);
BlendPalettes(1 << (16 + palOffset), 4, RGB_BLACK);
}
static void SetDiscSpritePosition(struct Sprite *sprite, u8 tmIdx)