mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-08-17 13:29:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ovl_En_Ik

Browse Source
This commit is contained in:
Sirius902
2020-10-12 21:16:47 -07:00
parent 558856d234 860297681c
commit 2941fd3540
170 changed files with 3270 additions and 9073 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+5 -14
View File
@@ -346,8 +346,7 @@ beginseg
include "build/src/code/z_skin_awb.o"
include "build/src/code/z_skin_matrix.o"
include "build/src/code/z_sram.o"
include "build/data/z_sram.data.o"
include "build/src/code/code_800A9D40.o"
include "build/src/code/z_ss_sram.o"
include "build/src/code/code_800A9F30.o"
include "build/data/z_text.data.o"
include "build/src/code/z_view.o"
@@ -738,8 +737,7 @@ endseg
beginseg
name "ovl_Bg_Gnd_Soulmeiro"
include "build/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.o"
include "build/data/overlays/actors/z_bg_gnd_soulmeiro.data.o"
include "build/data/overlays/actors/z_bg_gnd_soulmeiro.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/ovl_Bg_Gnd_Soulmeiro_reloc.o"
endseg
beginseg
@@ -772,8 +770,7 @@ endseg
beginseg
name "ovl_Bg_Haka_MeganeBG"
include "build/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.o"
include "build/data/overlays/actors/z_bg_haka_meganebg.data.o"
include "build/data/overlays/actors/z_bg_haka_meganebg.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Haka_MeganeBG/ovl_Bg_Haka_MeganeBG_reloc.o"
endseg
beginseg
@@ -2052,8 +2049,7 @@ endseg
beginseg
name "ovl_En_Butte"
include "build/src/overlays/actors/ovl_En_Butte/z_en_butte.o"
include "build/data/overlays/actors/z_en_butte.data.o"
include "build/data/overlays/actors/z_en_butte.reloc.o"
include "build/src/overlays/actors/ovl_En_Butte/ovl_En_Butte_reloc.o"
endseg
beginseg
@@ -2540,8 +2536,7 @@ endseg
beginseg
name "ovl_En_Horse_Normal"
include "build/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.o"
include "build/data/overlays/actors/z_en_horse_normal.data.o"
include "build/data/overlays/actors/z_en_horse_normal.reloc.o"
include "build/src/overlays/actors/ovl_En_Horse_Normal/ovl_En_Horse_Normal_reloc.o"
endseg
beginseg
@@ -2927,11 +2922,7 @@ endseg
beginseg
name "ovl_En_Rd"
include "build/src/overlays/actors/ovl_En_Rd/z_en_rd.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Rd/ovl_En_Rd_reloc.o"
#else
include "build/data/overlays/actors/z_en_rd.reloc.o"
#endif
endseg
beginseg