mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 07:46:18 +00:00
Code Issues Projects Releases Wiki Activity
255 commits 1 branch 0 tags 486 MiB
Commit graph

255 commits

This branch
This branch
All branches
Author SHA1 Message Date
shawlucas
c63b52ad58 Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-31 16:51:12 -07: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
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
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
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
fig02
d8cd8450c4 clang 2020-03-30 05:31:08 -04:00
fig02
ea7aebc731 arrow_light OK 2020-03-30 05:25:53 -04:00
shawlucas
667fcdccd9 Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-29 18:19:40 -07:00
fig02
da159ec528 arrow_ice OK 2020-03-29 12:47:58 -04:00
Roman971
f5ffe8687d Decompile z_rcp.c (1 non matching left) 2020-03-29 18:47:38 +02:00
Roman971
51c85fe660
Merge pull request #41 from Random06457/master 
Decompile z_quake.c and code_800D31A0.c
 2020-03-29 17:19:35 +02:00
Random
462c284a17 Fixes in PR #41 
- Use  VT macros in code_800D31A0.c
- Change D_8012DBC0 to false instead of 0
- Fix brace style
 2020-03-29 11:57:52 +02:00
fig02
7cc6b00fac fire arrow ok 2020-03-29 05:23:40 -04:00
Random
5f027cb431 Decompile z_quake.c and code_800D31A0.c 
- `code_800D31A0.c` : OK
- `z_quake.c` : OK
 2020-03-29 03:24:39 +02:00
shawlucas
1f93778d3d Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-28 12:22:51 -07:00
fig02
10c74eb958
Merge pull request #39 from zelda2773/master 
Decompiled ovl_En_Ds
 2020-03-28 02:45:24 -04:00
fig02
fde5369eae fire arrow almost done, draw func regalloc 2020-03-28 02:41:49 -04:00
zelda2773
8a45d9ec25 Format 2020-03-27 17:05:08 -04:00
zelda2773
6e2872ba6c Fixed floats in ovl_En_Ds 2020-03-27 16:26:10 -04:00
zelda2773
4621e066a9 More fixes 2020-03-27 13:28:14 -04:00
shawlucas
9ee5c122c1 Merge branch 'master' of https://github.com/shawlucas/oot 2020-03-27 09:34:10 -07:00
shawlucas
457633001f Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-27 09:33:16 -07:00
zelda2773
a754e399d0 Minor fix 2020-03-27 10:46:32 -04:00
zelda2773
1dc2b8b576 Changed line spacing 2020-03-27 10:37:04 -04:00
zelda2773
105ea6c5cd Decompiled ovl_En_Ds 2020-03-27 10:32:46 -04:00
Lucas Shaw
4156a7581f Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-26 23:25:11 -07:00
fig02
ba5df8eb51
Merge pull request #37 from ethteck/ovl_En_Ru2_new 
Decompiled ovl_En_Ru2
 2020-03-26 20:12:38 -04:00
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