Garrett Cox
|
8a3d1352d7
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
|
2022-09-03 17:39:11 -05:00 |
|
aMannus
|
6cd8d6ca3a
|
Clean up bool
|
2022-09-03 20:48:00 +02:00 |
|
Garrett Cox
|
c037bfc16b
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
|
2022-09-03 09:49:50 -05:00 |
|
aMannus
|
8d2f63419f
|
Implement Skip Scarecrow's Song
|
2022-09-03 14:40:41 +02:00 |
|
Christopher Leggett
|
a07ea091f0
|
Fixes crash when entering Ganon's Castle lobby on linux.
|
2022-09-03 00:20:50 -04:00 |
|
Garrett Cox
|
25ed66439e
|
Fix repeatable purchases and bottles rendering incorrectly
|
2022-09-02 17:23:37 -05:00 |
|
Garrett Cox
|
d1dac2a2ee
|
Add obtainability checks correctly
|
2022-09-02 15:22:09 -05:00 |
|
Garrett Cox
|
0277db578f
|
Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity
|
2022-09-02 14:33:32 -05:00 |
|
Garrett Cox
|
42858bf15e
|
Add shopsanity condition around shop changes
|
2022-09-02 13:27:59 -05:00 |
|
Garrett Cox
|
7a22763e55
|
Fix an issue with textId and with giving items with fanfare
|
2022-09-02 12:39:08 -05:00 |
|
Garrett Cox
|
d60a82d67a
|
Use randomizerInf
|
2022-09-02 11:47:57 -05:00 |
|
Garrett Cox
|
43d8a11de5
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
|
2022-09-02 11:07:21 -05:00 |
|
Garrett Cox
|
ee2f38ad91
|
Renaming of some randomizer item/check/get methods
|
2022-09-02 10:34:20 -05:00 |
|
briaguya
|
26c41079bd
|
Merge pull request #1362 from lilDavid/rando_biggoron_fix
Randomizer: Fix Biggoron checks
|
2022-09-01 12:50:37 -04:00 |
|
briaguya
|
5a009590fc
|
Merge remote-tracking branch 'origin/develop-zhora' into ztorn
|
2022-09-01 12:06:25 -04:00 |
|
lil David
|
c84654b202
|
Always check n64ddFlag before bgsFlag
that order is consistent with the existing condition in EnGo2_GetStateGoronDmtBiggoron
|
2022-09-01 09:23:08 -05:00 |
|
lil David
|
0a744cde01
|
Clarify comments
|
2022-09-01 08:11:17 -05:00 |
|
lil David
|
ea9db56914
|
Merge remote-tracking branch 'upstream/rando-next' into bombchu-logic
|
2022-09-01 07:59:09 -05:00 |
|
lilDavid
|
cfaed3ded0
|
Make Biggoron ignore whether you have BGS in rando
|
2022-08-31 22:07:34 -05:00 |
|
Christopher Leggett
|
042d6f3865
|
Fixes a few bugs related to chests.
|
2022-08-31 10:57:59 -04:00 |
|
Christopher Leggett
|
776219fb52
|
Backports a fix for sheik checks from rando-next (#1340)
* Fixes some Sheik checks I had accidentally set the wrong flag for.
* Removes duplicate switch case from cherry-pick
|
2022-08-31 15:25:47 +02:00 |
|
briaguya
|
6d4288c2a5
|
Merge pull request #1331 from leggettc18/ganon-trials
Reimplements selecting different amounts of Ganon's Trials.
|
2022-08-28 11:48:34 -04:00 |
|
Christopher Leggett
|
fafd90482b
|
Refactor of some old rando code to use new functions.
|
2022-08-27 18:42:36 -04:00 |
|
Christopher Leggett
|
3d8b8066da
|
More comment cleanup
|
2022-08-27 14:33:38 -04:00 |
|
Christopher Leggett
|
1bf8423f75
|
Reimplements selecting different amounts of Ganon's Trials.
|
2022-08-27 14:19:37 -04:00 |
|
Christopher Leggett
|
928a39fe9e
|
More Cleanup
|
2022-08-27 09:30:49 -04:00 |
|
Christopher Leggett
|
a572c11f4f
|
Fixes ice trap gidata not getting cleared after trap is sprung. (#1322)
|
2022-08-27 09:27:20 +02:00 |
|
Christopher Leggett
|
bf1b327a95
|
Cleanup and Documentation
|
2022-08-27 02:50:44 -04:00 |
|
Christopher Leggett
|
7fbb381db7
|
Changes Malon's behavior to so she won't leave Hyrule Castle until you've obtained her item.
|
2022-08-27 02:25:13 -04:00 |
|
Garrett Cox
|
67a890ed1e
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
|
2022-08-26 21:41:21 -05:00 |
|
Christopher Leggett
|
78e506a072
|
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into magic-bean-pack
|
2022-08-25 16:58:05 -04:00 |
|
briaguya
|
da07a8f409
|
Merge pull request #1300 from aMannus/tokensanity-bgs-fix
Rando: Tokensanity BGS and maps/compasses fix
|
2022-08-25 16:50:21 -04:00 |
|
Garrett Cox
|
1e31d108e6
|
Various changes from feedback, and use new randomizerInf table
|
2022-08-25 13:49:02 -05:00 |
|
Garrett Cox
|
936513a9c4
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity
|
2022-08-25 13:02:47 -05:00 |
|
aMannus
|
29b9f0b37e
|
Comment
|
2022-08-25 19:58:05 +02:00 |
|
aMannus
|
49b48fb7a4
|
Fix BGS and maps/keys textboxes
|
2022-08-25 19:56:34 +02:00 |
|
Christopher Leggett
|
6ab13f389b
|
Fixes salesman to properly take 60 rupees from you.
|
2022-08-25 12:43:19 -04:00 |
|
lilDavid
|
ad33aba9ba
|
Merge branch 'rando-next' into bombchu-logic
|
2022-08-25 11:23:30 -05:00 |
|
briaguya
|
9f60a97307
|
Merge pull request #1303 from aMannus/rando-skulls-winnerpoh-fix
Rando: Fix Winner PoH on skulltula's
|
2022-08-25 12:23:29 -04:00 |
|
aMannus
|
c22951353e
|
Renamed function
|
2022-08-25 18:04:52 +02:00 |
|
Garrett Cox
|
95372718a3
|
Transition a few things to randomizerInf flags
|
2022-08-25 10:27:31 -05:00 |
|
Christopher Leggett
|
ef1b662bf4
|
Finishes wiring up bean salesman settings and text.
|
2022-08-25 09:42:15 -04:00 |
|
aMannus
|
bc5ec24889
|
Ice trap fix
|
2022-08-25 09:54:08 +02:00 |
|
aMannus
|
2626f6c7e3
|
Fixed Winner PoH on skulltula's
|
2022-08-25 09:34:46 +02:00 |
|
Christopher Leggett
|
c4de29b7f1
|
Correctly sets BEANS_BOUGHT as a "flag" for the bean salesman
|
2022-08-24 17:24:50 -04:00 |
|
Christopher Leggett
|
adf465c1a0
|
Sets up Magic Bean Salesman to sell a rando check for 60 rupees.
|
2022-08-24 17:20:45 -04:00 |
|
briaguya
|
f15b3880f3
|
Merge pull request #1292 from aMannus/custom-key-colors-fix
Rando: Custom key colors fix
|
2022-08-24 17:17:54 -04:00 |
|
aMannus
|
a48ac71762
|
Fixed lost woods target crash
|
2022-08-24 23:02:48 +02:00 |
|
aMannus
|
d5074c3e77
|
Fixes double def and split second wrong colors
|
2022-08-24 22:18:24 +02:00 |
|
Christopher Leggett
|
ecd0e3e8bb
|
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into color-coded-keys
|
2022-08-24 13:03:44 -04:00 |
|