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

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

Browse Source 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
This commit is contained in:
Anghelo
2021-01-27 15:13:08 -03:00
parent 22da97e9f3 20c1f4e648
commit ef2f7e5a66
196 changed files with 4773 additions and 4227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/overlays/actors/z_boss_fd.data.s
+1 -1
View File
@@ -63,7 +63,7 @@ glabel D_808D1A84
glabel D_808D1A90
.word 0xFF8000FF, 0x0000FFFF, 0x00FF0000
glabel D_808D1A9C
.word 0x04051DB0, 0x04051DB0, 0x040521B0, 0x040525B0, 0x040529B0, 0x04052DB0, 0x040531B0, 0x040535B0, 0x040539B0
.word gDust1Tex, gDust1Tex, gDust2Tex, gDust3Tex, gDust4Tex, gDust5Tex, gDust6Tex, gDust7Tex, gDust8Tex
glabel D_808D1AC0
.byte 0x00, 0x00
glabel D_808D1AC2
data/overlays/actors/z_door_killer.data.s
+1 -1
View File
@@ -25,7 +25,7 @@ glabel D_80996000
glabel D_80996010
.word 0x002C0000
glabel D_80996014
.word 0x0600E5A0, 0x00590000, 0x060035C0, 0x01870000, 0x06000000, 0x00010000, 0x0400EF38
.word 0x0600E5A0, 0x00590000, 0x060035C0, 0x01870000, 0x06000000, 0x00010000, gWoodenDoorTex
glabel D_80996030
.word 0x00000000, 0x00000000, 0x00000000
glabel D_8099603C
data/overlays/actors/z_en_anubice_fire.data.s
+1 -1
View File
@@ -40,5 +40,5 @@ glabel D_809B3268
glabel D_809B326C
.word 0xFF0000FF
glabel D_809B3270
.word 0x040529B0, 0x04052DB0, 0x040531B0, 0x040535B0, 0x040539B0, 0x040535B0, 0x040531B0, 0x04052DB0
.word gDust4Tex, gDust5Tex, gDust6Tex, gDust7Tex, gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex
data/overlays/actors/z_en_go.data.s
+1 -1
View File
@@ -38,5 +38,5 @@ glabel D_80A41BC0
glabel D_80A41BCC
.word 0x44160000, 0x00000000, 0x00000000
glabel D_80A41BD8
.word 0x040539B0, 0x040535B0, 0x040531B0, 0x04052DB0, 0x040529B0, 0x040525B0, 0x040521B0, 0x04051DB0, 0x00000000, 0x00000000
.word gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex, 0x00000000, 0x00000000
data/overlays/actors/z_en_go2.data.s
+1 -1
View File
@@ -10,7 +10,7 @@
.balign 16
glabel D_80A480D0
.word 0x040539B0, 0x040535B0, 0x040531B0, 0x04052DB0, 0x040529B0, 0x040525B0, 0x040521B0, 0x04051DB0
.word gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex
glabel D_80A480F0
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A480FC
data/overlays/actors/z_obj_bean.data.s
+1 -1
View File
@@ -22,7 +22,7 @@ glabel D_80B90E54
glabel D_80B90E80
.word 0x40400000, 0x3E99999A, 0x41200000, 0x3F000000, 0x41F00000, 0x3F000000, 0x40400000, 0x3E99999A
glabel D_80B90EA0
.word 0x040355E0, 0x040356A0
.word gCuttableShrubStalkDL, gCuttableShrubTipDL
glabel D_80B90EA8
.word 0xC8500064, 0xB0F407D0, 0xB0F800C8, 0x30FC0640, 0x00000000, 0x00000000
data/overlays/actors/z_object_kankyo.data.s
+1 -1
View File
@@ -10,7 +10,7 @@
.balign 16
glabel D_80BA58E0
.word 0x04029F30, 0x0402A530, 0x0402AB30, 0x0402B130, 0x0402B730, 0x0402BD30, 0x0402C330, 0x0402C930
.word gEffLightning1Tex, gEffLightning2Tex, gEffLightning3Tex, gEffLightning4Tex, gEffLightning5Tex, gEffLightning6Tex, gEffLightning7Tex, gEffLightning8Tex
glabel D_80BA5900
.word 0x060015E0, 0x060025E0, 0x060035E0, 0x060045E0, 0x060055E0, 0x060065E0, 0x060075E0, 0x060085E0
glabel Object_Kankyo_InitVars