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
codemann8
d71e873d72
Extended Spiral/Mimic Ledge in Inverted
2022-01-06 12:45:27 -06:00
codemann8
c5ff897be6
Inverted TR Peg screen terrain changes
2022-01-06 11:39:21 -06:00
codemann8
b20f9ddd67
Merged DR v0.5.1.7
2022-01-06 02:13:05 -06:00
codemann8
67b96b3051
Extended Spiral/Mimic Ledge in Inverted
2022-01-06 01:52:58 -06: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
c416bfa917
update credits
2022-01-03 12:29:04 -08:00
b2043ef15e
Adjust credits to match layout of base randomizer fork
2022-01-03 12:26:15 -08:00
Thomas Prescott
2a3d6fae58
update credits
2022-01-03 13:55:03 -06:00
74c55cf048
Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
2022-01-01 15:30:19 -08:00
spannerisms
e78c41ef38
match expected usage
2021-12-29 18:58:15 -08:00
6db6733d80
Add permanent ice physics bit
2021-12-29 18:51:42 -08:00
cassidy
6f58b9f959
Merge branch 'master' into sram
2021-12-28 00:30:13 -05:00
8ffef89fb8
Fix bee damage
2021-12-27 14:04:20 -08:00
8c6d2ac26d
Fix moldorm/somaria issue and add both-canes mode
2021-12-23 22:13:30 -08:00
0f26e5aaa5
Fix width of special cane freestanding sprites
2021-12-23 22:13:30 -08:00
8a25dc9d52
Prevent hitting stunned ganon in cane-mode with default vulnerability
2021-12-23 22:13:30 -08:00
d2ad452170
Fix mothula/ganon breaking things (hopefully)
2021-12-23 22:13:30 -08:00
b1e3a7999c
Remove bomb damage in cane modes
2021-12-23 22:13:30 -08:00
53792aea25
Add cane-only modes
2021-12-23 22:13:26 -08:00
codemann8
d75325e1c5
Move mirror portal off screen during mirror bonk in Crossed OW
2021-12-22 10:51:26 -06:00
codemann8
0a4c624f2f
Move mirror portal off screen during mirror bonk in Crossed OW
2021-12-22 10:49:12 -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
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
cassidy
e2bb55c1ba
Fix asserts
2021-12-16 17:19:55 -05:00
cassidy
9e2382cbb2
Add absorbed keys
...
Adjust service request stuff
Change chest keys to "collected" keys
2021-12-16 17:19:55 -05:00
cassidy
ae0b57635c
Remove defines from LTTP_RND_GeneralBugfixes
...
Replace more labels
Add ROM version and reserve extra 16 bytes in unused hardware vector in
LTTP_RND_GeneralBugfixes
Move IncrementChestCounter to ChestPrep in newitems.asm
Remove IncrementChestCounter hook which was getting overwritten
More revisions to sram.asm
2021-12-16 17:19:55 -05:00
cassidy
06d0c6e9f9
Removed SRAM trace from tables.asm
...
Fixed comments related to OpenMode, left open as default
2021-12-16 17:19:54 -05:00
cassidy
7f03cf68e8
Replace labels in fileselect.asm
...
Full file name has also been moved to the beginning of the new save
space at $7F6000 in WRAM and $700500 in SRAM
2021-12-16 17:19:54 -05:00
cassidy
ae82caca45
Replace more labels
...
Removed mask from rupeelimit.asm as total item counter is now a 16-bit
value
Commented out CountBits in utilities.asm in previous commit as I've
allocated a counter byte in SRAM
2021-12-16 17:19:54 -05:00
cassidy
fa76b61df0
Change addresses to labels and remove SRAM trace calls
2021-12-16 17:19:54 -05:00
cassidy
774aeb5e73
Next draft of sram.asm. Save/SRAM changes to save, init, and password
...
Deleted previewdatacopy.asm which was for SRAM Trace which we no longer
support. Password moved to $703000. 32-bits at $FFE0 in ROM (unused
hardware vector) now burned into $702015 in SRAM with ROM name.
2021-12-16 17:19:54 -05:00
cassidy
640e94153d
Refactor inventory code and add more labels
...
Refactored highest sword, shield, and mail counting
Refactored how heart pieces, heart containers, and crystals are counted
Moved quickswap lock bit to high byte of InventoryTracking
Fixed sword and shield item downgrade
Added PreFluteLocations counter
2021-12-16 17:19:54 -05:00
cassidy
e4d917c47c
First pass-through adding labels
...
Added items, equipment, and tracking/indicators
Added playername changes
Removed some defines
2021-12-16 17:19:54 -05:00
