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
8321a5ef59 zora
jml
2021-03-25 04:53:35 -04:00
Bonta-kun
94218b048b Dont replace multiworld items 2020-06-08 09:20:17 -07:00
Karkat
f1f59c865a let's dev sep 28th 2017
fix for catfish/zora item spawn problem for items with IDs over 0x80
2017-09-28 23:03:51 -04:00
Karkat
f755a63925 initial checkin 2017-05-17 13:00:32 -04:00