Merge branch 'ChestKeyCounter' into DRMain
# Conflicts: # LTTP_RND_GeneralBugfixes.asm # build.sh # darkworldspawn.asm # events.asm # itemdowngrade.asm # shopkeeper.asm # stats.asm
This commit is contained in:
@@ -147,7 +147,6 @@ incsrc scratchpad.asm
|
||||
incsrc map.asm
|
||||
incsrc msu.asm
|
||||
incsrc dialog.asm
|
||||
incsrc events.asm
|
||||
incsrc entrances.asm
|
||||
incsrc accessability.asm
|
||||
incsrc heartbeep.asm
|
||||
@@ -194,6 +193,7 @@ incsrc compression.asm
|
||||
incsrc retro.asm
|
||||
incsrc dpadinvert.asm
|
||||
incsrc boots.asm
|
||||
incsrc events.asm
|
||||
incsrc clock.asm
|
||||
incsrc fileselect.asm
|
||||
incsrc playername.asm
|
||||
|
||||
Reference in New Issue
Block a user