briaguya
388319deac
add kak gate check for mask select
2022-08-11 02:01:25 -04:00
Christopher Leggett
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
briaguya
2af572aa30
add check for mask shop being open to mask select
2022-08-11 01:51:43 -04:00
Christopher Leggett
cb81023255
Renames, relocates, and implements ModIndex enum.
2022-08-11 00:38:28 -04:00
Christopher Leggett
4787f2f98b
Removes some commented out code.
2022-08-10 21:00:52 -04:00
Christopher Leggett
17c9ce7804
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into get-item-rework
2022-08-10 20:23:27 -04:00
aMannus
e259e87588
ADD: Enable Glitch-Useful Cutscenes option to rando
2022-08-10 21:51:10 +02:00
lilDavid
fc08229a46
Save editor: Link adult trade item slot and flags
2022-08-10 11:00:49 -05:00
briaguya
d523ba5127
complete mask quest
2022-08-10 06:28:10 -04:00
briaguya
65356b6ced
Merge pull request #1051 from garrettjoecox/keysanity
...
Keysanity + Shuffle Compasses & Maps
2022-08-10 02:28:14 -04:00
lilDavid
aef77a0913
Merge branch 'rando-next' into trade_quest_shuffle
2022-08-09 20:40:00 -05:00
lilDavid
12d45685b9
Move files in with other rando files
2022-08-09 19:57:40 -05:00
lilDavid
08366c51b6
Correct mixed indentation styles
2022-08-09 10:17:38 -05:00
Garrett Cox
608f493c5b
Update descriptions and defaults
2022-08-09 07:53:15 -05:00
Christopher Leggett
7a5acb0a2a
Fixes placement
2022-08-09 08:36:20 -04:00
Christopher Leggett
20bbf85f00
Sets player getItemId before other messagebox instance.
2022-08-09 07:26:17 -04:00
Christopher Leggett
6f7b38539b
Moves setting of getItemId into a rando save if block.
2022-08-09 01:56:47 -04:00
Christopher Leggett
95918e0cb2
Fixes skulltula messages for custom items.
2022-08-09 01:42:47 -04:00
Garrett Cox
3472e83250
Use new custom message system, skulltula drops still broken text
2022-08-09 00:00:30 -05:00
Garrett Cox
e8c4378d17
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-08 22:47:29 -05:00
briaguya
8410a79b26
Merge branch 'rando-next' into zhora-to-next
2022-08-08 22:27:04 -04:00
briaguya
816fac6c06
Merge branch 'develop-zhora' into zhora-to-next
2022-08-08 22:23:06 -04:00
briaguya
317de33a8b
Merge branch 'develop-rachael' into rachael-to-zhora
2022-08-08 21:43:04 -04:00
briaguya
fa090c51f6
Merge pull request #831 from leggettc18/custom-messages
...
System for Creating and Storing Custom Messages
2022-08-08 21:24:48 -04:00
Christopher Leggett
e63d84bd7d
Adapts this branch for cmake building.
2022-08-08 21:14:29 -04:00
aMannus
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
InfoManiac742
0e10b59307
Update z_kaleido_item.c ( #1046 )
2022-08-08 19:58:01 -04:00
InfoManiac742
4bf4ad3359
Update z_en_ru1.c ( #1042 )
2022-08-08 19:56:56 -04:00
lilDavid
f80ba4102a
Add instant boomerang recall ( #1006 )
2022-08-08 19:55:07 -04:00
Dog
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
Christopher Leggett
59baf24dc6
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages
2022-08-08 19:46:09 -04:00
Garrett Cox
a0ac945b4e
Make logic consistent across z_parameter & z_sram
2022-08-08 14:18:15 -05:00
Garrett Cox
8f55dd0624
Add support for shuffling maps and compasses
2022-08-08 14:07:02 -05:00
Garrett Cox
34b8d7d5f8
Handle impa giving a key if skip zelda is on
2022-08-08 11:09:06 -05:00
lilDavid
46be24b595
Add missing semicolons and return values
2022-08-07 18:58:17 -05:00
Garrett Cox
c8ac2d7c7e
Finally found fix for boss keys...
2022-08-07 16:41:57 -05:00
Christopher Leggett
58da0a5aa2
Some more partial ice trap fixing that wasn't pushed earlier
2022-08-07 17:19:26 -04:00
Garrett Cox
8b59466ce5
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-07 15:41:44 -05:00
Garrett Cox
01a36f525e
Handle keys in checkObtainability
2022-08-07 15:41:30 -05:00
Christopher Leggett
7516725f13
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into get-item-rework
2022-08-07 16:24:59 -04:00
Garrett Cox
ec801530b7
Move some more items around, boss keys still broken
2022-08-07 14:32:54 -05:00
Christopher Leggett
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
Christopher Leggett
9616058952
Fixes item fanfares
2022-08-07 12:14:07 -04:00
Christopher Leggett
75aaefaf04
Fixed Particle effects in the new getItem system.
2022-08-07 11:35:37 -04:00
briaguya
cac6869a56
Merge pull request #1080 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-08-07 02:16:11 -04:00
briaguya
91ad58aa3e
Merge pull request #1061 from garrettjoecox/frogSongs
...
Shuffle frog song rupees
2022-08-07 02:13:24 -04:00
Christopher Leggett
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
Christopher Leggett
cfce0eba3d
Implements fixes for competing getItem calls.
2022-08-06 22:51:15 -04:00
GaryOderNichts
cb2410d9c5
Handle audio thread properly
2022-08-06 21:52:42 -04:00
briaguya
c3253fe59f
add comment explaining ocarina mode setting
2022-08-06 18:23:47 -04:00
