alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity
2,086 Commits 7 Branches 1 Tag
pikit_mode_merge
Commit Graph
457 Commits
Author SHA1 Message Date
aerinon a017c98c4e Map bug with prizes 2022-04-20 09:07:59 -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
Lexi Rose c6adf11a0d Merge pull request #159 from cassidoxa/sram_rework 
SRAM Re-work
 2022-04-05 09:38:27 -05:00
codemann8 da788dadcd Merge remote-tracking branch 'upstream/DRUnstable' into OWMain 2022-03-26 07:00:13 -05:00
codemann8 cb48137fa7 Fixed issue with mirror portal deleting after mirror bonk in Crossed OW 2022-02-22 19:55:02 -06:00
aerinon fe66c67d07 Fixing up the hud to indicate Pendant/Crystal etc 2022-02-15 12:12:42 -07: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
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
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
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
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
spannerisms 501699e401 oops 2021-09-18 08:07:45 -04: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
spannerisms 03c287a988 jingle jangle 2021-08-11 06:30:52 -04:00
KatDevsGames 910d63e886 Merge pull request #143 from spannerisms/master 
fix quadrant glitch hopefully
 2021-08-10 15:13:32 -05:00
KatDevsGames f69a33aed0 Merge pull request #142 from ardnaxelarak/fix_ohko 
Fix OHKO mode
 2021-08-10 15:13:13 -05:00
spannerisms 7057d984e2 fix quadrant glitch hopefully 2021-08-10 09:56:57 -04:00
karafruit 230b15a294 Fix OHKO mode 2021-08-09 15:30:16 -07:00