Commit Graph

3586 Commits

Author SHA1 Message Date
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
Philip Dubé
5a484331b6 Fix merge regression in Shuffle Masks (#6147) 2026-01-17 05:30:00 +00:00
Philip Dubé
44d351698b Shuffle Masks (#5536)
Future improvements can build on this,
giving masks abilities,
or adding checks for trading mask to someone
2026-01-17 05:00:03 +00:00
mckinlee
69f151e79d i control boom (#6136) 2026-01-17 00:26:31 +00:00
Philip Dubé
04df48944a Shuffle Open Chest (#5946) 2026-01-16 18:34:14 +00:00
Jordan Longstaff
6606eefbf1 Add option to disable Link spinning with the Goron Pot (#6138)
Make Link focus on Goron Pot instead
2026-01-16 13:55:36 +00:00
Reppan
6e4c010ffe [Custom equipment] fix fallback (#6113) 2026-01-16 04:08:09 +00:00
Philip Dubé
9c1a1728ee fix dev, broke due to incompatible PRs (#6144) 2026-01-16 01:59:36 +00:00
Malkierian
704ace8fd3 ImGui-Driven Extraction Flow and Progress Reporting (#5892)
This sets up the initialization process to allow for producing an ImGui window before ROM archives are made, so that ImGui can be used to prompt users along the O2R creation process instead of using the OS prompts, which aren't always usable even on some Linux devices, let alone other 2nd-party port platforms, as well as graphically report extraction progress.
2026-01-15 23:10:20 +00:00
Jordan Longstaff
c7e4e8ccee Owl Travel cutscenes skipped as One Point cutscenes (#6141) 2026-01-15 21:02:27 +00:00
Christopher Leggett
7b3efb1e7b Upgrades Custom Messages to Hooks and ShipInit (#5101)
Defines the hook for OnTextLoad. Intercepts message loading with hooks. Adds file to handle the CustomMessage creation for items.

Handles Ice Traps, Triforce Pieces, and Custom Items. Handle maps, compasses, and keys

Converts gossip stone hints to hook. Handle one-off merchant messages. Convert scrubs and shop text and remove now-unused code

Convert Sheik and Ganondorf hint text. Convert skulltula people messages. Convert more static hints

Specifically Dampe, Greg, Warp Songs, Frogs, Loach, Fishing Pole, and Saria

Convert Biggoron Hint. Convert Big Poes hint. Convert Anju hint dialogue. Convert Malon hint. Convert Horseback Archery hints. Convert Mask Shop SIgn hint

Convert Lake Hylia Switch related text. Convert Shooting Gallery bow reminder message

Convert random rupee names. Convert Rando-Relevant Navi Enhancement. Convert Random Goron messages

Convert Injecting Skull token counts. Add in a way to AutoFormat with an item icon.. Fix some errors with skull tokens and apply icon

Convert heart container item counts. Convert Inject Item Count for Heart Pieces. Port Better Bombchu Shopping. Convert Market Sneak

Port Quit Fishing At Door and clean up unused stuff. Reintroduce missing Mysterious warp song hint

Make ShipInitFuncs static

Adds and uses per-item articles for get item messages

Fix Entrance Hints and port toggle from dev-copper
2026-01-15 20:57:13 +00:00
Fabien Romano
c43139ebd6 fix build and run on OpenBSD (#6050) 2026-01-15 20:46:03 +00:00
Pepper0ni
a92f07e1f1 Fix quest leak assert triggering in no logic (#6143) 2026-01-15 19:31:19 +00:00
aMannus
0821c2e315 Fix boss souls on item tracker (#6142) 2026-01-15 15:51:04 +00:00
Reppan
0d4986f2c3 Add Clear List button to Mod Menu (#6137) 2026-01-14 18:50:33 +00:00
Philip Dubé
6e6834af22 Rando: Shuffle Crawl (#5032) 2026-01-14 04:29:30 +00:00
Garrett Cox
e149e09e08 Add GFX Stack to crash handler ext (#6130) 2026-01-12 05:11:42 +00:00
Pepper0ni
45fb38e309 Add Forest MQ Child Doorframe trick and fix some issues with courtyard Scarecrow (#6134) 2026-01-11 15:27:00 +00:00