Commit Graph
1513 Commits
Author SHA1 Message Date
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
cassidoxa 02932a2a9d Add comments to initsramtables.asm 2022-02-07 20:05:52 -05: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
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
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 cad5a43d4b Change bitfield letters to match JP disassembly
Add sprite item pot data block
2022-01-12 21:52:47 -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
cassidy 6f58b9f959 Merge branch 'master' into sram 2021-12-28 00:30:13 -05: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
cassidy e8623768af Merge branch 'sram' of https://github.com/cassidoxa/z3randomizer into sram 2021-12-17 13:56:15 -05:00
cassidy ed225e044b Cleanup in sram.asm and compasses.asm 2021-12-17 13:53:53 -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
cassidy c09839eb33 Fix sword and shield item downgrade 2021-12-16 17:19:55 -05:00
cassidy be2d59eec8 Fix compass items collected counts on HUD 2021-12-16 17:19:55 -05:00
cassidy c4c9065a79 Fix ROM version location
Remove comments, general cleanup
2021-12-16 17:19:55 -05:00
cassidy c8ea2c6dce Move compass counts to ROM and trackable RAM
Add flag if compass HUD count has been displayed in SRAM
Move low hearts fix from tables.asm to bugfixes.asm
Rearrange dungeon stats in SRAM to match door rando ROM
2021-12-16 17:19:55 -05:00
cassidy 6c9b33ed93 Write macro for SRAM assertions
Change some label names to be clearer
Fix some of the progress flags and dungeon bitfields
2021-12-16 17:19:55 -05:00
cassidy 15d88b19a3 Fix dungeon key and locations checked tables, reserve unused indices
Swap locations checked with absorbed keys to match door rando
2021-12-16 17:19:55 -05:00