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

62
src/trainer_card.c
View File

@@ -231,7 +231,7 @@ static const struct WindowTemplate sTrainerCardWindowTemplates[] =
.tilemapTop = 15,
.width = 27,
.height = 4,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x253,
},
{
@@ -240,7 +240,7 @@ static const struct WindowTemplate sTrainerCardWindowTemplates[] =
.tilemapTop = 1,
.width = 28,
.height = 18,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x1,
},
{
@@ -249,7 +249,7 @@ static const struct WindowTemplate sTrainerCardWindowTemplates[] =
.tilemapTop = 5,
.width = 9,
.height = 10,
.paletteNum = 0x8,
.paletteNum = 8,
.baseBlock = 0x150,
},
DUMMY_WIN_TEMPLATE
@@ -1371,7 +1371,7 @@ static void LoadMonIconGfx(void)
TintPalette_SepiaTone(sData->monIconPal, 96);
break;
}
LoadPalette(sData->monIconPal, BG_PLTT_ID(0x5), 6 * PLTT_SIZE_4BPP);
LoadPalette(sData->monIconPal, BG_PLTT_ID(5), 6 * PLTT_SIZE_4BPP);
for (i = 0; i < PARTY_SIZE; i++)
{
@@ -1398,10 +1398,10 @@ static void PrintStickersOnCard(void)
static void LoadStickerGfx(void)
{
LoadPalette(sTrainerCardSticker1_Pal, BG_PLTT_ID(0xB), PLTT_SIZE_4BPP);
LoadPalette(sTrainerCardSticker2_Pal, BG_PLTT_ID(0xC), PLTT_SIZE_4BPP);
LoadPalette(sTrainerCardSticker3_Pal, BG_PLTT_ID(0xD), PLTT_SIZE_4BPP);
LoadPalette(sTrainerCardSticker4_Pal, BG_PLTT_ID(0xE), PLTT_SIZE_4BPP);
LoadPalette(sTrainerCardSticker1_Pal, BG_PLTT_ID(11), PLTT_SIZE_4BPP);
LoadPalette(sTrainerCardSticker2_Pal, BG_PLTT_ID(12), PLTT_SIZE_4BPP);
LoadPalette(sTrainerCardSticker3_Pal, BG_PLTT_ID(13), PLTT_SIZE_4BPP);
LoadPalette(sTrainerCardSticker4_Pal, BG_PLTT_ID(14), PLTT_SIZE_4BPP);
LoadBgTiles(3, sData->stickerTiles, 1024, 128);
}
@@ -1424,19 +1424,19 @@ static u8 SetCardBgsAndPals(void)
case 2:
if (sData->cardType != CARD_TYPE_FRLG)
{
LoadPalette(sHoennTrainerCardStarPals[sData->trainerCard.stars], BG_PLTT_ID(0x0), 3 * PLTT_SIZE_4BPP);
LoadPalette(sHoennTrainerCardBadges_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP);
LoadPalette(sHoennTrainerCardStarPals[sData->trainerCard.stars], BG_PLTT_ID(0), 3 * PLTT_SIZE_4BPP);
LoadPalette(sHoennTrainerCardBadges_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP);
if (sData->trainerCard.gender != MALE)
LoadPalette(sHoennTrainerCardFemaleBg_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP);
LoadPalette(sHoennTrainerCardFemaleBg_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP);
}
else
{
LoadPalette(sKantoTrainerCardStarPals[sData->trainerCard.stars], BG_PLTT_ID(0x0), 3 * PLTT_SIZE_4BPP);
LoadPalette(sKantoTrainerCardBadges_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP);
LoadPalette(sKantoTrainerCardStarPals[sData->trainerCard.stars], BG_PLTT_ID(0), 3 * PLTT_SIZE_4BPP);
LoadPalette(sKantoTrainerCardBadges_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP);
if (sData->trainerCard.gender != MALE)
LoadPalette(sKantoTrainerCardFemaleBg_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP);
LoadPalette(sKantoTrainerCardFemaleBg_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP);
}
LoadPalette(sTrainerCardGold_Pal, BG_PLTT_ID(0x4), PLTT_SIZE_4BPP);
LoadPalette(sTrainerCardGold_Pal, BG_PLTT_ID(4), PLTT_SIZE_4BPP);
break;
case 3:
SetBgTilemapBuffer(0, sData->cardTilemapBuffer);
@@ -1495,9 +1495,9 @@ static void DrawStarsAndBadgesOnCard(void)
s16 i, x;
u16 tileNum = 192;
u8 palNum = 0x3;
u8 palNum = 3;
FillBgTilemapBufferRect(3, 143, 15, yOffsets[sData->isHoenn], sData->trainerCard.stars, 1, 0x4);
FillBgTilemapBufferRect(3, 143, 15, yOffsets[sData->isHoenn], sData->trainerCard.stars, 1, 4);
if (!sData->isLink)
{
x = 4;
@@ -1521,38 +1521,38 @@ static void DrawCardBackStats(void)
{
if (sData->hasTrades)
{
FillBgTilemapBufferRect(3, 141, 27, 9, 1, 1, 0x1);
FillBgTilemapBufferRect(3, 157, 27, 10, 1, 1, 0x1);
FillBgTilemapBufferRect(3, 141, 27, 9, 1, 1, 1);
FillBgTilemapBufferRect(3, 157, 27, 10, 1, 1, 1);
}
if (sData->trainerCard.linkPoints.berryCrush)
{
FillBgTilemapBufferRect(3, 141, 21, 13, 1, 1, 0x1);
FillBgTilemapBufferRect(3, 157, 21, 14, 1, 1, 0x1);
FillBgTilemapBufferRect(3, 141, 21, 13, 1, 1, 1);
FillBgTilemapBufferRect(3, 157, 21, 14, 1, 1, 1);
}
if (sData->trainerCard.unionRoomNum)
{
FillBgTilemapBufferRect(3, 141, 27, 11, 1, 1, 0x1);
FillBgTilemapBufferRect(3, 157, 27, 12, 1, 1, 0x1);
FillBgTilemapBufferRect(3, 141, 27, 11, 1, 1, 1);
FillBgTilemapBufferRect(3, 157, 27, 12, 1, 1, 1);
}
}
else
{
if (sData->hasTrades)
{
FillBgTilemapBufferRect(3, 141, 27, 9, 1, 1, 0x0);
FillBgTilemapBufferRect(3, 157, 27, 10, 1, 1, 0x0);
FillBgTilemapBufferRect(3, 141, 27, 9, 1, 1, 0);
FillBgTilemapBufferRect(3, 157, 27, 10, 1, 1, 0);
}
if (sData->trainerCard.contestsWithFriends)
{
FillBgTilemapBufferRect(3, 141, 27, 13, 1, 1, 0x0);
FillBgTilemapBufferRect(3, 157, 27, 14, 1, 1, 0x0);
FillBgTilemapBufferRect(3, 141, 27, 13, 1, 1, 0);
FillBgTilemapBufferRect(3, 157, 27, 14, 1, 1, 0);
}
if (sData->hasBattleTowerWins)
{
FillBgTilemapBufferRect(3, 141, 17, 15, 1, 1, 0x0);
FillBgTilemapBufferRect(3, 157, 17, 16, 1, 1, 0x0);
FillBgTilemapBufferRect(3, 140, 27, 15, 1, 1, 0x0);
FillBgTilemapBufferRect(3, 156, 27, 16, 1, 1, 0x0);
FillBgTilemapBufferRect(3, 141, 17, 15, 1, 1, 0);
FillBgTilemapBufferRect(3, 157, 17, 16, 1, 1, 0);
FillBgTilemapBufferRect(3, 140, 27, 15, 1, 1, 0);
FillBgTilemapBufferRect(3, 156, 27, 16, 1, 1, 0);
}
}
CopyBgTilemapBufferToVram(3);