diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /include/intro_credits_graphics.h | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'include/intro_credits_graphics.h')
| -rw-r--r-- | include/intro_credits_graphics.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/intro_credits_graphics.h b/include/intro_credits_graphics.h index 2718d2f9f..303f50095 100644 --- a/include/intro_credits_graphics.h +++ b/include/intro_credits_graphics.h @@ -1,14 +1,14 @@ #ifndef GUARD_INTRO_CREDITS_GRAPHICS_H #define GUARD_INTRO_CREDITS_GRAPHICS_H -extern const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet; -extern const struct CompressedSpriteSheet gIntro2MaySpriteSheet; -extern const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet; -extern const struct CompressedSpriteSheet gIntro2LatiosSpriteSheet; -extern const struct CompressedSpriteSheet gIntro2LatiasSpriteSheet; +extern const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet[]; +extern const struct CompressedSpriteSheet gIntro2MaySpriteSheet[]; +extern const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet[]; +extern const struct CompressedSpriteSheet gIntro2LatiosSpriteSheet[]; +extern const struct CompressedSpriteSheet gIntro2LatiasSpriteSheet[]; extern const struct SpritePalette gIntro2SpritePalettes[]; -extern const struct CompressedSpriteSheet gUnknown_08416E24; -extern const struct CompressedSpriteSheet gUnknown_08416E34; +extern const struct CompressedSpriteSheet gUnknown_08416E24[]; +extern const struct CompressedSpriteSheet gUnknown_08416E34[]; void load_intro_part2_graphics(u8 a); void sub_8148C78(u8 a); |