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
aerinon
57dec5651f
Merge branch 'DRMain' into DRUnstable
2022-02-09 14:34:58 -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
codemann8
ba8a9aeb90
Merged in Upstream ER changes
2022-02-04 06:04:26 -06: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
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
8dfdd3ee87
Merge branch 'main' into overworld_kara
2022-01-24 14:07:50 -08: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
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
7633c8b586
Fixed Hera boss music to correctly read boss defeated flag
2022-01-19 02:31:38 -06:00
Thomas Backmark
b392eb7554
Improved text renderer with lowercase letters
2022-01-18 11:10:14 +01:00
codemann8
3e9f598fe1
Added flute SFX to itemget if collecting a pre-activated flute
2022-01-15 04:07:27 -06:00
aerinon
8698c3e109
Merge branch 'DRMain' into DRVolatile
2022-01-06 16:04:08 -07: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
aerinon
c88a301708
Merge branch 'master' into DRMain
...
# Conflicts:
# tables.asm
2022-01-05 14:26:48 -07:00
74c55cf048
Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
2022-01-01 15:30:19 -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
codemann8
0a4c624f2f
Move mirror portal off screen during mirror bonk in Crossed OW
2021-12-22 10:49:12 -06: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
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
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
codemann8
9c3d85e360
Improvement to FF damage fix to insta-warp Link to destination once Link has exceeded the bounds of the current screen
2021-12-13 23:16:29 -06:00
69a669e16e
Merge branch 'OWMain' into overworld_kara
2021-11-08 00:09:02 -08:00
2fd459d8ca
Show bomb level on file select screen in bomb-only mode
2021-11-07 19:32:27 -08:00
2b241b2340
Unify handling of bomb colors in bomb-only mode
2021-11-07 12:47:13 -08:00
codemann8
ff6a553a0d
Fake flipper autokill reversal
2021-11-01 10:59:37 -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
aeec3fe6c6
Allow early detonation of bombs and add build flag to remove static RNG
2021-10-30 09:11:36 -07:00
codemann8
2215b16240
Merge branch 'DRMain' into OWMain
2021-10-21 21:26:38 -05:00
aerinon
85d799ba67
Merge branch 'DRMain' into DRVolatile
2021-10-21 16:35:09 -06:00
aerinon
415e2cae41
Merge pull request #15 from spannerisms/master
...
Quadrant glitch fix
2021-10-21 16:09:45 -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
f6f6383913
Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
2021-09-21 14:10:23 -07:00
spannerisms
501699e401
oops
2021-09-18 08:07:45 -04:00
42002ae839
Merge branch 'main' into overworld_kara
2021-08-26 08:44:15 -07:00
codemann8
c399f8c77b
Separated ambient SFX from music track selection
...
Fixes issue with ambient SFX stopping and starting
2021-08-11 05:53:27 -05:00
