Commit Graph
100 Commits
Author SHA1 Message Date
aerinon 3b4e19b5de Fixes for compatibility with compiling perf
Couple fixes for standard+ER
2020-05-29 16:19:32 -06:00
aerinon d9d497ba62 Merge branch 'DoorPerf' of https://github.com/compiling/ALttPEntranceRandomizer into compiling-DoorPerf 2020-05-26 14:35:12 -06:00
aerinon 2b441134fe Fixed a problem with edges when those are turned off (experimental not on)
Fixed a problem with standard requiring you to go through the tapestry backwards to save Zelda
Added debugging features to help figure out some bugs
2020-05-26 14:34:24 -06:00
aerinon 2d8d4ebf4a Added the stz $047a for pod eg glitch
Standard generation improvements (Bomb escape rework)
Vanilla+ER generation improvements
2020-05-22 13:45:00 -06:00
aerinon ae7ce076af Open edges math fix (indices corrected in tables)
Spoiler lists bosses
Enemizer settings fix
Swamp flooded ladder's fix (Crossed mostly)
Spoiler encoding issue fixed
2020-05-20 10:51:56 -06:00
aerinon 337dbf311d Some generation improvements (bk checked better, backtrack added re-attempts)
No logic skips more key logic
Some prototyping new key rules
2020-05-12 15:03:39 -06:00
aerinon 300db22725 Some ER generation improvements
Attempt at Attic Hint Tile
Stonewall detection improved by not excluding drops
2020-05-05 13:24:51 -06:00
aerinon aeb3b3d4b1 Forgot straight stairs in vanilla 2020-05-02 15:15:21 -06:00
aerinon 0705ccaeda Edge rom changes and minor mystery defensive coding 2020-05-02 15:09:23 -06:00
aerinon 79c4889e07 Merge remote-tracking branch 'origin/EdgeWork' into EdgeWork
# Conflicts:
#	asm/edges.asm
2020-04-29 21:20:47 -06:00
aerinon 467507b505 Straight Stairs trap doors
Straight Stairs adjustment for different door types
2020-04-28 17:05:58 -06:00
aerinon 45016ed5ce Merge Unstable into EdgeWork 2020-04-24 14:02:47 -06:00
aerinon 810942cf69 DungeonGen bug
Animated tiles fix
2020-04-23 16:18:56 -06:00
aerinon 946c7bbcef Merge in DoorDev changes
Revert ci changes
2020-04-21 16:06:49 -06:00
aerinon 53ddd1963c Split dungeon combinations - runs through combinations if few enough
Odd builders - new algorithm for testing entire set then making a decision
Force groupings updated to be smarter about it - needs to apply elsewhere
2020-04-21 16:03:07 -06:00
aerinon 0bb7e7caf8 update ci to build dev releases for now 2020-04-17 14:13:27 -06:00
aerinon 88b93d2649 Bump version 2020-04-17 14:08:52 -06:00
aerinon 1f2edde2e5 Add minor notes 2020-04-17 14:07:39 -06:00
aerinon bc06b86311 Multiworld torch key fix 2020-04-16 15:52:19 -06:00
aerinon 57cd5575da Merge branch 'patch-1' of https://github.com/zig-for/ALttPEntranceRandomizer into zig-for-patch-2 2020-04-16 14:31:55 -06:00
aerinon aed4251f13 Merge branch 'DoorDevUnstable' into CrossGenWork 2020-04-13 14:54:59 -06:00
aerinon d02cc2bb15 Fix compassshuffle/mapshuffle menu flags 2020-04-13 14:49:04 -06:00
aerinon e1cd520ea9 Merge unstable into CrossGen 2020-04-10 15:17:31 -06:00
aerinon 09bd392fd0 Bugfix to map info
Bugfix to dungeon reminder on death
2020-04-10 11:19:05 -06:00
aerinon acd430378d Minor fix to vanilla doors 2020-04-09 17:32:06 -06:00
aerinon ff3577358d Version bump
Release notes updated
2020-04-09 17:14:42 -06:00
aerinon 8e7ed89723 Formatting
Json spoiler tied to jsonout arg
Fixed Default Link sprite button again
Removed odd return from local_path (need to test this with bundle)
2020-04-09 17:02:40 -06:00
aerinon b86ffc3378 Merge branch 'miketrethewey-dev' into DoorDevUnstable 2020-04-09 15:55:42 -06:00
aerinon 23e6c5b14d Merge branch 'dev' of https://github.com/miketrethewey/ALttPDoorRandomizer into miketrethewey-dev 2020-04-09 15:55:27 -06:00
aerinon 954a5fa09f Merge branch 'CaitSith2-patch-1' into DoorDevUnstable 2020-04-09 15:54:34 -06:00
aerinon e7c2e63166 Formatting 2020-04-09 15:53:58 -06:00
aerinon f6f7d8add3 Merge branch 'patch-1' of https://github.com/CaitSith2/ALttPEntranceRandomizer into CaitSith2-patch-1 2020-04-09 15:51:17 -06:00
aerinon 7f935d6ff9 Fix fire speed for ice palace rooms 2020-04-08 17:04:33 -06:00
aerinon 4fe97f9b7f Adjusted map info to be experimental
Moved mirror scroll to be standard in non-vanilla door shuffles
Fixed potential duplicate map issues
2020-04-08 15:56:03 -06:00
aerinon 114ed784f1 Torch keys counted like chest
Moved the total key counter to a count down on the left.
Added the BK indicator
Attempt to fix dungeon counters and fish error in Mystery.py
Removed double rom patch
AT map added.
5 chests min for all dungeons
2020-04-07 16:50:02 -06:00
aerinon bb402ff7f2 Dungeon reminder added to hud for Crossed dungeons
Blinking red square added to hud and it indicates a boss room is close by. Only appears if you have the compass. (Basic & Crossed)
Key counters added to hud if you have found the map. (Crossed only)
2020-04-03 15:45:55 -06:00
aerinon e30f66742b MirrorScroll block erase removed
Standard+Crossed ammo issue addressed
Fix for vitreous' eye dropping keys
Fix for vanilla linking doors (hc back hallway)
2020-04-02 13:15:08 -06:00
aerinon 01bff51707 Fixed some minor issues
Started work on Straight Stairs
2020-04-01 12:48:04 -06:00
aerinon c968621ba3 Tons of edge work:
--Refactor of scrolling
--Addition of edge math
--Tied linking doors to DR Flag
--Fixed vanilla linking doors
2020-03-31 11:00:49 -06:00
aerinon e5a1c59f85 Fix for capacity shop and hobo splash interaction 2020-03-25 15:52:57 -06:00
aerinon 8ceb1f4585 CI change 2020-03-24 10:50:25 -06:00
aerinon 8f545fc6d1 Merge branch 'DoorDev' into EdgeWork 2020-03-24 10:49:28 -06:00
aerinon 0b13db754d Fixing some seed reporting 2020-03-23 15:40:56 -06:00
aerinon 4fc15e84fc Bump version
Set shuffleganon to default to True
2020-03-23 14:15:17 -06:00
aerinon ceea586389 Merge remote-tracking branch 'origin/EdgeWork' into EdgeWork 2020-03-20 21:08:47 -06:00
aerinon 53a5376693 Merge branch 'DoorDev' into EdgeWork 2020-03-20 13:32:00 -06:00
aerinon 9a65e45813 Refinement on BK restriction logic 2020-03-20 13:08:38 -06:00
aerinon de2a3bf5c1 Version change and note for later 2020-03-20 12:24:36 -06:00
aerinon a18f5c4d51 Key logic rework for placement rules
--exhaustive per key_counter
--contradictions between rules
Mire Lobby chest fix
2020-03-20 09:05:07 -06:00
aerinon 269de35590 Minor bugfix with Ice Tall Hint 2020-03-12 09:13:09 -06:00
aerinon 999fafbbeb Missed adding enum in merge 2020-03-11 16:28:21 -06:00
aerinon 9d75561dc3 Merge branch 'DoorDev' into EdgeWork 2020-03-11 15:09:51 -06:00
aerinon 2d9d108430 Merge in DoorDev 2020-03-11 14:33:53 -06:00
aerinon 3fdf9e8624 Unvalidated gen work 2020-03-11 14:21:14 -06:00
aerinon f87a2e8a85 Clean up some asm that's not ready 2020-03-11 14:19:22 -06:00
aerinon ceeb23669a Experimental flag issue
Turned off unprepared experimental feature that snuck in
2020-03-11 14:02:16 -06:00
aerinon c67cd478a1 Fixed problem with Inverted+ER
Fixed problem with Vanilla doors+Retro
Fixed Keylock issue with Ice Cross
Merged in compiling's fix for keyshuffle
ER Infinite Loop detection
2020-03-11 12:25:49 -06:00
aerinon 90e6e8762e Merge branch 'compiling-DoorDev' into DoorDev 2020-03-11 10:48:42 -06:00
aerinon 9935563802 Left transition fix 2020-03-07 22:37:39 -07:00
aerinon d3696a2752 Prototype edge debugging 2020-03-07 22:15:27 -07:00
aerinon 2b8044d89d Fixed problem with keyshuffle option without bigkeyshuffle - attmept 2 2020-03-07 09:29:32 -07:00
aerinon b0eb7fb85d Fixed problem with keyshuffle option without bigkeyshuffle 2020-03-07 09:19:38 -07:00
aerinon 7072684505 Merge remote-tracking branch 'origin/DoorDev' into DoorDev 2020-03-07 09:10:02 -07:00
aerinon c1783082d8 Lots of cross gen work 2020-03-05 16:47:57 -07:00
aerinon 39ea777cf9 Gui fixes for clocks/dungeon_counters
Map fix for settings
2020-03-04 13:57:29 -07:00
aerinon 84d639ab60 Merge DoorDev fixes 2020-03-03 12:49:59 -07:00
aerinon 5e2a5f2e8e Bugfix for a key lock 2020-03-03 12:39:52 -07:00
aerinon 549607c72a Bugfix for rupee20
Bugfix for Triforce hunt
Bugfix for python issue
Mystery experimental option
Mystery open pyramid refined
Mirror Scroll turned off if door shuffle is vanilla (even if experimental)
2020-03-03 09:37:09 -07:00
aerinon 5aef551f7c More & better forced connection detection 2020-03-03 08:25:52 -07:00
aerinon 62caf015c0 Merge remote-tracking branch 'origin/DoorDev' into DoorDev 2020-03-02 19:58:42 -07:00
aerinon 83a9c4bdcf Merge in latest door dev changes 2020-03-02 15:41:44 -07:00
aerinon 34774eb2d5 Merge remote-tracking branch 'origin/DoorDev' into DoorDev 2020-03-02 15:25:46 -07:00
aerinon c9656d1ac9 Made count default "none" 2020-03-02 15:25:26 -07:00
aerinon 7ecb416c07 Increment version 2020-03-02 15:13:04 -07:00
aerinon 8bdbf5d6b2 Saves sprite settings
Save on exit feature
Some formatting changes
2020-03-02 15:04:46 -07:00
aerinon a20f5423fd Minor gui fixes 2020-02-28 16:35:45 -07:00
aerinon 6daa436f08 Generation Fix
* Added step to adjust parity before complete neutralization
2020-02-28 15:00:02 -07:00
aerinon bdf59e293b Merge pull request #41 from compiling/DoorDev
Bug fixes
2020-02-28 12:58:07 -07:00
aerinon 06562ed3ea Generation Fixes
*  Entrance dead end and branch calculation fixed
*  Parity checks added to global
*  Forced dead end checks in split dungeons
2020-02-27 15:53:19 -07:00
aerinon 1dbd7e95e2 -Multiworld key rule fix
-Minor generation fix
2020-02-25 15:16:18 -07:00
aerinon 72a94e1e4f Vanilla fixes for 100% locations 2020-02-24 08:53:03 -07:00
aerinon 268975263e Rom generation fixes 2020-02-24 06:54:52 -07:00
aerinon c2e22a6223 Merge branch 'DoorDev' into EdgeWork 2020-02-21 16:26:50 -07:00
aerinon 7064b1de77 Logic additions for basic+experimental 2020-02-21 16:26:18 -07:00
aerinon e6b37af515 Version bump 2020-02-20 16:46:39 -07:00
aerinon e416e46130 Placement rules implemented for checking key placement 2020-02-20 16:45:51 -07:00
aerinon c23e37e60e Merge branch 'keylock-validation' of https://github.com/compiling/ALttPEntranceRandomizer into keylock-validation 2020-02-19 13:27:20 -07:00
aerinon dfd0bc41ce -Key shuffler fix (needs some more testing)
-Mirror Scroll should now choose correct spawn point
-Desert Wall Slide fixed for Skull/Desert builders
2020-02-19 13:24:12 -07:00
aerinon 6f3040415d Tested a lot of north edges 2020-02-19 12:50:37 -07:00
aerinon 2116bb6d0d Merge branch 'chest-counters' of https://github.com/compiling/ALttPEntranceRandomizer into DoorDev 2020-02-18 13:35:02 -07:00
aerinon 6e11a4bbac Fixes for mirror scroll
Fix for Stonewall + Ice Cross
Fix for Ice Cross key doors
Changed how key doors are chosen in a slightly better manner (pairs them earlier)
2020-02-18 13:15:41 -07:00
aerinon 62efaebb4d Merge branch 'DoorDev' into gui-improvements
# Conflicts:
#	Gui.py
2020-02-14 21:24:05 -07:00
aerinon b76a5f954d first edge function 2020-02-14 16:35:17 -07:00
aerinon 8d97eede65 -Sprite selection fix
-Scrollbar added
-Experimental checkbox added
-Settings file created
-Random sprite work for settings file
2020-02-13 13:53:04 -07:00
aerinon cad62c59ab Some Initial Tables for Edge transitions 2020-02-13 08:35:25 -07:00
aerinon 6bd05982ae Bunny impassible rules for doorways 2020-02-12 14:19:29 -07:00
aerinon d0369fe1c6 Add experimental checkbox to gui 2020-02-12 10:29:52 -07:00
aerinon 1ea5c1f4b2 Fix for Full ER Shuffle so that Hyrule Castle cannot be crossworld when doors are shuffled. 2020-02-12 09:25:06 -07:00
aerinon 2309eccad5 Merge branch 'doors-shops' of https://github.com/cassidoxa/ALttPEntranceRandomizer into ShopCode 2020-02-11 14:57:03 -07:00
aerinon 1f7c27009e Whole ton of things:
-Experimental Flag
--Mirror Scroll
--Mortal GT Minibosses
--Random door kinds
-Crossed Mode
--Standard logic
--Nothing Items
--GT Trash fill skip
--Too many keys in retro
--Hint work
--Spoiler clarification
--Aga 1 logic
-Misc
--Retro nothing item
--Bombable/Dashable matching
--ER+Inverted Logic fix
--Logic for GT Gauntlet/Wizzrobes
--Logic for PoD Sexy Statue switch
2020-02-11 14:40:58 -07:00