6f138825d9
Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
...
WIP, Broken, Do Not Use
2022-09-18 17:36:49 -07:00
codemann8
7c7664224e
Merged DR v1.0.1.0
2022-07-08 05:32:08 -05:00
aerinon
5863f9783f
Minor fix up on CrystalPendantFlags_3
2022-04-30 15:20:53 -06:00
aerinon
e088a040f8
Merge branch 'dr_sram' of https://github.com/cassidoxa/z3randomizer into cassidoxa-dr_sram
...
# Conflicts:
# hooks.asm
# menu/overworldmap.asm
# music.asm
2022-04-26 11:57:51 -06:00
cassidoxa
9c41ffb55b
Merge branch 'sram_rework' into dr_sram
2022-04-20 00:30:35 -04: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
da788dadcd
Merge remote-tracking branch 'upstream/DRUnstable' into OWMain
2022-03-26 07:00:13 -05:00
aerinon
fe66c67d07
Fixing up the hud to indicate Pendant/Crystal etc
2022-02-15 12:12:42 -07:00
7da5e6257a
Merge branch 'OWMain' of github.com:codemann8/z3randomizer into overworld_kara
2022-02-11 13:36:00 -08: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
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
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
8dfdd3ee87
Merge branch 'main' into overworld_kara
2022-01-24 14:07:50 -08:00
ede8760b5c
Make non-seeded rng a rom flag instead of compile flag
2022-01-24 13:55:29 -08:00
codemann8
f2a03f0bda
Reorganized and reserved new starting data section
2022-01-14 12:59:14 -06:00
codemann8
b5e313d709
Added Starting OW Flag Table
2022-01-13 21:56:03 -06:00
aerinon
8698c3e109
Merge branch 'DRMain' into DRVolatile
2022-01-06 16:04:08 -07:00
codemann8
b20f9ddd67
Merged DR v0.5.1.7
2022-01-06 02:13:05 -06:00
aerinon
c88a301708
Merge branch 'master' into DRMain
...
# Conflicts:
# tables.asm
2022-01-05 14:26:48 -07:00
6db6733d80
Add permanent ice physics bit
2021-12-29 18:51:42 -08:00
8c6d2ac26d
Fix moldorm/somaria issue and add both-canes mode
2021-12-23 22:13:30 -08:00
53792aea25
Add cane-only modes
2021-12-23 22:13:26 -08: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
06d0c6e9f9
Removed SRAM trace from tables.asm
...
Fixed comments related to OpenMode, left open as default
2021-12-16 17:19:54 -05:00
spannerisms
2b1a3566d8
flibber
2021-10-31 10:38:38 -04:00
82c5190f63
Merge branch 'OWMain' into overworld_kara
2021-10-30 11:55:08 -07:00
codemann8
4e67ebd959
Make Smith deletion on S+Q dependent of a new flag
2021-10-22 00:21:22 -05:00
aerinon
620c672fe1
Turn off Terrorpin AI fix by default - can be a post-gen option
2021-10-21 16:18:51 -06:00
aerinon
9bf662642b
Merge branch 'DRMain' into OverworldMapRefactor
2021-10-21 14:53:55 -06:00
aerinon
27654b9ac9
Merge remote-tracking branch 'baserom/master' into DRMain
...
# Conflicts:
# hooks.asm
# newhud.asm
# utilities.asm
2021-10-21 14:15:54 -06:00
aerinon
c503e3eb61
Overworld Map Refactor
2021-10-21 14:05:59 -06:00
42002ae839
Merge branch 'main' into overworld_kara
2021-08-26 08:44:15 -07:00
spannerisms
03c287a988
jingle jangle
2021-08-11 06:30:52 -04:00
spannerisms
7057d984e2
fix quadrant glitch hopefully
2021-08-10 09:56:57 -04:00
7aac3970d1
Add pseudo-sword mode
2021-07-25 01:42:21 -07:00
faf05fb9a9
Merge branch 'OWMain' into overworld_kara
2021-07-17 12:19:56 -07:00
bdd665db24
move storage of BOMB_LEVEL to make it play nicely with starting equipment
2021-07-13 11:28:04 -07:00
aerinon
641ec0ffa0
Minor fix to credits
...
Default to AgaDoor to Std/Open state
2021-07-13 10:51:01 -07:00
da14e440c7
Add L-1 bombs as separate from no bombs in bomb-only mode
2021-07-12 02:34:57 -07:00
3944dadcab
Change default for locked aga tower to no longer be inverted
2021-07-08 18:25:04 -07:00
aerinon
aee82fa319
Merge branch 'master' into DRMain
...
# Conflicts:
# LTTP_RND_GeneralBugfixes.asm
# events.asm
# hooks.asm
# stats.asm
# stats/creditsnew.asm
# stats/statConfig.asm
# swordswap.asm
# utilities.asm
2021-07-07 11:15:11 -07:00
d960103e86
Merge branch 'main' into overworld_kara
2021-07-07 09:15:29 -07:00
KatDevsGames
264f7b26bc
Merge pull request #134 from Bonta0/fakeboots
...
Fake boots
2021-07-06 22:25:42 -05:00
KatDevsGames
6f2383fafe
Merge pull request #135 from ardnaxelarak/medallion
...
Implement always-allowed medallions
2021-07-06 17:44:41 -05:00
3548a0bbf5
Implement always-allowed medallions
2021-07-06 12:24:06 -07:00
Bonta
27cb1b5459
Implement Fakeboots
2021-07-05 21:38:08 +02:00
2fec3f7484
Merge commit 'f403ca10da9e009599a531be8cdcd20a61b4801c' of github.com:spannerisms/z3randomizer into overworld_kara
2021-07-01 23:05:48 -07:00
