summaryrefslogtreecommitdiff
path: root/include/digit_obj_util.h
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-03-03 15:55:58 -0500
committerGitHub <noreply@github.com>2020-03-03 15:55:58 -0500
commit0e468b49bba6471ea9384ba49dbc8fb5e90f934b (patch)
tree4a30c1d98c6364514e3ece3f1f278b4d1c5617bc /include/digit_obj_util.h
parentdd22d97814bc152d356e076a8d0f19b0d3dd9230 (diff)
parentc2f85a5326dceb0b17618cae9947491667e9e7e7 (diff)
Merge pull request #284 from PikalaxALT/berry_crush
Berry crush
Diffstat (limited to 'include/digit_obj_util.h')
-rw-r--r--include/digit_obj_util.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/digit_obj_util.h b/include/digit_obj_util.h
index 11d51f1fc..1db775d26 100644
--- a/include/digit_obj_util.h
+++ b/include/digit_obj_util.h
@@ -11,8 +11,12 @@ struct DigitObjUtilTemplate
u8 xDelta;
s16 x;
s16 y;
- const struct SpriteSheet *spriteSheet;
- const struct SpritePalette *spritePal;
+ union
+ {
+ const struct SpriteSheet * uncompressed;
+ const struct CompressedSpriteSheet * compressed;
+ } spriteSheet;
+ const struct SpritePalette * spritePal;
};
extern const u16 gUnknown_8479668[];