From 5a96959bca0b7a0608139dd10ab58a442224525d Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sat, 12 Jun 2021 00:18:39 -0500 Subject: [PATCH] unknown_last.rodata.s taken care of. --- asm/assets/ucode_data.s | 6 +- .../unknown_003260/func_80002C00.s | 4 +- data/unknown_last.rodata.s | 194 ------------------ extract-ver/us_1.0.config.json | 5 +- src/unknown_001050.c | 2 +- tools/python/generate_assets.py | 3 +- tools/python/generate_ld.py | 1 - 7 files changed, 12 insertions(+), 203 deletions(-) delete mode 100644 data/unknown_last.rodata.s diff --git a/asm/assets/ucode_data.s b/asm/assets/ucode_data.s index 740cfcaa..82e263dd 100644 --- a/asm/assets/ucode_data.s +++ b/asm/assets/ucode_data.s @@ -3,11 +3,13 @@ .include "globals.inc" .include "macros.inc" +glabel rspUnknownDataStart +.incbin "./build/us_1.0/ucode/data_unknown.bin" glabel rspF3DDKRDataDramStart .incbin "./build/us_1.0/ucode/data_f3ddkr_dram.bin" glabel rspF3DDKRDataFifoStart .incbin "./build/us_1.0/ucode/data_f3ddkr_fifo.bin" glabel rspF3DDKRDataXbusStart .incbin "./build/us_1.0/ucode/data_f3ddkr_xbus.bin" -glabel rspUnknownDataStart -.incbin "./build/us_1.0/ucode/data_unknown.bin" +glabel rspUnknown2DataStart +.incbin "./build/us_1.0/ucode/data_unknown_2.bin" diff --git a/asm/non_matchings/unknown_003260/func_80002C00.s b/asm/non_matchings/unknown_003260/func_80002C00.s index 3a1d64c2..d67f7b00 100644 --- a/asm/non_matchings/unknown_003260/func_80002C00.s +++ b/asm/non_matchings/unknown_003260/func_80002C00.s @@ -92,11 +92,11 @@ glabel func_80002C00 /* 003960 80002D60 000E78C3 */ sra $t7, $t6, 3 /* 003964 80002D64 27398590 */ addiu $t9, %lo(rspF3DDKRDramStart) # addiu $t9, $t9, -0x7a70 /* 003968 80002D68 3C09800D */ lui $t1, %hi(rspUnknownStart) # $t1, 0x800d -/* 00396C 80002D6C 3C0A800F */ lui $t2, %hi(D_800E98D0) # $t2, 0x800f +/* 00396C 80002D6C 3C0A800F */ lui $t2, %hi(rspUnknownDataStart) # $t2, 0x800f /* 003970 80002D70 000FC0C0 */ sll $t8, $t7, 3 /* 003974 80002D74 03254023 */ subu $t0, $t9, $a1 /* 003978 80002D78 25297600 */ addiu $t1, %lo(rspUnknownStart) # addiu $t1, $t1, 0x7600 -/* 00397C 80002D7C 254A98D0 */ addiu $t2, %lo(D_800E98D0) # addiu $t2, $t2, -0x6730 +/* 00397C 80002D7C 254A98D0 */ addiu $t2, %lo(rspUnknownDataStart) # addiu $t2, $t2, -0x6730 /* 003980 80002D80 240B0800 */ li $t3, 2048 /* 003984 80002D84 240C0001 */ li $t4, 1 /* 003988 80002D88 AE18004C */ sw $t8, 0x4c($s0) diff --git a/data/unknown_last.rodata.s b/data/unknown_last.rodata.s deleted file mode 100644 index f6169a4f..00000000 --- a/data/unknown_last.rodata.s +++ /dev/null @@ -1,194 +0,0 @@ -.include "macros.inc" - -.macro .aligned_text ascii - .asciz "\ascii" - .balign 4 -.endm - -.section .rodata - -# I'm not sure where this data is supposed to go. -# This is the last rodata block. -# D_800E98D0 is only used in unknown_003260, but that already has a .rodata block in it. - -glabel D_800E98D0 -.word 0x00000001 -.word 0x0002FFFF -.word 0x00200800 -.word 0x7FFF4000 -.word 0x111814A4 -.word 0x11EC1BA0 -.word 0x123C18D4 -.word 0x127012D4 -.word 0x12F0132C -.word 0x142812A4 -.word 0x1E3C1390 -.word 0x17581480 -.word 0xF0000F00 -.word 0x00F0000F -.word 0x00010010 -.word 0x01001000 -.word 0x80000000 -.word 0x80000000 -.word 0x80000000 -.word 0x80000000 -.word 0x00020004 -.word 0x00060008 -.word 0x000A000C -.word 0x000E0010 -.word 0x00010001 -.word 0x00010001 -.word 0x00010001 -.word 0x00010001 -.word 0x00000001 -.word 0x00020004 -.word 0x00080010 -.word 0x01000200 -.word 0x00010000 -.word 0x00000000 -.word 0x00010000 -.word 0x00000000 -.word 0x00000001 -.word 0x00000000 -.word 0x00000001 -.word 0x00000000 -.word 0x00000000 -.word 0x00010000 -.word 0x00000000 -.word 0x00010000 -.word 0x00000000 -.word 0x00000001 -.word 0x00000000 -.word 0x00000001 -.word 0x20004000 -.word 0x60008000 -.word 0xA000C000 -.word 0xE000FFFF -.word 0x0C3966AD -.word 0x0D46FFDF -.word 0x0B396696 -.word 0x0E5FFFD8 -.word 0x0A446669 -.word 0x0F83FFD0 -.word 0x095A6626 -.word 0x10B4FFC8 -.word 0x087D65CD -.word 0x11F0FFBF -.word 0x07AB655E -.word 0x1338FFB6 -.word 0x06E464D9 -.word 0x148CFFAC -.word 0x0628643F -.word 0x15EBFFA1 -.word 0x0577638F -.word 0x1756FF96 -.word 0x04D162CB -.word 0x18CBFF8A -.word 0x043561F3 -.word 0x1A4CFF7E -.word 0x03A46106 -.word 0x1BD7FF71 -.word 0x031C6007 -.word 0x1D6CFF64 -.word 0x029F5EF5 -.word 0x1F0BFF56 -.word 0x022A5DD0 -.word 0x20B3FF48 -.word 0x01BE5C9A -.word 0x2264FF3A -.word 0x015B5B53 -.word 0x241EFF2C -.word 0x010159FC -.word 0x25E0FF1E -.word 0x00AE5896 -.word 0x27A9FF10 -.word 0x00635720 -.word 0x297AFF02 -.word 0x001F559D -.word 0x2B50FEF4 -.word 0xFFE2540D -.word 0x2D2CFEE8 -.word 0xFFAC5270 -.word 0x2F0DFEDB -.word 0xFF7C50C7 -.word 0x30F3FED0 -.word 0xFF534F14 -.word 0x32DCFEC6 -.word 0xFF2E4D57 -.word 0x34C8FEBD -.word 0xFF0F4B91 -.word 0x36B6FEB6 -.word 0xFEF549C2 -.word 0x38A5FEB0 -.word 0xFEDF47ED -.word 0x3A95FEAC -.word 0xFECE4611 -.word 0x3C85FEAB -.word 0xFEC04430 -.word 0x3E74FEAC -.word 0xFEB6424A -.word 0x4060FEAF -.word 0xFEAF4060 -.word 0x424AFEB6 -.word 0xFEAC3E74 -.word 0x4430FEC0 -.word 0xFEAB3C85 -.word 0x4611FECE -.word 0xFEAC3A95 -.word 0x47EDFEDF -.word 0xFEB038A5 -.word 0x49C2FEF5 -.word 0xFEB636B6 -.word 0x4B91FF0F -.word 0xFEBD34C8 -.word 0x4D57FF2E -.word 0xFEC632DC -.word 0x4F14FF53 -.word 0xFED030F3 -.word 0x50C7FF7C -.word 0xFEDB2F0D -.word 0x5270FFAC -.word 0xFEE82D2C -.word 0x540DFFE2 -.word 0xFEF42B50 -.word 0x559D001F -.word 0xFF02297A -.word 0x57200063 -.word 0xFF1027A9 -.word 0x589600AE -.word 0xFF1E25E0 -.word 0x59FC0101 -.word 0xFF2C241E -.word 0x5B53015B -.word 0xFF3A2264 -.word 0x5C9A01BE -.word 0xFF4820B3 -.word 0x5DD0022A -.word 0xFF561F0B -.word 0x5EF5029F -.word 0xFF641D6C -.word 0x6007031C -.word 0xFF711BD7 -.word 0x610603A4 -.word 0xFF7E1A4C -.word 0x61F30435 -.word 0xFF8A18CB -.word 0x62CB04D1 -.word 0xFF961756 -.word 0x638F0577 -.word 0xFFA115EB -.word 0x643F0628 -.word 0xFFAC148C -.word 0x64D906E4 -.word 0xFFB61338 -.word 0x655E07AB -.word 0xFFBF11F0 -.word 0x65CD087D -.word 0xFFC810B4 -.word 0x6626095A -.word 0xFFD00F83 -.word 0x66690A44 -.word 0xFFD80E5F -.word 0x66960B39 -.word 0xFFDF0D46 -.word 0x66AD0C39 diff --git a/extract-ver/us_1.0.config.json b/extract-ver/us_1.0.config.json index d2123b2f..a77b631b 100644 --- a/extract-ver/us_1.0.config.json +++ b/extract-ver/us_1.0.config.json @@ -41,17 +41,18 @@ "type": "NoExtract", "folder" : "", "files" : [ - { "filename": "game_data", "length" : "0xD570" } + { "filename": "game_data", "length" : "0xD2A0" } ] }, { "type": "Binary", "folder" : "../../ucode/us_1.0", "files" : [ + { "filename": "data_unknown", "length" : "0x2D0" }, { "filename": "data_f3ddkr_dram", "length" : "0x800" }, { "filename": "data_f3ddkr_fifo", "length" : "0x800" }, { "filename": "data_f3ddkr_xbus", "length" : "0x800" }, - { "filename": "data_unknown", "length" : "0xBC0" } + { "filename": "data_unknown_2", "length" : "0xBC0" } ] } ] diff --git a/src/unknown_001050.c b/src/unknown_001050.c index 7cb74044..096c286b 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -140,7 +140,7 @@ void audio_init(u32 arg0){ //*((s32*)0x803FFFFC) = 0xDEADBEEF; seq_max_len = 0; - alHeapInit(&gALHeap, gBssSectionStart, 0x00029D88); + alHeapInit(&gALHeap, gBssSectionStart, AUDIO_HEAP_SIZE); reg_s2 = func_80076C58(38); ALBankFile_80115D14 = (ALBankFile*) func_80070C9C(reg_s2[2] - reg_s2[1], 0x00FFFFFF); diff --git a/tools/python/generate_assets.py b/tools/python/generate_assets.py index b5776522..0c8e1f56 100644 --- a/tools/python/generate_assets.py +++ b/tools/python/generate_assets.py @@ -120,10 +120,11 @@ class GenerateAssets: assetsUCodeData = '# This file was generated by generate_ld.py\n\n' assetsUCodeData += '.include "globals.inc"\n.include "macros.inc"\n\n' + assetsUCodeData += self.generate_ucode_file('rspUnknownDataStart', 'ucode/data_unknown.bin') assetsUCodeData += self.generate_ucode_file('rspF3DDKRDataDramStart', 'ucode/data_f3ddkr_dram.bin') assetsUCodeData += self.generate_ucode_file('rspF3DDKRDataFifoStart', 'ucode/data_f3ddkr_fifo.bin') assetsUCodeData += self.generate_ucode_file('rspF3DDKRDataXbusStart', 'ucode/data_f3ddkr_xbus.bin') - assetsUCodeData += self.generate_ucode_file('rspUnknownDataStart', 'ucode/data_unknown.bin') + assetsUCodeData += self.generate_ucode_file('rspUnknown2DataStart', 'ucode/data_unknown_2.bin') with open(self.UCODE_DATA_FILENAME, "w") as assetsFile: assetsFile.write(assetsUCodeData) diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 2045ce0e..336b7021 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -123,7 +123,6 @@ class GenerateLD: testName = DATA_DIR + '/' + fname + '.rodata.s' if FileUtil.does_file_exist(testName): self.gen_line(BUILD_DIR + '/data/' + fname + '.rodata.o(.rodata);') - self.gen_line(BUILD_DIR + '/data/unknown_last.rodata.o(.rodata);') self.gen_close_block() self.gen_line('romPos += SIZEOF(.rodata);') self.gen_newline()