mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-10-18 20:49:58 +00:00
Code Issues Projects Releases Wiki Activity

Fixed merge conflict

Browse source
This commit is contained in:
Lucas Shaw 2020-03-22 22:57:24 -07:00
commit 6a45dcba7f
1126 changed files with 14375 additions and 23498 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spec
View file

@ -788,9 +788,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
@ -3676,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