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
briaguya
0eb8f5c95f
remove commented out lines
2022-08-06 18:15:24 -04:00
briaguya
e0d6445f24
remove unused cow stuff
2022-08-06 18:14:01 -04:00
briaguya
46c3541458
seems to be working, still needs cleanup
2022-08-06 18:07:16 -04:00
Garrett Cox
ea909b748e
Add super basic custom messages for keysanity, not pretty...
2022-08-06 16:51:58 -05:00
lilDavid
f885195fc9
Apply trade item timer disabling consistently
2022-08-06 16:01:29 -05:00
lilDavid
7cfe21f865
Fix non-randomizer carpenter's son despawning
2022-08-06 15:58:57 -05:00
lilDavid
8ee597298c
Change cursor sound and add files to build system
2022-08-06 15:01:35 -05:00
Garrett Cox
8aba2b6323
Merge branch 'keysanity' of github.com:garrettjoecox/Shipwright into keysanity
2022-08-06 14:18:50 -05:00
Garrett Cox
77f2e56039
Support starts with and more options on ganons boss key
2022-08-06 14:07:46 -05:00
lilDavid
f41b939a71
Only show adult trade items in the save editor if they're shuffled
2022-08-06 12:58:21 -05:00
lilDavid
6603a9a474
Add adult trade shuffle to randomizer
2022-08-06 12:58:08 -05:00
Christopher Leggett
ba160cf997
merge in develop-zhora
2022-08-06 12:26:38 -04:00
briaguya
5574442fdc
fix ganon's boss key
2022-08-06 04:30:03 -04:00
Garrett Cox
e274530073
Fix cows giving free bottles, too generous
2022-08-06 03:03:11 -05:00
Garrett Cox
b420638267
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-06 00:48:55 -05:00
Garrett Cox
5346217af3
Misc fixes
2022-08-06 00:29:05 -05:00
Garrett Cox
2d9d67bbd0
Add missing case
2022-08-05 23:44:53 -05:00
Garrett Cox
cc4300ef8b
Revert accidental changes
2022-08-05 23:40:43 -05:00
briaguya
61c88386a1
Merge branch 'develop-zhora' into zhora-to-next
2022-08-06 00:26:50 -04:00
Garrett Cox
733ce5d28f
Use scene enum, handle thieves hideout keys
2022-08-05 23:26:50 -05:00
Garrett Cox
4a78375c8f
And like magic, keysanity working :D
2022-08-05 23:08:46 -05:00
briaguya
97d363c91e
Merge pull request #1019 from garrettjoecox/shuffleCows
...
Add shuffleCows options for randomizer
2022-08-06 00:03:27 -04:00
Garrett Cox
de34fd7e94
Check coords for other cows rather than falling back
2022-08-05 16:11:17 -05:00
Garrett Cox
528dbcdc17
More suggested changes
2022-08-05 14:59:04 -05:00
Garrett Cox
5de662a326
Fix ice traps
2022-08-05 12:05:22 -05:00
Garrett Cox
ed3cddbeaf
Add option to shuffle frog song rupees
2022-08-05 09:52:11 -05:00
Garrett Cox
11d7a78e62
More changes from suggestions
2022-08-05 01:38:45 -05:00
Josh Bodner
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
