Commit Graph

10 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
c97475f422 BRL -> JMP 2020-12-27 08:04:32 -05:00
Bonta-kun
2a5e305fc6 implement remote item checks 2020-06-08 09:25:25 -07:00
Bonta-kun
94218b048b Dont replace multiworld items 2020-06-08 09:20:17 -07:00
qwertymodo
768fbad245 Make existing code compatible with asar 2019-11-17 15:20:57 -08:00
Kevin Cathcart
72f7451b6c Prevent Standing items from corrupting if hit by hookshot/boomerang 2018-09-14 18:16:27 -04:00
Kevin Cathcart
a4a0ef8d04 Fix Tablet items
Ensure that standing overworld items will never load the null item.
2018-07-26 19:00:25 -04:00
Kevin Cathcart
7204f6c2d4 Fix duplicate hooks.
Also simplify the LoadNarrowObject Hook, and correct the hook location
comment for it.
2018-07-21 18:30:22 -04:00
Kevin Cathcart
edb3cbaaeb Standardize on JML for long jumps (instead of JMP.l) 2018-04-21 22:12:51 -04:00
Karkat
f755a63925 initial checkin 2017-05-17 13:00:32 -04:00