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
f40e9a1639
sotn-decomp/config/splat.us.strwrp.yaml

92 lines
3.2 KiB
YAML
Raw Normal View History

Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
options:
platform: psx
basename: strwrp
Use of rodata section
2022-10-16 08:55:11 +00:00
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/ST/RWRP/RWRP.BIN
Change assembly location from asm/ to asm/us/
2023-02-21 19:11:05 +00:00
asm_path: asm/us/st/rwrp
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
asset_path: assets/st/rwrp
Merge RWRP with WRP (#1425) This will decompile all the functions but the new `EntityRWarpRoom` from the RWRP overlay. Note that as `e_misc.c` has a function with a different castle flag, I had to use a shared header. Everything else was identical. --------- Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-07-22 14:57:21 +00:00
src_path: src/st
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/strwrp.ld
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +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.strwrp.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.strwrp.txt
undefined_syms_auto_path: config/undefined_syms_auto.us.strwrp.txt
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
find_file_boundaries: yes
use_legacy_include_asm: no
Use of rodata section
2022-10-16 08:55:11 +00:00
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
Extract g_Rooms for all the overlays
2023-03-13 20:56:36 +00:00
extensions_path: tools/splat_ext
Fix decomp on binutils 2.36 and onward
2022-12-25 09:46:07 +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"
Fix decomp on binutils 2.36 and onward
2022-12-25 09:46:07 +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"
Update splat to 0.24.4 (#1112) Still work in progress. I removed splat as a submodule and started using it as a pip package instead. Everything is matching but the memory card icons part in both DRA and SEL. I still have no idea what the issue is. Once this PR is good to be merged, we can get rid of the splat fork too.
2024-06-12 17:50:32 +00:00
- ".sbss"
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
segments:
- name: strwrp
type: code
start: 0x00000000
vram: 0x80180000
Update splat to 0.24.4 (#1112) Still work in progress. I removed splat as a submodule and started using it as a pip package instead. Everything is matching but the memory card icons part in both DRA and SEL. I still have no idea what the issue is. Once this PR is good to be merged, we can get rid of the splat fork too.
2024-06-12 17:50:32 +00:00
align: 4
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
subalign: 4
subsegments:
Merge RWRP with WRP (#1425) This will decompile all the functions but the new `EntityRWarpRoom` from the RWRP overlay. Note that as `e_misc.c` has a function with a different castle flag, I had to use a shared header. Everything else was identical. --------- Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-07-22 14:57:21 +00:00
- [0x0, .data, rwrp/header]
- [0xB8, .data, rwrp/header] # layers
- [0x1B8, .data, rwrp/d_1b8] # entity gfx
- [0x23C, .data, rwrp/e_laydef] # layout entries header
- [0x3E4, .data, rwrp/e_init]
- [0x528, .data, wrp/st_debug]
- [0x5A8, .data, wrp/e_breakable]
- [0x608, .data, wrp/d_608]
Decompiles Remaining `rwrp` Function & Data (#1437) Adds an a PSX implementation of `EntityRWarpRoom`. This is similar to `EntityWarpRoom`, but needs to raise and lower the player stands on, and obviously has to warp to other inverted rooms. This also pulls in the remaining data and static storage, completing the `rwrp` mapping. --------- Co-authored-by: Jonathan Hohle <jon@ttkb.co>
2024-07-30 01:30:24 +00:00
- [0x648, .data, rwrp/warp]
Merge RWRP with WRP (#1425) This will decompile all the functions but the new `EntityRWarpRoom` from the RWRP overlay. Note that as `e_misc.c` has a function with a different castle flag, I had to use a shared header. Everything else was identical. --------- Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-07-22 14:57:21 +00:00
- [0x690, .data, wrp/st_update]
- [0x6BC, .data, wrp/collision]
- [0xA7C, .data, wrp/e_red_door]
- [0xA94, .data, wrp/st_common]
- [0xC94, .data, wrp/e_collect]
- [0xF84, .data, rwrp/e_misc]
- [0xFE8, .data, wrp/e_particles]
- [0x1120, .data, wrp/e_room_fg]
- [0x11AC, .data, rwrp/rooms]
- [0x1228, .data, rwrp/e_layout] # layout entries data
- [0x1420, cmp, D_80181420]
- [0x1764, cmp, D_80181764]
- [0x1D08, raw, D_80181D08]
- [0x1FC8, .data, rwrp/tile_data] # tile data
- [0x2BC8, .data, rwrp/tile_data] # tile definitions
- [0x6FE8, .data, rwrp/sprites]
Decompiles Remaining `rwrp` Function & Data (#1437) Adds an a PSX implementation of `EntityRWarpRoom`. This is similar to `EntityWarpRoom`, but needs to raise and lower the player stands on, and obviously has to warp to other inverted rooms. This also pulls in the remaining data and static storage, completing the `rwrp` mapping. --------- Co-authored-by: Jonathan Hohle <jon@ttkb.co>
2024-07-30 01:30:24 +00:00
- [0x8C48, .rodata, rwrp/warp] # warp strings
- [0x8C88, .rodata, rwrp/warp] # EntityRWarpRoom
Merge RWRP with WRP (#1425) This will decompile all the functions but the new `EntityRWarpRoom` from the RWRP overlay. Note that as `e_misc.c` has a function with a different castle flag, I had to use a shared header. Everything else was identical. --------- Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-07-22 14:57:21 +00:00
- [0x8CB0, .rodata, rwrp/warp] # EntityWarpSmallRocks
- [0x8CC8, .rodata, wrp/e_red_door] # EntityRedDoor
- [0x8CE0, .rodata, wrp/e_collect] # CollectGold strings
- [0x8D30, .rodata, wrp/e_collect] # EntityPrizeDrop
- [0x8D50, .rodata, wrp/e_collect] # EntityEquipItemDrop
NP3 first steps to align C extraction (#1430) Start to perform a series of code refactoring to align the various overlays on how NZ0, WRP and RWRP are currently organised, aiming to share as much code as possible. This is a good stop gap that does not change too much. There are virtually no major changes other than the removal of the fake symbol `D_8003BEEC`. I found it is very hard to share every single line of code due to some minor differences in the castle flags. I couldn't yet spot a reliable pattern on how castle flags are manager across stages. My vision is to share as much code as possible, possibly not as header files but as C files in a similar fashion of #1425 . I am aiming to model NP3 so we can merge it with NO3 given the fact they share a good chunk of the code base. I am waiting to split the rest of the entities into their own individual files. My idea is to have a file per entity or per entity group with their own set of data and helper functions, possibly all marked as `static`. We agreed it is probably a good idea to wait exploring the PSP build of NZ0, NO3 or NP3 before performing this step.
2024-07-26 12:36:05 +00:00
- [0x8D68, .rodata, rwrp/e_misc] # EntityRelicOrb
- [0x8DA0, .rodata, rwrp/e_misc] # EntityMessageBox
Merge RWRP with WRP (#1425) This will decompile all the functions but the new `EntityRWarpRoom` from the RWRP overlay. Note that as `e_misc.c` has a function with a different castle flag, I had to use a shared header. Everything else was identical. --------- Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-07-22 14:57:21 +00:00
- [0x8DB4, .rodata, wrp/e_stage_name] # EntityStageNamePopup
- [0x8DE8, .rodata, wrp/prim_helpers]
- [0x8DF0, c, wrp/st_debug]
- [0x908C, c, wrp/e_breakable]
- [0x91C0, c, rwrp/warp]
- [0xA168, c, wrp/st_update]
- [0xA59C, c, wrp/collision]
- [0xBD58, c, wrp/create_entity]
- [0xC8D0, c, wrp/e_red_door]
- [0xD580, c, wrp/st_common]
- [0xEA30, c, wrp/e_collect]
- [0xff9c, c, wrp/blit_char]
- [0x1024C, c, rwrp/e_misc]
- [0x1373C, c, wrp/e_stage_name]
- [0x14590, c, wrp/e_particles]
- [0x14DD4, c, wrp/e_room_fg]
- [0x14EC0, c, wrp/popup]
- [0x151F0, c, wrp/prim_helpers]
Stage BSS Organizing, Padding Macros (#1497) Maps `create_entity` and `e_collect` data, text, and bss for all stages. Adds macros for defining padding for various sections by size. Tables for section sizes have been added to common includes to make calculating offsets easier when segments.
2024-08-11 14:49:53 +00:00
- [0x15A20, .bss, wrp/create_entity]
- [0x15A36, .bss, rwrp/bss]
- [0x166A8, .bss, wrp/e_collect]
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
- [0x166E8]
Reference in New Issue Copy Permalink