mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 22:36:01 +00:00
Code Issues Projects Releases Wiki Activity
699 commits 1 branch 0 tags 464 MiB
Commit graph

699 commits

This branch
This branch
All branches
Author SHA1 Message Date
shawlucas
c218f38635 Fixed merge conflict 2020-04-02 09:40:01 -07:00
fig02
999044cdcd
Merge pull request #45 from zelda2773/master 
Decompiled ovl_Obj_Comb
 2020-04-02 12:15:38 -04:00
shawlucas
2a1bf81765 Removed NULL from dlist tables. Found out it was just padding 2020-04-01 17:40:56 -07:00
shawlucas
2d11436367 Decompiled ovl_Bg_Spot05_Soko 2020-04-01 17:32:20 -07:00
shawlucas
64b66029ad Merge branch 'ovl_Bg_Spot05_Soko' into en_tana 2020-04-01 17:28:25 -07:00
shawlucas
45ce20a6e0 Decompiled ovl_Bg_Spot05_Soko 2020-04-01 17:28:00 -07:00
shawlucas
9f35711e8f Made suggested changes 2020-04-01 14:57:57 -07:00
shawlucas
febc0b4f17 Merge branch 'master' of https://github.com/zeldaret/oot 2020-04-01 14:52:33 -07:00
shawlucas
36b9f914dc Removed asm files from En_Tana 2020-04-01 14:42:47 -07:00
shawlucas
a40827fc25 Merge branch 'master' of https://github.com/zeldaret/oot into en_tana 2020-04-01 14:35:00 -07:00
shawlucas
76bc423dd3 Decompiled ovl_En_Tana, ran format.sh 2020-04-01 14:34:48 -07:00
KrimtonZ
495582cc94 Merge branch 'master' into skelanimeupdates 2020-04-01 14:05:17 -05:00
fig02
3f6350afc0
Merge pull request #47 from ProjectRevoTPP/fix_spot15_saku 
Fix 2 remaining nonmatchings in z_bg_spot15_saku
 2020-04-01 14:39:27 -04:00
ProjectRevoTPP
9008b30046 remove unneeded comments 2020-04-01 13:30:26 -04:00
zelda2773
a62877a543 Merge remote-tracking branch 'upstream/master' 2020-04-01 13:19:43 -04:00
ProjectRevoTPP
b3f92538ad Merge branch 'master' of https://github.com/zeldaret/oot into fix_spot15_saku 2020-04-01 13:14:27 -04:00
ProjectRevoTPP
c40c29dd8f fix remaining nonmatchings in z_bg_spot15_saku 2020-04-01 13:14:15 -04:00
shawlucas
46f9fe6185 Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-31 21:47:23 -07:00
Nicholas Estelami
6fa5c47b87
Merge pull request #40 from NEstelami/master 
Added 'setup' target to makefile, details in description.
 2020-03-31 23:54:02 -04:00
KrimtonZ
25dcb73520 Merge branch 'master' into skelanimeupdates 2020-03-31 20:59:51 -05:00
KrimtonZ
32bda67e0f Name a few unknown parameters 2020-03-31 20:53:53 -05:00
KrimtonZ
f069777b19 name more skelanime struct members, match all but 1 function, name more functions, some documentation 2020-03-31 20:19:21 -05:00
shawlucas
c63b52ad58 Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-31 16:51:12 -07:00
KrimtonZ
48968f90b7 remove accidental baserom.z64.txt file 2020-03-31 18:30:49 -05:00
KrimtonZ
75f570f4ac skelanime wip 2020-03-31 18:29:09 -05:00
Jack Walker
675215417f Updated script to check for multiple ROM extensions. 2020-03-31 16:41:02 -04:00
zelda2773
5059e623fb ovl_Obj_Comb renamed functions and variables 2020-03-31 10:13:21 -04:00
Roman971
4988a70113
Merge pull request #43 from fig02/elemental-arrows 
Elemental Arrows OK
 2020-03-31 12:53:48 +02:00
fig02
6ec73a5f1c fix merge issues 2020-03-31 05:07:23 -04:00
fig02
8d37f3a15e Merge remote-tracking branch 'upstream/master' into elemental-arrows 2020-03-31 05:03:25 -04:00
fig02
340fbd5a40 adjusting sub98 init structs across actors 2020-03-31 05:00:04 -04:00
fig02
d75595de3c
Merge pull request #42 from Roman971/z_rcp 
Decompile z_rcp.c (1 non matching left)
 2020-03-31 04:24:29 -04:00
Roman971
e99b2af35a Merge branch 'master' into z_rcp 2020-03-31 10:02:59 +02:00
shawlucas
ea341214d0 Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-30 23:16:19 -07:00
zelda2773
730b788f6e ovl_Obj_Comb add header 2020-03-31 00:03:53 -04:00
zelda2773
c05de00a96 ovl_Obj_Comb fix struct 2020-03-30 23:46:54 -04:00
KrimtonZ
8f54c82a96 rename SkelAnime_ChangeAnimation functions 2020-03-30 22:37:01 -05:00
KrimtonZ
8c993d9676 Merge branch 'master' into skelanimeupdates 2020-03-30 22:22:54 -05:00
KrimtonZ
6d6299cb0b use ONE_THIRD define for 0.333f 2020-03-30 22:22:10 -05:00
fig02
9884655260
Merge pull request #44 from Roman971/z_elf_message 
Decompile z_elf_message.c (1 non matching left)
 2020-03-30 23:15:33 -04:00
zelda2773
eeb31944f8 Merge remote-tracking branch 'upstream/master' 2020-03-30 22:07:42 -04:00
zelda2773
ba49ef6a0e Decompiled ovl_Obj_Comb 2020-03-30 21:56:36 -04:00
KrimtonZ
b9f2d4c707 more skelanime wip 2020-03-30 20:12:49 -05:00
Jack Walker
d780e6b13e Updated fixbaserom script 
- Script now checks ROM header to determine if ROM is byte swapped.
- Checks the hash of the ROM to determine if it's "vanilla".
 2020-03-30 19:38:51 -04:00
KrimtonZ
24babfa95a skelanime update wip 2020-03-30 17:53:26 -05:00
Roman971
f64174730c Decompile z_elf_message.c (1 non matching left) 2020-03-30 22:29:55 +02:00
fig02
daa7877c96 pr changes 2020-03-30 14:52:06 -04:00
KrimtonZ
b337e1d518 Merge branch 'master' into skelanimeupdates 2020-03-30 07:03:12 -05:00
fig02
9cb03972af fix clang formatting change 2020-03-30 06:04:36 -04:00
fig02
dd0541751c Merge remote-tracking branch 'upstream/master' into elemental-arrows 2020-03-30 05:52:27 -04:00