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

Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Obj_Bombiwa

Browse Source
This commit is contained in:
Thar0
2020-03-20 00:52:28 +00:00
parent adbcbb6434 c0965dcbe6
commit f263ce0b9c
38 changed files with 654 additions and 1689 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+2 -7
View File
@@ -308,8 +308,6 @@ beginseg
include "build/src/code/z_common_data.o"
include "build/data/z_common_data.bss.o"
include "build/src/code/z_debug.o"
include "build/data/z_debug.data.o"
include "build/data/z_debug.bss.o"
include "build/src/code/z_debug_display.o"
include "build/src/code/z_demo.o"
include "build/src/code/code_80069420.o"
@@ -615,8 +613,7 @@ endseg
beginseg
name "ovl_title"
include "build/src/overlays/gamestates/ovl_title/z_title.o"
include "build/data/overlays/gamestates/z_title.data.o"
include "build/data/overlays/gamestates/z_title.reloc.o"
include "build/src/overlays/gamestates/ovl_title/z_title_reloc.o"
address 0x80800000
endseg
@@ -3184,9 +3181,7 @@ endseg
beginseg
name "ovl_En_Lightbox"
include "build/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.o"
include "build/data/overlays/actors/z_en_lightbox.data.o"
include "build/data/overlays/actors/z_en_lightbox.rodata.o"
include "build/data/overlays/actors/z_en_lightbox.reloc.o"
include "build/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox_reloc.o"
endseg
beginseg