9 Commits

Author	SHA1	Message	Date
shawlucas	08b73fe685	fixed merge conflict	2020-03-21 18:14:17 -07:00
Roman971	5f04911e00	Add script to generate REG macros from GameInfo offsets ... Also removed `asmdiff-old.sh` that I believe is no longer used by anyone.	2020-03-21 18:20:28 +01:00
shawlucas	1ed67c4b21	Merge branch 'master' of https://github.com/zeldaret/oot	2020-03-20 11:11:08 -07:00
Ethan Roseman	1d7a2ff18d	Fixing build to successfully stop on failure	2020-03-20 00:33:07 -04:00
Thar0	97538a2f14	ovl_Door_Ana OK	2020-03-18 14:59:46 +00:00
Lucas Shaw	37497e427c	test	2020-03-16 23:09:16 -07:00
Ethan Roseman	c820e9b453	Updating ZAP2	2020-03-17 01:51:51 -04:00
Jack Walker	458593fcd7	Re-added ZAP2	2020-03-17 00:36:02 -04:00
Jack Walker	087f561f77	First proper commit.	2020-03-17 00:31:30 -04:00