Commit Graph

246 Commits

Author SHA1 Message Date
53792aea25 Add cane-only modes 2021-12-23 22:13:26 -08:00
82c5190f63 Merge branch 'OWMain' into overworld_kara 2021-10-30 11:55:08 -07:00
codemann8
4e67ebd959 Make Smith deletion on S+Q dependent of a new flag 2021-10-22 00:21:22 -05: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
42002ae839 Merge branch 'main' into overworld_kara 2021-08-26 08:44:15 -07:00
spannerisms
03c287a988 jingle jangle 2021-08-11 06:30:52 -04:00
spannerisms
7057d984e2 fix quadrant glitch hopefully 2021-08-10 09:56:57 -04:00
7aac3970d1 Add pseudo-sword mode 2021-07-25 01:42:21 -07:00
faf05fb9a9 Merge branch 'OWMain' into overworld_kara 2021-07-17 12:19:56 -07:00
bdd665db24 move storage of BOMB_LEVEL to make it play nicely with starting equipment 2021-07-13 11:28:04 -07:00
aerinon
641ec0ffa0 Minor fix to credits
Default to AgaDoor to Std/Open state
2021-07-13 10:51:01 -07:00
da14e440c7 Add L-1 bombs as separate from no bombs in bomb-only mode 2021-07-12 02:34:57 -07:00
3944dadcab Change default for locked aga tower to no longer be inverted 2021-07-08 18:25:04 -07:00
aerinon
aee82fa319 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	events.asm
#	hooks.asm
#	stats.asm
#	stats/creditsnew.asm
#	stats/statConfig.asm
#	swordswap.asm
#	utilities.asm
2021-07-07 11:15:11 -07:00
d960103e86 Merge branch 'main' into overworld_kara 2021-07-07 09:15:29 -07:00
KatDevsGames
264f7b26bc Merge pull request #134 from Bonta0/fakeboots
Fake boots
2021-07-06 22:25:42 -05:00
KatDevsGames
6f2383fafe Merge pull request #135 from ardnaxelarak/medallion
Implement always-allowed medallions
2021-07-06 17:44:41 -05:00
3548a0bbf5 Implement always-allowed medallions 2021-07-06 12:24:06 -07:00
Bonta
27cb1b5459 Implement Fakeboots 2021-07-05 21:38:08 +02:00
2fec3f7484 Merge commit 'f403ca10da9e009599a531be8cdcd20a61b4801c' of github.com:spannerisms/z3randomizer into overworld_kara 2021-07-01 23:05:48 -07:00
01abf889d7 Merge branch 'main' into overworld_kara 2021-07-01 23:02:23 -07:00
spannerisms
f403ca10da boss icons 2021-06-30 07:15:37 -04:00
b8dc86d7c5 Allow Ganon to be vulnerable to arbitrary item 2021-06-29 16:43:01 -07:00
8b0f0464f8 Implement always-allowed medallions 2021-06-29 16:43:01 -07:00
b3d649a0fb Add bomb-only mode 2021-06-29 16:43:01 -07:00
KatDevsGames
ae0a712bdd Merge pull request #129 from spannerisms/master
OneMind
2021-06-28 11:08:44 -05:00
aerinon
e9aec2ba86 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
2021-06-22 13:12:07 -06:00
spannerisms
49afe7ca9b onemind 2021-06-20 10:09:04 -04:00
Bonta
b16f7b4994 Stats: Fix bonk counter 2021-06-20 15:15:55 +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
aerinon
5672e2f090 Merge branch 'master' into DRMain 2021-05-24 14:52:26 -06: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
cassidy
fe708fd20f Restore invisible floors when flashing is disabled
Replace Seizure_Safety with FlashingDisabled
2021-04-25 16:09:42 -04:00
cassidy
6a34b5cbc4 Flash toggle rough draft 2021-04-21 13:34:10 -04:00
spannerisms
e9584597c4 new credits 2021-04-12 22:45:19 -04:00
spannerisms
fc29db2b46 reserve for v32 2021-04-11 10:18:07 -04:00
spannerisms
ed9c6681e8 new goals
make goals a jump table
add light speed
add crystals and bosses
add crystals only
move XY preservation to CountBits and utilize stack instead of Y for temp storage
2021-04-06 02:00:25 -04:00
KatDevsGames
b188024daa Merge pull request #99 from Catobat/Aga
Add Instant Post-Aga World State option
2021-04-02 13:18:28 -05:00
spannerisms
d9946e8f2a boss kills 2021-02-14 01:33:48 -05:00
aerinon
2a08959229 Shop counting items 2021-02-01 10:11:38 -07:00
aerinon
05e7f8eb96 Ported over pepper's shop code 2021-01-29 13:55:13 -07:00
Catobat
df45a9b451 Add Instant Post-Aga World State option 2020-12-16 21:32:30 +01:00
aerinon
717913b8fb Compass Refactor 2020-11-03 10:12:08 -07:00
CaitSith2
a892ff39b2 Backport terrorpin ai fix from enemizer. (and fix a bug with it.) 2020-08-05 08:48:25 -07:00
caitsith2
715ba87517 Reserve the space for berserkermulti.world seed guid. 2020-07-14 11:12:25 -07:00
compiling
5a10017747 Triforce Hunt + Kill Ganon goal. 2020-06-25 07:40:53 -07:00
compiling
1d88d7479d Triforce Hunt + Kill Ganon goal. 2020-06-13 19:01:37 +10:00
caitsith2
4530021fea Revert exetend msu flag as it is no longer needed. 2020-06-08 09:30:49 -07:00