mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-10 04:02:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Bg_toki_swd

Browse Source
This commit is contained in:
shawlucas
2020-03-21 20:38:59 -07:00
parent 13e2c84dbf a3bac9fbb2
commit f581128e6b
139 changed files with 941 additions and 1643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+4 -9
View File
@@ -383,8 +383,7 @@ beginseg
include "build/src/code/z_view.o"
include "build/data/z_view.data.o"
include "build/src/code/z_vimode.o"
include "build/asm/code_800ACE70.o"
include "build/data/code_800ACE70.data.o"
include "build/src/code/code_800ACE70.o"
include "build/src/code/z_vismono.o"
include "build/asm/code_800AD920.o"
include "build/src/code/z_vr_box.o"
@@ -509,10 +508,8 @@ beginseg
include "build/src/code/code_800FC620.o"
include "build/asm/code_800FCB50.o"
include "build/asm/code_800FCD40.o"
include "build/asm/code_800FCE80.o"
include "build/data/code_800FCE80.data.o"
include "build/data/code_800FCE80.rodata.o"
include "build/data/code_800FCE80.bss.o"
include "build/src/code/code_800FCE80.o"
include "build/asm/fp.o"
include "build/src/code/system_malloc.o"
include "build/asm/code_800FD970.o"
include "build/data/code_800FD970.data.o"
@@ -1787,9 +1784,7 @@ endseg
beginseg
name "ovl_Demo_Geff"
include "build/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.o"
include "build/data/overlays/actors/z_demo_geff.data.o"
include "build/data/overlays/actors/z_demo_geff.rodata.o"
include "build/data/overlays/actors/z_demo_geff.reloc.o"
include "build/src/overlays/actors/ovl_Demo_Geff/z_demo_geff_reloc.o"
endseg
beginseg