diff options
| -rw-r--r-- | data/data_8479668.s | 12 | ||||
| -rw-r--r-- | ld_script.txt | 3 | ||||
| -rw-r--r-- | src/digit_obj_util.c | 4 |
3 files changed, 5 insertions, 14 deletions
diff --git a/data/data_8479668.s b/data/data_8479668.s index 6d8a22898..0ddecfe58 100644 --- a/data/data_8479668.s +++ b/data/data_8479668.s @@ -13,18 +13,6 @@ .section .rodata - .align 2 -gUnknown_8479668:: @ 8479668 - .incbin "graphics/misc/unk_8479688.gbapal" - -gUnknown_8479688:: - .incbin "graphics/misc/unk_8479688.4bpp.lz" - -gUnknown_8479748:: - .incbin "graphics/misc/unk_8479748.4bpp.lz" - - .section .rodata.after_trainer_tower - // berry_fix_program gUnknown_847A8D8:: diff --git a/ld_script.txt b/ld_script.txt index 0b2c0e06c..2fa7fe805 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -582,14 +582,13 @@ SECTIONS { src/battle_controller_pokedude.o(.rodata); src/teachy_tv.o(.rodata); src/digit_obj_util.o(.rodata); - data/data_8479668.o(.rodata); src/ss_anne.o(.rodata); src/cereader_tool.o(.rodata); src/renewable_hidden_items.o(.rodata); src/trainer_tower.o(.rodata); src/minigame_countdown.o(.rodata); src/berry_fix_program.o(.rodata); - data/data_8479668.o(.rodata.after_trainer_tower); + data/data_8479668.o(.rodata); /* These should not be moved to C files */ src/mystery_event_msg.o(.rodata); diff --git a/src/digit_obj_util.c b/src/digit_obj_util.c index 285b83397..82af5dcab 100644 --- a/src/digit_obj_util.c +++ b/src/digit_obj_util.c @@ -65,6 +65,10 @@ static const u8 sTilesPerImage[4][4] = } }; +const u16 gUnknown_8479668[] = INCBIN_U16("graphics/misc/unk_8479688.gbapal"); +const u32 gUnknown_8479688[] = INCBIN_U32("graphics/misc/unk_8479688.4bpp.lz"); +const u32 gUnknown_8479748[] = INCBIN_U32("graphics/misc/unk_8479748.4bpp.lz"); + // code bool32 DigitObjUtil_Init(u32 count) { |