Commit Graph

3931 Commits

Author SHA1 Message Date
Pepper0ni a6ceda989e Fix KF to LW sign region (#6571) 2026-04-28 20:16:49 +00:00
Pepper0ni 4b90ae48c7 Add missing hint logic, cleanup ganon's tower and mido logic, change LA rock name (#6565) 2026-04-26 14:39:01 +00:00
Pepper0ni ea76550fc7 Fix owl talk logic to include kokiri (#6564) 2026-04-25 15:30:27 +00:00
Philip Dubé ccfa31a245 Fix drag&drop not updating excluded locations (#6559) 2026-04-23 22:48:12 +00:00
Philip Dubé 806398a65b Fix OGC great fairy reward in vanilla with skip misc interactions when fish is not obtainable (#6556)
Item_CheckObtainability should only be called with MOD_NONE GI

For RG_DOUBLE_DEFENSE that became ITEM_FISH. Nonsense ensued

To reproduce issue, create debug save & go straight to OGC great fairy with only magic/ocarina/lullaby
2026-04-23 12:34:26 +00:00
Philip Dubé eeca7626d8 rocksanity (#5015)
Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
2026-04-22 14:50:14 +00:00
Philip Dubé f3d60e0ddd use bool over s8 (#6547) 2026-04-22 13:36:18 +00:00
Philip Dubé 92ba43d675 fix seed generation regression (#6549)
seedString is some unused variable, correct variable is seed
2026-04-22 03:11:07 +00:00
Philip Dubé 18bf4b315f RC_HF_OCARINA_OF_TIME_ITEM gated on RSK_OOT_HINT (#6546)
forgot to push in hint refactor
2026-04-21 23:07:59 +00:00
Pepper0ni 3221d8a988 Fix bean fairies + start with beans generation (#6548) 2026-04-21 23:04:37 +00:00
Philip Dubé 5d8c3c8883 Refactor hints (#6540)
small hint logic cleanup
share code for bridge requirements
refactor DistributeAndPlaceHints
2026-04-21 16:31:41 +00:00
Philip Dubé 69681e608f Fix swimvoid in grottos to just respawn in grotto (#6529) 2026-04-21 16:02:33 +00:00
Philip Dubé 719bb87eda add hint text for sun song fairies in spirit temple (#6544) 2026-04-21 15:30:33 +00:00
Philip Dubé fa875596f2 pool_functions cleanup (#6536)
remove 3drando/rando_main
2026-04-21 15:29:36 +00:00
Philip Dubé 94a5311cba port text.hpp to custom-message as text.cpp/text.h (#6541)
remove unused logic, leaving Text pretty bare bones
2026-04-20 18:37:05 +00:00
Philip Dubé 461cc0930f don't use 3drando/random.hpp outside 3drando (#6537) 2026-04-20 17:18:48 +00:00
Philip Dubé aa5379a8e0 remove 3drando/custom_messages (#6538) 2026-04-20 17:18:25 +00:00
Reppan bf37645d72 Fix mirror shield color editor (#6542)
Oversight on my end that customequipment.cpp unloaded and reloaded assets abit to aggressive.

Adds a guard to make sure to only unload if custom asset is used and to not unload then reload vanilla asset.

Have tested it with fados customequipment and confirmed that mirrorshield is working as intended.
2026-04-20 17:18:08 +00:00
Philip Dubé 3b65eaa4ef Fix cutscene skips causing credits to spawn player in Lake Hylia (#6534)
SkipBlueWarp was intercepting credits. Disable during GAMEMODE_END_CREDITS
2026-04-19 20:50:11 +00:00
Philip Dubé c7ef690bc2 func_$hex renaming from upstream (#6498) 2026-04-19 18:56:01 +00:00
Chris 3be7eff02c Arrow cycle should check for sufficient magic (#6532) 2026-04-19 15:04:13 +00:00
Philip Dubé 39dcc0a73c Triforce Hunt: drain queue before credits (#6519) 2026-04-18 21:21:29 +00:00
ProverbialPennance 80de5cc179 example flake - add missing deps, pin clang14 (#6531)
`Python3`, used for several CMake targets.
`Zenity`, a still used runtime dependency.
`xorg.libX11` -> `libx11`, packageset deprecated.
`imagemagick`, included as per @IQubic's research.
`clang_14`, clang-formatter used by decomp, thus also used by HM64
2026-04-18 13:07:10 +00:00
Philip Dubé f5e113c5aa fix Roc's translation (#6525)
feel like I've done this a few times now..

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
2026-04-18 13:05:57 +00:00
rannek06 52a08daf04 Fix Hint translation (#6507)
Fix the inversion of french and german articles in the hints, also adds or correct a few articles in french.

---------

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
2026-04-17 13:31:39 +00:00
Reppan 4587ca6dbe Horseback archery settings (#6517) 2026-04-17 13:22:57 +00:00
Philip Dubé 256ab01630 Fishing: don't say default 6/7 when minimum reduced by enhancement (#6523) 2026-04-17 04:31:02 +00:00
Philip Dubé 072838613a Fix kak bazaar items having articles (#6522)
IsShop didn't include SCENE_TEST01, but that's used as placeholder for kak bazaar vs market bazaar
2026-04-17 03:53:24 +00:00
Philip Dubé aedae12e63 Hookify DropsDontDie, NoFishDespawn, NoBugsDespawn (#6513) 2026-04-17 03:50:17 +00:00
Chris 9c321862ca Fix Rate Limited Success Chime (#6512) 2026-04-17 01:30:28 +00:00
A Green Spoon 412b60a02f Fix Duplicate Reticles in Anchor (#6520) 2026-04-16 23:50:55 +00:00
Philip Dubé 1876435e98 Fix skulltula hints ending text too soon (#6516) 2026-04-16 15:59:14 +00:00
Philip Dubé 27d35e5a92 Fix logic issues noticed while rebasing doorsanity (#6510)
These shouldn't generally matter right now
2026-04-15 15:23:33 +00:00
Sophia Caspe 12dddc5e8e Dungeon Rewards Own Dungeon + Light Medallion Handling Refactor (#6500)
Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
2026-04-15 13:44:52 +00:00
Philip Dubé 17a8f460e0 Merge pull request #6504 from HarbourMasters/develop-ackbar
merge develop-ackbar 9.2.3 to develop
2026-04-14 16:48:19 +00:00
Philip Dubé cb71e22a79 9.2.3 Ackbar Delta (#6503) 9.2.3 2026-04-13 23:48:22 -07:00
Philip Dubé feb489cab0 Fix shopsanity soft lock (#6502)
GetForCurrentLanguage() defaults to MF_FORMATTED, appending MESSAGE_END (\x02) to output string

Revert using hint name for items in shops. Other merchants return GetHintMessage directly
2026-04-14 06:41:37 +00:00
Philip Dubé 4cae72463e Merge pull request #6497 from serprex/develop922
merge develop-ackbar 9.2.2 to develop
2026-04-14 02:31:35 +00:00
Demur Rumed a60d46141b Merge remote-tracking branch 'origin/develop-ackbar' into develop922 2026-04-14 01:10:10 +00:00
Philip Dubé adb1e46ba9 fix bad args handling in extractor (#6501) 9.2.2 2026-04-14 01:00:16 +00:00
Philip Dubé 13ebc31ec7 9.2.2 Ackbar Charlie (#6494) 2026-04-13 14:12:37 +00:00
Jerom Venneker ca38dba192 Add missing Hint clarities back (#6477) 2026-04-13 03:39:30 +00:00
Philip Dubé 25eb09180d Revise Arrow Cycling (#6490)
1. simplify UI, flashing buttons are unnecessary
2. change arrow without drawing a new arrow
2026-04-12 23:03:46 +00:00
Philip Dubé d855742c2f Avoid over-allocating with texture interpolation (#6489)
Also remove interpolation with all zeroes & fix one interpolation direction
2026-04-12 18:51:04 +00:00
Philip Dubé 8513fd8800 fix cosmetic/audio randomizing options being seeded when they shouldn't be (#6481) 2026-04-12 18:25:05 +00:00
Philip Dubé 568813a2a4 Remove tooltip text referencing Let It Snow chests (#6488)
Was not preserved in chest revamp
2026-04-12 18:24:53 +00:00
Philip Dubé 7b7b799fad Make Lake Hylia water level switch in rando 10x faster (#6492)
35 seconds was an eternity
2026-04-12 18:24:14 +00:00
Philip Dubé 88099e6ebe Fix generation failure for Ganon's Castle MQ Fire Trial (#6487) 2026-04-12 13:27:06 +00:00
Jordan Longstaff 68cd04175d Update ccache-action version to 1.2.22 (#6482) 2026-04-11 14:55:20 +00:00
Jordan Longstaff b2f0cae9ec Added slider for Rupee Diving Game's time limit (#6476) 2026-04-10 23:51:38 +00:00