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
168 Commits
Author SHA1 Message Date
cassidoxa a2020c9c76 Add HUD map mode flag, "chest key" totals table, and seen-counter flags 
for tracking
 2023-02-23 20:46:40 -05:00
cassidoxa 02786974ad Compute and write save checksum on new file creation 2023-02-21 14:58:24 -05:00
cassidoxa 7426ce5945 More RAM labels 
Fixed tablets checking for item collected, uses NpcFlags+1
Deleted mantle.asm, moved to lampmantlecone.asm
 2022-11-24 18:34:35 -05:00
cassidoxa 09d15f3294 Another WRAM label pass 
Deleted compression.asm
 2022-11-22 00:36:39 -05:00
cassidoxa 788cceaab9 Continue labeling and documentation in ram.asm, main rando block 
Deleted several unused modules and some commented code
Reorganized some routines to clean up modules
Moved some memory into mirrored WRAM
Refactored NMI hook aux routine
Removed old fake flipper fix
 2022-11-16 21:38:28 -05:00
cassidoxa 43f753b517 ram.asm initial commit. Replaced all address defines with labels 
Value defines styled without quotes, # moved to load/store/cmp site
Added registers.asm (copied from spannerisms JP disassembly)
Added a bunch of length annotations
Deleted old or trivial commented out code
Deleted: ganonfixes.asm, map.asm, seedtag.asm
Replaced obsolete credits.asm with creditsnew.asm
Moved scratch space at $7F5020-3F to mirrored WRAM (7E1E70-8F)
Moved clock RAM to mirrored WRAM (7E1E90-9F)
dialog.asm: FreeDungeonItemNotice preserves callee-preserved scratch RAM
Toast buffer moved to mirrored WRAM (7E1E0E-0F)
servicerequest.asm: long store to $012E converted to word length store
 2022-11-05 00:50:25 -04:00
cassidoxa cafb0908a0 Introduce bound to QS loop to prevent infinite loop on last bomb loss 
Move !INFINITE_BOMB define to ram.asm, replace with labels
 2022-10-23 22:02:36 -04:00
cassidoxa 95ee31f7c9 Remove some hard coded addresses for MVN instructions 2022-07-29 22:04:13 -04:00
cassidoxa 9c41ffb55b Merge branch 'sram_rework' into dr_sram 2022-04-20 00:30:35 -04:00
cassidoxa 3c6c45ddb4 Fix some mangled labels 2022-02-03 22:01:34 -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
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
aerinon c88a301708 Merge branch 'master' into DRMain 
# Conflicts:
#	tables.asm
 2022-01-05 14:26:48 -07: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 9e2382cbb2 Add absorbed keys 
Adjust service request stuff
Change chest keys to "collected" keys
 2021-12-16 17:19:55 -05:00
cassidy fa76b61df0 Change addresses to labels and remove SRAM trace calls 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
spannerisms 2b1a3566d8 flibber 2021-10-31 10:38:38 -04:00
aerinon 415e2cae41 Merge pull request #15 from spannerisms/master 
Quadrant glitch fix
 2021-10-21 16:09:45 -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
spannerisms 501699e401 oops 2021-09-18 08:07:45 -04:00
karafruit 230b15a294 Fix OHKO mode 2021-08-09 15:30:16 -07:00
spannerisms 187c2aa4a2 always fix 2021-07-29 09:44:21 -04:00
spannerisms df66369f17 hopefully fix that text bug 2021-07-29 09:43:08 -04: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
KatDevsGames 69ec104027 Merge pull request #131 from Bonta0/chestturns 
Credits: Add chest turns counter
 2021-06-28 11:47:01 -05:00
KatDevsGames 49f1f49ccb Merge pull request #127 from Bonta0/escapeassist 
Events: Fix unusable infinite bombs with empty inventory
 2021-06-28 11:06:51 -05:00
Bonta d3db31b05e Events: Fix unusable infinite bombs with empty inventory 2021-06-24 23:12:58 +02:00
aerinon e9aec2ba86 Merge branch 'master' into DRMain 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
 2021-06-22 13:12:07 -06:00
Bonta cc12372627 Stats: Track chest turns 2021-06-22 02:31:52 +02:00
cassidy 77f742b25c Rewrite to handle electro palette, leave bunny alone 
Should fix bunny issues
Big thank to kara for report, assistance, and testing
 2021-06-14 13:14:38 -04:00
aerinon 5672e2f090 Merge branch 'master' into DRMain 2021-05-24 14:52:26 -06:00
Kat 47e52d3fb2 cucco storm 2021-05-14 14:17:11 -05:00
aerinon 842bb043e6 Merge branch 'master' into DRMain 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	catfish.asm
#	compasses.asm
#	darkworldspawn.asm
#	hooks.asm
#	inventory.asm
#	newitems.asm
#	shopkeeper.asm
#	stats.asm
#	tables.asm

Adn some updates from DR
 2021-05-13 12:11:40 -06:00
spannerisms b95923fb9a Merge branch 'master' into master 2021-04-03 00:31:23 -04:00
spannerisms 33dbe3003c Update events.asm 
just JMLs here
 2021-03-24 08:20:08 -04:00
aerinon 8b622dd841 Multiclient flags 
Multi Sprite Player set to skip progressive limits
 2021-02-18 13:37:33 -07:00
aerinon a63aa6f5fe Shop fixes 2021-02-01 16:29:09 -07:00
aerinon 2a08959229 Shop counting items 2021-02-01 10:11:38 -07:00
Catobat 0c608c1380 Fix starting equipment on file select 2020-12-16 19:58:33 +01:00
Catobat 99da1d3115 Reset boss RNG and other things on new file 2020-12-16 18:04:37 +01:00
aerinon 443070fe2c Merge branch 'ChestKeyCounter' into DRMain 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	build.sh
#	darkworldspawn.asm
#	events.asm
#	itemdowngrade.asm
#	shopkeeper.asm
#	stats.asm
 2020-11-30 09:34:18 -07:00
aerinon 0dba58c194 Support for Mirror Scroll 
DR Hud Additions
 2020-10-30 16:26:28 -06:00
KatDevsGames 9c9925fdda Merge pull request #75 from JonHanon/starting-menu-fix 
Starting File Menu Fix
 2020-09-21 02:14:47 -04:00
randall.rupper 233afa1e38 Chest Key counters 2020-09-18 11:06:02 -06:00
aerinon 397da02e3f Converted file to tabs for consistency 2020-08-28 12:23:27 -06:00
aerinon d58fa5d5b7 Starting keys accounted for 2020-08-28 12:15:31 -06:00
caitsith2 65bd0df346 Labels added for Door rando hook points. 2020-07-15 01:27:33 -07:00