codemann8
75fd81ab57
Merged in DR v1.4.1.6
2024-02-23 11:11:59 -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
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
9c41ffb55b
Merge branch 'sram_rework' into dr_sram
2022-04-20 00:30:35 -04: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
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
1dca518150
Update halfmagicbat.asm
...
JML
2021-03-25 05:10:39 -04:00
Bonta-kun
ddd456c04e
multiworld
2020-06-08 09:19:18 -07:00
Kevin Cathcart
14783a12e0
Implement item table encryption
2018-07-09 09:26:08 -04:00
Karkat
f755a63925
initial checkin
2017-05-17 13:00:32 -04:00
codemann8