diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-11-12 18:44:01 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 18:44:01 -0600 |
| commit | 90a58c859bffa3ab6d6b1efb4b904a7a5416500d (patch) | |
| tree | 9dc1d2b06fa55f722da1204316d6f15d708ecbea /src/data | |
| parent | 0ad332124e5bf57d0a43122616a77cd8c9318250 (diff) | |
| parent | cacc17391765b3917acb3292ae2a49c61fd13dbe (diff) | |
Merge pull request #703 from Sewef/master
Some Trainer_Card work
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/graphics.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/data/graphics.c b/src/data/graphics.c index 6262734c3..60ba81dab 100644 --- a/src/data/graphics.c +++ b/src/data/graphics.c @@ -1080,17 +1080,17 @@ const u16 gPokenavCondition7_Pal[] = INCBIN_U16("graphics/pokenav/condition7.bin const u8 gPokenavTrainersEyesHeader_Gfx[] = INCBIN_U8("graphics/pokenav/trainereyes.4bpp.lz"); const u8 gPokenavRibbonsHeader_Gfx[] = INCBIN_U8("graphics/pokenav/ribbons.4bpp.lz"); -const u8 gMenuTrainerCard_Gfx[] = INCBIN_U8("graphics/misc/trainer_card.4bpp"); -const u16 gMenuTrainerCard0Star_Pal[] = INCBIN_U16("graphics/misc/trainer_card_0star.gbapal"); -const u16 gMenuTrainerCard1Star_Pal[] = INCBIN_U16("graphics/misc/trainer_card_1star.gbapal"); -const u16 gMenuTrainerCard2Star_Pal[] = INCBIN_U16("graphics/misc/trainer_card_2star.gbapal"); -const u16 gMenuTrainerCard3Star_Pal[] = INCBIN_U16("graphics/misc/trainer_card_3star.gbapal"); -const u16 gMenuTrainerCard4Star_Pal[] = INCBIN_U16("graphics/misc/trainer_card_4star.gbapal"); - -const u8 gUnknown_08E8CAC0[] = INCBIN_U8("graphics/unknown/unknown_E8CAC0.bin"); -const u8 gUnknown_08E8CFC0[] = INCBIN_U8("graphics/unknown/unknown_E8CFC0.bin"); -const u8 gUnknown_08E8D4C0[] = INCBIN_U8("graphics/unknown/unknown_E8D4C0.bin"); -const u8 gUnknown_08E8D9C0[] = INCBIN_U8("graphics/unknown/unknown_E8D9C0.bin"); +const u8 gMenuTrainerCard_Gfx[] = INCBIN_U8("graphics/trainer_card/trainer_card.4bpp"); +const u16 gMenuTrainerCard0Star_Pal[] = INCBIN_U16("graphics/trainer_card/trainer_card_0star.gbapal"); +const u16 gMenuTrainerCard1Star_Pal[] = INCBIN_U16("graphics/trainer_card/trainer_card_1star.gbapal"); +const u16 gMenuTrainerCard2Star_Pal[] = INCBIN_U16("graphics/trainer_card/trainer_card_2star.gbapal"); +const u16 gMenuTrainerCard3Star_Pal[] = INCBIN_U16("graphics/trainer_card/trainer_card_3star.gbapal"); +const u16 gMenuTrainerCard4Star_Pal[] = INCBIN_U16("graphics/trainer_card/trainer_card_4star.gbapal"); + +const u8 gMenuTrainerCardFront_Tilemap[] = INCBIN_U8("graphics/trainer_card/trainer_card_front.map.bin"); +const u8 gMenuTrainerCardBack_Tilemap[] = INCBIN_U8("graphics/trainer_card/trainer_card_back.map.bin"); +const u8 gMenuTrainerCardFront2_Tilemap[] = INCBIN_U8("graphics/trainer_card/trainer_card_front_2.map.bin"); +const u8 gMenuTrainerCardBackground_Tilemap[] = INCBIN_U8("graphics/trainer_card/trainer_card_background.map.bin"); const u8 gPSSMenuHeader_Gfx[] = INCBIN_U8("graphics/pokemon_storage/header.4bpp.lz"); const u16 gPSSMenu1_Pal[] = INCBIN_U16("graphics/pokemon_storage/menu1.gbapal"); |