Commit Graph

270 Commits

Author SHA1 Message Date
shawlucas 08b73fe685 fixed merge conflict 2020-03-21 18:14:17 -07:00
Ethan Roseman c6a7cb2c8e Beginning 2020-03-21 19:05:38 -04:00
Lucas Shaw f374ac8d2b started ovl_bg_toki_swd 2020-03-21 11:54:45 -07:00
glank fa4c848cad Merge branch 'master' into z_en_tk 2020-03-21 12:31:29 +01:00
Ethan Roseman 31deeb865b Merge branch 'master' into ovl_Demo_Geff 2020-03-21 03:16:37 -04:00
fig02 ea075560c8 merge bombiwa 2020-03-20 08:25:26 -04:00
fig02 aa603ca229 merge and change scene thing 2020-03-20 08:17:48 -04:00
fig02 f3b509eb68 en_dog OK 2020-03-20 08:04:35 -04:00
Thar0 ad417f8824 Remove duplicate en_lightbox syms added by merge 2020-03-20 01:04:19 +00:00
Thar0 f263ce0b9c Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Obj_Bombiwa 2020-03-20 00:52:28 +00:00
Thar0 adbcbb6434 Decompile Obj_Bombiwa 2020-03-20 00:50:20 +00:00
Ethan Roseman 2d00e319fe Merge branch 'master' into ovl_Demo_Geff 2020-03-19 20:07:08 -04:00
Ethan Roseman db822f7d0f More 2020-03-19 20:06:46 -04:00
Roman971 9f434ad733
Merge pull request #12 from Random06457/master
Decompiled z_title.c
2020-03-20 01:01:21 +01:00
Random c931cd5837 Decompiled z_title.c
`z_title.c` : matching
2020-03-19 23:29:33 +01:00
glank 86c4472662 ovl_En_Tk OK 2020-03-19 13:01:17 +01:00
Faschz b0e6f3b698 Decompiled ovl_En_Lightbox 2020-03-18 20:12:13 -05:00
Roman971 85237605e2 Fix and cleanup ovl_En_Tubo_Trap (4/7 matched) 2020-03-18 21:22:00 +01:00
fig02 898a103b78 move en_dog progress from old repo 2020-03-17 04:38:46 -04:00
Jack Walker 087f561f77 First proper commit. 2020-03-17 00:31:30 -04:00