Commit Graph
1354 Commits
Author SHA1 Message Date
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
cassidoxa 3e2362b7ca Implement initial SRAM table
Data in initialsramtable.asm gets copied to SRAM on save file init
Frontend will be responsible for setting this, requires frontend changes
Changed some label names to disambiguate WRAM and SRAM labels
Deleted open mode
2022-02-03 20:25:32 -05:00
codemann8 98949be9bc Changed GT/AT swap in Mixed OW to prioritize leaving AT vanilla unless GT is the only one in the starting world 2022-02-03 06:13:13 -06:00
codemann8 ddd86a96cf Minor code improvement 2022-02-02 20:00:49 -06:00
cassidoxa c048589c02 Add static file name feature by special request
Move compass count ram init to compasses.asm
Rename WRAMEquipment and SRAMEquipment to EquipmentWRAM/SRAM
2022-02-02 16:51:50 -05:00
spannerisms 8f74ddab05 fix
forgot to account for the stack pointer being screwed up when we start using the stack again

might as well add in better VWF control and move hex to BG2 for more space
2022-01-27 01:24:28 -05:00
spannerisms a247a0ae01 tinker tinker 2022-01-26 08:22:44 -05:00
spannerisms 7ca4fd6467 Merge branch 'master' of https://github.com/spannerisms/z3randomizer 2022-01-26 06:41:56 -05:00
spannerisms 32d619c9e7 BSOD 2022-01-26 06:41:34 -05: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
cassidoxa b91ac58b47 Merge branch 'master' into sram 2022-01-20 11:16:31 -05: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
cassidoxa 6c4acb1e5b Check new value in SRAM to determine if Aga 2 duck comes
Added pushpc/pullpc to sram.asm
2022-01-19 20:17:02 -05:00
Catobat 78148fb4f3 Fix witch item bug 2022-01-20 01:30:21 +01:00
codemann8 c7718e7a47 Fixed Hera boss music to correctly read boss defeated flag 2022-01-19 14:39:19 -06:00
Catobat f3d1e99421 Fix Tower of Hera boss music bug 2022-01-19 19:52:01 +01:00
codemann8 335744f7b6 Restored vanilla Ice Palace terrain for Inverted 2022-01-19 03:18:31 -06:00
codemann8 7633c8b586 Fixed Hera boss music to correctly read boss defeated flag 2022-01-19 02:31:38 -06:00
codemann8 1677b95744 Restoring vanilla terrain for glitched Inverted modes 2022-01-19 01:42:16 -06:00
codemann8 14748b7788 Fixed world flag on Mountain Cave start 2022-01-19 01:39:24 -06:00
codemann8 bfbc7f16b1 Fixed issue with spawning on Pyramid/HC Ledge with old man 2022-01-19 00:23:24 -06:00
Thomas Backmark b392eb7554 Improved text renderer with lowercase letters 2022-01-18 11:10:14 +01:00
codemann8 c79863aad2 Fixed issue with Inverted Mirror Bonks not getting applied appropriately 2022-01-18 03:14:09 -06:00
codemann8 b72f89ff87 Made flute SFX louder for preactivated flute item get 2022-01-15 20:56:16 -06:00
codemann8 51d7f663c3 Restored vanilla ladder to Dark Graveyard in Inverted 2022-01-15 13:28:45 -06:00
codemann8 49b0cf0669 Inverted TR Peg screen terrain changes 2022-01-15 12:40:51 -06:00
codemann8 cbc4bbd6f3 Removed ladder from DDM 2022-01-15 12:22:01 -06:00
codemann8 3e9f598fe1 Added flute SFX to itemget if collecting a pre-activated flute 2022-01-15 04:07:27 -06:00
codemann8 f2a03f0bda Reorganized and reserved new starting data section 2022-01-14 12:59:14 -06:00
codemann8 fdea61fbf3 Added Starting OW Flag Table 2022-01-13 22:09:01 -06:00
codemann8 b5e313d709 Added Starting OW Flag Table 2022-01-13 21:56:03 -06:00