mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-14 19:10:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into ovl_En_Ik

Browse source
This commit is contained in:
Sirius902 2020-10-03 16:37:06 -07:00
commit 8384e646a5
972 changed files with 4286 additions and 11055 deletions
Download patch file Download diff file Expand all files Collapse all files

136
spec
View file

@ -411,8 +411,8 @@ beginseg
include "build/src/code/code_800E11F0.o"
include "build/data/code_800E11F0.data.o"
include "build/data/code_800E11F0.rodata.o"
include "build/src/libultra_code/code_800E6840.o"
include "build/src/libultra_code/osAiSetNextBuffer.o"
include "build/src/libultra_code_O2/code_800E6840.o"
include "build/src/libultra_code_O2/osAiSetNextBuffer.o"
include "build/src/code/audio_playback.o"
include "build/src/code/audio_effects.o"
include "build/data/audio_effects.data.o"
@ -442,71 +442,71 @@ beginseg
include "build/src/code/sleep.o"
include "build/src/code/jpegutils.o"
include "build/src/code/jpegdecoder.o"
include "build/src/libultra_code/osPfsFreeBlocks.o"
include "build/src/libultra_code_O2/osPfsFreeBlocks.o"
include "build/asm/guScale.o"
include "build/src/libultra_code/sinf.o"
include "build/src/libultra_code/sins.o"
include "build/src/libultra_code/sptask.o"
include "build/src/libultra_code/osRumblePak.o"
include "build/src/libultra_code/__osSiCreateAccessQueue.o"
include "build/src/libultra_code/osContInit.o"
include "build/src/libultra_code/osContStartReadData.o"
include "build/src/libultra_code/guPerspectiveF.o"
include "build/src/libultra_code/__osSpRawStartDma.o"
include "build/src/libultra_code/__osSiRawStartDma.o"
include "build/src/libultra_code/osSpTaskYield.o"
include "build/src/libultra_code/pfsreadwritefile.o"
include "build/src/libultra_code/__osPfsGetStatus.o"
include "build/src/libultra_code_O2/sinf.o"
include "build/src/libultra_code_O2/sins.o"
include "build/src/libultra_code_O2/sptask.o"
include "build/src/libultra_code_O2/osRumblePak.o"
include "build/src/libultra_code_O2/__osSiCreateAccessQueue.o"
include "build/src/libultra_code_O2/osContInit.o"
include "build/src/libultra_code_O2/osContStartReadData.o"
include "build/src/libultra_code_O2/guPerspectiveF.o"
include "build/src/libultra_code_O2/__osSpRawStartDma.o"
include "build/src/libultra_code_O2/__osSiRawStartDma.o"
include "build/src/libultra_code_O2/osSpTaskYield.o"
include "build/src/libultra_code_O2/pfsreadwritefile.o"
include "build/src/libultra_code_O2/__osPfsGetStatus.o"
include "build/asm/guMtxIdentF.o"
include "build/src/libultra_code/guLookAt.o"
include "build/src/libultra_code/pfsallocatefile.o"
include "build/src/libultra_code/osStopTimer.o"
include "build/src/libultra_code/contpfs.o"
include "build/src/libultra_code/code_80102FA0.o"
include "build/src/libultra_code/osPfsFindFile.o"
include "build/src/libultra_code/sqrtf.o"
include "build/src/libultra_code/osAfterPreNMI.o"
include "build/src/libultra_code/contquery.o"
include "build/src/libultra_code/guLookAtHilite.o"
include "build/src/libultra_code/sp.o"
include "build/src/libultra_code_O2/guLookAt.o"
include "build/src/libultra_code_O2/pfsallocatefile.o"
include "build/src/libultra_code_O1/osStopTimer.o"
include "build/src/libultra_code_O2/contpfs.o"
include "build/src/libultra_code_O2/code_80102FA0.o"
include "build/src/libultra_code_O2/osPfsFindFile.o"
include "build/src/libultra_code_O2/sqrtf.o"
include "build/src/libultra_code_O2/osAfterPreNMI.o"
include "build/src/libultra_code_O2/contquery.o"
include "build/src/libultra_code_O2/guLookAtHilite.o"
include "build/src/libultra_code_O2/sp.o"
include "build/asm/guMtxIdent.o"
include "build/src/libultra_code/guPosition.o"
include "build/src/libultra_code/osSpTaskYielded.o"
include "build/src/libultra_code/rotate.o"
include "build/src/libultra_code/osAiSetFrequency.o"
include "build/src/libultra_code/__osGetActiveQueue.o"
include "build/src/libultra_code_O2/guPosition.o"
include "build/src/libultra_code_O2/osSpTaskYielded.o"
include "build/src/libultra_code_O2/rotate.o"
include "build/src/libultra_code_O2/osAiSetFrequency.o"
include "build/src/libultra_code_O2/__osGetActiveQueue.o"
include "build/asm/guNormalize.o"
include "build/src/libultra_code/osDpGetStatus.o"
include "build/src/libultra_code/osDpSetStatus.o"
include "build/src/libultra_code/osPfsDeleteFile.o"
include "build/src/libultra_code/ortho.o"
include "build/src/libultra_code/cosf.o"
include "build/src/libultra_code_O2/osDpGetStatus.o"
include "build/src/libultra_code_O2/osDpSetStatus.o"
include "build/src/libultra_code_O2/osPfsDeleteFile.o"
include "build/src/libultra_code_O2/ortho.o"
include "build/src/libultra_code_O2/cosf.o"
include "build/data/__libm_qnan_f.rodata.o"
include "build/src/libultra_code/coss.o"
include "build/src/libultra_code/osViSetEvent.o"
include "build/src/libultra_code/osPfsIsPlug.o"
include "build/src/libultra_code/guS2DInitBg.o"
include "build/src/libultra_code/__osPfsSelectBank.o"
include "build/src/libultra_code/osContSetCh.o"
include "build/src/libultra_code/code_80104D60.o"
include "build/src/libultra_code/pfsinitpak.o"
include "build/src/libultra_code/pfschecker.o"
include "build/src/libultra_code/osAiGetLength.o"
include "build/src/libultra_code_O2/coss.o"
include "build/src/libultra_code_O2/osViSetEvent.o"
include "build/src/libultra_code_O2/osPfsIsPlug.o"
include "build/src/libultra_code_O2/guS2DInitBg.o"
include "build/src/libultra_code_O2/__osPfsSelectBank.o"
include "build/src/libultra_code_O2/osContSetCh.o"
include "build/src/libultra_code_O2/code_80104D60.o"
include "build/src/libultra_code_O2/pfsinitpak.o"
include "build/src/libultra_code_O2/pfschecker.o"
include "build/src/libultra_code_O2/osAiGetLength.o"
include "build/asm/guTranslate.o"
include "build/src/libultra_code/__osContRamWrite.o"
include "build/src/libultra_code/__osContRamRead.o"
include "build/src/libultra_code/__osContAddressCrc.o"
include "build/src/libultra_code/osSetTimer.o"
include "build/src/libultra_code/__osSpGetStatus.o"
include "build/src/libultra_code/__osSpSetStatus.o"
include "build/src/libultra_code_O2/__osContRamWrite.o"
include "build/src/libultra_code_O2/__osContRamRead.o"
include "build/src/libultra_code_O2/__osContAddressCrc.o"
include "build/src/libultra_code_O1/osSetTimer.o"
include "build/src/libultra_code_O2/__osSpGetStatus.o"
include "build/src/libultra_code_O2/__osSpSetStatus.o"
include "build/asm/osWritebackDCacheAll.o"
include "build/src/libultra_code/__osGetCurrFaultedThread.o"
include "build/src/libultra_code_O2/__osGetCurrFaultedThread.o"
include "build/asm/guMtxF2L.o"
include "build/src/libultra_code/llcvt.o"
include "build/src/libultra_code/osViGetCurrentFramebuffer.o"
include "build/src/libultra_code/__osSpSetPc.o"
include "build/src/libultra_code/sqrt.o"
include "build/src/libultra_code/absf.o"
include "build/src/libultra_code_O1/llcvt.o"
include "build/src/libultra_code_O2/osViGetCurrentFramebuffer.o"
include "build/src/libultra_code_O2/__osSpSetPc.o"
include "build/src/libultra_code_O2_g3/sqrt.o"
include "build/src/libultra_code_O2_g3/absf.o"
include "build/src/code/code_801067F0.o"
include "build/src/code/code_80106860.o"
include "build/src/code/code_801068B0.o"
@ -1032,8 +1032,7 @@ endseg
beginseg
name "ovl_Bg_Jya_Zurerukabe"
include "build/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.o"
include "build/data/overlays/actors/z_bg_jya_zurerukabe.data.o"
include "build/data/overlays/actors/z_bg_jya_zurerukabe.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/ovl_Bg_Jya_Zurerukabe_reloc.o"
endseg
beginseg
@ -2039,9 +2038,7 @@ endseg
beginseg
name "ovl_En_Box"
include "build/src/overlays/actors/ovl_En_Box/z_en_box.o"
include "build/data/overlays/actors/z_en_box.data.o"
include "build/data/overlays/actors/z_en_box.bss.o"
include "build/data/overlays/actors/z_en_box.reloc.o"
include "build/src/overlays/actors/ovl_En_Box/ovl_En_Box_reloc.o"
endseg
beginseg
@ -2505,8 +2502,11 @@ endseg
beginseg
name "ovl_En_Holl"
include "build/src/overlays/actors/ovl_En_Holl/z_en_holl.o"
include "build/data/overlays/actors/z_en_holl.data.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Holl/ovl_En_Holl_reloc.o"
#else
include "build/data/overlays/actors/z_en_holl.reloc.o"
#endif
endseg
beginseg
@ -2567,8 +2567,7 @@ endseg
beginseg
name "ovl_En_Hs2"
include "build/src/overlays/actors/ovl_En_Hs2/z_en_hs2.o"
include "build/data/overlays/actors/z_en_hs2.data.o"
include "build/data/overlays/actors/z_en_hs2.reloc.o"
include "build/src/overlays/actors/ovl_En_Hs2/ovl_En_Hs2_reloc.o"
endseg
beginseg
@ -2884,8 +2883,7 @@ endseg
beginseg
name "ovl_En_Part"
include "build/src/overlays/actors/ovl_En_Part/z_en_part.o"
include "build/data/overlays/actors/z_en_part.data.o"
include "build/data/overlays/actors/z_en_part.reloc.o"
include "build/src/overlays/actors/ovl_En_Part/ovl_En_Part_reloc.o"
endseg
beginseg