Commit Graph

1164 Commits

Author SHA1 Message Date
53792aea25 Add cane-only modes 2021-12-23 22:13:26 -08:00
0ab9095222 Merge branch 'OWMain' into overworld_kara 2021-11-29 00:04:13 -08:00
codemann8
a1fff4ff76 Fix mirror portals getting erased when changing worlds 2021-11-24 15:58:39 -06:00
codemann8
10ad8ab834 Fix mirror portals getting erased when changing worlds 2021-11-22 09:07:38 -06:00
codemann8
3262c6ff1a Fix mirror portals getting erased when changing worlds 2021-11-20 00:34:57 -06:00
codemann8
9094d118df Fixed Inverted Double-Swap issue 2021-11-14 17:08:06 -06:00
e96d802ed1 Shorten duration of boomerang stun 2021-11-10 00:08:35 -08:00
b515b59a38 Make boomerang in bomb-only mode stun enemies it would normally damage 2021-11-08 16:38:03 -08:00
69a669e16e Merge branch 'OWMain' into overworld_kara 2021-11-08 00:09:02 -08:00
4896985493 Fix bomb icons on file select/endgame screens 2021-11-07 23:58:40 -08:00
2fd459d8ca Show bomb level on file select screen in bomb-only mode 2021-11-07 19:32:27 -08:00
918eefc3bd Minor fixes 2021-11-07 19:31:53 -08:00
codemann8
7d80b8087a Allow normal Link speed with Old Man if not in his cave or on WDM 2021-11-07 16:24:45 -06:00
2b241b2340 Unify handling of bomb colors in bomb-only mode 2021-11-07 12:47:13 -08:00
codemann8
15a381769c Merge branch 'DRMain' into OWMain 2021-11-02 17:20:03 -05:00
codemann8
582abf3d32 Fixed boss music 2021-11-02 17:17:37 -05:00
aerinon
6757e35dca Straight Stair fixes 2021-11-02 15:24:21 -06:00
codemann8
ff6a553a0d Fake flipper autokill reversal 2021-11-01 10:59:37 -05:00
codemann8
dd57b4be79 Preserve Sanc music change in Standard 2021-11-01 02:09:05 -05:00
codemann8
4bcc76e83b Play Sanc music on arrival in Sanc in Standard 2021-10-31 20:56:27 -05:00
0c6ba20470 Merge branch 'main' into overworld_kara 2021-10-30 16:38:09 -07: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
82c5190f63 Merge branch 'OWMain' into overworld_kara 2021-10-30 11:55:08 -07:00
aeec3fe6c6 Allow early detonation of bombs and add build flag to remove static RNG 2021-10-30 09:11:36 -07:00
codemann8
2e9f4c5abb Fixed issue with whirlpools not changing world in Crossed OW 2021-10-28 21:40:51 -05:00
codemann8
86212c8d25 Adding cross-world behavior for Whirlpool Shuffle 2021-10-27 01:09:53 -05:00
codemann8
4e67ebd959 Make Smith deletion on S+Q dependent of a new flag 2021-10-22 00:21:22 -05:00
codemann8
7819e80051 Fixed portal to match grass in Inverted 2021-10-21 22:18:23 -05:00
codemann8
2215b16240 Merge branch 'DRMain' into OWMain 2021-10-21 21:26:38 -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
825d4a1ead Merge branch 'overworld_kara' of github.com:ardnaxelarak/z3randomizer into overworld_kara 2021-10-02 21:19:06 -07:00
6d9cbc85b7 Merge branch 'OWMain' of github.com:codemann8/z3randomizer into overworld_kara 2021-10-02 20:46:14 -07:00
f6f6383913 Merge remote-tracking branch 'codemann/OWMain' into overworld_kara 2021-09-21 14:10:23 -07:00
fb4068a3e1 Merge branch 'main' into overworld_kara 2021-09-21 11:55:33 -07:00
spannerisms
501699e401 oops 2021-09-18 08:07:45 -04:00
codemann8
a30e459dbb Merge branch 'DRMain' into OWMain 2021-09-17 10:54:00 -05: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
codemann8
200c1ff334 Merge branch 'DRMain' into OWMain 2021-08-31 19:21:19 -05:00