Commit Graph

3603 Commits

Author SHA1 Message Date
Philip Dubé
8fd41474c1 Fix logic thinking child exiting OGC GFF leads to castle grounds, not past gate (#6207)
Also fix grotto's age redirection
2026-02-07 20:21:14 +00:00
Malkierian
2bfae47b7f Change interior pot access to only check for viable methods. (#6233) 2026-02-07 08:41:08 -07:00
Christopher Leggett
65c7c3e4a9 Fix Heart Containers/Pieces Item Pool Calculation (#6226)
This calc ends up with 8 heart containers in the pool with the default 3 starting hearts, just like the 8 heart containers in the vanilla game. Changing starting hearts results in half of the remaining hearts being filled by heart containers and half of the remaining hearts being filled by heart pieces.
2026-02-06 02:18:06 +00:00
anthony-barricelli
2656c20f71 check if rando for quest kaleido menu panel (#6231) 2026-02-04 18:59:52 +00:00
A Green Spoon
c021a0e8a2 Fix KD Without Bombs Trick Name (#6225) 2026-02-04 02:53:06 +00:00
Malkierian
cc0941cc9f Attempt to correct Linux appimage behavior. (#6215)
Also make Windows rom search react to the set search path.
2026-02-01 11:35:54 -07:00
anthony-barricelli
a4eacdd267 reset selected enemies list when clicking box for all enemies (#6219) 2026-01-31 15:00:06 +00:00
Shishu the Dragon
79d6f54be1 Fix segfault on quit (#6212) 2026-01-29 18:28:55 -07:00
Jordan Longstaff
23606325e6 Hookify Goron Pot (#6208) 2026-01-29 14:36:46 +00:00
Malkierian
8176e57144 Entrance Tracker Display Options (#6193)
Add all window display options to Entrance Tracker.
Apply hidden label filtering to combobox labels.
Remove tracker prefixes from check and entrance tracker preset load functions.
Remove all references to the menu bar, and the menubar source and header files.
2026-01-29 03:24:43 +00:00
Philip Dubé
473a77bbb2 Fix generation when Shuffle Speak disabled (#6206) 2026-01-28 18:22:21 +00:00
tortugaveloz
a365446832 Basic Surround Sound support. (#6204) 2026-01-28 05:14:57 +00:00
Philip Dubé
e2db315ffa Shuffle Speak (#5538)
Shuffles 6 languages (Deku, Gerudo, Goron, Hylian, Kokiri, Zora) to learn before being able to use Speak command with actors of that type. Other actors can still always initiate speech

Owl speaks anything (relevant for owl flights)
2026-01-28 05:14:14 +00:00
OtherBlue
16ee01404a small patch to match 2ship (#6197) 2026-01-26 03:26:16 +00:00
xxAtrain223
077fda8749 Stringify More Conditions (#6031) 2026-01-26 03:25:24 +00:00
xxAtrain223
f5264be192 Recalculate Available Checks from Current Region (#6165) 2026-01-26 03:23:47 +00:00
Christopher Leggett
983d04d362 Restores missing hint types that got lost in a merge (#6194)
Also fix bad text id on deku tree compass & fix dungeon map custom messages
2026-01-23 02:15:27 +00:00
Christopher Leggett
2af265dbce Add action shuffle icons to the item tracker (#6190) 2026-01-23 01:09:08 +00:00
Christopher Leggett
dfba6b319b Fixes missing flag filter theme color (#6191) 2026-01-23 00:08:58 +00:00
Eric Hoey
894b8e6c86 Glitch-Aiding CS Tweaks/Fixes/Addition (#6192)
unskip door shutter cutscene

add second jabu OI door to glitch-aiding cutscenes

add dc boss door shutter

fix spirit mq switch

add comments
2026-01-22 14:27:07 +00:00
Philip Dubé
2da233c40b Improve forest temple poe cutscene hack (#6185)
ACTOR_EN_ST isn't reliable in enemy randomizer,
& in doorsanity it's desirable to trigger in first room
2026-01-21 19:50:23 +00:00
Philip Dubé
6b160fac1c Entrance/Location: remove Getuint32_t method (#6186) 2026-01-21 16:33:35 +00:00
Philip Dubé
78c68ae3d4 Fewer Tunic Requirements: remove lies (#6183)
Logic has been widening use of Fewer Tunic Requirements, making the description no longer accurate
2026-01-21 06:39:38 +00:00
Christopher Leggett
fae74d4a5e Kaleido Tracker - Add new Shuffles (#6184)
Namely Swim, Crawl, Climb, Grab, Open Chests, and Bean Souls

Also added a page up and page down feature since the list is getting large. Assigned it to C-Left and C-Right. I'd like to put C-Down as "Jump to End" but the way things currently are I can't set C-Up as "Jump to Start" so I'll leave that one out for now.
2026-01-21 04:04:24 +00:00
Philip Dubé
c9414b4d45 Misc fixes mostly related to custom text refactor (#6174)
fix goron messages in rando
also always include "IS_RANDO" in rando shipinit dependencies
don't use rando RNG, trying std::array
avoid sprintf, std::array not necessary
fix random rupee name crash
roll random traps: don't reuse rando rng
fix better bombchu typo
2026-01-20 20:55:24 +00:00
Pepper0ni
9991a95ab1 fix maps and compasses not being added to the pool (#6180) 2026-01-20 15:39:03 +00:00
aMannus
c360b2dee4 Fix missing farores (#6176) 2026-01-20 01:11:52 +00:00
Philip Dubé
596b714fa4 Rando: Shuffle Climb (#5182)
Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
2026-01-19 19:47:56 +00:00
Philip Dubé
f52b653cfb Pot CMC (#6167)
Copied from https://github.com/HarbourMasters/2ship2harkinian/pull/1011
2026-01-19 19:40:09 +00:00
Fabien Romano
35039565df fix portArchiveVersion, DetectOTRVersion() use LocateFileAcrossAppDirs() so it needs filename as argument, not full path. (#6168) 2026-01-19 17:04:55 +00:00
aMannus
451820cac4 Fix skulltula messages (#6170)
Typo made the replace fail and then freeze the game on the autoformat step afterwards

Also fix water temple boss key text color
2026-01-19 15:19:02 +00:00
Garrett Cox
d7981bf03f Some tweaks to anchor (#6166) 2026-01-19 04:38:48 +00:00
Philip Dubé
a2245f7a47 Merge pull request #6164 from serprex/merge912
merge 9.1.2
2026-01-19 03:55:50 +00:00
Demur Rumed
7588734a42 Merge remote-tracking branch 'origin/develop-copper' into merge912 2026-01-19 02:35:48 +00:00
Philip Dubé
0dc6989438 9.1.2 (#6160) 2026-01-19 00:10:09 +00:00
Philip Dubé
be0f8fec9f Fix boot to debug warp screen not applying time savers (#6151) 2026-01-18 23:10:33 +00:00
xxAtrain223
651078f0b3 Added search boxes for Save Editor flags. (#6163) 2026-01-18 23:01:21 +00:00
Pepe20129
f541c3f4ad Shuffle Ganon Tower (#5078) 2026-01-18 22:38:01 +00:00
Philip Dubé
c71cc68951 Update references to soh.otr/oot.otr/oot-mq.otr to .o2r (#6161) 2026-01-18 16:59:20 +00:00
ItsHeckinPat
04c5d50b3e Ported BtnSelector from 2ship (#6158)
Allows the rebinding for Resetting the game, Debug Map Select, and Debug No-Clip.
Also allows for Speed Modifiers to use the new button combos, instead of only the modifier buttons.
2026-01-18 16:01:39 +00:00
Shishu the Dragon
eab279c0be Fix boot crash when v8 saves are present (#6157) 2026-01-18 14:29:57 +00:00
Philip Dubé
7006ef7404 Don't put unshuffled master sword into playthrough (#6146)
Includes some cleanup. Main point is:
1. hidden checks are not hintable
2. hidden checks should not be written to spoiler log
2026-01-18 14:29:06 +00:00
Philip Dubé
18b00e7bc1 Shuffle Grab (#5719)
AKA str0. Named in-game item Power Bracelet

Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
2026-01-18 05:32:31 +00:00
Philip Dubé
60205ec0bd item list: bring back bean souls (#6156)
got lost somehow. also align columns
2026-01-18 05:13:45 +00:00
Philip Dubé
5e802f232d Fix ZR/LW entrance shuffle leak (#6154) 2026-01-17 21:00:35 +00:00
Philip Dubé
f474a86928 Cleanup various things noticed while fixing rando generation / debug warp (#6152)
Adjust RAND_GET_OPTION to return option instead of option value
2026-01-17 20:34:24 +00:00
Philip Dubé
9ab58a8d07 Fix rando objects not randomizing (#6150)
Recent changes in init ordering had param hashmap built before static locations setup by hooks
2026-01-17 18:03:51 +00:00
xxAtrain223
1af0f4e395 Added Scarecrow Spawn to the Collision Viewer. (#6148) 2026-01-17 15:55:41 +00:00
Garrett Cox
c36468ccbd Add bounce off walls toggle (#6110) 2026-01-17 06:11:17 +00:00
Jordan Longstaff
7850fa82df Modularize enemy defeat count hook & fix counting bugs (#5885) 2026-01-17 05:35:45 +00:00