diff options
| -rw-r--r-- | data/berry_tag_screen.s | 12 | ||||
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | src/berry_tag_screen.c | 11 |
3 files changed, 10 insertions, 15 deletions
diff --git a/data/berry_tag_screen.s b/data/berry_tag_screen.s deleted file mode 100644 index d1be8a9d7..000000000 --- a/data/berry_tag_screen.s +++ /dev/null @@ -1,12 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_0841192C:: @ 841192C - .4byte ContestStatsText_VerySoft - .4byte ContestStatsText_Soft - .4byte ContestStatsText_Hard - .4byte ContestStatsText_VeryHard - .4byte ContestStatsText_SuperHard diff --git a/ld_script.txt b/ld_script.txt index a01ecb40e..2aed43e78 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -471,7 +471,7 @@ SECTIONS { src/lottery_corner.o(.rodata); src/diploma.o(.rodata); src/strings.o(.rodata); - data/berry_tag_screen.o(.rodata); + src/berry_tag_screen.o(.rodata); src/save_failed_screen.o(.rodata); data/pokeblock_feed.o(.rodata); data/intro_credits_graphics.o(.rodata); diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 0e81e4fec..244c90f46 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); |