45b56c6328
Trolls
2023-06-14 19:02:51 -05:00
bfbc180ff3
Merge branch 'OWMain' into overworld_kara
2023-02-26 14:30:05 -06:00
codemann8
b1f23151a2
Disable flute in rain state
2023-02-25 21:37:25 -06:00
codemann8
bfb131be81
Merged in DR v1.2.0.8
2023-02-17 18:47:36 -06:00
aerinon
4a8b8b7691
Standard save and quit change for DR
2023-02-17 16:58:50 -07: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
846ad798cf
Fix conflict between hammer-on-B code with bunny-pressing-A code
2022-11-19 10:06:37 -08:00
5d4e7fa62d
Add Hammer-On-B mode
2022-11-16 14:39:05 -08:00
be81787446
Bee Mode
2022-11-16 14:37:42 -08:00
682583c215
Merge branch 'OWMain' into overworld_kara
2022-11-16 14:24:25 -08:00
codemann8
1e2a0c7774
Remove the sprite spawn delay when bonking prizes
2022-11-08 18:52:11 -06:00
6f138825d9
Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
...
WIP, Broken, Do Not Use
2022-09-18 17:36:49 -07:00
codemann8
223c086c82
Merge branch 'DRUnstable' into OWMain
2022-09-07 19:38:34 -05:00
aerinon
2acee4abb9
Flute activated pickup sfx
2022-09-07 15:09:04 -06:00
aerinon
8a18566da1
Merge branch 'DRUnstable' into Synthesis
...
# Conflicts:
# doorrando/overrides.asm
2022-08-24 14:27:34 -06:00
aerinon
ca70d8c2a3
Merge branch 'DRVolatile' into Synthesis
2022-08-11 15:28:32 -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
92c155f5c0
Re-implemented mirror scroll during escape behavior to not affect entrance and include the throne spawn point
2022-06-16 12:32:31 -06:00
aerinon
a36068fb04
Fix for Zelda despawning near maiden cell
2022-06-15 23:49:20 -06:00
aerinon
2579038832
Mirror scroll spawns in Zelda's cell instead of last entrance (mirror remains unchanged)
...
Tapestry is open when spawning in the throne room.
2022-06-14 12:36:04 -06:00
Catobat
87cac1a113
Shuffle Back of Tavern
2022-06-13 20:37:59 +02:00
codemann8
f86780913f
Fixed issue with mirror portals showing up in DW in Crossed OW
2022-05-21 20:53:00 -05:00
codemann8
9b846498a2
Moved some mirror code out to new function
2022-05-21 20:51:54 -05:00
codemann8
478d4fc7f3
Fix issue with mirror portals showing up on map checks when they shouldn't
2022-05-21 14:55:42 -05:00
aerinon
0960dcaac9
Merge branch 'master' into DRVolatile
2022-04-27 13:50:42 -06:00
aerinon
e088a040f8
Merge branch 'dr_sram' of https://github.com/cassidoxa/z3randomizer into cassidoxa-dr_sram
...
# Conflicts:
# hooks.asm
# menu/overworldmap.asm
# music.asm
2022-04-26 11:57:51 -06:00
codemann8
a26b128b52
Merge remote-tracking branch 'upstream/DRUnstable' into OWMain
2022-04-21 13:11:31 -05:00
aerinon
4b68406be0
Merge branch 'DRUnstable' into DRVolatile
2022-04-20 13:56:31 -06:00
aerinon
a017c98c4e
Map bug with prizes
2022-04-20 09:07:59 -06:00
cassidoxa
9c41ffb55b
Merge branch 'sram_rework' into dr_sram
2022-04-20 00:30:35 -04:00
codemann8
436ecbb17d
Merged DR v1.0.0.3
2022-04-15 10:34:10 -05:00
aerinon
d116249412
Merge branch 'DRUnstable' into DRVolatile
2022-04-13 13:32:31 -06:00
Lexi Rose
c6adf11a0d
Merge pull request #159 from cassidoxa/sram_rework
...
SRAM Re-work
2022-04-05 09:38:27 -05:00
9c30e3cdf9
Merge commit '697a742e0937780d3e6d1193876c8096ef1e2200' into HEAD
2022-04-01 18:28:29 -07:00
codemann8
da788dadcd
Merge remote-tracking branch 'upstream/DRUnstable' into OWMain
2022-03-26 07:00:13 -05:00
codemann8
cb48137fa7
Fixed issue with mirror portal deleting after mirror bonk in Crossed OW
2022-02-22 19:55:02 -06:00
aerinon
fe66c67d07
Fixing up the hud to indicate Pendant/Crystal etc
2022-02-15 12:12:42 -07:00
7da5e6257a
Merge branch 'OWMain' of github.com:codemann8/z3randomizer into overworld_kara
2022-02-11 13:36:00 -08:00
aerinon
57dec5651f
Merge branch 'DRMain' into DRUnstable
2022-02-09 14:34:58 -07:00
aerinon
93fe72466d
Merge branch 'master' into DRMain
...
# Conflicts:
# LTTP_RND_GeneralBugfixes.asm
# hooks.asm
# music.asm
2022-02-09 09:59:56 -07:00
codemann8
ba8a9aeb90
Merged in Upstream ER changes
2022-02-04 06:04:26 -06:00
cassidoxa
dfc4284a70
Merge branch 'master' into sram_rework
2022-02-03 21:20:16 -05:00
cassidoxa
3e2362b7ca
Implement initial SRAM table
...
Data in initialsramtable.asm gets copied to SRAM on save file init
Frontend will be responsible for setting this, requires frontend changes
Changed some label names to disambiguate WRAM and SRAM labels
Deleted open mode
2022-02-03 20:25:32 -05:00
cassidoxa
c048589c02
Add static file name feature by special request
...
Move compass count ram init to compasses.asm
Rename WRAMEquipment and SRAMEquipment to EquipmentWRAM/SRAM
2022-02-02 16:51:50 -05:00
spannerisms
7ca4fd6467
Merge branch 'master' of https://github.com/spannerisms/z3randomizer
2022-01-26 06:41:56 -05:00
spannerisms
32d619c9e7
BSOD
2022-01-26 06:41:34 -05:00
8dfdd3ee87
Merge branch 'main' into overworld_kara
2022-01-24 14:07:50 -08:00
Lexi Rose
c515beb853
Merge pull request #155 from tewtal/new-text-renderer
...
Improved dialog text rendering
2022-01-20 16:00:20 -06:00
