Commit Graph

210 Commits

Author SHA1 Message Date
aerinon
fea605ae66 Fixing conflicts 2020-01-02 11:52:24 -07:00
compiling
6b97cebec5 Work around for json patch - split out bow limit into a separate patch so that it can be overridden properly. 2020-01-02 16:33:00 +11:00
aerinon
ea53f97289 Removed the sewer dungeon for now to enable Escape Big Key to work. 2019-12-19 16:18:59 -07:00
aerinon
1467b76d84 Fixed ice palace Hammer Block stairs
Initial work on new key logic - only for vanilla for now
2019-11-22 12:04:36 -07:00
aerinon
5e9134a74e GT Lobby Up Stairs fixed
Minor typo in help
2019-11-20 13:47:44 -07:00
aerinon
6a276ca0b8 MSU Scrolling bug
Crystaroller Stairs fixed
More Full ER support
Added DungeonGen check for hangers without enough hooks
DungeonGen doesn't consider BK door problems unless starting from origin
--This could cause some longer gen times - as the origin is hooked up last
Skull 3 Exit - attempt to fix
2019-11-19 16:00:55 -07:00
aerinon
093746a0c7 Ganon's Tower added
Some key logic work
2019-11-15 13:50:31 -07:00
aerinon
d365ae5c36 Fixing a couple minor bugs 2019-11-09 19:10:13 -07:00
aerinon
e7ddae0dfa Fix a TT open edge (getting caught by door code)
Try to fix Skull exit again
Fix Hera stair key
Some vanilla fixes
2019-11-08 16:51:51 -07:00
aerinon
5718018982 Added Turtle Rock.
Fixed clock -> process_time for Python 3.8
Fixed interior blocked doors
Vanilla logical connections for Ice Cross (Push block)
Dungeon entrance enhancement for TR, Skull, HC (Standard)
Kill on invalid dungeons during key door shuffle
Key logic improvements (Smallkey restrictions, Logic Min/Logic Max for key doors, Big Chest doesn't count for small keys if BK not found yet)
Key door candidate now accounts for "overworld" dungeon traversal
Path checking added some Crystal Logic (Blind's Cell to Boss mostly)
Kill on dungeon gen if taking too long
2019-11-07 12:16:13 -07:00
aerinon
f8abf1fe81 Implemented mire 2019-11-05 11:39:13 -07:00
aerinon
8b7bbc25ff Bug fixes for that one dumb pod spiral staircase 2019-11-04 12:49:25 -07:00
aerinon
e08bf3776a Ice Palace added
Dynamic logical doors added for ice cross w/ push block
Improved crystal switch pathing
Minor update to PoD
2019-11-01 16:13:23 -06:00
aerinon
050ae66bf6 Thieves Town 2019-10-25 13:50:37 -06:00
aerinon
7db3c82e70 More swamp fixes
Removed Left Drain to Right (switch resets)
2019-10-16 06:57:57 -06:00
aerinon
a0fdb25b43 Spirals for Swamp
Swamp Logic
Door definition cleanup
Stabs at Swamp events and Crystal Switches
2019-10-11 16:53:46 -06:00
aerinon
19a78f2a0c Fixed a few spiral bugs
Fixed a problem with door pairing system
2019-10-05 23:15:06 -06:00
aerinon
5cc4fdfa1f Added PoD
Added Logic for Desert,Hera,Aga,PoD
Revamped Logic for HC, Eastern
2019-10-03 09:24:27 -06:00
aerinon
fd11e8cde1 Merge branch 'Dev' into DoorDev 2019-10-01 14:35:30 -06:00
aerinon
8719a4919d Door pairing system initial pass complete
Sucessfully de-coupling of Big Key doors with dumb small key doors behind
Added a bit to trap door fixer so that we can hit the 3rd door in the door list
Added door list position info
2019-10-01 11:26:10 -06:00
aerinon
f12659af9d Fixes to Aga Tower staircases
Lots of initial work on key doors and other door pairs
2019-09-27 22:00:45 -06:00
aerinon
8e50c6d8eb Several fixes for problems with staircases in Hera/AgaTower 2019-09-21 22:15:51 -06:00
cassidoxa
f8628337bb One more vanilla/dungeons ROM fix 2019-09-21 22:15:12 -04:00
cassidoxa
2859acef7d Swordless rom writes and inverted fixes
* Update Swordless rom writes

* Remove swordless as possible mode in ItemList.py

* Fix inverted HC Ledge access
Added collection state helper methods for determining lw/dw access
Restricted locations where Link's House can be in inverted
Dark Sanc and Link's House can no longer be at the back of Skull Woods
Fixed minor error in inverted bunny rules

* Update Link's House Shuffling in inverted insanity

* More isolated entrances not to put Link's House at

* Fix Link's House in dungeons shuffles

* More dungeons shuffle stuff I forgot
2019-09-21 21:59:16 -04:00
aerinon
5eb0e6e379 Aga Tower preliminary check in 2019-09-20 21:24:46 -06:00
aerinon
1aa2d904d3 Spirals Can "connect" to the same direction now. Screws with maps.
Some initial work on key doors. Namely altering the reverse side of Big Key doors that were unreachable in vanilla.
2019-09-19 14:58:50 -06:00
randall.rupper
2f659da39f Update to latest baserom (has some MSU-1 stuff)
Minor fix to Armory S door - can't seem to get it right
Minor fix to spirals that cross the horiz quadrant boundary while traversing
2019-09-18 13:01:35 -06:00
randall.rupper
ec5e8614bc Started addressing trap doors to help indicate when they should be open
Sped up the gfx fixer stuff by moving the dungeon load room to execute only once
Minor optimization to spiral
Moved normal doors to separate file
2019-09-11 12:17:20 -06:00
aerinon
ed6ad04fa0 Fix to spiral stairs outside of dungeons. 2019-09-06 20:32:59 -06:00
randall.rupper
48f29b3aa5 Merge branch 'Dev' into DoorDev 2019-09-06 14:22:42 -06:00
randall.rupper
1ec963f162 Moved spiral warp point during dark transition (fixed $53 logic)
More spiral layers fixed by adding a 'from layer' bit.
Several edge cases addressed (a couple stairs crossed quadrant boundaries during transition)
2019-09-06 14:21:19 -06:00
randall.rupper
02b3ca5d52 Some spiral layers fixed
Some spiral camera bounds fixed
2019-09-06 09:13:49 -06:00
randall.rupper
eb3b1eaa44 Working on spiral problems 2019-09-05 21:09:26 -06:00
randall.rupper
ac01262a31 Refactored normal doors to use a lookup table. Now the door table is <4k
Fixed graphics between HC/Sewers and cross dungeons.
Added base work for spiral staircases in HC/Eastern. (More data needed for other dungeons.)
Added new region to deal with push blocks in Sewers Secret Room
Refactored asm to be in multiple files.
2019-09-04 16:34:59 -06:00
Kevin Cathcart
f2c62e87ef Update flavor text 2019-09-02 15:34:52 -04:00
Kevin Cathcart
7249429f69 Fix silvers hint 2019-09-02 15:33:34 -04:00
cassidoxa
0a759f18d6 Undo write causing map tile glitch in EP area (#9) 2019-08-28 21:13:35 -04:00
Kevin Cathcart
ab99e8c223 Triforce Hunt turn-in logic 2019-08-28 21:12:44 -04:00
randall.rupper
02f4ad956d Merge branch 'Dev' into DoorDev 2019-08-26 15:11:11 -06:00
randall.rupper
7f6c593df0 Bug with sanc/pull switch doors fixed.
Bug with doors with offset 2 going to doors with offset 2 was fixed in asm.
Refactor asm code to use Y as 2nd index, which cleaned up code.
Also learned the phb:phk:plb ... plb trick (cleaner than what I was doing)
2019-08-26 15:03:42 -06:00
Kevin Cathcart
895d274b02 New music muting mechanism 2019-08-25 22:36:19 -04:00
Kevin Cathcart
12d7459a60 Implement progressive bow limit 2019-08-25 22:28:12 -04:00
Kevin Cathcart
7dfff45a84 Fix typo 2019-08-25 22:22:31 -04:00
Kevin Cathcart
df6bf6f99c Fix errors 2019-08-24 15:53:21 -04:00
Kevin Cathcart
6a6058adb3 Update goal sign/ganon taunts 2019-08-24 15:36:54 -04:00
Kevin Cathcart
ec9709f009 Preopen GT for 0 crystals 2019-08-24 15:35:23 -04:00
cassidoxa
fe1505408a Fix mirror bonking in inverted
reverted a change and fixed some inverted writes I messed up initially
2019-08-24 10:14:57 -04:00
randall.rupper
c87c767835 Upgrades doors to be written out by the rom. (No testing today)
Added some various modes to play around with.
Fixed prototype's generation code to run
2019-08-23 16:52:53 -06:00
randall.rupper
2ff60fe377 Base rom edited to contain the asm hack.
Fixed the vanilla linking doors in HC Back Hallway
2019-08-23 10:16:53 -06:00
Kevin Cathcart
c0acfdd81e New silver arrow hints
Supporting progressive bows.
2019-08-21 22:40:19 -04:00