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

Merge remote-tracking branch 'upstream/master' into ovl_Eff_Dust

Browse Source
This commit is contained in:
angie
2021-01-23 01:22:30 -03:00
parent 272fc5ca0f 84195fcef6
commit 48964ff2a8
1003 changed files with 28386 additions and 22481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+11 -20
View File
@@ -569,11 +569,7 @@ endseg
beginseg
name "ovl_player_actor"
include "build/src/overlays/actors/ovl_player_actor/z_player.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_player_actor/ovl_player_actor_reloc.o"
#else
include "build/data/overlays/actors/z_player.reloc.o"
#endif
endseg
beginseg
@@ -788,8 +784,7 @@ endseg
beginseg
name "ovl_Bg_Haka_Zou"
include "build/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.o"
include "build/data/overlays/actors/z_bg_haka_zou.data.o"
include "build/data/overlays/actors/z_bg_haka_zou.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Haka_Zou/ovl_Bg_Haka_Zou_reloc.o"
endseg
beginseg
@@ -956,8 +951,11 @@ endseg
beginseg
name "ovl_Bg_Jya_Cobra"
include "build/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.o"
include "build/data/overlays/actors/z_bg_jya_cobra.data.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra_reloc.o"
#else
include "build/data/overlays/actors/z_bg_jya_cobra.reloc.o"
#endif
endseg
beginseg
@@ -1196,8 +1194,7 @@ endseg
beginseg
name "ovl_Bg_Spot06_Objects"
include "build/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.o"
include "build/data/overlays/actors/z_bg_spot06_objects.data.o"
include "build/data/overlays/actors/z_bg_spot06_objects.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Spot06_Objects/ovl_Bg_Spot06_Objects_reloc.o"
endseg
beginseg
@@ -2499,8 +2496,7 @@ endseg
beginseg
name "ovl_En_Hy"
include "build/src/overlays/actors/ovl_En_Hy/z_en_hy.o"
include "build/data/overlays/actors/z_en_hy.data.o"
include "build/data/overlays/actors/z_en_hy.reloc.o"
include "build/src/overlays/actors/ovl_En_Hy/ovl_En_Hy_reloc.o"
endseg
beginseg
@@ -2630,8 +2626,11 @@ endseg
beginseg
name "ovl_En_M_Thunder"
include "build/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.o"
include "build/data/overlays/actors/z_en_m_thunder.data.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_M_Thunder/ovl_En_M_Thunder_reloc.o"
#else
include "build/data/overlays/actors/z_en_m_thunder.reloc.o"
#endif
endseg
beginseg
@@ -2782,11 +2781,7 @@ endseg
beginseg
name "ovl_En_Owl"
include "build/src/overlays/actors/ovl_En_Owl/z_en_owl.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Owl/ovl_En_Owl_reloc.o"
#else
include "build/data/overlays/actors/z_en_owl.reloc.o"
#endif
endseg
beginseg
@@ -3106,11 +3101,7 @@ endseg
beginseg
name "ovl_En_Viewer"
include "build/src/overlays/actors/ovl_En_Viewer/z_en_viewer.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Viewer/ovl_En_Viewer_reloc.o"
#else
include "build/data/overlays/actors/z_en_viewer.reloc.o"
#endif
endseg
beginseg