Commit Graph

1003 Commits

Author SHA1 Message Date
codemann8
a6dafc5fa6 Add HUD indicator if LW/DW in Mixed OW mode 2021-06-13 12:17:51 -05:00
Bonta
14844400b3 MSU1: Minor tweaks to avoid a long jump in main path 2021-06-13 00:38:00 +02:00
Bonta
183d439ff7 MSU1: Fade in on resume 2021-06-12 23:47:46 +02:00
Thomas Prescott
3d7e12a760 Update creditsnew.asm
Add Bonta and Emosaru to the Special Thanks section
2021-06-12 16:15:28 -05:00
Bonta
a9a929c6f4 MSU1: Dont resume track from Link's house 2021-06-12 22:35:07 +02:00
Bonta
3f86caf083 MSU1: Move msu.asm to bank A4 2021-06-12 21:16:30 +02:00
Bonta
ce7396ae35 MSU1: Allow resuming any track 2021-06-12 21:14:50 +02:00
Bonta
34bb99b7d0 MSU1: Resume overworld tracks 2021-06-12 21:14:50 +02:00
KatDevsGames
dca1bfbab2 Merge pull request #120 from spannerisms/master
Fast credits
2021-06-12 13:39:49 -05:00
spannerisms
a378bcf5c5 flag 2021-06-12 13:43:48 -04:00
spannerisms
775a970bcc yes 2021-06-12 07:47:27 -04:00
spannerisms
6261b9b8e0 improvement for UW 2021-06-12 07:46:20 -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
codemann8
c1ecc4c891 Merge branch 'DRMain' into OWMain 2021-06-04 21:49:55 -05:00
aerinon
050ce5e20e Changes from DR 0.4.0.6 2021-06-04 17:02:23 -06:00
codemann8
4846bcbb58 Merge branch 'DRMain' into OWMain 2021-06-03 10:56:15 -05:00
codemann8
22f761a6c5 Added map terrain changes specific to OW Shuffle 2021-06-03 10:54:30 -05:00
codemann8
5cb8b68e8a Added convenient portals on WDM for OW Shuffle 2021-06-03 08:05:41 -05:00
codemann8
53d3fc3737 Added convenient portals on WDM for OW Shuffle 2021-06-03 07:36:59 -05:00
codemann8
6c616a20b2 Made world checks table-based rather than based on OW ID 2021-06-03 00:50:25 -05:00
codemann8
ff87b09d4b Minor reorganization of code/data placement 2021-05-30 06:44:34 -05:00
aerinon
429649bde8 Merge pull request #8 from codemann8/MSUMuteFix
Msu mute fix
2021-05-29 21:51:08 -06:00
codemann8
dd2110f91d Moved Inverted Pyramid Entrance to HC Ledge 2021-05-26 21:07:16 -05:00
codemann8
1f37695fe0 Merge branch 'DRMain' into OWMain 2021-05-24 17:52:01 -05:00
aerinon
c7a4d817c0 Changes from DR 2021-05-24 15:12:09 -06:00
aerinon
5672e2f090 Merge branch 'master' into DRMain 2021-05-24 14:52:26 -06:00
KatDevsGames
1bbf359198 Merge pull request #119 from cassidoxa/entrances
Revert "Update entrances.asm"
2021-05-22 13:11:59 -05:00
cassidy
327f08ce35 Revert "Update entrances.asm"
This reverts commit f4a336db9e.
2021-05-22 12:46:35 -04:00
KatDevsGames
b09b214ac0 Merge pull request #118 from cassidoxa/bombfix
Fix bombs count
2021-05-21 14:19:04 -05:00
cassidy
869706e50b Fix bombs count 2021-05-20 20:32:29 -04:00
codemann8
60ab0fcae2 Merge branch 'MSUMuteFix' into OWMain 2021-05-19 04:32:10 -05:00
codemann8
9d64b5edd1 Whoops, lines got swapped 2021-05-19 04:31:55 -05:00
codemann8
2e91981a1e Merge branch 'MSUMuteFix' into OWMain 2021-05-19 04:30:05 -05:00
KatDevsGames
feb3105c5a Merge pull request #116 from spannerisms/master
Fix
2021-05-18 20:29:58 -05:00
spannerisms
471a6da9ba Sorry, malmo 2021-05-18 05:30:23 -04:00
codemann8
6e86c5c9b8 Fixed GT/ToH MSU muting when playing Door Shuffle 2021-05-18 00:21:32 -05:00
codemann8
89881f3bee Merge remote-tracking branch 'upstream/DRMain' into OWMain 2021-05-16 04:51:57 -05:00
KatDevsGames
abd3dbe1fc Merge pull request #115 from aerinon/FixDefeatGanon
Fix a minor typo that makes Ganon invincible
2021-05-14 19:47:26 -05:00
aerinon
ce58e22496 Fix a minor typo that makes Ganon invincible 2021-05-14 16:50:35 -06:00
aerinon
e9a376d92a Bugfixes 2021-05-14 16:49:49 -06:00
Kat
47e52d3fb2 cucco storm 2021-05-14 14:17:11 -05:00
Kat
a7f8bc8d91 Update tables.asm 2021-05-14 13:33:56 -05: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
KatDevsGames
b76efe6df4 Merge pull request #113 from cassidoxa/flashing
Fix S&Q bug on DDM with flashing disabled
2021-05-09 17:23:26 -05:00
cassidy
01e894a0b0 Fix S&Q bug on DDM with flashing enabled
Force push to fix dummy Y register. Doesn't make a difference but feels
cleaner if they're the same.
2021-05-09 17:28:54 -04:00
KatDevsGames
086721d035 Merge pull request #112 from cassidoxa/flashing
Remove flashing ancilla near pedestal item during cutscene
2021-05-09 14:20:56 -05:00
KatDevsGames
2048f75185 Merge pull request #111 from tcprescott/patch-3
Fix msu1 in credits
2021-05-09 14:19:04 -05:00
cassidy
3e09808536 Save a byte setting processor flags 2021-05-09 02:46:39 -04:00