Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-23 13:09:44 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
2ad7900f95
sotn-decomp/config/splat.us.tt_000.yaml

45 lines
1.2 KiB
YAML
Raw Normal View History

Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
options:
platform: psx
basename: tt_000
base_path: ..
Writes built binaries into build/us/
2023-02-21 20:06:27 +00:00
build_path: build/us
Change how game assets are managed
2023-02-21 23:25:24 +00:00
target_path: disks/us/SERVANT/TT_000.BIN
Change assembly location from asm/ to asm/us/
2023-02-21 19:11:05 +00:00
asm_path: asm/us/servant/tt_000
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
asset_path: assets/servant/tt_000
src_path: src/servant/tt_000
Enhance make extract on PSX (#662) Previously if either the YAML or the symbol list were changed, we were forced to either manually delete the `asm` folder of the specific overlay or to invoke `make clean`, where the latter forced us to re-extract all the overlays via `make -j extract`. That changes with this PR. How `make` works is `target: dep1 dep2` where if one of the dependencies has the last modified date greater than the target, the rule is triggered again. Previously we were extracting overlays doing `make extract_stcen`. But since every overlay extraction generates a linker script I now changed the rules to do `make build/us/stcen.ld` to extract the same overlay. As I explained above, if either the YAML or one of the related symbols changes, the linker modified date will be older and the extraction for that overlay to be trigger again. The above allowed me to stop polluting the repo root with the linker scripts as they are now moved into `build/us` or `build/hd` depending of what you're trying to build. If you do `make extract` twice in a row you will be welcomed with a `make: Nothing to be done for 'extract'.`. There are still some instances where you **might** need `make clean` beforehand, especially when modifying the `segment` section in the YAML or renaming the symbols. A `rm -rf asm/$(VERSION)/$*` can help but I want to see if the current solution will be enough. ### Please try removing `make clean` from your workflow, once this is merged, to quickly detect possible problems with this new approach. I am also planning to make more substantial changes on our build-chain like this PR or #660 in the future. I am aiming to small incremental changes over time in case I break someone's flow or detect design flaws. I am also considering the breaking changes introduced in make 4.4, which will most likely be included in Ubuntu 24.04 LTS. I set March 2024 as a deadline to finish all the new build-chain work. --------- Co-authored-by: sozud <122322823+sozud@users.noreply.github.com>
2023-10-05 08:26:29 +00:00
ld_script_path: build/us/tt_000.ld
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
compiler: GCC
Pass undefined_syms files to linker (#1065) Creating a PR for this, will look at updating splat in a separate PR
2024-02-18 14:57:03 +00:00
symbol_addrs_path:
- config/symbols.us.txt
- config/symbols.us.tt_000.txt
Rename config folder to use game version
2023-02-21 01:42:33 +00:00
undefined_funcs_auto_path: config/undefined_funcs_auto.us.tt_000.txt
undefined_syms_auto_path: config/undefined_syms_auto.us.tt_000.txt
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
find_file_boundaries: yes
use_legacy_include_asm: no
migrate_rodata_to_functions: no
use jlabel for rodata labels (#260) Compare https://decomp.me/scratch/dhUE5 with https://decomp.me/scratch/NZt5p. e.g. with this PR: ![image](https://github.com/Xeeynamo/sotn-decomp/assets/22226349/bf999863-a66f-4b64-abbe-a41e4be34181) vs without: ![image](https://github.com/Xeeynamo/sotn-decomp/assets/22226349/04141d82-aedd-4451-817c-ff98e9e10a17)
2023-06-18 14:17:36 +00:00
asm_jtbl_label_macro: jlabel
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
section_order:
Update external tools (#764) 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.
2023-11-15 23:38:30 +00:00
- ".data"
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
- ".rodata"
- ".text"
Update external tools (#764) 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.
2023-11-15 23:38:30 +00:00
- ".bss"
TT_000 import BSS section (#1110) I had to cherry-pick the following PR on our splat fork: https://github.com/ethteck/splat/pull/305
2024-04-03 22:26:07 +00:00
ld_bss_is_noload: False
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
segments:
- name: tt_000
type: code
start: 0x00000000
vram: 0x80170000
TT_000 import BSS section (#1110) I had to cherry-pick the following PR on our splat fork: https://github.com/ethteck/splat/pull/305
2024-04-03 22:26:07 +00:00
subalign: 4
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
subsegments:
TT_000 import data
2023-02-08 18:23:26 +00:00
- [0x0, .data, 10E8]
- [0x40, .data, spriteparts]
- [0x448, .data, 448]
- [0x4A8, .data, 4A8]
TT_000 func_801718A0 matchign
2023-02-08 22:08:26 +00:00
- [0x608, .data, 608]
TT_000 func_80172120 (#791) Second last function of TT_000 decompiled. * Add `printf '\x00' | dd of=$@ bs=1 seek=40959 count=1 conv=notrunc` to ensure the output binary is 40960 bytes long (useful once BSS is migrated) * Add `$(BUILD_DIR)/tt_%.ld` so every time the splat YAML changes, doing `make tt_000` triggers the extract again * All the variables from BSS are now in `10E8` and in order. Removing `extern` from will properly create the BSS section * Fix 7A4D0.c to not use the familiar entity extension * Delete the fake symbols `D_80170660` and `D_8017065C` * Replace all the instances of `ext.generic` as `ext.bat` when possible NOTES: * For `SquareRoot12((...) << 0xC) >> 0xC;` I was not able to use the macro `FLT` *
2023-11-19 18:14:32 +00:00
- [0x10AC, .rodata, 10E8] # func_80172120
Add TT_000 from the HD version (#1111) 100% decompiled. `US` adds some padding to have the file exactly 40KB long. The HD version does not add any padding, hence why I ended up producing `tt_000_raw.bin`. I would have used just `tt_000.bin` as a name as found in `disks/pspeu/PSP_GAME/USRDIR/res/ps/hdbin/tt_000.bin`, but on Windows-based file system it would collide with `TT_000.BIN` due to the OS having case insensitive names. I modified `make clean` as I found annoying that `VERSION=hd make clean` would wipe out `us` build stuff. The only different function in HD is `ProcessEvent`, which has a weaker check. Another hint suggesting HD being older than US. `s32 _unused[26];` added enough padding in the bss section to get an :ok: . I am pretty sure it is unused data because the final binary is not aligned by any power of 2.
2024-04-04 21:28:57 +00:00
- [0x10C4, .rodata, 10E8] # func_80174038
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
- [0x10E8, c]
TT_000 PSP match more functions (#1150) Highlights: * `abs` is a real function the compiler can optimise and inline (thanks @Mc-muffin for the discovery) * `-Op` is required to avoid using `div` when dividing integer numbers * A file split in TT_000 is required to match on PSP * `UpdateAnim` had the wrong signature * Splatting the PSP build has been an excellent idea
2024-05-19 18:23:30 +00:00
- [0x45E4, c]
TT_000 import BSS section (#1110) I had to cherry-pick the following PR on our splat fork: https://github.com/ethteck/splat/pull/305
2024-04-03 22:26:07 +00:00
- [0x48D8, .bss, 10E8]
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
- [0xA000]
Reference in New Issue Copy Permalink