Commit Graph
2029 Commits
Author SHA1 Message Date
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
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
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
KatDevsGames 02ec4ded4b Merge pull request #110 from spannerisms/master
Share sewers and castle items
2021-05-04 04:45:15 -05:00
spannerisms 9744f846f7 sewers 2021-05-04 05:17:37 -04:00
codemann8 99a695c1a2 Removed unnecessary data 2021-05-02 20:28:55 -05:00
codemann8 fd3f27adb1 Minor formatting changes 2021-05-02 19:16:02 -05:00
codemann8 a0b731ffbd Moved VRAM adjustment back to original spot 2021-05-02 19:15:42 -05:00
codemann8 fd3aed6d60 Preserve Link's position if within incoming gap 2021-05-02 18:30:49 -05:00
codemann8 ff08965ce5 Minor efficiency improvements 2021-05-01 19:50:46 -05:00
codemann8 e1a763c29f Minor formatting/labeling 2021-04-29 01:18:10 -05:00
spannerisms 6fdd5f636e Merge pull request #1 from KatDevsGames/master
A
2021-04-29 01:32:46 -04:00
codemann8 42f77472c5 Merge pull request #3 from Catobat/OWFix3
Fix camera unlocking
2021-04-28 18:39:32 -05:00
codemann8 8be83d6f94 Merge pull request #2 from Catobat/OWFix2
Fix transitions for real
2021-04-28 18:37:44 -05:00
KatDevsGames 8db9b67654 Merge pull request #109 from tcprescott/patch-2
Credits updates
2021-04-28 13:33:34 -05:00
KatDevsGames d52e5f2037 Merge pull request #108 from cassidoxa/flashing
Flash toggle
2021-04-28 13:33:21 -05:00
Catobat 0abda3e210 Fix camera unlocking 2021-04-27 22:41:32 +02:00
codemann8 e8cba03156 Updated gitignore 2021-04-26 23:15:59 -05:00
codemann8 340a3c1c9d Catobat fix for transition bugs 2021-04-26 18:06:01 -05:00
Catobat 2b65123802 Fix transitions for real 2021-04-26 21:52:06 +02: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
cassidy 8881aa66b1 Save space with a jump to vanilla routine 2021-04-25 22:34: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