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
Thomas Prescott
03c0eb0475 Fix msu1 in credits
%smallcredits() can't have numbers, so we need to remove the 1 from MSU1
2021-05-06 21:45:10 -05:00
Thomas Prescott
08abf980eb fix 2021-04-26 00:34:33 -05:00
Thomas Prescott
1efb19b88d update credits 2021-04-26 00:32:56 -05:00
spannerisms
c179bfcb64 credits update
add color (thanks synack)
add warning and errors for misalignment
2021-04-15 02:19:16 -04:00
spannerisms
12decaab45 ah that wouldn't work 2021-04-13 19:26:24 -04:00
spannerisms
975dd10db5 remove padding 2021-04-13 19:24:19 -04:00
spannerisms
44445b51ce autospacing 2021-04-13 00:00:34 -04:00
spannerisms
c9340e5aa8 Update creditsnew.asm 2021-04-12 22:48:21 -04:00
spannerisms
e9584597c4 new credits 2021-04-12 22:45:19 -04:00