diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-17 20:10:21 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-17 20:10:21 -0400 |
| commit | 8027698fd30d410f2262906a25c0f00170abd58f (patch) | |
| tree | 4b36f90f33d3d93a329956c5c88cba0d48157fb0 /src/berry_tag_screen.c | |
| parent | 61d54c967acbbfdc0aaeb3f96d5f7d4aa94c6dcf (diff) | |
| parent | d01a28c82fd25b8a92cbb1d508279e34690e3d26 (diff) | |
resolve tv.c conflict
Diffstat (limited to 'src/berry_tag_screen.c')
| -rw-r--r-- | src/berry_tag_screen.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 2d8ff2236..6cbc38ecc 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -41,13 +41,20 @@ extern u16 gUnknown_030041B4; extern const struct CompressedSpriteSheet gUnknown_083C1F74; extern const struct CompressedSpritePalette gUnknown_083C1F7C; -extern u8 *gUnknown_0841192C[]; - extern u8 gBerryCheck_Gfx[]; extern u8 gBerryCheck_Pal[]; extern u8 gUnknown_08E788E4[]; extern u8 gUnknown_08E78A84[]; +static const u8 *const gUnknown_0841192C[] = +{ + ContestStatsText_VerySoft, + ContestStatsText_Soft, + ContestStatsText_Hard, + ContestStatsText_VeryHard, + ContestStatsText_SuperHard, +}; + static void sub_8146014(void); static void sub_814602C(void); static bool8 sub_8146058(void); |