6d7498829d
Wraps up a few missed type changes.
2022-08-14 11:54:43 -04:00
0604dbfef8
Cleans up and updates item fanfares.
2022-08-14 11:43:25 -04:00
1ab4b23011
Should fix some Skulltula oddities.
2022-08-14 11:26:00 -04:00
c8d085cb49
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next
...
Hopefully everything works here. Need to do some testing.
2022-08-13 22:43:19 -04:00
9940c9ed28
Fixes too many arguments error.
...
Not sure why this didn't fail to build on Windows before.
2022-08-13 16:38:33 -04:00
76282830d3
Fixes LACS/Prelude situation... again.
2022-08-13 15:30:18 -04:00
9ed7feb30a
Realized I had the bgm conditions wrong.
2022-08-13 12:13:46 -04:00
58c9f64a16
Extends GetItemEntry to include GID.
...
This allows for using it later when drawing freestanding items.
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943168136
2022-08-13 01:44:19 -04:00
11db45eef6
Extends GetItemEntry to include getItemId
...
Also adapts some existing calls for both the entry and the id to only
get the entry.
2022-08-13 01:32:36 -04:00
0c334615b6
Adds else if to added fanfare sound cases.
...
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940112924 and https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940113492
2022-08-13 00:38:09 -04:00
4cc492f383
Fixes some funky formatting that got committed earlier.
2022-08-13 00:28:19 -04:00
69086f58c2
Cleanup, bugfixes, removing the `- 1`s from `z_player.c`
2022-08-13 00:22:34 -04:00
e9354cc9a1
Don't spawn Fado and the carpenter's son at once
2022-08-12 17:12:19 -05:00
86faa42acf
Make libultra OSContPad struct consistent with the one from libultraship
2022-08-11 19:41:53 -04:00
094388187f
Cleans up Controllers
...
Renames VirtualController to DummyController.
Makes controller axis treated the same as buttons.
Made Controller class members private or protected
Made Controller class treat deadzones, sensitivities, and press thresholds consistently.
2022-08-11 19:41:53 -04:00
388319deac
add kak gate check for mask select
2022-08-11 02:01:25 -04:00
0431dce989
Removes now unused ItemIDs and GetItemIDs
...
Also makes all the necessary changes to other code that was still
using them indirectly through the GI to GID map that was removed.
There's quite a lot of changes here and I haven't had time to test them
yet.
2022-08-11 02:01:01 -04:00
2af572aa30
add check for mask shop being open to mask select
2022-08-11 01:51:43 -04:00
cb81023255
Renames, relocates, and implements ModIndex enum.
2022-08-11 00:38:28 -04:00
4787f2f98b
Removes some commented out code.
2022-08-10 21:00:52 -04:00
17c9ce7804
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into get-item-rework
2022-08-10 20:23:27 -04:00
e259e87588
ADD: Enable Glitch-Useful Cutscenes option to rando
2022-08-10 21:51:10 +02:00
65356b6ced
Merge pull request #1051 from garrettjoecox/keysanity
...
Keysanity + Shuffle Compasses & Maps
2022-08-10 02:28:14 -04:00
aef77a0913
Merge branch 'rando-next' into trade_quest_shuffle
2022-08-09 20:40:00 -05:00
12d45685b9
Move files in with other rando files
2022-08-09 19:57:40 -05:00
08366c51b6
Correct mixed indentation styles
2022-08-09 10:17:38 -05:00
7a5acb0a2a
Fixes placement
2022-08-09 08:36:20 -04:00
20bbf85f00
Sets player getItemId before other messagebox instance.
2022-08-09 07:26:17 -04:00
6f7b38539b
Moves setting of getItemId into a rando save if block.
2022-08-09 01:56:47 -04:00
95918e0cb2
Fixes skulltula messages for custom items.
2022-08-09 01:42:47 -04:00
3472e83250
Use new custom message system, skulltula drops still broken text
2022-08-09 00:00:30 -05:00
e8c4378d17
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-08 22:47:29 -05:00
8410a79b26
Merge branch 'rando-next' into zhora-to-next
2022-08-08 22:27:04 -04:00
816fac6c06
Merge branch 'develop-zhora' into zhora-to-next
2022-08-08 22:23:06 -04:00
317de33a8b
Merge branch 'develop-rachael' into rachael-to-zhora
2022-08-08 21:43:04 -04:00
fa090c51f6
Merge pull request #831 from leggettc18/custom-messages
...
System for Creating and Storing Custom Messages
2022-08-08 21:24:48 -04:00
e63d84bd7d
Adapts this branch for cmake building.
2022-08-08 21:14:29 -04:00
4ea7f8371f
Rando: Zelda sequence fixes ( #1095 )
...
* Fixed zelda sequence oddities
* Fixed code inconsistency
* Adressed review comments
* Adressed review comments, removed unneccesary entrance skip
* Addressed some more review comments
* tiny cleanup
2022-08-08 19:59:06 -04:00
0e10b59307
Update z_kaleido_item.c ( #1046 )
2022-08-08 19:58:01 -04:00
4bf4ad3359
Update z_en_ru1.c ( #1042 )
2022-08-08 19:56:56 -04:00
f80ba4102a
Add instant boomerang recall ( #1006 )
2022-08-08 19:55:07 -04:00
1f5d323d89
Randomizer: Skip Cutscenes ( #846 )
...
* Skip Jabu Jabu's fishy feeding time if rando is enabled Issue #757
Also skip the ganon tower fall cutscene if you died to ganon during the ganon fight for issue #773
* Immediately give control back to player when talon running cutscene starts.
* Fix case of not skipping Gannon
2022-08-08 19:48:53 -04:00
59baf24dc6
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages
2022-08-08 19:46:09 -04:00
8f55dd0624
Add support for shuffling maps and compasses
2022-08-08 14:07:02 -05:00
46be24b595
Add missing semicolons and return values
2022-08-07 18:58:17 -05:00
58da0a5aa2
Some more partial ice trap fixing that wasn't pushed earlier
2022-08-07 17:19:26 -04:00
8b59466ce5
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-07 15:41:44 -05:00
ec801530b7
Move some more items around, boss keys still broken
2022-08-07 14:32:54 -05:00
0efb008213
Partially fixes Ice Traps
...
Obtaining a freestanding Ice Trap causes link to slide forward
and receiving one from an NPC plays the sound effect and damage
animation but doesn't freeze link.
2022-08-07 13:17:06 -04:00
9616058952
Fixes item fanfares
2022-08-07 12:14:07 -04:00
91ad58aa3e
Merge pull request #1061 from garrettjoecox/frogSongs
...
Shuffle frog song rupees
2022-08-07 02:13:24 -04:00
3258fc5fb3
Correctly renders freestanding items
...
Particle effects are probably broken, need to fix them still, I pretty
much know how I would do that.
2022-08-06 23:29:28 -04:00
cfce0eba3d
Implements fixes for competing getItem calls.
2022-08-06 22:51:15 -04:00
c3253fe59f
add comment explaining ocarina mode setting
2022-08-06 18:23:47 -04:00
0eb8f5c95f
remove commented out lines
2022-08-06 18:15:24 -04:00
e0d6445f24
remove unused cow stuff
2022-08-06 18:14:01 -04:00
46c3541458
seems to be working, still needs cleanup
2022-08-06 18:07:16 -04:00
f885195fc9
Apply trade item timer disabling consistently
2022-08-06 16:01:29 -05:00
7cfe21f865
Fix non-randomizer carpenter's son despawning
2022-08-06 15:58:57 -05:00
8ee597298c
Change cursor sound and add files to build system
2022-08-06 15:01:35 -05:00
6603a9a474
Add adult trade shuffle to randomizer
2022-08-06 12:58:08 -05:00
ba160cf997
merge in develop-zhora
2022-08-06 12:26:38 -04:00
5574442fdc
fix ganon's boss key
2022-08-06 04:30:03 -04:00
e274530073
Fix cows giving free bottles, too generous
2022-08-06 03:03:11 -05:00
b420638267
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-06 00:48:55 -05:00
61c88386a1
Merge branch 'develop-zhora' into zhora-to-next
2022-08-06 00:26:50 -04:00
4a78375c8f
And like magic, keysanity working :D
2022-08-05 23:08:46 -05:00
97d363c91e
Merge pull request #1019 from garrettjoecox/shuffleCows
...
Add shuffleCows options for randomizer
2022-08-06 00:03:27 -04:00
de34fd7e94
Check coords for other cows rather than falling back
2022-08-05 16:11:17 -05:00
528dbcdc17
More suggested changes
2022-08-05 14:59:04 -05:00
5de662a326
Fix ice traps
2022-08-05 12:05:22 -05:00
ed3cddbeaf
Add option to shuffle frog song rupees
2022-08-05 09:52:11 -05:00
11d7a78e62
More changes from suggestions
2022-08-05 01:38:45 -05:00
c23457d666
Automatically save after every scene transition ( #984 )
...
* Automatically save after every scene transition
* Refactor and don't save in grottos
* Don't save in cutscenes
* Save after getting items as well
* Fix paren
2022-08-05 00:15:49 -04:00
1789e5dddd
Fix ice traps for cow shuffle
2022-08-04 20:59:46 -05:00
95d439bb30
Adds rough ability to differentiate between rando and vanilla items.merge stashed changes from before develop-zhora merge
2022-08-04 20:54:51 -04:00
ebcf574085
Use Randomizer_GetItemIdFromKnownCheck instead for shuffleCows
2022-08-04 19:42:58 -05:00
facd1723f8
don't use signed ints for epochs ( #1044 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-04 17:32:23 -04:00
2d22099805
Merge pull request #1039 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-08-03 21:02:29 -07:00
1da655adb5
Resolve merge conflicts with develop-zhora
2022-08-03 23:13:53 -04:00
739434e3e4
Merge branch 'develop-rachael' into rachael-to-zhora
2022-08-03 23:01:11 -04:00
bd86c792c3
Moves release version text ( #1028 )
2022-08-03 22:44:43 -04:00
dffcbb035e
Fixes glitchy dungeon maps. ( #1032 )
2022-08-03 22:43:55 -04:00
0f7a88bd5a
This should fix (all?) 60fps interpolation issues left. ( #938 )
...
* This should fix (all?) 60fps interpolation issues left.
Resolves #631 #917
* Update z_fishing.c
* Re-adds Emil's interpolation in certain places.
* move open/close disps out of if statments checking timer based vars, revert fishing to use recordopen/closed child
* move disps out of ifs for morpha
* use recordopen/recordclose for volv
* recordopen/recordclose for ganondorf
* switch back to recordopen/recordclose for ganondorf floor
* Frame interpolation now uses a 64bit parameter rather than 32.
* More 60fps fixes
* Fix close child typo
* add todo calls to recordopen/recordclose
* fix build
* revert long long frame interpolation
* add some epochs
* add more epochs
* bongo epochs
* the rest of the epochs
* fix the typo fix the build
* interpolation fixes pr cleanup
* init/cleanup bongo epochs
* bongo hand trails
* Fixes niw feathers
* Fixes bongo bongo hands, and replaces epoch * i with epoch + i
* don't update epochs
Co-authored-by: briaguya <briaguya@alice>
2022-08-03 22:36:13 -04:00
fd379896d6
LUS Cleanup: Clean up hooks system.
2022-08-03 21:12:51 -04:00
8c2feb537d
Use 454+cowId to identify cows in randomizer.cpp
2022-08-03 11:26:14 -05:00
723e34a06a
Move some flags around and use global array instead of flag for shuffle cows
2022-08-03 08:44:48 -05:00
c18203878b
Add shuffleCows options for randomizer
2022-08-03 00:14:38 -05:00
fe02818d51
Randomizer: Ocarina of Time Ice Trap Fix ( #964 )
...
* Fixes Ice Trap on OoT check from preventing SoT check
* Removes unneeded GlobalContext argument.
2022-08-02 23:48:51 -04:00
a007bfd14a
Merge changes from develop-zhora
2022-08-02 19:17:08 -04:00
73447f05ab
Revert Goron Spin Fix ( #1003 )
...
* Fixes Goron Wakeup animations
* Cleanup of some unneeded code.
* Fixes comment spacing
* Revert goron's back to spinny behavior with smooth transitions.
2022-08-02 18:09:02 -04:00
ac776ce7bc
Merge branch 'develop-zhora' into zhornext
2022-08-02 15:49:59 -04:00
53229f0905
Merge branch 'develop-rachael' into rachael-zhora
...
# Conflicts:
# libultraship/libultraship/ImGuiImpl.cpp
2022-08-02 20:05:40 +02:00
d1ddc2a0c3
Merge branch 'develop-zhora' into zhora-to-rnext-merge
2022-08-02 13:02:13 -04:00
412264050a
Merge pull request #746 from Sarge-117/rando-quest-item-fanfares
...
Rando: Item Fanfares
2022-08-02 03:24:36 -07:00
eae97cff79
Addresses most of bria's comments.
2022-08-01 21:44:28 -04:00
bfdf814a1f
Implements new getItem table in game.
2022-08-01 21:03:58 -04:00
9389ceb8c1
Speed up lifting silver rocks and obelisks by 5x ( #953 )
...
* Speed up lifting silver rocks and obelisks by 3x
* Increase rock lifting speed to 5x
* Fix bug that sped up picking up small rocks, grass, bombflowers
* Add enhancement checkbox for faster block lifting and reduced speed to 3x
2022-07-31 22:09:30 -04:00
d332c3d9d6
Randomizer Allows Skull Kid to accept Mask after receiving an ice trap. ( #963 )
...
* Allows Skull Kid to accept Mask after receiving an ice trap.
* Extracts obscure rando check into a clearly named function.
* Fixes missing semicolon...
2022-07-31 21:58:13 -04:00
b59c9cdf02
Randomizer: Fixes LACS and Prelude checks under certain conditions ( #961 )
...
* Prevents LACS flag from getting set when it shouldn't be.
* Fixes Prelude and LACS checks so they apply immediately if missed.
* Refactors the scene-flag-setting code into its own function.
* Renames new enums and props to be clearer and not specific to scene flags.
* Refactors pendingFlag data into a separate struct.
2022-07-31 21:57:30 -04:00
Christopher Leggett