102 Commits

Author SHA1 Message Date
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
0d827eadd2 Merge branch 'DRUnstable' into OWMain 2025-12-04 19:12:35 -06:00
aerinon
fca7f214bc fix: key counts for pot keys and normal absorbed keys 2025-12-04 15:37:02 -07:00
codemann8
dfe49a11c4 Merged in DR v1.5.0 2025-12-03 10:09:50 -06:00
codemann8
581e45a63c Merge branch 'DRUnstable' into OWMain 2025-12-03 09:37:31 -06:00
aerinon
b583cc58ff fix: not sure what I was thinking - fix branches and width 2025-12-02 11:09:37 -07:00
aerinon
68c511d6be fix: skip map check based on "compass" mode 2025-12-02 08:26:33 -07:00
aerinon
5936b08497 fix: skip map check only when maps aren't shuffled 2025-11-20 10:04:53 -07:00
aerinon
70a23191ba fix: bunch of fixes for key counting system 2025-11-19 16:29:40 -07:00
codemann8
7b93b4b4eb Added new gfx for 10/11 keys rather than A/B keys 2025-11-18 23:54:10 -06:00
aerinon
fee689e583 feat: hud shows all keys, instead of chest keys. Dropped Map requirement for key info. 2025-11-18 15:19:28 -07:00
codemann8
d75d912c7d Added some compass icons to DR pause menu 2025-07-10 22:59:51 -05:00
codemann8
953c115719 Fix HUD to show prize, key count, and compass count if seen by player 2025-07-07 15:03:14 -05:00
codemann8
aabb649578 Initial Follower Shuffle Implementation 2025-04-30 06:18:08 -05:00
codemann8
c7c97196fb Fixed issue with drawing A items on HUD with DR menu 2024-08-16 21:41:43 -05:00
codemann8
f9da730caf Initial Prize Shuffle Implementation 2024-05-23 18:23:26 -05:00
codemann8
0d84af814a Merged in DR v1.4.1.10 2024-04-18 09:47:17 -05: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
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
9cfeb18fef Merged in DR v1.4.1.9 2024-03-30 04:30:56 -05:00
aerinon
f25c9dd4c4 fix: dungeon indicator changes 2024-03-28 13:14:15 -06:00
codemann8
495a8c93f7 Removed unused superbunny mirror bonk freeze code 2024-03-24 17:42:34 -05: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
ed8cefe0c6 fix: bad branch, bad org, dead code, bad args flags 2024-02-07 12:36:54 -07:00
Randall Rupper
8c080c81a6 refactor: clarify StandardAgaDmg code paths 2024-01-03 11:06:00 -07:00
KrisDavie
660674c051 Add toggle to override aga1 invulnerability in standard 2024-01-03 10:53:22 -07:00
codemann8
8e9b4c234b Fix Old Man death putting you on Pyramid 2023-09-27 16:09:45 -05:00
aerinon
f3768ea0ad Fix problems with mystery hidden item total
Upgrade blue enemy drop indicator to work with caves
2023-09-26 13:31:34 -06:00
aerinon
b831dd29a5 Turn off enemy drop indicator based on flag 2023-09-12 10:10:42 -06:00
aerinon
5ccdebe09d Fixing crashes 2023-08-31 14:22:46 -06:00
aerinon
d09aea3ff9 2 byte compass counts 2023-08-30 12:33:27 -06:00
aerinon
cd67d27798 Hud update flag added for standing items
Ram addresses updated
Minor multiworld fix
2023-08-30 10:25:20 -06:00
aerinon
b688149dfa Fix for shops and powder
Fix for dungeon indicator
2023-08-28 11:32:46 -06: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
aerinon
78b5695e30 Prevent cross dungeon drops
Enemy drop indicator prototype
2023-08-17 13:39:18 -06:00
aerinon
6a22218727 Merge branch 'DRUnstable' into DRVolatile
# Conflicts:
#	doorrando/bugfix/kholdstare_shell_collision.asm
2023-08-04 11:32:19 -06:00
codemann8
653f66e57a Fix for Hera music silence 2023-07-10 10:28:17 -06:00
codemann8
9c08588d92 Added a TF Cutscene when getting the TF item 2023-05-13 02:07:40 -05:00
codemann8
9500800c3c Minor formatting and small optimization 2023-05-05 22:11:19 -05:00
codemann8
3d9b76eda0 Fix pottery to retain gfx during map check 2023-04-16 04:34:55 -05:00
codemann8
480372f7a5 Merged in DR v1.2.0.16 2023-04-14 15:30:35 -05:00
aerinon
08c178a974 Fix Kholdstare shell collision at Lanmo 2 or other tiles where the shell could limit movement. 2023-04-14 14:13:27 -06:00
aerinon
ef057638c5 Comment edits 2023-04-10 12:20:15 -06:00