Skip to content

Commit 35f03c9

Browse files
authored
Merge pull request #52 from SeekyCt/dev
v9
2 parents f524a33 + fa88e61 commit 35f03c9

File tree

353 files changed

+15018
-4248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

353 files changed

+15018
-4248
lines changed

.gitignore

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
*.elf
2-
*.rel
1+
# Build system outputs
2+
build
3+
out
4+
build.ninja
5+
6+
# Tool / user files
37
.vscode
4-
build.*
5-
*.bat
68
porting
7-
*.bin
9+
*.bat
10+
compile_commands.json

Makefile

Lines changed: 0 additions & 219 deletions
This file was deleted.

README.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,22 @@ The dev branch contains in-development features and usually isn't ported to or t
2525
## Building
2626
To compile this yourself, you'll need the following:
2727
* devkitPPC
28+
* ninja
29+
* Python 3
30+
- 3.8 is known to work, earlier versions may too
31+
* The python modules from `requirements.txt` (`pip install -r requirements.txt`)
2832
* The fork of PistonMiner's elf2rel from the [SPM Rel Loader repo](https://github.com/SeekyCt/spm-rel-loader/releases/tag/elf2rel-24-6-2021)
29-
* For v8 and above, the 21-12-2021 build is required. v5-7 require the 24-6-2021 build. Older versions are compatible with any build.
30-
* The TTYDTOOLS environment variable set to the folder outside of the `bin` folder with your compiled `elf2rel` in (so `$(TTYDTOOLS)/bin/elf2rel` will point to it)
33+
* For v8 and above, the 21-12-2021 build is required. v5-7 require the 24-6-2021 build. Older versions are compatible with any build
34+
* The ELF2REL environment variable set to the path to your compiled `elf2rel` executable
3135

32-
Once that's set up you can use `make rgX` to build region `rg` ('eu', 'us', 'jp' or 'kr') revision `X` (0-1 for eu & jp, 0-2 for us, 0 for kr) or just `make` to build for all regions and revisions.
36+
Once that's set up:
37+
* Run `configure.py`
38+
* Versions can be listed as arguments to enable them, by default all will be enabled
39+
* Run `ninja`
40+
* Versions can be listed as arguments to build them (must be enabled in `configure.py`), by default all will be built
3341

3442
## Credits
3543
* This mod was made using the [SPM Rel Loader](https://github.com/SeekyCt/spm-rel-loader), which is based on the TTYD rel loader by PistonMiner and Zephiles.
3644
* JohnP55 for help and suggestions creating the map change teleport effect.
3745
* TheLordScruffy for the Dolphin & Riivolution detection methods.
46+
* stebler for `tools/incbin.S`.

assets.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# == Format ==
2+
# assetPathHere:
3+
# symbol: symbolHere (<symbol>_end will also be created)
4+
# align: alignmentHere (default 4)
5+
# section: sectionHere (default .rodata)
6+
7+
assets/inputs.tpl:
8+
symbol: inpTpl
9+
align: 0x20
10+
section: .data

assets/inputs.tpl

10.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)