codemann8
581e45a63c
Merge branch 'DRUnstable' into OWMain
2025-12-03 09:37:31 -06:00
KrisDavie
761365927f
Prevent prizes dropping in dungeons where they shouldn't (including cave state) and fix rain state items/tablets.
2025-12-02 08:28:08 -07:00
codemann8
d75c72f85d
Some byte designation corrections + formatting
2024-04-12 15:58:09 -06:00
codemann8
2367f16179
Formatting and notation
2024-04-10 04:26:17 -05:00
codemann8
a70251d2b2
Applied labels and byte designators
2024-04-09 09:26:27 -06:00
codemann8
a008406fde
Implmented New Item GFX System
2024-03-01 14:00:10 -06:00
codemann8
75fd81ab57
Merged in DR v1.4.1.6
2024-02-23 11:11:59 -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
cassidoxa
90ffa8bd23
Fix cave state item cutscene flag with boss hearts
...
Add item substitutions
2023-08-25 21:11:48 -04: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
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
codemann8
20f8ef457e
Converting item GFX drawing to use pottery draw method
2023-05-05 20:54:36 -05:00
cassidoxa
36ca193b75
Newitems
...
Fix magic bar & file select HUD
2022-12-29 12:09:50 -05:00
cassidoxa
5ab91e7137
Fix tablet check
2022-12-19 12:37:51 -05:00
spannerisms
0397623340
cassidy
...
item properties tabulated with a macro
new item graphics
better hex to dec code
some item code readability improvements
2022-12-05 00:18:27 -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
9c41ffb55b
Merge branch 'sram_rework' into dr_sram
2022-04-20 00:30:35 -04:00
cassidy
ae82caca45
Replace more labels
...
Removed mask from rupeelimit.asm as total item counter is now a 16-bit
value
Commented out CountBits in utilities.asm in previous commit as I've
allocated a counter byte in SRAM
2021-12-16 17:19:54 -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
c97475f422
BRL -> JMP
2020-12-27 08:04:32 -05:00
Bonta-kun
2a5e305fc6
implement remote item checks
2020-06-08 09:25:25 -07:00
Bonta-kun
94218b048b
Dont replace multiworld items
2020-06-08 09:20:17 -07:00
qwertymodo
768fbad245
Make existing code compatible with asar
2019-11-17 15:20:57 -08:00
Kevin Cathcart
72f7451b6c
Prevent Standing items from corrupting if hit by hookshot/boomerang
2018-09-14 18:16:27 -04:00
Kevin Cathcart
a4a0ef8d04
Fix Tablet items
...
Ensure that standing overworld items will never load the null item.
2018-07-26 19:00:25 -04:00
Kevin Cathcart
7204f6c2d4
Fix duplicate hooks.
...
Also simplify the LoadNarrowObject Hook, and correct the hook location
comment for it.
2018-07-21 18:30:22 -04:00
Kevin Cathcart
edb3cbaaeb
Standardize on JML for long jumps (instead of JMP.l)
2018-04-21 22:12:51 -04:00
Karkat
f755a63925
initial checkin
2017-05-17 13:00:32 -04:00