Commit Graph

1036 Commits

Author SHA1 Message Date
aerinon
7bf2a259a4 Merge remote-tracking branch 'origin/DRMain' into DRMain 2022-01-05 14:32:48 -07:00
aerinon
83ce4bf566 Merge pull request #17 from codemann8/MSUMuteFix
Preserve original Sanc/HC music track change if Zelda isn't delivered yet
2022-01-05 14:32:37 -07:00
aerinon
fc5e6191eb Merge remote-tracking branch 'origin/DRMain' into DRMain 2022-01-05 14:29:03 -07:00
aerinon
52c40ba0ca Merge pull request #16 from Catobat/DRFix
General fixes
2022-01-05 14:28:36 -07:00
aerinon
c88a301708 Merge branch 'master' into DRMain
# Conflicts:
#	tables.asm
2022-01-05 14:26:48 -07:00
Thomas Prescott
2a3d6fae58 update credits 2022-01-03 13:55:03 -06:00
Lexi Rose
4eafefb501 Merge pull request #153 from spannerisms/master
Fix EG
2021-12-21 23:19:16 -06:00
spannerisms
04fa0fc1a1 match expected usage 2021-12-20 16:42:56 -05:00
Lexi Rose
7dda06cf11 Merge pull request #152 from spannerisms/master
Bug Fix and MSU
2021-12-16 04:40:15 -06:00
spannerisms
42bc1d743a Merge branch 'KatDevsGames:master' into master 2021-12-15 01:12:07 -05:00
spannerisms
aa6aaffd2f prevent crashes 2021-12-15 01:11:26 -05:00
Lexi Rose
df2bca00ee Merge pull request #151 from cassidoxa/rom_version
Add ROM version to unused hw vector and before filename in SRAM
2021-12-07 15:18:24 -06:00
cassidy
c82edadadd Change version defines to use ?= operator
Now these defines can be set via CLI, otherwise will be what they are in the file
2021-12-07 15:45:22 -05:00
cassidy
5fc5dc13b2 Add ROM version to unused hw vector and before filename in SRAM
Two 16 bit ints located at $FFE0 (0x7FE0 PC) in ROM and burned into SRAM
starting at $701FFC, just before the ROM name
2021-12-07 15:29:30 -05:00
spannerisms
580bbb7c67 Merge branch 'KatDevsGames:master' into master 2021-11-12 09:26:40 -05:00
spannerisms
24f6a4d8a8 abcd 2021-11-12 09:25:43 -05:00
Lexi Rose
2fe5f0c126 Merge pull request #150 from spannerisms/master
Fake flippers softlock improvement
2021-11-10 16:38:49 -06:00
codemann8
2c6db075a9 Fixed boss music 2021-11-06 16:19:48 -05:00
codemann8
ad5b78b3d1 Preserve Sanc music change in Standard 2021-11-06 16:18:09 -05:00
codemann8
e8d5a9635d Play Sanc music on arrival in Sanc in Standard 2021-11-06 16:17:37 -05:00
aerinon
6757e35dca Straight Stair fixes 2021-11-02 15:24:21 -06:00
spannerisms
553821885f prevent transition 2021-11-01 06:58:30 -04:00
Catobat
1e6d79badc Fix bug with straight stairs and vanilla doors 2021-10-31 23:16:47 +01:00
Catobat
3f34e50a62 Improve transition animation from straight stairs 2021-10-31 21:17:18 +01:00
Catobat
a1fafb72cd Keep dungeon tileset after opening the map 2021-10-31 21:16:09 +01:00
spannerisms
2b1a3566d8 flibber 2021-10-31 10:38:38 -04:00
Thomas Prescott
7f749e9578 Merge pull request #148 from spannerisms/master
Major Glitches
2021-10-30 17:20:00 -05:00
Thomas Prescott
71ae648137 Merge pull request #149 from KatDevsGames/tcprescott-remove-zsnes-graphic
Remove ZSNES graphic
2021-10-30 17:19:52 -05:00
aerinon
415e2cae41 Merge pull request #15 from spannerisms/master
Quadrant glitch fix
2021-10-21 16:09:45 -06:00
aerinon
27654b9ac9 Merge remote-tracking branch 'baserom/master' into DRMain
# Conflicts:
#	hooks.asm
#	newhud.asm
#	utilities.asm
2021-10-21 14:15:54 -06:00
Thomas Prescott
798af49215 Update LTTP_RND_GeneralBugfixes.asm 2021-10-05 17:02:24 -05:00
aerinon
319aba5e4d EG disarmament on mirror 2021-10-05 14:15:38 -06:00
Thomas Prescott
4ec6acfae7 Remove ZSNES graphic
This graphic takes up too much space.  Instead if the check fails just do a STP and don't include any of the ZSNES graphics.  If we want to add some other message here later we can, but it's more of a nice to have than a necessity.
2021-10-05 14:11:55 -05:00
spannerisms
501699e401 oops 2021-09-18 08:07:45 -04:00
aerinon
cc502c7524 Removed stonewall pre-opens 2021-09-16 16:01:51 -06:00
KatDevsGames
1ef55470d5 Merge pull request #147 from cassidoxa/shield_overflow
Shield and Progressive Bow overflow
2021-09-14 13:37:48 -05:00
cassidy
aca809862d utilities: Rewrite prog bow narrow sprite overflow to check sram
This uses Bonta's method which is more efficient and reliable when it
comes to bow state and potential mixture of progressive,
none-progressive, and silver arrows upgrade.
2021-09-08 01:00:55 -04:00
aerinon
f9e3bec5cb Removed rails using a dynamic flag 2021-09-07 16:24:18 -06:00
cassidy
c37dcec6ea utilities: refactor some JSL X : RTL into JMP X 2021-09-06 20:20:12 -04:00
cassidy
9f1933d8c0 utilities: Progressive Bow overflow narrow sprites 2021-09-06 20:16:41 -04:00
cassidy
bbc8228175 utilities: Fix shields overflowing with narrow sprites 2021-09-06 17:21:48 -04:00
Thomas Prescott
0a93c3fa00 Merge pull request #146 from Catobat/PrizeIndicator
Fix check for wild maps
2021-09-04 16:09:27 -05:00
aerinon
07a3a9ad03 Catobat map fix
Cutoff table updated
Mutliworld mem location added for item ids
2021-08-31 15:35:19 -06:00
Catobat
086230bb8c Fix check for wild maps 2021-08-28 04:01:28 +02:00
qwertymodo
48d9a7d4bc Fix SPC un/mute race condition
Should fix mothula hardlock, for real this time
2021-08-23 11:24:24 -07:00
KatDevsGames
af8a47e743 Merge pull request #144 from spannerisms/master
Fix jingle glitch
2021-08-21 23:46:53 -05:00
Salvatore
9ebde3e5b7 Merge pull request #145 from KatDevsGames/tcprescott-patch-1
Add Pleasure to credits
2021-08-21 20:59:46 -04:00
Thomas Prescott
bd16b9ff92 Add Pleasure to credits
Credit the creator of the website logo
2021-08-21 07:43:23 -05:00
spannerisms
03c287a988 jingle jangle 2021-08-11 06:30:52 -04:00
KatDevsGames
910d63e886 Merge pull request #143 from spannerisms/master
fix quadrant glitch hopefully
2021-08-10 15:13:32 -05:00