Commit Graph

2840 Commits

Author SHA1 Message Date
Fredrik Andréasson
10e4b70bc9 * Changed to ShipInit (might be missing something?)
* Corrected Should in z_en_kusa.c to use original draw func when setting is Off
2025-01-28 20:10:01 +01:00
Fredrik Andréasson
fbf1b49c3e Merge remote-tracking branch 'hm64/develop' into grassanity 2025-01-28 03:16:21 +01:00
briaguya
668e266ecc
clamp addAlpha when skipping spinning logos to prevent softlock (#4964)
* debug print logos seen

* maybe this is the fix, not sure if there's a better option i'm overlooking

* use clamp

* msvc plz

* msvc?

* max is cleaner
2025-01-27 18:59:46 -07:00
Fredrik Andréasson
20ed9deea9 merge and update options from develop 2025-01-28 02:59:39 +01:00
Malkierian
41cf6b3338
LUS bump (#4960) 2025-01-27 14:13:14 -07:00
briaguya
744fab4b05
fix build (#4961) 2025-01-27 13:21:40 -07:00
Pepe20129
31cd419d6f
Update kakariko.cpp (#4959) 2025-01-27 11:31:50 -07:00
Christopher Leggett
b5e6342bc1
Rip Settings out of Rando::Context (#4943)
Not completely happy with everything here but this should fix the bugs
related to settings getting cleared on save load.
2025-01-27 11:30:04 -07:00
Malkierian
ef0350d830
Add translation for bottle item RGs to itemIDs for assigning to slots in logic.cpp (#4954)
Change `CanEmptyBigPoes` to reset to false instead of true.
2025-01-27 09:48:13 -07:00
briaguya
83000e2f6a
bump lus (controllerdb device at boot fix) (#4951)
* test controllerdb device at boot fix

* lus main
2025-01-26 19:37:14 +01:00
Eric Hoey
97c686c2a6
Fix fairy shuffle in LW Scrub Grotto and Royal Family Tomb (#4934)
* add missing fairy locations+hint text

* match rft chest name
2025-01-25 16:35:20 -07:00
Malkierian
8f67efee58
Entrance Names Redux (#4941)
* Add "Blue Warp" to the boss sides of the blue warp pairs to differentiate from the bosses on the other sides of boss doors.
Fix some names that weren't the same in both pairs of entrances.
Renamed a few other entrances for clarification.

* Add function to check entrance name consistency.
Fix remaining non-matching names.

* Document CheckEntranceNames.
Remove declaration of it from the header.
2025-01-25 10:09:17 -07:00
Eric Hoey
b6aa01b28c
fix fire temple hints (#4950) 2025-01-25 09:51:07 -07:00
Christopher Leggett
e99771f69c
Cause spoiler to be re-parsed on soft-reset (#4944) 2025-01-25 09:50:44 -07:00
Garrett Cox
8ac8dc3fd0
Move trap handler to its own file and make the additional trap types seeded (#4942) 2025-01-25 09:50:36 -07:00
Fredrik Andréasson
51b41d6d38 * merged ZR near PoH grass into a single loc 2025-01-25 00:45:32 +01:00
Fredrik Andréasson
c22b064a7a Merge remote-tracking branch 'hm64/develop' into grassanity 2025-01-25 00:20:57 +01:00
Fredrik Andréasson
dee8b44755 * Fixed market bushes by tree not working at night 2025-01-25 00:20:09 +01:00
briaguya
388eb487e3
rework "Authentic Logo Screen" and "Fast File Select" (#4939)
* skip z_title with button press

* use `RegisterShipInitFunc`

* rip out a bunch of custom ztitle code

* ok now it's almost fully back to vanilla

* titles are back for a limited time

enjoy #Skipping

* move old customizations into new custom draw

* finally getting the hang of this shipinit thing

* vb should let it snow

* boot sequence logic

* clean up logic to better handle changing boot sequence settings

* remove fast file select stuff

* remove authentic logo screen setting

* about window - not super pretty but not ugly imo

* maybe this fixes windows

* maybe alloca? idk why it's working in other files

* just pulling in every include hoping something works

* Revert

This reverts commit c1d02c9a40.

* try some macro fixing magic

* fix another c vs cpp thing

* do it without an extra var

* make `GitCommitHashTruncated` a private member on `AboutWindow` instead of truncating on draw

* move logo asset defs to `soh_assets.h`

* Apply suggestions from code review

Co-authored-by: Archez <Archez@users.noreply.github.com>

* VB_SHOULDN'T

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
2025-01-24 10:21:15 -05:00
briaguya
6d94cf9bac
bump LUS (joystick thread hint) (#4946) 2025-01-24 10:20:53 -05:00
Fredrik Andréasson
47db92b99b Merge remote-tracking branch 'hm64/develop' into grassanity 2025-01-23 16:09:29 +01:00
Fredrik Andréasson
747fec85c6 * corrected KAK location names and some formatting 2025-01-23 16:08:19 +01:00
Garrett Cox
aa2ad23601
Replace old pause buffer input experience with a more accurate one (#4918) 2025-01-23 01:30:34 +00:00
Fredrik Andréasson
ba37d44f3d Merge remote-tracking branch 'hm64/develop' into grassanity 2025-01-22 19:34:31 +01:00
Fredrik Andréasson
286783cd00 * fixed faulty locations 2025-01-22 19:33:26 +01:00
Garrett Cox
69e3342808
Fix improper usage of GetFinalGIEntry, passing the RG instead of GI (#4938) 2025-01-22 11:39:08 -06:00
Fredrik Andréasson
5a93a39310 * reverse should 2025-01-22 08:26:59 +01:00
Fredrik Andréasson
476cf01ee0 * fixed dupe location spoiler names which caused occasional crash when writing spoiler log 2025-01-22 03:09:14 +01:00
Fredrik Andréasson
023a82e81e * Clear grassIdentity on item drop
* Added check for RC on RandoDraw function
Results in no extra dupe drops, and instantly correct the color of the grass when cut instead of on collecting the item.
2025-01-22 02:16:13 +01:00
Fredrik Andréasson
4a583254a7 * see previous (forgot to stage woops) 2025-01-22 01:25:32 +01:00
Fredrik Andréasson
b39d0a27dc * formatting and removal of dupe lines after merge 2025-01-22 01:24:40 +01:00
Fredrik Andréasson
22e07a59f6 * Renaming and removal of some locs.
* Restructure in z_en_kusa.c to leave vanilla code alone.
* Formatting.
2025-01-22 01:18:23 +01:00
Eric Hoey
bc561efa8e
change RCs to RHTs (#4932) 2025-01-21 16:51:17 +01:00
Fredrik Andréasson
6590f97146 Merge from develop 2025-01-21 16:45:13 +01:00
Malkierian
c781a76e89
Add DMT Cow Grotto Storms Fairy to DMT location access. (#4931) 2025-01-21 10:05:36 +01:00
Pepper0ni
04c0697379
Clean up settings and add boss soul files (#4891)
* Clean up settings and add boss soul files

* address reviews

* didn't realise there was more

* add comment for how to undummy stealth
2025-01-21 06:46:52 +01:00
Philip Dubé
ad9984ef68
pause warp: check player has buttons (#4927)
* pause warp: check player has buttons

* feedback
2025-01-21 06:45:33 +01:00
PurpleHato
26e92a063f
ADD: French translations for rando on file select (#4928)
* French translation for rando file select

* better seed than Seed
2025-01-21 06:45:15 +01:00
Pepper0ni
6f8ac16a9e
Add DMT cow fairy and give overworld misc song fairies hints (#4930) 2025-01-21 06:44:56 +01:00
aMannus
8a5dd6323c
Use textures for boss souls in item tracker (#4925)
* Use textures for boss souls in item tracker

* Fix builds
2025-01-21 00:12:49 +01:00
aMannus
5c4a6ae8c0
Hint purge (#4924) 2025-01-21 00:03:38 +01:00
Philip Dubé
936b159a67
fix 4 warnings (#4922)
1. pragma in cpp
2. missing return
3. unnecessary function call
4. remove impossible null check
2025-01-21 00:03:21 +01:00
Garrett Cox
eab11d7f56
Lock overworld doors Randomizer option (#4489) 2025-01-21 00:03:02 +01:00
aMannus
ded1c721f2
Fix particles (#4923) 2025-01-20 22:37:44 +01:00
aMannus
878a8fe465
Fix boss soul ice traps (#4921) 2025-01-20 22:37:11 +01:00
briaguya
63046a89ec
simplify controllers (#4914)
* start moving towards just using `ShipDeviceIndex::SDLGamepad`

* rename `ShipDeviceIndex` to `ShipDeviceType`

* all sdl mappings are always `ShipDeviceType::SDLGamepad`

* create new `physicaldevice` directory where the new stuff can live

* `ConnectedPhysicalDeviceManager`

* start to not need index mapping manager

* somes fixes and stuff

* remove more shipdeviceindex stuff

* more removing and what not

* axis thresholds

* rename some stuff and remove device icons

* back to all stuff visible

* show connected device names

* bring in mouse color from lus input editor window

* lus

* remove

* more stuff

* more lus

* basic filtering

* update lus

* upstream LUS

* make `Controller_ShouldRumble` make sense
2025-01-20 19:51:39 +01:00
Fredrik Andréasson
30acbe6d39 Merge remote-tracking branch 'hm64/develop' into grassanity 2025-01-20 04:42:42 +01:00
Christopher Leggett
8244d63719
Fix rando menu sliders so they update on JSON drop (#4912) 2025-01-19 18:06:54 -07:00
Christopher Leggett
526aad59d5
Fix the trick options loop (#4917)
It initialized an array with a size, which pre-filled
it all with nullptrs, and then used push_back on top of that.
So it was a bunch of nullptrs followed by the actual
option pointers. Fixed by calling reserve instead of
constructing with a size, so it reserves the memory it needs
without actually filling the vector with nullptrs, so push_back
properly starts from the beginning.
2025-01-19 18:06:42 -07:00
Philip Dubé
ed674f1ed2
mOptionGroups: populate RSG_TRICKS with loop (#4909)
There were some tricks missing, using loop makes one less place to update when adding tricks
2025-01-19 20:49:59 +01:00