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

Merge branch 'master' into tokeidai

Browse Source
This commit is contained in:
tom-overton
2021-12-26 20:39:32 -08:00
parent e9596e0095 f19571dfcd
commit bd57993e2d
134 changed files with 18620 additions and 3570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+25 -36
View File
@@ -430,19 +430,17 @@ beginseg
include "build/data/code/code_801E3FA0.bss.o"
include "build/src/code/z_en_item00.o"
include "build/src/code/z_eff_blure.o"
include "build/data/code/z_eff_blure.data.o"
include "build/src/code/z_eff_shield_particle.o"
include "build/data/code/z_eff_shield_particle.data.o"
include "build/src/code/z_eff_spark.o"
include "build/src/code/z_eff_ss_dead.o"
include "build/src/code/z_eff_tire_mark.o"
include "build/src/code/z_effect.o"
include "build/data/code/z_effect.bss.o"
include "build/src/code/z_effect_soft_sprite.o"
include "build/data/code/z_effect_soft_sprite.data.o"
include "build/src/code/z_effect_soft_sprite_old_init.o"
include "build/data/code/z_effect_soft_sprite_old_init.data.o"
include "build/src/code/flg_set.o"
include "build/data/code/flg_set.bss.o"
include "build/src/code/pad_801DC9C0.o"
include "build/src/code/z_DLF.o"
include "build/src/code/z_actor.o"
@@ -567,10 +565,7 @@ beginseg
include "build/data/code/db_camera.bss.o"
include "build/data/code/code_801D0B50.data.o"
include "build/src/code/z_kaleido_manager.o"
include "build/data/code/z_kaleido_manager.data.o"
include "build/data/code/z_kaleido_manager.bss.o"
include "build/src/code/z_kaleido_scope_call.o"
include "build/data/code/z_kaleido_scope_call.bss.o"
include "build/src/code/z_fbdemo_dlftbls.o"
include "build/data/code/code_801D0BB0.data.o"
include "build/src/code/z_fbdemo.o"
@@ -641,7 +636,7 @@ beginseg
include "build/data/code/audio_load.bss.o"
include "build/src/code/audio/code_80192BE0.o"
include "build/data/code/code_80192BE0.data.o"
include "build/src/code/audio/code_80194710.o"
include "build/src/code/audio/audio_dcache.o"
include "build/src/code/audio/code_80194790.o"
include "build/data/code/code_80194790.data.o"
include "build/src/code/audio/audio_playback.o"
@@ -741,12 +736,12 @@ beginseg
endseg
beginseg
name "ovl_Player_Actor"
name "ovl_player_actor"
compress
include "build/src/overlays/actors/ovl_Player_Actor/z_player.o"
include "build/data/ovl_Player_Actor/ovl_Player_Actor.data.o"
include "build/data/ovl_Player_Actor/ovl_Player_Actor.bss.o"
include "build/data/ovl_Player_Actor/ovl_Player_Actor.reloc.o"
include "build/src/overlays/actors/ovl_player_actor/z_player.o"
include "build/data/ovl_player_actor/ovl_player_actor.data.o"
include "build/data/ovl_player_actor/ovl_player_actor.bss.o"
include "build/data/ovl_player_actor/ovl_player_actor.reloc.o"
endseg
beginseg
@@ -863,8 +858,7 @@ beginseg
name "ovl_En_Elf"
compress
include "build/src/overlays/actors/ovl_En_Elf/z_en_elf.o"
include "build/data/ovl_En_Elf/ovl_En_Elf.data.o"
include "build/data/ovl_En_Elf/ovl_En_Elf.reloc.o"
include "build/src/overlays/actors/ovl_En_Elf/ovl_En_Elf_reloc.o"
endseg
beginseg
@@ -1055,9 +1049,11 @@ beginseg
name "ovl_Door_Warp1"
compress
include "build/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.o"
include "build/data/ovl_Door_Warp1/ovl_Door_Warp1.data.o"
include "build/data/ovl_Door_Warp1/ovl_Door_Warp1.bss.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_Door_Warp1/ovl_Door_Warp1_reloc.o"
#else
include "build/data/ovl_Door_Warp1/ovl_Door_Warp1.reloc.o"
#endif
endseg
beginseg
@@ -1280,8 +1276,7 @@ beginseg
name "ovl_En_Bigslime"
compress
include "build/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.o"
include "build/data/ovl_En_Bigslime/ovl_En_Bigslime.data.o"
include "build/data/ovl_En_Bigslime/ovl_En_Bigslime.reloc.o"
include "build/src/overlays/actors/ovl_En_Bigslime/ovl_En_Bigslime_reloc.o"
endseg
beginseg
@@ -1490,8 +1485,7 @@ beginseg
name "ovl_En_Fz"
compress
include "build/src/overlays/actors/ovl_En_Fz/z_en_fz.o"
include "build/data/ovl_En_Fz/ovl_En_Fz.data.o"
include "build/data/ovl_En_Fz/ovl_En_Fz.reloc.o"
include "build/src/overlays/actors/ovl_En_Fz/ovl_En_Fz_reloc.o"
endseg
beginseg
@@ -2418,8 +2412,7 @@ beginseg
name "ovl_En_Aob_01"
compress
include "build/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.o"
include "build/data/ovl_En_Aob_01/ovl_En_Aob_01.data.o"
include "build/data/ovl_En_Aob_01/ovl_En_Aob_01.reloc.o"
include "build/src/overlays/actors/ovl_En_Aob_01/ovl_En_Aob_01_reloc.o"
endseg
beginseg
@@ -2705,8 +2698,11 @@ beginseg
name "ovl_Obj_Iceblock"
compress
include "build/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.o"
include "build/data/ovl_Obj_Iceblock/ovl_Obj_Iceblock.data.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_Obj_Iceblock/ovl_Obj_Iceblock_reloc.o"
#else
include "build/data/ovl_Obj_Iceblock/ovl_Obj_Iceblock.reloc.o"
#endif
endseg
beginseg
@@ -4274,8 +4270,7 @@ beginseg
name "ovl_En_Rail_Skb"
compress
include "build/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.o"
include "build/data/ovl_En_Rail_Skb/ovl_En_Rail_Skb.data.o"
include "build/data/ovl_En_Rail_Skb/ovl_En_Rail_Skb.reloc.o"
include "build/src/overlays/actors/ovl_En_Rail_Skb/ovl_En_Rail_Skb_reloc.o"
endseg
beginseg
@@ -4415,9 +4410,7 @@ beginseg
name "ovl_En_Zog"
compress
include "build/src/overlays/actors/ovl_En_Zog/z_en_zog.o"
include "build/data/ovl_En_Zog/ovl_En_Zog.data.o"
include "build/data/ovl_En_Zog/ovl_En_Zog.bss.o"
include "build/data/ovl_En_Zog/ovl_En_Zog.reloc.o"
include "build/src/overlays/actors/ovl_En_Zog/ovl_En_Zog_reloc.o"
endseg
beginseg
@@ -4440,8 +4433,7 @@ beginseg
name "ovl_Bg_Inibs_Movebg"
compress
include "build/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.o"
include "build/data/ovl_Bg_Inibs_Movebg/ovl_Bg_Inibs_Movebg.data.o"
include "build/data/ovl_Bg_Inibs_Movebg/ovl_Bg_Inibs_Movebg.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Inibs_Movebg/ovl_Bg_Inibs_Movebg_reloc.o"
endseg
beginseg
@@ -4896,8 +4888,7 @@ beginseg
name "ovl_En_Talk"
compress
include "build/src/overlays/actors/ovl_En_Talk/z_en_talk.o"
include "build/data/ovl_En_Talk/ovl_En_Talk.data.o"
include "build/data/ovl_En_Talk/ovl_En_Talk.reloc.o"
include "build/src/overlays/actors/ovl_En_Talk/ovl_En_Talk_reloc.o"
endseg
beginseg
@@ -5042,8 +5033,7 @@ beginseg
name "ovl_En_Akindonuts"
compress
include "build/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.o"
include "build/data/ovl_En_Akindonuts/ovl_En_Akindonuts.data.o"
include "build/data/ovl_En_Akindonuts/ovl_En_Akindonuts.reloc.o"
include "build/src/overlays/actors/ovl_En_Akindonuts/ovl_En_Akindonuts_reloc.o"
endseg
beginseg
@@ -5130,8 +5120,7 @@ beginseg
name "ovl_En_Bomjimb"
compress
include "build/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.o"
include "build/data/ovl_En_Bomjimb/ovl_En_Bomjimb.data.o"
include "build/data/ovl_En_Bomjimb/ovl_En_Bomjimb.reloc.o"
include "build/src/overlays/actors/ovl_En_Bomjimb/ovl_En_Bomjimb_reloc.o"
endseg
beginseg