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.

Sign up for GitHub

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 #155

Merged
merged 32 commits into from
Dec 2, 2024
Merged

Merge zeldaret/oot changes #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e55e909
Document `ACTOR_FLAG_UPDATE_DURING_OCARINA` and `PLAYER_STATE2_USING_…
fig02 Oct 18, 2024
f421032
Document `ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT` (#2276)
fig02 Oct 21, 2024
3677c11
Document `ACTOR_FLAG_CAN_PRESS_SWITCHES` (#2275)
fig02 Oct 21, 2024
6ea3982
Remove hardcoded bash location in tools/preprocess.sh (#2280)
CharlesAverill Oct 24, 2024
2c1d2d7
Document `PLAYER_STATE1_SHIELDING` (#2279)
Pepe20129 Oct 25, 2024
012c192
Missing python3-venv in Dockerfile (#2282)
vonProteus Oct 28, 2024
5b27899
libu64 (#2267)
Dragorn421 Nov 1, 2024
e50581b
`ACTOR_FLAG_ENKUSA_CUT` -> `ACTOR_FLAG_GRASS_DESTROYED` (#2285)
fig02 Nov 4, 2024
0d04f51
Document Arrow Related Actor Flags (#2284)
fig02 Nov 5, 2024
d886ebe
[ntsc-1.0/1.1] Match audio and loose ends (#2293)
cadmic Nov 11, 2024
2d45493
[Audio 9/?] Multiversion samplebank and soundfont extraction xmls, 1.…
Thar0 Nov 12, 2024
a04912a
Use the T macro in z_select (#2273)
Pepe20129 Nov 12, 2024
8ce69c3
Completely match ntsc-1.0/1.1 bss and add to CI (#2294)
cadmic Nov 12, 2024
c55a1da
fix_bss.py: Fix infinite loop after linker errors (#2297)
cadmic Nov 14, 2024
e46fcbd
Document `enum PauseState` game over parts (#2283)
Feacur Nov 15, 2024
cf4dc98
Use debug macros even in N64-only code (#2298)
cadmic Nov 15, 2024
17edb82
Decouple Debug Features From gc-eu-mq-dbg (#2296)
fig02 Nov 17, 2024
5881164
Fix VROM address handling in sym_info.py (#2292)
cadmic Nov 17, 2024
ae1a1ad
Player Docs: Begin "Start Mode" Documentation (#2301)
fig02 Nov 18, 2024
e0e0e93
Player: Name all Start Modes (#2302)
fig02 Nov 20, 2024
6239f8e
Document Hookshot Attachment (#2300)
fig02 Nov 22, 2024
e10c64a
Add a PARAMS_PACK macro for building actor params setters (#2304)
Thar0 Nov 24, 2024
33391c0
Name Remaining Hookshot Actor Flags (#2306)
fig02 Nov 24, 2024
53962a2
Document Actor "Fidget Tables" (#2287)
Feacur Nov 27, 2024
cddca30
Player Docs: Document Some Start Mode Actions (#2305)
fig02 Nov 28, 2024
4e3ed27
Merge remote-tracking branch 'decomp/main' into decomp_merge
Yanis002 Nov 29, 2024
aea3652
post decomp merge build fixes
Yanis002 Nov 29, 2024
26ff90e
format
Yanis002 Nov 29, 2024
e0bd123
Document time-specific textures for Deku Tree and Gerudo Fortress sim…
mracsys Nov 30, 2024
6199634
Minor Cleanup (#2308)
engineer124 Dec 1, 2024
3f703a3
Fix some more GCC warnings, mark some bugs based on GCC warnings (#2309)
Thar0 Dec 2, 2024
8ff1587
Merge remote-tracking branch 'decomp/main' into decomp_merge
Yanis002 Dec 2, 2024
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
  •  
  •  
  •  
214 changes: 167 additions & 47 deletions .vscode/c_cpp_properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,86 @@
{
"configurations": [
{
"name": "hackeroot-mq",
"compilerPath": "/usr/bin/gcc",
"name": "oot-ntsc-1.2",
"compilerArgs": [
"-m32"
],
"intelliSenseMode": "gcc-x86",
"includePath": [
"include",
"include/libc",
"src",
"build/hackeroot-mq",
"build/ntsc-1.2",
".",
"extracted/hackeroot-mq"
"extracted/ntsc-1.2"
],
"defines": [
"_LANGUAGE_C",
"OOT_VERSION=NTSC_1_2",
"OOT_REGION=REGION_JP",
"PLATFORM_N64=1",
"PLATFORM_GC=0",
"DEBUG_FEATURES=0",
"NDEBUG",
"F3DEX_GBI_2",
"ENABLE_HACKEROOT=1",
"RELEASE_ROM=0",
"COMPRESS_YAZ=1",
"OOT_VERSION=OOT_GC_EU_MQ_DBG",
"OOT_REGION=REGION_EU",
"OOT_PAL=1",
"OOT_MQ=1",
"OOT_DEBUG=1",
"COMPRESS_YAZ=1"
],
"cStandard": "gnu89"
},
{
"name": "oot-gc-jp",
"compilerArgs": [
"-m32"
],
"includePath": [
"include",
"include/libc",
"src",
"build/gc-jp",
".",
"extracted/gc-jp"
],
"defines": [
"_LANGUAGE_C",
"OOT_VERSION=GC_JP",
"OOT_REGION=REGION_JP",
"PLATFORM_N64=0",
"PLATFORM_GC=1",
"DEBUG_FEATURES=0",
"NDEBUG",
"F3DEX_GBI_2",
"F3DEX_GBI_PL",
"GBI_DOWHILE",
"GBI_DEBUG"
"GBI_DOWHILE"
],
"cStandard": "gnu89"
},
{
"name": "oot-gc-jp-mq",
"compilerArgs": [
"-m32"
],
"includePath": [
"include",
"include/libc",
"src",
"build/gc-jp-mq",
".",
"extracted/gc-jp-mq"
],
"cStandard": "gnu89",
"cppStandard": "${default}"
"defines": [
"_LANGUAGE_C",
"OOT_VERSION=GC_JP_MQ",
"OOT_REGION=REGION_JP",
"PLATFORM_N64=0",
"PLATFORM_GC=1",
"DEBUG_FEATURES=0",
"NDEBUG",
"F3DEX_GBI_2",
"F3DEX_GBI_PL",
"GBI_DOWHILE"
],
"cStandard": "gnu89"
},
{
"name": "oot-gc-us",
Expand All @@ -48,21 +97,72 @@
],
"defines": [
"_LANGUAGE_C",
"ENABLE_HACKEROOT=0",
"RELEASE_ROM=0",
"COMPRESS_YAZ=1",
"OOT_VERSION=OOT_GC_US",
"OOT_VERSION=GC_US",
"OOT_REGION=REGION_US",
"PLATFORM_N64=0",
"PLATFORM_GC=1",
"DEBUG_FEATURES=0",
"NDEBUG",
"F3DEX_GBI_2",
"F3DEX_GBI_PL",
"GBI_DOWHILE"
],
"cStandard": "gnu89"
},
{
"name": "oot-gc-us-mq",
"compilerArgs": [
"-m32"
],
"includePath": [
"include",
"include/libc",
"src",
"build/gc-us-mq",
".",
"extracted/gc-us-mq"
],
"defines": [
"_LANGUAGE_C",
"OOT_VERSION=GC_US_MQ",
"OOT_REGION=REGION_US",
"OOT_NTSC=1",
"OOT_MQ=0",
"OOT_DEBUG=0",
"PLATFORM_N64=0",
"PLATFORM_GC=1",
"DEBUG_FEATURES=0",
"NDEBUG",
"F3DEX_GBI_2",
"F3DEX_GBI_PL",
"GBI_DOWHILE"
],
"cStandard": "gnu89"
},
{
"name": "oot-gc-eu-mq-dbg",
"compilerArgs": [
"-m32"
],
"includePath": [
"include",
"include/libc",
"src",
"build/gc-eu-mq-dbg",
".",
"extracted/gc-eu-mq-dbg"
],
"defines": [
"_LANGUAGE_C",
"OOT_VERSION=GC_EU_MQ_DBG",
"OOT_REGION=REGION_EU",
"PLATFORM_N64=0",
"PLATFORM_GC=1",
"DEBUG_FEATURES=1",
"F3DEX_GBI_2",
"F3DEX_GBI_PL",
"GBI_DOWHILE",
"GBI_DEBUG"
],
"cStandard": "gnu89"
},
{
"name": "oot-gc-eu",
"compilerArgs": [
Expand All @@ -78,14 +178,11 @@
],
"defines": [
"_LANGUAGE_C",
"ENABLE_HACKEROOT=0",
"RELEASE_ROM=0",
"COMPRESS_YAZ=1",
"OOT_VERSION=OOT_GC_EU",
"OOT_VERSION=GC_EU",
"OOT_REGION=REGION_EU",
"OOT_PAL=1",
"OOT_MQ=0",
"OOT_DEBUG=0",
"PLATFORM_N64=0",
"PLATFORM_GC=1",
"DEBUG_FEATURES=0",
"NDEBUG",
"F3DEX_GBI_2",
"F3DEX_GBI_PL",
Expand All @@ -108,14 +205,11 @@
],
"defines": [
"_LANGUAGE_C",
"ENABLE_HACKEROOT=0",
"RELEASE_ROM=0",
"COMPRESS_YAZ=1",
"OOT_VERSION=OOT_GC_EU_MQ",
"OOT_VERSION=GC_EU_MQ",
"OOT_REGION=REGION_EU",
"OOT_PAL=1",
"OOT_MQ=1",
"OOT_DEBUG=0",
"PLATFORM_N64=0",
"PLATFORM_GC=1",
"DEBUG_FEATURES=0",
"NDEBUG",
"F3DEX_GBI_2",
"F3DEX_GBI_PL",
Expand All @@ -124,36 +218,62 @@
"cStandard": "gnu89"
},
{
"name": "oot-gc-eu-mq-dbg",
"name": "oot-gc-jp-ce",
"compilerArgs": [
"-m32"
],
"includePath": [
"include",
"include/libc",
"src",
"build/gc-eu-mq-dbg",
"build/gc-jp-ce",
".",
"extracted/gc-eu-mq-dbg"
"extracted/gc-jp-ce"
],
"defines": [
"_LANGUAGE_C",
"OOT_VERSION=GC_JP_CE",
"OOT_REGION=REGION_JP",
"PLATFORM_N64=0",
"PLATFORM_GC=1",
"DEBUG_FEATURES=0",
"NDEBUG",
"F3DEX_GBI_2",
"F3DEX_GBI_PL",
"GBI_DOWHILE"
],
"cStandard": "gnu89"
},
{
"name": "hackeroot",
"compilerArgs": [
"-m32"
],
"includePath": [
"include",
"include/libc",
"src",
"build/hackeroot-mq",
".",
"extracted/hackeroot-mq"
],
"defines": [
"_LANGUAGE_C",
"ENABLE_HACKEROOT=0",
"RELEASE_ROM=0",
"COMPRESS_YAZ=1",
"OOT_VERSION=OOT_GC_EU_MQ_DBG",
"OOT_REGION=REGION_EU",
"OOT_PAL=1",
"OOT_MQ=1",
"OOT_DEBUG=1",
"PLATFORM_N64=0",
"PLATFORM_GC=1",
"DEBUG_FEATURES=1",
"NDEBUG",
"F3DEX_GBI_2",
"F3DEX_GBI_PL",
"GBI_DOWHILE",
"GBI_DEBUG"
"ENABLE_HACKEROOT=1",
"RELEASE_ROM=0",
"COMPRESS_YAZ=1"
],
"cStandard": "gnu89"
}
],
"version": 4
}

1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone &
pkg-config \
python3 \
python3-pip \
python3-venv \
git \
wget \
unzip \
Expand Down
18 changes: 16 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ pipeline {
// The ROMs are built in an order that maximizes compiler flags coverage in a "fail fast" approach.
// Specifically we start with a retail ROM for BSS ordering, and make sure we cover all of
// N64/GC/NTSC/PAL/MQ/DEBUG as quickly as possible.
stage('Build ntsc-1.2') {
stage('Build ntsc-1.0') {
steps {
script {
build('ntsc-1.2', 'oot-ntsc-1.2-us.z64')
build('ntsc-1.0', 'oot-ntsc-1.0-us.z64')
}
}
}
Expand Down Expand Up @@ -64,6 +64,13 @@ pipeline {
}
}
}
stage('Build ntsc-1.2') {
steps {
script {
build('ntsc-1.2', 'oot-ntsc-1.2-us.z64')
}
}
}
stage('Build gc-us') {
steps {
script {
Expand Down Expand Up @@ -99,6 +106,13 @@ pipeline {
}
}
}
stage('Build ntsc-1.1') {
steps {
script {
build('ntsc-1.1', 'oot-ntsc-1.1-us.z64')
}
}
}
stage('Build gc-us-mq') {
steps {
script {
Expand Down
Loading