Commit Graph
100 Commits
Author SHA1 Message Date
aerinon f916346747 Stumpy bugfix 2023-09-08 14:55:25 -06:00
aerinon 2561737236 Merge remote-tracking branch 'baserom/master' into MergeDecompression
# Conflicts:
#	inventory.asm
#	newhud.asm
2023-09-08 13:49:16 -06:00
aerinon e772b4a931 Progressive Shields fix
Fix for collection rate overflow
Fix for progressive shield standing item (narrow version)
Fix for double key counts
Multiworld item substitution
Made map key coutner not depend on new flag for now
2023-09-08 13:42:22 -06:00
aerinon 134651e4fb Merge remote-tracking branch 'baserom/master' into MergeDecompression
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	inventory.asm
#	itemdatatables.asm
#	newitems.asm
2023-09-07 12:21:22 -06:00
aerinon 9fc85218ae Fixed ExtendedSRAM not saving
Fix enemy drops and pots with Fairies/Chickens/Big Magic
Fixed Big Magic refill when in chests/standing items
Changed shop code to respect ShopEnableCount flag
2023-09-01 14:13:01 -06:00
aerinon aecc65595e Merge remote-tracking branch 'baserom/master' into MergeDecompression
# Conflicts:
#	bookofmudora.asm
2023-09-01 11:37:46 -06:00
aerinon 5ccdebe09d Fixing crashes 2023-08-31 14:22:46 -06:00
aerinon b635126e81 Copmass count fix for 2 bytes 2023-08-30 16:16:05 -06:00
aerinon 150adec969 Sewers count fix 2023-08-30 15:25:29 -06:00
aerinon e21067f0a2 Initial work on new items 2023-08-30 14:35:30 -06:00
aerinon d09aea3ff9 2 byte compass counts 2023-08-30 12:33:27 -06:00
aerinon cd67d27798 Hud update flag added for standing items
Ram addresses updated
Minor multiworld fix
2023-08-30 10:25:20 -06:00
aerinon 51011dcada Merge remote-tracking branch 'baserom/master' into MergeDecompression
# Conflicts:
#	events.asm
#	newitems.asm
#	shopkeeper.asm
#	tables.asm

Plus attempt to update standing items
2023-08-28 12:01:57 -06:00
aerinon b688149dfa Fix for shops and powder
Fix for dungeon indicator
2023-08-28 11:32:46 -06:00
aerinon 09702e659d Merge remote-tracking branch 'baserom/master' into MergeDecompression
# Conflicts:
#	goalitem.asm
#	inventory.asm
#	invertedmaps.asm
#	newhud.asm
#	pendantcrystalhud.asm

Also some bugfixes here and there
2023-08-24 16:16:31 -06:00
aerinon f1dda4a8c0 Attempt to re-write standing items using the new decompressed gfx.
Fix a few bus left over from merge
2023-08-23 16:06:31 -06:00
aerinon 2a789b04e4 Merge remote-tracking branch 'baserom/master' into MergeDecompression
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	bookofmudora.asm
#	build.bat
#	catfish.asm
#	compasses.asm
#	contrib.asm
#	darkworldspawn.asm
#	entrances.asm
#	events.asm
#	floodgatesoftlock.asm
#	flute.asm
#	framehook.asm
#	goalitem.asm
#	halfmagicbat.asm
#	heartpieces.asm
#	hooks.asm
#	inventory.asm
#	invertedmaps.asm
#	itemtext_lower.asm
#	lampmantlecone.asm
#	mantle.asm
#	msu.asm
#	music.asm
#	newhud.asm
#	newitems.asm
#	pendantcrystalhud.asm
#	ram.asm
#	rngfixes.asm
#	roomloading.asm
#	shopkeeper.asm
#	stats.asm
#	stats/credits.asm
#	stats/creditsnew.asm
#	stats/statConfig.asm
#	tables.asm
#	tablets.asm
#	utilities.asm
#	zoraking.asm
2023-08-23 13:02:39 -06:00
aerinon 78b5695e30 Prevent cross dungeon drops
Enemy drop indicator prototype
2023-08-17 13:39:18 -06:00
aerinon 459dacd582 Sewer fix
Multiworld absorbable fix
Thoughts on design for cross dungeon issues
2023-08-09 15:16:13 -06:00
aerinon 2c9161927e Fix incorrect address 2023-08-04 16:41:13 -06:00
aerinon 6a22218727 Merge branch 'DRUnstable' into DRVolatile
# Conflicts:
#	doorrando/bugfix/kholdstare_shell_collision.asm
2023-08-04 11:32:19 -06:00
aerinon 75545cf568 Mimic rework 2023-08-04 11:30:29 -06:00
aerinon 05409f1875 Multiworld support for enemy drops. More logic for hera basement counting. 2023-07-10 10:25:37 -06:00
aerinon 15236c9aee Fix 2023-05-19 08:51:53 -06:00
aerinon 08c178a974 Fix Kholdstare shell collision at Lanmo 2 or other tiles where the shell could limit movement. 2023-04-14 14:13:27 -06:00
aerinon 5cac501cc7 Falling death flag 2023-04-14 14:03:40 -06:00
aerinon ef057638c5 Comment edits 2023-04-10 12:20:15 -06:00
aerinon 568708afd3 Fix Kholdstare shell collision at Lanmo 2 or other tiles where the shell could limit movement. 2023-04-10 12:18:52 -06:00
aerinon 4f09d30fe5 Merge branch 'DRUnstable' into Enemizer
# Conflicts:
#	keydrop/standing_items.asm
2023-04-05 16:03:17 -06:00
aerinon 67f22ab602 Fix kodongo ai slightly better.
Introduce a flag for the FixPrizeOnTheEyes bug
2023-03-30 15:00:39 -06:00
aerinon b10dff8a30 Minor clean up 2023-03-14 16:33:02 -06:00
aerinon 69a6e7f918 Version area reservation 2023-03-14 16:06:32 -06:00
aerinon 04aabc8bd8 Clear standing item data on transition to overworld
Standard+retro no arrow filler unless you have the bow
2023-03-13 15:54:19 -06:00
aerinon 0f541ad069 Assemble fix 2023-03-10 14:13:03 -07:00
aerinon 7e96db4ba6 Merge branch 'DRUnstable' into Enemizer
# Conflicts:
#	enemizer/hooks/blindboss_hooks.asm
2023-03-10 14:10:07 -07:00
aerinon 380f917e60 Fix for mirror portal in inverted
Yet another fix for blocked doors in Standard ER, minor alteration for the swamp entrance fix to work when blocked as well.
2023-03-08 08:26:34 -07:00
aerinon 5c213477bc Cave state fixes 2023-03-06 16:10:41 -07:00
aerinon 72e8d73277 Fix for lower layer blocked doors in standard 2023-03-02 16:21:02 -07:00
aerinon 13879317fe Mirror Portal + Entrance Fix 2023-03-01 15:41:54 -07:00
aerinon b9c8984d6d Fix for door overruns
Minor graphical fix for sanc door
2023-03-01 15:41:36 -07:00
aerinon 096157e981 Changes graphical status of standard exits when blocking exits in rain
Fixes graphical issues with sanctuary and swamp hub lobbies
Major fix for decoupled doors landing area
Fix for multiworld absorbables
2023-02-24 14:22:42 -07:00
aerinon 2411d0344e Minor optimization on handling special door landing 2023-02-17 23:48:08 -07:00
aerinon ff6b8b996b Merge branch 'DRFixes' of github.com:codemann8/z3randomizer into codemann8-DRFixes 2023-02-17 23:43:07 -07:00
aerinon 4a8b8b7691 Standard save and quit change for DR 2023-02-17 16:58:50 -07:00
aerinon 296c311b0a Fix for lamp check in escape if entering from dark world. Also fixes the torch going out bug. 2023-01-27 15:12:30 -07:00
aerinon 8957b8db7b Fast ROM updates 2023-01-06 15:02:22 -07:00
aerinon 83465e39af Fix for blocked entrance doors 2022-12-16 15:14:33 -07:00
aerinon 955766dc2a Door state fix attempt2 2022-12-05 08:19:59 -07:00
aerinon 46272e7fad New goal "completionist" 2022-12-01 14:04:09 -07:00
aerinon 9e50d5f02c Aga fix for door state (no trap door) 2022-12-01 14:03:39 -07:00
aerinon 612597be12 Merge branch 'Synthesis' into DRUnstable 2022-12-01 10:01:57 -07:00
aerinon 3af9e75dbd Possible fix for standing items after Aga transition 2022-12-01 10:01:37 -07:00
aerinon 44a648e3be Killable thieves flag 2022-10-25 09:15:15 -06:00
aerinon 8e20d6280c Enemizer Cleanup 2022-10-06 14:16:47 -06:00
aerinon 686bb0c064 Big key door fix 2022-09-30 15:29:00 -06:00
aerinon d6f50525a1 Big key door fix 2022-09-30 15:28:45 -06:00
aerinon 895074a4cb Support for new items
Support for static enemy drops
Bug fix for wrong sprites dead
2022-09-30 15:28:38 -06:00
aerinon 3fdf95a364 UW Sprites new home
Enemizer asm refinement
2022-09-27 14:38:28 -06:00
aerinon 5e93e59727 Enemizer migration 2022-09-20 16:38:20 -06:00
aerinon 9cdca6edb3 Fix for rain prevented doors and key door numbering 2022-09-07 16:51:57 -06:00
aerinon 6b853222f2 Fix for rain prevented doors and key door numbering 2022-09-07 16:51:29 -06:00
aerinon 2acee4abb9 Flute activated pickup sfx 2022-09-07 15:09:04 -06:00
aerinon 8a18566da1 Merge branch 'DRUnstable' into Synthesis
# Conflicts:
#	doorrando/overrides.asm
2022-08-24 14:27:34 -06:00
aerinon 0e15eb3560 Merge branch 'BlindZeldaDespawn' into DRUnstable 2022-08-24 14:26:48 -06:00
aerinon 0941cd321e Merge branch 'DRUnstable' into Synthesis 2022-08-24 14:24:37 -06:00
aerinon 2457c67d0e Bank map update 2022-08-24 13:13:24 -06:00
aerinon e1fa3aa7b7 Merge branch 'DRUnstable' into Synthesis 2022-08-11 15:28:38 -06:00
aerinon ca70d8c2a3 Merge branch 'DRVolatile' into Synthesis 2022-08-11 15:28:32 -06:00
aerinon ad6a2ed2fe Merge remote-tracking branch 'origin/DRVolatile' into DRVolatile 2022-08-11 15:28:00 -06:00
aerinon 2309b88545 Standing items fix for reloading pot items 2022-08-11 15:27:38 -06:00
aerinon 22b5524a4c Merge pull request #22 from Catobat/Tavern
Shuffle Back of Tavern
2022-08-11 15:27:00 -06:00
aerinon e321299603 Fix for crash 2022-08-08 10:33:01 -06:00
aerinon a6577b4e4b Output for collection rate config 2022-08-05 13:31:18 -06:00
aerinon 196905a83f Merge branch 'DRUnstable' into Synthesis 2022-08-05 13:29:54 -06:00
aerinon 53f89790a7 Fix for floodgates in vanilla mode 2022-07-29 12:08:36 -06:00
aerinon 17d1b12890 Merge branch 'master' into DRVolatile
# Conflicts:
#	compasses.asm
2022-07-06 10:03:01 -06:00
aerinon 4e6acaf7b9 Big key door double-sided check 2022-07-06 09:48:42 -06:00
aerinon 7f8e560b76 Merge branch 'DRVolatile' into StandardThrone 2022-07-01 15:15:22 -06:00
aerinon 3b5ccc7dfa Enemizer fix for pot substitution. 2022-06-30 11:52:02 -06:00
aerinon 3e6da34c71 Pot substitution for certain ammo and rupee items. 2022-06-29 11:32:51 -06:00
aerinon 92c155f5c0 Re-implemented mirror scroll during escape behavior to not affect entrance and include the throne spawn point 2022-06-16 12:32:31 -06:00
aerinon ae1fde65f4 Fix for followers despawning near maiden cell 2022-06-16 06:45:11 -06:00
aerinon a36068fb04 Fix for Zelda despawning near maiden cell 2022-06-15 23:49:20 -06:00
aerinon 6f1eda9296 Fix for pottery/shopsanity conflict 2022-06-15 16:53:49 -06:00
aerinon 2579038832 Mirror scroll spawns in Zelda's cell instead of last entrance (mirror remains unchanged)
Tapestry is open when spawning in the throne room.
2022-06-14 12:36:04 -06:00
aerinon 1ccc24f72f Fix dungeon completion bitfield (16-bit) 2022-05-26 09:14:08 -06:00
aerinon bea2d24d4d Fix dungeon completion bitfield 2022-05-26 09:14:05 -06:00
aerinon ed3ce6af6f Merge pull request #20 from cassidoxa/compasses_dr
Fix checking compass mode for compass count display bitfield
2022-05-17 13:03:06 -06:00
aerinon 445a91c2aa Merge pull request #19 from cassidoxa/keyfix
Fix key door indexing
2022-04-30 15:17:59 -06:00
aerinon 83ce4bf566 Merge pull request #17 from codemann8/MSUMuteFix
Preserve original Sanc/HC music track change if Zelda isn't delivered yet
2022-01-05 14:32:37 -07:00
aerinon 52c40ba0ca Merge pull request #16 from Catobat/DRFix
General fixes
2022-01-05 14:28:36 -07:00
aerinon 415e2cae41 Merge pull request #15 from spannerisms/master
Quadrant glitch fix
2021-10-21 16:09:45 -06:00
aerinon fa516b58d4 Merge pull request #14 from codemann8/MSUMuteFix
Fix for boss music not playing in non-DR modes
2021-07-27 08:53:08 -06:00
aerinon 5b8c90e069 Merge pull request #12 from codemann8/MSUMuteFix
Some music fixes
2021-07-23 07:44:01 -07:00
aerinon e038b0bb18 Merge pull request #13 from ardnaxelarak/DR_statCountersFix
Fix counters for damage taken and magic used
2021-07-23 07:42:18 -07:00
aerinon e35c437fe3 Merge pull request #10 from ardnaxelarak/DRMain
Fix junk graphics appearing during GAME OVER screen
2021-07-13 10:44:51 -07:00
aerinon 1c9936d231 Merge pull request #9 from ardnaxelarak/DRMain
Fix drawing C/P indicator and Stat Tracking
2021-07-09 10:38:20 -07:00
aerinon 429649bde8 Merge pull request #8 from codemann8/MSUMuteFix
Msu mute fix
2021-05-29 21:51:08 -06:00
aerinon 6fe4132564 Merge pull request #4 from Catobat/DRStairs
Shuffle in-room stairs
2021-02-01 16:29:51 -07:00
aerinon 6fe8496fde Create README.md 2020-10-29 16:07:44 -06:00