Port some standalone rodata objects to C

This commit is contained in:
PikalaxALT
2020-03-03 14:05:38 -05:00
parent d047e66310
commit df08e8645b
3 changed files with 5 additions and 14 deletions
-12
View File
@@ -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::
+1 -2
View File
@@ -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);
+4
View File
@@ -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)
{