diff options
-rw-r--r-- | graphics-de/trainer_card/trainer_card.png (renamed from graphics-de/misc/trainer_card.png) | bin | 1417 -> 1417 bytes | |||
-rw-r--r-- | graphics/trainer_card/trainer_card.png (renamed from graphics/misc/trainer_card.png) | bin | 1583 -> 1583 bytes | |||
-rw-r--r-- | graphics/trainer_card/trainer_card_0star.pal (renamed from graphics/misc/trainer_card_0star.pal) | 0 | ||||
-rw-r--r-- | graphics/trainer_card/trainer_card_1star.pal (renamed from graphics/misc/trainer_card_1star.pal) | 0 | ||||
-rw-r--r-- | graphics/trainer_card/trainer_card_2star.pal (renamed from graphics/misc/trainer_card_2star.pal) | 0 | ||||
-rw-r--r-- | graphics/trainer_card/trainer_card_3star.pal (renamed from graphics/misc/trainer_card_3star.pal) | 0 | ||||
-rw-r--r-- | graphics/trainer_card/trainer_card_4star.pal (renamed from graphics/misc/trainer_card_4star.pal) | 0 | ||||
-rw-r--r-- | graphics/trainer_card/trainer_card_back.map.bin (renamed from graphics/unknown/unknown_E8CFC0.bin) | bin | 1280 -> 1280 bytes | |||
-rw-r--r-- | graphics/trainer_card/trainer_card_background.map.bin (renamed from graphics/unknown/unknown_E8D9C0.bin) | bin | 1280 -> 1280 bytes | |||
-rw-r--r-- | graphics/trainer_card/trainer_card_front.map.bin (renamed from graphics/unknown/unknown_E8CAC0.bin) | bin | 1280 -> 1280 bytes | |||
-rw-r--r-- | graphics/trainer_card/trainer_card_front_2.map.bin (renamed from graphics/unknown/unknown_E8D4C0.bin) | bin | 1280 -> 1280 bytes | |||
-rw-r--r-- | include/graphics.h | 8 | ||||
-rw-r--r-- | src/data/graphics.c | 22 | ||||
-rw-r--r-- | src/trainer_card.c | 12 |
14 files changed, 21 insertions, 21 deletions
diff --git a/graphics-de/misc/trainer_card.png b/graphics-de/trainer_card/trainer_card.png Binary files differindex fe5626f12..fe5626f12 100644 --- a/graphics-de/misc/trainer_card.png +++ b/graphics-de/trainer_card/trainer_card.png diff --git a/graphics/misc/trainer_card.png b/graphics/trainer_card/trainer_card.png Binary files differindex 915ecdca2..915ecdca2 100644 --- a/graphics/misc/trainer_card.png +++ b/graphics/trainer_card/trainer_card.png diff --git a/graphics/misc/trainer_card_0star.pal b/graphics/trainer_card/trainer_card_0star.pal index f49b7f2c5..f49b7f2c5 100644 --- a/graphics/misc/trainer_card_0star.pal +++ b/graphics/trainer_card/trainer_card_0star.pal diff --git a/graphics/misc/trainer_card_1star.pal b/graphics/trainer_card/trainer_card_1star.pal index 62c51c91f..62c51c91f 100644 --- a/graphics/misc/trainer_card_1star.pal +++ b/graphics/trainer_card/trainer_card_1star.pal diff --git a/graphics/misc/trainer_card_2star.pal b/graphics/trainer_card/trainer_card_2star.pal index bacce54f5..bacce54f5 100644 --- a/graphics/misc/trainer_card_2star.pal +++ b/graphics/trainer_card/trainer_card_2star.pal diff --git a/graphics/misc/trainer_card_3star.pal b/graphics/trainer_card/trainer_card_3star.pal index 21f3d83eb..21f3d83eb 100644 --- a/graphics/misc/trainer_card_3star.pal +++ b/graphics/trainer_card/trainer_card_3star.pal diff --git a/graphics/misc/trainer_card_4star.pal b/graphics/trainer_card/trainer_card_4star.pal index 4e1d56b54..4e1d56b54 100644 --- a/graphics/misc/trainer_card_4star.pal +++ b/graphics/trainer_card/trainer_card_4star.pal diff --git a/graphics/unknown/unknown_E8CFC0.bin b/graphics/trainer_card/trainer_card_back.map.bin Binary files differindex 0892a9a05..0892a9a05 100644 --- a/graphics/unknown/unknown_E8CFC0.bin +++ b/graphics/trainer_card/trainer_card_back.map.bin diff --git a/graphics/unknown/unknown_E8D9C0.bin b/graphics/trainer_card/trainer_card_background.map.bin Binary files differindex b4090f540..b4090f540 100644 --- a/graphics/unknown/unknown_E8D9C0.bin +++ b/graphics/trainer_card/trainer_card_background.map.bin diff --git a/graphics/unknown/unknown_E8CAC0.bin b/graphics/trainer_card/trainer_card_front.map.bin Binary files differindex 452e72026..452e72026 100644 --- a/graphics/unknown/unknown_E8CAC0.bin +++ b/graphics/trainer_card/trainer_card_front.map.bin diff --git a/graphics/unknown/unknown_E8D4C0.bin b/graphics/trainer_card/trainer_card_front_2.map.bin Binary files differindex 500150057..500150057 100644 --- a/graphics/unknown/unknown_E8D4C0.bin +++ b/graphics/trainer_card/trainer_card_front_2.map.bin diff --git a/include/graphics.h b/include/graphics.h index c9fdb9a81..9934c22a5 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2623,10 +2623,10 @@ extern const u16 gMenuTrainerCard1Star_Pal[]; extern const u16 gMenuTrainerCard2Star_Pal[]; extern const u16 gMenuTrainerCard3Star_Pal[]; extern const u16 gMenuTrainerCard4Star_Pal[]; -extern const u8 gUnknown_08E8CAC0[]; -extern const u8 gUnknown_08E8CFC0[]; -extern const u8 gUnknown_08E8D4C0[]; -extern const u8 gUnknown_08E8D9C0[]; +extern const u8 gMenuTrainerCardFront_Tilemap[]; +extern const u8 gMenuTrainerCardBack_Tilemap[]; +extern const u8 gMenuTrainerCardFront2_Tilemap[]; +extern const u8 gMenuTrainerCardBackground_Tilemap[]; extern const u8 gUnknown_08EA1DEC[]; extern const u16 gUnknown_08EA0328[]; 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) |