mirror of
https://github.com/zeldaret/mm.git
synced 2026-08-16 04:44:19 -04:00
Merge remote-tracking branch 'upstream/master' into ultracleanup2
This commit is contained in:
@@ -13,38 +13,38 @@ endseg
|
||||
beginseg
|
||||
name "boot"
|
||||
address 0x80080060
|
||||
include "build/src/boot_O2_g3/boot_main.o"
|
||||
include "build/src/boot/boot_main.o"
|
||||
include "build/data/boot/rspboot.data.o"
|
||||
include "build/src/boot_O2_g3/idle.o"
|
||||
include "build/src/boot_O2_g3/viconfig.o"
|
||||
include "build/src/boot/idle.o"
|
||||
include "build/src/boot/viconfig.o"
|
||||
include "build/data/boot/viconfig.data.o"
|
||||
include "build/src/boot_O2_g3/z_std_dma.o"
|
||||
include "build/src/boot_O2_g3/yaz0.o"
|
||||
include "build/src/boot_O2_g3/irqmgr.o"
|
||||
include "build/src/boot_O2_g3/CIC6105.o"
|
||||
include "build/src/boot_O2_g3/syncprintf.o"
|
||||
include "build/src/boot_O2_g3/fault.o"
|
||||
include "build/src/boot_O2_g3/fault_drawer.o"
|
||||
include "build/src/boot_O2/boot_80084940.o"
|
||||
include "build/src/boot_O2/loadfragment.o"
|
||||
include "build/src/boot_O2/loadfragment2.o"
|
||||
include "build/src/boot_O2/padutils.o"
|
||||
include "build/src/boot_O2/stackcheck.o"
|
||||
include "build/src/boot_O2/gfxprint.o"
|
||||
include "build/src/boot/z_std_dma.o"
|
||||
include "build/src/boot/yaz0.o"
|
||||
include "build/src/boot/irqmgr.o"
|
||||
include "build/src/boot/CIC6105.o"
|
||||
include "build/src/boot/syncprintf.o"
|
||||
include "build/src/boot/fault.o"
|
||||
include "build/src/boot/fault_drawer.o"
|
||||
include "build/src/boot/O2/rcp_utils.o"
|
||||
include "build/src/boot/O2/loadfragment.o"
|
||||
include "build/src/boot/O2/loadfragment2.o"
|
||||
include "build/src/boot/O2/padutils.o"
|
||||
include "build/src/boot/O2/stackcheck.o"
|
||||
include "build/src/boot/O2/gfxprint.o"
|
||||
include "build/data/boot/gfxprint.data.o"
|
||||
include "build/src/boot_O2/mtxuty-cvt.o"
|
||||
include "build/src/boot_O2/debug.o"
|
||||
include "build/src/boot_O2/system_heap.o"
|
||||
include "build/src/boot_O2/padsetup.o"
|
||||
include "build/src/boot_O2/boot_80086760.o"
|
||||
include "build/src/boot/O2/mtxuty-cvt.o"
|
||||
include "build/src/boot/O2/debug.o"
|
||||
include "build/src/boot/O2/system_heap.o"
|
||||
include "build/src/boot/O2/padsetup.o"
|
||||
include "build/src/boot/O2/math64.o"
|
||||
include "build/asm/boot/fp.text.o"
|
||||
include "build/data/boot/fp.data.o"
|
||||
include "build/src/boot_O2/system_malloc.o"
|
||||
include "build/src/boot_O2/rand.o"
|
||||
include "build/src/boot_O2/__osMalloc.o"
|
||||
include "build/src/boot/O2/system_malloc.o"
|
||||
include "build/src/boot/O2/rand.o"
|
||||
include "build/src/boot/O2/__osMalloc.o"
|
||||
include "build/src/libultra/libc/sprintf.o"
|
||||
include "build/src/boot_O2/printutils.o"
|
||||
include "build/src/boot_O2/sleep.o"
|
||||
include "build/src/boot/O2/printutils.o"
|
||||
include "build/src/boot/O2/sleep.o"
|
||||
include "build/asm/boot/setcause.text.o"
|
||||
include "build/src/libultra/os/sendmesg.o"
|
||||
include "build/src/libultra/io/pfsfreeblocks.o"
|
||||
@@ -232,12 +232,12 @@ beginseg
|
||||
include "build/src/libultra/os/sethwinterrupt.o"
|
||||
include "build/asm/boot/getwatchlo.text.o"
|
||||
include "build/asm/boot/setwatchlo.text.o"
|
||||
include "build/src/boot_O2/fmodf.o"
|
||||
include "build/src/boot_O2/__osMemset.o"
|
||||
include "build/src/boot_O2/__osStrcmp.o"
|
||||
include "build/src/boot_O2/__osStrcpy.o"
|
||||
include "build/src/boot_O2/__osMemcpy.o"
|
||||
include "build/src/boot_O2_g3/build.o"
|
||||
include "build/src/boot/O2/fmodf.o"
|
||||
include "build/src/boot/O2/__osMemset.o"
|
||||
include "build/src/boot/O2/__osStrcmp.o"
|
||||
include "build/src/boot/O2/__osStrcpy.o"
|
||||
include "build/src/boot/O2/__osMemcpy.o"
|
||||
include "build/src/boot/build.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
@@ -547,7 +547,6 @@ beginseg
|
||||
include "build/src/code/z_play.o"
|
||||
include "build/src/code/z_play_hireso.o"
|
||||
include "build/src/code/PreRender.o"
|
||||
include "build/data/code/PreRender.bss.o"
|
||||
include "build/src/code/TwoHeadGfxArena.o"
|
||||
include "build/src/code/TwoHeadArena.o"
|
||||
include "build/src/code/audio_stop_all_sfx.o"
|
||||
@@ -3098,8 +3097,7 @@ beginseg
|
||||
name "ovl_Obj_Tokei_Tobira"
|
||||
compress
|
||||
include "build/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.o"
|
||||
include "build/data/ovl_Obj_Tokei_Tobira/ovl_Obj_Tokei_Tobira.data.o"
|
||||
include "build/data/ovl_Obj_Tokei_Tobira/ovl_Obj_Tokei_Tobira.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_Obj_Tokei_Tobira/ovl_Obj_Tokei_Tobira_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
@@ -4851,9 +4849,7 @@ beginseg
|
||||
name "ovl_En_Invadepoh_Demo"
|
||||
compress
|
||||
include "build/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.o"
|
||||
include "build/data/ovl_En_Invadepoh_Demo/ovl_En_Invadepoh_Demo.data.o"
|
||||
include "build/data/ovl_En_Invadepoh_Demo/ovl_En_Invadepoh_Demo.bss.o"
|
||||
include "build/data/ovl_En_Invadepoh_Demo/ovl_En_Invadepoh_Demo.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_Invadepoh_Demo/ovl_En_Invadepoh_Demo_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
||||
Reference in New Issue
Block a user