mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-14 14:08:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into play

Browse Source
This commit is contained in:
Derek Hensley
2022-10-04 17:38:41 -07:00
parent f2d272f50b 2006a65ba6
commit c8d7e4de3b
315 changed files with 13597 additions and 6414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+9 -23
View File
@@ -549,12 +549,10 @@ beginseg
include "build/src/code/z_kaleido_manager.o"
include "build/src/code/z_kaleido_scope_call.o"
include "build/src/code/z_fbdemo_dlftbls.o"
include "build/data/code/code_801D0BB0.data.o"
include "build/src/code/z_fbdemo.o"
include "build/data/code/z_fbdemo.data.o"
include "build/src/code/z_fbdemo_fade.o"
include "build/src/code/z_fbdemo_circle.o"
include "build/data/code/z_fbdemo_circle.data.o"
include "build/src/code/z_overlay.o"
include "build/src/code/z_play.o"
include "build/data/code/z_play.bss.o"
@@ -607,7 +605,6 @@ beginseg
pad_text
include "build/src/code/audio/audio_data.o"
include "build/src/code/audio/audio_synthesis.o"
include "build/data/code/audio_synthesis.data.o"
include "build/src/code/audio/audio_heap.o"
include "build/data/code/audio_heap.bss.o"
include "build/src/code/audio/audio_load.o"
@@ -983,8 +980,7 @@ beginseg
name "ovl_En_M_Thunder"
compress
include "build/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.o"
include "build/data/ovl_En_M_Thunder/ovl_En_M_Thunder.data.o"
include "build/data/ovl_En_M_Thunder/ovl_En_M_Thunder.reloc.o"
include "build/src/overlays/actors/ovl_En_M_Thunder/ovl_En_M_Thunder_reloc.o"
endseg
beginseg
@@ -1729,9 +1725,7 @@ beginseg
name "ovl_Oceff_Wipe"
compress
include "build/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.o"
include "build/data/ovl_Oceff_Wipe/ovl_Oceff_Wipe.data.o"
include "build/data/ovl_Oceff_Wipe/ovl_Oceff_Wipe.bss.o"
include "build/data/ovl_Oceff_Wipe/ovl_Oceff_Wipe.reloc.o"
include "build/src/overlays/actors/ovl_Oceff_Wipe/ovl_Oceff_Wipe_reloc.o"
endseg
beginseg
@@ -1871,8 +1865,7 @@ beginseg
name "ovl_Effect_Ss_Solder_Srch_Ball"
compress
include "build/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.o"
include "build/data/ovl_Effect_Ss_Solder_Srch_Ball/ovl_Effect_Ss_Solder_Srch_Ball.data.o"
include "build/data/ovl_Effect_Ss_Solder_Srch_Ball/ovl_Effect_Ss_Solder_Srch_Ball.reloc.o"
include "build/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/ovl_Effect_Ss_Solder_Srch_Ball_reloc.o"
endseg
beginseg
@@ -1942,8 +1935,7 @@ beginseg
name "ovl_Oceff_Storm"
compress
include "build/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.o"
include "build/data/ovl_Oceff_Storm/ovl_Oceff_Storm.data.o"
include "build/data/ovl_Oceff_Storm/ovl_Oceff_Storm.reloc.o"
include "build/src/overlays/actors/ovl_Oceff_Storm/ovl_Oceff_Storm_reloc.o"
endseg
beginseg
@@ -2716,8 +2708,7 @@ beginseg
name "ovl_En_Wiz"
compress
include "build/src/overlays/actors/ovl_En_Wiz/z_en_wiz.o"
include "build/data/ovl_En_Wiz/ovl_En_Wiz.data.o"
include "build/data/ovl_En_Wiz/ovl_En_Wiz.reloc.o"
include "build/src/overlays/actors/ovl_En_Wiz/ovl_En_Wiz_reloc.o"
endseg
beginseg
@@ -3201,8 +3192,7 @@ beginseg
name "ovl_En_Door_Etc"
compress
include "build/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.o"
include "build/data/ovl_En_Door_Etc/ovl_En_Door_Etc.data.o"
include "build/data/ovl_En_Door_Etc/ovl_En_Door_Etc.reloc.o"
include "build/src/overlays/actors/ovl_En_Door_Etc/ovl_En_Door_Etc_reloc.o"
endseg
beginseg
@@ -4364,9 +4354,7 @@ beginseg
name "ovl_Oceff_Wipe5"
compress
include "build/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.o"
include "build/data/ovl_Oceff_Wipe5/ovl_Oceff_Wipe5.data.o"
include "build/data/ovl_Oceff_Wipe5/ovl_Oceff_Wipe5.bss.o"
include "build/data/ovl_Oceff_Wipe5/ovl_Oceff_Wipe5.reloc.o"
include "build/src/overlays/actors/ovl_Oceff_Wipe5/ovl_Oceff_Wipe5_reloc.o"
endseg
beginseg
@@ -4777,8 +4765,7 @@ beginseg
name "ovl_En_Bombal"
compress
include "build/src/overlays/actors/ovl_En_Bombal/z_en_bombal.o"
include "build/data/ovl_En_Bombal/ovl_En_Bombal.data.o"
include "build/data/ovl_En_Bombal/ovl_En_Bombal.reloc.o"
include "build/src/overlays/actors/ovl_En_Bombal/ovl_En_Bombal_reloc.o"
endseg
beginseg
@@ -5036,8 +5023,7 @@ beginseg
name "ovl_Dm_Tag"
compress
include "build/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.o"
include "build/data/ovl_Dm_Tag/ovl_Dm_Tag.data.o"
include "build/data/ovl_Dm_Tag/ovl_Dm_Tag.reloc.o"
include "build/src/overlays/actors/ovl_Dm_Tag/ovl_Dm_Tag_reloc.o"
endseg
beginseg