Commit Graph
1082 Commits
Author SHA1 Message Date
aerinon 4b68406be0 Merge branch 'DRUnstable' into DRVolatile 2022-04-20 13:56:31 -06:00
aerinon a017c98c4e Map bug with prizes 2022-04-20 09:07:59 -06:00
aerinon e8f06f2da6 Pottery fix for vanilla hera key 2022-04-20 08:52:01 -06:00
aerinon 3114223a04 Can force the drawing algorithm to skip 2022-04-19 14:35:16 -06:00
aerinon f6015a8569 New colorized pot and bitfields 2022-04-19 14:04:12 -06:00
aerinon d116249412 Merge branch 'DRUnstable' into DRVolatile 2022-04-13 13:32:31 -06:00
aerinon 4239e7204e Check Aga2's boss defeat flag instead of pyramid hole
New flag on compass mode to indicate maps should be used instead for showing the location
2022-04-13 13:30:15 -06:00
aerinon 281beeeb58 Switch standing item gfx to a different slot
Rain state fix
2022-03-29 14:29:04 -06:00
aerinon 93fe175cab Don't delete hammer when hammer dashing through pots and the sprite limit is reached
Hook for frozen enemies killed with hammer (if there's an item they won't automatically drop the freeze prize now)
2022-03-23 14:24:36 -06:00
aerinon c687157882 Fix the Y index for ShouldCountNormalPot 2022-03-08 08:53:23 -07:00
aerinon 60026bea50 Pottery refinements 2022-03-07 10:44:53 -07:00
aerinon 66657eb956 Missed a line 2022-03-04 17:56:07 -07:00
aerinon a0ebf72d59 Lifting normal pots increases location count
Pot despawn protection
Hud updates
2022-03-04 15:24:22 -07:00
aerinon c83185c1b2 Minor bug fix 2022-02-24 14:04:33 -07:00
aerinon 2c8299bac3 Standing item key for hera basement cage 2022-02-15 12:13:29 -07:00
aerinon fe66c67d07 Fixing up the hud to indicate Pendant/Crystal etc 2022-02-15 12:12:42 -07:00
aerinon a80171ba9b Revert SRAM changes (not yet ready) 2022-02-10 08:37:05 -07:00
aerinon 57dec5651f Merge branch 'DRMain' into DRUnstable 2022-02-09 14:34:58 -07:00
aerinon 5bd4d36cd9 Fix for standing item palette 2022-02-09 14:17:42 -07:00
aerinon e8b85e4815 Lowercase item text 2022-02-09 10:06:16 -07:00
aerinon 93fe72466d Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
#	music.asm
2022-02-09 09:59:56 -07:00
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
Lexi Rose c515beb853 Merge pull request #155 from tewtal/new-text-renderer
Improved dialog text rendering
2022-01-20 16:00:20 -06:00
Thomas Backmark b46269b662 Moved the new text renderer behind a feature flag 2022-01-20 22:24:52 +01:00
Lexi Rose 02ed70442d Merge pull request #154 from cassidoxa/starting_area_exit
Fix reading starting area offset to prevent indexing out of bounds
2022-01-20 02:33:52 -06:00
Lexi Rose df27e07221 Merge pull request #156 from Catobat/HeraBoss
Fix Tower of Hera boss music bug and witch item bug
2022-01-20 02:33:27 -06:00
Catobat 78148fb4f3 Fix witch item bug 2022-01-20 01:30:21 +01:00
Catobat f3d1e99421 Fix Tower of Hera boss music bug 2022-01-19 19:52:01 +01:00
Thomas Backmark b392eb7554 Improved text renderer with lowercase letters 2022-01-18 11:10:14 +01:00
aerinon 50dd0c7be4 Fixing bugs with pottery lottery 2022-01-13 15:03:20 -07:00
cassidoxa 1d378211ba Initialize overworld door frame data when starting in single-exit cave 2022-01-13 15:51:50 -05:00
cassidoxa 6d72a1a9c2 Fix reading starting area offset to prevent indexing out of bounds 2022-01-12 20:31:27 -05: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 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 fc5e6191eb Merge remote-tracking branch 'origin/DRMain' into DRMain 2022-01-05 14:29:03 -07:00
aerinon 52c40ba0ca Merge pull request #16 from Catobat/DRFix
General fixes
2022-01-05 14:28:36 -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
Thomas Prescott 2a3d6fae58 update credits 2022-01-03 13:55:03 -06:00
Lexi Rose 4eafefb501 Merge pull request #153 from spannerisms/master
Fix EG
2021-12-21 23:19:16 -06:00
spannerisms 04fa0fc1a1 match expected usage 2021-12-20 16:42:56 -05: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
Lexi Rose 7dda06cf11 Merge pull request #152 from spannerisms/master
Bug Fix and MSU
2021-12-16 04:40:15 -06:00
spannerisms 42bc1d743a Merge branch 'KatDevsGames:master' into master 2021-12-15 01:12:07 -05:00
spannerisms aa6aaffd2f prevent crashes 2021-12-15 01:11:26 -05:00