bfbc180ff3
Merge branch 'OWMain' into overworld_kara
2023-02-26 14:30:05 -06:00
codemann8
750c412f59
Minor comment change
2023-02-25 21:37:44 -06:00
codemann8
b1f23151a2
Disable flute in rain state
2023-02-25 21:37:25 -06:00
ec6231955d
Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
2023-01-30 19:47:34 -06:00
codemann8
4af93256a5
Merged DR v1.2.0.0
2022-12-01 14:10:35 -06:00
3cec56c5d8
Revert "Fix mixing progressive/non-progressive swords and shields"
...
This reverts commit d05169d5e2
2022-10-12 15:55:48 -07:00
d05169d5e2
Fix mixing progressive/non-progressive swords and shields
2022-10-08 15:43:28 -07:00
d6f3aee02b
Remove non-progressive bomb/cane upgrades
2022-09-18 18:18:12 -07:00
6f138825d9
Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
...
WIP, Broken, Do Not Use
2022-09-18 17:36:49 -07:00
aerinon
2acee4abb9
Flute activated pickup sfx
2022-09-07 15:09:04 -06:00
codemann8
ed72830397
Implemented Bonk Drop Shuffle
2022-07-24 11:29:28 -05:00
codemann8
7c7664224e
Merged DR v1.0.1.0
2022-07-08 05:32:08 -05:00
aerinon
6f1eda9296
Fix for pottery/shopsanity conflict
2022-06-15 16:53:49 -06:00
aerinon
9779f91ce9
Fix dungeon completion bitfield (16-bit)
2022-05-19 10:36:20 -06:00
aerinon
003278f7e0
Fix dungeon completion bitfield
2022-05-18 14:52:47 -06:00
cassidoxa
9c41ffb55b
Merge branch 'sram_rework' into dr_sram
2022-04-20 00:30:35 -04:00
9c30e3cdf9
Merge commit '697a742e0937780d3e6d1193876c8096ef1e2200' into HEAD
2022-04-01 18:28:29 -07:00
codemann8
697a742e09
Minor fix to flute SFX for pre-activated flute
2022-03-18 23:21:45 -05:00
cassidoxa
5d943d9a6d
Add dungeons completed bitfield from door rando
2022-02-23 12:42:21 -05:00
cassidoxa
838d4e9bf8
Refactor dungeon locations checked incrementing
...
Fix BowTracking documentation
2022-02-18 17:45:33 -05:00
7da5e6257a
Merge branch 'OWMain' of github.com:codemann8/z3randomizer into overworld_kara
2022-02-11 13:36:00 -08:00
cassidoxa
905e897b52
Handle 16-bit GoalCounter and TotalItemCounter
...
Fix vanilla sword + shield item
Fix how progressive items handled
Clean up compasses.asm
2022-02-08 19:25:59 -05:00
codemann8
b72f89ff87
Made flute SFX louder for preactivated flute item get
2022-01-15 20:56:16 -06:00
codemann8
3e9f598fe1
Added flute SFX to itemget if collecting a pre-activated flute
2022-01-15 04:07:27 -06:00
8c6d2ac26d
Fix moldorm/somaria issue and add both-canes mode
2021-12-23 22:13:30 -08:00
53792aea25
Add cane-only modes
2021-12-23 22:13:26 -08:00
cassidy
c8ea2c6dce
Move compass counts to ROM and trackable RAM
...
Add flag if compass HUD count has been displayed in SRAM
Move low hearts fix from tables.asm to bugfixes.asm
Rearrange dungeon stats in SRAM to match door rando ROM
2021-12-16 17:19:55 -05:00
cassidy
ae0b57635c
Remove defines from LTTP_RND_GeneralBugfixes
...
Replace more labels
Add ROM version and reserve extra 16 bytes in unused hardware vector in
LTTP_RND_GeneralBugfixes
Move IncrementChestCounter to ChestPrep in newitems.asm
Remove IncrementChestCounter hook which was getting overwritten
More revisions to sram.asm
2021-12-16 17:19:55 -05:00
cassidy
640e94153d
Refactor inventory code and add more labels
...
Refactored highest sword, shield, and mail counting
Refactored how heart pieces, heart containers, and crystals are counted
Moved quickswap lock bit to high byte of InventoryTracking
Fixed sword and shield item downgrade
Added PreFluteLocations counter
2021-12-16 17:19:54 -05:00
7aac3970d1
Add pseudo-sword mode
2021-07-25 01:42:21 -07:00
bdd665db24
move storage of BOMB_LEVEL to make it play nicely with starting equipment
2021-07-13 11:28:04 -07:00
e81905a517
Fix bomb downgrades and track bomb stats in bomb-mode
2021-07-12 02:35:24 -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
01abf889d7
Merge branch 'main' into overworld_kara
2021-07-01 23:02:23 -07:00
Bonta
4b6d70a61b
Quickswap: Fix consecutive special swaps
2021-06-20 12:57:17 +02:00
aerinon
5672e2f090
Merge branch 'master' into DRMain
2021-05-24 14:52:26 -06:00
cassidy
869706e50b
Fix bombs count
2021-05-20 20:32:29 -04: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
fab1c22d43
Merge pull request #101 from StructuralMike/nostartingbombs
...
Now possible to start with 0 bomb capacity
2021-04-02 13:18:15 -05:00
KatDevsGames
362e9d3b14
Merge pull request #102 from kedNalatacId/quickswap_bottle_y_pressed
...
Quickswap bottle y pressed
2021-04-02 13:17:57 -05:00
ken
025b4941f3
don't require both shoulders twice; causes too much lag
2021-03-16 22:23:06 -07:00
ken
a19c72a062
bottles via double shoulder
2021-03-16 01:02:26 -07:00
StructuralMike
f2ce8aaf59
Now possible to start with 0 bomb capacity
2021-03-04 21:58:54 +01:00
aerinon
f6cc3607df
Refactored Potion shop hooks to allow old behaviors
2021-02-22 14:48:10 -07:00
aerinon
ddf56a9ed1
Merge branch 'DRMain2' into DRMain
2021-02-18 13:13:44 -07:00
aerinon
d15dc91db4
Fix for BallnChain guard when keydropshuffle is off
2021-02-13 20:48:51 -07:00
aerinon
7fee6ce440
Merge branch '16_bit_collection_rate' of https://github.com/CaitSith2/z3randomizer into InventoryCountMerge
2021-02-12 20:45:59 -07:00
CaitSith2
d3af10649c
Dungeon completion flags, that indicate for which dungeons the prize was collected from.
2021-02-12 07:45:32 -08:00
CaitSith2
244b622074
Move stats that were not compass related out of the former compass counters.
2021-02-12 07:27:21 -08:00
aerinon
a63aa6f5fe
Shop fixes
2021-02-01 16:29:09 -07:00
