Commit Graph

447 Commits

Author SHA1 Message Date
53d2a7606a Merge remote-tracking branch 'codemann/OWMain' into codemann_OWMain 2026-01-25 21:15:13 -06:00
37ee113f9d Merge in dungeon map changes (#1)
known issues:
- in-room stairs in door shuffle draw slightly bugged sometimes
- entrance sprites in non-doors are sometimes drawn on the wrong floor
- in some modes, sanctuary will open HC map instead of sewers/HC2 map

Reviewed-on: #1
Co-authored-by: Kara Alexandra <ardnaxelarak@gmail.com>
Co-committed-by: Kara Alexandra <ardnaxelarak@gmail.com>
2026-01-25 22:43:02 +00:00
codemann8
781431f633 Fixes issue not able to screen transition if bumped by enemy in water 2026-01-19 15:21:03 -06:00
codemann8
5af2fdc51e Fix psuedoboots ability to open Kings Tomb 2026-01-08 19:47:06 -06:00
a6ad4c082b Finish pseudoflute 2025-12-13 22:48:03 -06:00
74d9c72cc8 Pseudoflute 2025-12-13 19:06:11 -06:00
18a73e3b88 Add flag to make the baserom work 2025-12-12 21:33:08 -06:00
4f0703ea62 Merge remote-tracking branch 'codemann/OWMain' into GKNew 2025-12-12 18:16:07 -06:00
codemann8
2418c1b322 Fix for post-mirror follower sprite gfx 2025-11-22 06:52:45 -06:00
e4f9c4cffc Add variable ganon vulnerability mode 2025-09-03 19:53:10 -05:00
cef41b1674 Merge branch 'OWMain' into GKNew 2025-09-01 10:56:43 -05:00
codemann8
060554a5fb Implemented ability to change GT cutscene gfx 2025-08-25 15:20:36 -05:00
codemann8
ea4f39e116 Corrected some music fade-outs during mosaic transitions 2025-08-19 10:16:16 -05:00
codemann8
8ac480947d Fix for music so it doesn't change when going into special OW screens 2025-08-19 10:12:05 -05:00
codemann8
11ff5825ae Fix music change after dig game ends 2025-08-19 10:10:51 -05:00
codemann8
34fa1cd98e Fix issue with music silence in DR when straight stairs lead to pre-Aga room 2025-08-19 10:10:08 -05:00
codemann8
4c5adfbee2 Fix issue with LH/BS half volume issue when exiting to Kakariko 2025-08-19 10:08:36 -05:00
9256f48f5e Merge branch 'OWMain' into GKNew 2025-07-01 14:08:48 -05:00
codemann8
021ba9d8a6 Actual fix for issue with no music in LH after S+Q from Kakariko 2025-06-12 01:50:21 -05:00
codemann8
4088698af9 Undo MSU Kak Music Fix 2025-06-12 00:54:23 -05:00
codemann8
baec6954a3 Reset MSU Resume on S+Q 2025-06-05 20:52:13 -05:00
2344f9490e copy skulls manually instead of DMA 2025-05-18 02:56:13 -05:00
642aec9112 Fix gloom heart icons to be loaded via DMA 2025-05-18 02:32:39 -05:00
a3f892975f Merge branch 'OWMain' into GKNew 2025-05-04 15:18:54 -05:00
codemann8
86efa74185 Various bug fixes for Follower Shuffle post-launch
- Fix issue with infinite purple chest item get
- Fix issue with Kiki running away on iframe ledge hops
- Fix issue with bad follower gfx on screens with followers
- Fix issue with Zelda appearing in conditional follower locations
2025-05-04 09:24:33 -05:00
codemann8
aabb649578 Initial Follower Shuffle Implementation 2025-04-30 06:18:08 -05:00
66e4e91beb Dashing mimics and crystal books 2025-03-09 16:42:54 -05:00
bc966c0f99 Dark room modes 2025-03-09 13:25:22 -05:00
codemann8
2e0eb97a4b Fixed rare crash during music transition 2024-12-14 14:11:11 -06:00
codemann8
274ef3f39d Improved Psuedoboots 2024-12-13 16:52:20 -06:00
codemann8
9e84707f13 Fixed crash on pedestal pull 2024-09-03 10:02:10 -05:00
codemann8
b3979affc9 Don't delete follower on crystal cutscene if prize shuffle 2024-08-27 07:15:18 -05:00
codemann8
23943f2234 Fix some music issues 2024-08-27 07:12:57 -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
879b02387e Fixed issue with HP refill canceling out of post-boss cutscene 2024-05-29 16:16:05 -05:00
codemann8
f9da730caf Initial Prize Shuffle Implementation 2024-05-23 18:23:26 -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
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
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
553fb272a0 fix: remove terrorpin ai code 2024-01-03 10:32:47 -07:00
cassidoxa
7001767c9b Fix dungeon prize ancilla spawn regression 2023-12-27 11:39:00 -05:00
Randall Rupper
52325979a7 fix: YA Hera Boss music fix 2023-11-15 15:10:19 -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