Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-30 16:31:00 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
4b4cd960f0
sotn-decomp/config/splat.us.stwrp.yaml

94 lines
3.0 KiB
YAML
Raw Normal View History

Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
options:
platform: psx
basename: stwrp
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/WRP/WRP.BIN
Change assembly location from asm/ to asm/us/
2023-02-21 19:11:05 +00:00
asm_path: asm/us/st/wrp
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
asset_path: assets/st/wrp
src_path: src/st/wrp
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/stwrp.ld
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
compiler: GCC
Rename config folder to use game version
2023-02-21 01:42:33 +00:00
symbol_addrs_path: config/generated.symbols.us.stwrp.txt
undefined_funcs_auto_path: config/undefined_funcs_auto.us.stwrp.txt
undefined_syms_auto_path: config/undefined_syms_auto.us.stwrp.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
WRP split some data and add new split tools (#109) The objective is to separate the data that is usually written into `asm/*/data` into separate files. Those will initially be binary files. There is also an utility that allows to decompress compressed data. The decompressed data is currently not read as we are missing a compression algorithm that matches the original one. I tried writing one in the past: it worked, it re-created similar files but sadly not the same ones. The decompression algorithm is there to allow to do some data mining and understand what the data is and how it is used.
2023-03-09 13:32:00 +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:
Set right sections for WRP
2023-01-08 23:30:47 +00:00
- ".data"
Fix decomp on binutils 2.36 and onward
2022-12-25 09:46:07 +00:00
- ".rodata"
- ".text"
Set right sections for WRP
2023-01-08 23:30:47 +00:00
- ".bss"
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
segments:
- name: stwrp
type: code
start: 0x00000000
vram: 0x80180000
subalign: 4
subsegments:
WRP extract room data
2023-03-31 07:42:03 +00:00
- [0x0, .data, header]
- [0xB8, layers, rooms]
- [0x1B8, .data, 6FD0]
Deduplicate BlitChar (#535) This will match `BlitChar` across all the overlays. I did not create a `blit_char.c` as the function produces no `.data` or `.rodata`
2023-08-31 23:11:55 +00:00
- [0xF84, .data, entity_relic_orb]
Decompile EntityMessageBox (#536) ![image](https://github.com/Xeeynamo/sotn-decomp/assets/6128729/e967866c-1349-4264-b089-d5debc1e5d7a) Used to display a temporary message that displays a certain information to the player. It needs a new name before getting merged.
2023-09-01 09:08:20 +00:00
- [0xFE8, .data, F420]
WRP split some data and add new split tools (#109) The objective is to separate the data that is usually written into `asm/*/data` into separate files. Those will initially be binary files. There is also an utility that allows to decompress compressed data. The decompressed data is currently not read as we are missing a compression algorithm that matches the original one. I tried writing one in the past: it worked, it re-created similar files but sadly not the same ones. The decompression algorithm is there to allow to do some data mining and understand what the data is and how it is used.
2023-03-09 13:32:00 +00:00
- [0x11AC, roomdef, g_Rooms]
- [0x1228, layoutobj, D_80181228]
- [0x1250, layoutobj, D_80181250]
- [0x1278, layoutobj, D_80181278]
- [0x12A0, layoutobj, D_801812A0]
- [0x12C8, layoutobj, D_801812C8]
- [0x12F0, layoutobj, D_801812F0]
- [0x1304, layoutobj, D_80181304]
- [0x1324, layoutobj, D_80181324]
- [0x134C, layoutobj, D_8018134C]
- [0x1374, layoutobj, D_80181374]
- [0x139C, layoutobj, D_8018139C]
- [0x13C4, layoutobj, D_801813C4]
- [0x13EC, layoutobj, D_801813EC]
- [0x1400, layoutobj, D_80181400]
- [0x1420, cmp, D_80181420]
- [0x1764, cmp, D_80181764]
- [0x1D08, cmp, D_80181D08]
- [0x1D68, tilelayout, D_80181D68]
- [0x1F68, tilelayout, D_80181F68]
- [0x2168, tilelayout, D_80182168]
- [0x2368, tilelayout, D_80182368]
- [0x2568, tilelayout, D_80182568]
- [0x2768, tilelayout, D_80182768]
- [0x2968, raw, D_80182968]
- [0x2A68, raw, D_80182A68]
- [0x2B68, raw, D_80182B68]
- [0x2C68, raw, D_80182C68]
- [0x2D68, tiledef, D_80182D68]
- [0x2D78, raw, D_80182D78]
- [0x3D78, raw, D_80183D78]
- [0x4D78, raw, D_80184D78]
- [0x5D78, raw, D_80185D78]
- [0x6D78, tiledef, D_80186D78]
Animation set extraction (#495) I rewrote the logic on how `spriteparts` and `spritepartslist` were extracted. They are now extracted under the new module `animset`, which handles a list of Sprite Parts in the same JSON file. It is extracting the information as a JSON and it is rebuilding it back into a binary usable in-game. The extracted assets will have the `.animset.json` extension. It took me a lot of time to find a pattern that would work with the WRP and the WEAPON overlays. I made myself sure to create a solution that would work in all the case scenario I found so far. What I wrote will work across all the overlays. It takes a while to find where the animset banks are located and I think I will deal with it in a separate PR. With this it would be possible to preview animations without using #235 but we would need to either convert it into something other programs can read (HTML5+CSS, Aseprite, DarkFunction) or parse it with a custom-made GUI tool.
2023-08-22 02:24:44 +00:00
- [0x6D88, animset, D_80186D88]
WRP split data
2023-02-05 19:43:20 +00:00
- [0x6E30, .rodata, 6FD0]
WRP Properly splitting remaining rodata
2023-02-05 16:25:10 +00:00
- [0x6E70, rodata] # EntityWarpRoom
- [0x6E90, rodata] # EntityWarpSmallRocks
- [0x6EA8, rodata] # EntityRedDoor
- [0x6EC0, rodata] # CollectGold
EntityPrizeDrop matching
2023-03-25 20:37:41 +00:00
- [0x6F10, .rodata, D020]
Remaining EntityEquipItemDrop duplicates (#165)
2023-03-26 15:25:05 +00:00
- [0x6F30, .rodata, D020] # EntityEquipItemDrop
Deduplicate BlitChar (#535) This will match `BlitChar` across all the overlays. I did not create a `blit_char.c` as the function produces no `.data` or `.rodata`
2023-08-31 23:11:55 +00:00
- [0x6F48, .rodata, entity_relic_orb]
Decompile EntityMessageBox (#536) ![image](https://github.com/Xeeynamo/sotn-decomp/assets/6128729/e967866c-1349-4264-b089-d5debc1e5d7a) Used to display a temporary message that displays a certain information to the player. It needs a new name before getting merged.
2023-09-01 09:08:20 +00:00
- [0x6F80, .rodata, entity_message_box]
WRP Properly splitting remaining rodata
2023-02-05 16:25:10 +00:00
- [0x6F94, rodata] # EntityStageNamePopup
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
- [0x6FD0, c]
Start sharing some common stage code (#464) Following up #454 , #453 and related from @sozud , I started to convert some previously defined headers into proper shared C code. The advantage from the header is the C file is completely independent, it will have its own `.data` and `.rodata` and it will be compiled once. I also took the opportunity to move `include/st/AnimateEntity.h` to `src/st/animate_entity.h` for consistency. I think the change is small enough to be included as part of this PR.
2023-09-03 06:55:48 +00:00
- [0x81E8, c, random]
- [0x8218, c, update]
- [0x8514, c, update_stage_entities]
Split on TestCollisions (#456) This splits on TestCollisions, giving a block of the following 3 functions in a separate file and that are fully decompiled with the exception of MAD. ``` #include "../random.h" #include "../update.h" #include "../update_stage_entities.h" ``` It should now be possible to change the build system to make that a C file that is shared among the overlays.
2023-08-08 20:07:51 +00:00
- [0x861C, c]
EntityPrizeDrop matching
2023-03-25 20:37:41 +00:00
- [0xD020, c]
Deduplicate BlitChar (#535) This will match `BlitChar` across all the overlays. I did not create a `blit_char.c` as the function produces no `.data` or `.rodata`
2023-08-31 23:11:55 +00:00
- [0xE2CC, c, entity_relic_orb]
Decompile EntityMessageBox (#536) ![image](https://github.com/Xeeynamo/sotn-decomp/assets/6128729/e967866c-1349-4264-b089-d5debc1e5d7a) Used to display a temporary message that displays a certain information to the player. It needs a new name before getting merged.
2023-09-01 09:08:20 +00:00
- [0xED9C, c, entity_heart_drop]
- [0xEEC4, c, entity_message_box]
- [0xF420, c]
Set right sections for WRP
2023-01-08 23:30:47 +00:00
- [0x13AA0, sbss] # bss?
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
- [0x14768]
Reference in New Issue Copy Permalink