Commit Graph

5 Commits

Author SHA1 Message Date
aerinon
842bb043e6 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	catfish.asm
#	compasses.asm
#	darkworldspawn.asm
#	hooks.asm
#	inventory.asm
#	newitems.asm
#	shopkeeper.asm
#	stats.asm
#	tables.asm

Adn some updates from DR
2021-05-13 12:11:40 -06:00
spannerisms
1dca518150 Update halfmagicbat.asm
JML
2021-03-25 05:10:39 -04:00
Bonta-kun
ddd456c04e multiworld 2020-06-08 09:19:18 -07:00
Kevin Cathcart
14783a12e0 Implement item table encryption 2018-07-09 09:26:08 -04:00
Karkat
f755a63925 initial checkin 2017-05-17 13:00:32 -04:00