Commit Graph

253 Commits

Author SHA1 Message Date
codemann8
11099f53b0 Merging DRMain 2021-07-23 15:49:10 -05:00
aerinon
9861c76d23 Minor refactor to keep dr hooks in DR 2021-07-23 09:13:35 -07:00
codemann8
c01c6f337a Fixed boss music when boss room entered thru Straight Stairs in DR 2021-07-12 20:59:57 -05:00
codemann8
a05b148261 Fixed boss music when boss room entered thru Straight Stairs in DR 2021-07-12 20:59:47 -05:00
codemann8
30d8bdd813 Suppressed awkward/abrupt music changes in dungeons when DR is enabled 2021-07-12 19:23:13 -05:00
codemann8
dc2a468acb Suppressed awkward/abrupt music changes in dungeons when DR is enabled 2021-07-12 19:22:57 -05:00
codemann8
9209153643 Supressed awkward/abrupt music changes in dungeons when DR is enabled 2021-07-12 16:44:03 -05:00
codemann8
0bce51af4e Supressed awkward/abrupt music changes in dungeons when DR is enabled 2021-07-12 15:41:59 -05:00
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
f403ca10da boss icons 2021-06-30 07:15:37 -04:00
KatDevsGames
ae0a712bdd Merge pull request #129 from spannerisms/master
OneMind
2021-06-28 11:08:44 -05:00
KatDevsGames
49f1f49ccb Merge pull request #127 from Bonta0/escapeassist
Events: Fix unusable infinite bombs with empty inventory
2021-06-28 11:06:51 -05:00
Bonta
d3db31b05e Events: Fix unusable infinite bombs with empty inventory 2021-06-24 23:12:58 +02:00
spannerisms
be0389ffbb stats 2021-06-24 08:36:04 -04:00
aerinon
e9aec2ba86 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
2021-06-22 13:12:07 -06:00
spannerisms
49afe7ca9b onemind 2021-06-20 10:09:04 -04:00
cassidy
77f742b25c Rewrite to handle electro palette, leave bunny alone
Should fix bunny issues
Big thank to kara for report, assistance, and testing
2021-06-14 13:14:38 -04:00
spannerisms
a378bcf5c5 flag 2021-06-12 13:43:48 -04:00
spannerisms
775a970bcc yes 2021-06-12 07:47:27 -04:00
spannerisms
3204ad2ed5 fast credits 2021-06-12 07:43:18 -04:00
spannerisms
8f74212259 goals
easy-to-add AD no aga goal
2021-06-12 06:11:04 -04:00
spannerisms
feb27d71b9 heartbeeps 2021-06-12 06:07:38 -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
f389a2e737 DisableFlashing now disables electro palette changing
Affects Ether animation and enemies that electrocute Link
2021-05-09 02:17:09 -04:00
cassidy
12e30ba2db Remove flashing ancilla near pedestal item during cutscene 2021-05-08 22:59:09 -04:00
cassidy
ca7eaf3385 Change how Ether flashing is handled
Removed SetEtherFlicker and hooked into new restore palette code instead
2021-04-25 21:13:23 -04:00
cassidy
74cb39f666 Refactor whitening bg 2021-04-23 13:59:49 -04:00
cassidy
452a2db03d Aga 2 flashing 2021-04-22 17:05:04 -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
e6aee5c375 oops? 2021-04-07 04:58:02 -04:00
KatDevsGames
2da2d16896 Merge pull request #106 from spannerisms/master
new goals
2021-04-06 03:39:23 -05:00
spannerisms
ed9c6681e8 new goals
make goals a jump table
add light speed
add crystals and bosses
add crystals only
move XY preservation to CountBits and utilize stack instead of Y for temp storage
2021-04-06 02:00:25 -04:00
Thomas Prescott
c5053b7847 Merge branch 'master' into patch-1 2021-04-04 21:38:41 -05:00
Thomas Prescott
ead4cf5ca8 new firebar layer fix from Zarby 2021-04-04 21:33:33 -05:00
spannerisms
b95923fb9a Merge branch 'master' into master 2021-04-03 00:31:23 -04:00
KatDevsGames
b84921e255 Merge pull request #100 from spannerisms/master
HUD Updates
2021-04-02 05:10:35 -05:00
spannerisms
36a21a7190 unkillaable enemies 2021-03-26 04:51:58 -04:00
aerinon
f6cc3607df Refactored Potion shop hooks to allow old behaviors 2021-02-22 14:48:10 -07:00
aerinon
05e7f8eb96 Ported over pepper's shop code 2021-01-29 13:55:13 -07:00
spannerisms
c97475f422 BRL -> JMP 2020-12-27 08:04:32 -05:00
Catobat
0c608c1380 Fix starting equipment on file select 2020-12-16 19:58:33 +01: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
qwertymodo
b10dc742c2 Give the people what they want 2020-10-10 10:03:52 -07:00
KatDevsGames
8814f8764a Merge pull request #88 from tcprescott/patch-1
Fix the shop fix and potentially fix a rare S&Q issue
2020-09-20 01:57:39 -04:00
CaitSith2
820b5d5357 Low stakes and high stakes chest game no longer increments item counter. 2020-09-18 11:04:22 -06:00
CaitSith2
acf119d6a1 Low stakes and high stakes chest game no longer increments item counter. 2020-09-04 12:48:39 -07:00
CaitSith2
a892ff39b2 Backport terrorpin ai fix from enemizer. (and fix a bug with it.) 2020-08-05 08:48:25 -07:00