summaryrefslogtreecommitdiff
path: root/src/data/trainer_graphics/back_pic_tables.h
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-10-21 12:24:24 -0500
committerGitHub <noreply@github.com>2018-10-21 12:24:24 -0500
commit804d0a4b6a12907974ffd8cb20f6ed6c527b663b (patch)
treee9a7231867cc05a415f347beb354339f1cb909aa /src/data/trainer_graphics/back_pic_tables.h
parent2a3ba78831f2dca1ff0d3fe3f03844a993597b28 (diff)
parent8e7202ec3d289305190aedc66d02435571747a76 (diff)
Merge pull request #371 from Diegoisawesome/align_lz
Fix LZ compressed data alignment
Diffstat (limited to 'src/data/trainer_graphics/back_pic_tables.h')
-rw-r--r--src/data/trainer_graphics/back_pic_tables.h19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/data/trainer_graphics/back_pic_tables.h b/src/data/trainer_graphics/back_pic_tables.h
index 3e74902d8..8d4e27694 100644
--- a/src/data/trainer_graphics/back_pic_tables.h
+++ b/src/data/trainer_graphics/back_pic_tables.h
@@ -10,16 +10,19 @@ const struct MonCoords gTrainerBackPicCoords[] =
{8, 4},
};
+// this table goes functionally unused, since none of these pics are compressed
+// and the place they would get extracted to gets overwritten later anyway
+// the casts are so they'll play nice with the strict struct definition
const struct CompressedSpriteSheet gTrainerBackPicTable[] =
{
- gTrainerBackPic_Brendan, 0x2000, 0,
- gTrainerBackPic_May, 0x2000, 1,
- gTrainerBackPic_Red, 0x2800, 2,
- gTrainerBackPic_Leaf, 0x2800, 3,
- gTrainerBackPic_RubySapphireBrendan, 0x2000, 4,
- gTrainerBackPic_RubySapphireMay, 0x2000, 5,
- gTrainerBackPic_Wally, 0x2000, 6,
- gTrainerBackPic_Steven, 0x2000, 7,
+ (const u32 *)gTrainerBackPic_Brendan, 0x2000, 0,
+ (const u32 *)gTrainerBackPic_May, 0x2000, 1,
+ (const u32 *)gTrainerBackPic_Red, 0x2800, 2,
+ (const u32 *)gTrainerBackPic_Leaf, 0x2800, 3,
+ (const u32 *)gTrainerBackPic_RubySapphireBrendan, 0x2000, 4,
+ (const u32 *)gTrainerBackPic_RubySapphireMay, 0x2000, 5,
+ (const u32 *)gTrainerBackPic_Wally, 0x2000, 6,
+ (const u32 *)gTrainerBackPic_Steven, 0x2000, 7,
};
const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] =