Commit Graph

6 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
ffd1db722b refactor catfish
use JML instead of JSL : RTL
2021-03-24 07:39:20 -04:00
Bonta-kun
94218b048b Dont replace multiworld items 2020-06-08 09:20:17 -07:00
Bonta-kun
ddd456c04e multiworld 2020-06-08 09:19:18 -07:00
Karkat
151098ba22 let's dev 5/12/18
fixed zore ledge heart graphic bug
changed seed hash to be manually settable
added more seizure safety
2018-05-12 23:17:26 -04:00
Karkat
f755a63925 initial checkin 2017-05-17 13:00:32 -04:00