diff options
| -rw-r--r-- | arm9/arm9.lcf | 9 | ||||
| -rw-r--r-- | arm9/data/rom2_3.s | 4 | ||||
| -rw-r--r-- | arm9/data/rom2_4.s | 4 | ||||
| -rw-r--r-- | arm9/lib/src/FS_overlay.c | 26 | ||||
| -rw-r--r-- | arm9/undefined_syms.txt | 2 |
5 files changed, 37 insertions, 8 deletions
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf index 2cc19d81..4f2e0bd1 100644 --- a/arm9/arm9.lcf +++ b/arm9/arm9.lcf @@ -228,13 +228,22 @@ SECTIONS { rom2.o (.rodata) string_util.o (.rodata) rom2_2.o (.rodata) + FS_command.o (.rodata) FS_command_default.o (.rodata) + FS_archive.o (.rodata) + FS_file.o (.rodata) + FS_rom.o (.rodata) + FS_overlay.o (.rodata) /* . = ALIGN(32); */ SDK_STATIC_TEXT_END = .; /* somewhere around here */ SDK_STATIC_DATA_START = .; rom2_3.o (.data) + FS_command.o (.data) FS_command_default.o (.data) + FS_archive.o (.data) + FS_file.o (.data) FS_rom.o (.data) + FS_overlay.o (.data) rom2_4.o (.data) SDK_STATIC_DATA_END = .; SDK_STATIC_END = .; diff --git a/arm9/data/rom2_3.s b/arm9/data/rom2_3.s index 8b047886..95e5aaa9 100644 --- a/arm9/data/rom2_3.s +++ b/arm9/data/rom2_3.s @@ -5,5 +5,5 @@ .section .data - /* 0x02103FA4 */ - .incbin "baserom.nds", 0x107FA4, 0x2888
\ No newline at end of file + /* 0x02103FE4 */ + .incbin "baserom.nds", 0x107FE4, 0x2848
\ No newline at end of file diff --git a/arm9/data/rom2_4.s b/arm9/data/rom2_4.s index 14ef2fce..efdaebde 100644 --- a/arm9/data/rom2_4.s +++ b/arm9/data/rom2_4.s @@ -5,5 +5,5 @@ .section .data - /* 0x02106834 */ - .incbin "baserom.nds", 0x10a834, 0x76c
\ No newline at end of file + /* 0x0210683C */ + .incbin "baserom.nds", 0x10a83C, 0x764
\ No newline at end of file diff --git a/arm9/lib/src/FS_overlay.c b/arm9/lib/src/FS_overlay.c index d8d53570..d2a4677d 100644 --- a/arm9/lib/src/FS_overlay.c +++ b/arm9/lib/src/FS_overlay.c @@ -144,8 +144,30 @@ BOOL FS_LoadOverlayImage(FSOverlayInfo * p_ovi) } } -const void *fsi_digest_key_ptr; -u32 fsi_digest_key_len; +static const u8 fsi_def_digest_key[64] = { + 0x21, 0x06, 0xc0, 0xde, + 0xba, 0x98, 0xce, 0x3f, + 0xa6, 0x92, 0xe3, 0x9d, + 0x46, 0xf2, 0xed, 0x01, + + 0x76, 0xe3, 0xcc, 0x08, + 0x56, 0x23, 0x63, 0xfa, + 0xca, 0xd4, 0xec, 0xdf, + 0x9a, 0x62, 0x78, 0x34, + + 0x8f, 0x6d, 0x63, 0x3c, + 0xfe, 0x22, 0xca, 0x92, + 0x20, 0x88, 0x97, 0x23, + 0xd2, 0xcf, 0xae, 0xc2, + + 0x32, 0x67, 0x8d, 0xfe, + 0xca, 0x83, 0x64, 0x98, + 0xac, 0xfd, 0x3e, 0x37, + 0x87, 0x46, 0x58, 0x24, +}; + +static const void *fsi_digest_key_ptr = fsi_def_digest_key; +static int fsi_digest_key_len = sizeof(fsi_def_digest_key); BOOL FSi_CompareDigest(const u8 *spec_digest, void *src, int len) { diff --git a/arm9/undefined_syms.txt b/arm9/undefined_syms.txt index f5d6b767..930bffec 100644 --- a/arm9/undefined_syms.txt +++ b/arm9/undefined_syms.txt @@ -16,8 +16,6 @@ Unk_02106900 = 0x02106900; Unk_02106A00 = 0x02106A00; Unk_02106A04 = 0x02106A04; // FS -fsi_digest_key_ptr = 0x02106834; -fsi_digest_key_len = 0x02106838; SDK_OVERLAY_DIGEST = 0x02106F84; SDK_OVERLAY_DIGEST_END = 0x02106F84; |