mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-04 16:55:56 +00:00
Code Issues Projects Releases Wiki Activity
270 commits 1 branch 0 tags 471 MiB
Commit graph

270 commits

This branch
This branch
All branches
Author SHA1 Message Date
fig02
6afbae621e
Merge pull request #38 from zelda2773/master 
Bg_Gjyo_Bridge OK
 2020-03-26 20:04:34 -04:00
Ethan Roseman
ab7b0a50ab PR comments 2020-03-26 19:33:39 -04:00
shawlucas
2f4a6ff949 Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-26 14:58:45 -07:00
zelda2773
55e1b3af7a Fixed missing reloc 2020-03-26 10:45:08 -04:00
zelda2773
1b347f247a Made suggested changes 2020-03-26 10:15:13 -04:00
fig02
3c9fe35311 fire arrow progress 2020-03-26 04:36:10 -04:00
zelda2773
c52cb091ab Bg_Gjyo_Bridge OK 2020-03-26 01:22:08 -04:00
Ethan Roseman
b646d535f3 tiny change 2020-03-25 19:01:43 -04:00
Ethan Roseman
a4be535164 Merge branch 'master' into ovl_En_Ru2_new 2020-03-25 18:56:09 -04:00
Ethan Roseman
36119f6c65 PR suggestions 2020-03-25 18:39:51 -04:00
Ethan Roseman
73cc2073fd
Update src/overlays/actors/ovl_En_Ru2/z_en_ru2.c 
Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-03-25 17:34:38 -04:00
fig02
ada905a754
Merge pull request #33 from krimtonz/skelanime 
Decompiles a large portion of z_skelanime.c
 2020-03-25 15:49:49 -04:00
KrimtonZ
dc35cba293 naming update 2020-03-25 14:44:42 -05:00
KrimtonZ
864cb28e27 remove skelanime data files, few extra namings, add non_matching for func_800A2E70 2020-03-25 14:38:16 -05:00
Ethan Roseman
5510186f98 newline 2020-03-25 13:53:20 -04:00
KrimtonZ
582b32d39c Fix Draw Callbacks, fix segmented address in z_en_bird 2020-03-25 11:43:11 -05:00
KrimtonZ
095924d05a clang formatting 2020-03-25 11:07:09 -05:00
KrimtonZ
18676c531d set types for more segment addresses 2020-03-25 10:59:49 -05:00
KrimtonZ
498d19655b Merge branch 'master' into skelanime 2020-03-25 10:52:04 -05:00
KrimtonZ
8970968cfc name SkelAnime_InitLinkAnimetion, name load animation types and callbacks, rename several segement addresses in decompiled actors 2020-03-25 10:51:25 -05:00
fig02
50dd042189
Merge pull request #36 from ethteck/ovl_Bg_Spot12_Gate 
Decompiled ovl_Bg_Spot12_Gate
 2020-03-25 11:39:04 -04:00
fig02
80b0f9b5fe
Merge pull request #35 from JoshDuMan/nonmatching 
Match z_en_bird.c's last function.
 2020-03-25 11:38:37 -04:00
Lucas Shaw
3a11638901 Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-25 00:09:26 -07:00
Ethan Roseman
b2b07e352a Description 2020-03-24 22:33:10 -04:00
Ethan Roseman
baab910fae Moving out cutscene data 2020-03-24 22:31:54 -04:00
Ethan Roseman
512b3f6659 Formatting 2020-03-24 22:26:45 -04:00
Ethan Roseman
c559068eda Done 2020-03-24 22:24:33 -04:00
Ethan Roseman
735a6c93c5 One more 2020-03-24 21:52:39 -04:00
Ethan Roseman
7376fe5cad Decompiled ovl_Bg_Spot12_Gate 2020-03-24 21:42:07 -04:00
JoshDuMan
f0c033ce70 Match func_809C1CAC 2020-03-24 19:52:07 -04:00
fig02
17765e2586
Merge pull request #34 from pixel-stuck/master 
match final non-matching in sys_cfb.c
 2020-03-24 19:51:57 -04:00
fig02
00f10c9f71
Merge pull request #32 from ethteck/ovl_Bg_Spot09_Obj 
Decompiled ovl_Bg_Spot09_Obj
 2020-03-24 18:27:40 -04:00
Ethan Roseman
f72837caeb Merge branch 'ovl_Bg_Spot09_Obj' of github.com:ethteck/oot into ovl_Bg_Spot09_Obj 2020-03-24 17:07:59 -04:00
Ethan Roseman
05122ec2f8 PR suggestions 2020-03-24 17:07:52 -04:00
Ethan Roseman
29cbc5c999 2 more 2020-03-24 17:00:46 -04:00
dark-samus
4b7f998b20 match final non-matching in sys_cfb.c 2020-03-24 16:53:09 -04:00
KrimtonZ
a99840162b minor formatting updates, match func_800A4A20 2020-03-24 14:01:00 -05:00
JoshDuMan
234b954473
Bring up to master. 2020-03-24 14:38:55 -04:00
shawlucas
8fa6b94dca Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-24 11:13:30 -07:00
KrimtonZ
f2c65d615b fix jenkins build errors, small prototype update 2020-03-24 13:06:15 -05:00
KrimtonZ
ee356fe203 run clang on functions.h 2020-03-24 12:29:59 -05:00
KrimtonZ
db3cfe1b61 use clang, modify z64animation.h and z64dma.h to use open braces on newline 2020-03-24 12:16:13 -05:00
KrimtonZ
2b0b6a6c12 readd merge conflicts 2020-03-24 11:57:01 -05:00
KrimtonZ
8bbac143cd Merge branch 'master' into skelanime 2020-03-24 11:56:37 -05:00
KrimtonZ
ac4a51bf8f Rename SkelAnime functions, which in turn modified a bunch of actor functions. Move necessary skelanime function calls to functions.h, remove unnecessary skelanime functions from functions.h, other skelanime cleanup 2020-03-24 11:52:12 -05:00
Ethan Roseman
b3f865dc58 Merge branch 'master' into ovl_En_Ru2_new 2020-03-24 00:30:09 -04:00
Ethan Roseman
2fcc450890
Merge branch 'master' into ovl_Bg_Spot09_Obj 2020-03-24 00:20:17 -04:00
Ethan Roseman
ba31478e23 Spacing 2020-03-24 00:18:33 -04:00
Ethan Roseman
a8b19baf6e Format 2020-03-24 00:16:35 -04:00
Ethan Roseman
c4bb9bed4c Done 2020-03-24 00:16:01 -04:00