mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-27 07:07:09 +00:00
Code Issues Projects Releases Wiki Activity
283 commits 1 branch 0 tags 485 MiB
Commit graph

283 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
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
shawlucas
c63b52ad58 Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-31 16:51:12 -07: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
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
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
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
Jack Walker
ec37636a7a Updated jenkins file, readme, and replaced 'extract' target with 'setup' 2020-03-28 17:34:57 -04: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