Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-23 04:59:41 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Update external tools (#764)

Browse Source 
Occasional maintenance:

* asm-differ: latest commit
* m2c: latest commit
* maspsx: latest commit
* spimdisasm: 0.18.0 latest
* splat: 0.17.3

The latest version of splat is 0.19.1 but a breaking change in
[0.18.0](https://github.com/ethteck/splat/pull/294) is preventing me to
upgrade further ([discussion
here](https://discord.com/channels/710646040331681844/813939516385525790/1172978921000669274))

Some YAML were malformed and since splat 0.17.0 there are additional
checks to ensure they are compliant. There are also new checks that
prevents a malformed symbol list including duplicates, which I fixed
too.
This commit is contained in:
Luciano Ciccariello 2023-11-15 23:38:30 +00:00 committed by Luciano Ciccariello
parent 3464bb705a
commit bc92406dcc
16 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
config/splat.us.ric.yaml
View File

@ -18,9 +18,10 @@ options:
asm_jtbl_label_macro: jlabel
extensions_path: tools/splat_ext
section_order:
- ".data"
- ".rodata"
- ".text"
- ".data"
- ".bss"
segments:
- name: ric
type: code
@ -28,15 +29,15 @@ segments:
vram: 0x8013C000
subalign: 4
subsegments:
- [0x0, rodata]
- [0x0, data]
- [0x20, spritesheet, richter, disks/us/BIN/F_GAME2.BIN, 0x40400]
- [0x170AC, rodata]
- [0x194B0, rodata]
- [0x19B50, rodata]
- [0x19BE0, rodata]
- [0x19C70, rodata]
- [0x19EE0, rodata]
- [0x1A454, rodata]
- [0x170AC, data]
- [0x194B0, data]
- [0x19B50, data]
- [0x19BE0, data]
- [0x19C70, data]
- [0x19EE0, data]
- [0x1A444, rodata]
- [0x1A5E0, .rodata, 1AC60]
- [0x1A5F0, rodata]
- [0x1A788, .rodata, 1F348]
@ -64,5 +65,5 @@ segments:
- [0x26C84, c, 26C84]
- [0x32324, c, 32324]
- [0x345EC, c, 345EC]
- [0x37B60, data]
- [0x37B60, sbss]
- [0x39A58]

8
config/splat.us.stcen.yaml
View File

@ -18,9 +18,10 @@ options:
asm_jtbl_label_macro: jlabel
extensions_path: tools/splat_ext
section_order:
- ".data"
- ".rodata"
- ".text"
- ".data"
- ".bss"
segments:
- name: stcen
type: code
@ -49,8 +50,5 @@ segments:
- [0x17B28, c, entity_message_box]
- [0x18084, c]
- [0x1B274, c]
- [0x1C704, rodata]
- [0x1C764, rodata]
- [0x1D374, rodata]
- [0x1D424, rodata]
- [0x1C704, sbss]
- [0x1D46C]

3
config/splat.us.stdre.yaml
View File

@ -18,9 +18,10 @@ options:
asm_jtbl_label_macro: jlabel
extensions_path: tools/splat_ext
section_order:
- ".data"
- ".rodata"
- ".text"
- ".data"
- ".bss"
segments:
- name: stdre
type: code

3
config/splat.us.stmad.yaml
View File

@ -19,9 +19,10 @@ options:
extensions_path: tools/splat_ext
string_encoding: SHIFT-JIS
section_order:
- ".data"
- ".rodata"
- ".text"
- ".data"
- ".bss"
segments:
- name: stmad
type: code

3
config/splat.us.stno3.yaml
View File

@ -18,9 +18,10 @@ options:
asm_jtbl_label_macro: jlabel
extensions_path: tools/splat_ext
section_order:
- ".data"
- ".rodata"
- ".text"
- ".data"
- ".bss"
segments:
- name: stno3
type: code

3
config/splat.us.stnp3.yaml
View File

@ -18,9 +18,10 @@ options:
asm_jtbl_label_macro: jlabel
extensions_path: tools/splat_ext
section_order:
- ".data"
- ".rodata"
- ".text"
- ".data"
- ".bss"
segments:
- name: stnp3
type: code

3
config/splat.us.strwrp.yaml
View File

@ -18,9 +18,10 @@ options:
asm_jtbl_label_macro: jlabel
extensions_path: tools/splat_ext
section_order:
- ".data"
- ".rodata"
- ".text"
- ".data"
- ".bss"
segments:
- name: strwrp
type: code

3
config/splat.us.stsel.yaml
View File

@ -18,9 +18,10 @@ options:
asm_jtbl_label_macro: jlabel
extensions_path: tools/splat_ext
section_order:
- ".data"
- ".rodata"
- ".text"
- ".data"
- ".bss"
segments:
- name: stsel
type: code

3
config/splat.us.tt_000.yaml
View File

@ -17,9 +17,10 @@ options:
migrate_rodata_to_functions: no
asm_jtbl_label_macro: jlabel
section_order:
- ".data"
- ".rodata"
- ".text"
- ".data"
- ".bss"
segments:
- name: tt_000
type: code

2
config/symbols.hd.txt
View File

@ -574,7 +574,6 @@ SpuMallocWithStartAddr = 0x80028D3C;
SpuFree = 0x80028FF4;
SpuSetNoiseVoice = 0x80029070;
SpuSetAnyVoice = 0x80029094;
_SpuSetAnyVoice = 0x80029094;
SpuSetReverb = 0x80029148;
_SpuIsInAllocateArea = 0x80029218;
_SpuIsInAllocateArea_ = 0x80029288;
@ -674,7 +673,6 @@ g_api = 0x8003C774;
g_api_o_TestCollisions = 0x8003C778;
g_api_o_unk08 = 0x8003C77C;
g_api_o_InitRoomEntities = 0x8003C780;
g_pfnInitRoomEntities = 0x8003C780;
g_api_o_rooms = 0x8003C784;
g_api_o_spriteBanks = 0x8003C788;
g_api_o_cluts = 0x8003C78C;

2
config/symbols.us.txt
View File

@ -574,7 +574,6 @@ SpuMallocWithStartAddr = 0x80028D3C;
SpuFree = 0x80028FF4;
SpuSetNoiseVoice = 0x80029070;
SpuSetAnyVoice = 0x80029094;
_SpuSetAnyVoice = 0x80029094;
SpuSetReverb = 0x80029148;
_SpuIsInAllocateArea = 0x80029218;
_SpuIsInAllocateArea_ = 0x80029288;
@ -674,7 +673,6 @@ g_api = 0x8003C774;
g_api_o_TestCollisions = 0x8003C778;
g_api_o_unk08 = 0x8003C77C;
g_api_o_InitRoomEntities = 0x8003C780;
g_pfnInitRoomEntities = 0x8003C780;
g_api_o_rooms = 0x8003C784;
g_api_o_spriteBanks = 0x8003C788;
g_api_o_cluts = 0x8003C78C;

2
tools/asm-differ

@ -1 +1 @@
Subproject commit 6d3e4c44d1ad8ad59bcae3abecb35f0d10e135e1
Subproject commit e8bddb02576e73aecb90f813bfb452417c37b257

2
tools/m2c

@ -1 +1 @@
Subproject commit 08138748803d75e73e4a94bb0c619a273754ee9c
Subproject commit beb457dabfc7a01ec6540a5404a6a05097a13602

2
tools/maspsx

@ -1 +1 @@
Subproject commit ae43f009e319d55362423e2bc1fb96bc7d55aa47
Subproject commit 1e50b30ce24030bc123ff45687d960eacab61447

2
tools/n64splat

@ -1 +1 @@
Subproject commit 8acd2fad7456c3cf373fa60150edc3ceaabe2b13
Subproject commit 63d16cf283597284200f9a7093bb94b5877c4365

2
tools/requirements-python.txt
View File

@ -12,7 +12,7 @@ tabulate
requests
graphviz
# splat
spimdisasm==1.16.0
spimdisasm==1.18.0
rabbitizer==1.7.0
n64img==0.3.3
PyYAML