5998dcff7a
Simplifies sram init for rando-specific items
2022-08-13 23:27:03 -04:00
6c3fff7412
Fixes Link's Pocket items.
2022-08-13 22:56:46 -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
76282830d3
Fixes LACS/Prelude situation... again.
2022-08-13 15:30:18 -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
69086f58c2
Cleanup, bugfixes, removing the - 1s from z_player.c
2022-08-13 00:22:34 -04:00
92d0d3e35e
Let Cojiro crow in Adult Trade Shuffle
2022-08-12 17:12:52 -05:00
e9354cc9a1
Don't spawn Fado and the carpenter's son at once
2022-08-12 17:12:19 -05:00
282192eb5e
Properly hatch pocket cucco using Sun's Song
2022-08-12 17:02:03 -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
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
cb81023255
Renames, relocates, and implements ModIndex enum.
2022-08-11 00:38:28 -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
fc08229a46
Save editor: Link adult trade item slot and flags
2022-08-10 11:00:49 -05:00
d523ba5127
complete mask quest
2022-08-10 06:28:10 -04: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
608f493c5b
Update descriptions and defaults
2022-08-09 07:53:15 -05:00
e8c4378d17
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-08 22:47:29 -05: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
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
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
a0ac945b4e
Make logic consistent across z_parameter & z_sram
2022-08-08 14:18:15 -05:00
8f55dd0624
Add support for shuffling maps and compasses
2022-08-08 14:07:02 -05:00
34b8d7d5f8
Handle impa giving a key if skip zelda is on
2022-08-08 11:09:06 -05:00
46be24b595
Add missing semicolons and return values
2022-08-07 18:58:17 -05:00
c8ac2d7c7e
Finally found fix for boss keys...
2022-08-07 16:41:57 -05:00
8b59466ce5
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-07 15:41:44 -05:00
01a36f525e
Handle keys in checkObtainability
2022-08-07 15:41:30 -05:00
7516725f13
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into get-item-rework
2022-08-07 16:24:59 -04: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
75aaefaf04
Fixed Particle effects in the new getItem system.
2022-08-07 11:35:37 -04:00
cac6869a56
Merge pull request #1080 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-08-07 02:16:11 -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
cb2410d9c5
Handle audio thread properly
2022-08-06 21:52:42 -04:00
ea909b748e
Add super basic custom messages for keysanity, not pretty...
2022-08-06 16:51:58 -05:00
77f2e56039
Support starts with and more options on ganons boss key
2022-08-06 14:07:46 -05:00
f41b939a71
Only show adult trade items in the save editor if they're shuffled
2022-08-06 12:58:21 -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
b420638267
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-06 00:48:55 -05:00
Christopher Leggett