diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt index 4864e8d4..46b95202 100644 --- a/linker_scripts/us/symbol_addrs.txt +++ b/linker_scripts/us/symbol_addrs.txt @@ -164,3 +164,4 @@ D_ovl_i4_8019FE74 = 0x8019FE74; // force_migration:True segment:ovl_i4 D_ovl_i4_8019FEFC = 0x8019FEFC; // force_migration:True segment:ovl_i4 D_i6_801A7560 = 0x801A7560; // force_migration:True segment:ovl_i6 D_i6_801A792C = 0x801A792C; // force_migration:True segment:ovl_i6 + diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld index d5cfddc5..fbea8a22 100644 --- a/linker_scripts/us/undefined_syms.ld +++ b/linker_scripts/us/undefined_syms.ld @@ -41,4 +41,3 @@ D_A5000510 = 0xA5000510; D_01000100 = 0x01000100; D_01010100 = 0x01010100; - diff --git a/tools/requirements-python.txt b/tools/requirements-python.txt index 2c17d75f..89c031b8 100644 --- a/tools/requirements-python.txt +++ b/tools/requirements-python.txt @@ -1,4 +1,4 @@ -spimdisasm==1.20.0 +spimdisasm==1.24.2 rabbitizer==1.7.0 PyYAML pylibyaml @@ -9,4 +9,5 @@ pygfxd n64img>=0.1.4 GitPython colour -requests \ No newline at end of file +requests +crunch64 \ No newline at end of file diff --git a/tools/splat b/tools/splat index 0b0bfa6c..6bc689f2 160000 --- a/tools/splat +++ b/tools/splat @@ -1 +1 @@ -Subproject commit 0b0bfa6c99e3c757517d1630fcdb8b7dd34d9792 +Subproject commit 6bc689f21dc3597799294942858ae914fadb6da9 diff --git a/yamls/us/main.yaml b/yamls/us/main.yaml index cea5ffe8..98f9b483 100644 --- a/yamls/us/main.yaml +++ b/yamls/us/main.yaml @@ -6,6 +6,7 @@ - {start: 0x40, type: textbin, name: ipl3} - {start: 0x1000, type: asm, vram: 0x80000400, name: entry} + - name: main type: code start: 0x1050 @@ -274,7 +275,7 @@ - [0xCA3D0, .rodata, libultra/rmon/rmonmisc] - [0xCA400, .rodata, libultra/rmon/rmonregs] - [0xCA480, .rodata, libultra/rmon/rmonbrk] - - [0xCA650, rodata, libultra/rmon/rmonrcp] + - [0xCA650, .rodata, libultra/rmon/rmonmain] # DATA - game engine - [0xCA690, .data, engine/fox_360]