mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-10-20 05:30:26 +00:00
Code Issues Projects Releases Wiki Activity

merge with upstream

Browse source
This commit is contained in:
chandler 2020-04-06 14:38:23 -04:00
commit 0265ad21c0
3743 changed files with 79385 additions and 105614 deletions
Download patch file Download diff file Expand all files Collapse all files

140
spec
View file

@ -280,9 +280,9 @@ beginseg
include "build/data/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/code_80026B00.o"
include "build/data/code_80026B00.data.o"
include "build/data/code_80026B00.bss.o"
include "build/src/code/z_effect.o"
include "build/data/z_effect.data.o"
include "build/data/z_effect.bss.o"
include "build/src/code/z_effect_soft_sprite.o"
include "build/data/z_effect_soft_sprite.data.o"
include "build/src/code/z_effect_soft_sprite_old_init.o"
@ -308,21 +308,17 @@ 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"
include "build/src/code/z_draw.o"
include "build/asm/code_8006BA00.o"
include "build/src/code/z_elf_message.o"
include "build/data/z_elf_message.data.o"
include "build/src/code/code_8006C360.o"
include "build/data/code_8006C360.data.o"
include "build/src/code/z_face_reaction.o"
include "build/src/code/code_8006C3A0.o"
include "build/src/code/code_8006C510.o"
include "build/src/code/z_fcurve_data_skelanime.o"
include "build/data/z_game_dlftbls.data.o"
include "build/src/code/z_game_dlftbls.o"
include "build/src/code/z_horse.o"
include "build/src/code/z_jpeg.o"
include "build/data/z_jpeg.data.o"
@ -342,8 +338,8 @@ beginseg
include "build/src/code/z_malloc.o"
include "build/src/code/z_map_mark.o"
include "build/src/code/z_moji.o"
include "build/src/code/code_8007BE60.o"
include "build/src/code/code_8007BF10.o"
include "build/src/code/z_prenmi_buff.o"
include "build/src/code/z_msgevent.o"
include "build/src/code/code_8007BF90.o"
include "build/src/code/z_onepointdemo.o"
include "build/data/z_onepointdemo.data.o"
@ -351,27 +347,20 @@ beginseg
include "build/data/z_map_exp.data.o"
include "build/data/z_map_exp.bss.o"
include "build/src/code/z_parameter.o"
include "build/asm/code_8008E4E0.o"
include "build/data/code_8008E4E0.rodata.o"
include "build/src/code/z_path.o"
include "build/asm/code_8008E6A0.o"
include "build/src/code/z_player_lib.o"
include "build/data/z_player_lib.data.o"
include "build/data/z_player_lib.bss.o"
include "build/src/code/z_prenmi.o"
include "build/asm/code_80092500.o"
include "build/data/code_80092500.data.o"
include "build/data/code_80092500.rodata.o"
include "build/data/code_80092500.bss.o"
include "build/src/code/z_quake.o"
include "build/src/code/z_rcp.o"
include "build/data/z_rcp.data.o"
include "build/src/code/z_room.o"
include "build/src/code/z_sample.o"
include "build/src/code/code_80097A00.o"
include "build/src/code/z_scene.o"
include "build/src/code/z_scene_table.o"
include "build/src/code/z_skelanime.o"
include "build/data/z_skelanime.data.o"
include "build/data/z_skelanime.bss.o"
include "build/src/code/z_skin.o"
include "build/data/z_skin.bss.o"
include "build/src/code/z_skin_awb.o"
@ -383,11 +372,10 @@ beginseg
include "build/src/code/code_800A9D40.o"
include "build/src/code/code_800A9F30.o"
include "build/data/code_800A9F30.bss.o"
include "build/data/z_text.data.o"
include "build/src/code/z_view.o"
include "build/data/z_view.data.o"
include "build/src/code/z_vimode.o"
include "build/asm/code_800ACE70.o"
include "build/data/code_800ACE70.data.o"
include "build/src/code/code_800ACE70.o"
include "build/src/code/z_vismono.o"
include "build/asm/code_800AD920.o"
include "build/src/code/z_vr_box.o"
@ -437,15 +425,10 @@ beginseg
include "build/data/game.rodata.o"
include "build/data/game.bss.o"
include "build/src/code/gamealloc.o"
include "build/asm/graph.o"
include "build/data/graph.data.o"
include "build/data/graph.rodata.o"
include "build/data/graph.bss.o"
include "build/src/code/graph.o"
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"
@ -466,9 +449,7 @@ beginseg
include "build/data/sys_ucode.data.o"
include "build/asm/code_800D2E30.o"
include "build/data/code_800D2E30.data.o"
include "build/asm/code_800D31A0.o"
include "build/data/code_800D31A0.data.o"
include "build/data/code_800D31A0.rodata.o"
include "build/src/code/code_800D31A0.o"
include "build/src/code/irqmgr.o"
include "build/src/code/debug_malloc.o"
include "build/src/code/fault.o"
@ -514,10 +495,8 @@ beginseg
include "build/src/code/code_800FC620.o"
include "build/asm/code_800FCB50.o"
include "build/asm/code_800FCD40.o"
include "build/asm/code_800FCE80.o"
include "build/data/code_800FCE80.data.o"
include "build/data/code_800FCE80.rodata.o"
include "build/data/code_800FCE80.bss.o"
include "build/src/code/code_800FCE80.o"
include "build/asm/fp.o"
include "build/src/code/system_malloc.o"
include "build/asm/code_800FD970.o"
include "build/data/code_800FD970.data.o"
@ -617,8 +596,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
@ -689,25 +667,19 @@ endseg
beginseg
name "ovl_Arrow_Fire"
include "build/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.o"
include "build/data/overlays/actors/z_arrow_fire.data.o"
include "build/data/overlays/actors/z_arrow_fire.rodata.o"
include "build/data/overlays/actors/z_arrow_fire.reloc.o"
include "build/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire_reloc.o"
endseg
beginseg
name "ovl_Arrow_Ice"
include "build/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.o"
include "build/data/overlays/actors/z_arrow_ice.data.o"
include "build/data/overlays/actors/z_arrow_ice.rodata.o"
include "build/data/overlays/actors/z_arrow_ice.reloc.o"
include "build/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice_reloc.o"
endseg
beginseg
name "ovl_Arrow_Light"
include "build/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.o"
include "build/data/overlays/actors/z_arrow_light.data.o"
include "build/data/overlays/actors/z_arrow_light.rodata.o"
include "build/data/overlays/actors/z_arrow_light.reloc.o"
include "build/src/overlays/actors/ovl_Arrow_Light/z_arrow_light_reloc.o"
endseg
beginseg
@ -797,17 +769,13 @@ endseg
beginseg
name "ovl_Bg_Gate_Shutter"
include "build/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.o"
include "build/data/overlays/actors/z_bg_gate_shutter.data.o"
include "build/data/overlays/actors/z_bg_gate_shutter.rodata.o"
include "build/data/overlays/actors/z_bg_gate_shutter.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter_reloc.o"
endseg
beginseg
name "ovl_Bg_Gjyo_Bridge"
include "build/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.o"
include "build/data/overlays/actors/z_bg_gjyo_bridge.data.o"
include "build/data/overlays/actors/z_bg_gjyo_bridge.rodata.o"
include "build/data/overlays/actors/z_bg_gjyo_bridge.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge_reloc.o"
endseg
beginseg
@ -877,8 +845,7 @@ endseg
beginseg
name "ovl_Bg_Haka_Megane"
include "build/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.o"
include "build/data/overlays/actors/z_bg_haka_megane.data.o"
include "build/data/overlays/actors/z_bg_haka_megane.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane_reloc.o"
endseg
beginseg
@ -1428,8 +1395,7 @@ endseg
beginseg
name "ovl_Bg_Spot05_Soko"
include "build/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.o"
include "build/data/overlays/actors/z_bg_spot05_soko.data.o"
include "build/data/overlays/actors/z_bg_spot05_soko.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko_reloc.o"
endseg
beginseg
@ -1467,9 +1433,7 @@ endseg
beginseg
name "ovl_Bg_Spot09_Obj"
include "build/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.o"
include "build/data/overlays/actors/z_bg_spot09_obj.data.o"
include "build/data/overlays/actors/z_bg_spot09_obj.rodata.o"
include "build/data/overlays/actors/z_bg_spot09_obj.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj_reloc.o"
endseg
beginseg
@ -1491,17 +1455,13 @@ endseg
beginseg
name "ovl_Bg_Spot12_Gate"
include "build/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.o"
include "build/data/overlays/actors/z_bg_spot12_gate.data.o"
include "build/data/overlays/actors/z_bg_spot12_gate.rodata.o"
include "build/data/overlays/actors/z_bg_spot12_gate.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate_reloc.o"
endseg
beginseg
name "ovl_Bg_Spot12_Saku"
include "build/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.o"
include "build/data/overlays/actors/z_bg_spot12_saku.data.o"
include "build/data/overlays/actors/z_bg_spot12_saku.rodata.o"
include "build/data/overlays/actors/z_bg_spot12_saku.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku_reloc.o"
endseg
beginseg
@ -1598,9 +1558,7 @@ endseg
beginseg
name "ovl_Bg_Toki_Swd"
include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.o"
include "build/data/overlays/actors/z_bg_toki_swd.data.o"
include "build/data/overlays/actors/z_bg_toki_swd.rodata.o"
include "build/data/overlays/actors/z_bg_toki_swd.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_reloc.o"
endseg
beginseg
@ -1651,9 +1609,7 @@ endseg
beginseg
name "ovl_Bg_Zg"
include "build/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.o"
include "build/data/overlays/actors/z_bg_zg.data.o"
include "build/data/overlays/actors/z_bg_zg.rodata.o"
include "build/data/overlays/actors/z_bg_zg.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Zg/z_bg_zg_reloc.o"
endseg
beginseg
@ -1793,9 +1749,7 @@ endseg
beginseg
name "ovl_Demo_Geff"
include "build/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.o"
include "build/data/overlays/actors/z_demo_geff.data.o"
include "build/data/overlays/actors/z_demo_geff.rodata.o"
include "build/data/overlays/actors/z_demo_geff.reloc.o"
include "build/src/overlays/actors/ovl_Demo_Geff/z_demo_geff_reloc.o"
endseg
beginseg
@ -1880,9 +1834,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
@ -2598,9 +2550,7 @@ endseg
beginseg
name "ovl_En_Dog"
include "build/src/overlays/actors/ovl_En_Dog/z_en_dog.o"
include "build/data/overlays/actors/z_en_dog.data.o"
include "build/data/overlays/actors/z_en_dog.rodata.o"
include "build/data/overlays/actors/z_en_dog.reloc.o"
include "build/src/overlays/actors/ovl_En_Dog/z_en_dog_reloc.o"
endseg
beginseg
@ -2614,8 +2564,7 @@ endseg
beginseg
name "ovl_En_Ds"
include "build/src/overlays/actors/ovl_En_Ds/z_en_ds.o"
include "build/data/overlays/actors/z_en_ds.data.o"
include "build/data/overlays/actors/z_en_ds.reloc.o"
include "build/src/overlays/actors/ovl_En_Ds/z_en_ds_reloc.o"
endseg
beginseg
@ -3186,9 +3135,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
@ -3503,9 +3450,7 @@ endseg
beginseg
name "ovl_En_Ru2"
include "build/src/overlays/actors/ovl_En_Ru2/z_en_ru2.o"
include "build/data/overlays/actors/z_en_ru2.data.o"
include "build/data/overlays/actors/z_en_ru2.rodata.o"
include "build/data/overlays/actors/z_en_ru2.reloc.o"
include "build/src/overlays/actors/ovl_En_Ru2/z_en_ru2_reloc.o"
endseg
beginseg
@ -3671,9 +3616,7 @@ endseg
beginseg
name "ovl_En_Tana"
include "build/src/overlays/actors/ovl_En_Tana/z_en_tana.o"
include "build/data/overlays/actors/z_en_tana.data.o"
include "build/data/overlays/actors/z_en_tana.rodata.o"
include "build/data/overlays/actors/z_en_tana.reloc.o"
include "build/src/overlays/actors/ovl_En_Tana/z_en_tana_reloc.o"
endseg
beginseg
@ -3695,9 +3638,7 @@ endseg
beginseg
name "ovl_En_Tk"
include "build/src/overlays/actors/ovl_En_Tk/z_en_tk.o"
include "build/data/overlays/actors/z_en_tk.data.o"
include "build/data/overlays/actors/z_en_tk.rodata.o"
include "build/data/overlays/actors/z_en_tk.reloc.o"
include "build/src/overlays/actors/ovl_En_Tk/z_en_tk_reloc.o"
endseg
beginseg
@ -3803,7 +3744,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
@ -4050,16 +3991,13 @@ endseg
beginseg
name "ovl_Obj_Bombiwa"
include "build/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.o"
include "build/data/overlays/actors/z_obj_bombiwa.data.o"
include "build/data/overlays/actors/z_obj_bombiwa.reloc.o"
include "build/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa_reloc.o"
endseg
beginseg
name "ovl_Obj_Comb"
include "build/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.o"
include "build/data/overlays/actors/z_obj_comb.data.o"
include "build/data/overlays/actors/z_obj_comb.rodata.o"
include "build/data/overlays/actors/z_obj_comb.reloc.o"
include "build/src/overlays/actors/ovl_Obj_Comb/z_obj_comb_reloc.o"
endseg
beginseg