mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-08-04 01:03:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ovl_Bg_toki_swd

Browse Source
This commit is contained in:
Lucas Shaw
2020-03-21 18:10:07 -07:00
committed by GitHub
parent f1ae94c2f3 1d79f4b93d
commit bc6746b77b
54 changed files with 833 additions and 1447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+3 -6
View File
@@ -316,7 +316,6 @@ beginseg
include "build/src/code/z_elf_message.o"
include "build/data/z_elf_message.data.o"
include "build/src/code/code_8006C360.o"
include "build/data/code_8006C360.data.o"
include "build/src/code/code_8006C3A0.o"
include "build/src/code/code_8006C510.o"
include "build/src/code/z_fcurve_data_skelanime.o"
@@ -340,8 +339,8 @@ beginseg
include "build/src/code/z_malloc.o"
include "build/src/code/z_map_mark.o"
include "build/src/code/z_moji.o"
include "build/src/code/code_8007BE60.o"
include "build/src/code/code_8007BF10.o"
include "build/src/code/z_prenmi_buff.o"
include "build/src/code/z_msgevent.o"
include "build/src/code/code_8007BF90.o"
include "build/src/code/z_onepointdemo.o"
include "build/data/z_onepointdemo.data.o"
@@ -2591,9 +2590,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