4f0703ea62
Merge remote-tracking branch 'codemann/OWMain' into GKNew
2025-12-12 18:16:07 -06:00
codemann8
a97f8fbb48
Merged in DR v1.5.2
2025-12-09 16:44:50 -06:00
aerinon
ac7f50fc62
fix: revert to old way
2025-12-09 14:43:47 -07:00
codemann8
dd9ea4d38e
Merge branch 'DRUnstable' into OWMain
2025-12-09 09:23:48 -06:00
aerinon
4437194cfe
fix: key counts again
2025-12-08 16:37:51 -07:00
codemann8
581e45a63c
Merge branch 'DRUnstable' into OWMain
2025-12-03 09:37:31 -06:00
aerinon
70a23191ba
fix: bunch of fixes for key counting system
2025-11-19 16:29:40 -07:00
codemann8
a9ef09e2d0
Fixed Ganon silvers hint for free-standing items
2025-10-18 02:26:42 -05:00
9b7e5646b3
Improve junk item configuration
2025-09-05 20:47:36 -05:00
e92aa018e3
Multiworld junk item shortening
2025-03-17 19:02:02 -05:00
codemann8
d42417657b
Allow flute use in rain state if weathervane is activated
2025-01-08 08:37:22 -07:00
codemann8
72b7dea6fd
Allow flute use in rain state if weathervane is activated
2025-01-02 04:52:03 -06:00
codemann8
94f8bec8ae
Revert "Fixed issue with vanilla HCBK acting like a small key"
...
This reverts commit d3eb4c229f
2025-01-02 03:28:31 -06:00
codemann8
d3eb4c229f
Fixed issue with vanilla HCBK acting like a small key
2024-10-30 10:20:51 -05:00
codemann8
a5dfd97687
Merged in DR v1.4.5
2024-08-16 23:00:45 -05:00
aerinon
024746d78f
Merge remote-tracking branch 'upstream/master' into DRUnstable
2024-06-18 11:50:26 -06:00
aerinon
6e327c951f
feat: couple nice to haves for mirror scroll & fake boots
2024-06-14 17:04:30 -06:00
codemann8
f9da730caf
Initial Prize Shuffle Implementation
2024-05-23 18:23:26 -05:00
codemann8
50895c1ac2
Potential fix for weird bonk item dupe onto other standing items
2024-04-21 00:50:38 -05:00
codemann8
d75c72f85d
Some byte designation corrections + formatting
2024-04-12 15:58:09 -06:00
codemann8
27685ac77d
More merge labeling
2024-04-09 13:24:54 -05:00
codemann8
a70251d2b2
Applied labels and byte designators
2024-04-09 09:26:27 -06:00
codemann8
4b332c35a4
Removed unneeded MiniGameTimer setting
2024-03-24 17:47:39 -05:00
codemann8
b9da56c8ad
Added flag to skip bee trap disguises in various scenarios
2024-03-20 17:38:57 -05:00
codemann8
56def59f58
Fix invisible powder item
2024-03-20 17:34:12 -05:00
codemann8
a008406fde
Implmented New Item GFX System
2024-03-01 14:00:10 -06:00
codemann8
59eb254116
Merged in DR v1.4.1.6
2024-03-01 13:55:23 -06:00
codemann8
75fd81ab57
Merged in DR v1.4.1.6
2024-02-23 11:11:59 -06:00
aerinon
50dec603e2
fix: duplicate code
2024-01-25 11:04:16 -07:00
aerinon
fc08fa33c8
Merge branch 'DRVolatile' into DRUnstable
2024-01-22 11:00:36 -07:00
spannerisms
014b3a719a
fix things
2024-01-04 06:45:57 -05:00
Randall Rupper
97f3c527b0
fix: shopsanity repeatable item fix
2024-01-02 17:57:33 -07:00
Randall Rupper
79bdace3b3
fix: disable flute in rain state (except glitched modes)
...
fix(msu): GTBK music in DR
2023-11-15 14:49:29 -07:00
Randall Rupper
62356f0159
fix: disable flute in rain state (except glitched modes)
...
fix(msu): GTBK music in DR
2023-11-15 14:30:44 -07:00
aerinon
a8a1eaa1b9
Fix for counter rolling over
...
Fix for Lamp for another player being substituted with standing items
Fix for received keys not being counted correctly
Fix for pendants counting as items
2023-09-20 12:54:44 -06:00
aerinon
c0dff8e7c9
Bugfixes for duping/disappearing item and mutliworld crash
2023-09-13 14:28:18 -06:00
cassidoxa
cc36ccc0b1
Add time stamp for tossed fighter sword item
2023-09-10 00:55:03 -04:00
aerinon
2561737236
Merge remote-tracking branch 'baserom/master' into MergeDecompression
...
# Conflicts:
# inventory.asm
# newhud.asm
2023-09-08 13:49:16 -06:00
aerinon
e772b4a931
Progressive Shields fix
...
Fix for collection rate overflow
Fix for progressive shield standing item (narrow version)
Fix for double key counts
Multiworld item substitution
Made map key coutner not depend on new flag for now
2023-09-08 13:42:22 -06:00
cassidoxa
790f3f0ba3
Fix HUD item icon not refreshing after last bomb spent
...
Rename UpdateHUD to UpdateHUDFlag, replace with UpdateHUD vanilla JSR
label
2023-09-07 16:29:45 -04:00
aerinon
134651e4fb
Merge remote-tracking branch 'baserom/master' into MergeDecompression
...
# Conflicts:
# LTTP_RND_GeneralBugfixes.asm
# inventory.asm
# itemdatatables.asm
# newitems.asm
2023-09-07 12:21:22 -06:00
cassidoxa
7dc71cf1ac
Fix some stats counting
2023-09-07 11:53:24 -04: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
aerinon
9fc85218ae
Fixed ExtendedSRAM not saving
...
Fix enemy drops and pots with Fairies/Chickens/Big Magic
Fixed Big Magic refill when in chests/standing items
Changed shop code to respect ShopEnableCount flag
2023-09-01 14:13:01 -06:00
aerinon
150adec969
Sewers count fix
2023-08-30 15:25:29 -06:00
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
