Commit Graph

364 Commits

Author SHA1 Message Date
Kevin Cathcart
83c182fbcb Update base rom 2018-02-24 14:17:10 -05:00
AmazingAmpharos
14c0b39af3 Sanctuary at pyramid drop in crossed
This should enable Sanctuary and the back of escape to enter Ganon's slot in the crossed shuffle only. I also removed a small bit of code that no longer did anything (the code that serviced Agahnim's Tower always being in LW back when that was necessary) and cleaned up a lot of the comments in this file to more accurately reflect the modern environment.
2018-02-20 14:57:03 -06:00
AmazingAmpharos
deccff249b New restricted shuffle
This implements the new restricted shuffle that does not respect the difference between single and multi-entrance caves. Restricted_legacy is present for the old restricted behavior. Full_cross_worlds is renamed to Crossed, and all listing of shuffles is given a consistent order that pushes all the _legacy variants to the back.
2018-02-20 14:34:39 -06:00
AmazingAmpharos
5f07fdceef Misc fixes
Misc fixes
2018-02-20 12:31:39 -06:00
Kevin Cathcart
cc270ca44d Misc fixes
Fix offsets for madness+ modes.

Bunny cannot reach back skull woods second section hole.
2018-02-20 01:15:45 -05:00
AmazingAmpharos
7535ee7b62 fix broken insanity mode
Fix broken insanity mode
2018-02-19 21:18:19 -06:00
Kevin Cathcart
141b4199e9 Fix broken insanity mode 2018-02-19 22:15:21 -05:00
AmazingAmpharos
9c9636316e Regionalize King's Grave
This is necessary to account for exiting here without otherwise having access to the area behind the rocks. Will mostly come up in insanity but has some extreme niches where it could matter in full.
2018-02-19 20:30:56 -06:00
AmazingAmpharos
e1a3db1ede New insanity mode and bug fixes
New insanity mode and bug fixes
2018-02-19 19:45:36 -06:00
Kevin Cathcart
d48f7803ee Include new insanity mode in Gui 2018-02-18 15:01:21 -05:00
Kevin Cathcart
ac1c875341 Fix bug in big bomb logic 2018-02-18 14:53:39 -05:00
Kevin Cathcart
e490a3e224 Add new insanity mode 2018-02-18 14:52:34 -05:00
Kevin Cathcart
4a2078db26 Fix logic for standard mode 2018-02-18 12:22:50 -05:00
Kevin Cathcart
60c4ebf4d5 Fix GT exit offset code 2018-02-17 18:15:51 -05:00
AmazingAmpharos
5e743e1c33 Powder patch fixes
Last quick and dirty fix push was a little too quick and dirty. My bad.
2018-02-11 22:35:02 -06:00
AmazingAmpharos
abedfd4d1e Quick Mushroom turn-in fix
This is a quick and dirty (will be replaced later) fix for having to screen transition after turning in the Mushroom, not applied in shuffles that don't move the potion shop. Also a minor fix is in place so the list of entrances that don't invoke the Skull Final etc. exit offset is expanded to include the bottom of Superbunny Cave and TR Big Chest.
2018-02-11 22:25:19 -06:00
AmazingAmpharos
3471a9394a Regionalize some West Dark World stuff
The Dark World Hammer Pegs area and the Dark World shop in VoO are both regionalized to handle the possibility of connectors leading to them. Also an oversight in regionalizing Desert Palace that had broken the vanilla shuffle is corrected.
2018-02-11 22:04:58 -06:00
AmazingAmpharos
ed033a440a Bug fix for custom item pools
Triforce Pieces will now be correctly considered when deciding on how much Nothing to pad the item pool with.
2018-02-11 03:50:24 -06:00
AmazingAmpharos
9a2285f8f5 Update with latest base ROM changes and such
Update with latest base ROM changes and such
2018-02-11 03:49:39 -06:00
Kevin Cathcart
134d6d37e2 Update base rom 2018-02-11 00:14:23 -05:00
Kevin Cathcart
165feee1cd Dedupe 2018-02-10 18:12:49 -05:00
Kevin Cathcart
e090692c15 style/whitespace tweaks 2018-02-10 18:12:48 -05:00
Kevin Cathcart
aa3a828282 Update base rom 2018-02-10 18:12:48 -05:00
Kevin Cathcart
81aca40605 only adjust exit offsets for exits that need it 2018-02-10 18:12:48 -05:00
Kevin Cathcart
407687d18e Add Dam to spoiler Paths when appropriate 2018-02-09 19:20:54 -05:00
Kevin Cathcart
6b7e2d86f1 Regionized Northeast Dark World 2018-02-09 01:12:11 -05:00
AmazingAmpharos
b196ce89f1 Updated documentation
This just adds proper explanation for the new full, full_cross_worlds, full_legacy, and custom settings. Since other new shuffles are not finalized yet, I have excluded them from additional documentation for now.
2018-02-08 04:55:10 -06:00
AmazingAmpharos
428933ba81 Custom argument expansion
Just adds dead values to the world declaration for the custom related arguments so this file can still run.
2018-02-08 04:45:10 -06:00
AmazingAmpharos
bded86957d Desert bunny fix and super bomb logic updates
Desert Palace's main section is now broken into outer and inner regions separated by the pots, and the inner region is flagged as bunny impassable which should prevent the use of the central portion of Desert Main as a bunny by the logic while still permitting the outer two doors to be used as a connection.

Super Bomb logic was supposed to just be a small tweak to take care of the TODO on adding those three insanity only bomb shop locations to the logic, but then I realized that the rules for most of Death Mountain could be liberalized somewhat since that Flute to take the bomb away is also a direct access method and took care of all that. Hopefully Super Bomb logic won't need further tweaks for a good long while.
2018-02-08 04:40:16 -06:00
AmazingAmpharos
57cc94501f Mixed caves and various fixes merge
Mixed caves and other fixes merge
2018-02-08 04:34:02 -06:00
Kevin Cathcart
39f177dfa3 Fix incorrect rules for death mountain entrance cave
also some related fixes to super bomb logic
2018-02-06 23:21:04 -05:00
Kevin Cathcart
8be73a8c86 Update ROM 2018-02-06 21:31:53 -05:00
Kevin Cathcart
cd18be71d9 Add new full_cross_worlds shuffle
Untested, seed generates, but might be horrifically broken.
2018-02-06 19:18:14 -05:00
Kevin Cathcart
124e3b69de Change how option_identifier is calculated
This will provide more headroom before running out of space in the 32
bits of the title where this data goes.
2018-02-06 19:18:13 -05:00
Kevin Cathcart
f6f444a1d8 Add Hera as old man entrance to all legacy modes 2018-02-06 19:18:13 -05:00
Kevin Cathcart
f39886579a Add cross world bunny logic 2018-02-06 19:18:13 -05:00
Kevin Cathcart
a0237e0863 Update mixed cave shuffle
It now shuffles super bomb into multi-entrance caves
(The list of entrances that owuld be blacksmith safe are marked, but
they are not safe because dwarf will not enter them, we may patch this
eventually)

Also include a missing dungeon region in the hyrule castle dungeon
definition

Include Tower of Hera as a valid old man location in new Full shuffle
2018-02-06 19:18:12 -05:00
Kevin Cathcart
c6b67aa088 Update rules for bomb shop to account for mixed caves 2018-02-06 19:18:12 -05:00
Kevin Cathcart
bb6fa66dbe Refactor bomb rules 2018-02-06 19:18:12 -05:00
Kevin Cathcart
c8f1ed28ef Updates to Region tag
Modify Region taging to include a Dungeon Tag
Refactor to use helper methods to make it easier to see the types.
Add an underlying enum for storage on the region class
2018-02-06 19:18:12 -05:00
Kevin Cathcart
8672099a3c Add new Full Shuffle
Add stubs for other new modes
2018-02-06 19:18:12 -05:00
Kevin Cathcart
3becad7c10 Add exit data for single exit caves
This data was imperically determined by reading the cached memory values
that the game made when entering each cave
2018-02-06 19:18:11 -05:00
Kevin Cathcart
19f09af382 Fix accidentally swapped skull woods holes 2018-02-06 19:18:11 -05:00
Kevin Cathcart
6acad0c037 Re-implement multi-entrance cave patching
Make it function in a way that will be compatible with placing them in
single entrance doorways.
2018-02-06 19:18:11 -05:00
AmazingAmpharos
a461341c64 Initial equipment handling
Properly sets the initial equipment parameters to the defaults established in v28.
2018-01-29 19:46:16 -06:00
AmazingAmpharos
b8778385ad Spike Cave v29 adjustment
This makes spike cave correctly understand that potions in v29 will refill full magic independent of difficulty setting.
2018-01-29 18:56:15 -06:00
AmazingAmpharos
ffe8df3304 Various fixes and QoL changes
Dam softlock fix, fake world fix, TT basement keylock, adjustments for disable music, shuffle Ganon on by default, custom missing certain progression items will fail less often.
2018-01-29 15:48:56 -06:00
AmazingAmpharos
60ff21bf4f Triforce Hunt always 20/30
This adjusts the item pools to account for the fact that in v29 Triforce Hunt will be 20/30 in all difficulty settings.
2018-01-29 15:40:19 -06:00
Kevin Cathcart
570ee24fc0 Make Shuffle Ganon the Default 2018-01-27 17:11:53 -05:00
Kevin Cathcart
e19c0ada70 Retry Logic for Dungeon Prizes
Will help make avoid seed failure for custom pool seeds.

This won't help with a seed that has a layout that is not compatible
with the item pool though.
2018-01-27 16:21:32 -05:00