Commit Graph
75 Commits
Author SHA1 Message Date
aerinon 7db582d894 Moved SRAM to reserved locations 2022-02-09 09:02:17 -07:00
aerinon 725f6c110a Couple of fixes for Standing Items counts and generic keys in caves 2022-01-24 16:06:04 -07: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
aerinon 50dd0c7be4 Fixing bugs with pottery lottery 2022-01-13 15:03:20 -07:00
aerinon 149f19df83 Merge branch 'DRVolatile' into Potsanity 2022-01-06 16:08:02 -07:00
aerinon 8698c3e109 Merge branch 'DRMain' into DRVolatile 2022-01-06 16:04:08 -07:00
aerinon 7bf2a259a4 Merge remote-tracking branch 'origin/DRMain' into DRMain 2022-01-05 14:32:48 -07:00
aerinon fc5e6191eb Merge remote-tracking branch 'origin/DRMain' into DRMain 2022-01-05 14:29:03 -07:00
aerinon c88a301708 Merge branch 'master' into DRMain
# Conflicts:
#	tables.asm
2022-01-05 14:26:48 -07:00
aerinon e5d3ebf3cd Minor potsanity refinements 2022-01-04 15:49:00 -07:00
aerinon 7cf57a7a37 Merge branch 'DRVolatile' into Potsanity 2021-12-16 16:03:23 -07:00
aerinon 6821648443 potsanity advancement 2021-12-16 16:03:10 -07:00
aerinon f19b65b86c Merge branch 'DRMain' into DRVolatile 2021-11-02 15:29:20 -06:00
aerinon 6757e35dca Straight Stair fixes 2021-11-02 15:24:21 -06:00
aerinon 85d799ba67 Merge branch 'DRMain' into DRVolatile 2021-10-21 16:35:09 -06:00
aerinon 620c672fe1 Turn off Terrorpin AI fix by default - can be a post-gen option 2021-10-21 16:18:51 -06:00
aerinon f95bce282b Removed some comment cruft 2021-10-21 16:15:34 -06:00
aerinon 9bf662642b Merge branch 'DRMain' into OverworldMapRefactor 2021-10-21 14:53:55 -06:00
aerinon 27654b9ac9 Merge remote-tracking branch 'baserom/master' into DRMain
# Conflicts:
#	hooks.asm
#	newhud.asm
#	utilities.asm
2021-10-21 14:15:54 -06:00
aerinon aee5fe506a Standing items start 2021-10-21 14:11:57 -06:00
aerinon c503e3eb61 Overworld Map Refactor 2021-10-21 14:05:59 -06:00
aerinon 319aba5e4d EG disarmament on mirror 2021-10-05 14:15:38 -06:00
aerinon cc502c7524 Removed stonewall pre-opens 2021-09-16 16:01:51 -06:00
aerinon f9e3bec5cb Removed rails using a dynamic flag 2021-09-07 16:24:18 -06:00
aerinon 07a3a9ad03 Catobat map fix
Cutoff table updated
Mutliworld mem location added for item ids
2021-08-31 15:35:19 -06:00
aerinon 15337a1382 Collection Rate moved to arbline marco 2021-07-23 09:14:43 -07:00
aerinon 9861c76d23 Minor refactor to keep dr hooks in DR 2021-07-23 09:13:35 -07:00
aerinon bfbe3fbcc0 Addition to Cutoff room table 2021-07-15 10:33:47 -07:00
aerinon 641ec0ffa0 Minor fix to credits
Default to AgaDoor to Std/Open state
2021-07-13 10:51:01 -07:00
aerinon aee82fa319 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	events.asm
#	hooks.asm
#	stats.asm
#	stats/creditsnew.asm
#	stats/statConfig.asm
#	swordswap.asm
#	utilities.asm
2021-07-07 11:15:11 -07:00
aerinon e9aec2ba86 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
2021-06-22 13:12:07 -06:00
aerinon 717434bd88 Bank notes added 2021-06-22 13:05:40 -06:00
aerinon 050ce5e20e Changes from DR 0.4.0.6 2021-06-04 17:02:23 -06:00
aerinon c7a4d817c0 Changes from DR 2021-05-24 15:12:09 -06:00
aerinon 5672e2f090 Merge branch 'master' into DRMain 2021-05-24 14:52:26 -06:00
aerinon ce58e22496 Fix a minor typo that makes Ganon invincible 2021-05-14 16:50:35 -06:00
aerinon e9a376d92a Bugfixes 2021-05-14 16:49:49 -06:00
aerinon 842bb043e6 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	catfish.asm
#	compasses.asm
#	darkworldspawn.asm
#	hooks.asm
#	inventory.asm
#	newitems.asm
#	shopkeeper.asm
#	stats.asm
#	tables.asm

Adn some updates from DR
2021-05-13 12:11:40 -06:00
aerinon d015310e4d Blind boss checks for maiden sequence 2021-02-27 15:30:28 -07:00
aerinon f6cc3607df Refactored Potion shop hooks to allow old behaviors 2021-02-22 14:48:10 -07:00
aerinon 8b622dd841 Multiclient flags
Multi Sprite Player set to skip progressive limits
2021-02-18 13:37:33 -07:00
aerinon ddf56a9ed1 Merge branch 'DRMain2' into DRMain 2021-02-18 13:13:44 -07:00
aerinon 5f1ea34646 Final fix for counting hera key 2021-02-17 11:52:10 -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