mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-25 18:04:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into skelanime

Browse Source
This commit is contained in:
KrimtonZ
2020-03-24 11:56:37 -05:00
parent ac4a51bf8f 4eb7f023f3
commit 8bbac143cd
505 changed files with 1437 additions and 2808 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+11 -15
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"
@@ -315,7 +315,7 @@ beginseg
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/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"
@@ -348,17 +348,16 @@ 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/asm/z_quake.o"
include "build/data/z_quake.data.o"
include "build/data/z_quake.rodata.o"
include "build/data/z_quake.bss.o"
include "build/src/code/z_rcp.o"
include "build/data/z_rcp.data.o"
include "build/src/code/z_room.o"
@@ -864,8 +863,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
@@ -1638,9 +1636,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