Commit Graph

274 Commits

Author SHA1 Message Date
e11ac2c130 Initial trolls:
- random dash timer
- random bomb timer
- flute sometimes summons chickens
- ice physics while carrying things
- lowered i-frames with increased hearts/armor
- Blind impervious (TODO: allow hitting with bunny pots)
2023-03-15 22:06:02 -05:00
015f769521 Move kara-branch code to bank A2 so there's space 2023-02-26 14:31:51 -06:00
ec6231955d Merge remote-tracking branch 'codemann/OWMain' into overworld_kara 2023-01-30 19:47:34 -06:00
codemann8
468fe5f2af Improved door landing 2023-01-30 10:34:48 -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
6f138825d9 Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
WIP, Broken, Do Not Use
2022-09-18 17:36:49 -07:00
codemann8
ee7e08f46c Merge branch 'DRUnstable' into OWMain 2022-08-25 16:14:08 -05:00
aerinon
0941cd321e Merge branch 'DRUnstable' into Synthesis 2022-08-24 14:24:37 -06:00
aerinon
2457c67d0e Bank map update 2022-08-24 13:13:24 -06:00
codemann8
8ccf8ecd66 Adding alternate tree colors for Bonk Drops 2022-07-24 11:30:46 -05:00
codemann8
ed72830397 Implemented Bonk Drop Shuffle 2022-07-24 11:29:28 -05:00
codemann8
c64d0266d5 Move owrando hook out of DR and into main rando 2022-07-18 07:10:49 -05:00
codemann8
7c7664224e Merged DR v1.0.1.0 2022-07-08 05:32:08 -05: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
codemann8
74f66abf51 Replacing hardcoded jumps and references to labels 2022-05-21 20:44:38 -05:00
aerinon
003278f7e0 Fix dungeon completion bitfield 2022-05-18 14:52:47 -06:00
codemann8
31e98903bc Unscramble lowercase letters for new font 2022-05-05 18:26:11 -05:00
codemann8
34f4b72524 Adding labels and rearrange some of the Special Transition code 2022-05-04 16:31:32 -05:00
aerinon
0960dcaac9 Merge branch 'master' into DRVolatile 2022-04-27 13:50:42 -06:00
aerinon
eb0bc2b7f6 Moved doorrando code. Fixed a multiclient issue with pot switches. 2022-04-27 13:47:12 -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
cassidoxa
9c41ffb55b Merge branch 'sram_rework' into dr_sram 2022-04-20 00:30:35 -04:00
aerinon
f6015a8569 New colorized pot and bitfields 2022-04-19 14:04:12 -06:00
638967ee9c unscramble lowercase letters for new font 2022-04-17 00:42:10 -07: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
6400a563ea unscramble lowercase letters for new font 2022-04-02 10:07:39 -07:00
codemann8
da788dadcd Merge remote-tracking branch 'upstream/DRUnstable' into OWMain 2022-03-26 07:00:13 -05: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
e8b85e4815 Lowercase item text 2022-02-09 10:06:16 -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
ece66e38df Added lowercase version of dungeon item text 2022-02-06 01:00:16 -06:00
codemann8
ba8a9aeb90 Merged in Upstream ER changes 2022-02-04 06:04:26 -06:00
cassidoxa
959aa40f58 Increment ROM version 2022-02-03 22:48:20 -05:00
cassidoxa
3c6c45ddb4 Fix some mangled labels 2022-02-03 22:01:34 -05: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
aerinon
3c9b04f30a Fixed up the anti-soft lock in swamp
Combined flags and fixed a couple of bugs
2022-01-21 16:07:03 -07: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
Thomas Backmark
b46269b662 Moved the new text renderer behind a feature flag 2022-01-20 22:24:52 +01:00
cassidoxa
b91ac58b47 Merge branch 'master' into sram 2022-01-20 11:16:31 -05:00