1
0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-22 05:14:47 +00:00
Commit Graph

154 Commits

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
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
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
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
zelda2773
5059e623fb ovl_Obj_Comb renamed functions and variables 2020-03-31 10:13:21 -04: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
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
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
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
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
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
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
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
fig02
ba5df8eb51
Merge pull request #37 from ethteck/ovl_En_Ru2_new
Decompiled ovl_En_Ru2
2020-03-26 20:12:38 -04:00
Ethan Roseman
ab7b0a50ab PR comments 2020-03-26 19:33:39 -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
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