mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 14:34:32 +00:00
Code Issues Projects Releases Wiki Activity

merge and change scene thing

Browse source
This commit is contained in:
fig02 2020-03-20 08:17:48 -04:00
commit aa603ca229
113 changed files with 1722 additions and 5879 deletions
Download patch file Download diff file Expand all files Collapse all files

17
spec
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"
@ -444,8 +442,6 @@ beginseg
include "build/src/code/listalloc.o"
include "build/src/code/main.o"
include "build/src/code/padmgr.o"
include "build/data/padmgr.data.o"
include "build/data/padmgr.bss.o"
include "build/src/code/sched.o"
include "build/data/sched.data.o"
include "build/data/sched.bss.o"
@ -617,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
@ -1882,9 +1877,7 @@ endseg
beginseg
name "ovl_Door_Ana"
include "build/src/overlays/actors/ovl_Door_Ana/z_door_ana.o"
include "build/data/overlays/actors/z_door_ana.data.o"
include "build/data/overlays/actors/z_door_ana.rodata.o"
include "build/data/overlays/actors/z_door_ana.reloc.o"
include "build/src/overlays/actors/ovl_Door_Ana/z_door_ana_reloc.o"
endseg
beginseg
@ -3186,9 +3179,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
@ -3803,7 +3794,7 @@ endseg
beginseg
name "ovl_En_Wallmas"
include "build/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.o"
include "build/data/overlays/actors/z_en_wallmas.reloc.o"
include "build/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas_reloc.o"
endseg
beginseg