Commit Graph

1438 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
cassidoxa
9c41ffb55b Merge branch 'sram_rework' into dr_sram 2022-04-20 00:30:35 -04:00
codemann8
0a7b886978 Merge remote-tracking branch 'upstream/DRUnstable' into OWMain 2022-04-19 21:32:47 -05: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
Lexi Rose
5861f546ad Merge pull request #160 from ardnaxelarak/main
Unscramble lowercase letters for new font
2022-04-17 03:17:31 -05:00
638967ee9c unscramble lowercase letters for new font 2022-04-17 00:42:10 -07:00
codemann8
0a57153762 Changed OW map in attract mode to show LW map always 2022-04-15 10:48:33 -05:00
codemann8
436ecbb17d Merged DR v1.0.0.3 2022-04-15 10:34:10 -05: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
codemann8
ed03692bef Fix from Aerinon for map/compass dungeon locations on map check 2022-04-10 19:16:24 -05:00
codemann8
c7f9b5c3a0 Fixed map check for GT skull icon to check if Aga2 defeated rather than pyramid hole opened 2022-04-05 11:29:46 -05:00
Lexi Rose
c6adf11a0d Merge pull request #159 from cassidoxa/sram_rework
SRAM Re-work
2022-04-05 09:38:27 -05:00
Lexi Rose
a754a6f22b Merge pull request #158 from spannerisms/master
Failures
2022-04-05 09:37:57 -05:00
aerinon
281beeeb58 Switch standing item gfx to a different slot
Rain state fix
2022-03-29 14:29:04 -06:00
codemann8
7dabea9f8b Update events.asm 2022-03-26 07:03:54 -05:00
codemann8
da788dadcd Merge remote-tracking branch 'upstream/DRUnstable' into OWMain 2022-03-26 07:00:13 -05: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
codemann8
697a742e09 Minor fix to flute SFX for pre-activated flute 2022-03-18 23:21:45 -05:00
aerinon
c687157882 Fix the Y index for ShouldCountNormalPot 2022-03-08 08:53:23 -07:00
codemann8
eb30242920 Fixed mirror bonk issue incorrectly leaving a mirror portal behind 2022-03-07 20:12:32 -06:00
codemann8
bd8b79ae5c Fixed issue with mirror portal not spawning when entering OW from the DW in Crossed OWR 2022-03-07 19:03:52 -06: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
codemann8
4958d43d71 Some additional changes to lowercase dungeon text 2022-02-24 06:05:23 -06:00
cassidoxa
5d943d9a6d Add dungeons completed bitfield from door rando 2022-02-23 12:42:21 -05:00
codemann8
cb48137fa7 Fixed issue with mirror portal deleting after mirror bonk in Crossed OW 2022-02-22 19:55:02 -06:00
cassidoxa
838d4e9bf8 Refactor dungeon locations checked incrementing
Fix BowTracking documentation
2022-02-18 17:45:33 -05: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
cassidoxa
905e897b52 Handle 16-bit GoalCounter and TotalItemCounter
Fix vanilla sword + shield item
Fix how progressive items handled
Clean up compasses.asm
2022-02-08 19:25:59 -05:00
codemann8
e01e8569d7 Fixed issue with TR Peg Puzzle Portal not working 2022-02-07 19:20:32 -06:00
cassidoxa
02932a2a9d Add comments to initsramtables.asm 2022-02-07 20:05:52 -05:00
codemann8
ea8f4dbc57 Fixed issue with TR Peg Puzzle Portal not working 2022-02-07 18:00:10 -06:00
codemann8
ece66e38df Added lowercase version of dungeon item text 2022-02-06 01:00:16 -06:00
codemann8
ba8a9aeb90 Merged in Upstream ER changes 2022-02-04 06:04:26 -06:00
cassidoxa
959aa40f58 Increment ROM version 2022-02-03 22:48:20 -05:00
cassidoxa
3c6c45ddb4 Fix some mangled labels 2022-02-03 22:01:34 -05:00
cassidoxa
dfc4284a70 Merge branch 'master' into sram_rework 2022-02-03 21:20:16 -05:00