Skip to content
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
2083d1e
start mk64
Yanis002 Sep 27, 2024
891efde
splits, rename dol to wii-vc, match some files
Yanis002 Sep 28, 2024
b365a1f
dol apply
Yanis002 Sep 28, 2024
7dc95a1
format
Yanis002 Sep 28, 2024
a59c265
match system, rom and flash
Yanis002 Sep 28, 2024
bc35bb1
dol apply & format
Yanis002 Sep 28, 2024
d9162fa
match errordisplay (and almost store)
Yanis002 Sep 28, 2024
8f8ddf2
match store
Yanis002 Sep 28, 2024
249b8a4
Merge remote-tracking branch 'upstream/main' into mk64
Yanis002 Oct 17, 2025
7ae943b
version stuff
Yanis002 Oct 17, 2025
6f2cdae
build fixes
Yanis002 Oct 17, 2025
9b50561
match banner.c
Yanis002 Oct 17, 2025
eb82ff0
link soundRVL
Yanis002 Oct 17, 2025
3ae9aa2
match helpRVL
Yanis002 Oct 17, 2025
97c05f2
match controller.c and random progress
Yanis002 Oct 17, 2025
c781b71
match library.c
Yanis002 Oct 17, 2025
63437c6
match libraries
Yanis002 Oct 17, 2025
2653a6e
dol apply
Yanis002 Oct 17, 2025
0a7d508
minor configure.py improvements
Yanis002 Oct 18, 2025
b3d96cb
name all functions for mk64-j and mk64-e and started splits
Yanis002 Oct 18, 2025
d34d635
complete splits for mk64-j
Yanis002 Oct 18, 2025
86ca568
run dol apply
Yanis002 Oct 18, 2025
ef3cb7b
complete splits for mk64-e
Yanis002 Oct 18, 2025
80db9a6
forgot __init_cpp_exceptions.cpp
Yanis002 Oct 18, 2025
45bfe41
self-review
Yanis002 Oct 18, 2025
ea8afc1
add mk64 to CI
Yanis002 Oct 18, 2025
99f6fa5
add mk64 in the supported versions list from the readme
Yanis002 Oct 18, 2025
087fa3f
version improvements
Yanis002 Oct 18, 2025
988c799
fix build issues
Yanis002 Oct 18, 2025
fed4b63
oot-vc -> wii-vc
Yanis002 Oct 18, 2025
d320528
configure.py improvement
Yanis002 Oct 18, 2025
e6e580d
version stuff
Yanis002 Oct 18, 2025
f22ee9b
initial configs
Yanis002 Oct 18, 2025
f04649c
name all functions
Yanis002 Oct 18, 2025
2d8b92e
complete splits and symbols for sm64-e
Yanis002 Oct 18, 2025
dfc0eb7
more splits and symbols
Yanis002 Oct 19, 2025
8e9ca1c
more splits and symbols 2
Yanis002 Oct 19, 2025
f624454
more splits and symbols 3
Yanis002 Oct 19, 2025
1cd7acc
match homebutton differences for jp and us
Yanis002 Oct 19, 2025
ae2bbad
emulator progress
Yanis002 Oct 19, 2025
77a46a4
run dol-apply and format
Yanis002 Oct 19, 2025
69aceb4
add sm64 to CI
Yanis002 Oct 19, 2025
c8c41b0
fix some build issues
Yanis002 Oct 19, 2025
d769fa1
library.c progress
Yanis002 Oct 20, 2025
c8b8638
library.c progress 2
Yanis002 Oct 20, 2025
550065e
library.c progress 3
Yanis002 Oct 20, 2025
6874ba3
frame.c progress
Yanis002 Oct 20, 2025
2603ada
cpu progress
Yanis002 Oct 20, 2025
cd3b042
frameDrawSetupSP progress
Yanis002 Oct 20, 2025
b790b3e
minor rsp progress
Yanis002 Oct 20, 2025
bc84b62
Merge branch 'mk64' into pre-oot-versions
Yanis002 Oct 20, 2025
73c308b
review
Yanis002 Oct 20, 2025
90a8a63
review 2 + fix match issues
Yanis002 Oct 20, 2025
e158310
format
Yanis002 Oct 20, 2025
1e75923
review 2
Yanis002 Oct 20, 2025
953a5fd
`VERSION >=` -> `VERSION >` for consistency
Yanis002 Oct 20, 2025
553406b
add sm64 to the readme
Yanis002 Oct 20, 2025
bf9c086
fake match rspParseGBI_F3DEX2
Yanis002 Oct 21, 2025
f8803d2
review 4
Yanis002 Oct 24, 2025
94a1221
`VERSION >` -> `VERSION >=`
Yanis002 Oct 24, 2025
97848aa
Merge remote-tracking branch 'upstream/main' into sm64
Yanis002 Oct 24, 2025
6952d66
format
Yanis002 Oct 24, 2025
1d7ee3b
fix build issues
Yanis002 Oct 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Build
run: |
python configure.py --map --binutils /binutils --compilers /compilers
ninja all_source build/{oot-j,oot-u,oot-e}/progress.json build/report.json
ninja all_source build/{sm64-j,sm64-u,sm64-e,oot-j,oot-u,oot-e}/progress.json build/report.json

# Upload map files
- name: Upload map
Expand Down
2 changes: 1 addition & 1 deletion config/oot-e/build.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dd77f97a971ff3c056791be8c3c97f1617393af6 build/oot-e/oot-vc.dol
dd77f97a971ff3c056791be8c3c97f1617393af6 build/oot-e/wii-vc.dol
3 changes: 2 additions & 1 deletion config/oot-e/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# See config.example.yml for documentation.
name: oot-vc
name: wii-vc
object: orig/oot-e/content1.app
hash: dd77f97a971ff3c056791be8c3c97f1617393af6
symbols: config/oot-e/symbols.txt
Expand Down Expand Up @@ -90,6 +90,7 @@ add_relocations:
target: fn_8005B6E8

block_relocations:
# system.c
- source: 0x800083A0
- source: 0x800083B0
- source: 0x800083CC
Expand Down
2 changes: 1 addition & 1 deletion config/oot-e/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7581,7 +7581,7 @@ dtor$2981 = .sdata:0x8025CAB8; // type:object size:0x4 scope:local align:4 data:
dtor$3020 = .sdata:0x8025CABC; // type:object size:0x4 scope:local align:4 data:float
nAddress$3459 = .sdata:0x8025CAC0; // type:object size:0x4 scope:local data:4byte
@16 = .sdata:0x8025CAC8; // type:object size:0x5 scope:local data:string
lbl_8025C850 = .sdata:0x8025CAD0; // type:object size:0x4 data:byte
helpMenu_lbl_8025C850 = .sdata:0x8025CAD0; // type:object size:0x4 data:byte
@3409 = .sdata:0x8025CAD4; // type:object size:0x6 scope:local data:string
@3410 = .sdata:0x8025CADC; // type:object size:0x6 scope:local data:string
@3510 = .sdata:0x8025CAE4; // type:object size:0x2 scope:local data:string
Expand Down
2 changes: 1 addition & 1 deletion config/oot-j/build.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
47546e48467ae14d712b8c207e911821586d1043 build/oot-j/oot-vc.dol
47546e48467ae14d712b8c207e911821586d1043 build/oot-j/wii-vc.dol
3 changes: 2 additions & 1 deletion config/oot-j/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# See config.example.yml for documentation.
name: oot-vc
name: wii-vc
object: orig/oot-j/content1.app
hash: 47546e48467ae14d712b8c207e911821586d1043
symbols: config/oot-j/symbols.txt
Expand Down Expand Up @@ -90,6 +90,7 @@ add_relocations:
target: fn_8005B6E8

block_relocations:
# system.c
- source: 0x8002C248
- source: 0x8002B758
- source: 0x8003E3BC
Expand Down
4 changes: 2 additions & 2 deletions config/oot-j/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7635,7 +7635,7 @@ dtor$2985 = .sdata:0x8025C838; // type:object size:0x4 scope:local align:4 data:
dtor$3024 = .sdata:0x8025C83C; // type:object size:0x4 scope:local align:4 data:float
nAddress$3463 = .sdata:0x8025C840; // type:object size:0x4 scope:local data:4byte
@16 = .sdata:0x8025C848; // type:object size:0x5 scope:local data:string
lbl_8025C850 = .sdata:0x8025C850; // type:object size:0x4 data:byte
helpMenu_lbl_8025C850 = .sdata:0x8025C850; // type:object size:0x4 data:byte
@3388 = .sdata:0x8025C854; // type:object size:0x6 scope:local data:string
@3389 = .sdata:0x8025C85C; // type:object size:0x6 scope:local data:string
@3489 = .sdata:0x8025C864; // type:object size:0x2 scope:local data:string
Expand Down Expand Up @@ -7985,7 +7985,7 @@ sSrcBuffer = .sbss:0x8025D088; // type:object size:0x4 data:4byte
sDestinationBuffer = .sbss:0x8025D08C; // type:object size:0x4 data:4byte
lbl_8025D090 = .sbss:0x8025D090; // type:object size:0x4 align:4 data:float
lbl_8025D094 = .sbss:0x8025D094; // type:object size:0x4 align:4 data:float
lbl_8025D098 = .sbss:0x8025D098; // type:object size:0x4 data:4byte
gRealProjectionType = .sbss:0x8025D098; // type:object size:0x4 data:4byte
snScissorHeight = .sbss:0x8025D09C; // type:object size:0x4 data:4byte
snScissorWidth = .sbss:0x8025D0A0; // type:object size:0x4 data:4byte
snScissorYOrig = .sbss:0x8025D0A4; // type:object size:0x4 data:4byte
Expand Down
2 changes: 1 addition & 1 deletion config/oot-u/build.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
763d4d3d0713e4d10e44540ccfa3255e19f28af7 build/oot-u/oot-vc.dol
763d4d3d0713e4d10e44540ccfa3255e19f28af7 build/oot-u/wii-vc.dol
3 changes: 2 additions & 1 deletion config/oot-u/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# See config.example.yml for documentation.
name: oot-vc
name: wii-vc
object: orig/oot-u/content1.app
hash: 763d4d3d0713e4d10e44540ccfa3255e19f28af7
symbols: config/oot-u/symbols.txt
Expand Down Expand Up @@ -90,6 +90,7 @@ add_relocations:
target: fn_8005B6E8

block_relocations:
# system.c
- source: 0x800083A0
- source: 0x800083B0
- source: 0x800083CC
Expand Down
2 changes: 1 addition & 1 deletion config/oot-u/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7648,7 +7648,7 @@ dtor$2981 = .sdata:0x8025C938; // type:object size:0x4 scope:local align:4 data:
dtor$3020 = .sdata:0x8025C93C; // type:object size:0x4 scope:local align:4 data:float
nAddress$3459 = .sdata:0x8025C940; // type:object size:0x4 scope:local data:4byte
@16 = .sdata:0x8025C948; // type:object size:0x5 scope:local data:string
lbl_8025C850 = .sdata:0x8025C950; // type:object size:0x4 data:byte
helpMenu_lbl_8025C850 = .sdata:0x8025C950; // type:object size:0x4 data:byte
@3400 = .sdata:0x8025C954; // type:object size:0x6 scope:local data:string
@3401 = .sdata:0x8025C95C; // type:object size:0x6 scope:local data:string
@3501 = .sdata:0x8025C964; // type:object size:0x2 scope:local data:string
Expand Down
1 change: 1 addition & 0 deletions config/sm64-e/build.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4d65a6aabcc9d902df6a84ad53e3c7619a85b4fb build/sm64-e/wii-vc.dol
127 changes: 127 additions & 0 deletions config/sm64-e/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
# See config.example.yml for documentation.
name: wii-vc
object: orig/sm64-e/content1.app
hash: 4d65a6aabcc9d902df6a84ad53e3c7619a85b4fb
symbols: config/sm64-e/symbols.txt
splits: config/sm64-e/splits.txt

# Change this to match the linker verison.
# See config.example.yml for a list.
mw_comment_version: 14

extract:
# DSPCode.c
- symbol: axDspSlave
header: axDspSlave.inc
# AXComp.c
- symbol: __AXCompressorTable
header: __AXCompressorTable.inc

force_active:
- lbl_801E3380
- DemoAllocator2
- TRKAccessFile
- TRKOpenFile
- TRKCloseFile
- TRKPositionFile
- sSetInfoAsync__Q210homebutton10Controller
- lbl_8025DBBC__Q210homebutton10Controller

add_relocations:
- source: 0x8005D0B0
type: ha
target: GenPerspective_1080
- source: 0x8005D0D8
type: l
target: GenPerspective_1080

block_relocations:
# system.c
- source: 0x8000B16C
- source: 0x8000B17C
- source: 0x8000B198
- source: 0x8000B1A0
- source: 0x8000B1C4
- source: 0x8000B1E8
- source: 0x8000B210
- source: 0x8000B220
- source: 0x8000B23C
- source: 0x8000B244
- source: 0x8000B268
- source: 0x8000B28C
- source: 0x8000B2B8
- source: 0x8000B2C8
- source: 0x8000B2E4
- source: 0x8000B2EC
- source: 0x8000B314
- source: 0x8000B338
- source: 0x8000B678
- source: 0x8000B680
- source: 0x8000B6A8
- source: 0x8000B6B0
- source: 0x8000B6D0
- source: 0x8000B6D8
- source: 0x8000B7F4
- source: 0x8000B7FC
- source: 0x8000B86C
- source: 0x8000B87C
- source: 0x8000B898
- source: 0x8000B8A8
- source: 0x8000B8C8
- source: 0x8000B8E0
- source: 0x8000B908
- source: 0x8000B918
- source: 0x8000B938
- source: 0x8000B9C4
- source: 0x8000B9CC
- source: 0x8000B9F0
- source: 0x8000BA14
- source: 0x8000BA38
- source: 0x8000BA40
- source: 0x8000BA64
- source: 0x8000BA88
- source: 0x8000BAD8
- source: 0x8000BAF0
- source: 0x8000BB20
- source: 0x8000BB48
- source: 0x8000BB68
- source: 0x8000BB78
- source: 0x8000BB98
- source: 0x8000BBC4
- source: 0x8000B640
- source: 0x8000B648
- source: 0x8000B7C4
- source: 0x8000B7CC
- source: 0x8000BBE8
- source: 0x8000BC00
- source: 0x8000BC2C
- source: 0x8000BC4C
- source: 0x8000BC5C
- source: 0x8000BC98
- source: 0x8000BCA8
- source: 0x8000BCCC
- source: 0x8000BD8C
- source: 0x8000BD9C
- source: 0x8000BDC0
- source: 0x8000BDE8
- source: 0x8000BE0C
- source: 0x8000BE38
- source: 0x8000BE54
- source: 0x8000BE64
- source: 0x8000BEC0
- source: 0x8000BED0
- source: 0x8000BEEC
- source: 0x8000BF0C
- source: 0x8000BF1C
- source: 0x8000BF3C
- source: 0x8000C010
- source: 0x8000C020
- source: 0x8000C058
- source: 0x8000C070
- source: 0x8000C0A8
- source: 0x8000C0B0
- source: 0x8000C0D0
- source: 0x8000C0E0
- source: 0x8000C104
- source: 0x8000C1BC
- source: 0x8000C1CC
Loading