diff --git a/config/GMPE01_00/config.yml b/config/GMPE01_00/config.yml index ebeae218..4d4d8936 100644 --- a/config/GMPE01_00/config.yml +++ b/config/GMPE01_00/config.yml @@ -17,6 +17,10 @@ modules: symbols: config/GMPE01_00/rels/bootDll/symbols.txt splits: config/GMPE01_00/rels/bootDll/splits.txt links: [] + extract: + - symbol: logoNintendoData + binary: logoNintendoData.bin + header: logoNintendoData.inc - object: orig/GMPE01_00/files/dll/instDll.rel hash: f09399fee83c63abfe2adb25341152adad959a93 symbols: config/GMPE01_00/rels/instDll/symbols.txt diff --git a/config/GMPE01_00/rels/bootDll/splits.txt b/config/GMPE01_00/rels/bootDll/splits.txt index 05a70d6d..1cdd17c0 100644 --- a/config/GMPE01_00/rels/bootDll/splits.txt +++ b/config/GMPE01_00/rels/bootDll/splits.txt @@ -12,8 +12,9 @@ REL/executor.c: REL/bootDll/bootDll.c: .text start:0x000000A0 end:0x00002944 .rodata start:0x00000000 end:0x000000DC - .data start:0x00000000 end:0x0000311D + .data start:0x00000000 end:0x000000A0 .bss start:0x00000000 end:0x0000005C REL/bootDll/nintendo_data.c: .text start:0x00002944 end:0x000029C8 + .data start:0x000000A0 end:0x0000311D diff --git a/configure.py b/configure.py index 391ab809..a636ef6f 100755 --- a/configure.py +++ b/configure.py @@ -295,7 +295,7 @@ config.libs = [ "objects": [ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/bootDll/bootDll.c"), - Object(Matching, "REL/bootDll/nintendo_data.c"), #Waiting for REL asset extraction to be fixed + Object(Matching, "REL/bootDll/nintendo_data.c"), ], }, { diff --git a/src/REL/bootDll/nintendo_data.c b/src/REL/bootDll/nintendo_data.c index 67a5d21d..9dd15f2c 100644 --- a/src/REL/bootDll/nintendo_data.c +++ b/src/REL/bootDll/nintendo_data.c @@ -1,6 +1,6 @@ #include "common.h" -extern u8 logoNintendoData[]; +#include "logoNintendoData.inc" void *logoReadNintendo(void) {