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
182 Commits
Author SHA1 Message Date
aerinon d09aea3ff9 2 byte compass counts 2023-08-30 12:33:27 -06:00
aerinon 51011dcada Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	events.asm
#	newitems.asm
#	shopkeeper.asm
#	tables.asm

Plus attempt to update standing items
 2023-08-28 12:01:57 -06:00
aerinon b688149dfa Fix for shops and powder 
Fix for dungeon indicator
 2023-08-28 11:32:46 -06:00
cassidoxa 90ffa8bd23 Fix cave state item cutscene flag with boss hearts 
Add item substitutions
 2023-08-25 21:11:48 -04:00
aerinon 09702e659d Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	goalitem.asm
#	inventory.asm
#	invertedmaps.asm
#	newhud.asm
#	pendantcrystalhud.asm

Also some bugfixes here and there
 2023-08-24 16:16:31 -06:00
aerinon 2a789b04e4 Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	bookofmudora.asm
#	build.bat
#	catfish.asm
#	compasses.asm
#	contrib.asm
#	darkworldspawn.asm
#	entrances.asm
#	events.asm
#	floodgatesoftlock.asm
#	flute.asm
#	framehook.asm
#	goalitem.asm
#	halfmagicbat.asm
#	heartpieces.asm
#	hooks.asm
#	inventory.asm
#	invertedmaps.asm
#	itemtext_lower.asm
#	lampmantlecone.asm
#	mantle.asm
#	msu.asm
#	music.asm
#	newhud.asm
#	newitems.asm
#	pendantcrystalhud.asm
#	ram.asm
#	rngfixes.asm
#	roomloading.asm
#	shopkeeper.asm
#	stats.asm
#	stats/credits.asm
#	stats/creditsnew.asm
#	stats/statConfig.asm
#	tables.asm
#	tablets.asm
#	utilities.asm
#	zoraking.asm
 2023-08-23 13:02:39 -06:00
cassidoxa 80f94824f4 Small fixes 2023-08-22 10:18:02 -04:00
cassidoxa e2525ebdb1 Rework menu dungeon item + select behavior 
Fix colored heart animations
 2023-08-22 01:40:53 -04:00
cassidoxa 66540f2819 Replace GT, Ganon vuln crystal checks, ped check with new system 
InvincibleGanon 0x18003E -> GanonVulnerableMode 0x1801A8-0x1801A9
NumberOfCrystalsRequiredForTower 0x18005E -> GanonsTowerOpenTarget 0x18019A-0x18019B
NumberOfCrystalsRequiredForGanon 0x18005F -> GanonVulnerableTarget 0x1801A6-0x1801A7
Various fixes
Moved CrystalCounter to word length space $7EF471 -> $7EF476
 2023-08-21 20:43:27 -04:00
cassidoxa 491e033ff0 Fix heart piece item resolution when mirroring 
Fix HC big key incrementing total item count
Fix key tracking
Fix misc stat incrementing
 2023-08-14 00:25:59 -04:00
cassidoxa aaf970b837 Heart colors 2023-08-13 13:46:21 -04:00
cassidoxa ad17c8e88d More small fixes 2023-08-12 15:34:33 -04:00
cassidoxa 56cb17a0a3 Small fixes 2023-08-08 01:00:49 -04:00
cassidoxa 39ac6c301a Fix mushroom gfx loading 2023-08-07 13:50:33 -04:00
cassidoxa 87e665965c Free crystals and ability to shuffle dungeon prizes 
Overworld map code via Aerinon
 2023-08-06 23:07:39 -04:00
cassidoxa cb16ffc20b Merge branch 'master' into decompressed 
Also some pendant receipt and palette fixes
 2023-08-02 17:40:38 -04:00
cassidoxa d446bd3c1b More fixes 2023-08-02 15:39:03 -04:00
cassidoxa 8ed4cbda1d Palette handling & sprite props data tables 
Statically assign item data tables
Fix some save-related bugs
Fix dungeon item notice in "this dungeon" with free dungeon items
 2023-08-01 17:13:47 -04:00
cassidoxa d3ed95d639 Refactor inventory.asm 
Refactor extended save data to use MVN
Free small keys can be place in their own dungeon
 2023-07-29 00:48:34 -04:00
cassidoxa 0a073df728 Item receipt refactor 
Inverted maps
Fix shops
 2023-06-30 21:21:59 -04:00
codemann8 1235357531 Using new overflow GFX slot and redraw after item get 2023-06-15 11:12:40 -05:00
cassidoxa aec3370f48 More HUD stuff 2023-06-08 19:26:31 -04:00
cassidoxa 815c2ab81f More fast hud 
Added update hud flag
 2023-06-08 11:21:42 -04:00
codemann8 20f8ef457e Converting item GFX drawing to use pottery draw method 2023-05-05 20:54:36 -05:00
cassidoxa 5ef08d934c Fix file select HUD I broke 2023-03-13 17:49:00 -04:00
cassidoxa 1f8389c446 Fix small key stats tracker 2023-03-13 13:15:30 -04:00
cassidoxa 7968ddf020 Compass and map HUD display modes properly skip or draw 
Minor key count refactor, count HC and Sewers as both in all cases
 2023-03-12 17:20:54 -04:00
codemann8 750c412f59 Minor comment change 2023-02-25 21:37:44 -06:00
codemann8 b1f23151a2 Disable flute in rain state 2023-02-25 21:37:25 -06:00
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 af59265712 Don't lock inventory stats; temp fix for post-game progressive items 2023-02-21 15:39:55 -05:00
codemann8 4af93256a5 Merged DR v1.2.0.0 2022-12-01 14:10:35 -06:00
cassidoxa d7431b6550 Allow menu free dungeon item toggle with no menu items 2022-11-27 23:35:59 -05:00
cassidoxa 69fd6015e6 Some more annotations 2022-11-25 01:08:07 -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
aerinon 2acee4abb9 Flute activated pickup sfx 2022-09-07 15:09:04 -06:00
cassidoxa 031e3965b2 Requires frontend changes 
Change SRAM ammo capacity upgrades to flatly represent max capacity
 2022-08-08 13:42:19 -04:00
codemann8 ed72830397 Implemented Bonk Drop Shuffle 2022-07-24 11:29:28 -05:00
codemann8 7c7664224e Merged DR v1.0.1.0 2022-07-08 05:32:08 -05:00
aerinon 6f1eda9296 Fix for pottery/shopsanity conflict 2022-06-15 16:53:49 -06:00
aerinon 1ccc24f72f Fix dungeon completion bitfield (16-bit) 2022-05-26 09:14:08 -06:00
aerinon bea2d24d4d Fix dungeon completion bitfield 2022-05-26 09:14:05 -06:00
aerinon 9779f91ce9 Fix dungeon completion bitfield (16-bit) 2022-05-19 10:36:20 -06:00
aerinon 003278f7e0 Fix dungeon completion bitfield 2022-05-18 14:52:47 -06:00
cassidoxa 9c41ffb55b Merge branch 'sram_rework' into dr_sram 2022-04-20 00:30:35 -04:00
codemann8 697a742e09 Minor fix to flute SFX for pre-activated flute 2022-03-18 23:21:45 -05:00
cassidoxa 5d943d9a6d Add dungeons completed bitfield from door rando 2022-02-23 12:42:21 -05:00