Commit Graph
33 Commits
Author SHA1 Message Date
aerinon ddf56a9ed1 Merge branch 'DRMain2' into DRMain 2021-02-18 13:13:44 -07:00
aerinon 4ae59ad1e6 Double count hera basement cage in keydropshuffle 2021-02-17 11:50:51 -07:00
aerinon 9d607b7caa Inverted fix - no longer a bunny in DW sanc
Standard fix - can't kill Aga1 before rescuing Zelda
Total locations to check set on file load, and displayed in HUD
2021-02-16 13:36:44 -07:00
aerinon d15dc91db4 Fix for BallnChain guard when keydropshuffle is off 2021-02-13 20:48:51 -07:00
aerinon 9b33530dba Merge branch 'DRStairFix' into DRMain2 2021-02-13 20:45:24 -07:00
aerinon c9d42587a4 Merge branch '16_bit_collection_rate' of https://github.com/CaitSith2/z3randomizer into InvCountMerge 2021-02-13 20:44:25 -07:00
aerinon 7fee6ce440 Merge branch '16_bit_collection_rate' of https://github.com/CaitSith2/z3randomizer into InventoryCountMerge 2021-02-12 20:45:59 -07:00
aerinon 2f5b555e0e Merge branch 'DRMain' into ShopBranch 2021-02-02 14:42:03 -07:00
aerinon 96d7a6a9ae Merge branch 'InventoryCount' into DRMain 2021-02-02 10:12:44 -07:00
aerinon a63aa6f5fe Shop fixes 2021-02-01 16:29:09 -07:00
aerinon 2a08959229 Shop counting items 2021-02-01 10:11:38 -07:00
aerinon b1d4ef3252 Merge branch 'InventoryCount' into ShopBranch 2021-01-29 15:13:14 -07:00
aerinon 05e7f8eb96 Ported over pepper's shop code 2021-01-29 13:55:13 -07:00
aerinon a9bddea1b4 Change how hera basement key is counted to not count Byrna 2020-12-09 14:28:12 -07:00
aerinon b3fcd2192e Some DR changes (outdoor check for hub and keydrop correct KeyTable address)
Shop VRAM issue investigated but not solved
2020-12-08 10:57:37 -07:00
aerinon 443070fe2c Merge branch 'ChestKeyCounter' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	build.sh
#	darkworldspawn.asm
#	events.asm
#	itemdowngrade.asm
#	shopkeeper.asm
#	stats.asm
2020-11-30 09:34:18 -07:00
aerinon be3960bedb Hera basement key fix
Combine HC/Sewer chest key count into one variable
2020-11-30 09:27:47 -07:00
aerinon 264e9f337d Keysanity menu bug fix 2020-11-20 13:57:49 -07:00
aerinon 6c7f5e46a3 Support for GT Big Key Credit
Support for Rain state prevention without rails
2020-11-19 16:27:47 -07:00
aerinon 94561e01c2 Bugfixes for lobby stuff 2020-11-12 12:18:23 -07:00
aerinon 8d9775c3de Change Compass addresses 2020-11-09 16:07:34 -07:00
aerinon 4c4fa74f1a Invisible Bunny fix
Double count Hera Basement Cage fix
2020-11-09 13:59:00 -07:00
aerinon 5310569aa3 Minor fixes 2020-11-03 10:15:41 -07:00
aerinon 5c2df8b6a6 Scroll fix 2020-11-03 10:12:48 -07:00
aerinon b5bcc13806 Merge remote-tracking branch 'origin/DRMain' into DRMain 2020-11-03 10:12:21 -07:00
aerinon 717913b8fb Compass Refactor 2020-11-03 10:12:08 -07:00
aerinon 0dba58c194 Support for Mirror Scroll
DR Hud Additions
2020-10-30 16:26:28 -06:00
aerinon 49dc0f4037 DR Code Init Commit
Rails for Mixed Travel
2020-10-29 15:58:05 -06:00
randall.rupper 233afa1e38 Chest Key counters 2020-09-18 11:06:02 -06:00
aerinon 397da02e3f Converted file to tabs for consistency 2020-08-28 12:23:27 -06:00
aerinon d58fa5d5b7 Starting keys accounted for 2020-08-28 12:15:31 -06:00
randall.rupper 8cf3ccb13e Add PHX/PLX in a better spot to prevent CountBottles from overwritting X 2020-06-08 09:58:46 -07:00
randall.rupper 50ff7683ab Add PHX/PLX in a better spot to prevent CountBottles from overwritting X 2020-06-08 09:54:09 -06:00