Merge branch 'main' into beta

Fix orange potion being overwritten
Ganon needs ARROWS not ARROYS, silly logic
2026-06-15 16:58:00 -05:00 · 2026-06-15 16:57:05 -05:00 · 2026-06-13 20:35:20 -05:00 · 2026-06-09 10:33:54 -05:00 · 2026-06-08 16:13:27 -05:00 · 2026-06-07 21:48:20 -05:00
2 changed files with 1 additions and 1 deletions
--- a/Rom.py
+++ b/Rom.py
@@ -85,7 +85,7 @@ from Utils import int16_as_bytes, int32_as_bytes, local_path, snes_to_pc
 from Versions import DRVersion, GKVersion, ORVersion

 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '589a044786a63d98aff0e44b51a6a339'
+RANDOMIZERBASEHASH = 'd80446af9eeb1726d2b6c1303bec1226'


 class JsonRom(object):
--- a/data/base2current.bps
+++ b/data/base2current.bps
Author	SHA1	Message	Date
Kara Alexandra	b3fb8b2867	Merge branch 'main' into beta	2026-06-15 16:58:00 -05:00
Kara Alexandra	b61c198159	Fix orange potion being overwritten	2026-06-15 16:57:05 -05:00
Kara Alexandra	e664d73fcb	Ganon needs ARROWS not ARROYS, silly logic	2026-06-13 20:35:20 -05:00
Kara Alexandra	c8870742ae	Merge branch 'beta'	2026-06-09 10:33:54 -05:00
Kara Alexandra	68c8d17d32	Update baserom	2026-06-08 16:13:27 -05:00
Kara Alexandra	65781912a6	Update hint text for refill hearts and heart containers	2026-06-07 21:48:20 -05:00
Kara Alexandra	36e57bcdf4	Merge branch 'beta'	2026-06-07 13:47:14 -05:00
Kara Alexandra	7bab5b0434	Merge commit '3cb1e'	2026-05-04 00:41:59 -05:00