mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 22:44:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into skelanime

Browse source
This commit is contained in:
KrimtonZ 2020-03-22 20:35:10 -05:00
commit d136468ace
1304 changed files with 15506 additions and 25453 deletions
Download patch file Download diff file Expand all files Collapse all files

29
spec
View file

@ -381,8 +381,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"
@ -507,10 +506,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"
@ -789,9 +786,7 @@ endseg
beginseg
name "ovl_Bg_Gate_Shutter"
include "build/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.o"
include "build/data/overlays/actors/z_bg_gate_shutter.data.o"
include "build/data/overlays/actors/z_bg_gate_shutter.rodata.o"
include "build/data/overlays/actors/z_bg_gate_shutter.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter_reloc.o"
endseg
beginseg
@ -1592,9 +1587,7 @@ endseg
beginseg
name "ovl_Bg_Toki_Swd"
include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.o"
include "build/data/overlays/actors/z_bg_toki_swd.data.o"
include "build/data/overlays/actors/z_bg_toki_swd.rodata.o"
include "build/data/overlays/actors/z_bg_toki_swd.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_reloc.o"
endseg
beginseg
@ -1787,9 +1780,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
@ -2590,9 +2581,7 @@ endseg
beginseg
name "ovl_En_Dog"
include "build/src/overlays/actors/ovl_En_Dog/z_en_dog.o"
include "build/data/overlays/actors/z_en_dog.data.o"
include "build/data/overlays/actors/z_en_dog.rodata.o"
include "build/data/overlays/actors/z_en_dog.reloc.o"
include "build/src/overlays/actors/ovl_En_Dog/z_en_dog_reloc.o"
endseg
beginseg
@ -3685,9 +3674,7 @@ endseg
beginseg
name "ovl_En_Tk"
include "build/src/overlays/actors/ovl_En_Tk/z_en_tk.o"
include "build/data/overlays/actors/z_en_tk.data.o"
include "build/data/overlays/actors/z_en_tk.rodata.o"
include "build/data/overlays/actors/z_en_tk.reloc.o"
include "build/src/overlays/actors/ovl_En_Tk/z_en_tk_reloc.o"
endseg
beginseg