ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 11:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move FRLG trainer card gfx to own folder, fix tiles

Browse Source
This commit is contained in:
GriffinR 2023-01-13 13:40:13 -05:00
parent 1707f82992
commit 387ea563fc
30 changed files with 105 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
graphics/trainer_card/one_star.pal → graphics/trainer_card/bronze.pal
View File

BIN
graphics/trainer_card/card.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 970 B

BIN
graphics/trainer_card/card_fr.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

0
graphics/trainer_card/two_stars.pal → graphics/trainer_card/copper.pal
View File

51
graphics/trainer_card/four_stars.pal
View File

@ -1,51 +0,0 @@
JASC-PAL
0100
48
139 98 115
246 246 222
246 238 172
164 164 164
123 123 123
98 98 115
41 57 65
57 106 139
65 139 197
246 230 139
230 213 49
213 197 57
156 115 57
106 189 255
205 205 205
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
106 180 213
41 123 164
0 0 0
0 0 0
98 98 115
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
106 189 255
205 205 205
0 0 0

0
graphics/trainer_card/back_fr.bin → graphics/trainer_card/frlg/back.bin
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
graphics/trainer_card/badges_fr.png → graphics/trainer_card/frlg/badges.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 587 B

After

Width:  |  Height:  |  Size: 587 B

0
graphics/trainer_card/bg_fr.bin → graphics/trainer_card/frlg/bg.bin
View File

0
graphics/trainer_card/0star_fr.pal → graphics/trainer_card/frlg/blue.pal
View File

0
graphics/trainer_card/two_stars_fr.pal → graphics/trainer_card/frlg/bronze.pal
View File

0
graphics/trainer_card/female_bg_fr.pal → graphics/trainer_card/frlg/female_bg.pal
View File

0
graphics/trainer_card/front_fr.bin → graphics/trainer_card/frlg/front.bin
View File

0
graphics/trainer_card/front_link_fr.bin → graphics/trainer_card/frlg/front_link.bin
View File

0
graphics/trainer_card/four_stars_fr.pal → graphics/trainer_card/frlg/gold.pal
View File

0
graphics/trainer_card/one_star_fr.pal → graphics/trainer_card/frlg/green.pal
View File

0
graphics/trainer_card/three_stars_fr.pal → graphics/trainer_card/frlg/silver.pal
View File

0
graphics/trainer_card/stickers_fr.png → graphics/trainer_card/frlg/stickers.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 387 B

0
graphics/trainer_card/stickers_fr1.pal → graphics/trainer_card/frlg/stickers1.pal
View File

0
graphics/trainer_card/stickers_fr2.pal → graphics/trainer_card/frlg/stickers2.pal
View File

0
graphics/trainer_card/stickers_fr3.pal → graphics/trainer_card/frlg/stickers3.pal
View File

0
graphics/trainer_card/stickers_fr4.pal → graphics/trainer_card/frlg/stickers4.pal
View File

BIN
graphics/trainer_card/frlg/tiles.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

56
graphics/trainer_card/gold.pal
View File

@ -1,19 +1,51 @@
JASC-PAL
0100
16
48
139 98 115
246 197 0
205 164 0
246 197 0
246 197 0
246 197 0
246 197 0
246 197 0
246 246 222
246 238 172
164 164 164
123 123 123
98 98 115
41 57 65
57 106 139
65 139 197
246 230 139
230 213 49
213 197 57
156 115 57
106 189 255
205 205 205
0 0 0
0 0 0
189 148 16
255 213 82
0 0 0
0 0 0
189 148 16
246 197 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
106 180 213
41 123 164
0 0 0
0 0 0
98 98 115
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
106 189 255
205 205 205
0 0 0

0
graphics/trainer_card/0star.pal → graphics/trainer_card/green.pal
View File

0
graphics/trainer_card/three_stars.pal → graphics/trainer_card/silver.pal
View File

19
graphics/trainer_card/star.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
139 98 115
246 197 0
205 164 0
246 197 0
246 197 0
246 197 0
246 197 0
246 197 0
0 0 0
0 0 0
189 148 16
255 213 82
0 0 0
0 0 0
189 148 16
246 197 0

BIN
graphics/trainer_card/tiles.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

4
include/graphics.h
View File

@ -4949,9 +4949,9 @@ extern const u16 gContestResultsTitle_Tough_Tilemap[];
extern const u16 gContestResultsTitle_Tilemap[];
// Trainer Card.
extern const u16 gHoennTrainerCard0Star_Pal[];
extern const u16 gHoennTrainerCardGreen_Pal[];
extern const u32 gHoennTrainerCard_Gfx[];
extern const u16 gKantoTrainerCard0Star_Pal[];
extern const u16 gKantoTrainerCardBlue_Pal[];
extern const u32 gKantoTrainerCard_Gfx[];
extern const u32 gKantoTrainerCardBg_Tilemap[];
extern const u32 gHoennTrainerCardBack_Tilemap[];

16
src/graphics.c
View File

@ -1374,19 +1374,19 @@ const u16 gUsePokeblockNatureWin_Pal[] = INCBIN_U16("graphics/pokeblock/use_scre
// trainer card
const u16 gHoennTrainerCard0Star_Pal[] = INCBIN_U16("graphics/trainer_card/0star.gbapal");
const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card.4bpp.lz");
const u16 gHoennTrainerCardGreen_Pal[] = INCBIN_U16("graphics/trainer_card/green.gbapal");
const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/tiles.4bpp.lz");
const u32 gHoennTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/bg.bin.lz");
const u32 gHoennTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/front.bin.lz");
const u32 gHoennTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back.bin.lz");
const u32 gHoennTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_link.bin.lz");
const u16 gKantoTrainerCard0Star_Pal[] = INCBIN_U16("graphics/trainer_card/0star_fr.gbapal");
const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card_fr.4bpp.lz");
const u32 gKantoTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/bg_fr.bin.lz");
const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_fr.bin.lz");
const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back_fr.bin.lz");
const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_link_fr.bin.lz");
const u16 gKantoTrainerCardBlue_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/blue.gbapal");
const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/frlg/tiles.4bpp.lz");
const u32 gKantoTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/bg.bin.lz");
const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front.bin.lz");
const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/back.bin.lz");
const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front_link.bin.lz");
// pokemon storage system

64
src/trainer_card.c
View File

@ -162,27 +162,27 @@ static bool8 Task_EndCardFlip(struct Task *task);
static void UpdateCardFlipRegs(u16);
static void LoadMonIconGfx(void);
static const u32 sTrainerCardStickers_Gfx[] = INCBIN_U32("graphics/trainer_card/stickers_fr.4bpp.lz");
static const u32 sTrainerCardStickers_Gfx[] = INCBIN_U32("graphics/trainer_card/frlg/stickers.4bpp.lz");
static const u16 sUnused_Pal[] = INCBIN_U16("graphics/trainer_card/unused.gbapal");
static const u16 sHoennTrainerCard1Star_Pal[] = INCBIN_U16("graphics/trainer_card/one_star.gbapal");
static const u16 sKantoTrainerCard1Star_Pal[] = INCBIN_U16("graphics/trainer_card/one_star_fr.gbapal");
static const u16 sHoennTrainerCard2Star_Pal[] = INCBIN_U16("graphics/trainer_card/two_stars.gbapal");
static const u16 sKantoTrainerCard2Star_Pal[] = INCBIN_U16("graphics/trainer_card/two_stars_fr.gbapal");
static const u16 sHoennTrainerCard3Star_Pal[] = INCBIN_U16("graphics/trainer_card/three_stars.gbapal");
static const u16 sKantoTrainerCard3Star_Pal[] = INCBIN_U16("graphics/trainer_card/three_stars_fr.gbapal");
static const u16 sHoennTrainerCard4Star_Pal[] = INCBIN_U16("graphics/trainer_card/four_stars.gbapal");
static const u16 sKantoTrainerCard4Star_Pal[] = INCBIN_U16("graphics/trainer_card/four_stars_fr.gbapal");
static const u16 sHoennTrainerCardBronze_Pal[] = INCBIN_U16("graphics/trainer_card/bronze.gbapal");
static const u16 sKantoTrainerCardGreen_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/green.gbapal");
static const u16 sHoennTrainerCardCopper_Pal[] = INCBIN_U16("graphics/trainer_card/copper.gbapal");
static const u16 sKantoTrainerCardBronze_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/bronze.gbapal");
static const u16 sHoennTrainerCardSilver_Pal[] = INCBIN_U16("graphics/trainer_card/silver.gbapal");
static const u16 sKantoTrainerCardSilver_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/silver.gbapal");
static const u16 sHoennTrainerCardGold_Pal[] = INCBIN_U16("graphics/trainer_card/gold.gbapal");
static const u16 sKantoTrainerCardGold_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/gold.gbapal");
static const u16 sHoennTrainerCardFemaleBg_Pal[] = INCBIN_U16("graphics/trainer_card/female_bg.gbapal");
static const u16 sKantoTrainerCardFemaleBg_Pal[] = INCBIN_U16("graphics/trainer_card/female_bg_fr.gbapal");
static const u16 sKantoTrainerCardFemaleBg_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/female_bg.gbapal");
static const u16 sHoennTrainerCardBadges_Pal[] = INCBIN_U16("graphics/trainer_card/badges.gbapal");
static const u16 sKantoTrainerCardBadges_Pal[] = INCBIN_U16("graphics/trainer_card/badges_fr.gbapal");
static const u16 sTrainerCardGold_Pal[] = INCBIN_U16("graphics/trainer_card/gold.gbapal");
static const u16 sTrainerCardSticker1_Pal[] = INCBIN_U16("graphics/trainer_card/stickers_fr1.gbapal");
static const u16 sTrainerCardSticker2_Pal[] = INCBIN_U16("graphics/trainer_card/stickers_fr2.gbapal");
static const u16 sTrainerCardSticker3_Pal[] = INCBIN_U16("graphics/trainer_card/stickers_fr3.gbapal");
static const u16 sTrainerCardSticker4_Pal[] = INCBIN_U16("graphics/trainer_card/stickers_fr4.gbapal");
static const u16 sKantoTrainerCardBadges_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/badges.gbapal");
static const u16 sTrainerCardStar_Pal[] = INCBIN_U16("graphics/trainer_card/star.gbapal");
static const u16 sTrainerCardSticker1_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/stickers1.gbapal");
static const u16 sTrainerCardSticker2_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/stickers2.gbapal");
static const u16 sTrainerCardSticker3_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/stickers3.gbapal");
static const u16 sTrainerCardSticker4_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/stickers4.gbapal");
static const u32 sHoennTrainerCardBadges_Gfx[] = INCBIN_U32("graphics/trainer_card/badges.4bpp.lz");
static const u32 sKantoTrainerCardBadges_Gfx[] = INCBIN_U32("graphics/trainer_card/badges_fr.4bpp.lz");
static const u32 sKantoTrainerCardBadges_Gfx[] = INCBIN_U32("graphics/trainer_card/frlg/badges.4bpp.lz");
static const struct BgTemplate sTrainerCardBgTemplates[4] =
{
@ -256,22 +256,22 @@ static const struct WindowTemplate sTrainerCardWindowTemplates[] =
DUMMY_WIN_TEMPLATE
};
static const u16 *const sHoennTrainerCardStarPals[] =
static const u16 *const sHoennTrainerCardPals[] =
{
gHoennTrainerCard0Star_Pal,
sHoennTrainerCard1Star_Pal,
sHoennTrainerCard2Star_Pal,
sHoennTrainerCard3Star_Pal,
sHoennTrainerCard4Star_Pal,
gHoennTrainerCardGreen_Pal, // Default (0 stars)
sHoennTrainerCardBronze_Pal, // 1 star
sHoennTrainerCardCopper_Pal, // 2 stars
sHoennTrainerCardSilver_Pal, // 3 stars
sHoennTrainerCardGold_Pal, // 4 stars
};
static const u16 *const sKantoTrainerCardStarPals[] =
static const u16 *const sKantoTrainerCardPals[] =
{
gKantoTrainerCard0Star_Pal,
sKantoTrainerCard1Star_Pal,
sKantoTrainerCard2Star_Pal,
sKantoTrainerCard3Star_Pal,
sKantoTrainerCard4Star_Pal,
gKantoTrainerCardBlue_Pal, // Default (0 stars)
sKantoTrainerCardGreen_Pal, // 1 star
sKantoTrainerCardBronze_Pal, // 2 stars
sKantoTrainerCardSilver_Pal, // 3 stars
sKantoTrainerCardGold_Pal, // 4 stars
};
static const u8 sTrainerCardTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY};
@ -1425,19 +1425,19 @@ static u8 SetCardBgsAndPals(void)
case 2:
if (sData->cardType != CARD_TYPE_FRLG)
{
LoadPalette(sHoennTrainerCardStarPals[sData->trainerCard.stars], 0, 96);
LoadPalette(sHoennTrainerCardPals[sData->trainerCard.stars], 0, 96);
LoadPalette(sHoennTrainerCardBadges_Pal, 48, 32);
if (sData->trainerCard.gender != MALE)
LoadPalette(sHoennTrainerCardFemaleBg_Pal, 16, 32);
}
else
{
LoadPalette(sKantoTrainerCardStarPals[sData->trainerCard.stars], 0, 96);
LoadPalette(sKantoTrainerCardPals[sData->trainerCard.stars], 0, 96);
LoadPalette(sKantoTrainerCardBadges_Pal, 48, 32);
if (sData->trainerCard.gender != MALE)
LoadPalette(sKantoTrainerCardFemaleBg_Pal, 16, 32);
}
LoadPalette(sTrainerCardGold_Pal, 64, 32);
LoadPalette(sTrainerCardStar_Pal, 64, 32);
break;
case 3:
SetBgTilemapBuffer(0, sData->cardTilemapBuffer);