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

Decimal paletteNums

Browse Source
This commit is contained in:
Martin Griffin
2022-08-19 16:32:00 +01:00
parent 5719a7f7bc
commit d57442a511
103 changed files with 1032 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/contest.c
View File

@@ -733,7 +733,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
.tilemapTop = 0,
.width = 12,
.height = 2,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x200
},
[WIN_CONTESTANT1_NAME] = {
@@ -742,7 +742,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
.tilemapTop = 5,
.width = 12,
.height = 2,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x218
},
[WIN_CONTESTANT2_NAME] = {
@@ -751,7 +751,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
.tilemapTop = 10,
.width = 12,
.height = 2,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x230
},
[WIN_CONTESTANT3_NAME] = {
@@ -760,7 +760,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
.tilemapTop = 15,
.width = 12,
.height = 2,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x248
},
[WIN_GENERAL_TEXT] = {
@@ -769,7 +769,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
.tilemapTop = 15,
.width = 17,
.height = 4,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x260
},
[WIN_MOVE0] = {
@@ -778,7 +778,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
.tilemapTop = 31,
.width = 9,
.height = 2,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x2A4
},
[WIN_MOVE1] = {
@@ -787,7 +787,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
.tilemapTop = 33,
.width = 9,
.height = 2,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x2B6
},
[WIN_MOVE2] = {
@@ -796,7 +796,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
.tilemapTop = 35,
.width = 9,
.height = 2,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x2C8
},
[WIN_MOVE3] = {
@@ -805,7 +805,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
.tilemapTop = 37,
.width = 9,
.height = 2,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x2DA
},
[WIN_SLASH] = {
@@ -814,7 +814,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
.tilemapTop = 31,
.width = 1,
.height = 2,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x2EC
},
[WIN_MOVE_DESCRIPTION] = {
@@ -823,7 +823,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
.tilemapTop = 35,
.width = 18,
.height = 4,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x2EE
},
DUMMY_WIN_TEMPLATE
@@ -1038,7 +1038,7 @@ void LoadContestBgAfterMoveAnim(void)
{
u32 contestantWindowId = 5 + i;
LoadPalette(eContestTempSave.cachedWindowPalettes[contestantWindowId], BG_PLTT_ID(0x5 + gContestantTurnOrder[i]), sizeof((eContestTempSave.cachedWindowPalettes[contestantWindowId])));
LoadPalette(eContestTempSave.cachedWindowPalettes[contestantWindowId], BG_PLTT_ID(5 + gContestantTurnOrder[i]), sizeof((eContestTempSave.cachedWindowPalettes[contestantWindowId])));
}
}
@@ -1073,11 +1073,11 @@ static void LoadContestPalettes(void)
{
s32 i;
LoadPalette(sText_Pal, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP);
LoadPalette(sText_Pal, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
SetBackdropFromColor(RGB_BLACK);
for (i = 10; i < 14; i++)
LoadPalette(gPlttBufferUnfaded + BG_PLTT_ID(0xF) + 1, BG_PLTT_ID(0xF) + i, PLTT_SIZEOF(1));
FillPalette(RGB(31, 17, 31), BG_PLTT_ID(0xF) + 3, PLTT_SIZEOF(1));
LoadPalette(gPlttBufferUnfaded + BG_PLTT_ID(15) + 1, BG_PLTT_ID(15) + i, PLTT_SIZEOF(1));
FillPalette(RGB(31, 17, 31), BG_PLTT_ID(15) + 3, PLTT_SIZEOF(1));
}
static void InitContestResources(void)
@@ -1328,10 +1328,10 @@ static bool8 SetupContestGraphics(u8 *stateVar)
break;
case 5:
LoadCompressedPalette(gContestInterfaceAudiencePalette, BG_PLTT_OFFSET, BG_PLTT_SIZE);
CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(0x8), tempPalette1, PLTT_SIZE_4BPP);
CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(0x5 + gContestPlayerMonIndex), tempPalette2, 16 * sizeof(u16));
CpuCopy32(tempPalette2, gPlttBufferUnfaded + BG_PLTT_ID(0x8), PLTT_SIZE_4BPP);
CpuCopy32(tempPalette1, gPlttBufferUnfaded + BG_PLTT_ID(0x5 + gContestPlayerMonIndex), PLTT_SIZE_4BPP);
CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(8), tempPalette1, PLTT_SIZE_4BPP);
CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(5 + gContestPlayerMonIndex), tempPalette2, PLTT_SIZE_4BPP);
CpuCopy32(tempPalette2, gPlttBufferUnfaded + BG_PLTT_ID(8), PLTT_SIZE_4BPP);
CpuCopy32(tempPalette1, gPlttBufferUnfaded + BG_PLTT_ID(5 + gContestPlayerMonIndex), PLTT_SIZE_4BPP);
DmaCopy32Defvars(3, gPlttBufferUnfaded, eContestTempSave.cachedWindowPalettes, sizeof(eContestTempSave.cachedWindowPalettes));
LoadContestPalettes();
break;
@@ -3097,7 +3097,7 @@ static u8 CreateJudgeSprite(void)
u8 spriteId;
LoadCompressedSpriteSheet(&sSpriteSheet_Judge);
LoadCompressedPalette(gContest2Pal, OBJ_PLTT_ID(0x1), PLTT_SIZE_4BPP);
LoadCompressedPalette(gContest2Pal, OBJ_PLTT_ID(1), PLTT_SIZE_4BPP);
spriteId = CreateSprite(&sSpriteTemplate_Judge, 112, 36, 30);
gSprites[spriteId].oam.paletteNum = 1;
gSprites[spriteId].callback = SpriteCallbackDummy;
@@ -3126,7 +3126,7 @@ static u8 CreateContestantSprite(u16 species, u32 otId, u32 personality, u32 ind
else
HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species], gMonSpritesGfxPtr->sprites.ptr[B_POSITION_PLAYER_LEFT], species, personality);
LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), OBJ_PLTT_ID(0x2), PLTT_SIZE_4BPP);
LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), OBJ_PLTT_ID(2), PLTT_SIZE_4BPP);
SetMultiuseSpriteTemplateToPokemon(species, B_POSITION_PLAYER_LEFT);
spriteId = CreateSprite(&gMultiuseSpriteTemplate, 0x70, GetBattlerSpriteFinal_Y(2, species, FALSE), 30);
@@ -3997,7 +3997,7 @@ static void Task_StopFlashJudgeAttentionEye(u8 taskId)
{
gTasks[eContest.judgeAttentionTaskId].data[contestant * 4 + 0] = 0xFF;
gTasks[eContest.judgeAttentionTaskId].data[contestant * 4 + 1] = 0;
BlendPalette(BG_PLTT_ID(0x5 + eContest.prevTurnOrder[contestant]) + 6, 2, 0, RGB(31, 31, 18));
BlendPalette(BG_PLTT_ID(5 + eContest.prevTurnOrder[contestant]) + 6, 2, 0, RGB(31, 31, 18));
DestroyTask(taskId);
}
}
@@ -4021,7 +4021,7 @@ static void Task_FlashJudgeAttentionEye(u8 taskId)
|| gTasks[taskId].data[offset + 0] == 0)
gTasks[taskId].data[offset + 1] ^= 1;
BlendPalette(BG_PLTT_ID(0x5 + eContest.prevTurnOrder[i]) + 6, 2, gTasks[taskId].data[offset + 0], RGB(31, 31, 18));
BlendPalette(BG_PLTT_ID(5 + eContest.prevTurnOrder[i]) + 6, 2, gTasks[taskId].data[offset + 0], RGB(31, 31, 18));
}
}
}
@@ -4100,8 +4100,8 @@ static void Task_UnusedBlend(u8 taskId)
|| gTasks[taskId].data[idx] == 0)
gTasks[taskId].data[idx + 1] ^= 1;
BlendPalette(BG_PLTT_ID(0x5 + i) + 10, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18));
BlendPalette(BG_PLTT_ID(0x5 + i) + 12 + i, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18));
BlendPalette(BG_PLTT_ID(5 + i) + 10, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18));
BlendPalette(BG_PLTT_ID(5 + i) + 12 + i, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18));
}
}
}
@@ -4414,7 +4414,7 @@ static void DrawContestantWindows(void)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
s32 windowId = i + 5;
LoadPalette(eContestTempSave.cachedWindowPalettes[windowId], BG_PLTT_ID(0x5 + gContestantTurnOrder[i]), sizeof(eContestTempSave.cachedWindowPalettes[0]));
LoadPalette(eContestTempSave.cachedWindowPalettes[windowId], BG_PLTT_ID(5 + gContestantTurnOrder[i]), sizeof(eContestTempSave.cachedWindowPalettes[0]));
}
DrawContestantWindowText();
}
@@ -4992,8 +4992,8 @@ static void Task_BlendAudienceBackground(u8 taskId)
else
gTasks[taskId].tBlendCoeff--;
BlendPalette(BG_PLTT_ID(0x1) + 1, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor);
BlendPalette(BG_PLTT_ID(0x1) + 10, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor);
BlendPalette(BG_PLTT_ID(1) + 1, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor);
BlendPalette(BG_PLTT_ID(1) + 10, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor);
if (gTasks[taskId].tBlendCoeff == gTasks[taskId].tTargetBlendCoeff)
{