468d1e3ec4
Merge branch 'main' into kara
2023-09-05 14:46:57 -05:00
826f6f6795
Move non-swords not damaging enemies to high bit of special weapons
2023-09-04 14:46:34 -05:00
ae8020642b
Show B indicator in menu when can switch item to B button
2023-09-03 18:22:25 -05:00
cassidoxa
73b2a180ba
Fix AddInventory/stats tracking with 16 bit item properties
2023-09-02 22:57:50 -04:00
cassidoxa
2cead7ae92
Fix Active flute standing item gfx
...
Move setting dungeon completed to prize pickup (or after aga1/aga2)
Fix some inverted tiles
Remove text-related conditional assembly
Make InventoryTable_properties 16 bits wide
Fix expanded save slot writing to cart SRAM
Fix HUD resetting with red potion
2023-09-02 15:55:37 -04:00
5a3277dbaf
Generalize item-on-B approach
2023-09-02 12:59:15 -05:00
a587bf29ae
Add toggle of bugnet-on-B
2023-09-01 16:55:45 -05:00
d71ffe0d9a
Merge branch 'main' into kara
2023-08-31 20:02:10 -05:00
dca8486b1a
Bug net mode, hopefully
2023-08-30 16:58:24 -05:00
cassidoxa
90ffa8bd23
Fix cave state item cutscene flag with boss hearts
...
Add item substitutions
2023-08-25 21:11:48 -04: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
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
e1643698f0
Merge branch 'main' into kara
2023-03-19 15:36:48 -05:00
2a9b098dac
Merge branch 'main' into kara
2023-03-13 21:33:27 -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
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
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
98b13507f1
Merge branch 'main' into kara
2022-11-16 14:52:02 -08: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
9d079dbd0f
Revert "Fix mixing progressive/non-progressive swords and shields"
...
This reverts commit 9bcb72f7bc
2022-10-12 15:55:18 -07:00
9bcb72f7bc
Fix mixing progressive/non-progressive swords and shields
2022-10-08 15:38:20 -07:00
bfc361ad3e
Remove non-progressive bomb/cane upgrades
2022-09-18 15:02:37 -07:00
cassidoxa
031e3965b2
Requires frontend changes
...
Change SRAM ammo capacity upgrades to flatly represent max capacity
2022-08-08 13:42:19 -04:00
f7070dd30f
Merge branch 'main' into kara
2022-07-23 17:33:34 -07:00
9d485e86cd
Merge branch 'main' into kara
2022-07-23 16:47:01 -07: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
cassidoxa
5d943d9a6d
Add dungeons completed bitfield from door rando
2022-02-23 12:42:21 -05:00
cassidoxa
838d4e9bf8
Refactor dungeon locations checked incrementing
...
Fix BowTracking documentation
2022-02-18 17:45:33 -05:00
