diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-02 10:48:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 10:48:56 -0500 |
| commit | 6280a3786ba77956fae95bb11b425e7301d0a6fa (patch) | |
| tree | b140b92b4bd9113d0dea6c6ed8197ace1f93f8fe /src/graphics.c | |
| parent | 47f6e9f97396d1486fe515b8a994bbc285060419 (diff) | |
| parent | 5198a05272716990bcd98b9b216d3431adb25a3e (diff) | |
Merge branch 'master' into doc-sixisland
Diffstat (limited to 'src/graphics.c')
| -rw-r--r-- | src/graphics.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/graphics.c b/src/graphics.c index 47d699fdd..eaa49247c 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1210,10 +1210,10 @@ const u32 gUnknown_8E990F8[] = INCBIN_U32("graphics/interface/naming_screen_8E99 const u8 gUnknown_8E99118[] = INCBIN_U8("graphics/tm_case/unk_8E99118.4bpp"); -const u16 gFireRedTrainerCard_Pal[] = INCBIN_U16("graphics/trainer_card/0star.gbapal"); -const u32 gFireRedTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card.4bpp.lz"); -const u16 gEmeraldTrainerCard_Pal[] = INCBIN_U16("graphics/trainer_card/0star_em.gbapal"); -const u32 gEmeraldTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card_em.4bpp.lz"); +const u16 gKantoTrainerCard_Pal[] = INCBIN_U16("graphics/trainer_card/0star.gbapal"); +const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card.4bpp.lz"); +const u16 gHoennTrainerCard_Pal[] = INCBIN_U16("graphics/trainer_card/0star_em.gbapal"); +const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card_em.4bpp.lz"); const u16 gUnknown_8E99D8C[] = INCBIN_U16("graphics/link_rfu/unk_8E99DAC.gbapal"); const u32 gUnknown_8E99DAC[] = INCBIN_U32("graphics/link_rfu/unk_8E99DAC.4bpp.lz"); |