Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge zeldaret/oot changes #162

Merged
merged 81 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
bdc7740
More descriptive names for CS_BEGIN_CUTSCENE and CS_END (#2311)
mracsys Dec 2, 2024
54c4ce8
named missing actor cue lists command types (#2317)
Yanis002 Dec 3, 2024
3a07abb
Rename and document Adult Ruto functions (#2288)
JordanLongstaff Dec 4, 2024
b2d3c05
Name asset extraction tools more consistently (#2316)
cadmic Dec 5, 2024
a96ada0
ru2 fixes (#2323)
fig02 Dec 6, 2024
da7958d
Name some scene cutscenes (Hyrule Field and Kakariko Village) (#2321)
Yanis002 Dec 7, 2024
4d902dc
Renamed EVENTCHKINF_3A (#2325)
JordanLongstaff Dec 7, 2024
6735eb2
Rename EVENTCHKINF_02 (#2322)
JordanLongstaff Dec 7, 2024
df2450a
Replaced EVENTCHKINF_4E (#2327)
JordanLongstaff Dec 7, 2024
4d28d34
Renamed EVENTCHKINF_4B (#2328)
JordanLongstaff Dec 8, 2024
7a0a90b
Name Sleeping Waterfall state machine function (#2320)
JordanLongstaff Dec 8, 2024
bda5e94
Document Player Params (#2307)
fig02 Dec 8, 2024
06ceb8e
Use MM names for some unnamed code files (#2312)
cadmic Dec 8, 2024
64de4a0
Rename code_800BB0A0.c -> z_cutscene_spline.c (#2313)
cadmic Dec 8, 2024
40930ac
Rename code_80069420.c -> z_memory_utils.c (#2314)
cadmic Dec 8, 2024
d886e76
Split code_800D31A0.c into sys_freeze.c and sys_debug_controller.c (#…
cadmic Dec 9, 2024
e9b165b
Add names for Medallion cutscene data (#2319)
JordanLongstaff Dec 9, 2024
9305a71
Document Mido functions, fields, and animations (#2289)
Feacur Dec 9, 2024
b76fe9d
Rename EVENTCHKINF_4D (#2329)
JordanLongstaff Dec 10, 2024
c21c3fe
Renamed EVENTCHKINF_33 (#2326)
JordanLongstaff Dec 10, 2024
07751d3
Rename symbols related to Kakariko Well being drained (#2332)
JordanLongstaff Dec 10, 2024
c04ed0e
Rename "temp" variables in Adult Ruto functions (#2335)
JordanLongstaff Dec 10, 2024
b01b206
Renamed EVENTCHKINF_3C (#2324)
JordanLongstaff Dec 10, 2024
c780c4e
Rename EVENTCHKINF_69 (#2330)
JordanLongstaff Dec 11, 2024
c57dff4
Rename item get flags for Forest Stage upgrades (#2333)
JordanLongstaff Dec 12, 2024
0fc3697
Name Kokiri Forest cutscenes (and related ones) (#2338)
Yanis002 Dec 13, 2024
a897017
Rename EVENTCHKINF flags for payments to Happy Mask salesman (#2331)
JordanLongstaff Dec 13, 2024
016aef4
Document Culling (#2318)
fig02 Dec 13, 2024
2f40fed
Naming some cutscenes 4 (Gerudo Fortress, Death Mountain Crater and G…
Yanis002 Dec 13, 2024
d12750b
Name some cutscenes 3 (Zora's Domain, Zora's Fountain, Lost Woods and…
Yanis002 Dec 13, 2024
4b20d82
Naming cutscenes from Lon-Lon Ranch (#2359)
Yanis002 Dec 13, 2024
df5d4cb
[Audio 10/10] Loose ends (#2337)
Thar0 Dec 14, 2024
9170902
Move build.c definitions to the makefile, introduce and use libultra …
Thar0 Dec 14, 2024
a59a60e
Name cutscenes from dungeons (Spirit Boss Room, Jabu-Jabu's Belly and…
Yanis002 Dec 14, 2024
7935162
name cs from chamber of sages, link's house, courtyard and shooting g…
Yanis002 Dec 14, 2024
0f27d2f
document `func_8002F368` (#2358)
Feacur Dec 14, 2024
db8d351
Name some scene cutscenes 2 (Graveyard, Meadow and Lake Hylia) (#2339)
Yanis002 Dec 15, 2024
9801a62
removing due to deprecation (#2369)
ptweezy Dec 15, 2024
2eb0b91
Name cutscenes from Death Mountain Trail (#2357)
Yanis002 Dec 15, 2024
ff78b12
Add macros for line number differences (#2365)
fig02 Dec 15, 2024
c9940fa
Fix macOS build (#2370)
cadmic Dec 15, 2024
8056312
Remove ‾ character from source files (#2371)
cadmic Dec 15, 2024
b270d58
Name cutscenes from Temple of Time (#2363)
Yanis002 Dec 15, 2024
76c1b62
Name cutscenes of remaining actors (#2366)
Yanis002 Dec 15, 2024
582f040
use `CS_TEXT_NORMAL` when needed (#2367)
Yanis002 Dec 15, 2024
4873788
Dockerfile Update (#2372)
ptweezy Dec 15, 2024
bdb3656
Use iconv from Homebrew on macOS (#2374)
cadmic Dec 15, 2024
81f89b5
Add libiconv to text too (#2375)
cadmic Dec 15, 2024
15ed658
Docker Build Change Proposal (#2373)
ptweezy Dec 16, 2024
34c1b41
Name cutscenes from the Master Sword and Deku Tree Mouth actors (#2364)
Yanis002 Dec 16, 2024
f88e62b
fix tiny mistake (#2368)
Yanis002 Dec 16, 2024
fdcfe49
Rename event check flags for boss battles (#2376)
JordanLongstaff Dec 16, 2024
524597d
Reformat item00 drop tables (#2377)
cadmic Dec 17, 2024
1adf696
Document z_horse.c and related actors (#2278)
mzxrules Dec 17, 2024
81df2d4
Move const-qualified data from session_config.c to session_init.c, no…
Thar0 Dec 21, 2024
471fe51
Set up build system for ique-cn (#2382)
cadmic Dec 21, 2024
ee4b347
Restructure event flags in z64save.h (1/?) (#2380)
mzxrules Dec 21, 2024
970639b
Fix editing PATH in macOS build instructions (#2379)
cadmic Dec 21, 2024
8a48c17
Move D_80134488 from system_heap.c to fp.s (#2387)
cadmic Dec 24, 2024
fbeb477
iQue text extraction (#2383)
Thar0 Dec 25, 2024
e10ecb2
Set up iQue disassembly (#2384)
cadmic Dec 26, 2024
aaf3183
Download ido-recomp compiler binaries instead of committing them (#2388)
cadmic Dec 26, 2024
1662ac7
Fix iQue audio and line numbers (#2386)
cadmic Dec 26, 2024
ccfb359
Match iQue compression (#2389)
cadmic Dec 27, 2024
ba6a835
Restructure event flags in z64save.h (2/?): Carpenters (#2385)
mzxrules Dec 27, 2024
7e082f0
Use IDO for assembling handwritten asm files in src (#2390)
Thar0 Dec 28, 2024
a590995
Add missing vimode splits in iQue disassembly (#2393)
cadmic Dec 28, 2024
95d5f5b
Restructure event flags in z64save.h (3/?): Cursed Family Rewards (#2…
mzxrules Dec 29, 2024
ffc9f2d
Download EGCS binutils and gcc for iQue (#2391)
cadmic Dec 30, 2024
9dafc2f
[iQue] Build some C files with EGCS (#2396)
cadmic Jan 2, 2025
4c88cfd
[iQue] Match makerom (#2397)
Thar0 Jan 3, 2025
bd606ba
[iQue] Match skapi.s, create bbskapi.h documenting the syscalls (#2400)
Thar0 Jan 4, 2025
ced7d36
Merge remote-tracking branch 'decomp/main' into decomp_merge
Yanis002 Jan 6, 2025
ad3e555
fix build issues (not the profiler because idk)
Yanis002 Jan 6, 2025
afce450
format
Yanis002 Jan 6, 2025
62057cf
fix issues with the profiler (thanks to tharo)
Yanis002 Jan 6, 2025
3aafbf3
Match remaining IDO files for iQue (#2394)
cadmic Jan 6, 2025
9a60c94
[iQue] Match exceptasm.s and parameters.s (#2401)
Thar0 Jan 6, 2025
c6cceea
[iQue] Match src/libc (#2405)
cadmic Jan 6, 2025
aa3503b
Merge remote-tracking branch 'decomp/main' into decomp_merge
Yanis002 Jan 6, 2025
7bf2f88
Merge remote-tracking branch 'upstream/main' into decomp_merge
Yanis002 Jan 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 4 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM ubuntu:22.04 as build
FROM ubuntu:24.04 AS build

ENV TZ=UTC
ENV LANG=C.UTF-8

RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
apt-get update && \
Expand All @@ -19,15 +21,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone &
apt-get clean && \
rm -rf /var/lib/apt/lists/*

RUN python3 -m pip install --user colorama ansiwrap attrs watchdog python-Levenshtein "mapfile-parser>=1.2.1,<2.0.0" "rabbitizer>=1.0.0,<2.0.0"
RUN python3 -m pip install --upgrade attrs pycparser

ENV LANG C.UTF-8

RUN mkdir /oot
WORKDIR /oot

RUN git config --global --add safe.directory /oot

CMD ["/bin/sh", "-c", \
"echo 'usage:\n docker run --rm --mount type=bind,source=\"$(pwd)\",destination=/oot oot make -j$(nproc) setup\n docker run --rm --mount type=bind,source=\"$(pwd)\",destination=/oot oot make -j$(nproc)'"]
CMD make -j $(nproc) setup && make -j $(nproc) && tail -f /dev/null
7 changes: 5 additions & 2 deletions INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,21 @@ The build process has the following package requirements:
* git
* build-essential
* binutils-mips-linux-gnu
* curl
* python3
* python3-pip
* python3-venv
* libpng-dev
* gcc-mips-linux-gnu
* libxml2-dev
* gcc-mips-linux-gnu

Note: you can use another GCC as long as it target MIPS.

Under Debian / Ubuntu (which we recommend using), you can install them with the following commands:

```bash
sudo apt-get update
sudo apt-get install git build-essential binutils-mips-linux-gnu python3 python3-pip python3-venv libpng-dev gcc-mips-linux-gnu libxml2-dev
sudo apt-get install git build-essential binutils-mips-linux-gnu curl python3 python3-pip python3-venv libpng-dev libxml2-dev gcc-mips-linux-gnu
```

#### 2. Clone the repository
Expand Down
Loading
Loading