Commit Graph

1004 Commits

Author SHA1 Message Date
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
aerinon
319aba5e4d EG disarmament on mirror 2021-10-05 14:15:38 -06: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
KatDevsGames
9067790b20 Merge pull request #141 from compiling/master
Fix clearing frog/smith in inverted mode
2021-08-10 15:13:23 -05:00
KatDevsGames
f69a33aed0 Merge pull request #142 from ardnaxelarak/fix_ohko
Fix OHKO mode
2021-08-10 15:13:13 -05:00
KatDevsGames
f18eac796c Merge pull request #140 from cassidoxa/escape_drop_rng
rngfixes: make enemy drop rng static during the standard escape sequence
2021-08-10 15:13:04 -05:00
spannerisms
7057d984e2 fix quadrant glitch hopefully 2021-08-10 09:56:57 -04:00
230b15a294 Fix OHKO mode 2021-08-09 15:30:16 -07:00
compiling
e2e4db8237 Fix clearing frog/smith in inverted mode 2021-08-08 14:13:40 +10:00
cassidy
fd490cab9a rngfixes: make enemy drop rng static during the standard escape sequence
This only applies between picking up the Uncle item and dropping off
zelda, not rain state in general
2021-08-02 21:06:13 -04:00
KatDevsGames
39441eb0a6 Merge pull request #139 from spannerisms/master
Bug fix
2021-07-30 20:47:55 -05:00
spannerisms
187c2aa4a2 always fix 2021-07-29 09:44:21 -04:00
spannerisms
df66369f17 hopefully fix that text bug 2021-07-29 09:43:08 -04:00
aerinon
fa516b58d4 Merge pull request #14 from codemann8/MSUMuteFix
Fix for boss music not playing in non-DR modes
2021-07-27 08:53:08 -06:00
codemann8
9cecd30e89 Fix for boss music not playing in non-DR modes 2021-07-27 02:42:36 -05:00
aerinon
15337a1382 Collection Rate moved to arbline marco 2021-07-23 09:14:43 -07:00
aerinon
9861c76d23 Minor refactor to keep dr hooks in DR 2021-07-23 09:13:35 -07:00
aerinon
5b8c90e069 Merge pull request #12 from codemann8/MSUMuteFix
Some music fixes
2021-07-23 07:44:01 -07:00
aerinon
e038b0bb18 Merge pull request #13 from ardnaxelarak/DR_statCountersFix
Fix counters for damage taken and magic used
2021-07-23 07:42:18 -07:00
8e12033105 Fix counters for damage taken and magic used 2021-07-23 00:07:51 -07:00
KatDevsGames
8da0dcf3e0 Merge pull request #138 from spannerisms/master
Fix Aga door bug
2021-07-18 13:25:46 -05:00
KatDevsGames
df7ce30bbe Merge pull request #137 from ardnaxelarak/main
Fix drawing C/P indicator
2021-07-18 13:25:36 -05:00
KatDevsGames
a5d66bc5a8 Merge pull request #136 from ardnaxelarak/fix_aga_default
Minor Low-Priority Fixes
2021-07-18 13:25:27 -05:00
spannerisms
b726ea1d0a Merge branch 'KatDevsGames:master' into master 2021-07-17 05:48:21 -04:00
spannerisms
f0a00aea0d fix 2021-07-17 05:46:02 -04:00
a2547e9810 Minor credits fixes 2021-07-16 15:29:01 -07:00
aerinon
bfbe3fbcc0 Addition to Cutoff room table 2021-07-15 10:33:47 -07:00
aerinon
641ec0ffa0 Minor fix to credits
Default to AgaDoor to Std/Open state
2021-07-13 10:51:01 -07:00
aerinon
e35c437fe3 Merge pull request #10 from ardnaxelarak/DRMain
Fix junk graphics appearing during GAME OVER screen
2021-07-13 10:44:51 -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
30d8bdd813 Suppressed awkward/abrupt music changes in dungeons when DR is enabled 2021-07-12 19:23:13 -05:00
codemann8
0bce51af4e Supressed awkward/abrupt music changes in dungeons when DR is enabled 2021-07-12 15:41:59 -05:00
12bc26bd5a Fix extra space in credits 2021-07-12 02:10:12 -07:00
2be05eed33 Fix junk graphics appearing during GAME OVER screen 2021-07-10 11:30:48 -07:00
e7d4f09871 Fix junk graphic appearing during GAME OVER screen 2021-07-10 11:27:34 -07:00