Commit Graph

195 Commits

Author SHA1 Message Date
aerinon
aee82fa319 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	events.asm
#	hooks.asm
#	stats.asm
#	stats/creditsnew.asm
#	stats/statConfig.asm
#	swordswap.asm
#	utilities.asm
2021-07-07 11:15:11 -07:00
KatDevsGames
264f7b26bc Merge pull request #134 from Bonta0/fakeboots
Fake boots
2021-07-06 22:25:42 -05:00
Bonta
27cb1b5459 Implement Fakeboots 2021-07-05 21:38:08 +02:00
spannerisms
00c59c791f damage/magic stats 2021-07-03 09:25:33 -04:00
spannerisms
f403ca10da boss icons 2021-06-30 07:15:37 -04:00
KatDevsGames
69ec104027 Merge pull request #131 from Bonta0/chestturns
Credits: Add chest turns counter
2021-06-28 11:47:01 -05:00
KatDevsGames
ae0a712bdd Merge pull request #129 from spannerisms/master
OneMind
2021-06-28 11:08:44 -05:00
aerinon
e9aec2ba86 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
2021-06-22 13:12:07 -06:00
aerinon
717434bd88 Bank notes added 2021-06-22 13:05:40 -06:00
Bonta
cc12372627 Stats: Track chest turns 2021-06-22 02:31:52 +02:00
spannerisms
49afe7ca9b onemind 2021-06-20 10:09:04 -04:00
Bonta
b16f7b4994 Stats: Fix bonk counter 2021-06-20 15:15:55 +02:00
Bonta
183d439ff7 MSU1: Fade in on resume 2021-06-12 23:47:46 +02:00
Bonta
3f86caf083 MSU1: Move msu.asm to bank A4 2021-06-12 21:16:30 +02:00
Bonta
34bb99b7d0 MSU1: Resume overworld tracks 2021-06-12 21:14:50 +02:00
spannerisms
3204ad2ed5 fast credits 2021-06-12 07:43:18 -04:00
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
cassidy
74cb39f666 Refactor whitening bg 2021-04-23 13:59:49 -04:00
cassidy
6a34b5cbc4 Flash toggle rough draft 2021-04-21 13:34:10 -04:00
KatDevsGames
c04ff98269 Merge pull request #107 from spannerisms/master
Agahnim Light Speed message
2021-04-20 14:26:58 -05:00
spannerisms
bc91aac550 provide unchanging address for memeforce 2021-04-16 01:41:24 -04:00
Thomas Prescott
ead4cf5ca8 new firebar layer fix from Zarby 2021-04-04 21:33:33 -05:00
aerinon
d015310e4d Blind boss checks for maiden sequence 2021-02-27 15:30:28 -07:00
aerinon
05e7f8eb96 Ported over pepper's shop code 2021-01-29 13:55:13 -07:00
aerinon
b3fcd2192e Some DR changes (outdoor check for hub and keydrop correct KeyTable address)
Shop VRAM issue investigated but not solved
2020-12-08 10:57:37 -07:00
aerinon
443070fe2c Merge branch 'ChestKeyCounter' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	build.sh
#	darkworldspawn.asm
#	events.asm
#	itemdowngrade.asm
#	shopkeeper.asm
#	stats.asm
2020-11-30 09:34:18 -07:00
aerinon
49dc0f4037 DR Code Init Commit
Rails for Mixed Travel
2020-10-29 15:58:05 -06:00
Thomas Prescott
9dc35af9d3 re-order include to fix back overrun 2020-09-22 23:25:37 -05:00
CaitSith2
a892ff39b2 Backport terrorpin ai fix from enemizer. (and fix a bug with it.) 2020-08-05 08:48:25 -07:00
caitsith2
1b3a586a57 Update multiworld to be compatible with save & quit delay fix. 2020-06-08 09:30:49 -07:00
caitsith2
80bc9c2028 Move player names and max them out at 255. 2020-06-08 09:26:25 -07:00
Bonta-kun
2a5e305fc6 implement remote item checks 2020-06-08 09:25:25 -07:00
Bonta-kun
c3c5ba9d53 move clock.asm from bank A0 to A4 2020-06-08 09:24:56 -07:00
Bonta-kun
94218b048b Dont replace multiworld items 2020-06-08 09:20:17 -07:00
Bonta-kun
6818c3e119 free some space in bank A0 2020-06-08 09:20:00 -07:00
Bonta-kun
ddd456c04e multiworld 2020-06-08 09:19:18 -07:00
Thomas Prescott
b874df7d8b Merge branch 'master' of https://github.com/KatDevsGames/z3randomizer into darkrooms 2020-06-06 21:31:28 -05:00
qwertymodo
605a344368 Port SPC engine patches to ASAR 2020-06-06 18:01:27 -07:00
Thomas Prescott
616748b831 Show items in dark rooms, written by Zarby89 and kan. 2020-06-04 20:23:18 -05:00
qwertymodo
768fbad245 Make existing code compatible with asar 2019-11-17 15:20:57 -08:00
qwertymodo
207cfdc85e Merge branch 'musicstuff' 2019-09-06 14:47:51 -07:00
qwertymodo
bebdb1fd61 Re-scan the MSU-1 fallback table on pack switch 2019-09-06 14:47:05 -07:00
Kat
a2dbc57810 Update LTTP_RND_GeneralBugfixes.asm 2019-09-01 18:27:36 -04:00
qwertymodo
c005695c18 Fix victory fanfare crash 2019-08-30 22:04:07 -07:00
qwertymodo
7dbe893eeb Merge branch 'musicstuff' 2019-08-28 12:55:58 -07:00
qwertymodo
fd7d2bba3a MSU-1 fixes and updates 2019-08-28 10:26:00 -07:00
Kat
00abc77be4 Update LTTP_RND_GeneralBugfixes.asm 2019-08-28 00:02:26 -04:00
Kevin Cathcart
13b90d5cf9 Finish Triforce turning and update date 2019-08-27 23:59:37 -04:00
Kevin Cathcart
607974caeb Fix bunny pallete map bug and glove color bug 2019-08-23 22:00:46 -04:00
qwertymodo
9d9fb8a563 Add runtime muting 2019-08-21 20:56:08 -07:00