diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/graphics.c | 22 | ||||
| -rw-r--r-- | src/trainer_card.c | 12 |
2 files changed, 17 insertions, 17 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"); diff --git a/src/trainer_card.c b/src/trainer_card.c index 541a4a061..b34517def 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -174,7 +174,7 @@ static void TrainerCard_ResetOffsetRegisters(void); static void TrainerCard_CopyGraphics(void); static void TrainerCard_LoadPalettes(void); static void TrainerCard_LoadTrainerGraphics(void); -static void sub_8093F14(void); +static void TrainerCard_LoadCardTileMap(void); static void sub_8093F48(void); static void sub_8093F64(void); static void TrainerCard_LoadTrainerTilemap(void); @@ -1211,7 +1211,7 @@ static void TrainerCard_DrawCardFront(void) { Menu_EraseScreen(); TrainerCard_ClearTrainerGraphics(); - sub_8093F14(); + TrainerCard_LoadCardTileMap(); TrainerCard_LoadTrainerTilemap(); TrainerCard_DrawStars(); TrainerCard_DisplayBadges(); @@ -1259,9 +1259,9 @@ static void TrainerCard_LoadTrainerGraphics(void) LoadTrainerGfx_TrainerCard(ewram0_2.displayedCard.gender, 80, (void *)(VRAM + 0x1880)); } -static void sub_8093F14(void) +static void TrainerCard_LoadCardTileMap(void) { - const void *arr[] = {gUnknown_08E8CAC0, gUnknown_08E8D4C0}; + const void *arr[] = {gMenuTrainerCardFront_Tilemap, gMenuTrainerCardFront2_Tilemap}; CpuFastSet(arr[ewram0_2.isShowingLinkCard], (void *)(VRAM + 0x4800), 0x140); } @@ -1287,12 +1287,12 @@ const u16 gTrainerCardBadgesMap[][4] = INCBIN_U16("graphics/trainer_card/83B5F8C static void sub_8093F48(void) { - CpuFastSet(gUnknown_08E8CFC0, (void *)(VRAM + 0x4800), 320); + CpuFastSet(gMenuTrainerCardBack_Tilemap, (void *)(VRAM + 0x4800), 320); } static void sub_8093F64(void) { - CpuFastSet(gUnknown_08E8D9C0, (void *)(VRAM + 0x5000), 320); + CpuFastSet(gMenuTrainerCardBackground_Tilemap, (void *)(VRAM + 0x5000), 320); } static void TrainerCard_LoadTrainerTilemap(void) |